diff --git a/.github/ISSUE_TEMPLATE/release.yml b/.github/ISSUE_TEMPLATE/release.yml
index 7ac55427a9..582998d492 100644
--- a/.github/ISSUE_TEMPLATE/release.yml
+++ b/.github/ISSUE_TEMPLATE/release.yml
@@ -1,6 +1,6 @@
 name: Release checklist
 description: Checklist for each release. This template is only for the core team.
-title: "[Release] Element Android v"
+title: "[Release] Element Android v"
 labels: [🚀 Release]
 assignees:
   - bmarty
@@ -10,7 +10,7 @@ body:
     id: checklist
     attributes:
       label: Release checklist
-      description: For the template example, we are releasing the version 1.1.10. Replace 1.1.10 with the version in the issue body.
+      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: |
@@ -22,35 +22,41 @@ body:
 
         ### Do the release
 
-        - [ ] Create release with gitflow, branch name `release/1.1.10`
+        - [ ] Create 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.1.10-dev
+        - [ ] 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
-        - [ ] Run towncrier: `towncrier --version v1.1.10 --draft` (remove `--draft` do write the file CHANGES.md)
+        - [ ] 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 --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
-        - [ ] 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
-        - [ ] Push `main` and the new tag `v1.1.10` to origin
+        - [ ] (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 in `./vector/build.gradle`
+        - [ ] 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
+
+        ### Once tested and validated internally
+
         - [ ] Create a new beta release on the GooglePlay console and upload the 4 signed Apks.
         - [ ] Check that the version codes are correct
         - [ ] Copy the fastlane change to the GooglePlay console in the section en-GB.
         - [ ] Push to beta release to 100% of the users
-        - [ ] 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
-        - [ ] Add an entry in the internal diary
+        - [ ] Notify the F-Droid team so that they can schedule the publication on F-Droid
 
         ### Once Live on PlayStore
 
         - [ ] Ping the Android public room and update its topic
+        - [ ] Add an entry in the internal diary
 
         ### After at least 2 days
 
@@ -62,6 +68,8 @@ body:
 
         ### Android SDK2
 
+        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
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index eb30c18fcf..7096e6bdb5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,41 @@
-### Pull Request Checklist
+<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
+ 
+## Type of change
 
-<!--
- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) before submitting your pull request
- Depending on the Pull Request content, it can be acceptable if some of the following checkboxes stay unchecked.
- -->
+- [ ] Feature
+- [ ] Bugfix
+- [ ] Technical
+- [ ] Other :
+
+## Content
+
+<!-- Describe shortly what has been changed -->
+
+## Motivation and context
+
+<!-- Provide link to the corresponding issue if applicable or explain the context -->
+
+## Screenshots / GIFs
+
+<!-- Only if UI have been changed -->
+
+## Tests
+
+<!-- Explain how you tested your development -->
+
+- Step 1
+- Step 2
+- Step ...
+
+## Tested devices
+
+- [ ] Physical
+- [ ] Emulator
+- OS version(s):
+
+## Checklist
+
+<!-- Depending on the Pull Request content, it can be acceptable if some of the following checkboxes stay unchecked. -->
 
 - [ ] Changes has been tested on an Android device or Android emulator with API 21
 - [ ] UI change has been tested on both light and dark themes
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index bf78356947..cac35fb1fc 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -180,6 +180,7 @@ jobs:
           body="$(cat ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml | grep "<testsuite" | sed "s@.*tests=\(.*\)time=.*@\1@")"
           echo "::set-output name=permalink::passed=$body"
       - name: Find Comment
+        if: github.event_name == 'pull_request'
         uses: peter-evans/find-comment@v1
         id: fc
         with:
@@ -187,6 +188,7 @@ jobs:
           comment-author: 'github-actions[bot]'
           body-includes: Integration Tests Results
       - name: Publish results to PR
+        if: github.event_name == 'pull_request'
         uses: peter-evans/create-or-update-comment@v1
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 7eff52cc9f..69f17a3875 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -54,7 +54,7 @@ jobs:
             echo "::set-output name=body::$body"
           fi
       - name: Find Comment
-        if: always()
+        if: always() && github.event_name == 'pull_request'
         uses: peter-evans/find-comment@v1
         id: fc
         with:
@@ -62,7 +62,7 @@ jobs:
           comment-author: 'github-actions[bot]'
           body-includes: Ktlint Results
       - name: Add comment if needed
-        if: always() && steps.ktlint-results.outputs.add_comment == 'true'
+        if: always() && github.event_name == 'pull_request' && steps.ktlint-results.outputs.add_comment == 'true'
         uses: peter-evans/create-or-update-comment@v1
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
@@ -73,7 +73,7 @@ jobs:
             ${{ steps.ktlint-results.outputs.body }}
           edit-mode: replace
       - name: Delete comment if needed
-        if: always() && steps.fc.outputs.comment-id != '' && steps.ktlint-results.outputs.add_comment == 'false'
+        if: always() && github.event_name == 'pull_request' && steps.fc.outputs.comment-id != '' && steps.ktlint-results.outputs.add_comment == 'false'
         uses: actions/github-script@v3
         with:
           script: |
diff --git a/.github/workflows/sanity_test.yml b/.github/workflows/sanity_test.yml
index 213c43b716..483926fa1f 100644
--- a/.github/workflows/sanity_test.yml
+++ b/.github/workflows/sanity_test.yml
@@ -8,7 +8,7 @@ on:
 # Enrich gradle.properties for CI/CD
 env:
   CI_GRADLE_ARG_PROPERTIES: >
-    -Porg.gradle.jvmargs=-Xmx2g
+    -Porg.gradle.jvmargs=-Xmx4g
     -Porg.gradle.parallel=false
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        api-level: [ 29 ]
+        api-level: [ 28 ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -57,9 +57,11 @@ jobs:
       - name: Run sanity tests on API ${{ matrix.api-level }}
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           api-level: ${{ matrix.api-level }}
-          profile: 24 # Pixel 5
+          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
           emulator-build: 7425822  # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
           script: |
             adb root
@@ -67,12 +69,12 @@ jobs:
             touch emulator.log
             chmod 777 emulator.log
             adb logcat >> emulator.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1
-      - name: Upload Failing Test Report Log
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || (adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1 )
+      - name: Upload Test Report Log
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: always()
         with:
           name: sanity-error-results
           path: |
             emulator.log
-            failure_screenshots/
\ No newline at end of file
+            failure_screenshots/
diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 71b1cde40d..eeddf2e785 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -202,3 +202,53 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc3m-g"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+ 
+  move_ftue_issues:
+    name: Z-FTUE to Mobile FTUE board
+    runs-on: ubuntu-latest
+    # Skip in forks
+    if: >
+      github.repository == 'vector-im/element-android' &&
+      contains(github.event.issue.labels.*.name, 'Z-FTUE')
+    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_kwDOAM0swc4AAqVx"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_WTF_issues:
+    name: Z-WTF to WTF board
+    runs-on: ubuntu-latest
+    # Skip in forks
+    if: >
+      github.repository == 'vector-im/element-android' &&
+      contains(github.event.issue.labels.*.name, 'Z-WTF')
+    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_kwDOAM0swc4AArk0"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.idea/dictionaries/bmarty.xml b/.idea/dictionaries/bmarty.xml
index f99842f067..ed572b573f 100644
--- a/.idea/dictionaries/bmarty.xml
+++ b/.idea/dictionaries/bmarty.xml
@@ -28,6 +28,7 @@
       <w>previewable</w>
       <w>previewables</w>
       <w>pstn</w>
+      <w>rageshake</w>
       <w>riotx</w>
       <w>signin</w>
       <w>signout</w>
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 0000000000..6f7872211b
Binary files /dev/null and b/.idea/icon.png differ
diff --git a/CHANGES.md b/CHANGES.md
index ec022bc770..255792f800 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,82 @@
+Changes in Element v1.4.2 (2022-02-22)
+======================================
+
+Features ✨
+----------
+ - Open the room when user accepts an invite from the room list ([#3771](https://github.com/vector-im/element-android/issues/3771))
+ - Add completion for @room to notify everyone in a room ([#5123](https://github.com/vector-im/element-android/issues/5123))
+ - Improve UI of reactions in timeline, including quick add reaction. ([#5204](https://github.com/vector-im/element-android/issues/5204))
+ - Support creating disclosed polls ([#5290](https://github.com/vector-im/element-android/issues/5290))
+
+Bugfixes 🐛
+----------
+ - Remove redundant highlight on add poll option button ([#5178](https://github.com/vector-im/element-android/issues/5178))
+ - Reliably display crash report prompt ([#5195](https://github.com/vector-im/element-android/issues/5195))
+ - Fix for rooms with virtual rooms not showing call status events in the timeline. ([#5198](https://github.com/vector-im/element-android/issues/5198))
+ - Fix for call transfer with consult failing to make outgoing consultation call. ([#5201](https://github.com/vector-im/element-android/issues/5201))
+ - Fix crash during account registration when redirecting to Web View ([#5218](https://github.com/vector-im/element-android/issues/5218))
+ - Analytics: Fixes missing use case identity values from within the onboarding flow ([#5234](https://github.com/vector-im/element-android/issues/5234))
+ - Fixing crash when adding room by QR code after accepting the camera permission for the first time ([#5295](https://github.com/vector-im/element-android/issues/5295))
+
+SDK API changes ⚠️
+------------------
+ - `join` and `leave` methods moved from MembershipService to RoomService and SpaceService to split logic for rooms and spaces ([#5183](https://github.com/vector-im/element-android/issues/5183))
+ - Deprecates Matrix.initialize and Matrix.getInstance in favour of the client providing its own singleton instance via Matrix.createInstance ([#5185](https://github.com/vector-im/element-android/issues/5185))
+ - Adds support for MSC3283, additional homeserver capabilities ([#5207](https://github.com/vector-im/element-android/issues/5207))
+
+Other changes
+-------------
+ - Right align the notifications badge in the rooms list (and DMs) so that it's always in a consistent place on the screen. ([#4640](https://github.com/vector-im/element-android/issues/4640))
+ - Collapse successive ACLs events in room timeline ([#2782](https://github.com/vector-im/element-android/issues/2782))
+ - Home screen: Replacing search icon by filter icon in the top right menu ([#4643](https://github.com/vector-im/element-android/issues/4643))
+ - Make Space creation screens more consistent ([#5104](https://github.com/vector-im/element-android/issues/5104))
+ - Defensive coding to ensure encryption when room was once e2e ([#5136](https://github.com/vector-im/element-android/issues/5136))
+ - Reduce verbosity of debug logging, ([#5209](https://github.com/vector-im/element-android/issues/5209))
+ - Standardise emulator versions of GHA integration tests. ([#5210](https://github.com/vector-im/element-android/issues/5210))
+ - Replacing color "vctr_unread_room_badge" by "vctr_content_secondary" ([#5225](https://github.com/vector-im/element-android/issues/5225))
+ - Change preferred jitsi domain from `jitsi.riot.im` to `meet.element.io` ([#5254](https://github.com/vector-im/element-android/issues/5254))
+ - Analytics screen events are now tracked on screen enter instead of screen leave ([#5256](https://github.com/vector-im/element-android/issues/5256))
+ - Improves bitmap memory usage by caching the shortcut images ([#5276](https://github.com/vector-im/element-android/issues/5276))
+ - Changes unread marker in room list from green to grey ([#5294](https://github.com/vector-im/element-android/issues/5294))
+ - Improve some internal realm usages. ([#5297](https://github.com/vector-im/element-android/issues/5297))
+
+Translations 🗣
+--------------
+ - Improved Japanese translations (special thanks to Suguru Hirahara!)
+
+
+Changes in Element v1.4.0 (2022-02-09)
+======================================
+
+Features ✨
+----------
+ - Initial implementation of thread messages ([#4746](https://github.com/vector-im/element-android/issues/4746))
+ - Support message bubbles in timeline. ([#4937](https://github.com/vector-im/element-android/issues/4937))
+ - Support generic location pin ([#5146](https://github.com/vector-im/element-android/issues/5146))
+ - Retrieve map style url from .well-known ([#5175](https://github.com/vector-im/element-android/issues/5175))
+
+Bugfixes 🐛
+----------
+ - Fixes non sans-serif font weights being ignored ([#3907](https://github.com/vector-im/element-android/issues/3907))
+ - Fixing missing/intermittent notifications on the google play variant when wifi is enabled ([#5038](https://github.com/vector-im/element-android/issues/5038))
+ - Fixes call statuses in the timeline for missed/rejected calls and connected calls. ([#5088](https://github.com/vector-im/element-android/issues/5088))
+ - Fix fallback permalink when threads are disabled ([#5128](https://github.com/vector-im/element-android/issues/5128))
+ - Analytics: aligns use case identifying with iOS implementation ([#5142](https://github.com/vector-im/element-android/issues/5142))
+ - Fix location rendering in timeline if map cannot be loaded ([#5143](https://github.com/vector-im/element-android/issues/5143))
+
+Other changes
+-------------
+ - "Invite users to space" dialog now closed when user choose invite method ([#4295](https://github.com/vector-im/element-android/issues/4295))
+ - Changed layout for space card and room card used at "explore room" screen and space/room invite dialogs ([#4304](https://github.com/vector-im/element-android/issues/4304))
+ - Removed spaces restricted search hint dialogs ([#4315](https://github.com/vector-im/element-android/issues/4315))
+ - Remove Search from room options if not available ([#4641](https://github.com/vector-im/element-android/issues/4641))
+ - Qr code scanning fragments merged into one ([#4873](https://github.com/vector-im/element-android/issues/4873))
+ - Fix CI/CD errors after merges for quality and integration tests ([#5118](https://github.com/vector-im/element-android/issues/5118))
+ - Added automation for the Z-FTUE label to add issues to the FTUE Project Board ([#5120](https://github.com/vector-im/element-android/issues/5120))
+ - Added automation for WTF labels to move to WTF project board ([#5148](https://github.com/vector-im/element-android/issues/5148))
+ - Update WTF automation to fix it ([#5173](https://github.com/vector-im/element-android/issues/5173))
+
+
 Changes in Element v1.3.18 (2022-02-03)
 =======================================
 
diff --git a/README.md b/README.md
index dedc9da2dd..d784841e2c 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,8 @@ 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 build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) Nighly sanity test status: [![allScreensTest](https://github.com/vector-im/element-android/actions/workflows/sanity_test.yml/badge.svg)](https://github.com/vector-im/element-android/actions/workflows/sanity_test.yml)
+
 
 # New Android SDK
 
diff --git a/build.gradle b/build.gradle
index 5fdeba24de..2ac948f0a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,6 +36,12 @@ allprojects {
     apply plugin: "org.jlleitschuh.gradle.ktlint"
 
     repositories {
+        mavenCentral {
+            content {
+                groups.mavenCentral.regex.each { includeGroupByRegex it }
+                groups.mavenCentral.group.each { includeGroup it }
+            }
+        }
         maven {
             url 'https://jitpack.io'
             content {
@@ -59,12 +65,6 @@ allprojects {
                 groups.google.group.each { includeGroup it }
             }
         }
-        mavenCentral {
-            content {
-                groups.mavenCentral.regex.each { includeGroupByRegex it }
-                groups.mavenCentral.group.each { includeGroup it }
-            }
-        }
         //noinspection JcenterRepositoryObsolete
         jcenter {
             content {
@@ -144,6 +144,11 @@ project(":diff-match-patch") {
     }
 }
 
+// Global configurations across all modules
+ext {
+    isThreadingEnabled = true
+}
+
 //project(":matrix-sdk-android") {
 //    sonarqube {
 //        properties {
diff --git a/docs/ui-tests.md b/docs/ui-tests.md
index 6ebb52abe8..05eb50f525 100644
--- a/docs/ui-tests.md
+++ b/docs/ui-tests.md
@@ -104,3 +104,76 @@ fun initAccount() {
   existingSession = createAccountAndSync(matrix, userName, password, true)
 }
 ```
+
+### Contributing to the UiAllScreensSanityTest
+
+The `UiAllScreensSanityTest` makes use of the Robot pattern in order to model pages, components and interactions.
+Each Robot aims to return the UI back to its original state after the interaction, allowing for a reusable and consistent DSL.
+
+```kotlin
+// launches and closes settings after executing the block
+elementRobot.settings {
+    // whilst in the settings, launches and closes the advanced settings sub screen
+    advancedSettings {
+        // crawls all the pages within the advanced settings
+        crawl()
+    }
+}
+
+// enables developer mode by navigating to the settings, enabling the toggle and then returning to the starting point to execute the block
+// on block completion the Robot disables developer mode by navigating back to the settings and finally returning to the original starting point
+elementRobot.withDeveloperMode {
+    // the same starting point as the example above
+    settings {
+        advancedSettings { crawlDeveloperOptions() }
+    }
+}
+```
+
+The Robots used in the example above...
+
+```kotlin
+class ElementRobot {
+    fun settings(block: SettingsRobot.() -> Unit) {
+        // double check we're where we think we are
+        waitUntilViewVisible(withId(R.id.bottomNavigationView))
+
+        // navigate to the settings
+        openDrawer()
+        clickOn(R.id.homeDrawerHeaderSettingsView)
+
+        // execute the robot with the context of the settings screen
+        block(SettingsRobot())
+
+        // close the settings and ensure we're back at the starting point
+        pressBack()
+        waitUntilViewVisible(withId(R.id.bottomNavigationView))
+    }
+
+    fun withDeveloperMode(block: ElementRobot.() -> Unit) {
+        settings { toggleDeveloperMode() }
+        block()
+        settings { toggleDeveloperMode() }
+    }
+}
+
+class SettingsRobot {
+    fun toggleDeveloperMode() {
+        advancedSettings {
+            toggleDeveloperMode()
+        }
+    }
+
+    fun advancedSettings(block: SettingsAdvancedRobot.() -> Unit) {
+        clickOn(R.string.settings_advanced_settings)
+        block(SettingsAdvancedRobot())
+        pressBack()
+    }
+}
+
+class SettingsAdvancedRobot {
+    fun toggleDeveloperMode() {
+        clickOn(R.string.settings_developer_mode_summary)
+    }
+}
+```
\ No newline at end of file
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40103160.txt b/fastlane/metadata/android/cs-CZ/changelogs/40103160.txt
new file mode 100644
index 0000000000..3701cfe4ac
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Odeslání vlastní polohy do libovolné místnosti. Možnost úpravy hlasování.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40103170.txt b/fastlane/metadata/android/cs-CZ/changelogs/40103170.txt
new file mode 100644
index 0000000000..73ec686cb1
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: odeslání svojí polohy do libovolné místnosti. Úpravy anket.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40103180.txt b/fastlane/metadata/android/cs-CZ/changelogs/40103180.txt
new file mode 100644
index 0000000000..502b318b3e
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: odeslání svojí polohy do libovolné místnosti. Úpravy anket.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/de-DE/changelogs/40103160.txt b/fastlane/metadata/android/de-DE/changelogs/40103160.txt
new file mode 100644
index 0000000000..78fac9a7c2
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Hauptänderungen: Du kannst ab sofort deinen Standort an deine Räume senden und Abstimmungen bearbeiten.
+Alle Änderungen: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/de-DE/changelogs/40103170.txt b/fastlane/metadata/android/de-DE/changelogs/40103170.txt
new file mode 100644
index 0000000000..4a93cfca52
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Wichtigste Änderungen in dieser Version: Versende deinen Standort an jeden Raum deiner Wahl. Bearbeite Umfragen.
+Alle Änderungen: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/de-DE/changelogs/40103180.txt b/fastlane/metadata/android/de-DE/changelogs/40103180.txt
new file mode 100644
index 0000000000..28c954f326
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Wichtigste Änderungen in dieser Version: Versende deinen Standort an jeden Raum deiner Wahl. Bearbeite Umfragen.
+Alle Änderungen: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/en-US/changelogs/40104000.txt b/fastlane/metadata/android/en-US/changelogs/40104000.txt
new file mode 100644
index 0000000000..4492b78882
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Initial implementation of thread messages. Message bubbles.
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.4.0
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40104020.txt b/fastlane/metadata/android/en-US/changelogs/40104020.txt
new file mode 100644
index 0000000000..82d3197db3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104020.txt
@@ -0,0 +1,2 @@
+Main changes in this version: add support to @room and undisclosed polls among many other little changes.
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.4.2
\ No newline at end of file
diff --git a/fastlane/metadata/android/et/changelogs/40103160.txt b/fastlane/metadata/android/et/changelogs/40103160.txt
new file mode 100644
index 0000000000..76f1abbeca
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: oma asukoha saatmine jututuppa ja küsitluste muutmise võimalus.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/et/changelogs/40103170.txt b/fastlane/metadata/android/et/changelogs/40103170.txt
new file mode 100644
index 0000000000..0dda39444a
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: oma asukoha saatmine jututuppa ja küsitluste muutmise võimalus.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/et/changelogs/40103180.txt b/fastlane/metadata/android/et/changelogs/40103180.txt
new file mode 100644
index 0000000000..55f251f454
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: oma asukoha saatmine jututuppa ja küsitluste muutmise võimalus.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/fa/changelogs/40103130.txt b/fastlane/metadata/android/fa/changelogs/40103130.txt
new file mode 100644
index 0000000000..9a67eebd44
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40103130.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارشنخستین تغییر در صفحه‌های راه‌اندازی شامل وارد شدن به تجزیه‌ها. پشتیبانی از رویدادهایی با ریاضیات افزوده در آزمایشگاه‌ها.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/fa/changelogs/40103140.txt b/fastlane/metadata/android/fa/changelogs/40103140.txt
new file mode 100644
index 0000000000..e4b01ecd11
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40103140.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارشنخستین تغییر در صفحه‌های راه‌اندازی شامل وارد شدن به تجزیه‌ها. پشتیبانی از رویدادهایی با ریاضیات افزوده در آزمایشگاه‌ها.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.3.14
diff --git a/fastlane/metadata/android/fa/changelogs/40103150.txt b/fastlane/metadata/android/fa/changelogs/40103150.txt
new file mode 100644
index 0000000000..e10ddf156c
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40103150.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارشنخستین تغییر در صفحه‌های راه‌اندازی شامل وارد شدن به تجزیه‌ها. پشتیبانی از رویدادهایی با ریاضیات افزوده در آزمایشگاه‌ها.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.3.15
diff --git a/fastlane/metadata/android/fa/changelogs/40103160.txt b/fastlane/metadata/android/fa/changelogs/40103160.txt
new file mode 100644
index 0000000000..0699f4536d
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: فرستادن مکانتان به هر اتاقی. ویرایش نظرسنجی.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/fa/changelogs/40103170.txt b/fastlane/metadata/android/fa/changelogs/40103170.txt
new file mode 100644
index 0000000000..55769b8a12
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: فرستادن مکانتان به هر اتاقی. ویرایش نظرسنجی.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/fa/changelogs/40103180.txt b/fastlane/metadata/android/fa/changelogs/40103180.txt
new file mode 100644
index 0000000000..529da3f5a4
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: فرستادن مکانتان به هر اتاقی. ویرایش نظرسنجی.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40103130.txt b/fastlane/metadata/android/fr-FR/changelogs/40103130.txt
new file mode 100644
index 0000000000..ba950fe819
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40103130.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Premier changement dans l’écran de bienvenue, y compris l’adhésion aux données d’analyses. Support des événements avec opération mathématiques ajoutées dans les labs.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40103140.txt b/fastlane/metadata/android/fr-FR/changelogs/40103140.txt
new file mode 100644
index 0000000000..24779bc59e
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40103140.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Premier changement dans l’écran de bienvenue, y compris l’adhésion aux données d’analyses. Support des événements avec opération mathématiques ajoutées dans les labs.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.3.14
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40103150.txt b/fastlane/metadata/android/fr-FR/changelogs/40103150.txt
new file mode 100644
index 0000000000..32fe3f6593
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40103150.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Premier changement dans l’écran de bienvenue, y compris l’adhésion aux données d’analyses. Support des événements avec opération mathématiques ajoutées dans les labs.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.3.15
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40103160.txt b/fastlane/metadata/android/fr-FR/changelogs/40103160.txt
new file mode 100644
index 0000000000..a7437a1f10
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : envoi de votre position dans n’importe quelle salon. Édition des sondage.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40103160.txt b/fastlane/metadata/android/hu-HU/changelogs/40103160.txt
new file mode 100644
index 0000000000..204a224222
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: földrajzi helyzet küldése bármely szobába. Szavazás szerkesztése
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40103170.txt b/fastlane/metadata/android/hu-HU/changelogs/40103170.txt
new file mode 100644
index 0000000000..7882ee3eed
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: földrajzi helyzet elküldése bármelyik szobába. Szavazás szerkesztése.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40103180.txt b/fastlane/metadata/android/hu-HU/changelogs/40103180.txt
new file mode 100644
index 0000000000..0630b8ba11
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: földrajzi helyzet elküldése bármelyik szobába. Szavazás szerkesztése.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/id/changelogs/40100100.txt b/fastlane/metadata/android/id/changelogs/40100100.txt
index 96a8f506b3..d4294758d8 100644
--- a/fastlane/metadata/android/id/changelogs/40100100.txt
+++ b/fastlane/metadata/android/id/changelogs/40100100.txt
@@ -1,2 +1,2 @@
 Versi baru ini terutama berisi perbaikan bug dan peningkatan. Mengirim pesan sekarang jauh lebih cepat.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.10
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.10
diff --git a/fastlane/metadata/android/id/changelogs/40100110.txt b/fastlane/metadata/android/id/changelogs/40100110.txt
index 9f86005d8b..07e969581c 100644
--- a/fastlane/metadata/android/id/changelogs/40100110.txt
+++ b/fastlane/metadata/android/id/changelogs/40100110.txt
@@ -1,2 +1,2 @@
 Versi baru ini terutama berisi antarmuka pengguna dan peningkatan pengalaman pengguna. Sekarang Anda dapat mengundang teman, dan membuat sebuah DM sangat cepat dengan memindai kode QR.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.11
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/id/changelogs/40100120.txt b/fastlane/metadata/android/id/changelogs/40100120.txt
index 3067b6367d..18adabfdcd 100644
--- a/fastlane/metadata/android/id/changelogs/40100120.txt
+++ b/fastlane/metadata/android/id/changelogs/40100120.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Pratinjau URL, keyboard Emoji baru, kemampuan pengaturan ruangan baru, dan salju untuk Natal!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.12
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/id/changelogs/40100130.txt b/fastlane/metadata/android/id/changelogs/40100130.txt
index df52988b6c..f94db4d7cd 100644
--- a/fastlane/metadata/android/id/changelogs/40100130.txt
+++ b/fastlane/metadata/android/id/changelogs/40100130.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Pratinjau URL, keyboard Emoji baru, kemampuan pengaturan ruangan baru, dan salju untuk Natal!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.13
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/id/changelogs/40100140.txt b/fastlane/metadata/android/id/changelogs/40100140.txt
index 5243adc1a8..e1ef504cd9 100644
--- a/fastlane/metadata/android/id/changelogs/40100140.txt
+++ b/fastlane/metadata/android/id/changelogs/40100140.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Edit izin ruangan, tema cahaya/gelap otomatis, dan banyak perbaikan bug.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.14
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/id/changelogs/40100150.txt b/fastlane/metadata/android/id/changelogs/40100150.txt
index 54c307b9b6..eaf8e1a715 100644
--- a/fastlane/metadata/android/id/changelogs/40100150.txt
+++ b/fastlane/metadata/android/id/changelogs/40100150.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Dukungan login sosial.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.15
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/id/changelogs/40100160.txt b/fastlane/metadata/android/id/changelogs/40100160.txt
index 3e357db352..0a6d42f8f6 100644
--- a/fastlane/metadata/android/id/changelogs/40100160.txt
+++ b/fastlane/metadata/android/id/changelogs/40100160.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Dukungan login sosial.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.15 dan https://github.com/vector-im/element-android/releases/tag/v1.0.16
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.15 dan https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/id/changelogs/40100170.txt b/fastlane/metadata/android/id/changelogs/40100170.txt
index 77f638a7fd..a2bd48f2c3 100644
--- a/fastlane/metadata/android/id/changelogs/40100170.txt
+++ b/fastlane/metadata/android/id/changelogs/40100170.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: perbaikan bug!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.17
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/id/changelogs/40101000.txt b/fastlane/metadata/android/id/changelogs/40101000.txt
index acfe661354..737f9b63ac 100644
--- a/fastlane/metadata/android/id/changelogs/40101000.txt
+++ b/fastlane/metadata/android/id/changelogs/40101000.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: perbaikan VoIP (panggilan audio dan video dalam DM) dan perbaikan bug!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.0
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/id/changelogs/40101010.txt b/fastlane/metadata/android/id/changelogs/40101010.txt
index a9903a90bd..be22d21c32 100644
--- a/fastlane/metadata/android/id/changelogs/40101010.txt
+++ b/fastlane/metadata/android/id/changelogs/40101010.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: peningkatan kinerja dan perbaikan bug!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.1
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/id/changelogs/40101020.txt b/fastlane/metadata/android/id/changelogs/40101020.txt
index d654bda4fe..394f48c171 100644
--- a/fastlane/metadata/android/id/changelogs/40101020.txt
+++ b/fastlane/metadata/android/id/changelogs/40101020.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: peningkatan kinerja dan perbaikan bug!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.2
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/id/changelogs/40101030.txt b/fastlane/metadata/android/id/changelogs/40101030.txt
index 283c201b2f..aa1e725b46 100644
--- a/fastlane/metadata/android/id/changelogs/40101030.txt
+++ b/fastlane/metadata/android/id/changelogs/40101030.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: peningkatan kinerja dan perbaikan bug!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.3
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/id/changelogs/40101040.txt b/fastlane/metadata/android/id/changelogs/40101040.txt
index fdb94db53d..97eddf643d 100644
--- a/fastlane/metadata/android/id/changelogs/40101040.txt
+++ b/fastlane/metadata/android/id/changelogs/40101040.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: peningkatan kinerja dan perbaikan bug!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.4
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/id/changelogs/40101050.txt b/fastlane/metadata/android/id/changelogs/40101050.txt
index 856530c703..fe745e06d1 100644
--- a/fastlane/metadata/android/id/changelogs/40101050.txt
+++ b/fastlane/metadata/android/id/changelogs/40101050.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: perbaikan hot-fix untuk 1.1.4
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.5
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/id/changelogs/40101060.txt b/fastlane/metadata/android/id/changelogs/40101060.txt
index 1810ecc3aa..2e01d640f7 100644
--- a/fastlane/metadata/android/id/changelogs/40101060.txt
+++ b/fastlane/metadata/android/id/changelogs/40101060.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: perbaikan hot-fix untuk 1.1.5
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.6
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/id/changelogs/40101070.txt b/fastlane/metadata/android/id/changelogs/40101070.txt
index 0087d51703..7449ef81c2 100644
--- a/fastlane/metadata/android/id/changelogs/40101070.txt
+++ b/fastlane/metadata/android/id/changelogs/40101070.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: dukungan beta untuk Spaces. Kompres video sebelum mengirim.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.7
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.7
diff --git a/fastlane/metadata/android/id/changelogs/40101080.txt b/fastlane/metadata/android/id/changelogs/40101080.txt
index cb98796449..737298a081 100644
--- a/fastlane/metadata/android/id/changelogs/40101080.txt
+++ b/fastlane/metadata/android/id/changelogs/40101080.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: perbaikan untuk Spaces.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.8
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.8
diff --git a/fastlane/metadata/android/id/changelogs/40101090.txt b/fastlane/metadata/android/id/changelogs/40101090.txt
index f6f535fe64..040cbac3b0 100644
--- a/fastlane/metadata/android/id/changelogs/40101090.txt
+++ b/fastlane/metadata/android/id/changelogs/40101090.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: menambahkan dukungan untuk jaringan gitter.im.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.9
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.9
diff --git a/fastlane/metadata/android/id/changelogs/40101100.txt b/fastlane/metadata/android/id/changelogs/40101100.txt
index 121d84ca50..2c13314610 100644
--- a/fastlane/metadata/android/id/changelogs/40101100.txt
+++ b/fastlane/metadata/android/id/changelogs/40101100.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: pembaruan tema dan gaya dan fitur-fitur baru untuk Spaces.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.10
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.10
diff --git a/fastlane/metadata/android/id/changelogs/40101110.txt b/fastlane/metadata/android/id/changelogs/40101110.txt
index 63c97253c4..7930471cb9 100644
--- a/fastlane/metadata/android/id/changelogs/40101110.txt
+++ b/fastlane/metadata/android/id/changelogs/40101110.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: pembaruan tema dan gaya dan fitur baru untuk spaces (perbaikan bug untuk 1.1.10)
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.11
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.11
diff --git a/fastlane/metadata/android/id/changelogs/40101120.txt b/fastlane/metadata/android/id/changelogs/40101120.txt
index b8f23c530b..6fd0e25502 100644
--- a/fastlane/metadata/android/id/changelogs/40101120.txt
+++ b/fastlane/metadata/android/id/changelogs/40101120.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: pembaruan tema dan gaya dan perbaiki crash setelah panggilan video
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.12
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.12
diff --git a/fastlane/metadata/android/id/changelogs/40101130.txt b/fastlane/metadata/android/id/changelogs/40101130.txt
index 51c532725b..0fca5b3563 100644
--- a/fastlane/metadata/android/id/changelogs/40101130.txt
+++ b/fastlane/metadata/android/id/changelogs/40101130.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: terutama pembaruan stabilitas dan perbaikan bug.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.13
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.13
diff --git a/fastlane/metadata/android/id/changelogs/40101140.txt b/fastlane/metadata/android/id/changelogs/40101140.txt
index af1e203dde..60b041b8e7 100644
--- a/fastlane/metadata/android/id/changelogs/40101140.txt
+++ b/fastlane/metadata/android/id/changelogs/40101140.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: memperbaiki masalah tentang pesan terenkripsi.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.14
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.14
diff --git a/fastlane/metadata/android/id/changelogs/40101150.txt b/fastlane/metadata/android/id/changelogs/40101150.txt
index f3aec557d0..2411b62b5f 100644
--- a/fastlane/metadata/android/id/changelogs/40101150.txt
+++ b/fastlane/metadata/android/id/changelogs/40101150.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: implementasi pesan suara dalam pengaturan labs.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.15
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.15
diff --git a/fastlane/metadata/android/id/changelogs/40101160.txt b/fastlane/metadata/android/id/changelogs/40101160.txt
index 19209bacf2..0a829a9262 100644
--- a/fastlane/metadata/android/id/changelogs/40101160.txt
+++ b/fastlane/metadata/android/id/changelogs/40101160.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Memperbaiki kesalahan saat mengirim pesan terenkripsi jika seseorang yang ada di ruangan keluar.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.16
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/id/changelogs/40102000.txt b/fastlane/metadata/android/id/changelogs/40102000.txt
index f7d93e2e4f..745c46dc18 100644
--- a/fastlane/metadata/android/id/changelogs/40102000.txt
+++ b/fastlane/metadata/android/id/changelogs/40102000.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Pesan Suara diaktifkan secara default
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.2.0
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.2.0
diff --git a/fastlane/metadata/android/id/changelogs/40102010.txt b/fastlane/metadata/android/id/changelogs/40102010.txt
index e77f0327b0..e68a571226 100644
--- a/fastlane/metadata/android/id/changelogs/40102010.txt
+++ b/fastlane/metadata/android/id/changelogs/40102010.txt
@@ -1,2 +1,2 @@
 Perubahan utama di versi ini: Banyak perbaikan di VoIP dan Space (masih beta).
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.2.1
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.2.1
diff --git a/fastlane/metadata/android/id/changelogs/40103000.txt b/fastlane/metadata/android/id/changelogs/40103000.txt
index bf7b5d8d5d..7192c3ba30 100644
--- a/fastlane/metadata/android/id/changelogs/40103000.txt
+++ b/fastlane/metadata/android/id/changelogs/40103000.txt
@@ -1,2 +1,2 @@
 Perubahan utama di versi ini: Organisir ruangan Anda menggunakan sebuah Space!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.0
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.0
diff --git a/fastlane/metadata/android/id/changelogs/40103020.txt b/fastlane/metadata/android/id/changelogs/40103020.txt
index 4f46881d68..2eb358b980 100644
--- a/fastlane/metadata/android/id/changelogs/40103020.txt
+++ b/fastlane/metadata/android/id/changelogs/40103020.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Penambahan dukungan untuk Android Auto. Banyak perbaikan bug!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.2
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.2
diff --git a/fastlane/metadata/android/id/changelogs/40103030.txt b/fastlane/metadata/android/id/changelogs/40103030.txt
index 630593a107..9324b44a3a 100644
--- a/fastlane/metadata/android/id/changelogs/40103030.txt
+++ b/fastlane/metadata/android/id/changelogs/40103030.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Membuat kebijakan server identitas terlihat di pengaturan. Menghilangkan dukungan Android Auto untuk sementara.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.3
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.3
diff --git a/fastlane/metadata/android/id/changelogs/40103040.txt b/fastlane/metadata/android/id/changelogs/40103040.txt
index 0641f72ffd..00987013ac 100644
--- a/fastlane/metadata/android/id/changelogs/40103040.txt
+++ b/fastlane/metadata/android/id/changelogs/40103040.txt
@@ -1,2 +1,2 @@
 Perubahan utama di versi ini: Tambahkan dukungan presensi, untuk ruangan Pesan Langsung (diingat bahwa presensi dinonaktifkan di matrix.org). Tambahkan lagi dukungan Android Auto.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.4
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.4
diff --git a/fastlane/metadata/android/id/changelogs/40103050.txt b/fastlane/metadata/android/id/changelogs/40103050.txt
index ec7c9423bf..dbca8cc0db 100644
--- a/fastlane/metadata/android/id/changelogs/40103050.txt
+++ b/fastlane/metadata/android/id/changelogs/40103050.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Tambahkan dukungan presensi, untuk ruangan Pesan Langsung (diingat bahwa presensi dinonaktifkan di matrix.org). Tambahkan lagi dukungan Android Auto.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.5
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.5
diff --git a/fastlane/metadata/android/id/changelogs/40103060.txt b/fastlane/metadata/android/id/changelogs/40103060.txt
index 4265699d2f..18f81838ff 100644
--- a/fastlane/metadata/android/id/changelogs/40103060.txt
+++ b/fastlane/metadata/android/id/changelogs/40103060.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Tambahkan dukungan presensi, untuk ruangan Pesan Langsung (catatan: presensi dinonaktifkan di matrix.org). Tambahkan lagi dukungan Android Auto.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.6
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.6
diff --git a/fastlane/metadata/android/id/changelogs/40103100.txt b/fastlane/metadata/android/id/changelogs/40103100.txt
index 39d127cd93..0254c176ee 100644
--- a/fastlane/metadata/android/id/changelogs/40103100.txt
+++ b/fastlane/metadata/android/id/changelogs/40103100.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Dukungan untuk fitur poll (dalam Uji Coba), dan desain tampilan URL baru.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.10
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.10
diff --git a/fastlane/metadata/android/id/changelogs/40103110.txt b/fastlane/metadata/android/id/changelogs/40103110.txt
index 725e58d957..3b325f7f03 100644
--- a/fastlane/metadata/android/id/changelogs/40103110.txt
+++ b/fastlane/metadata/android/id/changelogs/40103110.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Perbaikan bug!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.11
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.11
diff --git a/fastlane/metadata/android/id/changelogs/40103120.txt b/fastlane/metadata/android/id/changelogs/40103120.txt
index 9a5dc8026c..c765575ad7 100644
--- a/fastlane/metadata/android/id/changelogs/40103120.txt
+++ b/fastlane/metadata/android/id/changelogs/40103120.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Perbaikan bug!
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.12
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.12
diff --git a/fastlane/metadata/android/id/changelogs/40103130.txt b/fastlane/metadata/android/id/changelogs/40103130.txt
index 26a784d62a..2b81855beb 100644
--- a/fastlane/metadata/android/id/changelogs/40103130.txt
+++ b/fastlane/metadata/android/id/changelogs/40103130.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Perubahan pertama di layar permulaan, termasuk analitik opt-in. Dukungan untuk Peristiwa dengan Matematika ditambahkan di Uji Coba.
-Changelog lanjutan:
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/id/changelogs/40103140.txt b/fastlane/metadata/android/id/changelogs/40103140.txt
index dfefff307f..cabf0750e0 100644
--- a/fastlane/metadata/android/id/changelogs/40103140.txt
+++ b/fastlane/metadata/android/id/changelogs/40103140.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Perubahan pertama di layar permulaan, termasuk analitik opt-in. Dukungan untuk Peristiwa dengan Matematika ditambahkan di Uji Coba.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.14
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.14
diff --git a/fastlane/metadata/android/id/changelogs/40103150.txt b/fastlane/metadata/android/id/changelogs/40103150.txt
index c46e661d47..27fc93215b 100644
--- a/fastlane/metadata/android/id/changelogs/40103150.txt
+++ b/fastlane/metadata/android/id/changelogs/40103150.txt
@@ -1,2 +1,2 @@
 Perubahan utama dalam versi ini: Perubahan pertama di layar permulaan, termasuk analitik opt-in. Dukungan untuk Peristiwa dengan Matematika ditambahkan di Uji Coba.
-Changelog lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.15
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.15
diff --git a/fastlane/metadata/android/id/changelogs/40103160.txt b/fastlane/metadata/android/id/changelogs/40103160.txt
new file mode 100644
index 0000000000..418853bb2c
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Kirim lokasi Anda ke ruangan apa saja. Pengeditan pemungutan suara.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/id/changelogs/40103170.txt b/fastlane/metadata/android/id/changelogs/40103170.txt
new file mode 100644
index 0000000000..eebdcf5858
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: kirim lokasi Anda ke ruangan apa saja. Pengeditan pemungutan suara.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/id/changelogs/40103180.txt b/fastlane/metadata/android/id/changelogs/40103180.txt
new file mode 100644
index 0000000000..6ec4c2c1bc
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: kirim lokasi Anda ke ruangan apa saja. Pengeditan pemungutan suara.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/it-IT/changelogs/40103160.txt b/fastlane/metadata/android/it-IT/changelogs/40103160.txt
new file mode 100644
index 0000000000..fae2b8f1f9
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: invia la tua posizione in qualsiasi stanza. Modifica sondaggi.
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/it-IT/changelogs/40103170.txt b/fastlane/metadata/android/it-IT/changelogs/40103170.txt
new file mode 100644
index 0000000000..f490bc3f0d
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: invia la tua posizione in qualsiasi stanza. Modifica dei sondaggi.
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/it-IT/changelogs/40103180.txt b/fastlane/metadata/android/it-IT/changelogs/40103180.txt
new file mode 100644
index 0000000000..9872ddcb9b
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: invia la tua posizione in qualsiasi stanza. Modifica dei sondaggi.
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/iw-IL/changelogs/40103180.txt b/fastlane/metadata/android/iw-IL/changelogs/40103180.txt
new file mode 100644
index 0000000000..9649c6839c
--- /dev/null
+++ b/fastlane/metadata/android/iw-IL/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+שינויים עיקריים בגרסה זו: שלח את המיקום שלך לכל חדר. ערוך סקר.
+יומן שינויים מלא: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/iw-IL/full_description.txt b/fastlane/metadata/android/iw-IL/full_description.txt
index fe3bc16661..1545634b33 100644
--- a/fastlane/metadata/android/iw-IL/full_description.txt
+++ b/fastlane/metadata/android/iw-IL/full_description.txt
@@ -28,3 +28,6 @@
 <b> תקשורת מלאה </b>: הודעות, שיחות קול ווידאו, שיתוף קבצים, שיתוף מסך וחבורה שלמה של אינטגרציות, בוטים ווידג'טים. לבנות חדרים, קהילות, לשמור על קשר ולעשות דברים.
 
 <b> בכל מקום שאתה נמצא </b>: הישאר בקשר בכל מקום שאתה נמצא עם היסטוריית הודעות מסונכרנת לחלוטין בכל המכשירים שלך באינטרנט בכתובת https://app.element.io.
+
+<b>קוד פתוח</b>: 
+Element Android הוא פרויקט קוד פתוח, המתארח על ידי GitHub. נא לדווח על באגים ו/או לתרום לפיתוחה בכתובת https://github.com/vector-im/element-android
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40100100.txt b/fastlane/metadata/android/ja-JP/changelogs/40100100.txt
index 8359a12964..48af96d216 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40100100.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40100100.txt
@@ -1,2 +1,2 @@
 今回の新バージョンでは、主にバグの修正と改善が行われています。メッセージの送信がより速くなりました。
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.10
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.10
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40100110.txt b/fastlane/metadata/android/ja-JP/changelogs/40100110.txt
index c93db421af..b8b9798fcd 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40100110.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40100110.txt
@@ -1,2 +1,2 @@
 今回の新バージョンでは、主にUI（ユーザーインターフェース）とUX（ユーザーエクスペリエンス）の向上が図られています。友達を招待したり、QRコードを読み取って素早くDMを作成できるようになりました。
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.11
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40100120.txt b/fastlane/metadata/android/ja-JP/changelogs/40100120.txt
index aace2ef79f..01c33c5d52 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40100120.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40100120.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: URLプレビュー、新しい絵文字、新しいルーム設定機能、それにクリスマスには雪が！
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.12
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40100130.txt b/fastlane/metadata/android/ja-JP/changelogs/40100130.txt
index 97633621c5..941a052239 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40100130.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40100130.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: URLプレビュー、新しい絵文字、新しいルーム設定機能、それにクリスマスには雪が！
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.13
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40100140.txt b/fastlane/metadata/android/ja-JP/changelogs/40100140.txt
index c340663127..6dc536cdcf 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40100140.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40100140.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: 部屋の許可、自動のテーマ切替、そして多くのバグを修正しました。
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.14
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40100150.txt b/fastlane/metadata/android/ja-JP/changelogs/40100150.txt
index 42f28c7bea..caded1b8ed 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40100150.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40100150.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: ソーシャルログインに対応しました。
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.15
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40100160.txt b/fastlane/metadata/android/ja-JP/changelogs/40100160.txt
index 8b5196998a..1b1a2092b0 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40100160.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40100160.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.15 and https://github.com/vector-im/element-android/releases/tag/v1.0.16
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.15 and https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40100170.txt b/fastlane/metadata/android/ja-JP/changelogs/40100170.txt
index 586b01cb2b..a0cc7b107d 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40100170.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40100170.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: バグの修正！
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.17
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40101000.txt b/fastlane/metadata/android/ja-JP/changelogs/40101000.txt
index 25bbd7ab87..d0900f38c2 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40101000.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40101000.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.0
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40101010.txt b/fastlane/metadata/android/ja-JP/changelogs/40101010.txt
index 35ba933069..cb204e5696 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40101010.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40101010.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.1
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40101020.txt b/fastlane/metadata/android/ja-JP/changelogs/40101020.txt
index 88e3c79ca8..bb6ab66525 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40101020.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40101020.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.2
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40101030.txt b/fastlane/metadata/android/ja-JP/changelogs/40101030.txt
index 87d191b226..e7ecc05a0f 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40101030.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40101030.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.3
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40101160.txt b/fastlane/metadata/android/ja-JP/changelogs/40101160.txt
index a498487f46..985ea10510 100644
--- a/fastlane/metadata/android/ja-JP/changelogs/40101160.txt
+++ b/fastlane/metadata/android/ja-JP/changelogs/40101160.txt
@@ -1,2 +1,2 @@
 このバージョンの主な変更点:ルームにて誰かがログアウトした際に発生するエラーを修正しました。
-すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.16
+全ての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40103160.txt b/fastlane/metadata/android/ja-JP/changelogs/40103160.txt
new file mode 100644
index 0000000000..5475828623
--- /dev/null
+++ b/fastlane/metadata/android/ja-JP/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点：ルームへのロケーションの送信。投票機能の変更。
+更新履歴：https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40103170.txt b/fastlane/metadata/android/ja-JP/changelogs/40103170.txt
new file mode 100644
index 0000000000..61b91b54c0
--- /dev/null
+++ b/fastlane/metadata/android/ja-JP/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点：ルームへのロケーションの送信。投票機能の変更。
+更新履歴：https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40103180.txt b/fastlane/metadata/android/ja-JP/changelogs/40103180.txt
new file mode 100644
index 0000000000..ae4f1a0a0f
--- /dev/null
+++ b/fastlane/metadata/android/ja-JP/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点：ルームへのロケーションの送信。投票機能の変更。
+更新履歴：https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/ja-JP/full_description.txt b/fastlane/metadata/android/ja-JP/full_description.txt
index 4e7b01cce3..6014938cce 100644
--- a/fastlane/metadata/android/ja-JP/full_description.txt
+++ b/fastlane/metadata/android/ja-JP/full_description.txt
@@ -1,39 +1,42 @@
-Elementはセキュアなメッセンジャーであると同時に、リモートワークでのグループチャットにも最適です。エンドツーエンドの暗号化を使用して、強力なビデオ会議、ファイル共有、音声通話を提供します。
+Elementは、安全なメッセンジャー、リモートワーク中のグループチャットに適したチームコラボレーションアプリです。エンドツーエンドの暗号化を使用して、強力なビデオ会議、ファイル共有、音声通話を提供します。
 
 <b>Elementの特徴</b>
 - 高度なオンラインコミュニケーションツール
-- 完全に暗号化されたメッセージ
+- 完全に暗号化されたメッセージにより、リモートワーカーでも、より安全な企業コミュニケーションが可能
 - Matrixオープンソースフレームワークをベースにした分散型のチャット
 - プロジェクトを管理しながら、暗号化されたデータで安全にファイル共有
 - Voice over IPによるビデオチャットと画面共有
-- お気に入りのオンラインコラボレーションツール、プロジェクト管理ツール、VoIPサービス、その他のチームメッセージングアプリと統合可能
+- お気に入りのオンラインコラボレーションツール、プロジェクト管理ツール、VoIPサービス、その他のチームメッセージングアプリと簡単に統合可能
 
-Elementは他のメッセージングアプリやコラボレーションアプリとは異なります。安全なメッセージングと分散型（非中央集権）コミュニケーションのためのオープンネットワークであるMatrixで動作します。また、ユーザーが自分のデータやメッセージを最大限にコントロールできるように、セルフホスティングも可能です。
+Elementは他のメッセージングアプリやコラボレーションアプリとは全く異なります。安全なメッセージングと分散型（非中央集権）コミュニケーションのためのオープンネットワークであるMatrixで動作します。ユーザーが自分のデータやメッセージを最大限にコントロールできるように、セルフホスティングも可能です。
 
-<b>プライバシーと暗号化されたやりとり</b>
-Elementは、望ましくない広告、データマイニング、ウォールドガーデンからユーザーを保護します。また、エンド・ツー・エンドの暗号化と相互署名されたデバイスの検証により、すべてのデータ、1対1のビデオおよび音声通信を保護します。
+<b>プライバシーと暗号化されたコミュニケーション</b>
+Elementは、望ましくない広告、データマイニング、ウォールドガーデンからユーザーを保護します。また、エンド・ツー・エンドの暗号化と相互署名された端末の検証により、全てのデータ、1対1のビデオおよび音声通信を保護します。
 
-Elementは、Slackなどのアプリと統合することで、Matrixネットワーク上の誰とでも安全にコミュニケーションをとることができると同時に、プライバシーをコントロールすることができます。
+Elementは、Slackなどのアプリと統合することで、Matrixネットワーク上の誰とでも安全にコミュニケーションを取ることができると同時に、プライバシーをコントロールすることができます。
 
 <b>Elementはセルフホスティングが可能</b>
-機密データや会話の管理を強化するために、Elementはセルフホスティングが可能で、オープンソースの分散型コミュニケーションの標準であるマトリックスベースのホストを選択することもできます。Elementは、プライバシー、セキュリティコンプライアンス、および統合の柔軟性を提供します。
+機密データや会話の管理を強化するために、Elementはセルフホスティングが可能です。または、オープンソースの分散型コミュニケーションの標準であるMatrixベースのホストを選択することもできます。Elementは、プライバシー、セキュリティーコンプライアンス、および統合の柔軟性を提供します。
 
-<b>データを所有する</b>
-データやメッセージをどこに保管するかは、お客様が決めることができます。データマイニングやサードパーティからのアクセスされません。
+<b>自分のデータを所有する</b>
+データやメッセージをどこに保管するかは、ユーザー自身が決めることができます。データマイニングやサードパーティからのアクセスのリスクはありません。
 
-Elementではどのサーバーを使うか決めることができます。さまざまな方法で選択できます。
+Elementでは、どのサーバーを使うかを、ご自身で決めることができます。
 1. 開発者がホストする matrix.org のパブリックサーバーで無料アカウントを取得するか、ボランティアがホストしているパブリックサーバーから選択する。
-2. 自分でサーバを実行することにより、アカウントをセルフホストする。
-3. Element Matrix Servicesのホスティングプラットフォームに加入しカスタムサーバー上でアカウントを作る。
+2. あなた自身がサーバーを運営し、アカウントを管理する。
+3. Element Matrix Servicesのホスティングプラットフォームに加入し、カスタムサーバー上でアカウントを作る。
 
 <b>オープンなメッセージングとコラボレーション</b>
-Matrixネットワーク上の誰とでも、相手がElementを使っているか、他のMatrixアプリを使っていてもコミュニケーションすることができます。
+Matrixネットワーク上の誰とでも、相手がElementや他のMatrixアプリを使っているか、さらには他のメッセージングアプリを使っているかに関わらず、チャットをすることができます。
 
-<b>すごく安全</b>
-本物のエンド・ツー・エンドの暗号化（会話に参加している人だけがメッセージを復号化できる）と、相互署名されたデバイスの検証を行います。
+<b>非常に安全</b>
+本物のエンド・ツー・エンドの暗号化（会話に参加している人だけがメッセージを復号化できる）と、相互署名された端末の検証を行います。
 
 <b>包括的なコミュニケーションと統合</b>
-メッセージング、音声およびビデオ通話、ファイル共有、画面共有、その他多くの統合、ボット、ウィジェットを提供します。部屋やコミュニティを作り、連絡を取り合い、物事を成し遂げることができます。
+メッセージング、音声およびビデオ通話、ファイル共有、画面共有、その他多くのインテグレーション、ボット、ウィジェットを提供します。ルームやコミュニティーを立ち上げて連絡を取り合い、物事をスムーズに成し遂げることができます。
 
-<b>中断からの再開は</b>
-すべてのデバイスとウェブで完全に同期されたメッセージにより、どこにいても連絡を取り合うことができます。https://app.element.io
+<b>中断からの再開</b>
+メッセージの履歴は全ての端末とウェブ（https://app.element.io）で完全に同期されるので、どこからでも連絡を取り合うことができます。
+
+<b>オープンソース</b>
+Element AndroidはGitHubで開発されているオープンソースのプロジェクトです。 バグの報告や開発への貢献は https://github.com/vector-im/element-android にて受け付けています。
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40103160.txt b/fastlane/metadata/android/pt-BR/changelogs/40103160.txt
new file mode 100644
index 0000000000..59ade40e9e
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: envie sua localização para qualquer sala. Editar sondagem.
+Changelog completo: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40103170.txt b/fastlane/metadata/android/pt-BR/changelogs/40103170.txt
new file mode 100644
index 0000000000..1266131db7
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: envie sua localização para qualquer sala. Editar sondagem.
+Changelog completo: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40103180.txt b/fastlane/metadata/android/pt-BR/changelogs/40103180.txt
new file mode 100644
index 0000000000..56e23a2be4
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: envie sua localização para qualquer sala. Editar sondagem.
+Changelog completo: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103050.txt b/fastlane/metadata/android/ru-RU/changelogs/40103050.txt
new file mode 100644
index 0000000000..6f864e59dc
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103050.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Добавлена поддержка присутствия для комнаты личных сообщений (примечание: присутствие отключено на matrix.org). Добавьте снова поддержку Android Auto.
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.5
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103060.txt b/fastlane/metadata/android/ru-RU/changelogs/40103060.txt
new file mode 100644
index 0000000000..975b92ef9b
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103060.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Добавлена поддержка присутствия для комнаты личных сообщений (примечание: присутствие отключено на matrix.org). Добавьте снова поддержку Android Auto.
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.6
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103070.txt b/fastlane/metadata/android/ru-RU/changelogs/40103070.txt
new file mode 100644
index 0000000000..8ba9ea6417
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103070.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Исправлены ошибки, в основном касающиеся уведомлений.
+Полный список изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.7-RC2
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103080.txt b/fastlane/metadata/android/ru-RU/changelogs/40103080.txt
new file mode 100644
index 0000000000..bf47216dfb
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103080.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Исправлены ошибки!
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.8
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103090.txt b/fastlane/metadata/android/ru-RU/changelogs/40103090.txt
new file mode 100644
index 0000000000..95a482a48c
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103090.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Добавлена поддержка черновика голосового сообщения. Много исправлений!
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.9
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103100.txt b/fastlane/metadata/android/ru-RU/changelogs/40103100.txt
new file mode 100644
index 0000000000..73aab13115
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103100.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Исправлены ошибки!
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.11
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103110.txt b/fastlane/metadata/android/ru-RU/changelogs/40103110.txt
new file mode 100644
index 0000000000..836fd5131e
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103110.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Исправлены ошибки!
+Полный список изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.12
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103120.txt b/fastlane/metadata/android/ru-RU/changelogs/40103120.txt
new file mode 100644
index 0000000000..fb1bf5cb37
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103120.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Первое изменение экранов регистрации, включая подписку на Analytics. Добавлена поддержка событий с математикой в лабораториях.
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103130.txt b/fastlane/metadata/android/ru-RU/changelogs/40103130.txt
new file mode 100644
index 0000000000..fb1bf5cb37
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103130.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Первое изменение экранов регистрации, включая подписку на Analytics. Добавлена поддержка событий с математикой в лабораториях.
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103140.txt b/fastlane/metadata/android/ru-RU/changelogs/40103140.txt
new file mode 100644
index 0000000000..f1144e7022
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103140.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Первое изменение экранов регистрации, включая подписку на Analytics. Добавлена поддержка событий с математикой в лабораториях.
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.14
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103150.txt b/fastlane/metadata/android/ru-RU/changelogs/40103150.txt
new file mode 100644
index 0000000000..87becb7910
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103150.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Первое изменение экранов регистрации, включая подписку на Analytics. Добавлена поддержка событий с математикой в лабораториях.
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.15
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103160.txt b/fastlane/metadata/android/ru-RU/changelogs/40103160.txt
new file mode 100644
index 0000000000..fb8e01c009
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: отправьте свое местоположение в любую комнату. Редактирование опроса.
+Полный список изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103170.txt b/fastlane/metadata/android/ru-RU/changelogs/40103170.txt
new file mode 100644
index 0000000000..08286401e2
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: отправка вашего местоположения в любую комнату. Изменить опрос.
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40103180.txt b/fastlane/metadata/android/ru-RU/changelogs/40103180.txt
new file mode 100644
index 0000000000..08286401e2
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: отправка вашего местоположения в любую комнату. Изменить опрос.
+Полный журнал изменений: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/sk/changelogs/40103160.txt b/fastlane/metadata/android/sk/changelogs/40103160.txt
new file mode 100644
index 0000000000..9d2ad76715
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: odoslanie polohy do ľubovoľnej miestnosti. Úprava ankety.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/sk/changelogs/40103170.txt b/fastlane/metadata/android/sk/changelogs/40103170.txt
new file mode 100644
index 0000000000..58e5f1fa61
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: odoslanie polohy do ľubovoľnej miestnosti. Úprava ankety.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/sk/changelogs/40103180.txt b/fastlane/metadata/android/sk/changelogs/40103180.txt
new file mode 100644
index 0000000000..b5649471cb
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: odoslanie polohy do ľubovoľnej miestnosti. Úprava ankety.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/sk/full_description.txt b/fastlane/metadata/android/sk/full_description.txt
index 78661e961e..d653933c48 100644
--- a/fastlane/metadata/android/sk/full_description.txt
+++ b/fastlane/metadata/android/sk/full_description.txt
@@ -1,4 +1,4 @@
-Element je zabezpečený messenger a zároveň aplikácia na tímovú spoluprácu, ktorá je ideálna na skupinové konverzácie pri práci na diaľku. Táto komunikačná aplikácia využíva end-to-end šifrovanie na poskytovanie výkonných videokonferencií, zdieľania súborov a hlasových hovorov.
+Element je bezpečný messenger a zároveň aplikácia na tímovú spoluprácu, ktorá je ideálna na skupinové konverzácie pri práci na diaľku. Táto komunikačná aplikácia využíva end-to-end šifrovanie na poskytovanie výkonných videokonferencií, zdieľania súborov a hlasových hovorov.
 
 <b>Funkcie aplikácie Element zahŕňajú:</b>
 - Pokročilé nástroje na online komunikáciu
@@ -11,14 +11,15 @@ Element je zabezpečený messenger a zároveň aplikácia na tímovú spoluprác
 Element sa úplne líši od ostatných aplikácií na zasielanie správ a spoluprácu. Funguje na Matrixe, otvorenej sieti na bezpečné posielanie správ a decentralizovanú komunikáciu. Umožňuje vlastný hosting, aby používatelia získali maximálne vlastníctvo a kontrolu nad svojimi údajmi a správami.
 
 <b>Súkromie a šifrovanie správ</b>
-Element vás chráni pred nežiaducimi reklamami, ťažbou údajov a tzv. walled gardens. Zabezpečuje tiež všetky vaše údaje, video a hlasovú komunikáciu jeden na jedného prostredníctvom end-to-end šifrovania a overovania zariadení krížovým podpisovaním
+Element vás chráni pred nežiaducimi reklamami, ťažbou údajov a tzv. walled gardens. Zabezpečuje tiež všetky vaše údaje, video a hlasovú komunikáciu jeden na jedného prostredníctvom end-to-end šifrovania a overovania zariadení krížovým podpisovaním.
+
 Element vám poskytuje kontrolu nad vaším súkromím a zároveň vám umožňuje bezpečne komunikovať s kýmkoľvek v sieti Matrix alebo s inými nástrojmi na podnikovú spoluprácu vďaka integrácii s aplikáciami, ako je napríklad Slack.
 
-<b>Element môže byť na vašom vlastnom serveri</b>.
+<b>Element môže byť na vašom vlastnom serveri</b>
 Aby ste mali väčšiu kontrolu nad svojimi citlivými údajmi a konverzáciami, Element môže byť na vašom vlastnom serveri alebo si môžete vybrať ľubovoľný hosting založený na systéme Matrix - štandarde pre decentralizovanú komunikáciu s otvoreným zdrojovým kódom. Element vám poskytuje súkromie, súlad s bezpečnostnými predpismi a flexibilitu integrácie.
 
 <b>Vlastnite svoje údaje</b>
-Vy rozhodujete o tom, kde budú vaše údaje a správy uložené. Bez rizika ťažby údajov alebo prístupu tretích strán.
+Vy rozhodujete o tom, kde budú vaše údaje a správy uložené. Bez rizika získavania údajov alebo prístupu tretích strán.
 
 Element vám dáva kontrolu rôznymi spôsobmi:
 1. Získajte bezplatné konto na verejnom serveri matrix.org, ktorý hostia vývojári Matrixu, alebo si vyberte z tisícov verejných serverov, ktoré hostia dobrovoľníci.
@@ -32,10 +33,10 @@ Môžete komunikovať s kýmkoľvek v sieti Matrix, či už používa aplikáciu
 Skutočné end-to-end šifrovanie (správy môžu dešifrovať len účastníci konverzácie) a krížové overovanie zariadení.
 
 <b>Kompletná komunikácia a integrácia</b>
-Správy, hlasové a video hovory, zdieľanie súborov, zdieľanie obrazovky a celý rad integrácií, botov a widgetov. Vytvárajte miestnosti, komunity, zostaňte v kontakte a vybavujte veci.
+Správy, hlasové a video hovory, zdieľanie súborov, zdieľanie obrazovky a celý rad integrácií, botov a widgetov. Vytvárajte miestnosti, komunity, zostaňte v kontakte a vybavte veci.
 
 <b>Nadviažte tam, kde ste skončili</b>
 Buďte v kontakte, nech ste kdekoľvek, vďaka plne synchronizovanej histórii správ vo všetkých zariadeniach a na webe na adrese https://app.element.io.
 
 <b>Otvorený zdroj</b>
-Element Android je projekt s otvoreným zdrojovým kódom, ktorého hostiteľom je GitHub. Nahlasujte chyby a/alebo prispievajte k jeho vývoju na adrese https://github.com/vector-im/element-android.
+Element Android je projekt s otvoreným zdrojovým kódom, ktorého hostiteľom je GitHub. Nahláste prosím chyby a/alebo prispejte k jeho vývoju na https://github.com/vector-im/element-android
diff --git a/fastlane/metadata/android/sq/changelogs/40103130.txt b/fastlane/metadata/android/sq/changelogs/40103130.txt
new file mode 100644
index 0000000000..abae5b8206
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40103130.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndryshimi i parë te skena e mirëseardhjeve, përfshi zgjedhje për pjesëmarrje në Analizime. Mbulim për Akte dhe Formula Matematikore të shtuara te laboratorë.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/sq/changelogs/40103140.txt b/fastlane/metadata/android/sq/changelogs/40103140.txt
new file mode 100644
index 0000000000..b8231bdf78
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40103140.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndryshimi i parë në skenat e mirëseardhjes, përfshi zgjedhje për pjesëmarrje në Analiza. Në laboratorë u shtua mbulim për Akte me Formula Matematikore.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases/tag/v1.3.14
diff --git a/fastlane/metadata/android/sq/changelogs/40103150.txt b/fastlane/metadata/android/sq/changelogs/40103150.txt
new file mode 100644
index 0000000000..510fbab96e
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40103150.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndryshimi i parë në skenat e mirëseardhjes, përfshi zgjedhje për pjesëmarrje në Analiza. Në laboratorë u shtua mbulim për Akte me Formula Matematikore.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases/tag/v1.3.15
diff --git a/fastlane/metadata/android/sq/changelogs/40103160.txt b/fastlane/metadata/android/sq/changelogs/40103160.txt
new file mode 100644
index 0000000000..1a0dd3bf5d
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: dërgojeni vendndodhjen tuaj te cilado dhomë. Përpunoni pyetësor.
+Regjistër i plotës ndryshimesh: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/sq/changelogs/40103170.txt b/fastlane/metadata/android/sq/changelogs/40103170.txt
new file mode 100644
index 0000000000..405743bcb6
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: dërgojeni vendndodhjen tuaj në çfarëdo dhome. Përpunoni pyetësorë.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/sq/changelogs/40103180.txt b/fastlane/metadata/android/sq/changelogs/40103180.txt
new file mode 100644
index 0000000000..5ec41f7db3
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: dërgojeni vendndodhjen tuaj në çfarëdo dhome. Përpunoni pyetësorë.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40103130.txt b/fastlane/metadata/android/sv-SE/changelogs/40103130.txt
new file mode 100644
index 0000000000..6c9bd42f34
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40103130.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Första ändringen på introduktionsskärmar, inklusive opt-in för statistik. Stöd för händelser med matte tillagd i experiment.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40103140.txt b/fastlane/metadata/android/sv-SE/changelogs/40103140.txt
new file mode 100644
index 0000000000..a5209920d6
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40103140.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Första ändringen på introduktionsskärmar, inklusive opt-in för statistik. Stöd för händelser med matte tillagd i experiment.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.3.14
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40103150.txt b/fastlane/metadata/android/sv-SE/changelogs/40103150.txt
new file mode 100644
index 0000000000..0fac22f0ab
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40103150.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Första ändringen på introduktionsskärmar, inklusive opt-in för statistik. Stöd för händelser med matte tillagd i experiment.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.3.15
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40103160.txt b/fastlane/metadata/android/sv-SE/changelogs/40103160.txt
new file mode 100644
index 0000000000..0f324c9047
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: skicka din plats till vilket rum som helst. Redigera omröstningar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40103170.txt b/fastlane/metadata/android/sv-SE/changelogs/40103170.txt
new file mode 100644
index 0000000000..ae2be8bd17
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: skicka din plats till vilket rum som helst. Redigera omröstningar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40103180.txt b/fastlane/metadata/android/sv-SE/changelogs/40103180.txt
new file mode 100644
index 0000000000..fe5b212d9c
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: skicka din plats till vilket rum som helst. Redigera omröstningar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103000.txt b/fastlane/metadata/android/tr-TR/changelogs/40103000.txt
new file mode 100644
index 0000000000..bb66b40193
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103000.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Spaces kullanarak odalarınızı düzenleyin!
+Tam değişiklik günlüğü: https://github.com/vector-im/element-android/releases/tag/v1.3.0
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103010.txt b/fastlane/metadata/android/tr-TR/changelogs/40103010.txt
new file mode 100644
index 0000000000..3fea80054e
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103010.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Spaces kullanarak odalarınızı düzenleyin! v1.3.1, v1.3.0'da meydana gelen bir kilitlenme düzeltildi.
+Tam değişiklik günlüğü: https://github.com/vector-im/element-android/releases/tag/v1.3.1
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103020.txt b/fastlane/metadata/android/tr-TR/changelogs/40103020.txt
new file mode 100644
index 0000000000..ef8271c6c2
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103020.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Android Auto desteği eklendi. Birçok hata düzeltmesi!
+Tam değişiklik günlüğü: https://github.com/vector-im/element-android/releases/tag/v1.3.2
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103030.txt b/fastlane/metadata/android/tr-TR/changelogs/40103030.txt
new file mode 100644
index 0000000000..b771e53f96
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103030.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Ayarlarda kimlik sunucusu politika(lar)ını görünür yapın. Android Auto desteğini geçici olarak kaldırın.
+Tam değişiklik günlüğü: https://github.com/vector-im/element-android/releases/tag/v1.3.3
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103040.txt b/fastlane/metadata/android/tr-TR/changelogs/40103040.txt
new file mode 100644
index 0000000000..1b2f20e349
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103040.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Doğrudan Mesaj odası için Durum desteği ekleyin (not: durum devre dışı açık matrix.org ). Android Auto desteğini tekrar ekleyin.
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.4
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103050.txt b/fastlane/metadata/android/tr-TR/changelogs/40103050.txt
new file mode 100644
index 0000000000..69ac8dcb1f
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103050.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Doğrudan Mesaj odası için Durum desteği ekleyin (not: durum devre dışı açık matrix.org ). Android Auto desteğini tekrar ekleyin.
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.5
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103060.txt b/fastlane/metadata/android/tr-TR/changelogs/40103060.txt
new file mode 100644
index 0000000000..396cebd495
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103060.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Doğrudan Mesaj odası için Durum desteği ekleyin (not: durum devre dışı açık matrix.org ). Android Auto desteğini tekrar ekleyin.
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.6
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103070.txt b/fastlane/metadata/android/tr-TR/changelogs/40103070.txt
new file mode 100644
index 0000000000..62b3fa8824
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103070.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Esas olarak bildirimlerle ilgili hata düzeltmeleri.
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.7-RC2
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103080.txt b/fastlane/metadata/android/tr-TR/changelogs/40103080.txt
new file mode 100644
index 0000000000..6d802d09f7
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103080.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Hata düzeltmeleri!
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.8
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103090.txt b/fastlane/metadata/android/tr-TR/changelogs/40103090.txt
new file mode 100644
index 0000000000..4acef8f885
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103090.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Sesli mesaj taslağı için destek ekleyin. Birçok hata düzeltmeleri!
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.9
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103100.txt b/fastlane/metadata/android/tr-TR/changelogs/40103100.txt
new file mode 100644
index 0000000000..1ccdf8210e
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103100.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Anketler için destek ekleyin (laboratuarlarda). Yeni URL önizleme tasarımı.
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.10
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103110.txt b/fastlane/metadata/android/tr-TR/changelogs/40103110.txt
new file mode 100644
index 0000000000..c59f57a897
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103110.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Hata düzeltmeleri!
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.11
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103120.txt b/fastlane/metadata/android/tr-TR/changelogs/40103120.txt
new file mode 100644
index 0000000000..9ba7fa4556
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103120.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Hata düzeltmeleri!
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.12
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103130.txt b/fastlane/metadata/android/tr-TR/changelogs/40103130.txt
new file mode 100644
index 0000000000..1f356f8360
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103130.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Analytics'in etkinleştirilmesi de dahil olmak üzere, ilk önce yerleşik ekranlardaki değişiklikler. Laboratuvarlara Matematik eklenmiş Etkinlikler için destek.
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103140.txt b/fastlane/metadata/android/tr-TR/changelogs/40103140.txt
new file mode 100644
index 0000000000..d8e2d5f614
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103140.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Analytics'in etkinleştirilmesi de dahil olmak üzere, ilk önce yerleşik ekranlardaki değişiklikler. Laboratuvarlara Matematik eklenmiş Etkinlikler için destek.
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.14
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103150.txt b/fastlane/metadata/android/tr-TR/changelogs/40103150.txt
new file mode 100644
index 0000000000..7e98b545e8
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103150.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: Analytics'in etkinleştirilmesi de dahil olmak üzere, ilk önce yerleşik ekranlardaki değişiklikler. Laboratuvarlara Matematik eklenmiş Etkinlikler için destek.
+Tam değişiklik listesi: https://github.com/vector-im/element-android/releases/tag/v1.3.15
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103160.txt b/fastlane/metadata/android/tr-TR/changelogs/40103160.txt
new file mode 100644
index 0000000000..594b19dbfc
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: konumunuzu herhangi bir odaya gönderin. Anketi düzenleyin.
+Tam değişiklik günlüğü: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103170.txt b/fastlane/metadata/android/tr-TR/changelogs/40103170.txt
new file mode 100644
index 0000000000..4bb0b066b6
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: konumunuzu herhangi bir odaya gönderin. Anketi düzenleyin.
+Tam değişiklik günlüğü: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/tr-TR/changelogs/40103180.txt b/fastlane/metadata/android/tr-TR/changelogs/40103180.txt
new file mode 100644
index 0000000000..ce1573e113
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: konumunuzu herhangi bir odaya gönderin. Anketi düzenleyin.
+Tam değişiklik günlüğü: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/tr-TR/full_description.txt b/fastlane/metadata/android/tr-TR/full_description.txt
index 3895621620..8ce63e40a1 100644
--- a/fastlane/metadata/android/tr-TR/full_description.txt
+++ b/fastlane/metadata/android/tr-TR/full_description.txt
@@ -1,30 +1,42 @@
-Element, şu özelliklere sahip yeni bir tür mesajlaşma ve işbirliği uygulamasıdır:
+Element, hem güvenli bir haberci hem de uzaktan çalışırken grup sohbetleri için ideal olan bir üretkenlik ekibi işbirliği uygulamasıdır. Bu sohbet uygulaması, güçlü video konferans, dosya paylaşımı ve sesli aramalar sağlamak için uçtan uca şifreleme kullanır.
 
-1. Gizliliğinizi korumak için kontrolü size verir
-2. Matrix ağındaki herkesle ve hatta Slack gibi uygulamalarla entegre olarak iletişim kurmanızı sağlar
-3. Sizi reklamlardan, veri madenciliğinden ve walled gardenlardan korur
-4. Başkalarını doğrulamak için çapraz imzalama ile uçtan uca şifreleme yoluyla güvenliğinizi sağlar
+ <b>Elementin özellikleri şunları içerir:</b>
+ - Gelişmiş çevrimiçi iletişim araçları
+ - Uzak çalışanlar için bile daha güvenli kurumsal iletişime izin vermek için tamamen şifrelenmiş mesajlar
+ - Matrix açık kaynak çerçevesine dayalı merkezi olmayan sohbet
+ - Projeleri yönetirken şifreli verilerle güvenli dosya paylaşımı
+ - IP üzerinden Ses ve ekran paylaşımı ile görüntülü sohbetler
+ - En sevdiğiniz çevrimiçi işbirliği araçları, proje yönetimi araçları, VoIP hizmetleri ve diğer ekip mesajlaşma uygulamalarıyla kolay entegrasyon
 
-Element, dağıtık (decentralized) ve açık kaynak olduğu için diğer mesajlaşma ve işbirliği uygulamalarından tamamen farklıdır.
+ Element, diğer mesajlaşma ve işbirliği uygulamalarından tamamen farklıdır. Güvenli mesajlaşma ve merkezi olmayan iletişim için açık bir ağ olan Matrix üzerinde çalışır. Kendi kendine barındırmanın, kullanıcılara verilerinin ve mesajlarının maksimum sahipliğini ve kontrolünü vermesini sağlar.
 
-Element kendi sunucunuzu kurmanıza yada bir sunucu seçmenizi izin verir, böylece verilerinizin ve sohbetlerinizin gizliliğine ve kontrolüne sahip olursunuz. Size açık bir ağa erişim sağlar; yani yalnızca diğer Element kullanıcılarıyla konuşmak zorunda kalmazsınız. Ve çok güvenlidir.
+ <b>Gizlilik ve şifreli mesajlaşma</b>
+ Element sizi istenmeyen reklamlardan, veri madenciliğinden ve duvarlarla çevrili bahçelerden korur. Ayrıca uçtan uca şifreleme ve çapraz imzalı cihaz doğrulama yoluyla tüm verilerinizi, bire bir video ve sesli iletişiminizi korur.
 
-Element, açık, merkezi olmayan iletişim standardı olan Matrix üzerinde çalıştığı için tüm bunları yapabilir.
+ Element, Slack gibi uygulamalarla bütünleşerek Matrix ağındaki herhangi biriyle veya diğer iş işbirliği araçlarıyla güvenli bir şekilde iletişim kurmanıza izin verirken gizliliğiniz üzerinde kontrol sağlar.
 
-Element, konuşmalarınızın sunucusunu seçmenize izin vererek kontrolü size verir. Element uygulamasından, farklı şekillerde sunucu seçebilirsiniz:
+ <b>Öğe kendi kendine barındırılabilir</b>
+ Hassas verileriniz ve konuşmalarınız üzerinde daha fazla kontrole izin vermek için Element, kendi kendine barındırılabilir veya açık kaynak, merkezi olmayan iletişim standardı olan Matrix tabanlı herhangi bir ana bilgisayarı seçebilirsiniz. Element size gizlilik, güvenlik uyumluluğu ve entegrasyon esnekliği sağlar.
 
-1. Matrix geliştiricilerinin sahip olduğu matrix.org genel sunucusunda ücretsiz bir hesap edinin veya gönüllüler tarafından barındırılan binlerce genel sunucu arasından seçim yapın
-2. Kendi donanımınız üzerinde bir sunucu çalıştırarak kendi hesabınızı barındırın
-3. Element Matrix Hizmetleri sunucu platformuna abone olarak özel bir sunucuda hesap oluşturun
+ <b>Verilerinizin sahibi olun</b>
+ Verilerinizi ve mesajlarınızı nerede tutacağınıza siz karar verirsiniz. Veri madenciliği veya üçüncü şahıslardan erişim riski olmadan.
 
-<b>Neden Element'i Seçmelisiniz</b>
+ Element, kontrolü farklı şekillerde size verir:
+ 1. Matrix geliştiricileri tarafından barındırılan matrix.org genel sunucusunda ücretsiz bir hesap edinin veya gönüllüler tarafından barındırılan binlerce genel sunucu arasından seçim yapın
+ 2. Kendi BT altyapınızda bir sunucu çalıştırarak hesabınızı kendiniz barındırın
+ 3. Element Matrix Services barındırma platformuna abone olarak özel bir sunucuda bir hesap için kaydolun
 
-<b>KENDİ VERİLERİNİZE SAHİP OLUN </b>: Verilerinizi ve mesajlarınızı nerede saklayacağınıza siz karar verirsiniz. Verilerinize madencilik yapan veya üçüncü şahıslara erişim sağlayan bir BÜYÜKŞİRKETE verilerinizi vermiyorsunuz, onlara sahipsiniz ve kontrol ediyorsunuz.
+ <b>Açık mesajlaşma ve ortak çalışma</b>
+ Element, başka bir Matrix uygulaması veya farklı bir mesajlaşma uygulaması kullanıyor olsalar bile, Matrix ağındaki herkesle sohbet edebilirsiniz.
 
-<b>AÇIK MESAJLAŞMA VE İŞBİRLİĞİ</b>: Element veya başka bir Matrix uygulamalarını kullanmaları fark etmeksizin, hatta Slack, IRC yada XMPP gibi farklı mesajlaşma uygulamaları kullanıyor olsalar bile, Matrix sunucusundaki herhangi biriyle konuşabilirsiniz
+ <b>Süper güvenli</b>
+ Gerçek uçtan uca şifreleme (yalnızca görüşmedekiler mesajların şifresini çözebilir) ve çapraz imzalı cihaz doğrulaması.
 
-<b>SÜPER GÜVENLİ</b>: Gerçek uçtan uca şifreleme (yalnızca görüştüğünüz kişiler mesajların şifresini çözebilir) ve konuşma katılımcılarının cihazlarını doğrulamak için çapraz imzalama.
+ <b>Tam iletişim ve entegrasyon</b>
+ Mesajlaşma, sesli ve görüntülü aramalar, dosya paylaşımı, ekran paylaşımı ve bir sürü entegrasyon, bot ve widget. Odalar, topluluklar oluşturun, iletişimde kalın ve işlerinizi halledin.
 
-<b>TAM İLETİŞİM</b>: Mesajlaşma, sesli ve görüntülü aramalar, dosya paylaşımı, ekran paylaşımı ve bir sürü entegrasyon, bot ve widgetlar. Odalar, topluluklar oluşturun, iletişimde kalın ve işlerinizi halledin.
+ <b>Kaldığınız yerden devam edin</b>
+ https://app.element.io adresinde tüm cihazlarınızda ve web'de tamamen senkronize edilmiş mesaj geçmişiyle nerede olursanız olun bağlantıda kalın
 
-<b>OLDUĞUNUZ HER YERDE</b>: Nerede olursanız olun, tüm cihazlarınızda ve internette https://app.element.io adresinden tam senkronize mesaj geçmişiyle iletişimde kalın
+ <b>Açık kaynak</b>
+ Element Android, GitHub tarafından barındırılan açık kaynaklı bir projedir. Lütfen https://github.com/vector-im/element-android adresinde hataları bildirin ve/veya gelişimine katkıda bulunun.
diff --git a/fastlane/metadata/android/tr-TR/short_description.txt b/fastlane/metadata/android/tr-TR/short_description.txt
index f730519d33..7965a7c857 100644
--- a/fastlane/metadata/android/tr-TR/short_description.txt
+++ b/fastlane/metadata/android/tr-TR/short_description.txt
@@ -1 +1 @@
-Güvenli ve merkezsiz sohbet ve VoIP. Verilerinizi üçüncü taraflardan sakının.
+Grup mesajlaşma - şifreli mesajlaşma, grup sohbeti ve görüntülü aramalar
diff --git a/fastlane/metadata/android/tr-TR/title.txt b/fastlane/metadata/android/tr-TR/title.txt
index 28088f3da4..bb365ccdd0 100644
--- a/fastlane/metadata/android/tr-TR/title.txt
+++ b/fastlane/metadata/android/tr-TR/title.txt
@@ -1 +1 @@
-Element (eskiden Riot.im)
+Element - Güvenli Mesajlaşma
diff --git a/fastlane/metadata/android/uk/changelogs/40103160.txt b/fastlane/metadata/android/uk/changelogs/40103160.txt
new file mode 100644
index 0000000000..db0f1e4c62
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Основні зміни у цій версії: надсилання свого місцеперебування у будь-яку кімнату. Редагування опитувань.
+Вичерпний перелік змін: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/uk/changelogs/40103170.txt b/fastlane/metadata/android/uk/changelogs/40103170.txt
new file mode 100644
index 0000000000..708af771ac
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Основні зміни цієї версії: надсилання свого розташування у будь-яку кімнату. Редагування опитувань.
+Повний перелік змін: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/uk/changelogs/40103180.txt b/fastlane/metadata/android/uk/changelogs/40103180.txt
new file mode 100644
index 0000000000..6ffbe45571
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Основні зміни цієї версії: надсилання свого розташування у будь-яку кімнату. Редагування опитувань.
+Повний перелік змін: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40103160.txt b/fastlane/metadata/android/zh-TW/changelogs/40103160.txt
new file mode 100644
index 0000000000..04e51e013c
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：將您的位置傳送給任何聊天室。編輯投票。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40103170.txt b/fastlane/metadata/android/zh-TW/changelogs/40103170.txt
new file mode 100644
index 0000000000..a8e353c2eb
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：將您的位置傳送給任何聊天室。編輯投票。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40103180.txt b/fastlane/metadata/android/zh-TW/changelogs/40103180.txt
new file mode 100644
index 0000000000..3eabe8b7cc
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：將您的位置傳送給任何聊天室。編輯投票。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/gradle.properties b/gradle.properties
index 5c99297107..6de52be607 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@
 # The setting is particularly useful for tweaking memory settings.
 
 # Build Time Optimizations
-org.gradle.jvmargs=-Xmx3g -Xms512M -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx4g -Xms512M -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2a..41d9927a4d 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 ee6ba9a3ac..dcf5e2cb7b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionSha256Sum=cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library/ui-styles/src/main/res/anim/animation_slide_in_left.xml b/library/ui-styles/src/main/res/anim/animation_slide_in_left.xml
new file mode 100644
index 0000000000..77861c99f6
--- /dev/null
+++ b/library/ui-styles/src/main/res/anim/animation_slide_in_left.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromXDelta="-100%p" android:toXDelta="0"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+</set>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/anim/animation_slide_in_right.xml b/library/ui-styles/src/main/res/anim/animation_slide_in_right.xml
new file mode 100644
index 0000000000..cf7488cc1a
--- /dev/null
+++ b/library/ui-styles/src/main/res/anim/animation_slide_in_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:startOffset="250"
+        android:fromXDelta="100%p" android:toXDelta="0"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+</set>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/anim/animation_slide_out_left.xml b/library/ui-styles/src/main/res/anim/animation_slide_out_left.xml
new file mode 100644
index 0000000000..2afa66ceab
--- /dev/null
+++ b/library/ui-styles/src/main/res/anim/animation_slide_out_left.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:startOffset="250"
+        android:fromXDelta="0" android:toXDelta="-100%p"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+</set>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/anim/animation_slide_out_right.xml b/library/ui-styles/src/main/res/anim/animation_slide_out_right.xml
new file mode 100644
index 0000000000..49348f1dac
--- /dev/null
+++ b/library/ui-styles/src/main/res/anim/animation_slide_out_right.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromXDelta="0" android:toXDelta="100%p"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+</set>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_voice_playback.xml b/library/ui-styles/src/main/res/drawable/bg_media_pill.xml
similarity index 84%
rename from vector/src/main/res/drawable/bg_voice_playback.xml
rename to library/ui-styles/src/main/res/drawable/bg_media_pill.xml
index 4474c00345..2ad9ca9918 100644
--- a/vector/src/main/res/drawable/bg_voice_playback.xml
+++ b/library/ui-styles/src/main/res/drawable/bg_media_pill.xml
@@ -2,9 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Tint color is provided by the theme -->
     <solid android:color="@android:color/black" />
-    <size
-        android:width="240dp"
-        android:height="44dp" />
     <corners
         android:bottomLeftRadius="12dp"
         android:bottomRightRadius="12dp"
diff --git a/library/ui-styles/src/main/res/drawable/file_progress_bar.xml b/library/ui-styles/src/main/res/drawable/file_progress_bar.xml
index d175b871f7..bc20bb6340 100644
--- a/library/ui-styles/src/main/res/drawable/file_progress_bar.xml
+++ b/library/ui-styles/src/main/res/drawable/file_progress_bar.xml
@@ -2,16 +2,14 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@android:id/background">
-        <shape>
-            <corners android:radius="8dp" />
-            <solid android:color="?vctr_room_active_widgets_banner_bg" />
+        <shape android:shape="oval">
+            <solid android:color="?vctr_system" />
         </shape>
     </item>
 
     <item android:id="@android:id/progress">
         <clip>
-            <shape>
-                <corners android:radius="8dp" />
+            <shape android:shape="oval">
                 <solid android:color="@color/vctr_notice_secondary_alpha12" />
             </shape>
         </clip>
diff --git a/library/ui-styles/src/main/res/values-ldrtl/bools.xml b/library/ui-styles/src/main/res/values-v23/dimens.xml
similarity index 54%
rename from library/ui-styles/src/main/res/values-ldrtl/bools.xml
rename to library/ui-styles/src/main/res/values-v23/dimens.xml
index 27b280985f..18b8a81a7e 100644
--- a/library/ui-styles/src/main/res/values-ldrtl/bools.xml
+++ b/library/ui-styles/src/main/res/values-v23/dimens.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <bool name="is_rtl">true</bool>
-
+    <dimen name="menu_item_ripple_size">28dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/bools.xml b/library/ui-styles/src/main/res/values/bools.xml
index 9966999f28..93d5f925af 100644
--- a/library/ui-styles/src/main/res/values/bools.xml
+++ b/library/ui-styles/src/main/res/values/bools.xml
@@ -4,6 +4,4 @@
     <!-- Created to detect what has to be implemented (especially in the settings) -->
     <bool name="false_not_implemented">false</bool>
 
-    <bool name="is_rtl">false</bool>
-
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index 9df2794a1a..770b001893 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -57,11 +57,6 @@
     <attr name="vctr_list_separator_on_surface" format="color" />
 
     <!-- Other colors, which are not in the palette -->
-    <attr name="vctr_unread_room_badge" format="color" />
-    <color name="vctr_unread_room_badge_light">#FF61708B</color>
-    <color name="vctr_unread_room_badge_dark">#FF61708B</color>
-    <color name="vctr_unread_room_badge_black">#FF61708B</color>
-
     <attr name="vctr_fab_label_bg" format="color" />
     <color name="vctr_fab_label_bg_light">@android:color/white</color>
     <color name="vctr_fab_label_bg_dark">#FF181B21</color>
@@ -137,4 +132,5 @@
     <attr name="vctr_presence_indicator_offline" format="color" />
     <color name="vctr_presence_indicator_offline_light">@color/palette_gray_100</color>
     <color name="vctr_presence_indicator_offline_dark">@color/palette_gray_450</color>
+
 </resources>
diff --git a/library/ui-styles/src/main/res/values/colors_message_bubble.xml b/library/ui-styles/src/main/res/values/colors_message_bubble.xml
new file mode 100644
index 0000000000..7ac68574b6
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/colors_message_bubble.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Timeline bubble background colors -->
+    <attr name="vctr_message_bubble_inbound" format="color" />
+    <color name="vctr_message_bubble_inbound_light">#E8EDF4</color>
+    <color name="vctr_message_bubble_inbound_dark">#21262C</color>
+    <attr name="vctr_message_bubble_outbound" format="color" />
+    <color name="vctr_message_bubble_outbound_light">#E7F8F3</color>
+    <color name="vctr_message_bubble_outbound_dark">#133A34</color>
+</resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index d184cd06df..be57f75dc8 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -15,6 +15,8 @@
     <dimen name="item_decoration_left_margin">72dp</dimen>
     <dimen name="item_event_message_state_size">16dp</dimen>
 
+    <dimen name="item_event_message_media_button_size">32dp</dimen>
+
     <dimen name="chat_avatar_size">40dp</dimen>
     <dimen name="member_list_avatar_size">60dp</dimen>
 
@@ -42,12 +44,23 @@
 
     <!--  Preview Url  -->
     <dimen name="preview_url_view_corner_radius">8dp</dimen>
+    <dimen name="preview_url_view_image_max_height">160dp</dimen>
+
+    <dimen name="menu_item_icon_size">24dp</dimen>
+    <dimen name="menu_item_size">48dp</dimen>
+    <dimen name="menu_item_ripple_size">48dp</dimen>
 
     <!-- Composer -->
     <dimen name="composer_min_height">56dp</dimen>
     <dimen name="composer_attachment_size">52dp</dimen>
     <dimen name="composer_attachment_margin">1dp</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>
+
     <!--  Onboarding   -->
     <item name="ftue_auth_gutter_start_percent" format="float" type="dimen">0.05</item>
     <item name="ftue_auth_gutter_end_percent" format="float" type="dimen">0.95</item>
diff --git a/library/ui-styles/src/main/res/values/stylable_message_bubble.xml b/library/ui-styles/src/main/res/values/stylable_message_bubble.xml
new file mode 100644
index 0000000000..f7a877e3ed
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_message_bubble.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="MessageBubble">
+        <attr name="incoming_style" format="boolean" />
+        <attr name="show_time_overlay" format="boolean" />
+        <attr name="is_first" format="boolean" />
+        <attr name="is_last" format="boolean" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/styles_progress.xml b/library/ui-styles/src/main/res/values/styles_progress.xml
index 712e7e98b6..04a0e01b58 100644
--- a/library/ui-styles/src/main/res/values/styles_progress.xml
+++ b/library/ui-styles/src/main/res/values/styles_progress.xml
@@ -6,6 +6,7 @@
     <style name="Widget.Vector.ProgressBar.Horizontal.File">
         <item name="android:indeterminateOnly">false</item>
         <item name="android:progressDrawable">@drawable/file_progress_bar</item>
+        <item name="android:progressBackgroundTint">?android:colorBackground</item>
         <item name="android:minHeight">10dp</item>
         <item name="android:maxHeight">40dp</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/styles_timeline.xml b/library/ui-styles/src/main/res/values/styles_timeline.xml
index 7fd7eac0ec..c86eeb8efb 100644
--- a/library/ui-styles/src/main/res/values/styles_timeline.xml
+++ b/library/ui-styles/src/main/res/values/styles_timeline.xml
@@ -4,12 +4,34 @@
     <style name="TimelineContentStubBaseParams">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">8dp</item>
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginEnd">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
-        <item name="android:layout_marginBottom">4dp</item>
-        <item name="android:layout_marginTop">4dp</item>
     </style>
 
+    <style name="TimelineContentStubContainerParams">
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+    </style>
+
+    <style name="TimelineContentMediaPillStyle">
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">6dp</item>
+        <item name="android:paddingBottom">6dp</item>
+        <item name="minHeight">48dp</item>
+        <item name="android:background">@drawable/bg_media_pill</item>
+        <item name="android:backgroundTint">?vctr_content_quinary</item>
+    </style>
+
+    <style name="TimelineReactionView">
+        <item name="android:paddingStart">6dp</item>
+        <item name="android:paddingEnd">6dp</item>
+        <item name="android:paddingTop">1dp</item>
+        <item name="android:paddingBottom">1dp</item>
+        <item name="android:minHeight">28dp</item>
+        <item name="android:minWidth">40dp</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
index 4ad3fd493e..8e30dd00d6 100644
--- a/library/ui-styles/src/main/res/values/text_appearances.xml
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -59,6 +59,10 @@
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
+    <style name="TextAppearance.Vector.Body.OnError">
+        <item name="android:textColor">?colorOnError</item>
+    </style>
+
     <style name="TextAppearance.Vector.Caption" parent="TextAppearance.MaterialComponents.Caption">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
@@ -81,4 +85,4 @@
         <item name="android:letterSpacing">0.02</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library/ui-styles/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
index c472a4fae5..44d4206d43 100644
--- a/library/ui-styles/src/main/res/values/theme_black.xml
+++ b/library/ui-styles/src/main/res/values/theme_black.xml
@@ -7,7 +7,6 @@
         <!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting -->
 
         <!-- other colors -->
-        <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_black</item>
         <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_black</item>
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_black</item>
         <item name="vctr_fab_label_color">@color/vctr_fab_label_color_black</item>
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 b828855721..100a07f41d 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -16,7 +16,6 @@
         <item name="vctr_system">@color/element_system_dark</item>
 
         <!-- other colors -->
-        <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_dark</item>
         <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_dark</item>
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_dark</item>
         <item name="vctr_fab_label_color">@color/vctr_fab_label_color_dark</item>
@@ -31,6 +30,8 @@
         <item name="vctr_waiting_background_color">@color/vctr_waiting_background_color_dark</item>
         <item name="vctr_chat_effect_snow_background">@color/vctr_chat_effect_snow_background_dark</item>
         <item name="vctr_toolbar_background">@color/element_system_dark</item>
+        <item name="vctr_message_bubble_inbound">@color/vctr_message_bubble_inbound_dark</item>
+        <item name="vctr_message_bubble_outbound">@color/vctr_message_bubble_outbound_dark</item>
 
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
@@ -105,9 +106,6 @@
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
         <item name="android:overScrollMode">never</item>
 
-        <!-- fonts -->
-        <item name="android:typeface">sans</item>
-
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
         <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
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 790a0bfc7c..39e78ee5b1 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -16,7 +16,6 @@
         <item name="vctr_system">@color/element_system_light</item>
 
         <!-- other colors -->
-        <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_light</item>
         <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_light</item>
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_light</item>
         <item name="vctr_fab_label_color">@color/vctr_fab_label_color_light</item>
@@ -31,6 +30,8 @@
         <item name="vctr_waiting_background_color">@color/vctr_waiting_background_color_light</item>
         <item name="vctr_chat_effect_snow_background">@color/vctr_chat_effect_snow_background_light</item>
         <item name="vctr_toolbar_background">@color/element_background_light</item>
+        <item name="vctr_message_bubble_inbound">@color/vctr_message_bubble_inbound_light</item>
+        <item name="vctr_message_bubble_outbound">@color/vctr_message_bubble_outbound_light</item>
 
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
@@ -105,9 +106,6 @@
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
         <item name="android:overScrollMode">never</item>
 
-        <!-- fonts -->
-        <item name="android:typeface">sans</item>
-
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
         <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
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 42c1476b79..826f584f6a 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
@@ -32,6 +32,8 @@ 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
 
+typealias ThreadRootEvent = TimelineEvent
+
 class FlowRoom(private val room: Room) {
 
     fun liveRoomSummary(): Flow<Optional<RoomSummary>> {
@@ -98,6 +100,20 @@ class FlowRoom(private val room: Room) {
     fun liveNotificationState(): Flow<RoomNotificationState> {
         return room.getLiveRoomNotificationState().asFlow()
     }
+
+    fun liveThreadList(): Flow<List<ThreadRootEvent>> {
+        return room.getAllThreadsLive().asFlow()
+                .startWith(room.coroutineDispatchers.io) {
+                    room.getAllThreads()
+                }
+    }
+
+    fun liveLocalUnreadThreadList(): Flow<List<ThreadRootEvent>> {
+        return room.getMarkedThreadNotificationsLive().asFlow()
+                .startWith(room.coroutineDispatchers.io) {
+                    room.getMarkedThreadNotifications()
+                }
+    }
 }
 
 fun Room.flow(): FlowRoom {
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index a4102f7441..083c198720 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -31,13 +31,15 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.3.18\""
+        buildConfigField "String", "SDK_VERSION", "\"1.4.2\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         resValue "string", "git_sdk_revision", "\"${gitRevision()}\""
         resValue "string", "git_sdk_revision_unix_date", "\"${gitRevisionUnixDate()}\""
         resValue "string", "git_sdk_revision_date", "\"${gitRevisionDate()}\""
 
+        // Indicates whether or not threading support is enabled
+        buildConfigField "Boolean", "THREADING_ENABLED", "${isThreadingEnabled}"
         defaultConfig {
             consumerProguardFiles 'proguard-rules.pro'
         }
@@ -139,6 +141,9 @@ dependencies {
 
     kapt 'dk.ilios:realmfieldnameshelper:2.0.0'
 
+    // Shared Preferences
+    implementation libs.androidx.preferenceKtx
+
     // Work
     implementation libs.androidx.work
 
@@ -164,7 +169,7 @@ dependencies {
     implementation libs.apache.commonsImaging
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.42'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.43'
 
     testImplementation libs.tests.junit
     testImplementation 'org.robolectric:robolectric:4.7.3'
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 3cb699378f..031d0a8bcf 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
@@ -157,14 +157,20 @@ class CommonTestHelper(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): List<TimelineEvent> {
+    private 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 ->
-                        room.sendTextMessage(formattedMessage)
+                        if (rootThreadEventId != null) {
+                            room.replyInThread(
+                                    rootThreadEventId = rootThreadEventId,
+                                    replyInThreadText = formattedMessage)
+                        } else {
+                            room.sendTextMessage(formattedMessage)
+                        }
                     }
                     waitWithLatch(timeout) { latch ->
                         val timelineListener = object : Timeline.Listener {
@@ -196,6 +202,27 @@ class CommonTestHelper(context: Context) {
         return sentEvents
     }
 
+    /**
+     * Reply in a thread
+     * @param room         the room where to send the messages
+     * @param message      the message to send
+     * @param numberOfMessages the number of time the message will be sent
+     */
+    fun replyInThreadMessage(
+            room: Room,
+            message: String,
+            numberOfMessages: Int,
+            rootThreadEventId: String,
+            timeout: Long = TestConstants.timeOutMillis): List<TimelineEvent> {
+        val timeline = room.createTimeline(null, TimelineSettings(10))
+        timeline.start()
+        val sentEvents = sendTextMessagesBatched(timeline, room, message, numberOfMessages, timeout, rootThreadEventId)
+        timeline.dispose()
+        // Check that all events has been created
+        assertEquals("Message number do not match $sentEvents", numberOfMessages.toLong(), sentEvents.size.toLong())
+        return sentEvents
+    }
+
     // PRIVATE METHODS *****************************************************************************
 
     /**
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
new file mode 100644
index 0000000000..6aa4f4cc32
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
@@ -0,0 +1,339 @@
+/*
+ * 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.session.room.threads
+
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeFalse
+import org.amshove.kluent.shouldBeNull
+import org.amshove.kluent.shouldBeTrue
+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.events.model.getRootThreadEventId
+import org.matrix.android.sdk.api.session.events.model.isTextMessage
+import org.matrix.android.sdk.api.session.events.model.isThread
+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
+import org.matrix.android.sdk.common.CryptoTestHelper
+import java.util.concurrent.CountDownLatch
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class ThreadMessagingTest : InstrumentedTest {
+
+    @Test
+    fun reply_in_thread_should_create_a_thread() {
+        val commonTestHelper = CommonTestHelper(context())
+        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(false)
+
+        val aliceSession = cryptoTestData.firstSession
+        val aliceRoomId = cryptoTestData.roomId
+
+        val aliceRoom = aliceSession.getRoom(aliceRoomId)!!
+
+        // Let's send a message in the normal timeline
+        val textMessage = "This is a normal timeline message"
+        val sentMessages = commonTestHelper.sendTextMessage(
+                room = aliceRoom,
+                message = textMessage,
+                nbOfMessages = 1)
+
+        val initMessage = sentMessages.first()
+
+        initMessage.root.isThread().shouldBeFalse()
+        initMessage.root.isTextMessage().shouldBeTrue()
+        initMessage.root.getRootThreadEventId().shouldBeNull()
+        initMessage.root.threadDetails?.isRootThread?.shouldBeFalse()
+
+        // Let's reply in timeline to that message
+        val repliesInThread = commonTestHelper.replyInThreadMessage(
+                room = aliceRoom,
+                message = "Reply In the above thread",
+                numberOfMessages = 1,
+                rootThreadEventId = initMessage.root.eventId.orEmpty())
+
+        val replyInThread = repliesInThread.first()
+        replyInThread.root.isThread().shouldBeTrue()
+        replyInThread.root.isTextMessage().shouldBeTrue()
+        replyInThread.root.getRootThreadEventId().shouldBeEqualTo(initMessage.root.eventId)
+
+        // The init normal message should now be a root thread event
+        val timeline = aliceRoom.createTimeline(null, TimelineSettings(30))
+        timeline.start()
+
+        aliceSession.startSync(true)
+        run {
+            val lock = CountDownLatch(1)
+            val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
+                val initMessageThreadDetails = snapshot.firstOrNull {
+                    it.root.eventId == initMessage.root.eventId
+                }?.root?.threadDetails
+                initMessageThreadDetails?.isRootThread?.shouldBeTrue()
+                initMessageThreadDetails?.numberOfThreads?.shouldBe(1)
+                true
+            }
+            timeline.addListener(eventsListener)
+            commonTestHelper.await(lock, 600_000)
+        }
+        aliceSession.stopSync()
+    }
+
+    @Test
+    fun reply_in_thread_should_create_a_thread_from_other_user() {
+        val commonTestHelper = CommonTestHelper(context())
+        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
+
+        val aliceSession = cryptoTestData.firstSession
+        val aliceRoomId = cryptoTestData.roomId
+        val aliceRoom = aliceSession.getRoom(aliceRoomId)!!
+
+        // Let's send a message in the normal timeline
+        val textMessage = "This is a normal timeline message"
+        val sentMessages = commonTestHelper.sendTextMessage(
+                room = aliceRoom,
+                message = textMessage,
+                nbOfMessages = 1)
+
+        val initMessage = sentMessages.first()
+
+        initMessage.root.isThread().shouldBeFalse()
+        initMessage.root.isTextMessage().shouldBeTrue()
+        initMessage.root.getRootThreadEventId().shouldBeNull()
+        initMessage.root.threadDetails?.isRootThread?.shouldBeFalse()
+
+        // Let's reply in timeline to that message from another user
+        val bobSession = cryptoTestData.secondSession!!
+        val bobRoomId = cryptoTestData.roomId
+        val bobRoom = bobSession.getRoom(bobRoomId)!!
+
+        val repliesInThread = commonTestHelper.replyInThreadMessage(
+                room = bobRoom,
+                message = "Reply In the above thread",
+                numberOfMessages = 1,
+                rootThreadEventId = initMessage.root.eventId.orEmpty())
+
+        val replyInThread = repliesInThread.first()
+        replyInThread.root.isThread().shouldBeTrue()
+        replyInThread.root.isTextMessage().shouldBeTrue()
+        replyInThread.root.getRootThreadEventId().shouldBeEqualTo(initMessage.root.eventId)
+
+        // The init normal message should now be a root thread event
+        val timeline = aliceRoom.createTimeline(null, TimelineSettings(30))
+        timeline.start()
+
+        aliceSession.startSync(true)
+        run {
+            val lock = CountDownLatch(1)
+            val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
+                val initMessageThreadDetails = snapshot.firstOrNull { it.root.eventId == initMessage.root.eventId }?.root?.threadDetails
+                initMessageThreadDetails?.isRootThread?.shouldBeTrue()
+                initMessageThreadDetails?.numberOfThreads?.shouldBe(1)
+                true
+            }
+            timeline.addListener(eventsListener)
+            commonTestHelper.await(lock, 600_000)
+        }
+        aliceSession.stopSync()
+
+        bobSession.startSync(true)
+        run {
+            val lock = CountDownLatch(1)
+            val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
+                val initMessageThreadDetails = snapshot.firstOrNull { it.root.eventId == initMessage.root.eventId }?.root?.threadDetails
+                initMessageThreadDetails?.isRootThread?.shouldBeTrue()
+                initMessageThreadDetails?.numberOfThreads?.shouldBe(1)
+                true
+            }
+            timeline.addListener(eventsListener)
+            commonTestHelper.await(lock, 600_000)
+        }
+        bobSession.stopSync()
+    }
+
+    @Test
+    fun reply_in_thread_to_timeline_message_multiple_times() {
+        val commonTestHelper = CommonTestHelper(context())
+        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(false)
+
+        val aliceSession = cryptoTestData.firstSession
+        val aliceRoomId = cryptoTestData.roomId
+
+        val aliceRoom = aliceSession.getRoom(aliceRoomId)!!
+
+        // Let's send 5 messages in the normal timeline
+        val textMessage = "This is a normal timeline message"
+        val sentMessages = commonTestHelper.sendTextMessage(
+                room = aliceRoom,
+                message = textMessage,
+                nbOfMessages = 5)
+
+        sentMessages.forEach {
+            it.root.isThread().shouldBeFalse()
+            it.root.isTextMessage().shouldBeTrue()
+            it.root.getRootThreadEventId().shouldBeNull()
+            it.root.threadDetails?.isRootThread?.shouldBeFalse()
+        }
+        // let's start the thread from the second message
+        val selectedInitMessage = sentMessages[1]
+
+        // Let's reply 40 times in the timeline to the second message
+        val repliesInThread = commonTestHelper.replyInThreadMessage(
+                room = aliceRoom,
+                message = "Reply In the above thread",
+                numberOfMessages = 40,
+                rootThreadEventId = selectedInitMessage.root.eventId.orEmpty())
+
+        repliesInThread.forEach {
+            it.root.isThread().shouldBeTrue()
+            it.root.isTextMessage().shouldBeTrue()
+            it.root.getRootThreadEventId()?.shouldBeEqualTo(selectedInitMessage.root.eventId.orEmpty()) ?: assert(false)
+        }
+
+        // The init normal message should now be a root thread event
+        val timeline = aliceRoom.createTimeline(null, TimelineSettings(30))
+        timeline.start()
+
+        aliceSession.startSync(true)
+        run {
+            val lock = CountDownLatch(1)
+            val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
+                val initMessageThreadDetails = snapshot.firstOrNull { it.root.eventId == selectedInitMessage.root.eventId }?.root?.threadDetails
+                // Selected init message should be the thread root
+                initMessageThreadDetails?.isRootThread?.shouldBeTrue()
+                // All threads should be 40
+                initMessageThreadDetails?.numberOfThreads?.shouldBeEqualTo(40)
+                true
+            }
+            // Because we sent more than 30 messages we should paginate a bit more
+            timeline.paginate(Timeline.Direction.BACKWARDS, 50)
+            timeline.addListener(eventsListener)
+            commonTestHelper.await(lock, 600_000)
+        }
+        aliceSession.stopSync()
+    }
+
+    @Test
+    fun thread_summary_advanced_validation_after_multiple_messages_in_multiple_threads() {
+        val commonTestHelper = CommonTestHelper(context())
+        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
+
+        val aliceSession = cryptoTestData.firstSession
+        val aliceRoomId = cryptoTestData.roomId
+
+        val aliceRoom = aliceSession.getRoom(aliceRoomId)!!
+
+        // Let's send 5 messages in the normal timeline
+        val textMessage = "This is a normal timeline message"
+        val sentMessages = commonTestHelper.sendTextMessage(
+                room = aliceRoom,
+                message = textMessage,
+                nbOfMessages = 5)
+
+        sentMessages.forEach {
+            it.root.isThread().shouldBeFalse()
+            it.root.isTextMessage().shouldBeTrue()
+            it.root.getRootThreadEventId().shouldBeNull()
+            it.root.threadDetails?.isRootThread?.shouldBeFalse()
+        }
+        // let's start the thread from the second message
+        val firstMessage = sentMessages[0]
+        val secondMessage = sentMessages[1]
+
+        // Alice will reply in thread to the second message 35 times
+        val aliceThreadRepliesInSecondMessage = commonTestHelper.replyInThreadMessage(
+                room = aliceRoom,
+                message = "Alice reply In the above second thread message",
+                numberOfMessages = 35,
+                rootThreadEventId = secondMessage.root.eventId.orEmpty())
+
+        // Let's reply in timeline to that message from another user
+        val bobSession = cryptoTestData.secondSession!!
+        val bobRoomId = cryptoTestData.roomId
+        val bobRoom = bobSession.getRoom(bobRoomId)!!
+
+        // Bob will reply in thread to the first message 35 times
+        val bobThreadRepliesInFirstMessage = commonTestHelper.replyInThreadMessage(
+                room = bobRoom,
+                message = "Bob reply In the above first thread message",
+                numberOfMessages = 42,
+                rootThreadEventId = firstMessage.root.eventId.orEmpty())
+
+        // Bob will also reply in second thread 5 times
+        val bobThreadRepliesInSecondMessage = commonTestHelper.replyInThreadMessage(
+                room = bobRoom,
+                message = "Another Bob reply In the above second thread message",
+                numberOfMessages = 20,
+                rootThreadEventId = secondMessage.root.eventId.orEmpty())
+
+        aliceThreadRepliesInSecondMessage.forEach {
+            it.root.isThread().shouldBeTrue()
+            it.root.isTextMessage().shouldBeTrue()
+            it.root.getRootThreadEventId()?.shouldBeEqualTo(secondMessage.root.eventId.orEmpty()) ?: assert(false)
+        }
+
+        bobThreadRepliesInFirstMessage.forEach {
+            it.root.isThread().shouldBeTrue()
+            it.root.isTextMessage().shouldBeTrue()
+            it.root.getRootThreadEventId()?.shouldBeEqualTo(firstMessage.root.eventId.orEmpty()) ?: assert(false)
+        }
+
+        bobThreadRepliesInSecondMessage.forEach {
+            it.root.isThread().shouldBeTrue()
+            it.root.isTextMessage().shouldBeTrue()
+            it.root.getRootThreadEventId()?.shouldBeEqualTo(secondMessage.root.eventId.orEmpty()) ?: assert(false)
+        }
+
+        // The init normal message should now be a root thread event
+        val timeline = aliceRoom.createTimeline(null, TimelineSettings(30))
+        timeline.start()
+
+        aliceSession.startSync(true)
+        run {
+            val lock = CountDownLatch(1)
+            val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
+                val firstMessageThreadDetails = snapshot.firstOrNull { it.root.eventId == firstMessage.root.eventId }?.root?.threadDetails
+                val secondMessageThreadDetails = snapshot.firstOrNull { it.root.eventId == secondMessage.root.eventId }?.root?.threadDetails
+
+                // first & second message should be the thread root
+                firstMessageThreadDetails?.isRootThread?.shouldBeTrue()
+                secondMessageThreadDetails?.isRootThread?.shouldBeTrue()
+
+                // First thread message should contain 42
+                firstMessageThreadDetails?.numberOfThreads shouldBeEqualTo 42
+                // Second thread message should contain 35+20
+                secondMessageThreadDetails?.numberOfThreads shouldBeEqualTo 55
+
+                true
+            }
+            // Because we sent more than 30 messages we should paginate a bit more
+            timeline.paginate(Timeline.Direction.BACKWARDS, 50)
+            timeline.paginate(Timeline.Direction.BACKWARDS, 50)
+            timeline.addListener(eventsListener)
+            commonTestHelper.await(lock, 600_000)
+        }
+        aliceSession.stopSync()
+    }
+}
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 5fbfaf99a0..20faa81bb6 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
@@ -344,7 +344,6 @@ class SpaceHierarchyTest : InstrumentedTest {
         // Test part one of the rooms
 
         val bRoomId = spaceBInfo.roomIds.first()
-        val bRoom = session.getRoom(bRoomId)
 
         commonTestHelper.waitWithLatch { latch ->
             val flatAChildren = session.getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId)
@@ -360,7 +359,7 @@ class SpaceHierarchyTest : InstrumentedTest {
             }
 
             // part from b room
-            bRoom!!.leave(null)
+            session.leaveRoom(bRoomId)
             // The room should have disapear from flat children
             flatAChildren.observeForever(childObserver)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
index 901ba75d16..5fedff53f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
@@ -99,12 +99,31 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         private lateinit var instance: Matrix
         private val isInit = AtomicBoolean(false)
 
+        /**
+         * Creates a new instance of Matrix, it's recommended to manage this instance as a singleton.
+         * To make use of the built in singleton use Matrix.initialize() and/or Matrix.getInstance(context) instead
+         **/
+        fun createInstance(context: Context, matrixConfiguration: MatrixConfiguration): Matrix {
+            return Matrix(context.applicationContext, matrixConfiguration)
+        }
+
+        /**
+         * Initializes a singleton instance of Matrix for the given MatrixConfiguration
+         * This instance will be returned by Matrix.getInstance(context)
+         */
+        @Deprecated("Use Matrix.createInstance and manage the instance manually")
         fun initialize(context: Context, matrixConfiguration: MatrixConfiguration) {
             if (isInit.compareAndSet(false, true)) {
                 instance = Matrix(context.applicationContext, matrixConfiguration)
             }
         }
 
+        /**
+         * Either provides an already initialized singleton Matrix instance or queries the application context for a MatrixConfiguration.Provider
+         * to lazily create and store the instance.
+         */
+        @Suppress("deprecation") // suppressing warning as this method is unused but is still provided for SDK clients
+        @Deprecated("Use Matrix.createInstance and manage the instance manually")
         fun getInstance(context: Context): Matrix {
             if (isInit.compareAndSet(false, true)) {
                 val appContext = context.applicationContext
@@ -113,7 +132,8 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
                     instance = Matrix(appContext, matrixConfiguration)
                 } else {
                     throw IllegalStateException("Matrix is not initialized properly." +
-                            " You should call Matrix.initialize or let your application implements MatrixConfiguration.Provider.")
+                            " If you want to manage your own Matrix instance use Matrix.createInstance" +
+                            " otherwise you should call Matrix.initialize or let your application implement MatrixConfiguration.Provider.")
                 }
             }
             return instance
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 306ed45500..c87f21d7ac 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
@@ -66,6 +66,7 @@ data class MatrixConfiguration(
     /**
      * Can be implemented by your Application class.
      */
+    @Deprecated("Use Matrix.createInstance and manage the instance manually instead of Matrix.getInstance")
     interface Provider {
         fun providesMatrixConfiguration(): MatrixConfiguration
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
index 88268f0f86..76885d8545 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
@@ -50,6 +50,9 @@ interface PushRuleService {
 
 //    fun fulfilledBingRule(event: Event, rules: List<PushRule>): PushRule?
 
+    fun resolveSenderNotificationPermissionCondition(event: Event,
+                                                     condition: SenderNotificationPermissionCondition): Boolean
+
     interface PushRuleListener {
         fun onEvents(pushEvents: PushEvents)
     }
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 aad5fce33e..df57ca5681 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
@@ -25,9 +25,14 @@ import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 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.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.relation.RelationDefaultContent
+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
+import org.matrix.android.sdk.api.util.ContentUtils
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
@@ -98,6 +103,9 @@ data class Event(
     @Transient
     var sendStateDetails: String? = null
 
+    @Transient
+    var threadDetails: ThreadDetails? = null
+
     fun sendStateError(): MatrixError? {
         return sendStateDetails?.let {
             val matrixErrorAdapter = MoshiProvider.providesMoshi().adapter(MatrixError::class.java)
@@ -123,6 +131,7 @@ data class Event(
             it.mCryptoErrorReason = mCryptoErrorReason
             it.sendState = sendState
             it.ageLocalTs = ageLocalTs
+            it.threadDetails = threadDetails
         }
     }
 
@@ -185,6 +194,51 @@ data class Event(
         return contentMap?.let { JSONObject(adapter.toJson(it)).toString(4) }
     }
 
+    /**
+     * Returns a user friendly content depending on the message type.
+     * It can be used especially for message summaries.
+     * It will return a decrypted text message or an empty string otherwise.
+     */
+    fun getDecryptedTextSummary(): String? {
+        if (isRedacted()) return "Message Deleted"
+        val text = getDecryptedValue() ?: return null
+        return when {
+            isReplyRenderedInThread() || isQuote() -> ContentUtils.extractUsefulTextFromReply(text)
+            isFileMessage()                        -> "sent a file."
+            isAudioMessage()                       -> "sent an audio file."
+            isImageMessage()                       -> "sent an image."
+            isVideoMessage()                       -> "sent a video."
+            isSticker()                            -> "sent a sticker"
+            isPoll()                               -> getPollQuestion() ?: "created a poll."
+            else                                   -> text
+        }
+    }
+
+    private fun Event.isQuote(): Boolean {
+        if (isReplyRenderedInThread()) return false
+        return getDecryptedValue("formatted_body")?.contains("<blockquote>") ?: false
+    }
+
+    /**
+     * Determines whether or not current event has mentioned the user
+     */
+    fun isUserMentioned(userId: String): Boolean {
+        return getDecryptedValue("formatted_body")?.contains(userId) ?: false
+    }
+
+    /**
+     * Decrypt the message, or return the pure payload value if there is no encryption
+     */
+    private fun getDecryptedValue(key: String = "body"): String? {
+        return if (isEncrypted()) {
+            @Suppress("UNCHECKED_CAST")
+            val decryptedContent = mxDecryptionResult?.payload?.get("content") as? JsonDict
+            decryptedContent?.get(key) as? String
+        } else {
+            content?.get(key) as? String
+        }
+    }
+
     /**
      * Tells if the event is redacted
      */
@@ -217,7 +271,7 @@ data class Event(
         if (mCryptoError != other.mCryptoError) return false
         if (mCryptoErrorReason != other.mCryptoErrorReason) return false
         if (sendState != other.sendState) return false
-
+        if (threadDetails != other.threadDetails) return false
         return true
     }
 
@@ -236,6 +290,8 @@ data class Event(
         result = 31 * result + (mCryptoError?.hashCode() ?: 0)
         result = 31 * result + (mCryptoErrorReason?.hashCode() ?: 0)
         result = 31 * result + sendState.hashCode()
+        result = 31 * result + threadDetails.hashCode()
+
         return result
     }
 }
@@ -243,70 +299,101 @@ data class Event(
 fun Event.isTextMessage(): Boolean {
     return getClearType() == EventType.MESSAGE &&
             when (getClearContent()?.get(MessageContent.MSG_TYPE_JSON_KEY)) {
-        MessageType.MSGTYPE_TEXT,
-        MessageType.MSGTYPE_EMOTE,
-        MessageType.MSGTYPE_NOTICE -> true
-        else                       -> false
-    }
+                MessageType.MSGTYPE_TEXT,
+                MessageType.MSGTYPE_EMOTE,
+                MessageType.MSGTYPE_NOTICE -> true
+                else                       -> false
+            }
 }
 
 fun Event.isImageMessage(): Boolean {
     return getClearType() == EventType.MESSAGE &&
             when (getClearContent()?.get(MessageContent.MSG_TYPE_JSON_KEY)) {
-        MessageType.MSGTYPE_IMAGE -> true
-        else                      -> false
-    }
+                MessageType.MSGTYPE_IMAGE -> true
+                else                      -> false
+            }
 }
 
 fun Event.isVideoMessage(): Boolean {
     return getClearType() == EventType.MESSAGE &&
             when (getClearContent()?.get(MessageContent.MSG_TYPE_JSON_KEY)) {
-        MessageType.MSGTYPE_VIDEO -> true
-        else                      -> false
-    }
+                MessageType.MSGTYPE_VIDEO -> true
+                else                      -> false
+            }
 }
 
 fun Event.isAudioMessage(): Boolean {
     return getClearType() == EventType.MESSAGE &&
             when (getClearContent()?.get(MessageContent.MSG_TYPE_JSON_KEY)) {
-        MessageType.MSGTYPE_AUDIO -> true
-        else                      -> false
-    }
+                MessageType.MSGTYPE_AUDIO -> true
+                else                      -> false
+            }
 }
 
 fun Event.isFileMessage(): Boolean {
     return getClearType() == EventType.MESSAGE &&
             when (getClearContent()?.get(MessageContent.MSG_TYPE_JSON_KEY)) {
-        MessageType.MSGTYPE_FILE -> true
-        else                     -> false
-    }
+                MessageType.MSGTYPE_FILE -> true
+                else                     -> false
+            }
 }
 
 fun Event.isAttachmentMessage(): Boolean {
     return getClearType() == EventType.MESSAGE &&
             when (getClearContent()?.get(MessageContent.MSG_TYPE_JSON_KEY)) {
-        MessageType.MSGTYPE_IMAGE,
-        MessageType.MSGTYPE_AUDIO,
-        MessageType.MSGTYPE_VIDEO,
-        MessageType.MSGTYPE_FILE -> true
-        else                     -> false
-    }
+                MessageType.MSGTYPE_IMAGE,
+                MessageType.MSGTYPE_AUDIO,
+                MessageType.MSGTYPE_VIDEO,
+                MessageType.MSGTYPE_FILE -> true
+                else                     -> false
+            }
 }
 
+fun Event.isPoll(): Boolean = getClearType() == EventType.POLL_START || getClearType() == EventType.POLL_END
+
+fun Event.isSticker(): Boolean = getClearType() == EventType.STICKER
+
 fun Event.getRelationContent(): RelationDefaultContent? {
     return if (isEncrypted()) {
         content.toModel<EncryptedEventContent>()?.relatesTo
     } else {
-        content.toModel<MessageContent>()?.relatesTo
+        content.toModel<MessageContent>()?.relatesTo ?: run {
+            // Special case to handle stickers, while there is only a local msgtype for stickers
+            if (getClearType() == EventType.STICKER) {
+                getClearContent().toModel<MessageStickerContent>()?.relatesTo
+            } else {
+                null
+            }
+        }
     }
 }
 
+/**
+ * Returns the poll question or null otherwise
+ */
+fun Event.getPollQuestion(): String? =
+        getPollContent()?.pollCreationInfo?.question?.question
+
+/**
+ * Returns the relation content for a specific type or null otherwise
+ */
+fun Event.getRelationContentForType(type: String): RelationDefaultContent? =
+        getRelationContent()?.takeIf { it.type == type }
+
 fun Event.isReply(): Boolean {
     return getRelationContent()?.inReplyTo?.eventId != null
 }
 
+fun Event.isReplyRenderedInThread(): Boolean {
+    return isReply() && getRelationContent()?.inReplyTo?.shouldRenderInThread() == true
+}
+
+fun Event.isThread(): Boolean = getRelationContentForType(RelationType.IO_THREAD)?.eventId != null
+
+fun Event.getRootThreadEventId(): String? = getRelationContentForType(RelationType.IO_THREAD)?.eventId
+
 fun Event.isEdition(): Boolean {
-    return getRelationContent()?.takeIf { it.type == RelationType.REPLACE }?.eventId != null
+    return getRelationContentForType(RelationType.REPLACE)?.eventId != null
 }
 
 fun Event.getPresenceContent(): PresenceContent? {
@@ -315,3 +402,7 @@ fun Event.getPresenceContent(): PresenceContent? {
 
 fun Event.isInvitation(): Boolean = type == EventType.STATE_ROOM_MEMBER &&
         content?.toModel<RoomMemberContent>()?.membership == Membership.INVITE
+
+fun Event.getPollContent(): MessagePollContent? {
+    return content.toModel<MessagePollContent>()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
index f67efc50ba..fb26264ad7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
@@ -28,9 +28,9 @@ object RelationType {
     /** Lets you define an event which references an existing event.*/
     const val REFERENCE = "m.reference"
 
-    /** Lets you define an thread event that belongs to another existing event.*/
-//    const val THREAD = "m.thread"         // m.thread is not yet released in the backend
-    const val THREAD = "io.element.thread"  // io.element.thread will be replaced by m.thread when it is released
+    /** Lets you define an event which is a thread reply to an existing event.*/
+    const val THREAD = "m.thread"
+    const val IO_THREAD = "io.element.thread"
 
     /** Lets you define an event which adds a response to an existing event.*/
     const val RESPONSE = "org.matrix.response"
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 3ed6a7ebb2..2256dfb8f0 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
@@ -21,6 +21,18 @@ data class HomeServerCapabilities(
          * True if it is possible to change the password of the account.
          */
         val canChangePassword: Boolean = true,
+        /**
+         * True if it is possible to change the display name of the account.
+         */
+        val canChangeDisplayName: Boolean = true,
+        /**
+         * True if it is possible to change the avatar of the account.
+         */
+        val canChangeAvatar: Boolean = true,
+        /**
+         * True if it is possible to change the 3pid associations of the account.
+         */
+        val canChange3pid: Boolean = true,
         /**
          * Max size of file which can be uploaded to the homeserver in bytes. [MAX_UPLOAD_FILE_SIZE_UNKNOWN] if unknown or not retrieved yet
          */
@@ -76,6 +88,7 @@ data class HomeServerCapabilities(
             }
         }
     }
+
     fun isFeatureSupported(feature: String, byRoomVersion: String): Boolean {
         if (roomVersions?.capabilities == null) return false
         val info = roomVersions.capabilities[feature] ?: return false
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
index 33fc8b052b..bfba43a82d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
@@ -47,5 +47,9 @@ data class PreviewUrlData(
         // Value of field "og:description"
         val description: String?,
         // Value of field "og:image"
-        val mxcUrl: String?
+        val mxcUrl: String?,
+        // Value of field "og:image:width"
+        val imageWidth: Int?,
+        // Value of field "og:image:height"
+        val imageHeight: Int?
 )
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 6c0e730499..d930a5d0fd 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
@@ -32,6 +32,7 @@ import org.matrix.android.sdk.api.session.room.send.DraftService
 import org.matrix.android.sdk.api.session.room.send.SendService
 import org.matrix.android.sdk.api.session.room.state.StateService
 import org.matrix.android.sdk.api.session.room.tags.TagsService
+import org.matrix.android.sdk.api.session.room.threads.ThreadsService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
@@ -45,6 +46,7 @@ import org.matrix.android.sdk.api.util.Optional
  */
 interface Room :
         TimelineService,
+        ThreadsService,
         SendService,
         DraftService,
         ReadService,
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 e4bd498990..bca432320d 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
@@ -76,6 +76,13 @@ interface RoomService {
             thirdPartySigned: SignInvitationResult
     )
 
+    /**
+     * Leave the room, or reject an invitation.
+     * @param roomId the roomId of the room to leave
+     * @param reason optional reason for leaving the room
+     */
+    suspend fun leaveRoom(roomId: String, reason: String? = null)
+
     /**
      * Get a room from a roomId
      * @param roomId the roomId to look for.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
index d5bc65c142..6c8e2d310c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
@@ -81,14 +81,4 @@ interface MembershipService {
 
     @Deprecated("Use remove instead", ReplaceWith("remove(userId, reason)"))
     suspend fun kick(userId: String, reason: String? = null) = remove(userId, reason)
-
-    /**
-     * Join the room, or accept an invitation.
-     */
-    suspend fun join(reason: String? = null, viaServers: List<String> = emptyList())
-
-    /**
-     * Leave the room, or reject an invitation.
-     */
-    suspend fun leave(reason: String? = null)
 }
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 67cb9600c8..5639730219 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
@@ -16,9 +16,7 @@
 
 package org.matrix.android.sdk.api.session.room.model
 
-import org.matrix.android.sdk.api.session.user.model.User
-
 data class ReadReceipt(
-        val user: User,
+        val roomMember: RoomMemberSummary,
         val originServerTs: Long
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
index c090487c58..d07bd2d73a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
@@ -64,4 +64,12 @@ data class MessageLocationContent(
 ) : MessageContent {
 
     fun getBestGeoUri() = locationInfo?.geoUri ?: geoUri
+
+    /**
+     * @return true if the location asset is a user location, not a generic one.
+     */
+    fun isSelfLocation(): Boolean {
+        // Should behave like m.self if locationAsset is null
+        return locationAsset?.type == null || locationAsset.type == LocationAssetType.SELF
+    }
 }
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 763d4bb892..09114436f0 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
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.api.session.room.model.relation
 import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
+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.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Cancelable
@@ -45,6 +46,9 @@ import org.matrix.android.sdk.api.util.Optional
  *  m.reference - lets you define an event which references an existing event.
  *              When aggregated, currently doesn't do anything special, but in future could bundle chains of references (i.e. threads).
  *              These are primarily intended for handling replies (and in future threads).
+ *
+ *  m.thread - lets you define an event which is a thread reply to an existing event.
+ *             When aggregated, returns the most thread event
  */
 interface RelationService {
 
@@ -62,8 +66,8 @@ interface RelationService {
      * @param targetEventId the id of the event being reacted
      * @param reaction the reaction (preferably emoji)
      */
-    fun undoReaction(targetEventId: String,
-                     reaction: String): Cancelable
+    suspend fun undoReaction(targetEventId: String,
+                             reaction: String): Cancelable
 
     /**
      * Edit a poll.
@@ -118,10 +122,15 @@ interface RelationService {
      * @param eventReplied the event referenced by the reply
      * @param replyText the reply text
      * @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
      */
     fun replyToMessage(eventReplied: TimelineEvent,
                        replyText: CharSequence,
-                       autoMarkdown: Boolean = false): Cancelable?
+                       autoMarkdown: Boolean = false,
+                       showInThread: Boolean = false,
+                       rootThreadEventId: String? = null
+    ): Cancelable?
 
     /**
      * Get the current EventAnnotationsSummary
@@ -136,4 +145,31 @@ interface RelationService {
      * @return the LiveData of EventAnnotationsSummary
      */
     fun getEventAnnotationsSummaryLive(eventId: String): LiveData<Optional<EventAnnotationsSummary>>
+
+    /**
+     * Creates a thread reply for an existing timeline event
+     * The replyInThreadText can be a Spannable and contains special spans (MatrixItemSpan) that will be translated
+     * by the sdk into pills.
+     * @param rootThreadEventId the root thread eventId
+     * @param replyInThreadText the reply text
+     * @param msgType the message type: MessageType.MSGTYPE_TEXT (default) or MessageType.MSGTYPE_EMOTE
+     * @param formattedText The formatted body using MessageType#FORMAT_MATRIX_HTML
+     * @param autoMarkdown If true, the SDK will generate a formatted HTML message from the body text if markdown syntax is present
+     * @param eventReplied the event referenced by the reply within a thread
+     */
+    fun replyInThread(rootThreadEventId: String,
+                      replyInThreadText: CharSequence,
+                      msgType: String = MessageType.MSGTYPE_TEXT,
+                      autoMarkdown: Boolean = false,
+                      formattedText: String? = null,
+                      eventReplied: TimelineEvent? = null): Cancelable?
+
+    /**
+     * Get all the thread replies for the specified rootThreadEventId
+     * The return list will contain the original root thread event and all the thread replies to that event
+     * Note: We will use a large limit value in order to avoid using pagination until it would be 100% ready
+     * from the backend
+     * @param rootThreadEventId the root thread eventId
+     */
+    suspend fun fetchThreadTimeline(rootThreadEventId: String): Boolean
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt
index 251328bea2..412a1bfca9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt
@@ -21,5 +21,8 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class ReplyToContent(
-        @Json(name = "event_id") val eventId: String? = null
+        @Json(name = "event_id") val eventId: String? = null,
+        @Json(name = "render_in") val renderIn: List<String>? = null
 )
+
+fun ReplyToContent.shouldRenderInThread(): Boolean = renderIn?.contains("m.thread") == true
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 20d00394df..913dbfd010 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
@@ -64,7 +64,7 @@ interface SendService {
      * @param autoMarkdown If true, the SDK will generate a formatted HTML message from the body text if markdown syntax is present
      * @return a [Cancelable]
      */
-    fun sendQuotedTextMessage(quotedEvent: TimelineEvent, text: String, autoMarkdown: Boolean): Cancelable
+    fun sendQuotedTextMessage(quotedEvent: TimelineEvent, text: String, autoMarkdown: Boolean, rootThreadEventId: String? = null): Cancelable
 
     /**
      * Method to send a media asynchronously.
@@ -72,11 +72,13 @@ interface SendService {
      * @param compressBeforeSending set to true to compress images before sending them
      * @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
      * @return a [Cancelable]
      */
     fun sendMedia(attachment: ContentAttachmentData,
                   compressBeforeSending: Boolean,
-                  roomIds: Set<String>): Cancelable
+                  roomIds: Set<String>,
+                  rootThreadEventId: String? = null): Cancelable
 
     /**
      * Method to send a list of media asynchronously.
@@ -84,11 +86,13 @@ interface SendService {
      * @param compressBeforeSending set to true to compress images before sending them
      * @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
      * @return a [Cancelable]
      */
     fun sendMedias(attachments: List<ContentAttachmentData>,
                    compressBeforeSending: Boolean,
-                   roomIds: Set<String>): Cancelable
+                   roomIds: Set<String>,
+                   rootThreadEventId: String? = null): Cancelable
 
     /**
      * Send a poll to the room.
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
new file mode 100644
index 0000000000..e4d1d979e1
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/ThreadsService.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.session.room.threads
+
+import androidx.lifecycle.LiveData
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+
+/**
+ * This interface defines methods to interact with threads related features.
+ * It's implemented at the room level within the main timeline.
+ */
+interface ThreadsService {
+
+    /**
+     * Returns a [LiveData] list of all the thread root TimelineEvents that exists at the room level
+     */
+    fun getAllThreadsLive(): LiveData<List<TimelineEvent>>
+
+    /**
+     * Returns a list of all the thread root TimelineEvents that exists at the room level
+     */
+    fun getAllThreads(): List<TimelineEvent>
+
+    /**
+     * Returns a [LiveData] list of all the marked unread threads that exists at the room level
+     */
+    fun getMarkedThreadNotificationsLive(): LiveData<List<TimelineEvent>>
+
+    /**
+     * Returns a list of all the marked unread threads that exists at the room level
+     */
+    fun getMarkedThreadNotifications(): List<TimelineEvent>
+
+    /**
+     * Returns whether or not the current user is participating in the thread
+     * @param rootThreadEventId the eventId of the current thread
+     */
+    fun isUserParticipatingInThread(rootThreadEventId: String): Boolean
+
+    /**
+     * Enhance the provided root thread TimelineEvent [List] by adding the latest
+     * message edition for that thread
+     * @return the enhanced [List] with edited updates
+     */
+    fun mapEventsWithEdition(threads: List<TimelineEvent>): List<TimelineEvent>
+
+    /**
+     * Marks the current thread as read in local DB.
+     * note: read receipts within threads are not yet supported with the API
+     * @param rootThreadEventId the root eventId of the current thread
+     */
+    suspend fun markThreadAsRead(rootThreadEventId: String)
+}
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 241e5f3b9b..d47a656798 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
@@ -43,7 +43,7 @@ interface Timeline {
     /**
      * This must be called before any other method after creating the timeline. It ensures the underlying database is open
      */
-    fun start()
+    fun start(rootThreadEventId: String? = null)
 
     /**
      * This must be called when you don't need the timeline. It ensures the underlying database get closed.
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 3f7d2d1278..6f8bae876b 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
@@ -22,7 +22,9 @@ 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.isEdition
+import org.matrix.android.sdk.api.session.events.model.isPoll
 import org.matrix.android.sdk.api.session.events.model.isReply
+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.room.model.EventAnnotationsSummary
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
@@ -149,6 +151,13 @@ fun TimelineEvent.isEdition(): Boolean {
     return root.isEdition()
 }
 
+fun TimelineEvent.isPoll(): Boolean =
+        root.isPoll()
+
+fun TimelineEvent.isSticker(): Boolean {
+    return root.isSticker()
+}
+
 /**
  * Get the latest message body, after a possible edition, stripping the reply prefix if necessary
  */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
index ceffedb234..6548453c8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
@@ -27,5 +27,14 @@ data class TimelineSettings(
         /**
          * If true, will build read receipts for each event.
          */
-        val buildReadReceipts: Boolean = true
-)
+        val buildReadReceipts: Boolean = true,
+        /**
+         * The root thread eventId if this is a thread timeline, or null if this is NOT a thread timeline
+         */
+        val rootThreadEventId: String? = null) {
+
+    /**
+     * Returns true if this is a thread timeline or false otherwise
+     */
+    fun isThreadTimeline() = rootThreadEventId != null
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 207050be7d..f0ed9daac5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -26,8 +26,6 @@ interface Space {
 
     val spaceId: String
 
-    suspend fun leave(reason: String? = null)
-
     /**
      * A current snapshot of [RoomSummary] associated with the space
      */
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 357c0b941a..41c4e7eed1 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
@@ -87,6 +87,13 @@ interface SpaceService {
 
     suspend fun rejectInvite(spaceId: String, reason: String?)
 
+    /**
+     * Leave the space, or reject an invitation.
+     * @param spaceId the spaceId of the space to leave
+     * @param reason optional reason for leaving the space
+     */
+    suspend fun leaveSpace(spaceId: String, reason: String? = null)
+
 //    fun getSpaceParentsOfRoom(roomId: String) : List<SpaceSummary>
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadDetails.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadDetails.kt
new file mode 100644
index 0000000000..fafe17b2c0
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadDetails.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.threads
+
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+
+/**
+ * This class contains all the details needed for threads.
+ * Is is mainly used from within an Event.
+ */
+data class ThreadDetails(
+        val isRootThread: Boolean = false,
+        val numberOfThreads: Int = 0,
+        val threadSummarySenderInfo: SenderInfo? = null,
+        val threadSummaryLatestTextMessage: String? = null,
+        val lastMessageTimestamp: Long? = null,
+        var threadNotificationState: ThreadNotificationState = ThreadNotificationState.NO_NEW_MESSAGE,
+        val isThread: Boolean = false,
+        val lastRootThreadEdition: String? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationBadgeState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationBadgeState.kt
new file mode 100644
index 0000000000..8e861e73de
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationBadgeState.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.threads
+
+/**
+ * This class defines the state of a thread notification badge
+ */
+data class ThreadNotificationBadgeState(
+        val numberOfLocalUnreadThreads: Int = 0,
+        val isUserMentioned: Boolean = false
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationState.kt
new file mode 100644
index 0000000000..8566d68aa5
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationState.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.threads
+
+/**
+ * This class defines the state of a thread notification
+ */
+enum class ThreadNotificationState {
+
+    // There are no new message
+    NO_NEW_MESSAGE,
+
+    // There is at least one new message
+    NEW_MESSAGE,
+
+    // The is at least one new message that should be highlighted
+    // ex. "Hello @aris.kotsomitopoulos"
+    NEW_HIGHLIGHTED_MESSAGE;
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadTimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadTimelineEvent.kt
new file mode 100644
index 0000000000..7b433566b8
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadTimelineEvent.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.threads
+
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+
+/**
+ * This class contains a thread TimelineEvent along with a boolean that
+ * determines if the current user has participated in that event
+ */
+data class ThreadTimelineEvent(
+        val timelineEvent: TimelineEvent,
+        val isParticipating: Boolean
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
index 3396c4a6c9..302f7387fa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
@@ -35,7 +35,19 @@ sealed class MatrixItem(
     data class UserItem(override val id: String,
                         override val displayName: String? = null,
                         override val avatarUrl: String? = null) :
-        MatrixItem(id, displayName?.removeSuffix(ircPattern), avatarUrl) {
+            MatrixItem(id, displayName?.removeSuffix(IRC_PATTERN), avatarUrl) {
+        init {
+            if (BuildConfig.DEBUG) checkId()
+        }
+
+        override fun updateAvatar(newAvatar: String?) = copy(avatarUrl = newAvatar)
+    }
+
+    data class EveryoneInRoomItem(override val id: String,
+                                  override val displayName: String = NOTIFY_EVERYONE,
+                                  override val avatarUrl: String? = null,
+                                  val roomDisplayName: String? = null) :
+            MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
         }
@@ -46,7 +58,7 @@ sealed class MatrixItem(
     data class EventItem(override val id: String,
                          override val displayName: String? = null,
                          override val avatarUrl: String? = null) :
-        MatrixItem(id, displayName, avatarUrl) {
+            MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
         }
@@ -57,7 +69,7 @@ sealed class MatrixItem(
     data class RoomItem(override val id: String,
                         override val displayName: String? = null,
                         override val avatarUrl: String? = null) :
-        MatrixItem(id, displayName, avatarUrl) {
+            MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
         }
@@ -68,7 +80,7 @@ sealed class MatrixItem(
     data class SpaceItem(override val id: String,
                          override val displayName: String? = null,
                          override val avatarUrl: String? = null) :
-        MatrixItem(id, displayName, avatarUrl) {
+            MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
         }
@@ -79,7 +91,7 @@ sealed class MatrixItem(
     data class RoomAliasItem(override val id: String,
                              override val displayName: String? = null,
                              override val avatarUrl: String? = null) :
-        MatrixItem(id, displayName, avatarUrl) {
+            MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
         }
@@ -90,7 +102,7 @@ sealed class MatrixItem(
     data class GroupItem(override val id: String,
                          override val displayName: String? = null,
                          override val avatarUrl: String? = null) :
-        MatrixItem(id, displayName, avatarUrl) {
+            MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
         }
@@ -109,16 +121,22 @@ sealed class MatrixItem(
     /**
      * Return the prefix as defined in the matrix spec (and not extracted from the id)
      */
-    fun getIdPrefix() = when (this) {
-        is UserItem      -> '@'
-        is EventItem     -> '$'
+    private fun getIdPrefix() = when (this) {
+        is UserItem           -> '@'
+        is EventItem          -> '$'
         is SpaceItem,
-        is RoomItem      -> '!'
-        is RoomAliasItem -> '#'
-        is GroupItem     -> '+'
+        is RoomItem,
+        is EveryoneInRoomItem -> '!'
+        is RoomAliasItem      -> '#'
+        is GroupItem          -> '+'
     }
 
     fun firstLetterOfDisplayName(): String {
+        val displayName = when (this) {
+            // use the room display name for the notify everyone item
+            is EveryoneInRoomItem -> roomDisplayName
+            else                  -> displayName
+        }
         return (displayName?.takeIf { it.isNotBlank() } ?: id)
                 .let { dn ->
                     var startIndex = 0
@@ -151,7 +169,8 @@ sealed class MatrixItem(
     }
 
     companion object {
-        private const val ircPattern = " (IRC)"
+        private const val IRC_PATTERN = " (IRC)"
+        const val NOTIFY_EVERYONE = "@room"
     }
 }
 
@@ -171,6 +190,8 @@ fun RoomSummary.toMatrixItem() = if (roomType == RoomType.SPACE) {
 
 fun RoomSummary.toRoomAliasMatrixItem() = MatrixItem.RoomAliasItem(canonicalAlias ?: roomId, displayName, avatarUrl)
 
+fun RoomSummary.toEveryoneInRoomMatrixItem() = MatrixItem.EveryoneInRoomItem(id = roomId, avatarUrl = avatarUrl, roomDisplayName = displayName)
+
 // If no name is available, use room alias as Riot-Web does
 fun PublicRoom.toMatrixItem() = MatrixItem.RoomItem(roomId, name ?: getPrimaryAlias() ?: "", avatarUrl)
 
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 bb62dbbfe9..298e116199 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
@@ -46,7 +46,9 @@ internal abstract class AuthModule {
         @JvmStatic
         @Provides
         @AuthDatabase
-        fun providesRealmConfiguration(context: Context, realmKeysUtils: RealmKeysUtils): RealmConfiguration {
+        fun providesRealmConfiguration(context: Context,
+                                       realmKeysUtils: RealmKeysUtils,
+                                       authRealmMigration: AuthRealmMigration): RealmConfiguration {
             val old = File(context.filesDir, "matrix-sdk-auth")
             if (old.exists()) {
                 old.renameTo(File(context.filesDir, "matrix-sdk-auth.realm"))
@@ -58,8 +60,8 @@ internal abstract class AuthModule {
                     }
                     .name("matrix-sdk-auth.realm")
                     .modules(AuthRealmModule())
-                    .schemaVersion(AuthRealmMigration.SCHEMA_VERSION)
-                    .migration(AuthRealmMigration)
+                    .schemaVersion(authRealmMigration.schemaVersion)
+                    .migration(authRealmMigration)
                     .build()
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt
index c2104690b3..59b6471a05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt
@@ -16,102 +16,31 @@
 
 package org.matrix.android.sdk.internal.auth.db
 
-import android.net.Uri
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
-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.sessionId
-import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.auth.db.migration.MigrateAuthTo001
+import org.matrix.android.sdk.internal.auth.db.migration.MigrateAuthTo002
+import org.matrix.android.sdk.internal.auth.db.migration.MigrateAuthTo003
+import org.matrix.android.sdk.internal.auth.db.migration.MigrateAuthTo004
 import timber.log.Timber
+import javax.inject.Inject
 
-internal object AuthRealmMigration : RealmMigration {
+internal class AuthRealmMigration @Inject constructor() : RealmMigration {
+    /**
+     * Forces all AuthRealmMigration instances to be equal
+     * Avoids Realm throwing when multiple instances of the migration are set
+     */
+    override fun equals(other: Any?) = other is AuthRealmMigration
+    override fun hashCode() = 4000
 
-    // Current schema version
-    const val SCHEMA_VERSION = 4L
+    val schemaVersion = 4L
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
         Timber.d("Migrating Auth Realm from $oldVersion to $newVersion")
 
-        if (oldVersion <= 0) migrateTo1(realm)
-        if (oldVersion <= 1) migrateTo2(realm)
-        if (oldVersion <= 2) migrateTo3(realm)
-        if (oldVersion <= 3) migrateTo4(realm)
-    }
-
-    private fun migrateTo1(realm: DynamicRealm) {
-        Timber.d("Step 0 -> 1")
-        Timber.d("Create PendingSessionEntity")
-
-        realm.schema.create("PendingSessionEntity")
-                .addField(PendingSessionEntityFields.HOME_SERVER_CONNECTION_CONFIG_JSON, String::class.java)
-                .setRequired(PendingSessionEntityFields.HOME_SERVER_CONNECTION_CONFIG_JSON, true)
-                .addField(PendingSessionEntityFields.CLIENT_SECRET, String::class.java)
-                .setRequired(PendingSessionEntityFields.CLIENT_SECRET, true)
-                .addField(PendingSessionEntityFields.SEND_ATTEMPT, Integer::class.java)
-                .setRequired(PendingSessionEntityFields.SEND_ATTEMPT, true)
-                .addField(PendingSessionEntityFields.RESET_PASSWORD_DATA_JSON, String::class.java)
-                .addField(PendingSessionEntityFields.CURRENT_SESSION, String::class.java)
-                .addField(PendingSessionEntityFields.IS_REGISTRATION_STARTED, Boolean::class.java)
-                .addField(PendingSessionEntityFields.CURRENT_THREE_PID_DATA_JSON, String::class.java)
-    }
-
-    private fun migrateTo2(realm: DynamicRealm) {
-        Timber.d("Step 1 -> 2")
-        Timber.d("Add boolean isTokenValid in SessionParamsEntity, with value true")
-
-        realm.schema.get("SessionParamsEntity")
-                ?.addField(SessionParamsEntityFields.IS_TOKEN_VALID, Boolean::class.java)
-                ?.transform { it.set(SessionParamsEntityFields.IS_TOKEN_VALID, true) }
-    }
-
-    private fun migrateTo3(realm: DynamicRealm) {
-        Timber.d("Step 2 -> 3")
-        Timber.d("Update SessionParamsEntity primary key, to allow several sessions with the same userId")
-
-        realm.schema.get("SessionParamsEntity")
-                ?.removePrimaryKey()
-                ?.addField(SessionParamsEntityFields.SESSION_ID, String::class.java)
-                ?.setRequired(SessionParamsEntityFields.SESSION_ID, true)
-                ?.transform {
-                    val credentialsJson = it.getString(SessionParamsEntityFields.CREDENTIALS_JSON)
-
-                    val credentials = MoshiProvider.providesMoshi()
-                            .adapter(Credentials::class.java)
-                            .fromJson(credentialsJson)
-
-                    it.set(SessionParamsEntityFields.SESSION_ID, credentials!!.sessionId())
-                }
-                ?.addPrimaryKey(SessionParamsEntityFields.SESSION_ID)
-    }
-
-    private fun migrateTo4(realm: DynamicRealm) {
-        Timber.d("Step 3 -> 4")
-        Timber.d("Update SessionParamsEntity to add HomeServerConnectionConfig.homeServerUriBase value")
-
-        val adapter = MoshiProvider.providesMoshi()
-                .adapter(HomeServerConnectionConfig::class.java)
-
-        realm.schema.get("SessionParamsEntity")
-                ?.transform {
-                    val homeserverConnectionConfigJson = it.getString(SessionParamsEntityFields.HOME_SERVER_CONNECTION_CONFIG_JSON)
-
-                    val homeserverConnectionConfig = adapter
-                            .fromJson(homeserverConnectionConfigJson)
-
-                    val homeserverUrl = homeserverConnectionConfig?.homeServerUri?.toString()
-                    // Special case for matrix.org. Old session may use "https://matrix.org", newer one may use
-                    // "https://matrix-client.matrix.org". So fix that here
-                    val alteredHomeserverConnectionConfig =
-                            if (homeserverUrl == "https://matrix.org" || homeserverUrl == "https://matrix-client.matrix.org") {
-                                homeserverConnectionConfig.copy(
-                                        homeServerUri = Uri.parse("https://matrix.org"),
-                                        homeServerUriBase = Uri.parse("https://matrix-client.matrix.org")
-                                )
-                            } else {
-                                homeserverConnectionConfig
-                            }
-                    it.set(SessionParamsEntityFields.HOME_SERVER_CONNECTION_CONFIG_JSON, adapter.toJson(alteredHomeserverConnectionConfig))
-                }
+        if (oldVersion < 1) MigrateAuthTo001(realm).perform()
+        if (oldVersion < 2) MigrateAuthTo002(realm).perform()
+        if (oldVersion < 3) MigrateAuthTo003(realm).perform()
+        if (oldVersion < 4) MigrateAuthTo004(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo001.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo001.kt
new file mode 100644
index 0000000000..627f4e16bc
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo001.kt
@@ -0,0 +1,41 @@
+/*
+ * 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.auth.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.auth.db.PendingSessionEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateAuthTo001(realm: DynamicRealm) : RealmMigrator(realm, 1) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Create PendingSessionEntity")
+
+        realm.schema.create("PendingSessionEntity")
+                .addField(PendingSessionEntityFields.HOME_SERVER_CONNECTION_CONFIG_JSON, String::class.java)
+                .setRequired(PendingSessionEntityFields.HOME_SERVER_CONNECTION_CONFIG_JSON, true)
+                .addField(PendingSessionEntityFields.CLIENT_SECRET, String::class.java)
+                .setRequired(PendingSessionEntityFields.CLIENT_SECRET, true)
+                .addField(PendingSessionEntityFields.SEND_ATTEMPT, Integer::class.java)
+                .setRequired(PendingSessionEntityFields.SEND_ATTEMPT, true)
+                .addField(PendingSessionEntityFields.RESET_PASSWORD_DATA_JSON, String::class.java)
+                .addField(PendingSessionEntityFields.CURRENT_SESSION, String::class.java)
+                .addField(PendingSessionEntityFields.IS_REGISTRATION_STARTED, Boolean::class.java)
+                .addField(PendingSessionEntityFields.CURRENT_THREE_PID_DATA_JSON, String::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo002.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo002.kt
new file mode 100644
index 0000000000..6b133f8580
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo002.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.auth.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.auth.db.SessionParamsEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateAuthTo002(realm: DynamicRealm) : RealmMigrator(realm, 2) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Add boolean isTokenValid in SessionParamsEntity, with value true")
+
+        realm.schema.get("SessionParamsEntity")
+                ?.addField(SessionParamsEntityFields.IS_TOKEN_VALID, Boolean::class.java)
+                ?.transform { it.set(SessionParamsEntityFields.IS_TOKEN_VALID, true) }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo003.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo003.kt
new file mode 100644
index 0000000000..9319ec9987
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo003.kt
@@ -0,0 +1,47 @@
+/*
+ * 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.auth.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.auth.data.sessionId
+import org.matrix.android.sdk.internal.auth.db.SessionParamsEntityFields
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateAuthTo003(realm: DynamicRealm) : RealmMigrator(realm, 3) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Update SessionParamsEntity primary key, to allow several sessions with the same userId")
+
+        realm.schema.get("SessionParamsEntity")
+                ?.removePrimaryKey()
+                ?.addField(SessionParamsEntityFields.SESSION_ID, String::class.java)
+                ?.setRequired(SessionParamsEntityFields.SESSION_ID, true)
+                ?.transform {
+                    val credentialsJson = it.getString(SessionParamsEntityFields.CREDENTIALS_JSON)
+
+                    val credentials = MoshiProvider.providesMoshi()
+                            .adapter(Credentials::class.java)
+                            .fromJson(credentialsJson)
+
+                    it.set(SessionParamsEntityFields.SESSION_ID, credentials!!.sessionId())
+                }
+                ?.addPrimaryKey(SessionParamsEntityFields.SESSION_ID)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo004.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo004.kt
new file mode 100644
index 0000000000..4a9b9022d5
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo004.kt
@@ -0,0 +1,57 @@
+/*
+ * 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.auth.db.migration
+
+import android.net.Uri
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.internal.auth.db.SessionParamsEntityFields
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateAuthTo004(realm: DynamicRealm) : RealmMigrator(realm, 4) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Update SessionParamsEntity to add HomeServerConnectionConfig.homeServerUriBase value")
+
+        val adapter = MoshiProvider.providesMoshi()
+                .adapter(HomeServerConnectionConfig::class.java)
+
+        realm.schema.get("SessionParamsEntity")
+                ?.transform {
+                    val homeserverConnectionConfigJson = it.getString(SessionParamsEntityFields.HOME_SERVER_CONNECTION_CONFIG_JSON)
+
+                    val homeserverConnectionConfig = adapter
+                            .fromJson(homeserverConnectionConfigJson)
+
+                    val homeserverUrl = homeserverConnectionConfig?.homeServerUri?.toString()
+                    // Special case for matrix.org. Old session may use "https://matrix.org", newer one may use
+                    // "https://matrix-client.matrix.org". So fix that here
+                    val alteredHomeserverConnectionConfig =
+                            if (homeserverUrl == "https://matrix.org" || homeserverUrl == "https://matrix-client.matrix.org") {
+                                homeserverConnectionConfig.copy(
+                                        homeServerUri = Uri.parse("https://matrix.org"),
+                                        homeServerUriBase = Uri.parse("https://matrix-client.matrix.org")
+                                )
+                            } else {
+                                homeserverConnectionConfig
+                            }
+                    it.set(SessionParamsEntityFields.HOME_SERVER_CONNECTION_CONFIG_JSON, adapter.toJson(alteredHomeserverConnectionConfig))
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
index fe388b44e2..3130a6382f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
@@ -112,7 +112,8 @@ internal abstract class CryptoModule {
         @SessionScope
         fun providesRealmConfiguration(@SessionFilesDirectory directory: File,
                                        @UserMd5 userMd5: String,
-                                       realmKeysUtils: RealmKeysUtils): RealmConfiguration {
+                                       realmKeysUtils: RealmKeysUtils,
+                                       realmCryptoStoreMigration: RealmCryptoStoreMigration): RealmConfiguration {
             return RealmConfiguration.Builder()
                     .directory(directory)
                     .apply {
@@ -121,8 +122,8 @@ internal abstract class CryptoModule {
                     .name("crypto_store.realm")
                     .modules(RealmCryptoStoreModule())
                     .allowWritesOnUiThread(true)
-                    .schemaVersion(RealmCryptoStoreMigration.CRYPTO_STORE_SCHEMA_VERSION)
-                    .migration(RealmCryptoStoreMigration)
+                    .schemaVersion(realmCryptoStoreMigration.schemaVersion)
+                    .migration(realmCryptoStoreMigration)
                     .build()
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
index 82eced4371..2a58d731e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
@@ -35,6 +35,8 @@ internal class CryptoSessionInfoProvider @Inject constructor(
 ) {
 
     fun isRoomEncrypted(roomId: String): Boolean {
+        // We look at the presence at any m.room.encryption state event no matter if it's
+        // the latest one or if it is well formed
         val encryptionEvent = monarchy.fetchCopied { realm ->
             EventEntity.whereType(realm, roomId = roomId, type = EventType.STATE_ROOM_ENCRYPTION)
                     .isEmpty(EventEntityFields.STATE_KEY)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
index 5a68937868..b70e6c1f80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
@@ -35,7 +35,7 @@ internal class MXOutboundSessionInfo(
         val sessionLifetime = System.currentTimeMillis() - creationTime
 
         if (useCount >= rotationPeriodMsgs || sessionLifetime >= rotationPeriodMs) {
-            Timber.v("## needsRotation() : Rotating megolm session after " + useCount + ", " + sessionLifetime + "ms")
+            Timber.v("## needsRotation() : Rotating megolm session after $useCount, ${sessionLifetime}ms")
             needsRotation = true
         }
 
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 82fb565377..96ea5c03fa 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
@@ -240,6 +240,14 @@ internal interface IMXCryptoStore {
      */
     fun getRoomAlgorithm(roomId: String): String?
 
+    /**
+     * This is a bit different than isRoomEncrypted
+     * A room is encrypted when there is a m.room.encryption state event in the room (malformed/invalid or not)
+     * But the crypto layer has additional guaranty to ensure that encryption would never been reverted
+     * It's defensive coding out of precaution (if ever state is reset)
+     */
+    fun roomWasOnceEncrypted(roomId: String): Boolean
+
     fun shouldEncryptForInvitedMembers(roomId: String): Boolean
 
     fun setShouldEncryptForInvitedMembers(roomId: String, shouldEncryptForInvitedMembers: Boolean)
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 33578ba06a..a07827c033 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
@@ -631,7 +631,15 @@ internal class RealmCryptoStore @Inject constructor(
 
     override fun storeRoomAlgorithm(roomId: String, algorithm: String?) {
         doRealmTransaction(realmConfiguration) {
-            CryptoRoomEntity.getOrCreate(it, roomId).algorithm = algorithm
+            CryptoRoomEntity.getOrCreate(it, roomId).let { entity ->
+                entity.algorithm = algorithm
+                // store anyway the new algorithm, but mark the room
+                // as having been encrypted once whatever, this can never
+                // go back to false
+                if (algorithm == MXCRYPTO_ALGORITHM_MEGOLM) {
+                    entity.wasEncryptedOnce = true
+                }
+            }
         }
     }
 
@@ -641,6 +649,12 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
+    override fun roomWasOnceEncrypted(roomId: String): Boolean {
+        return doWithRealm(realmConfiguration) {
+            CryptoRoomEntity.getById(it, roomId)?.wasEncryptedOnce ?: false
+        }
+    }
+
     override fun shouldEncryptForInvitedMembers(roomId: String): Boolean {
         return doWithRealm(realmConfiguration) {
             CryptoRoomEntity.getById(it, roomId)?.shouldEncryptForInvitedMembers
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 f73cbaf480..cac6499486 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
@@ -16,560 +16,56 @@
 
 package org.matrix.android.sdk.internal.crypto.store.db
 
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
-import io.realm.RealmObjectSchema
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.util.JsonDict
-import org.matrix.android.sdk.internal.crypto.model.MXDeviceInfo
-import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper
-import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
-import org.matrix.android.sdk.internal.crypto.store.db.mapper.CrossSigningKeysMapper
-import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMetadataEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.GossipingEventEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.IncomingGossipingRequestEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.KeyInfoEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.OutboundGroupSessionInfoEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingGossipingRequestEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntityFields
-import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEntityFields
-import org.matrix.android.sdk.internal.di.MoshiProvider
-import org.matrix.android.sdk.internal.di.SerializeNulls
-import org.matrix.androidsdk.crypto.data.MXOlmInboundGroupSession2
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo001Legacy
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo002Legacy
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo003RiotX
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo004
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo005
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo006
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo007
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo008
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo009
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo010
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo011
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo012
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo013
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo014
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo015
 import timber.log.Timber
-import org.matrix.androidsdk.crypto.data.MXDeviceInfo as LegacyMXDeviceInfo
+import javax.inject.Inject
 
-internal object RealmCryptoStoreMigration : RealmMigration {
+internal class RealmCryptoStoreMigration @Inject constructor() : RealmMigration {
+    /**
+     * Forces all RealmCryptoStoreMigration instances to be equal
+     * Avoids Realm throwing when multiple instances of the migration are set
+     */
+    override fun equals(other: Any?) = other is RealmCryptoStoreMigration
+    override fun hashCode() = 5000
 
     // 0, 1, 2: legacy Riot-Android
     // 3: migrate to RiotX schema
     // 4, 5, 6, 7, 8, 9: migrations from RiotX (which was previously 1, 2, 3, 4, 5, 6)
-    const val CRYPTO_STORE_SCHEMA_VERSION = 14L
-
-    private fun RealmObjectSchema.addFieldIfNotExists(fieldName: String, fieldType: Class<*>): RealmObjectSchema {
-        if (!hasField(fieldName)) {
-            addField(fieldName, fieldType)
-        }
-        return this
-    }
-
-    private fun RealmObjectSchema.removeFieldIfExists(fieldName: String): RealmObjectSchema {
-        if (hasField(fieldName)) {
-            removeField(fieldName)
-        }
-        return this
-    }
-
-    private fun RealmObjectSchema.setRequiredIfNotAlready(fieldName: String, isRequired: Boolean): RealmObjectSchema {
-        if (isRequired != isRequired(fieldName)) {
-            setRequired(fieldName, isRequired)
-        }
-        return this
-    }
+    val schemaVersion = 15L
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
-        Timber.v("Migrating Realm Crypto from $oldVersion to $newVersion")
+        Timber.d("Migrating Realm Crypto from $oldVersion to $newVersion")
 
-        if (oldVersion <= 0) migrateTo1Legacy(realm)
-        if (oldVersion <= 1) migrateTo2Legacy(realm)
-        if (oldVersion <= 2) migrateTo3RiotX(realm)
-        if (oldVersion <= 3) migrateTo4(realm)
-        if (oldVersion <= 4) migrateTo5(realm)
-        if (oldVersion <= 5) migrateTo6(realm)
-        if (oldVersion <= 6) migrateTo7(realm)
-        if (oldVersion <= 7) migrateTo8(realm)
-        if (oldVersion <= 8) migrateTo9(realm)
-        if (oldVersion <= 9) migrateTo10(realm)
-        if (oldVersion <= 10) migrateTo11(realm)
-        if (oldVersion <= 11) migrateTo12(realm)
-        if (oldVersion <= 12) migrateTo13(realm)
-        if (oldVersion <= 13) migrateTo14(realm)
-    }
-
-    private fun migrateTo1Legacy(realm: DynamicRealm) {
-        Timber.d("Step 0 -> 1")
-        Timber.d("Add field lastReceivedMessageTs (Long) and set the value to 0")
-
-        realm.schema.get("OlmSessionEntity")
-                ?.addField(OlmSessionEntityFields.LAST_RECEIVED_MESSAGE_TS, Long::class.java)
-                ?.transform {
-                    it.setLong(OlmSessionEntityFields.LAST_RECEIVED_MESSAGE_TS, 0)
-                }
-    }
-
-    private fun migrateTo2Legacy(realm: DynamicRealm) {
-        Timber.d("Step 1 -> 2")
-        Timber.d("Update IncomingRoomKeyRequestEntity format: requestBodyString field is exploded into several fields")
-
-        realm.schema.get("IncomingRoomKeyRequestEntity")
-                ?.addFieldIfNotExists("requestBodyAlgorithm", String::class.java)
-                ?.addFieldIfNotExists("requestBodyRoomId", String::class.java)
-                ?.addFieldIfNotExists("requestBodySenderKey", String::class.java)
-                ?.addFieldIfNotExists("requestBodySessionId", String::class.java)
-                ?.transform { dynamicObject ->
-                    try {
-                        val requestBodyString = dynamicObject.getString("requestBodyString")
-                        // It was a map before
-                        val map: Map<String, String>? = deserializeFromRealm(requestBodyString)
-
-                        map?.let {
-                            dynamicObject.setString("requestBodyAlgorithm", it["algorithm"])
-                            dynamicObject.setString("requestBodyRoomId", it["room_id"])
-                            dynamicObject.setString("requestBodySenderKey", it["sender_key"])
-                            dynamicObject.setString("requestBodySessionId", it["session_id"])
-                        }
-                    } catch (e: Exception) {
-                        Timber.e(e, "Error")
-                    }
-                }
-                ?.removeFieldIfExists("requestBodyString")
-
-        Timber.d("Update IncomingRoomKeyRequestEntity format: requestBodyString field is exploded into several fields")
-
-        realm.schema.get("OutgoingRoomKeyRequestEntity")
-                ?.addFieldIfNotExists("requestBodyAlgorithm", String::class.java)
-                ?.addFieldIfNotExists("requestBodyRoomId", String::class.java)
-                ?.addFieldIfNotExists("requestBodySenderKey", String::class.java)
-                ?.addFieldIfNotExists("requestBodySessionId", String::class.java)
-                ?.transform { dynamicObject ->
-                    try {
-                        val requestBodyString = dynamicObject.getString("requestBodyString")
-                        // It was a map before
-                        val map: Map<String, String>? = deserializeFromRealm(requestBodyString)
-
-                        map?.let {
-                            dynamicObject.setString("requestBodyAlgorithm", it["algorithm"])
-                            dynamicObject.setString("requestBodyRoomId", it["room_id"])
-                            dynamicObject.setString("requestBodySenderKey", it["sender_key"])
-                            dynamicObject.setString("requestBodySessionId", it["session_id"])
-                        }
-                    } catch (e: Exception) {
-                        Timber.e(e, "Error")
-                    }
-                }
-                ?.removeFieldIfExists("requestBodyString")
-
-        Timber.d("Create KeysBackupDataEntity")
-
-        if (!realm.schema.contains("KeysBackupDataEntity")) {
-            realm.schema.create("KeysBackupDataEntity")
-                    .addField(KeysBackupDataEntityFields.PRIMARY_KEY, Integer::class.java)
-                    .addPrimaryKey(KeysBackupDataEntityFields.PRIMARY_KEY)
-                    .setRequired(KeysBackupDataEntityFields.PRIMARY_KEY, true)
-                    .addField(KeysBackupDataEntityFields.BACKUP_LAST_SERVER_HASH, String::class.java)
-                    .addField(KeysBackupDataEntityFields.BACKUP_LAST_SERVER_NUMBER_OF_KEYS, Integer::class.java)
-        }
-    }
-
-    private fun migrateTo3RiotX(realm: DynamicRealm) {
-        Timber.d("Step 2 -> 3")
-        Timber.d("Migrate to RiotX model")
-
-        realm.schema.get("CryptoRoomEntity")
-                ?.addFieldIfNotExists(CryptoRoomEntityFields.SHOULD_ENCRYPT_FOR_INVITED_MEMBERS, Boolean::class.java)
-                ?.setRequiredIfNotAlready(CryptoRoomEntityFields.SHOULD_ENCRYPT_FOR_INVITED_MEMBERS, false)
-
-        // Convert format of MXDeviceInfo, package has to be the same.
-        realm.schema.get("DeviceInfoEntity")
-                ?.transform { obj ->
-                    try {
-                        val oldSerializedData = obj.getString("deviceInfoData")
-                        deserializeFromRealm<LegacyMXDeviceInfo>(oldSerializedData)?.let { legacyMxDeviceInfo ->
-                            val newMxDeviceInfo = MXDeviceInfo(
-                                    deviceId = legacyMxDeviceInfo.deviceId,
-                                    userId = legacyMxDeviceInfo.userId,
-                                    algorithms = legacyMxDeviceInfo.algorithms,
-                                    keys = legacyMxDeviceInfo.keys,
-                                    signatures = legacyMxDeviceInfo.signatures,
-                                    unsigned = legacyMxDeviceInfo.unsigned,
-                                    verified = legacyMxDeviceInfo.mVerified
-                            )
-
-                            obj.setString("deviceInfoData", serializeForRealm(newMxDeviceInfo))
-                        }
-                    } catch (e: Exception) {
-                        Timber.e(e, "Error")
-                    }
-                }
-
-        // Convert MXOlmInboundGroupSession2 to OlmInboundGroupSessionWrapper
-        realm.schema.get("OlmInboundGroupSessionEntity")
-                ?.transform { obj ->
-                    try {
-                        val oldSerializedData = obj.getString("olmInboundGroupSessionData")
-                        deserializeFromRealm<MXOlmInboundGroupSession2>(oldSerializedData)?.let { mxOlmInboundGroupSession2 ->
-                            val sessionKey = mxOlmInboundGroupSession2.mSession.sessionIdentifier()
-                            val newOlmInboundGroupSessionWrapper = OlmInboundGroupSessionWrapper(sessionKey, false)
-                                    .apply {
-                                        olmInboundGroupSession = mxOlmInboundGroupSession2.mSession
-                                        roomId = mxOlmInboundGroupSession2.mRoomId
-                                        senderKey = mxOlmInboundGroupSession2.mSenderKey
-                                        keysClaimed = mxOlmInboundGroupSession2.mKeysClaimed
-                                        forwardingCurve25519KeyChain = mxOlmInboundGroupSession2.mForwardingCurve25519KeyChain
-                                    }
-
-                            obj.setString("olmInboundGroupSessionData", serializeForRealm(newOlmInboundGroupSessionWrapper))
-                        }
-                    } catch (e: Exception) {
-                        Timber.e(e, "Error")
-                    }
-                }
-    }
-
-    // Version 4L added Cross Signing info persistence
-    private fun migrateTo4(realm: DynamicRealm) {
-        Timber.d("Step 3 -> 4")
-
-        if (realm.schema.contains("TrustLevelEntity")) {
-            Timber.d("Skipping Step 3 -> 4 because entities already exist")
-            return
-        }
-
-        Timber.d("Create KeyInfoEntity")
-        val trustLevelEntityEntitySchema = realm.schema.create("TrustLevelEntity")
-                .addField(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED, Boolean::class.java)
-                .setNullable(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED, true)
-                .addField(TrustLevelEntityFields.LOCALLY_VERIFIED, Boolean::class.java)
-                .setNullable(TrustLevelEntityFields.LOCALLY_VERIFIED, true)
-
-        val keyInfoEntitySchema = realm.schema.create("KeyInfoEntity")
-                .addField(KeyInfoEntityFields.PUBLIC_KEY_BASE64, String::class.java)
-                .addField(KeyInfoEntityFields.SIGNATURES, String::class.java)
-                .addRealmListField(KeyInfoEntityFields.USAGES.`$`, String::class.java)
-                .addRealmObjectField(KeyInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevelEntityEntitySchema)
-
-        Timber.d("Create CrossSigningInfoEntity")
-
-        val crossSigningInfoSchema = realm.schema.create("CrossSigningInfoEntity")
-                .addField(CrossSigningInfoEntityFields.USER_ID, String::class.java)
-                .addPrimaryKey(CrossSigningInfoEntityFields.USER_ID)
-                .addRealmListField(CrossSigningInfoEntityFields.CROSS_SIGNING_KEYS.`$`, keyInfoEntitySchema)
-
-        Timber.d("Updating UserEntity table")
-        realm.schema.get("UserEntity")
-                ?.addRealmObjectField(UserEntityFields.CROSS_SIGNING_INFO_ENTITY.`$`, crossSigningInfoSchema)
-
-        Timber.d("Updating CryptoMetadataEntity table")
-        realm.schema.get("CryptoMetadataEntity")
-                ?.addField(CryptoMetadataEntityFields.X_SIGN_MASTER_PRIVATE_KEY, String::class.java)
-                ?.addField(CryptoMetadataEntityFields.X_SIGN_USER_PRIVATE_KEY, String::class.java)
-                ?.addField(CryptoMetadataEntityFields.X_SIGN_SELF_SIGNED_PRIVATE_KEY, String::class.java)
-
-        val moshi = Moshi.Builder().add(SerializeNulls.JSON_ADAPTER_FACTORY).build()
-        val listMigrationAdapter = moshi.adapter<List<String>>(Types.newParameterizedType(
-                List::class.java,
-                String::class.java,
-                Any::class.java
-        ))
-        val mapMigrationAdapter = moshi.adapter<JsonDict>(Types.newParameterizedType(
-                Map::class.java,
-                String::class.java,
-                Any::class.java
-        ))
-
-        realm.schema.get("DeviceInfoEntity")
-                ?.addField(DeviceInfoEntityFields.USER_ID, String::class.java)
-                ?.addField(DeviceInfoEntityFields.ALGORITHM_LIST_JSON, String::class.java)
-                ?.addField(DeviceInfoEntityFields.KEYS_MAP_JSON, String::class.java)
-                ?.addField(DeviceInfoEntityFields.SIGNATURE_MAP_JSON, String::class.java)
-                ?.addField(DeviceInfoEntityFields.UNSIGNED_MAP_JSON, String::class.java)
-                ?.addField(DeviceInfoEntityFields.IS_BLOCKED, Boolean::class.java)
-                ?.setNullable(DeviceInfoEntityFields.IS_BLOCKED, true)
-                ?.addRealmObjectField(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevelEntityEntitySchema)
-                ?.transform { obj ->
-
-                    try {
-                        val oldSerializedData = obj.getString("deviceInfoData")
-                        deserializeFromRealm<MXDeviceInfo>(oldSerializedData)?.let { oldDevice ->
-
-                            val trustLevel = realm.createObject("TrustLevelEntity")
-                            when (oldDevice.verified) {
-                                MXDeviceInfo.DEVICE_VERIFICATION_UNKNOWN    -> {
-                                    obj.setNull(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`)
-                                }
-                                MXDeviceInfo.DEVICE_VERIFICATION_BLOCKED    -> {
-                                    trustLevel.setNull(TrustLevelEntityFields.LOCALLY_VERIFIED)
-                                    trustLevel.setNull(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED)
-                                    obj.setBoolean(DeviceInfoEntityFields.IS_BLOCKED, oldDevice.isBlocked)
-                                    obj.setObject(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevel)
-                                }
-                                MXDeviceInfo.DEVICE_VERIFICATION_UNVERIFIED -> {
-                                    trustLevel.setBoolean(TrustLevelEntityFields.LOCALLY_VERIFIED, false)
-                                    trustLevel.setBoolean(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED, false)
-                                    obj.setObject(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevel)
-                                }
-                                MXDeviceInfo.DEVICE_VERIFICATION_VERIFIED   -> {
-                                    trustLevel.setBoolean(TrustLevelEntityFields.LOCALLY_VERIFIED, true)
-                                    trustLevel.setBoolean(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED, false)
-                                    obj.setObject(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevel)
-                                }
-                            }
-
-                            obj.setString(DeviceInfoEntityFields.USER_ID, oldDevice.userId)
-                            obj.setString(DeviceInfoEntityFields.IDENTITY_KEY, oldDevice.identityKey())
-                            obj.setString(DeviceInfoEntityFields.ALGORITHM_LIST_JSON, listMigrationAdapter.toJson(oldDevice.algorithms))
-                            obj.setString(DeviceInfoEntityFields.KEYS_MAP_JSON, mapMigrationAdapter.toJson(oldDevice.keys))
-                            obj.setString(DeviceInfoEntityFields.SIGNATURE_MAP_JSON, mapMigrationAdapter.toJson(oldDevice.signatures))
-                            obj.setString(DeviceInfoEntityFields.UNSIGNED_MAP_JSON, mapMigrationAdapter.toJson(oldDevice.unsigned))
-                        }
-                    } catch (failure: Throwable) {
-                        Timber.w(failure, "Crypto Data base migration error")
-                        // an unfortunate refactor did modify that class, making deserialization failing
-                        // so we just skip and ignore..
-                    }
-                }
-                ?.removeField("deviceInfoData")
-    }
-
-    private fun migrateTo5(realm: DynamicRealm) {
-        Timber.d("Step 4 -> 5")
-        realm.schema.remove("OutgoingRoomKeyRequestEntity")
-        realm.schema.remove("IncomingRoomKeyRequestEntity")
-
-        // Not need to migrate existing request, just start fresh?
-
-        realm.schema.create("GossipingEventEntity")
-                .addField(GossipingEventEntityFields.TYPE, String::class.java)
-                .addIndex(GossipingEventEntityFields.TYPE)
-                .addField(GossipingEventEntityFields.CONTENT, String::class.java)
-                .addField(GossipingEventEntityFields.SENDER, String::class.java)
-                .addIndex(GossipingEventEntityFields.SENDER)
-                .addField(GossipingEventEntityFields.DECRYPTION_RESULT_JSON, String::class.java)
-                .addField(GossipingEventEntityFields.DECRYPTION_ERROR_CODE, String::class.java)
-                .addField(GossipingEventEntityFields.AGE_LOCAL_TS, Long::class.java)
-                .setNullable(GossipingEventEntityFields.AGE_LOCAL_TS, true)
-                .addField(GossipingEventEntityFields.SEND_STATE_STR, String::class.java)
-
-        realm.schema.create("IncomingGossipingRequestEntity")
-                .addField(IncomingGossipingRequestEntityFields.REQUEST_ID, String::class.java)
-                .addIndex(IncomingGossipingRequestEntityFields.REQUEST_ID)
-                .addField(IncomingGossipingRequestEntityFields.TYPE_STR, String::class.java)
-                .addIndex(IncomingGossipingRequestEntityFields.TYPE_STR)
-                .addField(IncomingGossipingRequestEntityFields.OTHER_USER_ID, String::class.java)
-                .addField(IncomingGossipingRequestEntityFields.REQUESTED_INFO_STR, String::class.java)
-                .addField(IncomingGossipingRequestEntityFields.OTHER_DEVICE_ID, String::class.java)
-                .addField(IncomingGossipingRequestEntityFields.REQUEST_STATE_STR, String::class.java)
-                .addField(IncomingGossipingRequestEntityFields.LOCAL_CREATION_TIMESTAMP, Long::class.java)
-                .setNullable(IncomingGossipingRequestEntityFields.LOCAL_CREATION_TIMESTAMP, true)
-
-        realm.schema.create("OutgoingGossipingRequestEntity")
-                .addField(OutgoingGossipingRequestEntityFields.REQUEST_ID, String::class.java)
-                .addIndex(OutgoingGossipingRequestEntityFields.REQUEST_ID)
-                .addField(OutgoingGossipingRequestEntityFields.RECIPIENTS_DATA, String::class.java)
-                .addField(OutgoingGossipingRequestEntityFields.REQUESTED_INFO_STR, String::class.java)
-                .addField(OutgoingGossipingRequestEntityFields.TYPE_STR, String::class.java)
-                .addIndex(OutgoingGossipingRequestEntityFields.TYPE_STR)
-                .addField(OutgoingGossipingRequestEntityFields.REQUEST_STATE_STR, String::class.java)
-    }
-
-    private fun migrateTo6(realm: DynamicRealm) {
-        Timber.d("Step 5 -> 6")
-        Timber.d("Updating CryptoMetadataEntity table")
-        realm.schema.get("CryptoMetadataEntity")
-                ?.addField(CryptoMetadataEntityFields.KEY_BACKUP_RECOVERY_KEY, String::class.java)
-                ?.addField(CryptoMetadataEntityFields.KEY_BACKUP_RECOVERY_KEY_VERSION, String::class.java)
-    }
-
-    private fun migrateTo7(realm: DynamicRealm) {
-        Timber.d("Step 6 -> 7")
-        Timber.d("Updating KeyInfoEntity table")
-        val crossSigningKeysMapper = CrossSigningKeysMapper(MoshiProvider.providesMoshi())
-
-        val keyInfoEntities = realm.where("KeyInfoEntity").findAll()
-        try {
-            keyInfoEntities.forEach {
-                val stringSignatures = it.getString(KeyInfoEntityFields.SIGNATURES)
-                val objectSignatures: Map<String, Map<String, String>>? = deserializeFromRealm(stringSignatures)
-                val jsonSignatures = crossSigningKeysMapper.serializeSignatures(objectSignatures)
-                it.setString(KeyInfoEntityFields.SIGNATURES, jsonSignatures)
-            }
-        } catch (failure: Throwable) {
-        }
-
-        // Migrate frozen classes
-        val inboundGroupSessions = realm.where("OlmInboundGroupSessionEntity").findAll()
-        inboundGroupSessions.forEach { dynamicObject ->
-            dynamicObject.getString(OlmInboundGroupSessionEntityFields.OLM_INBOUND_GROUP_SESSION_DATA)?.let { serializedObject ->
-                try {
-                    deserializeFromRealm<OlmInboundGroupSessionWrapper?>(serializedObject)?.let { oldFormat ->
-                        val newFormat = oldFormat.exportKeys()?.let {
-                            OlmInboundGroupSessionWrapper2(it)
-                        }
-                        dynamicObject.setString(OlmInboundGroupSessionEntityFields.OLM_INBOUND_GROUP_SESSION_DATA, serializeForRealm(newFormat))
-                    }
-                } catch (failure: Throwable) {
-                    Timber.e(failure, "## OlmInboundGroupSessionEntity migration failed")
-                }
-            }
-        }
-    }
-
-    private fun migrateTo8(realm: DynamicRealm) {
-        Timber.d("Step 7 -> 8")
-        realm.schema.create("MyDeviceLastSeenInfoEntity")
-                .addField(MyDeviceLastSeenInfoEntityFields.DEVICE_ID, String::class.java)
-                .addPrimaryKey(MyDeviceLastSeenInfoEntityFields.DEVICE_ID)
-                .addField(MyDeviceLastSeenInfoEntityFields.DISPLAY_NAME, String::class.java)
-                .addField(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_IP, String::class.java)
-                .addField(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_TS, Long::class.java)
-                .setNullable(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_TS, true)
-
-        val now = System.currentTimeMillis()
-        realm.schema.get("DeviceInfoEntity")
-                ?.addField(DeviceInfoEntityFields.FIRST_TIME_SEEN_LOCAL_TS, Long::class.java)
-                ?.setNullable(DeviceInfoEntityFields.FIRST_TIME_SEEN_LOCAL_TS, true)
-                ?.transform { deviceInfoEntity ->
-                    tryOrNull {
-                        deviceInfoEntity.setLong(DeviceInfoEntityFields.FIRST_TIME_SEEN_LOCAL_TS, now)
-                    }
-                }
-    }
-
-    // Fixes duplicate devices in UserEntity#devices
-    private fun migrateTo9(realm: DynamicRealm) {
-        Timber.d("Step 8 -> 9")
-        val userEntities = realm.where("UserEntity").findAll()
-        userEntities.forEach {
-            try {
-                val deviceList = it.getList(UserEntityFields.DEVICES.`$`)
-                        ?: return@forEach
-                val distinct = deviceList.distinctBy { it.getString(DeviceInfoEntityFields.DEVICE_ID) }
-                if (distinct.size != deviceList.size) {
-                    deviceList.clear()
-                    deviceList.addAll(distinct)
-                }
-            } catch (failure: Throwable) {
-                Timber.w(failure, "Crypto Data base migration error for migrateTo9")
-            }
-        }
-    }
-
-    // Version 10L added WithHeld Keys Info (MSC2399)
-    private fun migrateTo10(realm: DynamicRealm) {
-        Timber.d("Step 9 -> 10")
-        realm.schema.create("WithHeldSessionEntity")
-                .addField(WithHeldSessionEntityFields.ROOM_ID, String::class.java)
-                .addField(WithHeldSessionEntityFields.ALGORITHM, String::class.java)
-                .addField(WithHeldSessionEntityFields.SESSION_ID, String::class.java)
-                .addIndex(WithHeldSessionEntityFields.SESSION_ID)
-                .addField(WithHeldSessionEntityFields.SENDER_KEY, String::class.java)
-                .addIndex(WithHeldSessionEntityFields.SENDER_KEY)
-                .addField(WithHeldSessionEntityFields.CODE_STRING, String::class.java)
-                .addField(WithHeldSessionEntityFields.REASON, String::class.java)
-
-        realm.schema.create("SharedSessionEntity")
-                .addField(SharedSessionEntityFields.ROOM_ID, String::class.java)
-                .addField(SharedSessionEntityFields.ALGORITHM, String::class.java)
-                .addField(SharedSessionEntityFields.SESSION_ID, String::class.java)
-                .addIndex(SharedSessionEntityFields.SESSION_ID)
-                .addField(SharedSessionEntityFields.USER_ID, String::class.java)
-                .addIndex(SharedSessionEntityFields.USER_ID)
-                .addField(SharedSessionEntityFields.DEVICE_ID, String::class.java)
-                .addIndex(SharedSessionEntityFields.DEVICE_ID)
-                .addField(SharedSessionEntityFields.CHAIN_INDEX, Long::class.java)
-                .setNullable(SharedSessionEntityFields.CHAIN_INDEX, true)
-    }
-
-    // Version 11L added deviceKeysSentToServer boolean to CryptoMetadataEntity
-    private fun migrateTo11(realm: DynamicRealm) {
-        Timber.d("Step 10 -> 11")
-        realm.schema.get("CryptoMetadataEntity")
-                ?.addField(CryptoMetadataEntityFields.DEVICE_KEYS_SENT_TO_SERVER, Boolean::class.java)
-    }
-
-    // Version 12L added outbound group session persistence
-    private fun migrateTo12(realm: DynamicRealm) {
-        Timber.d("Step 11 -> 12")
-        val outboundEntitySchema = realm.schema.create("OutboundGroupSessionInfoEntity")
-                .addField(OutboundGroupSessionInfoEntityFields.SERIALIZED_OUTBOUND_SESSION_DATA, String::class.java)
-                .addField(OutboundGroupSessionInfoEntityFields.CREATION_TIME, Long::class.java)
-                .setNullable(OutboundGroupSessionInfoEntityFields.CREATION_TIME, true)
-
-        realm.schema.get("CryptoRoomEntity")
-                ?.addRealmObjectField(CryptoRoomEntityFields.OUTBOUND_SESSION_INFO.`$`, outboundEntitySchema)
-    }
-
-    // Version 13L delete unreferenced TrustLevelEntity
-    private fun migrateTo13(realm: DynamicRealm) {
-        Timber.d("Step 12 -> 13")
-
-        // Use a trick to do that... Ref: https://stackoverflow.com/questions/55221366
-        val trustLevelEntitySchema = realm.schema.get("TrustLevelEntity")
-
-        /*
-        Creating a new temp field called isLinked which is set to true for those which are
-        references by other objects. Rest of them are set to false. Then removing all
-        those which are false and hence duplicate and unnecessary. Then removing the temp field
-        isLinked
-         */
-        var mainCounter = 0
-        var deviceInfoCounter = 0
-        var keyInfoCounter = 0
-        val deleteCounter: Int
-
-        trustLevelEntitySchema
-                ?.addField("isLinked", Boolean::class.java)
-                ?.transform { obj ->
-                    // Setting to false for all by default
-                    obj.set("isLinked", false)
-                    mainCounter++
-                }
-
-        realm.schema.get("DeviceInfoEntity")?.transform { obj ->
-            // Setting to true for those which are referenced in DeviceInfoEntity
-            deviceInfoCounter++
-            obj.getObject("trustLevelEntity")?.set("isLinked", true)
-        }
-
-        realm.schema.get("KeyInfoEntity")?.transform { obj ->
-            // Setting to true for those which are referenced in KeyInfoEntity
-            keyInfoCounter++
-            obj.getObject("trustLevelEntity")?.set("isLinked", true)
-        }
-
-        // Removing all those which are set as false
-        realm.where("TrustLevelEntity")
-                .equalTo("isLinked", false)
-                .findAll()
-                .also { deleteCounter = it.size }
-                .deleteAllFromRealm()
-
-        trustLevelEntitySchema?.removeField("isLinked")
-
-        Timber.w("TrustLevelEntity cleanup: $mainCounter entities")
-        Timber.w("TrustLevelEntity cleanup: $deviceInfoCounter entities referenced in DeviceInfoEntities")
-        Timber.w("TrustLevelEntity cleanup: $keyInfoCounter entities referenced in KeyInfoEntity")
-        Timber.w("TrustLevelEntity cleanup: $deleteCounter entities deleted!")
-        if (mainCounter != deviceInfoCounter + keyInfoCounter + deleteCounter) {
-            Timber.e("TrustLevelEntity cleanup: Something is not correct...")
-        }
-    }
-
-    // Version 14L Update the way we remember key sharing
-    private fun migrateTo14(realm: DynamicRealm) {
-        Timber.d("Step 13 -> 14")
-        realm.schema.get("SharedSessionEntity")
-                ?.addField(SharedSessionEntityFields.DEVICE_IDENTITY_KEY, String::class.java)
-                ?.addIndex(SharedSessionEntityFields.DEVICE_IDENTITY_KEY)
-                ?.transform {
-                    val sharedUserId = it.getString(SharedSessionEntityFields.USER_ID)
-                    val sharedDeviceId = it.getString(SharedSessionEntityFields.DEVICE_ID)
-                    val knownDevice = realm.where("DeviceInfoEntity")
-                            .equalTo(DeviceInfoEntityFields.USER_ID, sharedUserId)
-                            .equalTo(DeviceInfoEntityFields.DEVICE_ID, sharedDeviceId)
-                            .findFirst()
-                    it.setString(SharedSessionEntityFields.DEVICE_IDENTITY_KEY, knownDevice?.getString(DeviceInfoEntityFields.IDENTITY_KEY))
-                }
+        if (oldVersion < 1) MigrateCryptoTo001Legacy(realm).perform()
+        if (oldVersion < 2) MigrateCryptoTo002Legacy(realm).perform()
+        if (oldVersion < 3) MigrateCryptoTo003RiotX(realm).perform()
+        if (oldVersion < 4) MigrateCryptoTo004(realm).perform()
+        if (oldVersion < 5) MigrateCryptoTo005(realm).perform()
+        if (oldVersion < 6) MigrateCryptoTo006(realm).perform()
+        if (oldVersion < 7) MigrateCryptoTo007(realm).perform()
+        if (oldVersion < 8) MigrateCryptoTo008(realm).perform()
+        if (oldVersion < 9) MigrateCryptoTo009(realm).perform()
+        if (oldVersion < 10) MigrateCryptoTo010(realm).perform()
+        if (oldVersion < 11) MigrateCryptoTo011(realm).perform()
+        if (oldVersion < 12) MigrateCryptoTo012(realm).perform()
+        if (oldVersion < 13) MigrateCryptoTo013(realm).perform()
+        if (oldVersion < 14) MigrateCryptoTo014(realm).perform()
+        if (oldVersion < 15) MigrateCryptoTo015(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo001Legacy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo001Legacy.kt
new file mode 100644
index 0000000000..0e44689428
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo001Legacy.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.internal.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateCryptoTo001Legacy(realm: DynamicRealm) : RealmMigrator(realm, 1) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Add field lastReceivedMessageTs (Long) and set the value to 0")
+
+        realm.schema.get("OlmSessionEntity")
+                ?.addField(OlmSessionEntityFields.LAST_RECEIVED_MESSAGE_TS, Long::class.java)
+                ?.transform {
+                    it.setLong(OlmSessionEntityFields.LAST_RECEIVED_MESSAGE_TS, 0)
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo002Legacy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo002Legacy.kt
new file mode 100644
index 0000000000..84e627a688
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo002Legacy.kt
@@ -0,0 +1,86 @@
+/*
+ * 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.deserializeFromRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateCryptoTo002Legacy(realm: DynamicRealm) : RealmMigrator(realm, 2) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Update IncomingRoomKeyRequestEntity format: requestBodyString field is exploded into several fields")
+        realm.schema.get("IncomingRoomKeyRequestEntity")
+                ?.addFieldIfNotExists("requestBodyAlgorithm", String::class.java)
+                ?.addFieldIfNotExists("requestBodyRoomId", String::class.java)
+                ?.addFieldIfNotExists("requestBodySenderKey", String::class.java)
+                ?.addFieldIfNotExists("requestBodySessionId", String::class.java)
+                ?.transform { dynamicObject ->
+                    try {
+                        val requestBodyString = dynamicObject.getString("requestBodyString")
+                        // It was a map before
+                        val map: Map<String, String>? = deserializeFromRealm(requestBodyString)
+
+                        map?.let {
+                            dynamicObject.setString("requestBodyAlgorithm", it["algorithm"])
+                            dynamicObject.setString("requestBodyRoomId", it["room_id"])
+                            dynamicObject.setString("requestBodySenderKey", it["sender_key"])
+                            dynamicObject.setString("requestBodySessionId", it["session_id"])
+                        }
+                    } catch (e: Exception) {
+                        Timber.e(e, "Error")
+                    }
+                }
+                ?.removeFieldIfExists("requestBodyString")
+
+        Timber.d("Update IncomingRoomKeyRequestEntity format: requestBodyString field is exploded into several fields")
+        realm.schema.get("OutgoingRoomKeyRequestEntity")
+                ?.addFieldIfNotExists("requestBodyAlgorithm", String::class.java)
+                ?.addFieldIfNotExists("requestBodyRoomId", String::class.java)
+                ?.addFieldIfNotExists("requestBodySenderKey", String::class.java)
+                ?.addFieldIfNotExists("requestBodySessionId", String::class.java)
+                ?.transform { dynamicObject ->
+                    try {
+                        val requestBodyString = dynamicObject.getString("requestBodyString")
+                        // It was a map before
+                        val map: Map<String, String>? = deserializeFromRealm(requestBodyString)
+
+                        map?.let {
+                            dynamicObject.setString("requestBodyAlgorithm", it["algorithm"])
+                            dynamicObject.setString("requestBodyRoomId", it["room_id"])
+                            dynamicObject.setString("requestBodySenderKey", it["sender_key"])
+                            dynamicObject.setString("requestBodySessionId", it["session_id"])
+                        }
+                    } catch (e: Exception) {
+                        Timber.e(e, "Error")
+                    }
+                }
+                ?.removeFieldIfExists("requestBodyString")
+
+        Timber.d("Create KeysBackupDataEntity")
+        if (!realm.schema.contains("KeysBackupDataEntity")) {
+            realm.schema.create("KeysBackupDataEntity")
+                    .addField(KeysBackupDataEntityFields.PRIMARY_KEY, Integer::class.java)
+                    .addPrimaryKey(KeysBackupDataEntityFields.PRIMARY_KEY)
+                    .setRequired(KeysBackupDataEntityFields.PRIMARY_KEY, true)
+                    .addField(KeysBackupDataEntityFields.BACKUP_LAST_SERVER_HASH, String::class.java)
+                    .addField(KeysBackupDataEntityFields.BACKUP_LAST_SERVER_NUMBER_OF_KEYS, Integer::class.java)
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo003RiotX.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo003RiotX.kt
new file mode 100644
index 0000000000..b468a56af6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo003RiotX.kt
@@ -0,0 +1,83 @@
+/*
+ * 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.OlmInboundGroupSessionWrapper
+import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.serializeForRealm
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import org.matrix.androidsdk.crypto.data.MXDeviceInfo
+import org.matrix.androidsdk.crypto.data.MXOlmInboundGroupSession2
+import timber.log.Timber
+
+class MigrateCryptoTo003RiotX(realm: DynamicRealm) : RealmMigrator(realm, 3) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Migrate to RiotX model")
+        realm.schema.get("CryptoRoomEntity")
+                ?.addFieldIfNotExists(CryptoRoomEntityFields.SHOULD_ENCRYPT_FOR_INVITED_MEMBERS, Boolean::class.java)
+                ?.setRequiredIfNotAlready(CryptoRoomEntityFields.SHOULD_ENCRYPT_FOR_INVITED_MEMBERS, false)
+
+        // Convert format of MXDeviceInfo, package has to be the same.
+        realm.schema.get("DeviceInfoEntity")
+                ?.transform { obj ->
+                    try {
+                        val oldSerializedData = obj.getString("deviceInfoData")
+                        deserializeFromRealm<MXDeviceInfo>(oldSerializedData)?.let { legacyMxDeviceInfo ->
+                            val newMxDeviceInfo = org.matrix.android.sdk.internal.crypto.model.MXDeviceInfo(
+                                    deviceId = legacyMxDeviceInfo.deviceId,
+                                    userId = legacyMxDeviceInfo.userId,
+                                    algorithms = legacyMxDeviceInfo.algorithms,
+                                    keys = legacyMxDeviceInfo.keys,
+                                    signatures = legacyMxDeviceInfo.signatures,
+                                    unsigned = legacyMxDeviceInfo.unsigned,
+                                    verified = legacyMxDeviceInfo.mVerified
+                            )
+
+                            obj.setString("deviceInfoData", serializeForRealm(newMxDeviceInfo))
+                        }
+                    } catch (e: Exception) {
+                        Timber.e(e, "Error")
+                    }
+                }
+
+        // Convert MXOlmInboundGroupSession2 to OlmInboundGroupSessionWrapper
+        realm.schema.get("OlmInboundGroupSessionEntity")
+                ?.transform { obj ->
+                    try {
+                        val oldSerializedData = obj.getString("olmInboundGroupSessionData")
+                        deserializeFromRealm<MXOlmInboundGroupSession2>(oldSerializedData)?.let { mxOlmInboundGroupSession2 ->
+                            val sessionKey = mxOlmInboundGroupSession2.mSession.sessionIdentifier()
+                            val newOlmInboundGroupSessionWrapper = OlmInboundGroupSessionWrapper(sessionKey, false)
+                                    .apply {
+                                        olmInboundGroupSession = mxOlmInboundGroupSession2.mSession
+                                        roomId = mxOlmInboundGroupSession2.mRoomId
+                                        senderKey = mxOlmInboundGroupSession2.mSenderKey
+                                        keysClaimed = mxOlmInboundGroupSession2.mKeysClaimed
+                                        forwardingCurve25519KeyChain = mxOlmInboundGroupSession2.mForwardingCurve25519KeyChain
+                                    }
+
+                            obj.setString("olmInboundGroupSessionData", serializeForRealm(newOlmInboundGroupSessionWrapper))
+                        }
+                    } catch (e: Exception) {
+                        Timber.e(e, "Error")
+                    }
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
new file mode 100644
index 0000000000..20a4814b8d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
@@ -0,0 +1,139 @@
+/*
+ * 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 com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.crypto.model.MXDeviceInfo
+import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.CrossSigningInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMetadataEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntityFields
+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.crypto.store.db.model.UserEntityFields
+import org.matrix.android.sdk.internal.di.SerializeNulls
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+// Version 4L added Cross Signing info persistence
+class MigrateCryptoTo004(realm: DynamicRealm) : RealmMigrator(realm, 4) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        if (realm.schema.contains("TrustLevelEntity")) {
+            Timber.d("Skipping Step 3 -> 4 because entities already exist")
+            return
+        }
+
+        Timber.d("Create KeyInfoEntity")
+        val trustLevelEntityEntitySchema = realm.schema.create("TrustLevelEntity")
+                .addField(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED, Boolean::class.java)
+                .setNullable(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED, true)
+                .addField(TrustLevelEntityFields.LOCALLY_VERIFIED, Boolean::class.java)
+                .setNullable(TrustLevelEntityFields.LOCALLY_VERIFIED, true)
+
+        val keyInfoEntitySchema = realm.schema.create("KeyInfoEntity")
+                .addField(KeyInfoEntityFields.PUBLIC_KEY_BASE64, String::class.java)
+                .addField(KeyInfoEntityFields.SIGNATURES, String::class.java)
+                .addRealmListField(KeyInfoEntityFields.USAGES.`$`, String::class.java)
+                .addRealmObjectField(KeyInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevelEntityEntitySchema)
+
+        Timber.d("Create CrossSigningInfoEntity")
+
+        val crossSigningInfoSchema = realm.schema.create("CrossSigningInfoEntity")
+                .addField(CrossSigningInfoEntityFields.USER_ID, String::class.java)
+                .addPrimaryKey(CrossSigningInfoEntityFields.USER_ID)
+                .addRealmListField(CrossSigningInfoEntityFields.CROSS_SIGNING_KEYS.`$`, keyInfoEntitySchema)
+
+        Timber.d("Updating UserEntity table")
+        realm.schema.get("UserEntity")
+                ?.addRealmObjectField(UserEntityFields.CROSS_SIGNING_INFO_ENTITY.`$`, crossSigningInfoSchema)
+
+        Timber.d("Updating CryptoMetadataEntity table")
+        realm.schema.get("CryptoMetadataEntity")
+                ?.addField(CryptoMetadataEntityFields.X_SIGN_MASTER_PRIVATE_KEY, String::class.java)
+                ?.addField(CryptoMetadataEntityFields.X_SIGN_USER_PRIVATE_KEY, String::class.java)
+                ?.addField(CryptoMetadataEntityFields.X_SIGN_SELF_SIGNED_PRIVATE_KEY, String::class.java)
+
+        val moshi = Moshi.Builder().add(SerializeNulls.JSON_ADAPTER_FACTORY).build()
+        val listMigrationAdapter = moshi.adapter<List<String>>(Types.newParameterizedType(
+                List::class.java,
+                String::class.java,
+                Any::class.java
+        ))
+        val mapMigrationAdapter = moshi.adapter<JsonDict>(Types.newParameterizedType(
+                Map::class.java,
+                String::class.java,
+                Any::class.java
+        ))
+
+        realm.schema.get("DeviceInfoEntity")
+                ?.addField(DeviceInfoEntityFields.USER_ID, String::class.java)
+                ?.addField(DeviceInfoEntityFields.ALGORITHM_LIST_JSON, String::class.java)
+                ?.addField(DeviceInfoEntityFields.KEYS_MAP_JSON, String::class.java)
+                ?.addField(DeviceInfoEntityFields.SIGNATURE_MAP_JSON, String::class.java)
+                ?.addField(DeviceInfoEntityFields.UNSIGNED_MAP_JSON, String::class.java)
+                ?.addField(DeviceInfoEntityFields.IS_BLOCKED, Boolean::class.java)
+                ?.setNullable(DeviceInfoEntityFields.IS_BLOCKED, true)
+                ?.addRealmObjectField(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevelEntityEntitySchema)
+                ?.transform { obj ->
+
+                    try {
+                        val oldSerializedData = obj.getString("deviceInfoData")
+                        deserializeFromRealm<MXDeviceInfo>(oldSerializedData)?.let { oldDevice ->
+
+                            val trustLevel = realm.createObject("TrustLevelEntity")
+                            when (oldDevice.verified) {
+                                MXDeviceInfo.DEVICE_VERIFICATION_UNKNOWN    -> {
+                                    obj.setNull(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`)
+                                }
+                                MXDeviceInfo.DEVICE_VERIFICATION_BLOCKED    -> {
+                                    trustLevel.setNull(TrustLevelEntityFields.LOCALLY_VERIFIED)
+                                    trustLevel.setNull(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED)
+                                    obj.setBoolean(DeviceInfoEntityFields.IS_BLOCKED, oldDevice.isBlocked)
+                                    obj.setObject(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevel)
+                                }
+                                MXDeviceInfo.DEVICE_VERIFICATION_UNVERIFIED -> {
+                                    trustLevel.setBoolean(TrustLevelEntityFields.LOCALLY_VERIFIED, false)
+                                    trustLevel.setBoolean(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED, false)
+                                    obj.setObject(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevel)
+                                }
+                                MXDeviceInfo.DEVICE_VERIFICATION_VERIFIED   -> {
+                                    trustLevel.setBoolean(TrustLevelEntityFields.LOCALLY_VERIFIED, true)
+                                    trustLevel.setBoolean(TrustLevelEntityFields.CROSS_SIGNED_VERIFIED, false)
+                                    obj.setObject(DeviceInfoEntityFields.TRUST_LEVEL_ENTITY.`$`, trustLevel)
+                                }
+                            }
+
+                            obj.setString(DeviceInfoEntityFields.USER_ID, oldDevice.userId)
+                            obj.setString(DeviceInfoEntityFields.IDENTITY_KEY, oldDevice.identityKey())
+                            obj.setString(DeviceInfoEntityFields.ALGORITHM_LIST_JSON, listMigrationAdapter.toJson(oldDevice.algorithms))
+                            obj.setString(DeviceInfoEntityFields.KEYS_MAP_JSON, mapMigrationAdapter.toJson(oldDevice.keys))
+                            obj.setString(DeviceInfoEntityFields.SIGNATURE_MAP_JSON, mapMigrationAdapter.toJson(oldDevice.signatures))
+                            obj.setString(DeviceInfoEntityFields.UNSIGNED_MAP_JSON, mapMigrationAdapter.toJson(oldDevice.unsigned))
+                        }
+                    } catch (failure: Throwable) {
+                        Timber.w(failure, "Crypto Data base migration error")
+                        // an unfortunate refactor did modify that class, making deserialization failing
+                        // so we just skip and ignore..
+                    }
+                }
+                ?.removeField("deviceInfoData")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo005.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo005.kt
new file mode 100644
index 0000000000..8365d34464
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo005.kt
@@ -0,0 +1,66 @@
+/*
+ * 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.GossipingEventEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.IncomingGossipingRequestEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingGossipingRequestEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateCryptoTo005(realm: DynamicRealm) : RealmMigrator(realm, 5) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.remove("OutgoingRoomKeyRequestEntity")
+        realm.schema.remove("IncomingRoomKeyRequestEntity")
+
+        // Not need to migrate existing request, just start fresh?
+
+        realm.schema.create("GossipingEventEntity")
+                .addField(GossipingEventEntityFields.TYPE, String::class.java)
+                .addIndex(GossipingEventEntityFields.TYPE)
+                .addField(GossipingEventEntityFields.CONTENT, String::class.java)
+                .addField(GossipingEventEntityFields.SENDER, String::class.java)
+                .addIndex(GossipingEventEntityFields.SENDER)
+                .addField(GossipingEventEntityFields.DECRYPTION_RESULT_JSON, String::class.java)
+                .addField(GossipingEventEntityFields.DECRYPTION_ERROR_CODE, String::class.java)
+                .addField(GossipingEventEntityFields.AGE_LOCAL_TS, Long::class.java)
+                .setNullable(GossipingEventEntityFields.AGE_LOCAL_TS, true)
+                .addField(GossipingEventEntityFields.SEND_STATE_STR, String::class.java)
+
+        realm.schema.create("IncomingGossipingRequestEntity")
+                .addField(IncomingGossipingRequestEntityFields.REQUEST_ID, String::class.java)
+                .addIndex(IncomingGossipingRequestEntityFields.REQUEST_ID)
+                .addField(IncomingGossipingRequestEntityFields.TYPE_STR, String::class.java)
+                .addIndex(IncomingGossipingRequestEntityFields.TYPE_STR)
+                .addField(IncomingGossipingRequestEntityFields.OTHER_USER_ID, String::class.java)
+                .addField(IncomingGossipingRequestEntityFields.REQUESTED_INFO_STR, String::class.java)
+                .addField(IncomingGossipingRequestEntityFields.OTHER_DEVICE_ID, String::class.java)
+                .addField(IncomingGossipingRequestEntityFields.REQUEST_STATE_STR, String::class.java)
+                .addField(IncomingGossipingRequestEntityFields.LOCAL_CREATION_TIMESTAMP, Long::class.java)
+                .setNullable(IncomingGossipingRequestEntityFields.LOCAL_CREATION_TIMESTAMP, true)
+
+        realm.schema.create("OutgoingGossipingRequestEntity")
+                .addField(OutgoingGossipingRequestEntityFields.REQUEST_ID, String::class.java)
+                .addIndex(OutgoingGossipingRequestEntityFields.REQUEST_ID)
+                .addField(OutgoingGossipingRequestEntityFields.RECIPIENTS_DATA, String::class.java)
+                .addField(OutgoingGossipingRequestEntityFields.REQUESTED_INFO_STR, String::class.java)
+                .addField(OutgoingGossipingRequestEntityFields.TYPE_STR, String::class.java)
+                .addIndex(OutgoingGossipingRequestEntityFields.TYPE_STR)
+                .addField(OutgoingGossipingRequestEntityFields.REQUEST_STATE_STR, String::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo006.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo006.kt
new file mode 100644
index 0000000000..a29a791826
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo006.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.CryptoMetadataEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateCryptoTo006(realm: DynamicRealm) : RealmMigrator(realm, 6) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Updating CryptoMetadataEntity table")
+        realm.schema.get("CryptoMetadataEntity")
+                ?.addField(CryptoMetadataEntityFields.KEY_BACKUP_RECOVERY_KEY, String::class.java)
+                ?.addField(CryptoMetadataEntityFields.KEY_BACKUP_RECOVERY_KEY_VERSION, String::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo007.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo007.kt
new file mode 100644
index 0000000000..7ae58e7fc0
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo007.kt
@@ -0,0 +1,65 @@
+/*
+ * 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.OlmInboundGroupSessionWrapper
+import org.matrix.android.sdk.internal.crypto.model.OlmInboundGroupSessionWrapper2
+import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
+import org.matrix.android.sdk.internal.crypto.store.db.mapper.CrossSigningKeysMapper
+import org.matrix.android.sdk.internal.crypto.store.db.model.KeyInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.serializeForRealm
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateCryptoTo007(realm: DynamicRealm) : RealmMigrator(realm, 7) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Updating KeyInfoEntity table")
+        val crossSigningKeysMapper = CrossSigningKeysMapper(MoshiProvider.providesMoshi())
+
+        val keyInfoEntities = realm.where("KeyInfoEntity").findAll()
+        try {
+            keyInfoEntities.forEach {
+                val stringSignatures = it.getString(KeyInfoEntityFields.SIGNATURES)
+                val objectSignatures: Map<String, Map<String, String>>? = deserializeFromRealm(stringSignatures)
+                val jsonSignatures = crossSigningKeysMapper.serializeSignatures(objectSignatures)
+                it.setString(KeyInfoEntityFields.SIGNATURES, jsonSignatures)
+            }
+        } catch (failure: Throwable) {
+        }
+
+        // Migrate frozen classes
+        val inboundGroupSessions = realm.where("OlmInboundGroupSessionEntity").findAll()
+        inboundGroupSessions.forEach { dynamicObject ->
+            dynamicObject.getString(OlmInboundGroupSessionEntityFields.OLM_INBOUND_GROUP_SESSION_DATA)?.let { serializedObject ->
+                try {
+                    deserializeFromRealm<OlmInboundGroupSessionWrapper?>(serializedObject)?.let { oldFormat ->
+                        val newFormat = oldFormat.exportKeys()?.let {
+                            OlmInboundGroupSessionWrapper2(it)
+                        }
+                        dynamicObject.setString(OlmInboundGroupSessionEntityFields.OLM_INBOUND_GROUP_SESSION_DATA, serializeForRealm(newFormat))
+                    }
+                } catch (failure: Throwable) {
+                    Timber.e(failure, "## OlmInboundGroupSessionEntity migration failed")
+                }
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo008.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo008.kt
new file mode 100644
index 0000000000..e3bd3f035a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo008.kt
@@ -0,0 +1,46 @@
+/*
+ * 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.api.extensions.tryOrNull
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateCryptoTo008(realm: DynamicRealm) : RealmMigrator(realm, 8) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("MyDeviceLastSeenInfoEntity")
+                .addField(MyDeviceLastSeenInfoEntityFields.DEVICE_ID, String::class.java)
+                .addPrimaryKey(MyDeviceLastSeenInfoEntityFields.DEVICE_ID)
+                .addField(MyDeviceLastSeenInfoEntityFields.DISPLAY_NAME, String::class.java)
+                .addField(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_IP, String::class.java)
+                .addField(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_TS, Long::class.java)
+                .setNullable(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_TS, true)
+
+        val now = System.currentTimeMillis()
+        realm.schema.get("DeviceInfoEntity")
+                ?.addField(DeviceInfoEntityFields.FIRST_TIME_SEEN_LOCAL_TS, Long::class.java)
+                ?.setNullable(DeviceInfoEntityFields.FIRST_TIME_SEEN_LOCAL_TS, true)
+                ?.transform { deviceInfoEntity ->
+                    tryOrNull {
+                        deviceInfoEntity.setLong(DeviceInfoEntityFields.FIRST_TIME_SEEN_LOCAL_TS, now)
+                    }
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo009.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo009.kt
new file mode 100644
index 0000000000..ed705318f9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo009.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.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+// Fixes duplicate devices in UserEntity#devices
+class MigrateCryptoTo009(realm: DynamicRealm) : RealmMigrator(realm, 9) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        val userEntities = realm.where("UserEntity").findAll()
+        userEntities.forEach {
+            try {
+                val deviceList = it.getList(UserEntityFields.DEVICES.`$`)
+                        ?: return@forEach
+                val distinct = deviceList.distinctBy { it.getString(DeviceInfoEntityFields.DEVICE_ID) }
+                if (distinct.size != deviceList.size) {
+                    deviceList.clear()
+                    deviceList.addAll(distinct)
+                }
+            } catch (failure: Throwable) {
+                Timber.w(failure, "Crypto Data base migration error for migrateTo9")
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo010.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo010.kt
new file mode 100644
index 0000000000..8d69ee5558
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo010.kt
@@ -0,0 +1,50 @@
+/*
+ * 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.SharedSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+// Version 10L added WithHeld Keys Info (MSC2399)
+class MigrateCryptoTo010(realm: DynamicRealm) : RealmMigrator(realm, 10) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("WithHeldSessionEntity")
+                .addField(WithHeldSessionEntityFields.ROOM_ID, String::class.java)
+                .addField(WithHeldSessionEntityFields.ALGORITHM, String::class.java)
+                .addField(WithHeldSessionEntityFields.SESSION_ID, String::class.java)
+                .addIndex(WithHeldSessionEntityFields.SESSION_ID)
+                .addField(WithHeldSessionEntityFields.SENDER_KEY, String::class.java)
+                .addIndex(WithHeldSessionEntityFields.SENDER_KEY)
+                .addField(WithHeldSessionEntityFields.CODE_STRING, String::class.java)
+                .addField(WithHeldSessionEntityFields.REASON, String::class.java)
+
+        realm.schema.create("SharedSessionEntity")
+                .addField(SharedSessionEntityFields.ROOM_ID, String::class.java)
+                .addField(SharedSessionEntityFields.ALGORITHM, String::class.java)
+                .addField(SharedSessionEntityFields.SESSION_ID, String::class.java)
+                .addIndex(SharedSessionEntityFields.SESSION_ID)
+                .addField(SharedSessionEntityFields.USER_ID, String::class.java)
+                .addIndex(SharedSessionEntityFields.USER_ID)
+                .addField(SharedSessionEntityFields.DEVICE_ID, String::class.java)
+                .addIndex(SharedSessionEntityFields.DEVICE_ID)
+                .addField(SharedSessionEntityFields.CHAIN_INDEX, Long::class.java)
+                .setNullable(SharedSessionEntityFields.CHAIN_INDEX, true)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo011.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo011.kt
new file mode 100644
index 0000000000..c9825a7f3d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo011.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.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMetadataEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+// Version 11L added deviceKeysSentToServer boolean to CryptoMetadataEntity
+class MigrateCryptoTo011(realm: DynamicRealm) : RealmMigrator(realm, 11) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("CryptoMetadataEntity")
+                ?.addField(CryptoMetadataEntityFields.DEVICE_KEYS_SENT_TO_SERVER, Boolean::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo012.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo012.kt
new file mode 100644
index 0000000000..6b1460d9d6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo012.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.internal.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.OutboundGroupSessionInfoEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+// Version 12L added outbound group session persistence
+class MigrateCryptoTo012(realm: DynamicRealm) : RealmMigrator(realm, 12) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        val outboundEntitySchema = realm.schema.create("OutboundGroupSessionInfoEntity")
+                .addField(OutboundGroupSessionInfoEntityFields.SERIALIZED_OUTBOUND_SESSION_DATA, String::class.java)
+                .addField(OutboundGroupSessionInfoEntityFields.CREATION_TIME, Long::class.java)
+                .setNullable(OutboundGroupSessionInfoEntityFields.CREATION_TIME, true)
+
+        realm.schema.get("CryptoRoomEntity")
+                ?.addRealmObjectField(CryptoRoomEntityFields.OUTBOUND_SESSION_INFO.`$`, outboundEntitySchema)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo013.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo013.kt
new file mode 100644
index 0000000000..dc22c5f133
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo013.kt
@@ -0,0 +1,78 @@
+/*
+ * 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.util.database.RealmMigrator
+import timber.log.Timber
+
+// Version 13L delete unreferenced TrustLevelEntity
+class MigrateCryptoTo013(realm: DynamicRealm) : RealmMigrator(realm, 13) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        // Use a trick to do that... Ref: https://stackoverflow.com/questions/55221366
+        val trustLevelEntitySchema = realm.schema.get("TrustLevelEntity")
+
+        /*
+        Creating a new temp field called isLinked which is set to true for those which are
+        references by other objects. Rest of them are set to false. Then removing all
+        those which are false and hence duplicate and unnecessary. Then removing the temp field
+        isLinked
+         */
+        var mainCounter = 0
+        var deviceInfoCounter = 0
+        var keyInfoCounter = 0
+        val deleteCounter: Int
+
+        trustLevelEntitySchema
+                ?.addField("isLinked", Boolean::class.java)
+                ?.transform { obj ->
+                    // Setting to false for all by default
+                    obj.set("isLinked", false)
+                    mainCounter++
+                }
+
+        realm.schema.get("DeviceInfoEntity")?.transform { obj ->
+            // Setting to true for those which are referenced in DeviceInfoEntity
+            deviceInfoCounter++
+            obj.getObject("trustLevelEntity")?.set("isLinked", true)
+        }
+
+        realm.schema.get("KeyInfoEntity")?.transform { obj ->
+            // Setting to true for those which are referenced in KeyInfoEntity
+            keyInfoCounter++
+            obj.getObject("trustLevelEntity")?.set("isLinked", true)
+        }
+
+        // Removing all those which are set as false
+        realm.where("TrustLevelEntity")
+                .equalTo("isLinked", false)
+                .findAll()
+                .also { deleteCounter = it.size }
+                .deleteAllFromRealm()
+
+        trustLevelEntitySchema?.removeField("isLinked")
+
+        Timber.w("TrustLevelEntity cleanup: $mainCounter entities")
+        Timber.w("TrustLevelEntity cleanup: $deviceInfoCounter entities referenced in DeviceInfoEntities")
+        Timber.w("TrustLevelEntity cleanup: $keyInfoCounter entities referenced in KeyInfoEntity")
+        Timber.w("TrustLevelEntity cleanup: $deleteCounter entities deleted!")
+        if (mainCounter != deviceInfoCounter + keyInfoCounter + deleteCounter) {
+            Timber.e("TrustLevelEntity cleanup: Something is not correct...")
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo014.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo014.kt
new file mode 100644
index 0000000000..f0089e3427
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo014.kt
@@ -0,0 +1,41 @@
+/*
+ * 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.DeviceInfoEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+// Version 14L Update the way we remember key sharing
+class MigrateCryptoTo014(realm: DynamicRealm) : RealmMigrator(realm, 14) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("SharedSessionEntity")
+                ?.addField(SharedSessionEntityFields.DEVICE_IDENTITY_KEY, String::class.java)
+                ?.addIndex(SharedSessionEntityFields.DEVICE_IDENTITY_KEY)
+                ?.transform {
+                    val sharedUserId = it.getString(SharedSessionEntityFields.USER_ID)
+                    val sharedDeviceId = it.getString(SharedSessionEntityFields.DEVICE_ID)
+                    val knownDevice = realm.where("DeviceInfoEntity")
+                            .equalTo(DeviceInfoEntityFields.USER_ID, sharedUserId)
+                            .equalTo(DeviceInfoEntityFields.DEVICE_ID, sharedDeviceId)
+                            .findFirst()
+                    it.setString(SharedSessionEntityFields.DEVICE_IDENTITY_KEY, knownDevice?.getString(DeviceInfoEntityFields.IDENTITY_KEY))
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo015.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo015.kt
new file mode 100644
index 0000000000..465c18555a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo015.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.internal.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoRoomEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+// Version 15L adds wasEncryptedOnce field to CryptoRoomEntity
+class MigrateCryptoTo015(realm: DynamicRealm) : RealmMigrator(realm, 15) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("CryptoRoomEntity")
+                ?.addField(CryptoRoomEntityFields.WAS_ENCRYPTED_ONCE, Boolean::class.java)
+                ?.setNullable(CryptoRoomEntityFields.WAS_ENCRYPTED_ONCE, true)
+                ?.transform {
+                    val currentAlgorithm = it.getString(CryptoRoomEntityFields.ALGORITHM)
+                    it.set(CryptoRoomEntityFields.WAS_ENCRYPTED_ONCE, currentAlgorithm == MXCRYPTO_ALGORITHM_MEGOLM)
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
index 711b698464..6167314b5a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
@@ -27,7 +27,10 @@ internal open class CryptoRoomEntity(
         // Store the current outbound session for this room,
         // to avoid re-create and re-share at each startup (if rotation not needed..)
         // This is specific to megolm but not sure how to model it better
-        var outboundSessionInfo: OutboundGroupSessionInfoEntity? = null
+        var outboundSessionInfo: OutboundGroupSessionInfoEntity? = null,
+        // a security to ensure that a room will never revert to not encrypted
+        // even if a new state event with empty encryption, or state is reset somehow
+        var wasEncryptedOnce: Boolean? = false
         ) :
     RealmObject() {
 
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 d5a96f5ba1..ebc9bcce5a 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
@@ -19,11 +19,9 @@ import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Semaphore
-import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 
@@ -37,30 +35,26 @@ internal fun <T> CoroutineScope.asyncTransaction(realmConfiguration: RealmConfig
     }
 }
 
-private val realmSemaphore = Semaphore(1)
-
 suspend fun <T> awaitTransaction(config: RealmConfiguration, transaction: suspend (realm: Realm) -> T): T {
-    return realmSemaphore.withPermit {
-        withContext(Dispatchers.IO) {
-            Realm.getInstance(config).use { bgRealm ->
-                bgRealm.beginTransaction()
-                val result: T
-                try {
-                    val start = System.currentTimeMillis()
-                    result = transaction(bgRealm)
-                    if (isActive) {
-                        bgRealm.commitTransaction()
-                        val end = System.currentTimeMillis()
-                        val time = end - start
-                        Timber.v("Execute transaction in $time millis")
-                    }
-                } finally {
-                    if (bgRealm.isInTransaction) {
-                        bgRealm.cancelTransaction()
-                    }
+    return withContext(Realm.WRITE_EXECUTOR.asCoroutineDispatcher()) {
+        Realm.getInstance(config).use { bgRealm ->
+            bgRealm.beginTransaction()
+            val result: T
+            try {
+                val start = System.currentTimeMillis()
+                result = transaction(bgRealm)
+                if (isActive) {
+                    bgRealm.commitTransaction()
+                    val end = System.currentTimeMillis()
+                    val time = end - start
+                    Timber.v("Execute transaction in $time millis")
+                }
+            } finally {
+                if (bgRealm.isInTransaction) {
+                    bgRealm.cancelTransaction()
                 }
-                result
             }
+            result
         }
     }
 }
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 01576c3d61..12e60da114 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
@@ -17,36 +17,32 @@
 package org.matrix.android.sdk.internal.database
 
 import io.realm.DynamicRealm
-import io.realm.FieldAttribute
 import io.realm.RealmMigration
-import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
-import org.matrix.android.sdk.api.session.room.model.VersioningState
-import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
-import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
-import org.matrix.android.sdk.internal.crypto.model.event.EncryptionEventContent
-import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
-import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
-import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntityFields
-import org.matrix.android.sdk.internal.database.model.EditionOfEventFields
-import org.matrix.android.sdk.internal.database.model.EventEntityFields
-import org.matrix.android.sdk.internal.database.model.EventInsertEntityFields
-import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
-import org.matrix.android.sdk.internal.database.model.PendingThreePidEntityFields
-import org.matrix.android.sdk.internal.database.model.PreviewUrlCacheEntityFields
-import org.matrix.android.sdk.internal.database.model.RoomAccountDataEntityFields
-import org.matrix.android.sdk.internal.database.model.RoomEntityFields
-import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
-import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
-import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
-import org.matrix.android.sdk.internal.database.model.RoomTagEntityFields
-import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntityFields
-import org.matrix.android.sdk.internal.database.model.SpaceParentSummaryEntityFields
-import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
-import org.matrix.android.sdk.internal.database.model.presence.UserPresenceEntityFields
-import org.matrix.android.sdk.internal.di.MoshiProvider
-import org.matrix.android.sdk.internal.query.process
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo001
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo002
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo003
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo004
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo005
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo006
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo007
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo008
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo009
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo010
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo011
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo012
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo013
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo014
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo015
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo016
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo017
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo018
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo019
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo020
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo021
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo022
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo023
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo024
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo025
 import org.matrix.android.sdk.internal.util.Normalizer
 import timber.log.Timber
 import javax.inject.Inject
@@ -54,11 +50,6 @@ import javax.inject.Inject
 internal class RealmSessionStoreMigration @Inject constructor(
         private val normalizer: Normalizer
 ) : RealmMigration {
-
-    companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 22L
-    }
-
     /**
      * Forces all RealmSessionStoreMigration instances to be equal
      * Avoids Realm throwing when multiple instances of the migration are set
@@ -66,400 +57,35 @@ internal class RealmSessionStoreMigration @Inject constructor(
     override fun equals(other: Any?) = other is RealmSessionStoreMigration
     override fun hashCode() = 1000
 
+    val schemaVersion = 25L
+
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
-        Timber.v("Migrating Realm Session from $oldVersion to $newVersion")
+        Timber.d("Migrating Realm Session from $oldVersion to $newVersion")
 
-        if (oldVersion <= 0) migrateTo1(realm)
-        if (oldVersion <= 1) migrateTo2(realm)
-        if (oldVersion <= 2) migrateTo3(realm)
-        if (oldVersion <= 3) migrateTo4(realm)
-        if (oldVersion <= 4) migrateTo5(realm)
-        if (oldVersion <= 5) migrateTo6(realm)
-        if (oldVersion <= 6) migrateTo7(realm)
-        if (oldVersion <= 7) migrateTo8(realm)
-        if (oldVersion <= 8) migrateTo9(realm)
-        if (oldVersion <= 9) migrateTo10(realm)
-        if (oldVersion <= 10) migrateTo11(realm)
-        if (oldVersion <= 11) migrateTo12(realm)
-        if (oldVersion <= 12) migrateTo13(realm)
-        if (oldVersion <= 13) migrateTo14(realm)
-        if (oldVersion <= 14) migrateTo15(realm)
-        if (oldVersion <= 15) migrateTo16(realm)
-        if (oldVersion <= 16) migrateTo17(realm)
-        if (oldVersion <= 17) migrateTo18(realm)
-        if (oldVersion <= 18) migrateTo19(realm)
-        if (oldVersion <= 19) migrateTo20(realm)
-        if (oldVersion <= 20) migrateTo21(realm)
-        if (oldVersion <= 21) migrateTo22(realm)
-    }
-
-    private fun migrateTo1(realm: DynamicRealm) {
-        Timber.d("Step 0 -> 1")
-        // Add hasFailedSending in RoomSummary and a small warning icon on room list
-
-        realm.schema.get("RoomSummaryEntity")
-                ?.addField(RoomSummaryEntityFields.HAS_FAILED_SENDING, Boolean::class.java)
-                ?.transform { obj ->
-                    obj.setBoolean(RoomSummaryEntityFields.HAS_FAILED_SENDING, false)
-                }
-    }
-
-    private fun migrateTo2(realm: DynamicRealm) {
-        Timber.d("Step 1 -> 2")
-        realm.schema.get("HomeServerCapabilitiesEntity")
-                ?.addField("adminE2EByDefault", Boolean::class.java)
-                ?.transform { obj ->
-                    obj.setBoolean("adminE2EByDefault", true)
-                }
-    }
-
-    private fun migrateTo3(realm: DynamicRealm) {
-        Timber.d("Step 2 -> 3")
-        realm.schema.get("HomeServerCapabilitiesEntity")
-                ?.addField("preferredJitsiDomain", String::class.java)
-                ?.transform { obj ->
-                    // Schedule a refresh of the capabilities
-                    obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0)
-                }
-    }
-
-    private fun migrateTo4(realm: DynamicRealm) {
-        Timber.d("Step 3 -> 4")
-        realm.schema.create("PendingThreePidEntity")
-                .addField(PendingThreePidEntityFields.CLIENT_SECRET, String::class.java)
-                .setRequired(PendingThreePidEntityFields.CLIENT_SECRET, true)
-                .addField(PendingThreePidEntityFields.EMAIL, String::class.java)
-                .addField(PendingThreePidEntityFields.MSISDN, String::class.java)
-                .addField(PendingThreePidEntityFields.SEND_ATTEMPT, Int::class.java)
-                .addField(PendingThreePidEntityFields.SID, String::class.java)
-                .setRequired(PendingThreePidEntityFields.SID, true)
-                .addField(PendingThreePidEntityFields.SUBMIT_URL, String::class.java)
-    }
-
-    private fun migrateTo5(realm: DynamicRealm) {
-        Timber.d("Step 4 -> 5")
-        realm.schema.get("HomeServerCapabilitiesEntity")
-                ?.removeField("adminE2EByDefault")
-                ?.removeField("preferredJitsiDomain")
-    }
-
-    private fun migrateTo6(realm: DynamicRealm) {
-        Timber.d("Step 5 -> 6")
-        realm.schema.create("PreviewUrlCacheEntity")
-                .addField(PreviewUrlCacheEntityFields.URL, String::class.java)
-                .setRequired(PreviewUrlCacheEntityFields.URL, true)
-                .addPrimaryKey(PreviewUrlCacheEntityFields.URL)
-                .addField(PreviewUrlCacheEntityFields.URL_FROM_SERVER, String::class.java)
-                .addField(PreviewUrlCacheEntityFields.SITE_NAME, String::class.java)
-                .addField(PreviewUrlCacheEntityFields.TITLE, String::class.java)
-                .addField(PreviewUrlCacheEntityFields.DESCRIPTION, String::class.java)
-                .addField(PreviewUrlCacheEntityFields.MXC_URL, String::class.java)
-                .addField(PreviewUrlCacheEntityFields.LAST_UPDATED_TIMESTAMP, Long::class.java)
-    }
-
-    private fun migrateTo7(realm: DynamicRealm) {
-        Timber.d("Step 6 -> 7")
-        realm.schema.get("RoomEntity")
-                ?.addField(RoomEntityFields.MEMBERS_LOAD_STATUS_STR, String::class.java)
-                ?.transform { obj ->
-                    if (obj.getBoolean("areAllMembersLoaded")) {
-                        obj.setString("membersLoadStatusStr", RoomMembersLoadStatusType.LOADED.name)
-                    } else {
-                        obj.setString("membersLoadStatusStr", RoomMembersLoadStatusType.NONE.name)
-                    }
-                }
-                ?.removeField("areAllMembersLoaded")
-    }
-
-    private fun migrateTo8(realm: DynamicRealm) {
-        Timber.d("Step 7 -> 8")
-
-        val editionOfEventSchema = realm.schema.create("EditionOfEvent")
-                .addField(EditionOfEventFields.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(EditionOfEventFields.TIMESTAMP, Long::class.java)
-                .addField(EditionOfEventFields.IS_LOCAL_ECHO, Boolean::class.java)
-
-        realm.schema.get("EditAggregatedSummaryEntity")
-                ?.removeField("aggregatedContent")
-                ?.removeField("sourceEvents")
-                ?.removeField("lastEditTs")
-                ?.removeField("sourceLocalEchoEvents")
-                ?.addRealmListField(EditAggregatedSummaryEntityFields.EDITIONS.`$`, editionOfEventSchema)
-
-        // This has to be done once a parent use the model as a child
-        // See https://github.com/realm/realm-java/issues/7402
-        editionOfEventSchema.isEmbedded = true
-    }
-
-    private fun migrateTo9(realm: DynamicRealm) {
-        Timber.d("Step 8 -> 9")
-
-        realm.schema.get("RoomSummaryEntity")
-                ?.addField(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Long::class.java, FieldAttribute.INDEXED)
-                ?.setNullable(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, true)
-                ?.addIndex(RoomSummaryEntityFields.MEMBERSHIP_STR)
-                ?.addIndex(RoomSummaryEntityFields.IS_DIRECT)
-                ?.addIndex(RoomSummaryEntityFields.VERSIONING_STATE_STR)
-
-                ?.addField(RoomSummaryEntityFields.IS_FAVOURITE, Boolean::class.java)
-                ?.addIndex(RoomSummaryEntityFields.IS_FAVOURITE)
-                ?.addField(RoomSummaryEntityFields.IS_LOW_PRIORITY, Boolean::class.java)
-                ?.addIndex(RoomSummaryEntityFields.IS_LOW_PRIORITY)
-                ?.addField(RoomSummaryEntityFields.IS_SERVER_NOTICE, Boolean::class.java)
-                ?.addIndex(RoomSummaryEntityFields.IS_SERVER_NOTICE)
-
-                ?.transform { obj ->
-                    val isFavorite = obj.getList(RoomSummaryEntityFields.TAGS.`$`).any {
-                        it.getString(RoomTagEntityFields.TAG_NAME) == RoomTag.ROOM_TAG_FAVOURITE
-                    }
-                    obj.setBoolean(RoomSummaryEntityFields.IS_FAVOURITE, isFavorite)
-
-                    val isLowPriority = obj.getList(RoomSummaryEntityFields.TAGS.`$`).any {
-                        it.getString(RoomTagEntityFields.TAG_NAME) == RoomTag.ROOM_TAG_LOW_PRIORITY
-                    }
-
-                    obj.setBoolean(RoomSummaryEntityFields.IS_LOW_PRIORITY, isLowPriority)
-
-//                    XXX migrate last message origin server ts
-                    obj.getObject(RoomSummaryEntityFields.LATEST_PREVIEWABLE_EVENT.`$`)
-                            ?.getObject(TimelineEventEntityFields.ROOT.`$`)
-                            ?.getLong(EventEntityFields.ORIGIN_SERVER_TS)?.let {
-                                obj.setLong(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, it)
-                            }
-                }
-    }
-
-    private fun migrateTo10(realm: DynamicRealm) {
-        Timber.d("Step 9 -> 10")
-        realm.schema.create("SpaceChildSummaryEntity")
-                ?.addField(SpaceChildSummaryEntityFields.ORDER, String::class.java)
-                ?.addField(SpaceChildSummaryEntityFields.CHILD_ROOM_ID, String::class.java)
-                ?.addField(SpaceChildSummaryEntityFields.AUTO_JOIN, Boolean::class.java)
-                ?.setNullable(SpaceChildSummaryEntityFields.AUTO_JOIN, true)
-                ?.addRealmObjectField(SpaceChildSummaryEntityFields.CHILD_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
-                ?.addRealmListField(SpaceChildSummaryEntityFields.VIA_SERVERS.`$`, String::class.java)
-
-        realm.schema.create("SpaceParentSummaryEntity")
-                ?.addField(SpaceParentSummaryEntityFields.PARENT_ROOM_ID, String::class.java)
-                ?.addField(SpaceParentSummaryEntityFields.CANONICAL, Boolean::class.java)
-                ?.setNullable(SpaceParentSummaryEntityFields.CANONICAL, true)
-                ?.addRealmObjectField(SpaceParentSummaryEntityFields.PARENT_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
-                ?.addRealmListField(SpaceParentSummaryEntityFields.VIA_SERVERS.`$`, String::class.java)
-
-        val creationContentAdapter = MoshiProvider.providesMoshi().adapter(RoomCreateContent::class.java)
-        realm.schema.get("RoomSummaryEntity")
-                ?.addField(RoomSummaryEntityFields.ROOM_TYPE, String::class.java)
-                ?.addField(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, String::class.java)
-                ?.addField(RoomSummaryEntityFields.GROUP_IDS, String::class.java)
-                ?.transform { obj ->
-
-                    val creationEvent = realm.where("CurrentStateEventEntity")
-                            .equalTo(CurrentStateEventEntityFields.ROOM_ID, obj.getString(RoomSummaryEntityFields.ROOM_ID))
-                            .equalTo(CurrentStateEventEntityFields.TYPE, EventType.STATE_ROOM_CREATE)
-                            .findFirst()
-
-                    val roomType = creationEvent?.getObject(CurrentStateEventEntityFields.ROOT.`$`)
-                            ?.getString(EventEntityFields.CONTENT)?.let {
-                                creationContentAdapter.fromJson(it)?.type
-                            }
-
-                    obj.setString(RoomSummaryEntityFields.ROOM_TYPE, roomType)
-                }
-                ?.addRealmListField(RoomSummaryEntityFields.PARENTS.`$`, realm.schema.get("SpaceParentSummaryEntity")!!)
-                ?.addRealmListField(RoomSummaryEntityFields.CHILDREN.`$`, realm.schema.get("SpaceChildSummaryEntity")!!)
-    }
-
-    private fun migrateTo11(realm: DynamicRealm) {
-        Timber.d("Step 10 -> 11")
-        realm.schema.get("EventEntity")
-                ?.addField(EventEntityFields.SEND_STATE_DETAILS, String::class.java)
-    }
-
-    private fun migrateTo12(realm: DynamicRealm) {
-        Timber.d("Step 11 -> 12")
-
-        val joinRulesContentAdapter = MoshiProvider.providesMoshi().adapter(RoomJoinRulesContent::class.java)
-        realm.schema.get("RoomSummaryEntity")
-                ?.addField(RoomSummaryEntityFields.JOIN_RULES_STR, String::class.java)
-                ?.transform { obj ->
-                    val joinRulesEvent = realm.where("CurrentStateEventEntity")
-                            .equalTo(CurrentStateEventEntityFields.ROOM_ID, obj.getString(RoomSummaryEntityFields.ROOM_ID))
-                            .equalTo(CurrentStateEventEntityFields.TYPE, EventType.STATE_ROOM_JOIN_RULES)
-                            .findFirst()
-
-                    val roomJoinRules = joinRulesEvent?.getObject(CurrentStateEventEntityFields.ROOT.`$`)
-                            ?.getString(EventEntityFields.CONTENT)?.let {
-                                joinRulesContentAdapter.fromJson(it)?.joinRules
-                            }
-
-                    obj.setString(RoomSummaryEntityFields.JOIN_RULES_STR, roomJoinRules?.name)
-                }
-
-        realm.schema.get("SpaceChildSummaryEntity")
-                ?.addField(SpaceChildSummaryEntityFields.SUGGESTED, Boolean::class.java)
-                ?.setNullable(SpaceChildSummaryEntityFields.SUGGESTED, true)
-    }
-
-    private fun migrateTo13(realm: DynamicRealm) {
-        Timber.d("Step 12 -> 13")
-        // Fix issue with the nightly build. Eventually play again the migration which has been included in migrateTo12()
-        realm.schema.get("SpaceChildSummaryEntity")
-                ?.takeIf { !it.hasField(SpaceChildSummaryEntityFields.SUGGESTED) }
-                ?.addField(SpaceChildSummaryEntityFields.SUGGESTED, Boolean::class.java)
-                ?.setNullable(SpaceChildSummaryEntityFields.SUGGESTED, true)
-    }
-
-    private fun migrateTo14(realm: DynamicRealm) {
-        Timber.d("Step 13 -> 14")
-        val roomAccountDataSchema = realm.schema.create("RoomAccountDataEntity")
-                .addField(RoomAccountDataEntityFields.CONTENT_STR, String::class.java)
-                .addField(RoomAccountDataEntityFields.TYPE, String::class.java, FieldAttribute.INDEXED)
-
-        realm.schema.get("RoomEntity")
-                ?.addRealmListField(RoomEntityFields.ACCOUNT_DATA.`$`, roomAccountDataSchema)
-
-        realm.schema.get("RoomSummaryEntity")
-                ?.addField(RoomSummaryEntityFields.IS_HIDDEN_FROM_USER, Boolean::class.java, FieldAttribute.INDEXED)
-                ?.transform {
-                    val isHiddenFromUser = it.getString(RoomSummaryEntityFields.VERSIONING_STATE_STR) == VersioningState.UPGRADED_ROOM_JOINED.name
-                    it.setBoolean(RoomSummaryEntityFields.IS_HIDDEN_FROM_USER, isHiddenFromUser)
-                }
-
-        roomAccountDataSchema.isEmbedded = true
-    }
-
-    private fun migrateTo15(realm: DynamicRealm) {
-        Timber.d("Step 14 -> 15")
-        // fix issue with flattenParentIds on DM that kept growing with duplicate
-        // so we reset it, will be updated next sync
-        realm.where("RoomSummaryEntity")
-                .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
-                .equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
-                .findAll()
-                .onEach {
-                    it.setString(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, null)
-                }
-    }
-
-    private fun migrateTo16(realm: DynamicRealm) {
-        Timber.d("Step 15 -> 16")
-        realm.schema.get("HomeServerCapabilitiesEntity")
-                ?.addField(HomeServerCapabilitiesEntityFields.ROOM_VERSIONS_JSON, String::class.java)
-                ?.transform { obj ->
-                    // Schedule a refresh of the capabilities
-                    obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0)
-                }
-    }
-
-    private fun migrateTo17(realm: DynamicRealm) {
-        Timber.d("Step 16 -> 17")
-        realm.schema.get("EventInsertEntity")
-                ?.addField(EventInsertEntityFields.CAN_BE_PROCESSED, Boolean::class.java)
-    }
-
-    private fun migrateTo18(realm: DynamicRealm) {
-        Timber.d("Step 17 -> 18")
-        realm.schema.create("UserPresenceEntity")
-                ?.addField(UserPresenceEntityFields.USER_ID, String::class.java)
-                ?.addPrimaryKey(UserPresenceEntityFields.USER_ID)
-                ?.setRequired(UserPresenceEntityFields.USER_ID, true)
-                ?.addField(UserPresenceEntityFields.PRESENCE_STR, String::class.java)
-                ?.addField(UserPresenceEntityFields.LAST_ACTIVE_AGO, Long::class.java)
-                ?.setNullable(UserPresenceEntityFields.LAST_ACTIVE_AGO, true)
-                ?.addField(UserPresenceEntityFields.STATUS_MESSAGE, String::class.java)
-                ?.addField(UserPresenceEntityFields.IS_CURRENTLY_ACTIVE, Boolean::class.java)
-                ?.setNullable(UserPresenceEntityFields.IS_CURRENTLY_ACTIVE, true)
-                ?.addField(UserPresenceEntityFields.AVATAR_URL, String::class.java)
-                ?.addField(UserPresenceEntityFields.DISPLAY_NAME, String::class.java)
-
-        val userPresenceEntity = realm.schema.get("UserPresenceEntity") ?: return
-        realm.schema.get("RoomSummaryEntity")
-                ?.addRealmObjectField(RoomSummaryEntityFields.DIRECT_USER_PRESENCE.`$`, userPresenceEntity)
-
-        realm.schema.get("RoomMemberSummaryEntity")
-                ?.addRealmObjectField(RoomMemberSummaryEntityFields.USER_PRESENCE_ENTITY.`$`, userPresenceEntity)
-    }
-
-    private fun migrateTo19(realm: DynamicRealm) {
-        Timber.d("Step 18 -> 19")
-        realm.schema.get("RoomSummaryEntity")
-                ?.addField(RoomSummaryEntityFields.NORMALIZED_DISPLAY_NAME, String::class.java)
-                ?.transform {
-                    it.getString(RoomSummaryEntityFields.DISPLAY_NAME)?.let { displayName ->
-                        val normalised = normalizer.normalize(displayName)
-                        it.set(RoomSummaryEntityFields.NORMALIZED_DISPLAY_NAME, normalised)
-                    }
-                }
-    }
-
-    private fun migrateTo20(realm: DynamicRealm) {
-        Timber.d("Step 19 -> 20")
-
-        realm.schema.get("ChunkEntity")?.apply {
-            if (hasField("numberOfTimelineEvents")) {
-                removeField("numberOfTimelineEvents")
-            }
-            var cleanOldChunks = false
-            if (!hasField(ChunkEntityFields.NEXT_CHUNK.`$`)) {
-                cleanOldChunks = true
-                addRealmObjectField(ChunkEntityFields.NEXT_CHUNK.`$`, this)
-            }
-            if (!hasField(ChunkEntityFields.PREV_CHUNK.`$`)) {
-                cleanOldChunks = true
-                addRealmObjectField(ChunkEntityFields.PREV_CHUNK.`$`, this)
-            }
-            if (cleanOldChunks) {
-                val chunkEntities = realm.where("ChunkEntity").equalTo(ChunkEntityFields.IS_LAST_FORWARD, false).findAll()
-                chunkEntities.deleteAllFromRealm()
-            }
-        }
-    }
-
-    private fun migrateTo21(realm: DynamicRealm) {
-        Timber.d("Step 20 -> 21")
-
-        realm.schema.get("RoomSummaryEntity")
-                ?.addField(RoomSummaryEntityFields.E2E_ALGORITHM, String::class.java)
-                ?.transform { obj ->
-
-                    val encryptionContentAdapter = MoshiProvider.providesMoshi().adapter(EncryptionEventContent::class.java)
-
-                    val encryptionEvent = realm.where("CurrentStateEventEntity")
-                            .equalTo(CurrentStateEventEntityFields.ROOM_ID, obj.getString(RoomSummaryEntityFields.ROOM_ID))
-                            .equalTo(CurrentStateEventEntityFields.TYPE, EventType.STATE_ROOM_ENCRYPTION)
-                            .findFirst()
-
-                    val encryptionEventRoot = encryptionEvent?.getObject(CurrentStateEventEntityFields.ROOT.`$`)
-                    val algorithm = encryptionEventRoot
-                            ?.getString(EventEntityFields.CONTENT)?.let {
-                                encryptionContentAdapter.fromJson(it)?.algorithm
-                            }
-
-                    obj.setString(RoomSummaryEntityFields.E2E_ALGORITHM, algorithm)
-                    obj.setBoolean(RoomSummaryEntityFields.IS_ENCRYPTED, encryptionEvent != null)
-                    encryptionEventRoot?.getLong(EventEntityFields.ORIGIN_SERVER_TS)?.let {
-                        obj.setLong(RoomSummaryEntityFields.ENCRYPTION_EVENT_TS, it)
-                    }
-                }
-    }
-
-    private fun migrateTo22(realm: DynamicRealm) {
-        Timber.d("Step 21 -> 22")
-        val listJoinedRoomIds = realm.where("RoomEntity")
-                .equalTo(RoomEntityFields.MEMBERSHIP_STR, Membership.JOIN.name).findAll()
-                .map { it.getString(RoomEntityFields.ROOM_ID) }
-
-        val hasMissingStateEvent = realm.where("CurrentStateEventEntity")
-                .`in`(CurrentStateEventEntityFields.ROOM_ID, listJoinedRoomIds.toTypedArray())
-                .isNull(CurrentStateEventEntityFields.ROOT.`$`).findFirst() != null
-
-        if (hasMissingStateEvent) {
-            Timber.v("Has some missing state event, clear session cache")
-            realm.deleteAll()
-        }
+        if (oldVersion < 1) MigrateSessionTo001(realm).perform()
+        if (oldVersion < 2) MigrateSessionTo002(realm).perform()
+        if (oldVersion < 3) MigrateSessionTo003(realm).perform()
+        if (oldVersion < 4) MigrateSessionTo004(realm).perform()
+        if (oldVersion < 5) MigrateSessionTo005(realm).perform()
+        if (oldVersion < 6) MigrateSessionTo006(realm).perform()
+        if (oldVersion < 7) MigrateSessionTo007(realm).perform()
+        if (oldVersion < 8) MigrateSessionTo008(realm).perform()
+        if (oldVersion < 9) MigrateSessionTo009(realm).perform()
+        if (oldVersion < 10) MigrateSessionTo010(realm).perform()
+        if (oldVersion < 11) MigrateSessionTo011(realm).perform()
+        if (oldVersion < 12) MigrateSessionTo012(realm).perform()
+        if (oldVersion < 13) MigrateSessionTo013(realm).perform()
+        if (oldVersion < 14) MigrateSessionTo014(realm).perform()
+        if (oldVersion < 15) MigrateSessionTo015(realm).perform()
+        if (oldVersion < 16) MigrateSessionTo016(realm).perform()
+        if (oldVersion < 17) MigrateSessionTo017(realm).perform()
+        if (oldVersion < 18) MigrateSessionTo018(realm).perform()
+        if (oldVersion < 19) MigrateSessionTo019(realm, normalizer).perform()
+        if (oldVersion < 20) MigrateSessionTo020(realm).perform()
+        if (oldVersion < 21) MigrateSessionTo021(realm).perform()
+        if (oldVersion < 22) MigrateSessionTo022(realm).perform()
+        if (oldVersion < 23) MigrateSessionTo023(realm).perform()
+        if (oldVersion < 24) MigrateSessionTo024(realm).perform()
+        if (oldVersion < 25) MigrateSessionTo025(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 04ca26a943..08d55b5647 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
@@ -71,7 +71,7 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
                 }
                 .allowWritesOnUiThread(true)
                 .modules(SessionRealmModule())
-                .schemaVersion(RealmSessionStoreMigration.SESSION_STORE_SCHEMA_VERSION)
+                .schemaVersion(realmSessionStoreMigration.schemaVersion)
                 .migration(realmSessionStoreMigration)
                 .build()
 
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 c21bf74d93..289db9fa15 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
@@ -34,6 +34,7 @@ import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.database.query.find
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.database.query.whereRoomId
 import org.matrix.android.sdk.internal.extensions.assertIsManaged
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import timber.log.Timber
@@ -81,7 +82,7 @@ internal fun ChunkEntity.addStateEvent(roomId: String, stateEvent: EventEntity,
 internal fun ChunkEntity.addTimelineEvent(roomId: String,
                                           eventEntity: EventEntity,
                                           direction: PaginationDirection,
-                                          roomMemberContentsByUser: Map<String, RoomMemberContent?>) {
+                                          roomMemberContentsByUser: Map<String, RoomMemberContent?>? = null) {
     val eventId = eventEntity.eventId
     if (timelineEvents.find(eventId) != null) {
         return
@@ -101,7 +102,7 @@ internal fun ChunkEntity.addTimelineEvent(roomId: String,
                 ?.also { it.cleanUp(eventEntity.sender) }
         this.readReceipts = readReceiptsSummaryEntity
         this.displayIndex = displayIndex
-        val roomMemberContent = roomMemberContentsByUser[senderId]
+        val roomMemberContent = roomMemberContentsByUser?.get(senderId)
         this.senderAvatar = roomMemberContent?.avatarUrl
         this.senderName = roomMemberContent?.displayName
         isUniqueDisplayName = if (roomMemberContent?.displayName != null) {
@@ -157,9 +158,21 @@ private fun ChunkEntity.addTimelineEventFromMerge(realm: Realm, timelineEventEnt
         this.senderName = timelineEventEntity.senderName
         this.isUniqueDisplayName = timelineEventEntity.isUniqueDisplayName
     }
+    handleThreadSummary(realm, eventId, copied)
     timelineEvents.add(copied)
 }
 
+/**
+ * Upon copy of the timeline events we should update the latestMessage TimelineEventEntity with the new one
+ */
+private fun handleThreadSummary(realm: Realm, oldEventId: String, newTimelineEventEntity: TimelineEventEntity) {
+    EventEntity
+            .whereRoomId(realm, newTimelineEventEntity.roomId)
+            .equalTo(EventEntityFields.IS_ROOT_THREAD, true)
+            .equalTo(EventEntityFields.THREAD_SUMMARY_LATEST_MESSAGE.EVENT_ID, oldEventId)
+            .findFirst()?.threadSummaryLatestMessage = newTimelineEventEntity
+}
+
 private fun handleReadReceipts(realm: Realm, roomId: String, eventEntity: EventEntity, senderId: String): ReadReceiptsSummaryEntity {
     val readReceiptsSummaryEntity = ReadReceiptsSummaryEntity.where(realm, eventEntity.eventId).findFirst()
             ?: realm.createObject<ReadReceiptsSummaryEntity>(eventEntity.eventId).apply {
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
new file mode 100644
index 0000000000..f703bfaf82
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.helper
+
+import io.realm.Realm
+import io.realm.RealmQuery
+import io.realm.Sort
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
+import org.matrix.android.sdk.internal.database.mapper.asDomain
+import org.matrix.android.sdk.internal.database.model.ChunkEntity
+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.ReadReceiptEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.database.query.find
+import org.matrix.android.sdk.internal.database.query.findIncludingEvent
+import org.matrix.android.sdk.internal.database.query.findLastForwardChunkOfRoom
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.database.query.whereRoomId
+
+private typealias ThreadSummary = Pair<Int, TimelineEventEntity>?
+
+/**
+ * Finds the root thread event and update it with the latest message summary along with the number
+ * of threads included. If there is no root thread event no action is done
+ */
+internal fun Map<String, EventEntity>.updateThreadSummaryIfNeeded(
+        roomId: String,
+        realm: Realm, currentUserId: String,
+        chunkEntity: ChunkEntity? = null,
+        shouldUpdateNotifications: Boolean = true) {
+    for ((rootThreadEventId, eventEntity) in this) {
+        eventEntity.threadSummaryInThread(eventEntity.realm, rootThreadEventId, chunkEntity)?.let { threadSummary ->
+
+            val numberOfMessages = threadSummary.first
+            val latestEventInThread = threadSummary.second
+
+            // If this is a thread message, find its root event if exists
+            val rootThreadEvent = if (eventEntity.isThread()) eventEntity.findRootThreadEvent() else eventEntity
+
+            rootThreadEvent?.markEventAsRoot(
+                    threadsCounted = numberOfMessages,
+                    latestMessageTimelineEventEntity = latestEventInThread
+            )
+        }
+    }
+
+    if (shouldUpdateNotifications) {
+        updateNotificationsNew(roomId, realm, currentUserId)
+    }
+}
+
+/**
+ * Finds the root event of the the current thread event message.
+ * Returns the EventEntity or null if the root event do not exist
+ */
+internal fun EventEntity.findRootThreadEvent(): EventEntity? =
+        rootThreadEventId?.let {
+            EventEntity
+                    .where(realm, it)
+                    .findFirst()
+        }
+
+/**
+ * Mark or update the current event a root thread event
+ */
+internal fun EventEntity.markEventAsRoot(
+        threadsCounted: Int,
+        latestMessageTimelineEventEntity: TimelineEventEntity?) {
+    isRootThread = true
+    numberOfThreads = threadsCounted
+    threadSummaryLatestMessage = latestMessageTimelineEventEntity
+}
+
+/**
+ * Count the number of threads for the provided root thread eventId, and finds the latest event message
+ * @param rootThreadEventId The root eventId that will find the number of threads
+ * @return A ThreadSummary containing the counted threads and the latest event message
+ */
+internal fun EventEntity.threadSummaryInThread(realm: Realm, rootThreadEventId: String, chunkEntity: ChunkEntity?): ThreadSummary {
+    // Number of messages
+    val messages = TimelineEventEntity
+            .whereRoomId(realm, roomId = roomId)
+            .equalTo(TimelineEventEntityFields.ROOT.ROOT_THREAD_EVENT_ID, rootThreadEventId)
+            .count()
+            .toInt()
+
+    if (messages <= 0) return null
+
+    // Find latest thread event, we know it exists
+    var chunk = ChunkEntity.findLastForwardChunkOfRoom(realm, roomId) ?: chunkEntity ?: return null
+    var result: TimelineEventEntity? = null
+
+    // Iterate the chunk until we find our latest event
+    while (result == null) {
+        result = findLatestSortedChunkEvent(chunk, rootThreadEventId)
+        chunk = ChunkEntity.find(realm, roomId, nextToken = chunk.prevToken) ?: break
+    }
+
+    if (result == null && chunkEntity != null) {
+        // Find latest event from our current chunk
+        result = findLatestSortedChunkEvent(chunkEntity, rootThreadEventId)
+    } else if (result != null && chunkEntity != null) {
+        val currentChunkLatestEvent = findLatestSortedChunkEvent(chunkEntity, rootThreadEventId)
+        result = findMostRecentEvent(result, currentChunkLatestEvent)
+    }
+
+    result ?: return null
+
+    return ThreadSummary(messages, result)
+}
+
+/**
+ * Lets compare them in case user is moving forward in the timeline and we cannot know the
+ * exact chunk sequence while currentChunk is not yet committed in the DB
+ */
+private fun findMostRecentEvent(result: TimelineEventEntity, currentChunkLatestEvent: TimelineEventEntity?): TimelineEventEntity {
+    currentChunkLatestEvent ?: return result
+    val currentChunkEventTimestamp = currentChunkLatestEvent.root?.originServerTs ?: return result
+    val resultTimestamp = result.root?.originServerTs ?: return result
+    if (currentChunkEventTimestamp > resultTimestamp) {
+        return currentChunkLatestEvent
+    }
+    return result
+}
+
+/**
+ * Find the latest event of the current chunk
+ */
+private fun findLatestSortedChunkEvent(chunk: ChunkEntity, rootThreadEventId: String): TimelineEventEntity? =
+        chunk.timelineEvents.sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)?.firstOrNull {
+            it.root?.rootThreadEventId == rootThreadEventId
+        }
+
+/**
+ * Find all TimelineEventEntity that are root threads for the specified room
+ * @param roomId The room that all stored root threads will be returned
+ */
+internal fun TimelineEventEntity.Companion.findAllThreadsForRoomId(realm: Realm, roomId: String): RealmQuery<TimelineEventEntity> =
+        TimelineEventEntity
+                .whereRoomId(realm, roomId = roomId)
+                .equalTo(TimelineEventEntityFields.ROOT.IS_ROOT_THREAD, true)
+                .sort("${TimelineEventEntityFields.ROOT.THREAD_SUMMARY_LATEST_MESSAGE}.${TimelineEventEntityFields.ROOT.ORIGIN_SERVER_TS}", Sort.DESCENDING)
+
+/**
+ * Map each root thread TimelineEvent with the equivalent decrypted text edition/replacement
+ */
+internal fun List<TimelineEvent>.mapEventsWithEdition(realm: Realm, roomId: String): List<TimelineEvent> =
+        this.map {
+            EventAnnotationsSummaryEntity
+                    .where(realm, roomId, eventId = it.eventId)
+                    .findFirst()
+                    ?.editSummary
+                    ?.editions
+                    ?.lastOrNull()
+                    ?.eventId
+                    ?.let { editedEventId ->
+                        TimelineEventEntity.where(realm, roomId, eventId = editedEventId).findFirst()?.let { editedEvent ->
+                            it.root.threadDetails = it.root.threadDetails?.copy(lastRootThreadEdition = editedEvent.root?.asDomain()?.getDecryptedTextSummary()
+                                    ?: "(edited)")
+                            it
+                        } ?: it
+                    } ?: it
+        }
+
+/**
+ * Returns a list of all the marked unread threads that exists for the specified room
+ * @param roomId The roomId that the user is currently in
+ */
+internal fun TimelineEventEntity.Companion.findAllLocalThreadNotificationsForRoomId(realm: Realm, roomId: String): RealmQuery<TimelineEventEntity> =
+        TimelineEventEntity
+                .whereRoomId(realm, roomId = roomId)
+                .equalTo(TimelineEventEntityFields.ROOT.IS_ROOT_THREAD, true)
+                .beginGroup()
+                .equalTo(TimelineEventEntityFields.ROOT.THREAD_NOTIFICATION_STATE_STR, ThreadNotificationState.NEW_MESSAGE.name)
+                .or()
+                .equalTo(TimelineEventEntityFields.ROOT.THREAD_NOTIFICATION_STATE_STR, ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE.name)
+                .endGroup()
+
+/**
+ * Returns whether or not the given user is participating in a current thread
+ * @param roomId the room that the thread exists
+ * @param rootThreadEventId the thread that the search will be done
+ * @param senderId the user that will try to find participation
+ */
+internal fun TimelineEventEntity.Companion.isUserParticipatingInThread(realm: Realm, roomId: String, rootThreadEventId: String, senderId: String): Boolean =
+        TimelineEventEntity
+                .whereRoomId(realm, roomId = roomId)
+                .equalTo(TimelineEventEntityFields.ROOT.ROOT_THREAD_EVENT_ID, rootThreadEventId)
+                .equalTo(TimelineEventEntityFields.ROOT.SENDER, senderId)
+                .findFirst()
+                ?.let { true }
+                ?: false
+
+/**
+ * Returns whether or not the given user is mentioned in a current thread
+ * @param roomId the room that the thread exists
+ * @param rootThreadEventId the thread that the search will be done
+ * @param userId the user that will try to find if there is a mention
+ */
+internal fun TimelineEventEntity.Companion.isUserMentionedInThread(realm: Realm, roomId: String, rootThreadEventId: String, userId: String): Boolean =
+        TimelineEventEntity
+                .whereRoomId(realm, roomId = roomId)
+                .equalTo(TimelineEventEntityFields.ROOT.ROOT_THREAD_EVENT_ID, rootThreadEventId)
+                .equalTo(TimelineEventEntityFields.ROOT.SENDER, userId)
+                .findAll()
+                .firstOrNull { isUserMentioned(userId, it) }
+                ?.let { true }
+                ?: false
+
+/**
+ * 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)
+                .findFirst()
+                ?.eventId
+
+/**
+ * Returns whether or not the user is mentioned in the event
+ */
+internal fun isUserMentioned(currentUserId: String, timelineEventEntity: TimelineEventEntity?): Boolean {
+    return timelineEventEntity?.root?.asDomain()?.isUserMentioned(currentUserId) == true
+}
+
+/**
+ * Update badge notifications. Count the number of new thread events after the latest
+ * read receipt and aggregate. This function will find and notify new thread events
+ * that the user is either mentioned, or the user had participated in.
+ * Important: If the root thread event is not fetched notification will not work
+ * 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
+
+    val readReceiptChunk = ChunkEntity
+            .findIncludingEvent(realm, readReceipt) ?: return
+
+    val readReceiptChunkTimelineEvents = readReceiptChunk
+            .timelineEvents
+            .where()
+            .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
+            .sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.ASCENDING)
+            .findAll() ?: return
+
+    val readReceiptChunkPosition = readReceiptChunkTimelineEvents.indexOfFirst { it.eventId == readReceipt }
+
+    if (readReceiptChunkPosition == -1) return
+
+    if (readReceiptChunkPosition < readReceiptChunkTimelineEvents.lastIndex) {
+        // If the read receipt is found inside the chunk
+
+        val threadEventsAfterReadReceipt = readReceiptChunkTimelineEvents
+                .slice(readReceiptChunkPosition..readReceiptChunkTimelineEvents.lastIndex)
+                .filter { it.root?.isThread() == true }
+
+        // In order for the below code to work for old events, we should save the previous read receipt
+        // and then continue with the chunk search for that read receipt
+        /*
+       val newThreadEventsList = arrayListOf<TimelineEventEntity>()
+        newThreadEventsList.addAll(threadEventsAfterReadReceipt)
+
+        // got from latest chunk all new threads, lets move to the others
+        var nextChunk = ChunkEntity
+                .find(realm = realm, roomId = roomId, nextToken = readReceiptChunk.nextToken)
+                .takeIf { readReceiptChunk.nextToken != null }
+        while (nextChunk != null) {
+            newThreadEventsList.addAll(nextChunk.timelineEvents
+                    .filter { it.root?.isThread() == true })
+            nextChunk = ChunkEntity
+                    .find(realm = realm, roomId = roomId, nextToken = nextChunk.nextToken)
+                    .takeIf { readReceiptChunk.nextToken != null }
+        }*/
+
+        // Find if the user is mentioned in those events
+        val userMentionsList = threadEventsAfterReadReceipt
+                .filter {
+                    isUserMentioned(currentUserId = currentUserId, it)
+                }.map {
+                    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 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 (userMentionsList.contains(eventId)) {
+                rootThreadEventEntity?.threadNotificationState = ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/lightweight/LightweightSettingsStorage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/lightweight/LightweightSettingsStorage.kt
new file mode 100644
index 0000000000..700b94a985
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/lightweight/LightweightSettingsStorage.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.internal.database.lightweight
+
+import android.content.Context
+import androidx.core.content.edit
+import androidx.preference.PreferenceManager
+import javax.inject.Inject
+
+/**
+ * The purpose of this class is to provide an alternative and lightweight way to store settings/data
+ * on the sdi without using the database. This should be used just for sdk/user preferences and
+ * not for large data sets
+ */
+
+class LightweightSettingsStorage  @Inject constructor(context: Context) {
+
+    private val sdkDefaultPrefs = PreferenceManager.getDefaultSharedPreferences(context.applicationContext)
+
+    fun setThreadMessagesEnabled(enabled: Boolean) {
+        sdkDefaultPrefs.edit {
+            putBoolean(MATRIX_SDK_SETTINGS_THREAD_MESSAGES_ENABLED, enabled)
+        }
+    }
+
+    fun areThreadMessagesEnabled(): Boolean {
+        return sdkDefaultPrefs.getBoolean(MATRIX_SDK_SETTINGS_THREAD_MESSAGES_ENABLED, false)
+    }
+
+    companion object {
+        const val MATRIX_SDK_SETTINGS_THREAD_MESSAGES_ENABLED = "MATRIX_SDK_SETTINGS_THREAD_MESSAGES_ENABLED"
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
index 613b38e340..9c420e81fd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
@@ -21,7 +21,11 @@ import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 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.UnsignedData
+import org.matrix.android.sdk.api.session.events.model.getRootThreadEventId
 import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.threads.ThreadDetails
+import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.di.MoshiProvider
@@ -51,6 +55,10 @@ internal object EventMapper {
         }
         eventEntity.decryptionErrorReason = event.mCryptoErrorReason
         eventEntity.decryptionErrorCode = event.mCryptoError?.name
+        eventEntity.isRootThread = event.threadDetails?.isRootThread ?: false
+        eventEntity.rootThreadEventId = event.getRootThreadEventId()
+        eventEntity.numberOfThreads = event.threadDetails?.numberOfThreads ?: 0
+        eventEntity.threadNotificationState = event.threadDetails?.threadNotificationState ?: ThreadNotificationState.NO_NEW_MESSAGE
         return eventEntity
     }
 
@@ -93,6 +101,23 @@ internal object EventMapper {
                 MXCryptoError.ErrorType.valueOf(errorCode)
             }
             it.mCryptoErrorReason = eventEntity.decryptionErrorReason
+            it.threadDetails = ThreadDetails(
+                    isRootThread = eventEntity.isRootThread,
+                    isThread = if (it.threadDetails?.isThread == true) true else eventEntity.isThread(),
+                    numberOfThreads = eventEntity.numberOfThreads,
+                    threadSummarySenderInfo = eventEntity.threadSummaryLatestMessage?.let { timelineEventEntity ->
+                        SenderInfo(
+                                userId = timelineEventEntity.root?.sender ?: "",
+                                displayName = timelineEventEntity.senderName,
+                                isUniqueDisplayName = timelineEventEntity.isUniqueDisplayName,
+                                avatarUrl = timelineEventEntity.senderAvatar
+                        )
+                    },
+                    threadNotificationState = eventEntity.threadNotificationState,
+                    threadSummaryLatestTextMessage = eventEntity.threadSummaryLatestMessage?.root?.asDomain()?.getDecryptedTextSummary(),
+                    lastMessageTimestamp = eventEntity.threadSummaryLatestMessage?.root?.originServerTs
+
+            )
         }
     }
 }
@@ -101,9 +126,15 @@ internal fun EventEntity.asDomain(castJsonNumbers: Boolean = false): Event {
     return EventMapper.map(this, castJsonNumbers)
 }
 
-internal fun Event.toEntity(roomId: String, sendState: SendState, ageLocalTs: Long?): EventEntity {
+internal fun Event.toEntity(roomId: String, sendState: SendState, ageLocalTs: Long?, contentToInject: String? = null): EventEntity {
     return EventMapper.map(this, roomId).apply {
         this.sendState = sendState
         this.ageLocalTs = ageLocalTs
+        contentToInject?.let {
+            this.content = it
+            if (this.type == EventType.STICKER) {
+                this.type = EventType.MESSAGE
+            }
+        }
     }
 }
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 8b6d263f8c..7869506015 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
@@ -35,6 +35,9 @@ internal object HomeServerCapabilitiesMapper {
     fun map(entity: HomeServerCapabilitiesEntity): HomeServerCapabilities {
         return HomeServerCapabilities(
                 canChangePassword = entity.canChangePassword,
+                canChangeDisplayName = entity.canChangeDisplayName,
+                canChangeAvatar = entity.canChangeAvatar,
+                canChange3pid = entity.canChange3pid,
                 maxUploadFileSize = entity.maxUploadFileSize,
                 lastVersionIdentityServerSupported = entity.lastVersionIdentityServerSupported,
                 defaultIdentityServerUrl = entity.defaultIdentityServerUrl,
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 5413dd3d71..f3770e4afe 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
@@ -19,23 +19,26 @@ package org.matrix.android.sdk.internal.database.mapper
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.internal.database.RealmSessionProvider
 import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
-import org.matrix.android.sdk.internal.database.model.UserEntity
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
 import org.matrix.android.sdk.internal.database.query.where
 import javax.inject.Inject
 
-internal class ReadReceiptsSummaryMapper @Inject constructor(private val realmSessionProvider: RealmSessionProvider) {
+internal class ReadReceiptsSummaryMapper @Inject constructor(
+        private val realmSessionProvider: RealmSessionProvider
+) {
 
     fun map(readReceiptsSummaryEntity: ReadReceiptsSummaryEntity?): List<ReadReceipt> {
         if (readReceiptsSummaryEntity == null) {
             return emptyList()
         }
+        val readReceipts = readReceiptsSummaryEntity.readReceipts
+
         return realmSessionProvider.withRealm { realm ->
-            val readReceipts = readReceiptsSummaryEntity.readReceipts
             readReceipts
                     .mapNotNull {
-                        val user = UserEntity.where(realm, it.userId).findFirst()
+                        val roomMember = RoomMemberSummaryEntity.where(realm, roomId = it.roomId, userId = it.userId).findFirst()
                                 ?: return@mapNotNull null
-                        ReadReceipt(user.asDomain(), it.originServerTs.toLong())
+                        ReadReceipt(roomMember.asDomain(), it.originServerTs.toLong())
                     }
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
index f3bea68c26..55c7f2a8ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
@@ -48,7 +48,7 @@ internal class TimelineEventMapper @Inject constructor(private val readReceiptsS
                 ),
                 readReceipts = readReceipts
                         ?.distinctBy {
-                            it.user
+                            it.roomMember
                         }?.sortedByDescending {
                             it.originServerTs
                         }.orEmpty()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo001.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo001.kt
new file mode 100644
index 0000000000..831c6280ad
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo001.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.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo001(realm: DynamicRealm) : RealmMigrator(realm, 1) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        // Add hasFailedSending in RoomSummary and a small warning icon on room list
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.HAS_FAILED_SENDING, Boolean::class.java)
+                ?.transform { obj ->
+                    obj.setBoolean(RoomSummaryEntityFields.HAS_FAILED_SENDING, false)
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo002.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo002.kt
new file mode 100644
index 0000000000..215e558e2a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo002.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.util.database.RealmMigrator
+
+class MigrateSessionTo002(realm: DynamicRealm) : RealmMigrator(realm, 2) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField("adminE2EByDefault", Boolean::class.java)
+                ?.transform { obj ->
+                    obj.setBoolean("adminE2EByDefault", true)
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo003.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo003.kt
new file mode 100644
index 0000000000..bc0b79d7e6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo003.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.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo003(realm: DynamicRealm) : RealmMigrator(realm, 3) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField("preferredJitsiDomain", String::class.java)
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo004.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo004.kt
new file mode 100644
index 0000000000..be13ae2c2f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo004.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.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo004(realm: DynamicRealm) : RealmMigrator(realm, 4) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("PendingThreePidEntity")
+                .addField(PendingThreePidEntityFields.CLIENT_SECRET, String::class.java)
+                .setRequired(PendingThreePidEntityFields.CLIENT_SECRET, true)
+                .addField(PendingThreePidEntityFields.EMAIL, String::class.java)
+                .addField(PendingThreePidEntityFields.MSISDN, String::class.java)
+                .addField(PendingThreePidEntityFields.SEND_ATTEMPT, Int::class.java)
+                .addField(PendingThreePidEntityFields.SID, String::class.java)
+                .setRequired(PendingThreePidEntityFields.SID, true)
+                .addField(PendingThreePidEntityFields.SUBMIT_URL, String::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo005.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo005.kt
new file mode 100644
index 0000000000..b4826b23a4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo005.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.util.database.RealmMigrator
+
+class MigrateSessionTo005(realm: DynamicRealm) : RealmMigrator(realm, 5) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.removeField("adminE2EByDefault")
+                ?.removeField("preferredJitsiDomain")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo006.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo006.kt
new file mode 100644
index 0000000000..3d7f26ccee
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo006.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.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.PreviewUrlCacheEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo006(realm: DynamicRealm) : RealmMigrator(realm, 6) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("PreviewUrlCacheEntity")
+                .addField(PreviewUrlCacheEntityFields.URL, String::class.java)
+                .setRequired(PreviewUrlCacheEntityFields.URL, true)
+                .addPrimaryKey(PreviewUrlCacheEntityFields.URL)
+                .addField(PreviewUrlCacheEntityFields.URL_FROM_SERVER, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.SITE_NAME, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.TITLE, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.DESCRIPTION, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.MXC_URL, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.LAST_UPDATED_TIMESTAMP, Long::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo007.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo007.kt
new file mode 100644
index 0000000000..be8c8ce9c6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo007.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.RoomEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo007(realm: DynamicRealm) : RealmMigrator(realm, 7) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("RoomEntity")
+                ?.addField(RoomEntityFields.MEMBERS_LOAD_STATUS_STR, String::class.java)
+                ?.transform { obj ->
+                    if (obj.getBoolean("areAllMembersLoaded")) {
+                        obj.setString("membersLoadStatusStr", RoomMembersLoadStatusType.LOADED.name)
+                    } else {
+                        obj.setString("membersLoadStatusStr", RoomMembersLoadStatusType.NONE.name)
+                    }
+                }
+                ?.removeField("areAllMembersLoaded")
+    }
+}
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
new file mode 100644
index 0000000000..d46730ef70
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo008.kt
@@ -0,0 +1,47 @@
+/*
+ * 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.EditAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.EditionOfEventFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+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(EditionOfEventFields.EVENT_ID, String::class.java)
+                .setRequired(EditionOfEventFields.EVENT_ID, true)
+                .addField(EditionOfEventFields.SENDER_ID, String::class.java)
+                .setRequired(EditionOfEventFields.SENDER_ID, true)
+                .addField(EditionOfEventFields.TIMESTAMP, Long::class.java)
+                .addField(EditionOfEventFields.IS_LOCAL_ECHO, Boolean::class.java)
+
+        realm.schema.get("EditAggregatedSummaryEntity")
+                ?.removeField("aggregatedContent")
+                ?.removeField("sourceEvents")
+                ?.removeField("lastEditTs")
+                ?.removeField("sourceLocalEchoEvents")
+                ?.addRealmListField(EditAggregatedSummaryEntityFields.EDITIONS.`$`, editionOfEventSchema)
+
+        // This has to be done once a parent use the model as a child
+        // See https://github.com/realm/realm-java/issues/7402
+        editionOfEventSchema.isEmbedded = true
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo009.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo009.kt
new file mode 100644
index 0000000000..370430b9e3
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo009.kt
@@ -0,0 +1,65 @@
+/*
+ * 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 io.realm.FieldAttribute
+import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomTagEntityFields
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo009(realm: DynamicRealm) : RealmMigrator(realm, 9) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Long::class.java, FieldAttribute.INDEXED)
+                ?.setNullable(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, true)
+                ?.addIndex(RoomSummaryEntityFields.MEMBERSHIP_STR)
+                ?.addIndex(RoomSummaryEntityFields.IS_DIRECT)
+                ?.addIndex(RoomSummaryEntityFields.VERSIONING_STATE_STR)
+
+                ?.addField(RoomSummaryEntityFields.IS_FAVOURITE, Boolean::class.java)
+                ?.addIndex(RoomSummaryEntityFields.IS_FAVOURITE)
+                ?.addField(RoomSummaryEntityFields.IS_LOW_PRIORITY, Boolean::class.java)
+                ?.addIndex(RoomSummaryEntityFields.IS_LOW_PRIORITY)
+                ?.addField(RoomSummaryEntityFields.IS_SERVER_NOTICE, Boolean::class.java)
+                ?.addIndex(RoomSummaryEntityFields.IS_SERVER_NOTICE)
+
+                ?.transform { obj ->
+                    val isFavorite = obj.getList(RoomSummaryEntityFields.TAGS.`$`).any {
+                        it.getString(RoomTagEntityFields.TAG_NAME) == RoomTag.ROOM_TAG_FAVOURITE
+                    }
+                    obj.setBoolean(RoomSummaryEntityFields.IS_FAVOURITE, isFavorite)
+
+                    val isLowPriority = obj.getList(RoomSummaryEntityFields.TAGS.`$`).any {
+                        it.getString(RoomTagEntityFields.TAG_NAME) == RoomTag.ROOM_TAG_LOW_PRIORITY
+                    }
+
+                    obj.setBoolean(RoomSummaryEntityFields.IS_LOW_PRIORITY, isLowPriority)
+
+//                    XXX migrate last message origin server ts
+                    obj.getObject(RoomSummaryEntityFields.LATEST_PREVIEWABLE_EVENT.`$`)
+                            ?.getObject(TimelineEventEntityFields.ROOT.`$`)
+                            ?.getLong(EventEntityFields.ORIGIN_SERVER_TS)?.let {
+                                obj.setLong(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, it)
+                            }
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo010.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo010.kt
new file mode 100644
index 0000000000..b968862d10
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo010.kt
@@ -0,0 +1,70 @@
+/*
+ * 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.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.SpaceParentSummaryEntityFields
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo010(realm: DynamicRealm) : RealmMigrator(realm, 10) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("SpaceChildSummaryEntity")
+                ?.addField(SpaceChildSummaryEntityFields.ORDER, String::class.java)
+                ?.addField(SpaceChildSummaryEntityFields.CHILD_ROOM_ID, String::class.java)
+                ?.addField(SpaceChildSummaryEntityFields.AUTO_JOIN, Boolean::class.java)
+                ?.setNullable(SpaceChildSummaryEntityFields.AUTO_JOIN, true)
+                ?.addRealmObjectField(SpaceChildSummaryEntityFields.CHILD_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
+                ?.addRealmListField(SpaceChildSummaryEntityFields.VIA_SERVERS.`$`, String::class.java)
+
+        realm.schema.create("SpaceParentSummaryEntity")
+                ?.addField(SpaceParentSummaryEntityFields.PARENT_ROOM_ID, String::class.java)
+                ?.addField(SpaceParentSummaryEntityFields.CANONICAL, Boolean::class.java)
+                ?.setNullable(SpaceParentSummaryEntityFields.CANONICAL, true)
+                ?.addRealmObjectField(SpaceParentSummaryEntityFields.PARENT_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
+                ?.addRealmListField(SpaceParentSummaryEntityFields.VIA_SERVERS.`$`, String::class.java)
+
+        val creationContentAdapter = MoshiProvider.providesMoshi().adapter(RoomCreateContent::class.java)
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.ROOM_TYPE, String::class.java)
+                ?.addField(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, String::class.java)
+                ?.addField(RoomSummaryEntityFields.GROUP_IDS, String::class.java)
+                ?.transform { obj ->
+
+                    val creationEvent = realm.where("CurrentStateEventEntity")
+                            .equalTo(CurrentStateEventEntityFields.ROOM_ID, obj.getString(RoomSummaryEntityFields.ROOM_ID))
+                            .equalTo(CurrentStateEventEntityFields.TYPE, EventType.STATE_ROOM_CREATE)
+                            .findFirst()
+
+                    val roomType = creationEvent?.getObject(CurrentStateEventEntityFields.ROOT.`$`)
+                            ?.getString(EventEntityFields.CONTENT)?.let {
+                                creationContentAdapter.fromJson(it)?.type
+                            }
+
+                    obj.setString(RoomSummaryEntityFields.ROOM_TYPE, roomType)
+                }
+                ?.addRealmListField(RoomSummaryEntityFields.PARENTS.`$`, realm.schema.get("SpaceParentSummaryEntity")!!)
+                ?.addRealmListField(RoomSummaryEntityFields.CHILDREN.`$`, realm.schema.get("SpaceChildSummaryEntity")!!)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo011.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo011.kt
new file mode 100644
index 0000000000..92ee26df42
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo011.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.EventEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo011(realm: DynamicRealm) : RealmMigrator(realm, 11) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("EventEntity")
+                ?.addField(EventEntityFields.SEND_STATE_DETAILS, String::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo012.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo012.kt
new file mode 100644
index 0000000000..a914cadd80
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo012.kt
@@ -0,0 +1,53 @@
+/*
+ * 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.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntityFields
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo012(realm: DynamicRealm) : RealmMigrator(realm, 12) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        val joinRulesContentAdapter = MoshiProvider.providesMoshi().adapter(RoomJoinRulesContent::class.java)
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.JOIN_RULES_STR, String::class.java)
+                ?.transform { obj ->
+                    val joinRulesEvent = realm.where("CurrentStateEventEntity")
+                            .equalTo(CurrentStateEventEntityFields.ROOM_ID, obj.getString(RoomSummaryEntityFields.ROOM_ID))
+                            .equalTo(CurrentStateEventEntityFields.TYPE, EventType.STATE_ROOM_JOIN_RULES)
+                            .findFirst()
+
+                    val roomJoinRules = joinRulesEvent?.getObject(CurrentStateEventEntityFields.ROOT.`$`)
+                            ?.getString(EventEntityFields.CONTENT)?.let {
+                                joinRulesContentAdapter.fromJson(it)?.joinRules
+                            }
+
+                    obj.setString(RoomSummaryEntityFields.JOIN_RULES_STR, roomJoinRules?.name)
+                }
+
+        realm.schema.get("SpaceChildSummaryEntity")
+                ?.addField(SpaceChildSummaryEntityFields.SUGGESTED, Boolean::class.java)
+                ?.setNullable(SpaceChildSummaryEntityFields.SUGGESTED, true)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo013.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo013.kt
new file mode 100644
index 0000000000..2ea0303802
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo013.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.SpaceChildSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo013(realm: DynamicRealm) : RealmMigrator(realm, 13) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        // Fix issue with the nightly build. Eventually play again the migration which has been included in migrateTo12()
+        realm.schema.get("SpaceChildSummaryEntity")
+                ?.takeIf { !it.hasField(SpaceChildSummaryEntityFields.SUGGESTED) }
+                ?.addField(SpaceChildSummaryEntityFields.SUGGESTED, Boolean::class.java)
+                ?.setNullable(SpaceChildSummaryEntityFields.SUGGESTED, true)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo014.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo014.kt
new file mode 100644
index 0000000000..c524b6f284
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo014.kt
@@ -0,0 +1,46 @@
+/*
+ * 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 io.realm.FieldAttribute
+import org.matrix.android.sdk.api.session.room.model.VersioningState
+import org.matrix.android.sdk.internal.database.model.RoomAccountDataEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo014(realm: DynamicRealm) : RealmMigrator(realm, 14) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        val roomAccountDataSchema = realm.schema.create("RoomAccountDataEntity")
+                .addField(RoomAccountDataEntityFields.CONTENT_STR, String::class.java)
+                .addField(RoomAccountDataEntityFields.TYPE, String::class.java, FieldAttribute.INDEXED)
+
+        realm.schema.get("RoomEntity")
+                ?.addRealmListField(RoomEntityFields.ACCOUNT_DATA.`$`, roomAccountDataSchema)
+
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.IS_HIDDEN_FROM_USER, Boolean::class.java, FieldAttribute.INDEXED)
+                ?.transform {
+                    val isHiddenFromUser = it.getString(RoomSummaryEntityFields.VERSIONING_STATE_STR) == VersioningState.UPGRADED_ROOM_JOINED.name
+                    it.setBoolean(RoomSummaryEntityFields.IS_HIDDEN_FROM_USER, isHiddenFromUser)
+                }
+
+        roomAccountDataSchema.isEmbedded = true
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo015.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo015.kt
new file mode 100644
index 0000000000..329964a9a4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo015.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.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.query.process
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo015(realm: DynamicRealm) : RealmMigrator(realm, 15) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        // fix issue with flattenParentIds on DM that kept growing with duplicate
+        // so we reset it, will be updated next sync
+        realm.where("RoomSummaryEntity")
+                .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
+                .equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+                .findAll()
+                .onEach {
+                    it.setString(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, null)
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo016.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo016.kt
new file mode 100644
index 0000000000..b2fa54a05c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo016.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
+
+class MigrateSessionTo016(realm: DynamicRealm) : RealmMigrator(realm, 16) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.ROOM_VERSIONS_JSON, String::class.java)
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo017.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo017.kt
new file mode 100644
index 0000000000..95d67b9ad8
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo017.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.EventInsertEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo017(realm: DynamicRealm) : RealmMigrator(realm, 17) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("EventInsertEntity")
+                ?.addField(EventInsertEntityFields.CAN_BE_PROCESSED, Boolean::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo018.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo018.kt
new file mode 100644
index 0000000000..b415c51d4b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo018.kt
@@ -0,0 +1,48 @@
+/*
+ * 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.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.presence.UserPresenceEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo018(realm: DynamicRealm) : RealmMigrator(realm, 18) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("UserPresenceEntity")
+                ?.addField(UserPresenceEntityFields.USER_ID, String::class.java)
+                ?.addPrimaryKey(UserPresenceEntityFields.USER_ID)
+                ?.setRequired(UserPresenceEntityFields.USER_ID, true)
+                ?.addField(UserPresenceEntityFields.PRESENCE_STR, String::class.java)
+                ?.addField(UserPresenceEntityFields.LAST_ACTIVE_AGO, Long::class.java)
+                ?.setNullable(UserPresenceEntityFields.LAST_ACTIVE_AGO, true)
+                ?.addField(UserPresenceEntityFields.STATUS_MESSAGE, String::class.java)
+                ?.addField(UserPresenceEntityFields.IS_CURRENTLY_ACTIVE, Boolean::class.java)
+                ?.setNullable(UserPresenceEntityFields.IS_CURRENTLY_ACTIVE, true)
+                ?.addField(UserPresenceEntityFields.AVATAR_URL, String::class.java)
+                ?.addField(UserPresenceEntityFields.DISPLAY_NAME, String::class.java)
+
+        val userPresenceEntity = realm.schema.get("UserPresenceEntity") ?: return
+        realm.schema.get("RoomSummaryEntity")
+                ?.addRealmObjectField(RoomSummaryEntityFields.DIRECT_USER_PRESENCE.`$`, userPresenceEntity)
+
+        realm.schema.get("RoomMemberSummaryEntity")
+                ?.addRealmObjectField(RoomMemberSummaryEntityFields.USER_PRESENCE_ENTITY.`$`, userPresenceEntity)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt
new file mode 100644
index 0000000000..d0b368be46
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.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.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.util.Normalizer
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo019(realm: DynamicRealm,
+                          private val normalizer: Normalizer) : RealmMigrator(realm, 19) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.NORMALIZED_DISPLAY_NAME, String::class.java)
+                ?.transform {
+                    it.getString(RoomSummaryEntityFields.DISPLAY_NAME)?.let { displayName ->
+                        val normalised = normalizer.normalize(displayName)
+                        it.set(RoomSummaryEntityFields.NORMALIZED_DISPLAY_NAME, normalised)
+                    }
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo020.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo020.kt
new file mode 100644
index 0000000000..c7f6e3ceed
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo020.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.ChunkEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo020(realm: DynamicRealm) : RealmMigrator(realm, 20) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("ChunkEntity")?.apply {
+            if (hasField("numberOfTimelineEvents")) {
+                removeField("numberOfTimelineEvents")
+            }
+            var cleanOldChunks = false
+            if (!hasField(ChunkEntityFields.NEXT_CHUNK.`$`)) {
+                cleanOldChunks = true
+                addRealmObjectField(ChunkEntityFields.NEXT_CHUNK.`$`, this)
+            }
+            if (!hasField(ChunkEntityFields.PREV_CHUNK.`$`)) {
+                cleanOldChunks = true
+                addRealmObjectField(ChunkEntityFields.PREV_CHUNK.`$`, this)
+            }
+            if (cleanOldChunks) {
+                val chunkEntities = realm.where("ChunkEntity").equalTo(ChunkEntityFields.IS_LAST_FORWARD, false).findAll()
+                chunkEntities.deleteAllFromRealm()
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo021.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo021.kt
new file mode 100644
index 0000000000..6b6952e697
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo021.kt
@@ -0,0 +1,55 @@
+/*
+ * 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.events.model.EventType
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptionEventContent
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo021(realm: DynamicRealm) : RealmMigrator(realm, 21) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.E2E_ALGORITHM, String::class.java)
+                ?.transform { obj ->
+
+                    val encryptionContentAdapter = MoshiProvider.providesMoshi().adapter(EncryptionEventContent::class.java)
+
+                    val encryptionEvent = realm.where("CurrentStateEventEntity")
+                            .equalTo(CurrentStateEventEntityFields.ROOM_ID, obj.getString(RoomSummaryEntityFields.ROOM_ID))
+                            .equalTo(CurrentStateEventEntityFields.TYPE, EventType.STATE_ROOM_ENCRYPTION)
+                            .findFirst()
+
+                    val encryptionEventRoot = encryptionEvent?.getObject(CurrentStateEventEntityFields.ROOT.`$`)
+                    val algorithm = encryptionEventRoot
+                            ?.getString(EventEntityFields.CONTENT)?.let {
+                                encryptionContentAdapter.fromJson(it)?.algorithm
+                            }
+
+                    obj.setString(RoomSummaryEntityFields.E2E_ALGORITHM, algorithm)
+                    obj.setBoolean(RoomSummaryEntityFields.IS_ENCRYPTED, encryptionEvent != null)
+                    encryptionEventRoot?.getLong(EventEntityFields.ORIGIN_SERVER_TS)?.let {
+                        obj.setLong(RoomSummaryEntityFields.ENCRYPTION_EVENT_TS, it)
+                    }
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo022.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo022.kt
new file mode 100644
index 0000000000..e78a9d05da
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo022.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.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateSessionTo022(realm: DynamicRealm) : RealmMigrator(realm, 22) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        val listJoinedRoomIds = realm.where("RoomEntity")
+                .equalTo(RoomEntityFields.MEMBERSHIP_STR, Membership.JOIN.name).findAll()
+                .map { it.getString(RoomEntityFields.ROOM_ID) }
+
+        val hasMissingStateEvent = realm.where("CurrentStateEventEntity")
+                .`in`(CurrentStateEventEntityFields.ROOM_ID, listJoinedRoomIds.toTypedArray())
+                .isNull(CurrentStateEventEntityFields.ROOT.`$`).findFirst() != null
+
+        if (hasMissingStateEvent) {
+            Timber.v("Has some missing state event, clear session cache")
+            realm.deleteAll()
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo023.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo023.kt
new file mode 100644
index 0000000000..0bb8ceeaa5
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo023.kt
@@ -0,0 +1,40 @@
+/*
+ * 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 io.realm.FieldAttribute
+import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo023(realm: DynamicRealm) : RealmMigrator(realm, 23) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        val eventEntity = realm.schema.get("TimelineEventEntity") ?: return
+
+        realm.schema.get("EventEntity")
+                ?.addField(EventEntityFields.IS_ROOT_THREAD, Boolean::class.java, FieldAttribute.INDEXED)
+                ?.addField(EventEntityFields.ROOT_THREAD_EVENT_ID, String::class.java, FieldAttribute.INDEXED)
+                ?.addField(EventEntityFields.NUMBER_OF_THREADS, Int::class.java)
+                ?.addField(EventEntityFields.THREAD_NOTIFICATION_STATE_STR, String::class.java)
+                ?.transform {
+                    it.setString(EventEntityFields.THREAD_NOTIFICATION_STATE_STR, ThreadNotificationState.NO_NEW_MESSAGE.name)
+                }
+                ?.addRealmObjectField(EventEntityFields.THREAD_SUMMARY_LATEST_MESSAGE.`$`, eventEntity)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo024.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo024.kt
new file mode 100644
index 0000000000..ff88972566
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo024.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.PreviewUrlCacheEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo024(realm: DynamicRealm) : RealmMigrator(realm, 24) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("PreviewUrlCacheEntity")
+                ?.addField(PreviewUrlCacheEntityFields.IMAGE_WIDTH, Int::class.java)
+                ?.setNullable(PreviewUrlCacheEntityFields.IMAGE_WIDTH, true)
+                ?.addField(PreviewUrlCacheEntityFields.IMAGE_HEIGHT, Int::class.java)
+                ?.setNullable(PreviewUrlCacheEntityFields.IMAGE_HEIGHT, true)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo025.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo025.kt
new file mode 100644
index 0000000000..237b016ac2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo025.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.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateSessionTo025(realm: DynamicRealm) : RealmMigrator(realm, 25) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_CHANGE_DISPLAY_NAME, Boolean::class.java)
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_CHANGE_AVATAR, Boolean::class.java)
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_CHANGE3PID, Boolean::class.java)
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}
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 ce2d1efc1d..445181e576 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
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.internal.database.model
 import io.realm.RealmObject
 import io.realm.annotations.Index
 import org.matrix.android.sdk.api.session.room.send.SendState
-import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
 import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.di.MoshiProvider
@@ -40,7 +40,12 @@ internal open class EventEntity(@Index var eventId: String = "",
                                 var unsignedData: String? = null,
                                 var redacts: String? = null,
                                 var decryptionResultJson: String? = null,
-                                var ageLocalTs: Long? = null
+                                var ageLocalTs: Long? = null,
+                                // Thread related, no need to create a new Entity for performance
+                                @Index var isRootThread: Boolean = false,
+                                @Index var rootThreadEventId: String? = null,
+                                var numberOfThreads: Int = 0,
+                                var threadSummaryLatestMessage: TimelineEventEntity? = null
 ) : RealmObject() {
 
     private var sendStateStr: String = SendState.UNKNOWN.name
@@ -53,6 +58,15 @@ internal open class EventEntity(@Index var eventId: String = "",
             sendStateStr = value.name
         }
 
+    private var threadNotificationStateStr: String = ThreadNotificationState.NO_NEW_MESSAGE.name
+    var threadNotificationState: ThreadNotificationState
+        get() {
+            return ThreadNotificationState.valueOf(threadNotificationStateStr)
+        }
+        set(value) {
+            threadNotificationStateStr = value.name
+        }
+
     var decryptionErrorCode: String? = null
         set(value) {
             if (value != field) field = value
@@ -65,10 +79,10 @@ internal open class EventEntity(@Index var eventId: String = "",
 
     companion object
 
-    fun setDecryptionResult(result: MXEventDecryptionResult, clearEvent: JsonDict? = null) {
+    fun setDecryptionResult(result: MXEventDecryptionResult) {
         assertIsManaged()
         val decryptionResult = OlmDecryptionResult(
-                payload = clearEvent ?: result.clearEvent,
+                payload = result.clearEvent,
                 senderKey = result.senderCurve25519Key,
                 keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
                 forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
@@ -84,4 +98,6 @@ internal open class EventEntity(@Index var eventId: String = "",
                 .findFirst()
                 ?.canBeProcessed = true
     }
+
+    fun isThread(): Boolean = rootThreadEventId != null
 }
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 980449ddfb..08ecd5995e 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
@@ -21,6 +21,9 @@ import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 
 internal open class HomeServerCapabilitiesEntity(
         var canChangePassword: Boolean = true,
+        var canChangeDisplayName: Boolean = true,
+        var canChangeAvatar: Boolean = true,
+        var canChange3pid: Boolean = true,
         var roomVersionsJson: String? = null,
         var maxUploadFileSize: Long = HomeServerCapabilities.MAX_UPLOAD_FILE_SIZE_UNKNOWN,
         var lastVersionIdentityServerSupported: Boolean = false,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PreviewUrlCacheEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PreviewUrlCacheEntity.kt
index b1e0b64405..f19d70a1f2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PreviewUrlCacheEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PreviewUrlCacheEntity.kt
@@ -28,7 +28,8 @@ internal open class PreviewUrlCacheEntity(
         var title: String? = null,
         var description: String? = null,
         var mxcUrl: String? = null,
-
+        var imageWidth: Int? = null,
+        var imageHeight: Int? = null,
         var lastUpdatedTimestamp: Long = 0L
 ) : RealmObject() {
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
index 240b2a0691..f7fa1037ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
@@ -49,6 +49,11 @@ internal fun EventEntity.Companion.where(realm: Realm, eventId: String): RealmQu
             .equalTo(EventEntityFields.EVENT_ID, eventId)
 }
 
+internal fun EventEntity.Companion.whereRoomId(realm: Realm, roomId: String): RealmQuery<EventEntity> {
+    return realm.where<EventEntity>()
+            .equalTo(EventEntityFields.ROOM_ID, roomId)
+}
+
 internal fun EventEntity.Companion.where(realm: Realm, eventIds: List<String>): RealmQuery<EventEntity> {
     return realm.where<EventEntity>()
             .`in`(EventEntityFields.EVENT_ID, eventIds.toTypedArray())
@@ -85,3 +90,8 @@ internal fun RealmList<EventEntity>.find(eventId: String): EventEntity? {
 internal fun RealmList<EventEntity>.fastContains(eventId: String): Boolean {
     return this.find(eventId) != null
 }
+
+internal fun EventEntity.Companion.whereRootThreadEventId(realm: Realm, rootThreadEventId: String): RealmQuery<EventEntity> {
+    return realm.where<EventEntity>()
+            .equalTo(EventEntityFields.ROOT_THREAD_EVENT_ID, rootThreadEventId)
+}
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 c9c96b9cc1..8cc99c3d2f 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
@@ -34,27 +34,29 @@ internal fun isEventRead(realmConfiguration: RealmConfiguration,
     if (LocalEcho.isLocalEchoId(eventId)) {
         return true
     }
-    // If we don't know if the event has been read, we assume it's not
-    var isEventRead = false
 
-    Realm.getInstance(realmConfiguration).use { realm ->
-        val latestEvent = TimelineEventEntity.latestEvent(realm, roomId, true)
-        // If latest event is from you we are sure the event is read
-        if (latestEvent?.root?.sender == userId) {
-            return true
-        }
+    return Realm.getInstance(realmConfiguration).use { realm ->
         val eventToCheck = TimelineEventEntity.where(realm, roomId, eventId).findFirst()
-        isEventRead = when {
-            eventToCheck == null                -> false
-            eventToCheck.root?.sender == userId -> true
-            else                                -> {
-                val readReceipt = ReadReceiptEntity.where(realm, roomId, userId).findFirst() ?: return@use
-                val readReceiptEvent = TimelineEventEntity.where(realm, roomId, readReceipt.eventId).findFirst() ?: return@use
-                readReceiptEvent.isMoreRecentThan(eventToCheck)
-            }
+        when {
+            // The event doesn't exist locally, let's assume it hasn't been read
+            eventToCheck == null                                          -> false
+            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
+            else                                                          -> false
         }
     }
-    return 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 ->
+        val readReceiptEvent = TimelineEventEntity.where(realm, roomId, readReceipt.eventId).findFirst()
+        readReceiptEvent?.isMoreRecentThan(this)
+    } ?: false
 }
 
 /**
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 aa1ce41bb7..63f41ebf2c 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
@@ -59,6 +59,7 @@ internal fun TimelineEventEntity.Companion.latestEvent(realm: Realm,
                                                        filters: TimelineEventFilters = TimelineEventFilters()): TimelineEventEntity? {
     val roomEntity = RoomEntity.where(realm, roomId).findFirst() ?: return null
     val sendingTimelineEvents = roomEntity.sendingTimelineEvents.where().filterEvents(filters)
+
     val liveEvents = ChunkEntity.findLastForwardChunkOfRoom(realm, roomId)?.timelineEvents?.where()?.filterEvents(filters)
     val query = if (includesSending && sendingTimelineEvents.findAll().isNotEmpty()) {
         sendingTimelineEvents
@@ -100,6 +101,7 @@ internal fun RealmQuery<TimelineEventEntity>.filterEvents(filters: TimelineEvent
     if (filters.filterRedacted) {
         not().like(TimelineEventEntityFields.ROOT.UNSIGNED_DATA, TimelineEventFilter.Unsigned.REDACTED)
     }
+
     return this
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
index e52e32e16a..28b9f64188 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
@@ -18,6 +18,8 @@ package org.matrix.android.sdk.internal.extensions
 
 import io.realm.RealmList
 import io.realm.RealmObject
+import io.realm.RealmObjectSchema
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
 
 internal fun RealmObject.assertIsManaged() {
     check(isManaged) { "${javaClass.simpleName} entity should be managed to use this function" }
@@ -31,3 +33,12 @@ internal fun <T> RealmList<T>.clearWith(delete: (T) -> Unit) {
         first()?.let { delete.invoke(it) }
     }
 }
+
+/**
+ * Schedule a refresh of the HomeServers capabilities
+ */
+internal fun RealmObjectSchema?.forceRefreshOfHomeServerCapabilities(): RealmObjectSchema? {
+    return this?.transform { obj ->
+        obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
index 445b6be8e8..22085e30fc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
@@ -42,7 +42,8 @@ import org.matrix.android.sdk.internal.legacy.riot.HomeServerConnectionConfig as
 internal class DefaultLegacySessionImporter @Inject constructor(
         private val context: Context,
         private val sessionParamsStore: SessionParamsStore,
-        private val realmKeysUtils: RealmKeysUtils
+        private val realmKeysUtils: RealmKeysUtils,
+        private val realmCryptoStoreMigration: RealmCryptoStoreMigration
 ) : LegacySessionImporter {
 
     private val loginStorage = LoginStorage(context)
@@ -170,8 +171,8 @@ internal class DefaultLegacySessionImporter @Inject constructor(
                 .directory(File(context.filesDir, userMd5))
                 .name("crypto_store.realm")
                 .modules(RealmCryptoStoreModule())
-                .schemaVersion(RealmCryptoStoreMigration.CRYPTO_STORE_SCHEMA_VERSION)
-                .migration(RealmCryptoStoreMigration)
+                .schemaVersion(realmCryptoStoreMigration.schemaVersion)
+                .migration(realmCryptoStoreMigration)
                 .build()
 
         Timber.d("Migration: copy DB to encrypted DB")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmMigration.kt
index 49bcc72181..8dffac5fa0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmMigration.kt
@@ -18,24 +18,23 @@ package org.matrix.android.sdk.internal.raw
 
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
-import org.matrix.android.sdk.internal.database.model.KnownServerUrlEntityFields
+import org.matrix.android.sdk.internal.raw.migration.MigrateGlobalTo001
 import timber.log.Timber
+import javax.inject.Inject
 
-internal object GlobalRealmMigration : RealmMigration {
+internal class GlobalRealmMigration @Inject constructor() : RealmMigration {
+    /**
+     * Forces all GlobalRealmMigration instances to be equal
+     * Avoids Realm throwing when multiple instances of the migration are set
+     */
+    override fun equals(other: Any?) = other is GlobalRealmMigration
+    override fun hashCode() = 2000
 
-    // Current schema version
-    const val SCHEMA_VERSION = 1L
+    val schemaVersion = 1L
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
-        Timber.d("Migrating Auth Realm from $oldVersion to $newVersion")
+        Timber.d("Migrating Global Realm from $oldVersion to $newVersion")
 
-        if (oldVersion <= 0) migrateTo1(realm)
-    }
-
-    private fun migrateTo1(realm: DynamicRealm) {
-        realm.schema.create("KnownServerUrlEntity")
-                .addField(KnownServerUrlEntityFields.URL, String::class.java)
-                .addPrimaryKey(KnownServerUrlEntityFields.URL)
-                .setRequired(KnownServerUrlEntityFields.URL, true)
+        if (oldVersion < 1) MigrateGlobalTo001(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt
index 50721b809a..a830976671 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt
@@ -51,14 +51,15 @@ internal abstract class RawModule {
         @Provides
         @GlobalDatabase
         @MatrixScope
-        fun providesRealmConfiguration(realmKeysUtils: RealmKeysUtils): RealmConfiguration {
+        fun providesRealmConfiguration(realmKeysUtils: RealmKeysUtils,
+                                       globalRealmMigration: GlobalRealmMigration): RealmConfiguration {
             return RealmConfiguration.Builder()
                     .apply {
                         realmKeysUtils.configureEncryption(this, DB_ALIAS)
                     }
                     .name("matrix-sdk-global.realm")
-                    .schemaVersion(GlobalRealmMigration.SCHEMA_VERSION)
-                    .migration(GlobalRealmMigration)
+                    .schemaVersion(globalRealmMigration.schemaVersion)
+                    .migration(globalRealmMigration)
                     .allowWritesOnUiThread(true)
                     .modules(GlobalRealmModule())
                     .build()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/migration/MigrateGlobalTo001.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/migration/MigrateGlobalTo001.kt
new file mode 100644
index 0000000000..cff2f7b8e8
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/migration/MigrateGlobalTo001.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.raw.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.KnownServerUrlEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+class MigrateGlobalTo001(realm: DynamicRealm) : RealmMigrator(realm, 1) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.create("KnownServerUrlEntity")
+                .addField(KnownServerUrlEntityFields.URL, String::class.java)
+                .addPrimaryKey(KnownServerUrlEntityFields.URL)
+                .setRequired(KnownServerUrlEntityFields.URL, true)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
index c42141a0aa..44fff45917 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
@@ -94,12 +94,12 @@ internal class CleanupSession @Inject constructor(
         do {
             val sessionRealmCount = Realm.getGlobalInstanceCount(realmSessionConfiguration)
             val cryptoRealmCount = Realm.getGlobalInstanceCount(realmCryptoConfiguration)
-            Timber.d("Wait for all Realm instance to be closed ($sessionRealmCount - $cryptoRealmCount)")
             if (sessionRealmCount > 0 || cryptoRealmCount > 0) {
-                Timber.d("Waiting ${TIME_TO_WAIT_MILLIS}ms")
+                Timber.d("Waiting ${TIME_TO_WAIT_MILLIS}ms for all Realm instance to be closed ($sessionRealmCount - $cryptoRealmCount)")
                 delay(TIME_TO_WAIT_MILLIS)
                 timeToWaitMillis -= TIME_TO_WAIT_MILLIS
             } else {
+                Timber.d("Finished waiting for all Realm instance to be closed ($sessionRealmCount - $cryptoRealmCount)")
                 timeToWaitMillis = 0
             }
         } while (timeToWaitMillis > 0)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt
index 82cd682eae..55db64f309 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt
@@ -66,7 +66,7 @@ internal class ThumbnailExtractor @Inject constructor(
                 thumbnail.recycle()
                 outputStream.reset()
             } ?: run {
-                Timber.e("Cannot extract video thumbnail at %s", attachment.queryUri.toString())
+                Timber.e("Cannot extract video thumbnail at ${attachment.queryUri}")
             }
         } catch (e: Exception) {
             Timber.e(e, "Cannot extract video thumbnail")
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 7047d38260..f498322967 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
@@ -48,6 +48,16 @@ data class RoomEventFilter(
          * a wildcard to match any sequence of characters.
          */
         @Json(name = "types") val types: List<String>? = null,
+        /**
+         * A list of relation types which must be exist pointing to the event being filtered.
+         * If this list is absent then no filtering is done on relation types.
+         */
+        @Json(name = "relation_types") val relationTypes: List<String>? = null,
+        /**
+         *  A list of senders of relations which must exist pointing to the event being filtered.
+         *  If this list is absent then no filtering is done on relation types.
+         */
+        @Json(name = "relation_senders") val relationSenders: List<String>? = null,
         /**
          * A list of room IDs to include. If this list is absent then all rooms are included.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
index b36d05b6c0..830a58cd12 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.session.homeserver
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.util.JsonDict
 
 /**
@@ -37,10 +36,30 @@ internal data class GetCapabilitiesResult(
 internal data class Capabilities(
         /**
          * Capability to indicate if the user can change their password.
+         * True if the user can change their password, false otherwise.
          */
         @Json(name = "m.change_password")
-        val changePassword: ChangePassword? = null,
+        val changePassword: BooleanCapability? = null,
 
+        /**
+         * Capability to indicate if the user can change their display name.
+         * True if the user can change their display name, false otherwise.
+         */
+        @Json(name = "m.set_displayname")
+        val changeDisplayName: BooleanCapability? = null,
+
+        /**
+         * Capability to indicate if the user can change their avatar.
+         * True if the user can change their avatar, false otherwise.
+         */
+        @Json(name = "m.set_avatar_url")
+        val changeAvatar: BooleanCapability? = null,
+        /**
+         * Capability to indicate if the user can change add, remove or change 3PID associations.
+         * True if the user can change their 3PID associations, false otherwise.
+         */
+        @Json(name = "m.3pid_changes")
+        val change3pid: BooleanCapability? = null,
         /**
          * This capability describes the default and available room versions a server supports, and at what level of stability.
          * Clients should make use of this capability to determine if users need to be encouraged to upgrade their rooms.
@@ -50,9 +69,9 @@ internal data class Capabilities(
 )
 
 @JsonClass(generateAdapter = true)
-internal data class ChangePassword(
+internal data class BooleanCapability(
         /**
-         * Required. True if the user can change their password, false otherwise.
+         * Required.
          */
         @Json(name = "enabled")
         val enabled: Boolean?
@@ -87,8 +106,3 @@ internal data class RoomVersions(
         @Json(name = "org.matrix.msc3244.room_capabilities")
         val roomCapabilities: JsonDict? = null
 )
-
-// The spec says: If not present, the client should assume that password changes are possible via the API
-internal fun GetCapabilitiesResult.canChangePassword(): Boolean {
-    return capabilities?.changePassword?.enabled.orTrue()
-}
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 612b98f863..e822cbdcdb 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,6 +20,7 @@ import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.MatrixPatterns.getDomain
 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.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.isLoginAndRegistrationSupportedBySdk
@@ -108,9 +109,16 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
             val homeServerCapabilitiesEntity = HomeServerCapabilitiesEntity.getOrCreate(realm)
 
             if (getCapabilitiesResult != null) {
-                homeServerCapabilitiesEntity.canChangePassword = getCapabilitiesResult.canChangePassword()
+                val capabilities = getCapabilitiesResult.capabilities
 
-                homeServerCapabilitiesEntity.roomVersionsJson = getCapabilitiesResult.capabilities?.roomVersions?.let {
+                // The spec says: If not present, the client should assume that
+                // password, display name, avatar changes and 3pid changes are possible via the API
+                homeServerCapabilitiesEntity.canChangePassword = capabilities?.changePassword?.enabled.orTrue()
+                homeServerCapabilitiesEntity.canChangeDisplayName = capabilities?.changeDisplayName?.enabled.orTrue()
+                homeServerCapabilitiesEntity.canChangeAvatar = capabilities?.changeAvatar?.enabled.orTrue()
+                homeServerCapabilitiesEntity.canChange3pid = capabilities?.change3pid?.enabled.orTrue()
+
+                homeServerCapabilitiesEntity.roomVersionsJson = capabilities?.roomVersions?.let {
                     MoshiProvider.providesMoshi().adapter(RoomVersions::class.java).toJson(it)
                 }
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
index 65794e6b14..4e9d7dc7f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
@@ -60,6 +60,7 @@ internal abstract class IdentityModule {
         @IdentityDatabase
         @SessionScope
         fun providesIdentityRealmConfiguration(realmKeysUtils: RealmKeysUtils,
+                                               realmIdentityStoreMigration: RealmIdentityStoreMigration,
                                                @SessionFilesDirectory directory: File,
                                                @UserMd5 userMd5: String): RealmConfiguration {
             return RealmConfiguration.Builder()
@@ -68,8 +69,8 @@ internal abstract class IdentityModule {
                     .apply {
                         realmKeysUtils.configureEncryption(this, SessionModule.getKeyAlias(userMd5))
                     }
-                    .schemaVersion(RealmIdentityStoreMigration.IDENTITY_STORE_SCHEMA_VERSION)
-                    .migration(RealmIdentityStoreMigration)
+                    .schemaVersion(realmIdentityStoreMigration.schemaVersion)
+                    .migration(realmIdentityStoreMigration)
                     .allowWritesOnUiThread(true)
                     .modules(IdentityRealmModule())
                     .build()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStoreMigration.kt
index 21c0f8eb9e..0c279d8a7e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStoreMigration.kt
@@ -18,23 +18,23 @@ package org.matrix.android.sdk.internal.session.identity.db
 
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
+import org.matrix.android.sdk.internal.session.identity.db.migration.MigrateIdentityTo001
 import timber.log.Timber
+import javax.inject.Inject
 
-internal object RealmIdentityStoreMigration : RealmMigration {
+internal class RealmIdentityStoreMigration @Inject constructor() : RealmMigration {
+    /**
+     * Forces all RealmIdentityStoreMigration instances to be equal
+     * Avoids Realm throwing when multiple instances of the migration are set
+     */
+    override fun equals(other: Any?) = other is RealmIdentityStoreMigration
+    override fun hashCode() = 3000
 
-    const val IDENTITY_STORE_SCHEMA_VERSION = 1L
+    val schemaVersion = 1L
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
-        Timber.v("Migrating Realm Identity from $oldVersion to $newVersion")
+        Timber.d("Migrating Realm Identity from $oldVersion to $newVersion")
 
-        if (oldVersion <= 0) migrateTo1(realm)
-    }
-
-    private fun migrateTo1(realm: DynamicRealm) {
-        Timber.d("Step 0 -> 1")
-        Timber.d("Add field userConsent (Boolean) and set the value to false")
-
-        realm.schema.get("IdentityDataEntity")
-                ?.addField(IdentityDataEntityFields.USER_CONSENT, Boolean::class.java)
+        if (oldVersion < 1) MigrateIdentityTo001(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/migration/MigrateIdentityTo001.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/migration/MigrateIdentityTo001.kt
new file mode 100644
index 0000000000..002601470d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/migration/MigrateIdentityTo001.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.session.identity.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.session.identity.db.IdentityDataEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import timber.log.Timber
+
+class MigrateIdentityTo001(realm: DynamicRealm) : RealmMigrator(realm, 1) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        Timber.d("Add field userConsent (Boolean) and set the value to false")
+        realm.schema.get("IdentityDataEntity")
+                ?.addField(IdentityDataEntityFields.USER_CONSENT, Boolean::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt
index e707c2351c..32bcf3f7ca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt
@@ -48,8 +48,8 @@ internal class DefaultGetPreviewUrlTask @Inject constructor(
 
     override suspend fun execute(params: GetPreviewUrlTask.Params): PreviewUrlData {
         return when (params.cacheStrategy) {
-            CacheStrategy.NoCache -> doRequest(params.url, params.timestamp)
-            is CacheStrategy.TtlCache -> doRequestWithCache(
+            CacheStrategy.NoCache       -> doRequest(params.url, params.timestamp)
+            is CacheStrategy.TtlCache   -> doRequestWithCache(
                     params.url,
                     params.timestamp,
                     params.cacheStrategy.validityDurationInMillis,
@@ -77,7 +77,9 @@ internal class DefaultGetPreviewUrlTask @Inject constructor(
                 siteName = (get("og:site_name") as? String)?.unescapeHtml(),
                 title = (get("og:title") as? String)?.unescapeHtml(),
                 description = (get("og:description") as? String)?.unescapeHtml(),
-                mxcUrl = get("og:image") as? String
+                mxcUrl = get("og:image") as? String,
+                imageHeight = (get("og:image:height") as? Double)?.toInt(),
+                imageWidth = (get("og:image:width") as? Double)?.toInt(),
         )
     }
 
@@ -114,7 +116,8 @@ internal class DefaultGetPreviewUrlTask @Inject constructor(
             previewUrlCacheEntity.title = data.title
             previewUrlCacheEntity.description = data.description
             previewUrlCacheEntity.mxcUrl = data.mxcUrl
-
+            previewUrlCacheEntity.imageHeight = data.imageHeight
+            previewUrlCacheEntity.imageWidth = data.imageWidth
             previewUrlCacheEntity.lastUpdatedTimestamp = Date().time
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/PreviewUrlMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/PreviewUrlMapper.kt
index dd1a9ead26..551dc29b92 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/PreviewUrlMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/PreviewUrlMapper.kt
@@ -27,5 +27,7 @@ internal fun PreviewUrlCacheEntity.toDomain() = PreviewUrlData(
         siteName = siteName,
         title = title,
         description = description,
-        mxcUrl = mxcUrl
+        mxcUrl = mxcUrl,
+        imageWidth = imageWidth,
+        imageHeight = imageHeight
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
index 3e821b8956..cdc7350f8b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
@@ -19,11 +19,13 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.pushrules.Action
+import org.matrix.android.sdk.api.pushrules.ConditionResolver
 import org.matrix.android.sdk.api.pushrules.PushEvents
 import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.pushrules.RuleKind
 import org.matrix.android.sdk.api.pushrules.RuleScope
 import org.matrix.android.sdk.api.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
 import org.matrix.android.sdk.api.pushrules.getActions
 import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.api.pushrules.rest.RuleSet
@@ -53,6 +55,7 @@ internal class DefaultPushRuleService @Inject constructor(
         private val removePushRuleTask: RemovePushRuleTask,
         private val pushRuleFinder: PushRuleFinder,
         private val taskExecutor: TaskExecutor,
+        private val conditionResolver: ConditionResolver,
         @SessionDatabase private val monarchy: Monarchy
 ) : PushRuleService {
 
@@ -143,6 +146,10 @@ internal class DefaultPushRuleService @Inject constructor(
         return pushRuleFinder.fulfilledBingRule(event, rules)?.getActions().orEmpty()
     }
 
+    override fun resolveSenderNotificationPermissionCondition(event: Event, condition: SenderNotificationPermissionCondition): Boolean {
+        return conditionResolver.resolveSenderNotificationPermissionCondition(event, condition)
+    }
+
     override fun getKeywords(): LiveData<Set<String>> {
         // Keywords are all content rules that don't start with '.'
         val liveData = monarchy.findAllMappedWithChanges(
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 1c3d1971c2..2d8c3e9c78 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
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.api.session.room.send.DraftService
 import org.matrix.android.sdk.api.session.room.send.SendService
 import org.matrix.android.sdk.api.session.room.state.StateService
 import org.matrix.android.sdk.api.session.room.tags.TagsService
+import org.matrix.android.sdk.api.session.room.threads.ThreadsService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
@@ -54,6 +55,7 @@ import java.security.InvalidParameterException
 internal class DefaultRoom(override val roomId: String,
                            private val roomSummaryDataSource: RoomSummaryDataSource,
                            private val timelineService: TimelineService,
+                           private val threadsService: ThreadsService,
                            private val sendService: SendService,
                            private val draftService: DraftService,
                            private val stateService: StateService,
@@ -77,6 +79,7 @@ internal class DefaultRoom(override val roomId: String,
 ) :
         Room,
         TimelineService by timelineService,
+        ThreadsService by threadsService,
         SendService by sendService,
         DraftService by draftService,
         StateService by stateService,
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 7ca64aa66a..4a02c55db0 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
@@ -46,6 +46,7 @@ import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.leaving.LeaveRoomTask
 import org.matrix.android.sdk.internal.session.room.peeking.PeekRoomTask
 import org.matrix.android.sdk.internal.session.room.peeking.ResolveRoomStateTask
 import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
@@ -66,7 +67,8 @@ internal class DefaultRoomService @Inject constructor(
         private val peekRoomTask: PeekRoomTask,
         private val roomGetter: RoomGetter,
         private val roomSummaryDataSource: RoomSummaryDataSource,
-        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource
+        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
+        private val leaveRoomTask: LeaveRoomTask,
 ) : RoomService {
 
     override suspend fun createRoom(createRoomParams: CreateRoomParams): String {
@@ -133,6 +135,10 @@ internal class DefaultRoomService @Inject constructor(
         joinRoomTask.execute(JoinRoomTask.Params(roomId, reason, thirdPartySigned = thirdPartySigned))
     }
 
+    override suspend fun leaveRoom(roomId: String, reason: String?) {
+        leaveRoomTask.execute(LeaveRoomTask.Params(roomId, reason))
+    }
+
     override suspend fun markAllAsRead(roomIds: List<String>) {
         markAllRoomsReadTask.execute(MarkAllRoomsReadTask.Params(roomIds))
     }
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 3cc08df0e8..acceaf6e24 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
@@ -44,6 +44,7 @@ import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.internal.SessionManager
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 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.model.EditAggregatedSummaryEntity
@@ -332,6 +333,29 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                 )
             }
         }
+
+        if (!isLocalEcho) {
+            val replaceEvent = TimelineEventEntity.where(realm, roomId, eventId).findFirst()
+            handleThreadSummaryEdition(editedEvent, replaceEvent, existingSummary?.editions)
+        }
+    }
+
+    /**
+     * Check if the edition is on the latest thread event, and update it accordingly
+     */
+    private fun handleThreadSummaryEdition(editedEvent: EventEntity?,
+                                           replaceEvent: TimelineEventEntity?,
+                                           editions: List<EditionOfEvent>?) {
+        replaceEvent ?: return
+        editedEvent ?: return
+        editedEvent.findRootThreadEvent()?.apply {
+            val threadSummaryEventId = threadSummaryLatestMessage?.eventId
+            if (editedEvent.eventId == threadSummaryEventId || editions?.any { it.eventId == threadSummaryEventId } == true) {
+                // The edition is for the latest event or for any event replaced, this is to handle multiple
+                // edits of the same latest event
+                threadSummaryLatestMessage = replaceEvent
+            }
+        }
     }
 
     private fun handleResponse(realm: Realm,
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 efc5166a0c..399bfbd0e4 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
@@ -226,7 +226,8 @@ internal interface RoomAPI {
     suspend fun getRelations(@Path("roomId") roomId: String,
                              @Path("eventId") eventId: String,
                              @Path("relationType") relationType: String,
-                             @Path("eventType") eventType: String
+                             @Path("eventType") eventType: String,
+                             @Query("limit") limit: Int? = null
     ): RelationsResponse
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
index 4ab06338a2..70c1ab4f42 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.internal.session.room.state.DefaultStateService
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.room.tags.DefaultTagsService
+import org.matrix.android.sdk.internal.session.room.threads.DefaultThreadsService
 import org.matrix.android.sdk.internal.session.room.timeline.DefaultTimelineService
 import org.matrix.android.sdk.internal.session.room.typing.DefaultTypingService
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultUploadsService
@@ -50,6 +51,7 @@ internal interface RoomFactory {
 internal class DefaultRoomFactory @Inject constructor(private val cryptoService: CryptoService,
                                                       private val roomSummaryDataSource: RoomSummaryDataSource,
                                                       private val timelineServiceFactory: DefaultTimelineService.Factory,
+                                                      private val threadsServiceFactory: DefaultThreadsService.Factory,
                                                       private val sendServiceFactory: DefaultSendService.Factory,
                                                       private val draftServiceFactory: DefaultDraftService.Factory,
                                                       private val stateServiceFactory: DefaultStateService.Factory,
@@ -76,6 +78,7 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                 roomId = roomId,
                 roomSummaryDataSource = roomSummaryDataSource,
                 timelineService = timelineServiceFactory.create(roomId),
+                threadsService = threadsServiceFactory.create(roomId),
                 sendService = sendServiceFactory.create(roomId),
                 draftService = draftServiceFactory.create(roomId),
                 stateService = stateServiceFactory.create(roomId),
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 64f6bc0b30..f831a77a5d 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
@@ -77,6 +77,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.threads.DefaultFetchThreadTimelineTask
+import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadTimelineTask
 import org.matrix.android.sdk.internal.session.room.reporting.DefaultReportContentTask
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentTask
 import org.matrix.android.sdk.internal.session.room.state.DefaultSendStateTask
@@ -289,4 +291,7 @@ internal abstract class RoomModule {
 
     @Binds
     abstract fun bindGetRoomSummaryTask(task: DefaultGetRoomSummaryTask): GetRoomSummaryTask
+
+    @Binds
+    abstract fun bindFetchThreadTimelineTask(task: DefaultFetchThreadTimelineTask): FetchThreadTimelineTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt
index d96beed3f1..d5a110dfc2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt
@@ -54,8 +54,7 @@ internal class RoomAccountDataDataSource @Inject constructor(@SessionDatabase pr
      */
     fun getAccountDataEvents(roomId: String?, types: Set<String>): List<RoomAccountDataEvent> {
         return realmSessionProvider.withRealm { realm ->
-            val roomEntity = buildRoomQuery(realm, roomId, types).findFirst() ?: return@withRealm emptyList()
-            roomEntity.accountDataEvents(types)
+            buildRoomQuery(realm, roomId, types).findAll().flatMap { it.accountDataEvents(types) }
         }
     }
 
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 ac6e0562b0..9bd15a0267 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
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.session.room.create
 
 import com.zhuinden.monarchy.Monarchy
-import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.TimeoutCancellationException
 import org.matrix.android.sdk.api.failure.Failure
@@ -28,6 +27,7 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 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.internal.database.awaitNotEmptyResult
+import org.matrix.android.sdk.internal.database.awaitTransaction
 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
@@ -105,7 +105,7 @@ internal class DefaultCreateRoomTask @Inject constructor(
             throw CreateRoomFailure.CreatedWithTimeout(roomId)
         }
 
-        Realm.getInstance(realmConfiguration).executeTransactionAsync {
+        awaitTransaction(realmConfiguration) {
             RoomSummaryEntity.where(it, roomId).findFirst()?.lastActivityTime = System.currentTimeMillis()
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
index 49b58aa765..005d7f26db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
@@ -37,8 +37,6 @@ import org.matrix.android.sdk.internal.query.QueryStringValueProcessor
 import org.matrix.android.sdk.internal.query.process
 import org.matrix.android.sdk.internal.session.room.membership.admin.MembershipAdminTask
 import org.matrix.android.sdk.internal.session.room.membership.joining.InviteTask
-import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
-import org.matrix.android.sdk.internal.session.room.membership.leaving.LeaveRoomTask
 import org.matrix.android.sdk.internal.session.room.membership.threepid.InviteThreePidTask
 import org.matrix.android.sdk.internal.util.fetchCopied
 
@@ -48,8 +46,6 @@ internal class DefaultMembershipService @AssistedInject constructor(
         private val loadRoomMembersTask: LoadRoomMembersTask,
         private val inviteTask: InviteTask,
         private val inviteThreePidTask: InviteThreePidTask,
-        private val joinTask: JoinRoomTask,
-        private val leaveRoomTask: LeaveRoomTask,
         private val membershipAdminTask: MembershipAdminTask,
         @UserId
         private val userId: String,
@@ -139,14 +135,4 @@ internal class DefaultMembershipService @AssistedInject constructor(
         val params = InviteThreePidTask.Params(roomId, threePid)
         return inviteThreePidTask.execute(params)
     }
-
-    override suspend fun join(reason: String?, viaServers: List<String>) {
-        val params = JoinRoomTask.Params(roomId, reason, viaServers)
-        joinTask.execute(params)
-    }
-
-    override suspend fun leave(reason: String?) {
-        val params = LeaveRoomTask.Params(roomId, reason)
-        leaveRoomTask.execute(params)
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
index 82fea237db..22a46b6cfc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.session.room.membership.joining
 
-import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.TimeoutCancellationException
 import org.matrix.android.sdk.api.session.events.model.toContent
@@ -24,6 +23,7 @@ import org.matrix.android.sdk.api.session.room.failure.JoinRoomFailure
 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.internal.database.awaitNotEmptyResult
+import org.matrix.android.sdk.internal.database.awaitTransaction
 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
@@ -89,11 +89,9 @@ internal class DefaultJoinRoomTask @Inject constructor(
         } catch (exception: TimeoutCancellationException) {
             throw JoinRoomFailure.JoinedWithTimeout
         }
-
-        Realm.getInstance(realmConfiguration).executeTransactionAsync {
+        awaitTransaction(realmConfiguration) {
             RoomSummaryEntity.where(it, roomId).findFirst()?.lastActivityTime = System.currentTimeMillis()
         }
-
         setReadMarkers(roomId)
     }
 
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 5ae4007c63..ee52fe574b 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
@@ -83,7 +83,9 @@ internal class RedactionEventProcessor @Inject constructor() : EventInsertLivePr
 //                    }
 
                     val modified = unsignedData.copy(redactedEvent = redactionEvent)
-                    eventToPrune.content = ContentMapper.map(emptyMap())
+                    // I Commented the line below, it should not be empty while we lose all the previous info about
+                    // the redacted event
+//                    eventToPrune.content = ContentMapper.map(emptyMap())
                     eventToPrune.unsignedData = MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).toJson(modified)
                     eventToPrune.decryptionResultJson = null
                     eventToPrune.decryptionErrorCode = null
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 cbcc108ddd..848e14ff57 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
@@ -21,7 +21,6 @@ import com.zhuinden.monarchy.Monarchy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
 import org.matrix.android.sdk.api.session.room.model.message.PollType
@@ -31,17 +30,15 @@ import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.NoOpCancellable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
-import org.matrix.android.sdk.internal.crypto.CryptoSessionInfoProvider
 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.EventAnnotationsSummaryEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
+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.send.queue.EventSenderProcessor
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.fetchCopyMap
 import timber.log.Timber
 
@@ -50,13 +47,12 @@ internal class DefaultRelationService @AssistedInject constructor(
         private val eventEditor: EventEditor,
         private val eventSenderProcessor: EventSenderProcessor,
         private val eventFactory: LocalEchoEventFactory,
-        private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
         private val findReactionEventForUndoTask: FindReactionEventForUndoTask,
         private val fetchEditHistoryTask: FetchEditHistoryTask,
+        private val fetchThreadTimelineTask: FetchThreadTimelineTask,
         private val timelineEventMapper: TimelineEventMapper,
-        @SessionDatabase private val monarchy: Monarchy,
-        private val taskExecutor: TaskExecutor) :
-    RelationService {
+        @SessionDatabase private val monarchy: Monarchy
+) : RelationService {
 
     @AssistedFactory
     interface Factory {
@@ -78,39 +74,31 @@ internal class DefaultRelationService @AssistedInject constructor(
                         .none { it.addedByMe && it.key == reaction }) {
             val event = eventFactory.createReactionEvent(roomId, targetEventId, reaction)
                     .also { saveLocalEcho(it) }
-            return eventSenderProcessor.postEvent(event, false /* reaction are not encrypted*/)
+            eventSenderProcessor.postEvent(event, false /* reaction are not encrypted*/)
         } else {
             Timber.w("Reaction already added")
             NoOpCancellable
         }
     }
 
-    override fun undoReaction(targetEventId: String, reaction: String): Cancelable {
+    override suspend fun undoReaction(targetEventId: String, reaction: String): Cancelable {
         val params = FindReactionEventForUndoTask.Params(
                 roomId,
                 targetEventId,
                 reaction
         )
-        // TODO We should avoid using MatrixCallback internally
-        val callback = object : MatrixCallback<FindReactionEventForUndoTask.Result> {
-            override fun onSuccess(data: FindReactionEventForUndoTask.Result) {
-                if (data.redactEventId == null) {
-                    Timber.w("Cannot find reaction to undo (not yet synced?)")
-                    // TODO?
-                }
-                data.redactEventId?.let { toRedact ->
-                    val redactEvent = eventFactory.createRedactEvent(roomId, toRedact, null)
-                            .also { saveLocalEcho(it) }
-                    eventSenderProcessor.postRedaction(redactEvent, null)
-                }
-            }
+
+        val data = findReactionEventForUndoTask.executeRetry(params, Int.MAX_VALUE)
+
+        return if (data.redactEventId == null) {
+            Timber.w("Cannot find reaction to undo (not yet synced?)")
+            // TODO?
+            NoOpCancellable
+        } else {
+            val redactEvent = eventFactory.createRedactEvent(roomId, data.redactEventId, null)
+                    .also { saveLocalEcho(it) }
+            eventSenderProcessor.postRedaction(redactEvent, null)
         }
-        return findReactionEventForUndoTask
-                .configureWith(params) {
-                    this.retryCount = Int.MAX_VALUE
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
     }
 
     override fun editPoll(targetEvent: TimelineEvent,
@@ -139,12 +127,24 @@ internal class DefaultRelationService @AssistedInject constructor(
         return fetchEditHistoryTask.execute(FetchEditHistoryTask.Params(roomId, eventId))
     }
 
-    override fun replyToMessage(eventReplied: TimelineEvent, replyText: CharSequence, autoMarkdown: Boolean): Cancelable? {
-        val event = eventFactory.createReplyTextEvent(roomId, eventReplied, replyText, autoMarkdown)
+    override fun replyToMessage(
+            eventReplied: TimelineEvent,
+            replyText: CharSequence,
+            autoMarkdown: Boolean,
+            showInThread: Boolean,
+            rootThreadEventId: String?
+    ): Cancelable? {
+        val event = eventFactory.createReplyTextEvent(
+                roomId = roomId,
+                eventReplied = eventReplied,
+                replyText = replyText,
+                autoMarkdown = autoMarkdown,
+                rootThreadEventId = rootThreadEventId,
+                showInThread = showInThread)
                 ?.also { saveLocalEcho(it) }
                 ?: return null
 
-        return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+        return eventSenderProcessor.postEvent(event)
     }
 
     override fun getEventAnnotationsSummary(eventId: String): EventAnnotationsSummary? {
@@ -166,6 +166,47 @@ internal class DefaultRelationService @AssistedInject constructor(
         }
     }
 
+    override fun replyInThread(
+            rootThreadEventId: String,
+            replyInThreadText: CharSequence,
+            msgType: String,
+            autoMarkdown: Boolean,
+            formattedText: String?,
+            eventReplied: TimelineEvent?): Cancelable? {
+        val event = if (eventReplied != null) {
+            // Reply within a thread
+            eventFactory.createReplyTextEvent(
+                    roomId = roomId,
+                    eventReplied = eventReplied,
+                    replyText = replyInThreadText,
+                    autoMarkdown = autoMarkdown,
+                    rootThreadEventId = rootThreadEventId,
+                    showInThread = false
+            )
+                    ?.also {
+                        saveLocalEcho(it)
+                    }
+                    ?: return null
+        } else {
+            // Normal thread reply
+            eventFactory.createThreadTextEvent(
+                    rootThreadEventId = rootThreadEventId,
+                    roomId = roomId,
+                    text = replyInThreadText,
+                    msgType = msgType,
+                    autoMarkdown = autoMarkdown,
+                    formattedText = formattedText)
+                    .also {
+                        saveLocalEcho(it)
+                    }
+        }
+        return eventSenderProcessor.postEvent(event)
+    }
+
+    override suspend fun fetchThreadTimeline(rootThreadEventId: String): Boolean {
+        return fetchThreadTimelineTask.execute(FetchThreadTimelineTask.Params(roomId, rootThreadEventId))
+    }
+
     /**
      * Saves the event in database as a local echo.
      * SendState is set to UNSENT and it's added to a the sendingTimelineEvents list of the room.
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 a40a8df443..b54cd71e50 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,7 +23,6 @@ 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.internal.crypto.CryptoSessionInfoProvider
 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
@@ -33,7 +32,6 @@ import javax.inject.Inject
 
 internal class EventEditor @Inject constructor(private val eventSenderProcessor: EventSenderProcessor,
                                                private val eventFactory: LocalEchoEventFactory,
-                                               private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
                                                private val localEchoRepository: LocalEchoRepository) {
 
     fun editTextMessage(targetEvent: TimelineEvent,
@@ -51,7 +49,7 @@ internal class EventEditor @Inject constructor(private val eventSenderProcessor:
         } else if (targetEvent.root.sendState.isSent()) {
             val event = eventFactory
                     .createReplaceTextEvent(roomId, targetEvent.eventId, newBodyText, newBodyAutoMarkdown, msgType, compatibilityBodyText)
-            return sendReplaceEvent(roomId, event)
+            return sendReplaceEvent(event)
         } else {
             // Should we throw?
             Timber.w("Can't edit a sending event")
@@ -72,7 +70,7 @@ internal class EventEditor @Inject constructor(private val eventSenderProcessor:
         } else if (targetEvent.root.sendState.isSent()) {
             val event = eventFactory
                     .createPollReplaceEvent(roomId, pollType, targetEvent.eventId, question, options)
-            return sendReplaceEvent(roomId, event)
+            return sendReplaceEvent(event)
         } else {
             Timber.w("Can't edit a sending event")
             return NoOpCancellable
@@ -82,12 +80,12 @@ internal class EventEditor @Inject constructor(private val eventSenderProcessor:
     private fun sendFailedEvent(targetEvent: TimelineEvent, editedEvent: Event): Cancelable {
         val roomId = targetEvent.roomId
         updateFailedEchoWithEvent(roomId, targetEvent.eventId, editedEvent)
-        return eventSenderProcessor.postEvent(editedEvent, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+        return eventSenderProcessor.postEvent(editedEvent)
     }
 
-    private fun sendReplaceEvent(roomId: String, editedEvent: Event): Cancelable {
+    private fun sendReplaceEvent(editedEvent: Event): Cancelable {
         localEchoRepository.createLocalEcho(editedEvent)
-        return eventSenderProcessor.postEvent(editedEvent, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+        return eventSenderProcessor.postEvent(editedEvent)
     }
 
     fun editReply(replyToEdit: TimelineEvent,
@@ -97,11 +95,17 @@ internal class EventEditor @Inject constructor(private val eventSenderProcessor:
         val roomId = replyToEdit.roomId
         if (replyToEdit.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.createReplyTextEvent(roomId, originalTimelineEvent, newBodyText, false)?.copy(
+            val editedEvent = eventFactory.createReplyTextEvent(
+                    roomId = roomId,
+                    eventReplied = originalTimelineEvent,
+                    replyText = newBodyText,
+                    autoMarkdown = false,
+                    showInThread = false
+            )?.copy(
                     eventId = replyToEdit.eventId
             ) ?: return NoOpCancellable
             updateFailedEchoWithEvent(roomId, replyToEdit.eventId, editedEvent)
-            return eventSenderProcessor.postEvent(editedEvent, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+            return eventSenderProcessor.postEvent(editedEvent)
         } else if (replyToEdit.root.sendState.isSent()) {
             val event = eventFactory.createReplaceTextOfReply(
                     roomId,
@@ -113,7 +117,7 @@ internal class EventEditor @Inject constructor(private val eventSenderProcessor:
                     compatibilityBodyText
             )
                     .also { localEchoRepository.createLocalEcho(it) }
-            return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+            return eventSenderProcessor.postEvent(event)
         } else {
             // Should we throw?
             Timber.w("Can't edit a sending event")
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
new file mode 100644
index 0000000000..e0d501c515
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+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.session.crypto.MXCryptoError
+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.CryptoSessionInfoProvider
+import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
+import org.matrix.android.sdk.internal.database.helper.updateThreadSummaryIfNeeded
+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.ReactionAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.query.copyToRealmOrIgnore
+import org.matrix.android.sdk.internal.database.query.findLastForwardChunkOfRoom
+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
+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.events.getFixedRoomMemberContent
+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.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import timber.log.Timber
+import javax.inject.Inject
+
+internal interface FetchThreadTimelineTask : Task<FetchThreadTimelineTask.Params, Boolean> {
+    data class Params(
+            val roomId: String,
+            val rootThreadEventId: String
+    )
+}
+
+internal class DefaultFetchThreadTimelineTask @Inject constructor(
+        private val roomAPI: RoomAPI,
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
+        @SessionDatabase private val monarchy: Monarchy,
+        @UserId private val userId: String,
+        private val cryptoService: DefaultCryptoService
+) : FetchThreadTimelineTask {
+
+    override suspend fun execute(params: FetchThreadTimelineTask.Params): Boolean {
+        val isRoomEncrypted = cryptoSessionInfoProvider.isRoomEncrypted(params.roomId)
+        val response = executeRequest(globalErrorReceiver) {
+            roomAPI.getRelations(
+                    roomId = params.roomId,
+                    eventId = params.rootThreadEventId,
+                    relationType = RelationType.IO_THREAD,
+                    eventType = if (isRoomEncrypted) EventType.ENCRYPTED else EventType.MESSAGE,
+                    limit = 2000
+            )
+        }
+
+        val threadList = response.chunks + listOfNotNull(response.originalEvent)
+
+        return storeNewEventsIfNeeded(threadList, params.roomId)
+    }
+
+    /**
+     * Store new events if they are not already received, and returns weather or not,
+     * a timeline update should be made
+     * @param threadList is the list containing the thread replies
+     * @param roomId the roomId of the the thread
+     * @return
+     */
+    private suspend fun storeNewEventsIfNeeded(threadList: List<Event>, roomId: String): Boolean {
+        var eventsSkipped = 0
+        monarchy
+                .awaitTransaction { realm ->
+                    val chunk = ChunkEntity.findLastForwardChunkOfRoom(realm, roomId)
+
+                    val optimizedThreadSummaryMap = hashMapOf<String, EventEntity>()
+                    val roomMemberContentsByUser = HashMap<String, RoomMemberContent?>()
+
+                    for (event in threadList.reversed()) {
+                        if (event.eventId == null || event.senderId == null || event.type == null) {
+                            eventsSkipped++
+                            continue
+                        }
+
+                        if (EventEntity.where(realm, event.eventId).findFirst() != null) {
+                            //  Skip if event already exists
+                            eventsSkipped++
+                            continue
+                        }
+                        if (event.isEncrypted()) {
+                            // Decrypt events that will be stored
+                            decryptIfNeeded(event, roomId)
+                        }
+
+                        handleReaction(realm, event, roomId)
+
+                        val ageLocalTs = event.unsignedData?.age?.let { System.currentTimeMillis() - it }
+                        val eventEntity = event.toEntity(roomId, SendState.SYNCED, ageLocalTs).copyToRealmOrIgnore(realm, EventInsertType.INCREMENTAL_SYNC)
+
+                        // Sender info
+                        roomMemberContentsByUser.getOrPut(event.senderId) {
+                            // If we don't have any new state on this user, get it from db
+                            val rootStateEvent = CurrentStateEventEntity.getOrNull(realm, roomId, event.senderId, EventType.STATE_ROOM_MEMBER)?.root
+                            rootStateEvent?.asDomain()?.getFixedRoomMemberContent()
+                        }
+
+                        chunk?.addTimelineEvent(roomId, eventEntity, PaginationDirection.FORWARDS, roomMemberContentsByUser)
+                        eventEntity.rootThreadEventId?.let {
+                            // This is a thread event
+                            optimizedThreadSummaryMap[it] = eventEntity
+                        } ?: run {
+                            // This is a normal event or a root thread one
+                            optimizedThreadSummaryMap[eventEntity.eventId] = eventEntity
+                        }
+                    }
+
+                    optimizedThreadSummaryMap.updateThreadSummaryIfNeeded(
+                            roomId = roomId,
+                            realm = realm,
+                            currentUserId = userId,
+                            shouldUpdateNotifications = false
+                    )
+                }
+        Timber.i("----> size: ${threadList.size} | skipped: $eventsSkipped | threads: ${threadList.map { it.eventId }}")
+
+        return eventsSkipped == threadList.size
+    }
+
+    /**
+     * Invoke the event decryption mechanism for a specific event
+     */
+
+    private fun decryptIfNeeded(event: Event, roomId: String) {
+        try {
+            // Event from sync does not have roomId, so add it to the event first
+            val result = cryptoService.decryptEvent(event.copy(roomId = roomId), "")
+            event.mxDecryptionResult = OlmDecryptionResult(
+                    payload = result.clearEvent,
+                    senderKey = result.senderCurve25519Key,
+                    keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
+                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+            )
+        } catch (e: MXCryptoError) {
+            if (e is MXCryptoError.Base) {
+                event.mCryptoError = e.errorType
+                event.mCryptoErrorReason = e.technicalMessage.takeIf { it.isNotEmpty() } ?: e.detailedErrorDescription
+            }
+        }
+    }
+
+    private fun handleReaction(realm: Realm,
+                               event: Event,
+                               roomId: String) {
+        val unsignedData = event.unsignedData ?: return
+        val relatedEventId = event.eventId ?: return
+
+        unsignedData.relations?.annotations?.chunk?.forEach { relationChunk ->
+
+            if (relationChunk.type == EventType.REACTION) {
+                val reaction = relationChunk.key
+                Timber.i("----> Annotation found in ${event.eventId} ${relationChunk.key} ")
+
+                val eventSummary = EventAnnotationsSummaryEntity.getOrCreate(realm, roomId, relatedEventId)
+                var sum = eventSummary.reactionsSummary.find { it.key == reaction }
+
+                if (sum == null) {
+                    sum = realm.createObject(ReactionAggregatedSummaryEntity::class.java)
+                    sum.key = reaction
+                    sum.firstTimestamp = event.originServerTs ?: 0
+                    Timber.v("Adding synced reaction $reaction")
+                    sum.count = 1
+                    // reactionEventId not included in the /relations API
+//                    sum.sourceEvents.add(reactionEventId)
+                    eventSummary.reactionsSummary.add(sum)
+                } else {
+                    sum.count += 1
+                }
+            }
+        }
+    }
+}
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 5662a72cb8..28c17f38b6 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
@@ -46,7 +46,7 @@ import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.CancelableBag
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.NoOpCancellable
-import org.matrix.android.sdk.internal.crypto.CryptoSessionInfoProvider
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.content.UploadContentWorker
@@ -66,7 +66,7 @@ internal class DefaultSendService @AssistedInject constructor(
         private val workManagerProvider: WorkManagerProvider,
         @SessionId private val sessionId: String,
         private val localEchoEventFactory: LocalEchoEventFactory,
-        private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
+        private val cryptoStore: IMXCryptoStore,
         private val taskExecutor: TaskExecutor,
         private val localEchoRepository: LocalEchoRepository,
         private val eventSenderProcessor: EventSenderProcessor,
@@ -98,8 +98,14 @@ internal class DefaultSendService @AssistedInject constructor(
                 .let { sendEvent(it) }
     }
 
-    override fun sendQuotedTextMessage(quotedEvent: TimelineEvent, text: String, autoMarkdown: Boolean): Cancelable {
-        return localEchoEventFactory.createQuotedTextEvent(roomId, quotedEvent, text, autoMarkdown)
+    override fun sendQuotedTextMessage(quotedEvent: TimelineEvent, text: String, autoMarkdown: Boolean, rootThreadEventId: String?): Cancelable {
+        return localEchoEventFactory.createQuotedTextEvent(
+                roomId = roomId,
+                quotedEvent = quotedEvent,
+                text = text,
+                autoMarkdown = autoMarkdown,
+                rootThreadEventId = rootThreadEventId
+        )
                 .also { createLocalEcho(it) }
                 .let { sendEvent(it) }
     }
@@ -254,22 +260,37 @@ internal class DefaultSendService @AssistedInject constructor(
 
     override fun sendMedias(attachments: List<ContentAttachmentData>,
                             compressBeforeSending: Boolean,
-                            roomIds: Set<String>): Cancelable {
+                            roomIds: Set<String>,
+                            rootThreadEventId: String?
+    ): Cancelable {
         return attachments.mapTo(CancelableBag()) {
-            sendMedia(it, compressBeforeSending, roomIds)
+            sendMedia(
+                    attachment = it,
+                    compressBeforeSending = compressBeforeSending,
+                    roomIds = roomIds,
+                    rootThreadEventId = rootThreadEventId)
         }
     }
 
     override fun sendMedia(attachment: ContentAttachmentData,
                            compressBeforeSending: Boolean,
-                           roomIds: Set<String>): Cancelable {
+                           roomIds: Set<String>,
+                           rootThreadEventId: String?
+    ): Cancelable {
+        // Ensure that the event will not be send in a thread if we are a different flow.
+        // Like sending files to multiple rooms
+        val rootThreadId = if (roomIds.isNotEmpty()) null else rootThreadEventId
+
         // Create an event with the media file path
         // Ensure current roomId is included in the set
         val allRoomIds = (roomIds + roomId).toList()
 
         // Create local echo for each room
         val allLocalEchoes = allRoomIds.map {
-            localEchoEventFactory.createMediaEvent(it, attachment).also { event ->
+            localEchoEventFactory.createMediaEvent(
+                    roomId = it,
+                    attachment = attachment,
+                    rootThreadEventId = rootThreadId).also { event ->
                 createLocalEcho(event)
             }
         }
@@ -282,7 +303,7 @@ internal class DefaultSendService @AssistedInject constructor(
     private fun internalSendMedia(allLocalEchoes: List<Event>, attachment: ContentAttachmentData, compressBeforeSending: Boolean): Cancelable {
         val cancelableBag = CancelableBag()
 
-        allLocalEchoes.groupBy { cryptoSessionInfoProvider.isRoomEncrypted(it.roomId!!) }
+        allLocalEchoes.groupBy { cryptoStore.roomWasOnceEncrypted(it.roomId!!) }
                 .apply {
                     keys.forEach { isRoomEncrypted ->
                         // Should never be empty
@@ -313,7 +334,7 @@ internal class DefaultSendService @AssistedInject constructor(
     }
 
     private fun sendEvent(event: Event): Cancelable {
-        return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(event.roomId!!))
+        return eventSenderProcessor.postEvent(event)
     }
 
     private fun createLocalEcho(event: 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 1e46602411..3c36d58710 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
@@ -28,6 +28,7 @@ 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.UnsignedData
 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.AudioInfo
 import org.matrix.android.sdk.api.session.room.model.message.AudioWaveformInfo
 import org.matrix.android.sdk.api.session.room.model.message.FileInfo
@@ -45,6 +46,7 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
 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.MessagePollResponseContent
+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.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
@@ -292,13 +294,16 @@ internal class LocalEchoEventFactory @Inject constructor(
                 ))
     }
 
-    fun createMediaEvent(roomId: String, attachment: ContentAttachmentData): Event {
+    fun createMediaEvent(roomId: String,
+                         attachment: ContentAttachmentData,
+                         rootThreadEventId: String?
+    ): Event {
         return when (attachment.type) {
-            ContentAttachmentData.Type.IMAGE         -> createImageEvent(roomId, attachment)
-            ContentAttachmentData.Type.VIDEO         -> createVideoEvent(roomId, attachment)
-            ContentAttachmentData.Type.AUDIO         -> createAudioEvent(roomId, attachment, isVoiceMessage = false)
-            ContentAttachmentData.Type.VOICE_MESSAGE -> createAudioEvent(roomId, attachment, isVoiceMessage = true)
-            ContentAttachmentData.Type.FILE          -> createFileEvent(roomId, attachment)
+            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)
         }
     }
 
@@ -321,7 +326,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 unsignedData = UnsignedData(age = null, transactionId = localId))
     }
 
-    private fun createImageEvent(roomId: String, attachment: ContentAttachmentData): Event {
+    private fun createImageEvent(roomId: String, attachment: ContentAttachmentData, rootThreadEventId: String?): Event {
         var width = attachment.width
         var height = attachment.height
 
@@ -345,12 +350,19 @@ internal class LocalEchoEventFactory @Inject constructor(
                         height = height?.toInt() ?: 0,
                         size = attachment.size
                 ),
-                url = attachment.queryUri.toString()
+                url = attachment.queryUri.toString(),
+                relatesTo = rootThreadEventId?.let {
+                    RelationDefaultContent(
+                            type = RelationType.IO_THREAD,
+                            eventId = it,
+                            inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(it))
+                    )
+                }
         )
         return createMessageEvent(roomId, content)
     }
 
-    private fun createVideoEvent(roomId: String, attachment: ContentAttachmentData): Event {
+    private fun createVideoEvent(roomId: String, attachment: ContentAttachmentData, rootThreadEventId: String?): Event {
         val mediaDataRetriever = MediaMetadataRetriever()
         mediaDataRetriever.setDataSource(context, attachment.queryUri)
 
@@ -381,12 +393,23 @@ internal class LocalEchoEventFactory @Inject constructor(
                         thumbnailUrl = attachment.queryUri.toString(),
                         thumbnailInfo = thumbnailInfo
                 ),
-                url = attachment.queryUri.toString()
+                url = attachment.queryUri.toString(),
+                relatesTo = rootThreadEventId?.let {
+                    RelationDefaultContent(
+                            type = RelationType.IO_THREAD,
+                            eventId = it,
+                            inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(it))
+                    )
+                }
         )
         return createMessageEvent(roomId, content)
     }
 
-    private fun createAudioEvent(roomId: String, attachment: ContentAttachmentData, isVoiceMessage: Boolean): Event {
+    private fun createAudioEvent(roomId: String,
+                                 attachment: ContentAttachmentData,
+                                 isVoiceMessage: Boolean,
+                                 rootThreadEventId: String?
+    ): Event {
         val content = MessageAudioContent(
                 msgType = MessageType.MSGTYPE_AUDIO,
                 body = attachment.name ?: "audio",
@@ -400,12 +423,19 @@ internal class LocalEchoEventFactory @Inject constructor(
                         duration = attachment.duration?.toInt(),
                         waveform = waveformSanitizer.sanitize(attachment.waveform)
                 ),
-                voiceMessageIndicator = if (!isVoiceMessage) null else emptyMap()
+                voiceMessageIndicator = if (!isVoiceMessage) null else emptyMap(),
+                relatesTo = rootThreadEventId?.let {
+                    RelationDefaultContent(
+                            type = RelationType.IO_THREAD,
+                            eventId = it,
+                            inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(it))
+                    )
+                }
         )
         return createMessageEvent(roomId, content)
     }
 
-    private fun createFileEvent(roomId: String, attachment: ContentAttachmentData): Event {
+    private fun createFileEvent(roomId: String, attachment: ContentAttachmentData, rootThreadEventId: String?): Event {
         val content = MessageFileContent(
                 msgType = MessageType.MSGTYPE_FILE,
                 body = attachment.name ?: "file",
@@ -413,7 +443,14 @@ internal class LocalEchoEventFactory @Inject constructor(
                         mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() },
                         size = attachment.size
                 ),
-                url = attachment.queryUri.toString()
+                url = attachment.queryUri.toString(),
+                relatesTo = rootThreadEventId?.let {
+                    RelationDefaultContent(
+                            type = RelationType.IO_THREAD,
+                            eventId = it,
+                            inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(it))
+                    )
+                }
         )
         return createMessageEvent(roomId, content)
     }
@@ -423,6 +460,7 @@ internal class LocalEchoEventFactory @Inject constructor(
     }
 
     fun createEvent(roomId: String, type: String, content: Content?): Event {
+        val newContent = enhanceStickerIfNeeded(type, content) ?: content
         val localId = LocalEcho.createLocalEchoId()
         return Event(
                 roomId = roomId,
@@ -430,19 +468,65 @@ internal class LocalEchoEventFactory @Inject constructor(
                 senderId = userId,
                 eventId = localId,
                 type = type,
-                content = content,
+                content = newContent,
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
     }
 
+    /**
+     * Enhance sticker to support threads fallback if needed
+     */
+    private fun enhanceStickerIfNeeded(type: String, content: Content?): Content? {
+        var newContent: Content? = null
+        if (type == EventType.STICKER) {
+            val isThread = (content.toModel<MessageStickerContent>())?.relatesTo?.type == RelationType.IO_THREAD
+            val rootThreadEventId = (content.toModel<MessageStickerContent>())?.relatesTo?.eventId
+            if (isThread && rootThreadEventId != null) {
+                val newRelationalDefaultContent = (content.toModel<MessageStickerContent>())?.relatesTo?.copy(
+                        inReplyTo = ReplyToContent(eventId = localEchoRepository.getLatestThreadEvent(rootThreadEventId))
+                )
+                newContent = (content.toModel<MessageStickerContent>())?.copy(
+                        relatesTo = newRelationalDefaultContent
+                ).toContent()
+            }
+        }
+        return newContent
+    }
+
+    /**
+     * Creates a thread event related to the already existing root event
+     */
+    fun createThreadTextEvent(
+            rootThreadEventId: String,
+            roomId: String,
+            text: CharSequence,
+            msgType: String,
+            autoMarkdown: Boolean,
+            formattedText: String?): Event {
+        val content = formattedText?.let { TextContent(text.toString(), it) } ?: createTextContent(text, autoMarkdown)
+        return createEvent(
+                roomId,
+                EventType.MESSAGE,
+                content.toThreadTextContent(
+                        rootThreadEventId = rootThreadEventId,
+                        latestThreadEventId = localEchoRepository.getLatestThreadEvent(rootThreadEventId),
+                        msgType = msgType)
+                        .toContent())
+    }
+
     private fun dummyOriginServerTs(): Long {
         return System.currentTimeMillis()
     }
 
+    /**
+     * Creates a reply to a regular timeline Event or a thread Event if needed
+     */
     fun createReplyTextEvent(roomId: String,
                              eventReplied: TimelineEvent,
                              replyText: CharSequence,
-                             autoMarkdown: Boolean): Event? {
+                             autoMarkdown: Boolean,
+                             rootThreadEventId: String? = null,
+                             showInThread: Boolean): Event? {
         // Fallbacks and event representation
         // TODO Add error/warning logs when any of this is null
         val permalink = permalinkFactory.createPermalink(eventReplied.root, false) ?: return null
@@ -473,11 +557,33 @@ internal class LocalEchoEventFactory @Inject constructor(
                 format = MessageFormat.FORMAT_MATRIX_HTML,
                 body = replyFallback,
                 formattedBody = replyFormatted,
-                relatesTo = RelationDefaultContent(null, null, ReplyToContent(eventId))
-        )
+                relatesTo = generateReplyRelationContent(
+                        eventId = eventId,
+                        rootThreadEventId = rootThreadEventId,
+                        showAsReply = showInThread))
         return createMessageEvent(roomId, content)
     }
 
+    /**
+     * Generates the appropriate relatesTo object for a reply event.
+     * It can either be a regular reply or a reply within a thread
+     * "m.relates_to": {
+     *      "rel_type": "m.thread",
+     *      "event_id": "$thread_root",
+     *      "m.in_reply_to": {
+     *          "event_id": "$event_target",
+     *          "render_in": ["m.thread"]
+     *        }
+     *   }
+     */
+    private fun generateReplyRelationContent(eventId: String, rootThreadEventId: String? = null, showAsReply: Boolean): RelationDefaultContent =
+            rootThreadEventId?.let {
+                RelationDefaultContent(
+                        type = RelationType.IO_THREAD,
+                        eventId = it,
+                        inReplyTo = ReplyToContent(eventId = eventId, renderIn = if (showAsReply) arrayListOf("m.thread") else null))
+            } ?: RelationDefaultContent(null, null, ReplyToContent(eventId = eventId))
+
     private fun buildFormattedReply(permalink: String, userLink: String, userId: String, bodyFormatted: String, newBodyFormatted: String): String {
         return REPLY_PATTERN.format(
                 permalink,
@@ -488,6 +594,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 newBodyFormatted
         )
     }
+
     private fun buildReplyFallback(body: TextContent, originalSenderId: String?, newBodyText: String): String {
         return buildString {
             append("> <")
@@ -593,11 +700,28 @@ internal class LocalEchoEventFactory @Inject constructor(
             quotedEvent: TimelineEvent,
             text: String,
             autoMarkdown: Boolean,
+            rootThreadEventId: String?
     ): Event {
         val messageContent = quotedEvent.getLastMessageContent()
         val textMsg = messageContent?.body
         val quoteText = legacyRiotQuoteText(textMsg, text)
-        return createFormattedTextEvent(roomId, markdownParser.parse(quoteText, force = true, advanced = autoMarkdown), MessageType.MSGTYPE_TEXT)
+
+        return if (rootThreadEventId != null) {
+            createMessageEvent(
+                    roomId,
+                    markdownParser
+                            .parse(quoteText, force = true, advanced = autoMarkdown)
+                            .toThreadTextContent(
+                                    rootThreadEventId = rootThreadEventId,
+                                    latestThreadEventId = localEchoRepository.getLatestThreadEvent(rootThreadEventId),
+                                    msgType = MessageType.MSGTYPE_TEXT)
+            )
+        } else {
+            createFormattedTextEvent(
+                    roomId,
+                    markdownParser.parse(quoteText, force = true, advanced = autoMarkdown),
+                    MessageType.MSGTYPE_TEXT)
+        }
     }
 
     private fun legacyRiotQuoteText(quotedText: String?, myText: String): String {
@@ -631,6 +755,7 @@ internal class LocalEchoEventFactory @Inject constructor(
         // </mx-reply>
         // No whitespace because currently breaks temporary formatted text to Span
         const val REPLY_PATTERN = """<mx-reply><blockquote><a href="%s">In reply to</a> <a href="%s">%s</a><br />%s</blockquote></mx-reply>%s"""
+        const val QUOTE_PATTERN = """<blockquote><p>%s</p></blockquote><p>%s</p>"""
 
         // This is used to replace inner mx-reply tags
         val MX_REPLY_REGEX = "<mx-reply>.*</mx-reply>".toRegex()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
index 13095fbd58..1b1a66a1c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
@@ -138,7 +138,7 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
         }
     }
 
-     fun deleteFailedEchoAsync(roomId: String, eventId: String?) {
+    fun deleteFailedEchoAsync(roomId: String, eventId: String?) {
         monarchy.runTransactionSync { realm ->
             TimelineEventEntity.where(realm, roomId = roomId, eventId = eventId ?: "").findFirst()?.deleteFromRealm()
             EventEntity.where(realm, eventId = eventId ?: "").findFirst()?.deleteFromRealm()
@@ -215,4 +215,13 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
                     }
         }
     }
+
+    /**
+     * Returns the latest known thread event message, or the rootThreadEventId if no other event found
+     */
+    fun getLatestThreadEvent(rootThreadEventId: String): String {
+        return realmSessionProvider.withRealm { realm ->
+            EventEntity.where(realm, eventId = rootThreadEventId).findFirst()?.threadSummaryLatestMessage?.eventId
+        } ?: rootThreadEventId
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt
index efc0b55abf..5c629f87f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt
@@ -16,9 +16,12 @@
 
 package org.matrix.android.sdk.internal.session.room.send
 
+import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
 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.RelationDefaultContent
+import org.matrix.android.sdk.api.session.room.model.relation.ReplyToContent
 import org.matrix.android.sdk.api.util.ContentUtils.extractUsefulTextFromHtmlReply
 import org.matrix.android.sdk.api.util.ContentUtils.extractUsefulTextFromReply
 
@@ -41,6 +44,29 @@ fun TextContent.toMessageTextContent(msgType: String = MessageType.MSGTYPE_TEXT)
     )
 }
 
+/**
+ * Transform a TextContent to a thread message content. It will also add the inReplyTo
+ * latestThreadEventId in order for the clients without threads enabled to render it appropriately
+ * If latest event not found, we pass rootThreadEventId
+ */
+fun TextContent.toThreadTextContent(
+        rootThreadEventId: String,
+        latestThreadEventId: String,
+        msgType: String = MessageType.MSGTYPE_TEXT): MessageTextContent {
+    return MessageTextContent(
+            msgType = msgType,
+            format = MessageFormat.FORMAT_MATRIX_HTML.takeIf { formattedText != null },
+            body = text,
+            relatesTo = RelationDefaultContent(
+                    type = RelationType.IO_THREAD,
+                    eventId = rootThreadEventId,
+                    inReplyTo = ReplyToContent(
+                            eventId = latestThreadEventId
+                    )),
+            formattedBody = formattedText
+    )
+}
+
 fun TextContent.removeInReplyFallbacks(): TextContent {
     return copy(
             text = extractUsefulTextFromReply(this.text),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
index 33cb0db243..ccbfbfcded 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
@@ -17,6 +17,7 @@ package org.matrix.android.sdk.internal.session.room.send.pills
 
 import android.text.SpannableString
 import org.matrix.android.sdk.api.session.room.send.MatrixItemSpan
+import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.internal.session.displayname.DisplayNameResolver
 import java.util.Collections
 import javax.inject.Inject
@@ -51,6 +52,8 @@ internal class TextPillsUtils @Inject constructor(
         val pills = spannableString
                 ?.getSpans(0, text.length, MatrixItemSpan::class.java)
                 ?.map { MentionLinkSpec(it, spannableString.getSpanStart(it), spannableString.getSpanEnd(it)) }
+                // we use the raw text for @room notification instead of a link
+                ?.filterNot { it.span.matrixItem is MatrixItem.EveryoneInRoomItem }
                 ?.toMutableList()
                 ?.takeIf { it.isNotEmpty() }
                 ?: return null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
index eb69161614..5b4efa5df6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
@@ -26,9 +26,9 @@ import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.getRetryDelay
 import org.matrix.android.sdk.api.failure.isLimitExceededError
 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.util.Cancelable
+import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.task.CoroutineSequencer
 import org.matrix.android.sdk.internal.task.SemaphoreCoroutineSequencer
@@ -54,7 +54,7 @@ private const val MAX_RETRY_COUNT = 3
  */
 @SessionScope
 internal class EventSenderProcessorCoroutine @Inject constructor(
-        private val cryptoService: CryptoService,
+        private val cryptoStore: IMXCryptoStore,
         private val sessionParams: SessionParams,
         private val queuedTaskFactory: QueuedTaskFactory,
         private val taskExecutor: TaskExecutor,
@@ -92,7 +92,8 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
     }
 
     override fun postEvent(event: Event): Cancelable {
-        return postEvent(event, event.roomId?.let { cryptoService.isRoomEncrypted(it) } ?: false)
+        val shouldEncrypt = event.roomId?.let { cryptoStore.roomWasOnceEncrypted(it) } ?: false
+        return postEvent(event, shouldEncrypt)
     }
 
     override fun postEvent(event: Event, encrypt: Boolean): Cancelable {
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 a7887d77f8..1c1d59fb3d 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
@@ -119,9 +119,8 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.roomType = roomType
         Timber.v("## Space: Updating summary room [$roomId] roomType: [$roomType]")
 
-        // Don't use current state for this one as we are only interested in having MXCRYPTO_ALGORITHM_MEGOLM event in the room
         val encryptionEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_ENCRYPTION, stateKey = "")?.root
-        Timber.v("## CRYPTO: currentEncryptionEvent is $encryptionEvent")
+        Timber.d("## CRYPTO: currentEncryptionEvent is $encryptionEvent")
 
         val 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
new file mode 100644
index 0000000000..5967ae8d2e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
@@ -0,0 +1,103 @@
+/*
+ * 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.threads
+
+import androidx.lifecycle.LiveData
+import com.zhuinden.monarchy.Monarchy
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import io.realm.Realm
+import org.matrix.android.sdk.api.session.room.threads.ThreadsService
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
+import org.matrix.android.sdk.internal.database.helper.findAllLocalThreadNotificationsForRoomId
+import org.matrix.android.sdk.internal.database.helper.findAllThreadsForRoomId
+import org.matrix.android.sdk.internal.database.helper.isUserParticipatingInThread
+import org.matrix.android.sdk.internal.database.helper.mapEventsWithEdition
+import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
+import org.matrix.android.sdk.internal.database.model.EventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+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.util.awaitTransaction
+
+internal class DefaultThreadsService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        @UserId private val userId: String,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val timelineEventMapper: TimelineEventMapper,
+) : ThreadsService {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(roomId: String): DefaultThreadsService
+    }
+
+    override fun getMarkedThreadNotificationsLive(): LiveData<List<TimelineEvent>> {
+        return monarchy.findAllMappedWithChanges(
+                { TimelineEventEntity.findAllLocalThreadNotificationsForRoomId(it, roomId = roomId) },
+                { timelineEventMapper.map(it) }
+        )
+    }
+
+    override fun getMarkedThreadNotifications(): List<TimelineEvent> {
+        return monarchy.fetchAllMappedSync(
+                { TimelineEventEntity.findAllLocalThreadNotificationsForRoomId(it, roomId = roomId) },
+                { timelineEventMapper.map(it) }
+        )
+    }
+
+    override fun getAllThreadsLive(): LiveData<List<TimelineEvent>> {
+        return monarchy.findAllMappedWithChanges(
+                { TimelineEventEntity.findAllThreadsForRoomId(it, roomId = roomId) },
+                { timelineEventMapper.map(it) }
+        )
+    }
+
+    override fun getAllThreads(): List<TimelineEvent> {
+        return monarchy.fetchAllMappedSync(
+                { TimelineEventEntity.findAllThreadsForRoomId(it, roomId = roomId) },
+                { timelineEventMapper.map(it) }
+        )
+    }
+
+    override fun isUserParticipatingInThread(rootThreadEventId: String): Boolean {
+        return Realm.getInstance(monarchy.realmConfiguration).use {
+            TimelineEventEntity.isUserParticipatingInThread(
+                    realm = it,
+                    roomId = roomId,
+                    rootThreadEventId = rootThreadEventId,
+                    senderId = userId)
+        }
+    }
+
+    override fun mapEventsWithEdition(threads: List<TimelineEvent>): List<TimelineEvent> {
+        return Realm.getInstance(monarchy.realmConfiguration).use {
+            threads.mapEventsWithEdition(it, roomId)
+        }
+    }
+
+    override suspend fun markThreadAsRead(rootThreadEventId: String) {
+        monarchy.awaitTransaction {
+            EventEntity.where(
+                    realm = it,
+                    eventId = rootThreadEventId).findFirst()?.threadNotificationState = ThreadNotificationState.NO_NEW_MESSAGE
+        }
+    }
+}
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 71823cd458..3dd4225b2c 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
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 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.internal.database.lightweight.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.sync.handler.room.ReadReceiptHandler
@@ -60,6 +61,7 @@ internal class DefaultTimeline(private val roomId: String,
                                timelineEventMapper: TimelineEventMapper,
                                timelineInput: TimelineInput,
                                threadsAwarenessHandler: ThreadsAwarenessHandler,
+                               lightweightSettingsStorage: LightweightSettingsStorage,
                                eventDecryptor: TimelineEventDecryptor) : Timeline {
 
     companion object {
@@ -79,6 +81,9 @@ internal class DefaultTimeline(private val roomId: String,
     private val sequencer = SemaphoreCoroutineSequencer()
     private val postSnapshotSignalFlow = MutableSharedFlow<Unit>(0)
 
+    private var isFromThreadTimeline = false
+    private var rootThreadEventId: String? = null
+
     private val strategyDependencies = LoadTimelineStrategy.Dependencies(
             timelineSettings = settings,
             realm = backgroundRealm,
@@ -89,6 +94,7 @@ internal class DefaultTimeline(private val roomId: String,
             timelineInput = timelineInput,
             timelineEventMapper = timelineEventMapper,
             threadsAwarenessHandler = threadsAwarenessHandler,
+            lightweightSettingsStorage = lightweightSettingsStorage,
             onEventsUpdated = this::sendSignalToPostSnapshot,
             onLimitedTimeline = this::onLimitedTimeline,
             onNewTimelineEvents = this::onNewTimelineEvents
@@ -118,18 +124,21 @@ internal class DefaultTimeline(private val roomId: String,
         listeners.clear()
     }
 
-    override fun start() {
+    override fun start(rootThreadEventId: String?) {
         timelineScope.launch {
             loadRoomMembersIfNeeded()
         }
         timelineScope.launch {
             sequencer.post {
                 if (isStarted.compareAndSet(false, true)) {
+                    isFromThreadTimeline = rootThreadEventId != null
+                    this@DefaultTimeline.rootThreadEventId = rootThreadEventId
+                    // /
                     val realm = Realm.getInstance(realmConfiguration)
                     ensureReadReceiptAreLoaded(realm)
                     backgroundRealm.set(realm)
                     listenToPostSnapshotSignals()
-                    openAround(initialEventId)
+                    openAround(initialEventId, rootThreadEventId)
                     postSnapshot()
                 }
             }
@@ -150,7 +159,7 @@ internal class DefaultTimeline(private val roomId: String,
 
     override fun restartWithEventId(eventId: String?) {
         timelineScope.launch {
-            openAround(eventId)
+            openAround(eventId, rootThreadEventId)
             postSnapshot()
         }
     }
@@ -219,19 +228,24 @@ internal class DefaultTimeline(private val roomId: String,
         return true
     }
 
-    private suspend fun openAround(eventId: String?) = withContext(timelineDispatcher) {
+    private suspend fun openAround(eventId: String?, rootThreadEventId: String?) = withContext(timelineDispatcher) {
         val baseLogMessage = "openAround(eventId: $eventId)"
         Timber.v("$baseLogMessage started")
         if (!isStarted.get()) {
             throw IllegalStateException("You should call start before using timeline")
         }
         strategy.onStop()
-        strategy = if (eventId == null) {
-            buildStrategy(LoadTimelineStrategy.Mode.Live)
-        } else {
-            buildStrategy(LoadTimelineStrategy.Mode.Permalink(eventId))
+
+        strategy = when {
+            rootThreadEventId != null -> buildStrategy(LoadTimelineStrategy.Mode.Thread(rootThreadEventId))
+            eventId == null           -> buildStrategy(LoadTimelineStrategy.Mode.Live)
+            else                      -> buildStrategy(LoadTimelineStrategy.Mode.Permalink(eventId))
         }
-        initPaginationStates(eventId)
+
+        rootThreadEventId?.let {
+            initPaginationStates(null)
+        } ?: initPaginationStates(eventId)
+
         strategy.onStart()
         loadMore(
                 count = strategyDependencies.timelineSettings.initialSize,
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 126374b430..d7d61f0b47 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,11 +32,13 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.database.RealmSessionProvider
+import org.matrix.android.sdk.internal.database.lightweight.LightweightSettingsStorage
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 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.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.session.sync.handler.room.ReadReceiptHandler
 import org.matrix.android.sdk.internal.session.sync.handler.room.ThreadsAwarenessHandler
@@ -44,6 +46,7 @@ import org.matrix.android.sdk.internal.task.TaskExecutor
 
 internal class DefaultTimelineService @AssistedInject constructor(
         @Assisted private val roomId: String,
+        @UserId private val userId: String,
         @SessionDatabase private val monarchy: Monarchy,
         private val realmSessionProvider: RealmSessionProvider,
         private val timelineInput: TimelineInput,
@@ -55,6 +58,7 @@ internal class DefaultTimelineService @AssistedInject constructor(
         private val timelineEventMapper: TimelineEventMapper,
         private val loadRoomMembersTask: LoadRoomMembersTask,
         private val threadsAwarenessHandler: ThreadsAwarenessHandler,
+        private val lightweightSettingsStorage: LightweightSettingsStorage,
         private val readReceiptHandler: ReadReceiptHandler,
         private val coroutineDispatchers: MatrixCoroutineDispatchers
 ) : TimelineService {
@@ -79,7 +83,8 @@ internal class DefaultTimelineService @AssistedInject constructor(
                 loadRoomMembersTask = loadRoomMembersTask,
                 readReceiptHandler = readReceiptHandler,
                 getEventTask = contextOfEventTask,
-                threadsAwarenessHandler = threadsAwarenessHandler
+                threadsAwarenessHandler = threadsAwarenessHandler,
+                lightweightSettingsStorage = lightweightSettingsStorage
         )
     }
 
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 528b564e8b..f332c4a35f 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
@@ -26,6 +26,7 @@ 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.internal.database.lightweight.LightweightSettingsStorage
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
@@ -51,6 +52,7 @@ internal class LoadTimelineStrategy(
     sealed interface Mode {
         object Live : Mode
         data class Permalink(val originEventId: String) : Mode
+        data class Thread(val rootThreadEventId: String) : Mode
 
         fun originEventId(): String? {
             return if (this is Permalink) {
@@ -59,6 +61,14 @@ internal class LoadTimelineStrategy(
                 null
             }
         }
+
+//        fun getRootThreadEventId(): String? {
+//            return if (this is Thread) {
+//                rootThreadEventId
+//            } else {
+//                null
+//            }
+//        }
     }
 
     data class Dependencies(
@@ -71,6 +81,7 @@ internal class LoadTimelineStrategy(
             val timelineInput: TimelineInput,
             val timelineEventMapper: TimelineEventMapper,
             val threadsAwarenessHandler: ThreadsAwarenessHandler,
+            val lightweightSettingsStorage: LightweightSettingsStorage,
             val onEventsUpdated: (Boolean) -> Unit,
             val onLimitedTimeline: () -> Unit,
             val onNewTimelineEvents: (List<String>) -> Unit
@@ -198,12 +209,20 @@ internal class LoadTimelineStrategy(
     }
 
     private fun getChunkEntity(realm: Realm): RealmResults<ChunkEntity> {
-        return if (mode is Mode.Permalink) {
-            ChunkEntity.findAllIncludingEvents(realm, listOf(mode.originEventId))
-        } else {
-            ChunkEntity.where(realm, roomId)
-                    .equalTo(ChunkEntityFields.IS_LAST_FORWARD, true)
-                    .findAll()
+        return when (mode) {
+            is Mode.Live      -> {
+                ChunkEntity.where(realm, roomId)
+                        .equalTo(ChunkEntityFields.IS_LAST_FORWARD, true)
+                        .findAll()
+            }
+            is Mode.Permalink -> {
+                ChunkEntity.findAllIncludingEvents(realm, listOf(mode.originEventId))
+            }
+            is Mode.Thread    -> {
+                ChunkEntity.where(realm, roomId)
+                        .equalTo(ChunkEntityFields.IS_LAST_FORWARD, true)
+                        .findAll()
+            }
         }
     }
 
@@ -224,6 +243,7 @@ internal class LoadTimelineStrategy(
                     timelineEventMapper = dependencies.timelineEventMapper,
                     uiEchoManager = uiEchoManager,
                     threadsAwarenessHandler = dependencies.threadsAwarenessHandler,
+                    lightweightSettingsStorage = dependencies.lightweightSettingsStorage,
                     initialEventId = mode.originEventId(),
                     onBuiltEvents = dependencies.onEventsUpdated
             )
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 6af03a858a..c0dc31fcf8 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
@@ -29,6 +29,7 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 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.internal.database.lightweight.LightweightSettingsStorage
 import org.matrix.android.sdk.internal.database.mapper.EventMapper
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
@@ -55,6 +56,7 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
                              private val timelineEventMapper: TimelineEventMapper,
                              private val uiEchoManager: UIEchoManager? = null,
                              private val threadsAwarenessHandler: ThreadsAwarenessHandler,
+                             private val lightweightSettingsStorage: LightweightSettingsStorage,
                              private val initialEventId: String?,
                              private val onBuiltEvents: (Boolean) -> Unit) {
 
@@ -88,11 +90,10 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
     private val timelineEventsChangeListener =
             OrderedRealmCollectionChangeListener { results: RealmResults<TimelineEventEntity>, changeSet: OrderedCollectionChangeSet ->
                 Timber.v("on timeline events chunk update")
-                val frozenResults = results.freeze()
-                handleDatabaseChangeSet(frozenResults, changeSet)
+                handleDatabaseChangeSet(results, changeSet)
             }
 
-    private var timelineEventEntities: RealmResults<TimelineEventEntity> = chunkEntity.sortedTimelineEvents()
+    private var timelineEventEntities: RealmResults<TimelineEventEntity> = chunkEntity.sortedTimelineEvents(timelineSettings.rootThreadEventId)
     private val builtEvents: MutableList<TimelineEvent> = Collections.synchronizedList(ArrayList())
     private val builtEventsIndexes: MutableMap<String, Int> = Collections.synchronizedMap(HashMap<String, Int>())
 
@@ -137,13 +138,18 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
         } else if (direction == Timeline.Direction.BACKWARDS && prevChunk != null) {
             return prevChunk?.loadMore(count, direction, fetchOnServerIfNeeded) ?: LoadMoreResult.FAILURE
         }
-        val loadFromStorageCount = loadFromStorage(count, direction)
-        Timber.v("Has loaded $loadFromStorageCount items from storage in $direction")
-        val offsetCount = count - loadFromStorageCount
+        val loadFromStorage = loadFromStorage(count, direction).also {
+            logLoadedFromStorage(it, direction)
+        }
+
+        val offsetCount = count - loadFromStorage.numberOfEvents
+
         return if (direction == Timeline.Direction.FORWARDS && isLastForward.get()) {
             LoadMoreResult.REACHED_END
         } else if (direction == Timeline.Direction.BACKWARDS && isLastBackward.get()) {
             LoadMoreResult.REACHED_END
+        } else if (timelineSettings.isThreadTimeline() && loadFromStorage.threadReachedEnd) {
+            LoadMoreResult.REACHED_END
         } else if (offsetCount == 0) {
             LoadMoreResult.SUCCESS
         } else {
@@ -187,6 +193,16 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
         }
     }
 
+    /**
+     * Simple log that displays the number and timeline of loaded events
+     */
+    private fun logLoadedFromStorage(loadedFromStorage: LoadedFromStorage, direction: Timeline.Direction) {
+        Timber.v("[" +
+                "${if (timelineSettings.isThreadTimeline()) "ThreadTimeLine" else "Timeline"}] Has loaded " +
+                "${loadedFromStorage.numberOfEvents} items from storage in $direction " +
+                if (timelineSettings.isThreadTimeline() && loadedFromStorage.threadReachedEnd) "[Reached End]" else "")
+    }
+
     fun getBuiltEventIndex(eventId: String, searchInNext: Boolean, searchInPrev: Boolean): Int? {
         val builtEventIndex = builtEventsIndexes[eventId]
         if (builtEventIndex != null) {
@@ -267,13 +283,23 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
 
     /**
      * This method tries to read events from the current chunk.
+     * @return the number of events loaded. If we are in a thread timeline it also returns
+     * whether or not we reached the end/root message
      */
-    private suspend fun loadFromStorage(count: Int, direction: Timeline.Direction): Int {
-        val displayIndex = getNextDisplayIndex(direction) ?: return 0
+    private fun loadFromStorage(count: Int, direction: Timeline.Direction): LoadedFromStorage {
+        val displayIndex = getNextDisplayIndex(direction) ?: return LoadedFromStorage()
         val baseQuery = timelineEventEntities.where()
-        val timelineEvents = baseQuery.offsets(direction, count, displayIndex).findAll().orEmpty()
-        if (timelineEvents.isEmpty()) return 0
-        fetchRootThreadEventsIfNeeded(timelineEvents)
+
+        val timelineEvents = baseQuery
+                .offsets(direction, count, displayIndex)
+                .findAll()
+                .orEmpty()
+
+        if (timelineEvents.isEmpty()) return LoadedFromStorage()
+// Disabled due to the new fallback
+//        if(!lightweightSettingsStorage.areThreadMessagesEnabled()) {
+//            fetchRootThreadEventsIfNeeded(timelineEvents)
+//        }
         if (direction == Timeline.Direction.FORWARDS) {
             builtEventsIndexes.entries.forEach { it.setValue(it.value + timelineEvents.size) }
         }
@@ -291,9 +317,20 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
                         builtEvents.add(timelineEvent)
                     }
                 }
-        return timelineEvents.size
+        return LoadedFromStorage(
+                threadReachedEnd = threadReachedEnd(timelineEvents),
+                numberOfEvents = timelineEvents.size)
     }
 
+    /**
+     * Returns whether or not the the thread has reached end. It returns false if the current timeline
+     * is not a thread timeline
+     */
+    private fun threadReachedEnd(timelineEvents: List<TimelineEventEntity>): Boolean =
+            timelineSettings.rootThreadEventId?.let { rootThreadId ->
+                timelineEvents.firstOrNull { it.eventId == rootThreadId }?.let { true }
+            } ?: false
+
     /**
      * This function is responsible to fetch and store the root event of a thread event
      * in order to be able to display the event to the user appropriately
@@ -316,6 +353,10 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
                 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 timelineEvent
     }
 
@@ -343,7 +384,8 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
         val loadMoreResult = try {
             if (token == null) {
                 if (direction == Timeline.Direction.BACKWARDS || !chunkEntity.hasBeenALastForwardChunk()) return LoadMoreResult.REACHED_END
-                val lastKnownEventId = chunkEntity.sortedTimelineEvents().firstOrNull()?.eventId ?: return LoadMoreResult.FAILURE
+                val lastKnownEventId = chunkEntity.sortedTimelineEvents(timelineSettings.rootThreadEventId).firstOrNull()?.eventId
+                        ?: return LoadMoreResult.FAILURE
                 val taskParams = FetchTokenAndPaginateTask.Params(roomId, lastKnownEventId, direction.toPaginationDirection(), count)
                 fetchTokenAndPaginateTask.execute(taskParams).toLoadMoreResult()
             } else {
@@ -352,7 +394,7 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
                 paginationTask.execute(taskParams).toLoadMoreResult()
             }
         } catch (failure: Throwable) {
-            Timber.e("Failed to fetch from server: $failure", failure)
+            Timber.e(failure, "Failed to fetch from server")
             LoadMoreResult.FAILURE
         }
         return if (loadMoreResult == LoadMoreResult.SUCCESS) {
@@ -385,10 +427,10 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
      * This method is responsible for managing insertions and updates of events on this chunk.
      *
      */
-    private fun handleDatabaseChangeSet(frozenResults: RealmResults<TimelineEventEntity>, changeSet: OrderedCollectionChangeSet) {
+    private fun handleDatabaseChangeSet(results: RealmResults<TimelineEventEntity>, changeSet: OrderedCollectionChangeSet) {
         val insertions = changeSet.insertionRanges
         for (range in insertions) {
-            val newItems = frozenResults
+            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) }
@@ -404,7 +446,7 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
         val modifications = changeSet.changeRanges
         for (range in modifications) {
             for (modificationIndex in (range.startIndex until range.startIndex + range.length)) {
-                val updatedEntity = frozenResults[modificationIndex] ?: continue
+                val updatedEntity = results[modificationIndex] ?: continue
                 try {
                     builtEvents[modificationIndex] = updatedEntity.buildAndDecryptIfNeeded()
                 } catch (failure: Throwable) {
@@ -418,17 +460,16 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
     }
 
     private fun getNextDisplayIndex(direction: Timeline.Direction): Int? {
-        val frozenTimelineEvents = timelineEventEntities.freeze()
-        if (frozenTimelineEvents.isEmpty()) {
+        if (timelineEventEntities.isEmpty()) {
             return null
         }
         return if (builtEvents.isEmpty()) {
             if (initialEventId != null) {
-                frozenTimelineEvents.where().equalTo(TimelineEventEntityFields.EVENT_ID, initialEventId).findFirst()?.displayIndex
+                timelineEventEntities.where().equalTo(TimelineEventEntityFields.EVENT_ID, initialEventId).findFirst()?.displayIndex
             } else if (direction == Timeline.Direction.BACKWARDS) {
-                frozenTimelineEvents.first(null)?.displayIndex
+                timelineEventEntities.first(null)?.displayIndex
             } else {
-                frozenTimelineEvents.last(null)?.displayIndex
+                timelineEventEntities.last(null)?.displayIndex
             }
         } else if (direction == Timeline.Direction.FORWARDS) {
             builtEvents.first().displayIndex + 1
@@ -450,10 +491,16 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
                 timelineEventMapper = timelineEventMapper,
                 uiEchoManager = uiEchoManager,
                 threadsAwarenessHandler = threadsAwarenessHandler,
+                lightweightSettingsStorage = lightweightSettingsStorage,
                 initialEventId = null,
                 onBuiltEvents = this.onBuiltEvents
         )
     }
+
+    private data class LoadedFromStorage(
+            val threadReachedEnd: Boolean = false,
+            val numberOfEvents: Int = 0
+    )
 }
 
 private fun RealmQuery<TimelineEventEntity>.offsets(
@@ -474,6 +521,19 @@ private fun Timeline.Direction.toPaginationDirection(): PaginationDirection {
     return if (this == Timeline.Direction.BACKWARDS) PaginationDirection.BACKWARDS else PaginationDirection.FORWARDS
 }
 
-private fun ChunkEntity.sortedTimelineEvents(): RealmResults<TimelineEventEntity> {
-    return timelineEvents.sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)
+private fun ChunkEntity.sortedTimelineEvents(rootThreadEventId: String?): RealmResults<TimelineEventEntity> {
+    return if (rootThreadEventId == null) {
+        timelineEvents
+                .sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)
+    } else {
+        timelineEvents
+                .where()
+                .beginGroup()
+                .equalTo(TimelineEventEntityFields.ROOT.ROOT_THREAD_EVENT_ID, rootThreadEventId)
+                .or()
+                .equalTo(TimelineEventEntityFields.ROOT.EVENT_ID, rootThreadEventId)
+                .endGroup()
+                .sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)
+                .findAll()
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
index 75d02dfd98..49a8a8b55a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
@@ -23,6 +23,8 @@ 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.internal.crypto.NewSessionListener
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.database.lightweight.LightweightSettingsStorage
+import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
@@ -36,7 +38,8 @@ internal class TimelineEventDecryptor @Inject constructor(
         @SessionDatabase
         private val realmConfiguration: RealmConfiguration,
         private val cryptoService: CryptoService,
-        private val threadsAwarenessHandler: ThreadsAwarenessHandler
+        private val threadsAwarenessHandler: ThreadsAwarenessHandler,
+        private val lightweightSettingsStorage: LightweightSettingsStorage
 ) {
 
     private val newSessionListener = object : NewSessionListener {
@@ -101,9 +104,27 @@ internal class TimelineEventDecryptor @Inject constructor(
         }
     }
 
+    private fun threadAwareNonEncryptedEvents(request: DecryptionRequest, realm: Realm) {
+        val event = request.event
+            realm.executeTransaction {
+                val eventId = event.eventId ?: return@executeTransaction
+                val eventEntity = EventEntity
+                        .where(it, eventId = eventId)
+                        .findFirst()
+                val decryptedEvent = eventEntity?.asDomain()
+                threadsAwarenessHandler.makeEventThreadAware(realm, event.roomId, decryptedEvent, eventEntity)
+        }
+    }
     private fun processDecryptRequest(request: DecryptionRequest, realm: Realm) {
         val event = request.event
         val timelineId = request.timelineId
+
+        if (!request.event.isEncrypted()) {
+            // Here we have requested a decryption to an event that is not encrypted
+            // We will simply make this event thread aware
+            threadAwareNonEncryptedEvents(request, realm)
+            return
+        }
         try {
             val result = cryptoService.decryptEvent(request.event, timelineId)
             Timber.v("Successfully decrypted event ${event.eventId}")
@@ -112,15 +133,9 @@ internal class TimelineEventDecryptor @Inject constructor(
                 val eventEntity = EventEntity
                         .where(it, eventId = eventId)
                         .findFirst()
-
-                eventEntity?.apply {
-                    val decryptedPayload = threadsAwarenessHandler.handleIfNeededDuringDecryption(
-                            it,
-                            roomId = event.roomId,
-                            event,
-                            result)
-                    setDecryptionResult(result, decryptedPayload)
-                }
+                eventEntity?.setDecryptionResult(result)
+                val decryptedEvent = eventEntity?.asDomain()
+                threadsAwarenessHandler.makeEventThreadAware(realm, event.roomId, decryptedEvent, eventEntity)
             }
         } catch (e: MXCryptoError) {
             Timber.v("Failed to decrypt event ${event.eventId} : ${e.localizedMessage}")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index a85f0dbdc9..6607e71bd9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -26,8 +26,11 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.internal.database.helper.addIfNecessary
 import org.matrix.android.sdk.internal.database.helper.addStateEvent
 import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
+import org.matrix.android.sdk.internal.database.helper.updateThreadSummaryIfNeeded
+import org.matrix.android.sdk.internal.database.lightweight.LightweightSettingsStorage
 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.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
@@ -36,6 +39,7 @@ import org.matrix.android.sdk.internal.database.query.create
 import org.matrix.android.sdk.internal.database.query.find
 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.StreamEventsManager
 import org.matrix.android.sdk.internal.util.awaitTransaction
 import timber.log.Timber
@@ -45,8 +49,10 @@ import javax.inject.Inject
  * Insert Chunk in DB, and eventually link next and previous chunk in db.
  */
 internal class TokenChunkEventPersistor @Inject constructor(
-        @SessionDatabase private val monarchy: Monarchy,
-        private val liveEventManager: Lazy<StreamEventsManager>) {
+                                                            @SessionDatabase private val monarchy: Monarchy,
+                                                            @UserId private val userId: String,
+                                                            private val lightweightSettingsStorage: LightweightSettingsStorage,
+                                                            private val liveEventManager: Lazy<StreamEventsManager>) {
 
     enum class Result {
         SHOULD_FETCH_MORE,
@@ -90,6 +96,7 @@ internal class TokenChunkEventPersistor @Inject constructor(
                         handlePagination(realm, roomId, direction, receivedChunk, currentChunk)
                     }
                 }
+
         return if (receivedChunk.events.isEmpty()) {
             if (receivedChunk.hasMore()) {
                 Result.SHOULD_FETCH_MORE
@@ -132,6 +139,7 @@ internal class TokenChunkEventPersistor @Inject constructor(
                 roomMemberContentsByUser[stateEvent.stateKey] = stateEvent.content.toModel<RoomMemberContent>()
             }
         }
+        val optimizedThreadSummaryMap = hashMapOf<String, EventEntity>()
         run processTimelineEvents@{
             eventList.forEach { event ->
                 if (event.eventId == null || event.senderId == null) {
@@ -176,10 +184,28 @@ internal class TokenChunkEventPersistor @Inject constructor(
                 }
                 liveEventManager.get().dispatchPaginatedEventReceived(event, roomId)
                 currentChunk.addTimelineEvent(roomId, eventEntity, direction, roomMemberContentsByUser)
+                if (lightweightSettingsStorage.areThreadMessagesEnabled()) {
+                    eventEntity.rootThreadEventId?.let {
+                        // This is a thread event
+                        optimizedThreadSummaryMap[it] = eventEntity
+                    } ?: run {
+                        // This is a normal event or a root thread one
+                        optimizedThreadSummaryMap[eventEntity.eventId] = eventEntity
+                    }
+                }
             }
         }
         if (currentChunk.isValid) {
             RoomEntity.where(realm, roomId).findFirst()?.addIfNecessary(currentChunk)
         }
+
+        if (lightweightSettingsStorage.areThreadMessagesEnabled()) {
+            optimizedThreadSummaryMap.updateThreadSummaryIfNeeded(
+                    roomId = roomId,
+                    realm = realm,
+                    currentUserId = userId,
+                    chunkEntity = currentChunk
+            )
+        }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
index 16d36c0cd9..bb92623249 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
@@ -66,11 +66,11 @@ internal class UIEchoManager(private val listener: Listener) {
         return existingState != sendState
     }
 
-    fun onLocalEchoCreated(timelineEvent: TimelineEvent): Boolean  {
+    fun onLocalEchoCreated(timelineEvent: TimelineEvent): Boolean {
         when (timelineEvent.root.getClearType()) {
             EventType.REDACTION -> {
             }
-            EventType.REACTION -> {
+            EventType.REACTION  -> {
                 val content: ReactionContent? = timelineEvent.root.content?.toModel<ReactionContent>()
                 if (RelationType.ANNOTATION == content?.relatesTo?.type) {
                     val reaction = content.relatesTo.key
@@ -104,8 +104,8 @@ internal class UIEchoManager(private val listener: Listener) {
         val updateReactions = existingAnnotationSummary.reactionsSummary.toMutableList()
 
         contents.forEach { uiEchoReaction ->
-            val existing = updateReactions.firstOrNull { it.key == uiEchoReaction.reaction }
-            if (existing == null) {
+            val indexOfExistingReaction = updateReactions.indexOfFirst { it.key == uiEchoReaction.reaction }
+            if (indexOfExistingReaction == -1) {
                 // just add the new key
                 ReactionAggregatedSummary(
                         key = uiEchoReaction.reaction,
@@ -117,6 +117,7 @@ internal class UIEchoManager(private val listener: Listener) {
                 ).let { updateReactions.add(it) }
             } else {
                 // update Existing Key
+                val existing = updateReactions[indexOfExistingReaction]
                 if (!existing.localEchoEvents.contains(uiEchoReaction.localEchoId)) {
                     updateReactions.remove(existing)
                     // only update if echo is not yet there
@@ -128,7 +129,7 @@ internal class UIEchoManager(private val listener: Listener) {
                             sourceEvents = existing.sourceEvents,
                             localEchoEvents = existing.localEchoEvents + uiEchoReaction.localEchoId
 
-                    ).let { updateReactions.add(it) }
+                    ).let { updateReactions.add(indexOfExistingReaction, it) }
                 }
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index 8de762ee1b..3ba7d11c3d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -19,6 +19,10 @@ package org.matrix.android.sdk.internal.session.search
 import org.matrix.android.sdk.api.session.search.EventAndSender
 import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.internal.database.RealmSessionProvider
+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.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
@@ -28,6 +32,7 @@ import org.matrix.android.sdk.internal.session.search.request.SearchRequestFilte
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestOrder
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestRoomEvents
 import org.matrix.android.sdk.internal.session.search.response.SearchResponse
+import org.matrix.android.sdk.internal.session.search.response.SearchResponseItem
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
@@ -47,7 +52,8 @@ internal interface SearchTask : Task<SearchTask.Params, SearchResult> {
 
 internal class DefaultSearchTask @Inject constructor(
         private val searchAPI: SearchAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        private val realmSessionProvider: RealmSessionProvider
 ) : SearchTask {
 
     override suspend fun execute(params: SearchTask.Params): SearchResult {
@@ -74,12 +80,22 @@ internal class DefaultSearchTask @Inject constructor(
     }
 
     private fun SearchResponse.toDomain(): SearchResult {
+        val localTimelineEvents = findRootThreadEventsFromDB(searchCategories.roomEvents?.results)
         return SearchResult(
                 nextBatch = searchCategories.roomEvents?.nextBatch,
                 highlights = searchCategories.roomEvents?.highlights,
                 results = searchCategories.roomEvents?.results?.map { searchResponseItem ->
+
+                    val localThreadEventDetails = localTimelineEvents
+                            ?.firstOrNull { it.eventId ==  searchResponseItem.event.eventId }
+                            ?.root
+                            ?.asDomain()
+                            ?.threadDetails
+
                     EventAndSender(
-                            searchResponseItem.event,
+                            searchResponseItem.event.apply {
+                                threadDetails = localThreadEventDetails
+                            },
                             searchResponseItem.event.senderId?.let { senderId ->
                                 searchResponseItem.context?.profileInfo?.get(senderId)
                                         ?.let {
@@ -94,4 +110,19 @@ internal class DefaultSearchTask @Inject constructor(
                 }?.reversed()
         )
     }
+
+    /**
+     * Find local events if exists in order to enhance the result with thread summary
+     */
+    private fun findRootThreadEventsFromDB(searchResponseItemList: List<SearchResponseItem>?): List<TimelineEventEntity>? {
+        return realmSessionProvider.withRealm { realm ->
+            searchResponseItemList?.mapNotNull {
+                it.event.roomId ?: return@mapNotNull null
+                it.event.eventId ?: return@mapNotNull null
+                TimelineEventEntity.where(realm, it.event.roomId, it.event.eventId).findFirst()
+            }?.filter {
+                it.root?.isRootThread == true || it.root?.isThread() == true
+            }
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 8589db27b1..303eda49d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -40,10 +40,6 @@ internal class DefaultSpace(
 
     override val spaceId = room.roomId
 
-    override suspend fun leave(reason: String?) {
-        return room.leave(reason)
-    }
-
     override fun spaceSummary(): RoomSummary? {
         return spaceSummaryDataSource.getSpaceSummary(room.roomId)
     }
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 ebd5f2578e..c18055e089 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
@@ -184,6 +184,10 @@ internal class DefaultSpaceService @Inject constructor(
         return joinSpaceTask.execute(JoinSpaceTask.Params(spaceIdOrAlias, reason, viaServers))
     }
 
+    override suspend fun leaveSpace(spaceId: String, reason: String?) {
+        leaveRoomTask.execute(LeaveRoomTask.Params(spaceId, reason))
+    }
+
     override suspend fun rejectInvite(spaceId: String, reason: String?) {
         leaveRoomTask.execute(LeaveRoomTask.Params(spaceId, reason))
     }
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 f178074507..f93da9705d 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
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.api.session.sync.model.RoomsSyncResponse
 import org.matrix.android.sdk.api.session.sync.model.SyncResponse
 import org.matrix.android.sdk.internal.SessionManager
 import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
+import org.matrix.android.sdk.internal.database.lightweight.LightweightSettingsStorage
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
@@ -64,6 +65,7 @@ internal class SyncResponseHandler @Inject constructor(
         private val aggregatorHandler: SyncResponsePostTreatmentAggregatorHandler,
         private val cryptoService: DefaultCryptoService,
         private val tokenStore: SyncTokenStore,
+        private val lightweightSettingsStorage: LightweightSettingsStorage,
         private val processEventForPushTask: ProcessEventForPushTask,
         private val pushRuleService: PushRuleService,
         private val threadsAwarenessHandler: ThreadsAwarenessHandler,
@@ -101,7 +103,10 @@ internal class SyncResponseHandler @Inject constructor(
         val aggregator = SyncResponsePostTreatmentAggregator()
 
         // Prerequisite for thread events handling in RoomSyncHandler
-        threadsAwarenessHandler.fetchRootThreadEventsIfNeeded(syncResponse)
+// Disabled due to the new fallback
+//        if (!lightweightSettingsStorage.areThreadMessagesEnabled()) {
+//            threadsAwarenessHandler.fetchRootThreadEventsIfNeeded(syncResponse)
+//        }
 
         // Start one big transaction
         monarchy.awaitTransaction { realm ->
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 170e8b734b..99e6521eb7 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
@@ -36,10 +36,13 @@ import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 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.updateThreadSummaryIfNeeded
+import org.matrix.android.sdk.internal.database.lightweight.LightweightSettingsStorage
 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.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.RoomMemberSummaryEntity
@@ -81,6 +84,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                                    private val threadsAwarenessHandler: ThreadsAwarenessHandler,
                                                    private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
                                                    @UserId private val userId: String,
+                                                   private val lightweightSettingsStorage: LightweightSettingsStorage,
                                                    private val timelineInput: TimelineInput,
                                                    private val liveEventService: Lazy<StreamEventsManager>) {
 
@@ -363,10 +367,12 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         val eventIds = ArrayList<String>(eventList.size)
         val roomMemberContentsByUser = HashMap<String, RoomMemberContent?>()
 
+        val optimizedThreadSummaryMap = hashMapOf<String, EventEntity>()
         for (event in eventList) {
             if (event.eventId == null || event.senderId == null || event.type == null) {
                 continue
             }
+
             eventIds.add(event.eventId)
             liveEventService.get().dispatchLiveEventReceived(event, roomId, insertType == EventInsertType.INITIAL_SYNC)
 
@@ -375,14 +381,13 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
             if (event.isEncrypted() && !isInitialSync) {
                 decryptIfNeeded(event, roomId)
             }
-
-            threadsAwarenessHandler.handleIfNeeded(
-                    realm = realm,
-                    roomId = roomId,
-                    event = event)
+            var contentToInject: String? = null
+            if (!isInitialSync) {
+                contentToInject = threadsAwarenessHandler.makeEventThreadAware(realm, roomId, event)
+            }
 
             val ageLocalTs = event.unsignedData?.age?.let { syncLocalTimestampMillis - it }
-            val eventEntity = event.toEntity(roomId, SendState.SYNCED, ageLocalTs).copyToRealmOrIgnore(realm, insertType)
+            val eventEntity = event.toEntity(roomId, SendState.SYNCED, ageLocalTs, contentToInject).copyToRealmOrIgnore(realm, insertType)
             if (event.stateKey != null) {
                 CurrentStateEventEntity.getOrCreate(realm, roomId, event.stateKey, event.type).apply {
                     eventId = event.eventId
@@ -402,6 +407,15 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
             }
 
             chunkEntity.addTimelineEvent(roomId, eventEntity, PaginationDirection.FORWARDS, roomMemberContentsByUser)
+            if (lightweightSettingsStorage.areThreadMessagesEnabled()) {
+                eventEntity.rootThreadEventId?.let {
+                    // This is a thread event
+                    optimizedThreadSummaryMap[it] = eventEntity
+                } ?: run {
+                    // This is a normal event or a root thread one
+                    optimizedThreadSummaryMap[eventEntity.eventId] = eventEntity
+                }
+            }
             // Give info to crypto module
             cryptoService.onLiveEvent(roomEntity.roomId, event)
 
@@ -426,9 +440,15 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                 }
             }
         }
-
         // Handle deletion of [stuck] local echos if needed
-         deleteLocalEchosIfNeeded(insertType, roomEntity, eventList)
+        deleteLocalEchosIfNeeded(insertType, roomEntity, eventList)
+        if (lightweightSettingsStorage.areThreadMessagesEnabled()) {
+            optimizedThreadSummaryMap.updateThreadSummaryIfNeeded(
+                    roomId = roomId,
+                    realm = realm,
+                    chunkEntity = chunkEntity,
+                    currentUserId = userId)
+        }
 
         // posting new events to timeline if any is registered
         timelineInput.onNewTimelineEvents(roomId = roomId, eventIds = eventIds)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
index 767a967522..f3a1523955 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
@@ -18,26 +18,35 @@ package org.matrix.android.sdk.internal.session.sync.handler.room
 
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
-import org.matrix.android.sdk.api.session.crypto.CryptoService
-import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import io.realm.kotlin.where
+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
+import org.matrix.android.sdk.api.session.events.model.getRelationContentForType
+import org.matrix.android.sdk.api.session.events.model.getRootThreadEventId
+import org.matrix.android.sdk.api.session.events.model.isSticker
 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.MessageFormat
 import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
 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.send.SendState
 import org.matrix.android.sdk.api.session.sync.model.SyncResponse
 import org.matrix.android.sdk.api.util.JsonDict
-import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
+import org.matrix.android.sdk.internal.database.lightweight.LightweightSettingsStorage
+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.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.database.query.where
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
@@ -52,11 +61,16 @@ import javax.inject.Inject
  */
 internal class ThreadsAwarenessHandler @Inject constructor(
         private val permalinkFactory: PermalinkFactory,
-        private val cryptoService: CryptoService,
         @SessionDatabase private val monarchy: Monarchy,
+        private val lightweightSettingsStorage: LightweightSettingsStorage,
         private val getEventTask: GetEventTask
 ) {
 
+    // This caching is responsible to improve the performance when we receive a root event
+    // to be able to know this event is a root one without checking the DB,
+    // We update the list with all thread root events by checking if there is a m.thread relation on the events
+    private val cacheEventRootId = hashSetOf<String>()
+
     /**
      * Fetch root thread events if they are missing from the local storage
      * @param syncResponse the sync response
@@ -84,7 +98,7 @@ internal class ThreadsAwarenessHandler @Inject constructor(
         if (eventList.isNullOrEmpty()) return
 
         val threadsToFetch = emptyMap<String, String>().toMutableMap()
-        Realm.getInstance(monarchy.realmConfiguration).use {  realm ->
+        Realm.getInstance(monarchy.realmConfiguration).use { realm ->
             eventList.asSequence()
                     .filter {
                         isThreadEvent(it) && it.roomId != null
@@ -139,96 +153,186 @@ internal class ThreadsAwarenessHandler @Inject constructor(
 
     /**
      * Handle events mainly coming from the RoomSyncHandler
+     * @return The content to inject in the roomSyncHandler live events
      */
-    fun handleIfNeeded(realm: Realm,
-                       roomId: String,
-                       event: Event) {
-        val payload = transformThreadToReplyIfNeeded(
-                realm = realm,
-                roomId = roomId,
-                event = event,
-                decryptedResult = event.mxDecryptionResult?.payload) ?: return
-
-        event.mxDecryptionResult = event.mxDecryptionResult?.copy(payload = payload)
-    }
-
-    /**
-     * Handle events while they are being decrypted
-     */
-    fun handleIfNeededDuringDecryption(realm: Realm,
-                                       roomId: String?,
-                                       event: Event,
-                                       result: MXEventDecryptionResult): JsonDict? {
-        return transformThreadToReplyIfNeeded(
-                realm = realm,
-                roomId = roomId,
-                event = event,
-                decryptedResult = result.clearEvent)
-    }
-
-    /**
-     * If the event is a thread event then transform/enhance it to a visual Reply Event,
-     * If the event is not a thread event, null value will be returned
-     * If there is an error (ex. the root/origin thread event is not found), null willl be returend
-     */
-    private fun transformThreadToReplyIfNeeded(realm: Realm, roomId: String?, event: Event, decryptedResult: JsonDict?): JsonDict? {
+    fun makeEventThreadAware(realm: Realm,
+                             roomId: String?,
+                             event: Event?,
+                             eventEntity: EventEntity? = null): String? {
+        event ?: return null
         roomId ?: return null
+        if (lightweightSettingsStorage.areThreadMessagesEnabled()) return null
+        handleRootThreadEventsIfNeeded(realm, roomId, eventEntity, event)
         if (!isThreadEvent(event)) return null
-        val rootThreadEventId = getRootThreadEventId(event) ?: return null
-        val payload = decryptedResult?.toMutableMap() ?: return null
-        val body = getValueFromPayload(payload, "body") ?: return null
-        val msgType = getValueFromPayload(payload, "msgtype") ?: return null
-        val rootThreadEvent = getEventFromDB(realm, rootThreadEventId) ?: return null
-        val rootThreadEventSenderId = rootThreadEvent.senderId ?: return null
+        val eventPayload = if (!event.isEncrypted()) {
+            event.content?.toMutableMap() ?: return null
+        } else {
+            event.mxDecryptionResult?.payload?.toMutableMap() ?: return null
+        }
+        val eventBody = event.getDecryptedTextSummary() ?: return null
+        val eventIdToInject = getPreviousEventOrRoot(event) ?: run {
+            return@makeEventThreadAware injectFallbackIndicator(event, eventBody, eventEntity, eventPayload)
+        }
+        val eventToInject = getEventFromDB(realm, eventIdToInject)
+        val eventToInjectBody = eventToInject?.getDecryptedTextSummary()
+        var contentForNonEncrypted: String?
+        if (eventToInject != null && eventToInjectBody != null) {
+            // If the event to inject exists and is decrypted
+            // Inject it to our event
+            val messageTextContent = injectEvent(
+                    roomId = roomId,
+                    eventBody = eventBody,
+                    eventToInject = eventToInject,
+                    eventToInjectBody = eventToInjectBody) ?: return null
+            // update the event
+            contentForNonEncrypted = updateEventEntity(event, eventEntity, eventPayload, messageTextContent)
+        } else {
+            contentForNonEncrypted = injectFallbackIndicator(event, eventBody, eventEntity, eventPayload)
+        }
 
-        decryptIfNeeded(rootThreadEvent, roomId)
+        // Now lets try to find relations for improved results, while some events may come with reverse order
+        eventEntity?.let {
+            // When eventEntity is not null means that we are not from within roomSyncHandler
+            handleEventsThatRelatesTo(realm, roomId, event, eventBody, false)
+        }
+        return contentForNonEncrypted
+    }
 
-        val rootThreadEventBody = getValueFromPayload(rootThreadEvent.mxDecryptionResult?.payload?.toMutableMap(), "body")
+    /**
+     * Handle for not thread events that we have marked them as root.
+     * Find relations and inject them accordingly
+     * @param eventEntity the current eventEntity received
+     * @param event the current event received
+     * @return The content to inject in the roomSyncHandler live events
+     */
+    private fun handleRootThreadEventsIfNeeded(realm: Realm, roomId: String, eventEntity: EventEntity?, event: Event): String? {
+        if (!isThreadEvent(event) && cacheEventRootId.contains(eventEntity?.eventId)) {
+            eventEntity?.let {
+                val eventBody = event.getDecryptedTextSummary() ?: return null
+                return handleEventsThatRelatesTo(realm, roomId, event, eventBody, true)
+            }
+        }
+        return null
+    }
 
-        val permalink = permalinkFactory.createPermalink(roomId, rootThreadEventId, false)
-        val userLink = permalinkFactory.createPermalink(rootThreadEventSenderId, false) ?: ""
+    /**
+     * This function is responsible to check if there is any event that relates to our current event
+     * This is useful when we receive an event that relates to a missing parent, so when later we receive the parent
+     * we can update the child as well
+     * @param event the current event that we examine
+     * @param eventBody the current body of the event
+     * @param isFromCache determines whether or not we already know this is root thread event
+     * @return The content to inject in the roomSyncHandler live events
+     */
+    private fun handleEventsThatRelatesTo(realm: Realm, roomId: String, event: Event, eventBody: String, isFromCache: Boolean): String? {
+        event.eventId ?: return null
+        val rootThreadEventId = if (isFromCache) event.eventId else event.getRootThreadEventId() ?: return null
+        eventThatRelatesTo(realm, event.eventId, rootThreadEventId)?.forEach { eventEntityFound ->
+            val newEventFound = eventEntityFound.asDomain()
+            val newEventBody = newEventFound.getDecryptedTextSummary() ?: return null
+            val newEventPayload = newEventFound.mxDecryptionResult?.payload?.toMutableMap() ?: return null
 
+            val messageTextContent = injectEvent(
+                    roomId = roomId,
+                    eventBody = newEventBody,
+                    eventToInject = event,
+                    eventToInjectBody = eventBody) ?: return null
+
+            return updateEventEntity(newEventFound, eventEntityFound, newEventPayload, messageTextContent)
+        }
+        return null
+    }
+
+    /**
+     * Actual update the eventEntity with the new payload
+     * @return the content to inject when this is executed by RoomSyncHandler
+     */
+    private fun updateEventEntity(event: Event,
+                                  eventEntity: EventEntity?,
+                                  eventPayload: MutableMap<String, Any>,
+                                  messageTextContent: Content): String? {
+        eventPayload["content"] = messageTextContent
+
+        if (event.isEncrypted()) {
+            if (event.isSticker()) {
+                eventPayload["type"] = EventType.MESSAGE
+            }
+            event.mxDecryptionResult = event.mxDecryptionResult?.copy(payload = eventPayload)
+            eventEntity?.decryptionResultJson = event.mxDecryptionResult?.let {
+                MoshiProvider.providesMoshi().adapter(OlmDecryptionResult::class.java).toJson(it)
+            }
+        } else {
+            if (event.type == EventType.STICKER) {
+                eventEntity?.type = EventType.MESSAGE
+            }
+            eventEntity?.content = ContentMapper.map(messageTextContent)
+            return ContentMapper.map(messageTextContent)
+        }
+        return null
+    }
+
+    /**
+     * Injecting $eventToInject decrypted content as a reply to $event
+     * @param eventToInject the event that will inject
+     * @param eventBody the actual event body
+     * @return The final content with the injected event
+     */
+    private fun injectEvent(roomId: String,
+                            eventBody: String,
+                            eventToInject: Event,
+                            eventToInjectBody: String): Content? {
+        val eventToInjectId = eventToInject.eventId ?: return null
+        val eventIdToInjectSenderId = eventToInject.senderId.orEmpty()
+        val permalink = permalinkFactory.createPermalink(roomId, eventToInjectId, false)
+        val userLink = permalinkFactory.createPermalink(eventIdToInjectSenderId, false) ?: ""
         val replyFormatted = LocalEchoEventFactory.REPLY_PATTERN.format(
                 permalink,
                 userLink,
-                rootThreadEventSenderId,
-                // Remove inner mx_reply tags if any
-                rootThreadEventBody,
-                body)
+                eventIdToInjectSenderId,
+                eventToInjectBody,
+                eventBody)
 
-        val messageTextContent = MessageTextContent(
-                msgType = msgType,
+        return MessageTextContent(
+                msgType = MessageType.MSGTYPE_TEXT,
                 format = MessageFormat.FORMAT_MATRIX_HTML,
-                body = body,
+                body = eventBody,
                 formattedBody = replyFormatted
         ).toContent()
-
-        payload["content"] = messageTextContent
-
-        return payload
     }
 
     /**
-     * Decrypt the event
+     * Integrate fallback Quote reply
      */
+    private fun injectFallbackIndicator(event: Event,
+                                        eventBody: String,
+                                        eventEntity: EventEntity?,
+                                        eventPayload: MutableMap<String, Any>): String? {
+        val replyFormatted = LocalEchoEventFactory.QUOTE_PATTERN.format(
+                "In reply to a thread",
+                eventBody)
 
-    private fun decryptIfNeeded(event: Event, roomId: String) {
-        try {
-            if (!event.isEncrypted() || event.mxDecryptionResult != null) return
+        val messageTextContent = MessageTextContent(
+                msgType = MessageType.MSGTYPE_TEXT,
+                format = MessageFormat.FORMAT_MATRIX_HTML,
+                body = eventBody,
+                formattedBody = replyFormatted
+        ).toContent()
 
-            // Event from sync does not have roomId, so add it to the event first
-            val result = cryptoService.decryptEvent(event.copy(roomId = roomId), "")
-            event.mxDecryptionResult = OlmDecryptionResult(
-                    payload = result.clearEvent,
-                    senderKey = result.senderCurve25519Key,
-                    keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
-                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
-            )
-        } catch (e: MXCryptoError) {
-            if (e is MXCryptoError.Base) {
-                event.mCryptoError = e.errorType
-                event.mCryptoErrorReason = e.technicalMessage.takeIf { it.isNotEmpty() } ?: e.detailedErrorDescription
-            }
+        return updateEventEntity(event, eventEntity, eventPayload, messageTextContent)
+    }
+
+    private fun eventThatRelatesTo(realm: Realm, currentEventId: String, rootThreadEventId: String): List<EventEntity>? {
+        val threadList = realm.where<EventEntity>()
+                .beginGroup()
+                .equalTo(EventEntityFields.ROOT_THREAD_EVENT_ID, rootThreadEventId)
+                .or()
+                .equalTo(EventEntityFields.EVENT_ID, rootThreadEventId)
+                .endGroup()
+                .and()
+                .findAll()
+        cacheEventRootId.add(rootThreadEventId)
+        return threadList.filter {
+            it.asDomain().getRelationContentForType(RelationType.IO_THREAD)?.inReplyTo?.eventId == currentEventId
         }
     }
 
@@ -246,7 +350,7 @@ internal class ThreadsAwarenessHandler @Inject constructor(
      * @param event
      */
     private fun isThreadEvent(event: Event): Boolean =
-            event.content.toModel<MessageRelationContent>()?.relatesTo?.type == RelationType.THREAD
+            event.content.toModel<MessageRelationContent>()?.relatesTo?.type == RelationType.IO_THREAD
 
     /**
      * Returns the root thread eventId or null otherwise
@@ -255,6 +359,9 @@ internal class ThreadsAwarenessHandler @Inject constructor(
     private fun getRootThreadEventId(event: Event): String? =
             event.content.toModel<MessageRelationContent>()?.relatesTo?.eventId
 
+    private fun getPreviousEventOrRoot(event: Event): String? =
+            event.content.toModel<MessageRelationContent>()?.relatesTo?.inReplyTo?.eventId
+
     @Suppress("UNCHECKED_CAST")
     private fun getValueFromPayload(payload: JsonDict?, key: String): String? {
         val content = payload?.get("content") as? JsonDict
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
index 0ecf91f6fa..97ae9b3a68 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
@@ -192,12 +192,14 @@ abstract class SyncService : Service() {
         }
     }
 
+    abstract fun provideMatrix(): Matrix
+
     private fun initialize(intent: Intent?): Boolean {
         if (intent == null) {
             Timber.d("## Sync: initialize intent is null")
             return false
         }
-        val matrix = Matrix.getInstance(applicationContext)
+        val matrix = provideMatrix()
         val safeSessionId = intent.getStringExtra(EXTRA_SESSION_ID) ?: return false
         syncTimeoutSeconds = intent.getIntExtra(EXTRA_TIMEOUT_SECONDS, getDefaultSyncTimeoutSeconds())
         syncDelaySeconds = intent.getIntExtra(EXTRA_DELAY_SECONDS, getDefaultSyncDelaySeconds())
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
new file mode 100644
index 0000000000..15e82f3cc0
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.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.util.database
+
+import io.realm.DynamicRealm
+import io.realm.RealmObjectSchema
+import timber.log.Timber
+
+abstract class RealmMigrator(private val realm: DynamicRealm,
+                             private val targetSchemaVersion: Int) {
+    fun perform() {
+        Timber.d("Migrate ${realm.configuration.realmFileName} to $targetSchemaVersion")
+        doMigrate(realm)
+    }
+
+    abstract fun doMigrate(realm: DynamicRealm)
+
+    protected fun RealmObjectSchema.addFieldIfNotExists(fieldName: String, fieldType: Class<*>): RealmObjectSchema {
+        if (!hasField(fieldName)) {
+            addField(fieldName, fieldType)
+        }
+        return this
+    }
+
+    protected fun RealmObjectSchema.removeFieldIfExists(fieldName: String): RealmObjectSchema {
+        if (hasField(fieldName)) {
+            removeField(fieldName)
+        }
+        return this
+    }
+
+    protected fun RealmObjectSchema.setRequiredIfNotAlready(fieldName: String, isRequired: Boolean): RealmObjectSchema {
+        if (isRequired != isRequired(fieldName)) {
+            setRequired(fieldName, isRequired)
+        }
+        return this
+    }
+}
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
old mode 100644
new mode 100755
diff --git a/tools/check/forbidden_strings_in_layout.txt b/tools/check/forbidden_strings_in_layout.txt
old mode 100644
new mode 100755
index 545983f844..e46aa3a0bb
--- a/tools/check/forbidden_strings_in_layout.txt
+++ b/tools/check/forbidden_strings_in_layout.txt
@@ -24,7 +24,7 @@
 # Extension:xml
 
 ### Use style="@style/Widget.Vector.TextView.*" instead of textSize attribute
-android:textSize===9
+android:textSize===11
 
 ### Use `@id` and not `@+id` when referencing ids in layouts
 layout_(.*)="@\+id
diff --git a/tools/emojis/emoji_picker_datasource_formatted.json b/tools/emojis/emoji_picker_datasource_formatted.json
index 341cdc0c54..c1aa590003 100644
--- a/tools/emojis/emoji_picker_datasource_formatted.json
+++ b/tools/emojis/emoji_picker_datasource_formatted.json
@@ -2475,9 +2475,11 @@
             "b": "1F636-200D-1F32B-FE0F",
             "j": [
                 "absentminded",
-                "face in clouds",
                 "face in the fog",
-                "head in clouds"
+                "head in clouds",
+                "shower",
+                "steam",
+                "dream"
             ]
         },
         "smirking-face": {
@@ -2536,12 +2538,14 @@
             "b": "1F62E-200D-1F4A8",
             "j": [
                 "exhale",
-                "face exhaling",
                 "gasp",
                 "groan",
                 "relief",
                 "whisper",
-                "whistle"
+                "whistle",
+                "relieve",
+                "tired",
+                "sigh"
             ]
         },
         "lying-face": {
@@ -2745,11 +2749,15 @@
             "b": "1F635-200D-1F4AB",
             "j": [
                 "dizzy",
-                "face with spiral eyes",
                 "hypnotized",
                 "spiral",
                 "trouble",
-                "whoa"
+                "whoa",
+                "sick",
+                "ill",
+                "confused",
+                "nauseous",
+                "nausea"
             ]
         },
         "exploding-head": {
@@ -3704,10 +3712,11 @@
             "j": [
                 "burn",
                 "heart",
-                "heart on fire",
                 "love",
                 "lust",
-                "sacred heart"
+                "sacred heart",
+                "passionate",
+                "enthusiastic"
             ]
         },
         "mending-heart": {
@@ -3717,10 +3726,12 @@
                 "healthier",
                 "improving",
                 "mending",
-                "mending heart",
                 "recovering",
                 "recuperating",
-                "well"
+                "well",
+                "broken heart",
+                "bandage",
+                "wounded"
             ]
         },
         "red-heart": {
@@ -4748,7 +4759,8 @@
             "j": [
                 "beard",
                 "man",
-                "man: beard"
+                "man: beard",
+                "facial hair"
             ]
         },
         "woman-beard": {
@@ -4757,7 +4769,8 @@
             "j": [
                 "beard",
                 "woman",
-                "woman: beard"
+                "woman: beard",
+                "facial hair"
             ]
         },
         "man-red-hair": {
diff --git a/vector/build.gradle b/vector/build.gradle
index 8792f526d4..91a6319975 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,11 +14,11 @@ kapt {
 
 // Note: 2 digits max for each value
 ext.versionMajor = 1
-ext.versionMinor = 3
+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 = 18
+ext.versionPatch = 2
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -153,6 +153,9 @@ android {
         //  This *must* only be set in trusted environments.
         buildConfigField "Boolean", "handleCallAssertedIdentityEvents", "false"
 
+        // Indicates whether or not threading support is enabled
+        buildConfigField "Boolean", "THREADING_ENABLED", "${isThreadingEnabled}"
+
         buildConfigField "Boolean", "enableLocationSharing", "true"
         buildConfigField "String", "mapTilerKey", "\"fU3vlMsMn4Jb6dnEIFsx\""
 
@@ -373,7 +376,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.42'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.43'
 
     // FlowBinding
     implementation libs.github.flowBinding
@@ -443,7 +446,7 @@ dependencies {
 
     implementation libs.github.glide
     kapt libs.github.glideCompiler
-    implementation 'com.github.yalantis:ucrop:2.2.7'
+    implementation 'com.github.yalantis:ucrop:2.2.8'
 
     // Badge for compatibility
     implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
index fb7b9dcb41..69fe63fb7b 100644
--- a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
@@ -38,7 +38,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 androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.core.utils.getMatrixInstance
 import im.vector.app.features.MainActivity
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.home.HomeActivity
@@ -47,7 +47,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.session.Session
 
 @RunWith(AndroidJUnit4::class)
@@ -61,8 +60,7 @@ class SecurityBootstrapTest : VerificationTestBase() {
 
     @Before
     fun createSessionWithCrossSigning() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        val matrix = Matrix.getInstance(context)
+        val matrix = getMatrixInstance()
         val userName = "foobar_${System.currentTimeMillis()}"
         existingSession = createAccountAndSync(matrix, userName, password, true)
         stubAllExternalIntents()
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
index 982a421425..c82b543a08 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
@@ -33,7 +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 androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.core.utils.getMatrixInstance
 import im.vector.app.features.MainActivity
 import im.vector.app.features.home.HomeActivity
 import org.hamcrest.CoreMatchers.not
@@ -41,7 +41,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-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
@@ -66,8 +65,7 @@ class VerifySessionInteractiveTest : VerificationTestBase() {
 
     @Before
     fun createSessionWithCrossSigning() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        val matrix = Matrix.getInstance(context)
+        val matrix = getMatrixInstance()
         val userName = "foobar_${System.currentTimeMillis()}"
         existingSession = createAccountAndSync(matrix, userName, password, true)
         doSync<Unit> {
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
index c51ff29669..80d8315a0e 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
@@ -34,6 +34,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.getMatrixInstance
 import im.vector.app.features.MainActivity
 import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
 import im.vector.app.features.crypto.recover.BootstrapCrossSigningTask
@@ -45,7 +46,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-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
@@ -67,7 +67,7 @@ class VerifySessionPassphraseTest : VerificationTestBase() {
     @Before
     fun createSessionWithCrossSigningAnd4S() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
-        val matrix = Matrix.getInstance(context)
+        val matrix = getMatrixInstance()
         val userName = "foobar_${System.currentTimeMillis()}"
         existingSession = createAccountAndSync(matrix, userName, password, true)
         doSync<Unit> {
@@ -90,7 +90,7 @@ class VerifySessionPassphraseTest : VerificationTestBase() {
 
         runBlocking {
             task.execute(Params(
-                    userInteractiveAuthInterceptor =  object : UserInteractiveAuthInterceptor {
+                    userInteractiveAuthInterceptor = object : UserInteractiveAuthInterceptor {
                         override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                             promise.resume(
                                     UserPasswordAuth(
diff --git a/vector/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt b/vector/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt
new file mode 100644
index 0000000000..322f5fa23d
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.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.core.utils
+
+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
+
+fun getMatrixInstance(): Matrix {
+    val context = InstrumentationRegistry.getInstrumentation().targetContext
+    val configuration = MatrixConfiguration(
+            roomDisplayNameFallbackProvider = VectorRoomDisplayNameFallbackProvider(context)
+    )
+    return Matrix.createInstance(context, configuration)
+}
diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt b/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
index 2e329ebb6b..2939dcf4e0 100644
--- a/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
+++ b/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
@@ -40,7 +40,7 @@ private val deviceLanguage = Locale.getDefault().language
 
 class ScreenshotFailureRule : TestWatcher() {
     override fun failed(e: Throwable?, description: Description) {
-        val screenShotName = "$deviceLanguage-${description.methodName}-${SimpleDateFormat("EEE-MMMM-dd-HH:mm:ss").format(Date())}"
+        val screenShotName = "$deviceLanguage-${description.methodName}-${SimpleDateFormat("EEE-MMMM-dd-HHmmss").format(Date())}"
         val bitmap = getInstrumentation().uiAutomation.takeScreenshot()
         storeFailureScreenshot(bitmap, screenShotName)
     }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index d625cf0390..417d28d625 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -16,10 +16,12 @@
 
 package im.vector.app.ui
 
+import android.Manifest
 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.rule.GrantPermissionRule
 import im.vector.app.R
 import im.vector.app.espresso.tools.ScreenshotFailureRule
 import im.vector.app.features.MainActivity
@@ -43,6 +45,7 @@ class UiAllScreensSanityTest {
     @get:Rule
     val testRule = RuleChain
             .outerRule(ActivityScenarioRule(MainActivity::class.java))
+            .around(GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE))
             .around(ScreenshotFailureRule())
 
     private val elementRobot = ElementRobot()
@@ -94,6 +97,30 @@ class UiAllScreensSanityTest {
             }
         }
 
+        elementRobot.space {
+            createSpace {
+                crawl()
+            }
+            val spaceName = UUID.randomUUID().toString()
+            createSpace {
+                createPublicSpace(spaceName)
+            }
+
+            spaceMenu(spaceName) {
+                spaceMembers()
+                spaceSettings {
+                    crawl()
+                }
+                exploreRooms()
+
+                invitePeople().also { openMenu(spaceName) }
+                addRoom().also { openMenu(spaceName) }
+                addSpace().also { openMenu(spaceName) }
+
+                leaveSpace()
+            }
+        }
+
         elementRobot.withDeveloperMode {
             settings {
                 advancedSettings { crawlDeveloperOptions() }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
index d7e99c63dd..f0ce23b7db 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
@@ -35,6 +35,7 @@ import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.onboarding.OnboardingActivity
 import im.vector.app.initialSyncIdlingResource
 import im.vector.app.ui.robot.settings.SettingsRobot
+import im.vector.app.ui.robot.space.SpaceRobot
 import im.vector.app.withIdlingResource
 import timber.log.Timber
 
@@ -145,7 +146,11 @@ class ElementRobot {
             assertDisplayed(R.string.are_you_sure)
             clickOn(R.string.action_skip)
             waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
-        }.onFailure { Timber.w("Verification popup missing", it) }
+        }.onFailure { Timber.w(it, "Verification popup missing") }
+    }
+
+    fun space(block: SpaceRobot.() -> Unit) {
+        block(SpaceRobot())
     }
 }
 
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
index 47bf31355c..b3bb5172e8 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
@@ -40,8 +40,11 @@ class OnboardingRobot {
 
     private fun crawlGetStarted() {
         clickOn(R.id.loginSplashSubmit)
+        assertDisplayed(R.id.useCaseHeaderTitle, R.string.ftue_auth_use_case_title)
+        clickOn(R.id.useCaseOptionOne)
         OnboardingServersRobot().crawlSignUp()
         pressBack()
+        pressBack()
     }
 
     private fun crawlAlreadyHaveAccount() {
@@ -66,6 +69,7 @@ class OnboardingRobot {
         assertDisplayed(R.id.loginSplashSubmit, R.string.login_splash_create_account)
         if (createAccount) {
             clickOn(R.id.loginSplashSubmit)
+            clickOn(R.id.useCaseOptionOne)
         } else {
             clickOn(R.id.loginSplashAlreadyHaveAccount)
         }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
index da57b105d7..6cf6ad3551 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
@@ -60,8 +60,6 @@ class RoomDetailRobot {
         pressBack()
         clickMenu(R.id.video_call)
         pressBack()
-        clickMenu(R.id.search)
-        pressBack()
     }
 
     fun crawlMessage(message: String) {
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt
new file mode 100644
index 0000000000..68e5fa5059
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.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.ui.robot.space
+
+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.action.ViewActions.click
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.withId
+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.spaces.manage.SpaceManageActivity
+import java.util.UUID
+
+class SpaceCreateRobot {
+
+    fun crawl() {
+        // public
+        clickOn(R.id.publicButton)
+        waitUntilViewVisible(withId(R.id.recyclerView))
+        onView(ViewMatchers.withHint(R.string.create_room_name_hint)).perform(ViewActions.replaceText(UUID.randomUUID().toString()))
+        clickOn(R.id.nextButton)
+        waitUntilViewVisible(withId(R.id.recyclerView))
+        pressBack()
+        pressBack()
+
+        // private
+        clickOn(R.id.privateButton)
+        waitUntilViewVisible(withId(R.id.recyclerView))
+        clickOn(R.id.nextButton)
+
+        waitUntilViewVisible(withId(R.id.teammatesButton))
+        // me and teammates
+        clickOn(R.id.teammatesButton)
+        waitUntilViewVisible(withId(R.id.recyclerView))
+        clickOn(R.id.nextButton)
+        pressBack()
+        pressBack()
+
+        // just me
+        waitUntilViewVisible(withId(R.id.justMeButton))
+        clickOn(R.id.justMeButton)
+        waitUntilActivityVisible<SpaceManageActivity> {
+            waitUntilViewVisible(withId(R.id.roomList))
+        }
+
+        onView(withId(R.id.roomList))
+                .perform(
+                        RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                ViewMatchers.hasDescendant(withText(R.string.room_displayname_empty_room)),
+                                click()
+                        ).atPosition(0)
+                )
+        clickOn(R.id.spaceAddRoomSaveItem)
+        waitUntilActivityVisible<HomeActivity> {
+            waitUntilViewVisible(withId(R.id.roomListContainer))
+        }
+    }
+
+    fun createPublicSpace(spaceName: String) {
+        clickOn(R.id.publicButton)
+        waitUntilViewVisible(withId(R.id.recyclerView))
+        onView(ViewMatchers.withHint(R.string.create_room_name_hint)).perform(ViewActions.replaceText(spaceName))
+        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))
+        // close room
+        pressBack()
+        waitUntilViewVisible(withId(R.id.roomListContainer))
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt
new file mode 100644
index 0000000000..431df396d0
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.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.ui.robot.space
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.Espresso.onView
+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.internal.viewaction.ClickChildAction
+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.invite.InviteUsersToRoomActivity
+import im.vector.app.features.roomprofile.RoomProfileActivity
+import im.vector.app.features.spaces.SpaceExploreActivity
+import im.vector.app.features.spaces.leave.SpaceLeaveAdvancedActivity
+import im.vector.app.features.spaces.manage.SpaceManageActivity
+import org.hamcrest.Matchers
+
+class SpaceMenuRobot {
+
+    fun openMenu(spaceName: String) {
+        waitUntilViewVisible(ViewMatchers.withId(R.id.groupListView))
+        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 invitePeople() = apply {
+        clickOn(R.id.invitePeople)
+        waitUntilDialogVisible(ViewMatchers.withId(R.id.inviteByMxidButton))
+        clickOn(R.id.inviteByMxidButton)
+        waitUntilActivityVisible<InviteUsersToRoomActivity> {
+            waitUntilViewVisible(ViewMatchers.withId(R.id.userListRecyclerView))
+        }
+        // close keyboard
+        Espresso.pressBack()
+        // close invite view
+        Espresso.pressBack()
+    }
+
+    fun spaceMembers() {
+        clickOn(R.id.showMemberList)
+        waitUntilActivityVisible<RoomProfileActivity> {
+            waitUntilViewVisible(ViewMatchers.withId(R.id.roomSettingsRecyclerView))
+        }
+        Espresso.pressBack()
+    }
+
+    fun spaceSettings(block: SpaceSettingsRobot.() -> Unit) {
+        clickOn(R.id.spaceSettings)
+        waitUntilActivityVisible<SpaceManageActivity> {
+            waitUntilViewVisible(ViewMatchers.withId(R.id.roomSettingsRecyclerView))
+        }
+        block(SpaceSettingsRobot())
+    }
+
+    fun exploreRooms() {
+        clickOn(R.id.exploreRooms)
+        waitUntilActivityVisible<SpaceExploreActivity> {
+            waitUntilViewVisible(ViewMatchers.withId(R.id.spaceDirectoryList))
+        }
+        Espresso.pressBack()
+    }
+
+    fun addRoom() = apply {
+        clickOn(R.id.addRooms)
+        waitUntilActivityVisible<SpaceManageActivity> {
+            waitUntilViewVisible(ViewMatchers.withId(R.id.roomList))
+        }
+        Espresso.pressBack()
+    }
+
+    fun addSpace() = apply {
+        clickOn(R.id.addSpaces)
+        waitUntilActivityVisible<SpaceManageActivity> {
+            waitUntilViewVisible(ViewMatchers.withId(R.id.roomList))
+        }
+        Espresso.pressBack()
+    }
+
+    fun leaveSpace() {
+        clickOn(R.id.leaveSpace)
+        waitUntilDialogVisible(ViewMatchers.withId(R.id.leaveButton))
+        clickOn(R.id.leave_selected)
+        waitUntilActivityVisible<SpaceLeaveAdvancedActivity> {
+            waitUntilViewVisible(ViewMatchers.withId(R.id.roomList))
+        }
+        clickOn(R.id.spaceLeaveButton)
+        waitUntilViewVisible(ViewMatchers.withId(R.id.groupListView))
+    }
+}
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
new file mode 100644
index 0000000000..ffb3c24051
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.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.ui.robot.space
+
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaDrawerInteractions.openDrawer
+import im.vector.app.R
+
+class SpaceRobot {
+
+    fun createSpace(block: SpaceCreateRobot.() -> Unit) {
+        openDrawer()
+        clickOn(R.string.add_space)
+        block(SpaceCreateRobot())
+    }
+
+    fun spaceMenu(spaceName: String, block: SpaceMenuRobot.() -> Unit) {
+        openDrawer()
+        with(SpaceMenuRobot()) {
+            openMenu(spaceName)
+            block()
+        }
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt
new file mode 100644
index 0000000000..dcd003da98
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.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.ui.robot.space
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import im.vector.app.R
+import im.vector.app.espresso.tools.waitUntilActivityVisible
+import im.vector.app.espresso.tools.waitUntilViewVisible
+import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleActivity
+
+class SpaceSettingsRobot {
+    fun crawl() {
+        Espresso.onView(ViewMatchers.withId(R.id.roomSettingsRecyclerView))
+                .perform(
+                        RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                ViewMatchers.hasDescendant(ViewMatchers.withText(R.string.room_settings_space_access_title)),
+                                ViewActions.click()
+                        )
+                )
+
+        waitUntilActivityVisible<RoomJoinRuleActivity> {
+            waitUntilViewVisible(ViewMatchers.withId(R.id.genericRecyclerView))
+        }
+
+        Espresso.pressBack()
+
+        Espresso.onView(ViewMatchers.withId(R.id.roomSettingsRecyclerView))
+                .perform(
+                        RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                ViewMatchers.hasDescendant(ViewMatchers.withText(R.string.space_settings_manage_rooms)),
+                                ViewActions.click()
+                        )
+                )
+
+        waitUntilViewVisible(ViewMatchers.withId(R.id.roomList))
+        Espresso.pressBack()
+
+        Espresso.onView(ViewMatchers.withId(R.id.roomSettingsRecyclerView))
+                .perform(
+                        RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                ViewMatchers.hasDescendant(ViewMatchers.withText(R.string.space_settings_permissions_title)),
+                                ViewActions.click()
+                        )
+                )
+
+        waitUntilViewVisible(ViewMatchers.withId(R.id.roomSettingsRecyclerView))
+        Espresso.pressBack()
+        Espresso.pressBack()
+    }
+}
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index fdec5337ba..2e5412870f 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -175,6 +175,8 @@
         <activity android:name=".features.roomdirectory.RoomDirectoryActivity" />
         <activity android:name=".features.roomdirectory.roompreview.RoomPreviewActivity" />
         <activity android:name=".features.home.room.filtered.FilteredRoomsActivity" />
+        <activity android:name=".features.home.room.threads.ThreadsActivity" />
+
         <activity
             android:name=".features.home.room.detail.RoomDetailActivity"
             android:parentActivityName=".features.home.HomeActivity">
diff --git a/vector/src/main/java/im/vector/app/AutoRageShaker.kt b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
index 0238931e4c..43283254b1 100644
--- a/vector/src/main/java/im/vector/app/AutoRageShaker.kt
+++ b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app
 
-import android.content.Context
 import android.content.SharedPreferences
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.features.rageshake.BugReporter
@@ -46,7 +45,6 @@ class AutoRageShaker @Inject constructor(
         private val sessionDataSource: ActiveSessionDataSource,
         private val activeSessionHolder: ActiveSessionHolder,
         private val bugReporter: BugReporter,
-        private val context: Context,
         private val vectorPreferences: VectorPreferences
 ) : Session.Listener, SharedPreferences.OnSharedPreferenceChangeListener {
 
@@ -136,7 +134,6 @@ class AutoRageShaker @Inject constructor(
 
     private fun sendRageShake(target: E2EMessageDetected) {
         bugReporter.sendBugReport(
-                context = context,
                 reportType = ReportType.AUTO_UISI,
                 withDevicesLogs = true,
                 withCrashLogs = true,
@@ -218,7 +215,6 @@ class AutoRageShaker @Inject constructor(
         val matchingIssue = event.content?.get("recipient_rageshake")?.toString() ?: ""
 
         bugReporter.sendBugReport(
-                context = context,
                 reportType = ReportType.AUTO_UISI_SENDER,
                 withDevicesLogs = true,
                 withCrashLogs = true,
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index d252b5d9bd..a3f4ffcfcd 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -55,7 +55,6 @@ import im.vector.app.features.pin.PinLocker
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.rageshake.VectorFileLogger
 import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.app.features.room.VectorRoomDisplayNameFallbackProvider
 import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.themes.ThemeUtils
@@ -63,7 +62,6 @@ import im.vector.app.features.version.VersionProvider
 import im.vector.app.push.fcm.FcmHelper
 import org.jitsi.meet.sdk.log.JitsiMeetDefaultLogHandler
 import org.matrix.android.sdk.api.Matrix
-import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import timber.log.Timber
@@ -77,7 +75,6 @@ import androidx.work.Configuration as WorkConfiguration
 @HiltAndroidApp
 class VectorApplication :
         Application(),
-        MatrixConfiguration.Provider,
         WorkConfiguration.Provider {
 
     lateinit var appContext: Context
@@ -100,6 +97,7 @@ class VectorApplication :
     @Inject lateinit var autoRageShaker: AutoRageShaker
     @Inject lateinit var vectorFileLogger: VectorFileLogger
     @Inject lateinit var vectorAnalytics: VectorAnalytics
+    @Inject lateinit var matrix: Matrix
 
     // font thread handler
     private var fontThreadHandler: Handler? = null
@@ -120,7 +118,7 @@ class VectorApplication :
         vectorAnalytics.init()
         invitesAcceptor.initialize()
         autoRageShaker.initialize()
-        vectorUncaughtExceptionHandler.activate(this)
+        vectorUncaughtExceptionHandler.activate()
 
         // Remove Log handler statically added by Jitsi
         Timber.forest()
@@ -220,16 +218,9 @@ class VectorApplication :
         }
     }
 
-    override fun providesMatrixConfiguration(): MatrixConfiguration {
-        return MatrixConfiguration(
-                applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION,
-                roomDisplayNameFallbackProvider = VectorRoomDisplayNameFallbackProvider(this)
-        )
-    }
-
     override fun getWorkManagerConfiguration(): WorkConfiguration {
         return WorkConfiguration.Builder()
-                .setWorkerFactory(Matrix.getInstance(this.appContext).workerFactory())
+                .setWorkerFactory(matrix.workerFactory())
                 .setExecutor(Executors.newCachedThreadPool())
                 .build()
     }
diff --git a/vector/src/main/java/im/vector/app/core/datastore/DataStoreProvider.kt b/vector/src/main/java/im/vector/app/core/datastore/DataStoreProvider.kt
new file mode 100644
index 0000000000..5b7988b76f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/datastore/DataStoreProvider.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.core.datastore
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStoreFile
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+/**
+ * Provides a singleton datastore cache
+ * allows for lazily fetching a datastore instance by key to avoid creating multiple stores for the same file
+ * Based on https://androidx.tech/artifacts/datastore/datastore-preferences/1.0.0-source/androidx/datastore/preferences/PreferenceDataStoreDelegate.kt.html
+ *
+ * Makes use of a ReadOnlyProperty in order to provide a simplified api on top of a Context
+ * ReadOnlyProperty allows us to lazily access the backing property instead of requiring it upfront as a dependency
+ * <pre>
+ * val Context.dataStoreProvider by dataStoreProvider()
+ * </pre>
+ */
+fun dataStoreProvider(): ReadOnlyProperty<Context, (String) -> DataStore<Preferences>> {
+    return MappedPreferenceDataStoreSingletonDelegate()
+}
+
+private class MappedPreferenceDataStoreSingletonDelegate : ReadOnlyProperty<Context, (String) -> DataStore<Preferences>> {
+
+    private val dataStoreCache = ConcurrentHashMap<String, DataStore<Preferences>>()
+    private val provider: (Context) -> (String) -> DataStore<Preferences> = { context ->
+        { key ->
+            dataStoreCache.getOrPut(key) {
+                PreferenceDataStoreFactory.create {
+                    context.applicationContext.preferencesDataStoreFile(key)
+                }
+            }
+        }
+    }
+
+    override fun getValue(thisRef: Context, property: KProperty<*>) = provider.invoke(thisRef)
+}
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
index 5d27909b25..e7aa83ae75 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -58,9 +58,10 @@ 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.room.breadcrumbs.BreadcrumbsFragment
-import im.vector.app.features.home.room.detail.RoomDetailFragment
+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.threads.list.views.ThreadListFragment
 import im.vector.app.features.location.LocationPreviewFragment
 import im.vector.app.features.location.LocationSharingFragment
 import im.vector.app.features.login.LoginCaptchaFragment
@@ -204,8 +205,8 @@ interface FragmentModule {
 
     @Binds
     @IntoMap
-    @FragmentKey(RoomDetailFragment::class)
-    fun bindRoomDetailFragment(fragment: RoomDetailFragment): Fragment
+    @FragmentKey(TimelineFragment::class)
+    fun bindTimelineFragment(fragment: TimelineFragment): Fragment
 
     @Binds
     @IntoMap
@@ -937,6 +938,11 @@ interface FragmentModule {
     @FragmentKey(SpaceLeaveAdvancedFragment::class)
     fun bindSpaceLeaveAdvancedFragment(fragment: SpaceLeaveAdvancedFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(ThreadListFragment::class)
+    fun bindThreadListFragment(fragment: ThreadListFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(CreatePollFragment::class)
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 9ad01cd3e4..2cd7136ffc 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
@@ -39,12 +39,11 @@ import im.vector.app.features.discovery.DiscoverySettingsViewModel
 import im.vector.app.features.discovery.change.SetIdentityServerViewModel
 import im.vector.app.features.home.HomeActivityViewModel
 import im.vector.app.features.home.HomeDetailViewModel
-import im.vector.app.features.home.PromoteRestrictedViewModel
 import im.vector.app.features.home.UnknownDeviceDetectorSharedViewModel
 import im.vector.app.features.home.UnreadMessagesSharedViewModel
 import im.vector.app.features.home.UserColorAccountDataViewModel
 import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsViewModel
-import im.vector.app.features.home.room.detail.RoomDetailViewModel
+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.search.SearchViewModel
 import im.vector.app.features.home.room.detail.timeline.action.MessageActionsViewModel
@@ -61,6 +60,7 @@ import im.vector.app.features.login2.created.AccountCreatedViewModel
 import im.vector.app.features.matrixto.MatrixToBottomSheetViewModel
 import im.vector.app.features.onboarding.OnboardingViewModel
 import im.vector.app.features.poll.create.CreatePollViewModel
+import im.vector.app.features.qrcode.QrCodeScannerViewModel
 import im.vector.app.features.rageshake.BugReportViewModel
 import im.vector.app.features.reactions.EmojiSearchResultViewModel
 import im.vector.app.features.room.RequireActiveMembershipViewModel
@@ -220,6 +220,11 @@ interface MavericksViewModelModule {
     @MavericksViewModelKey(CreateDirectRoomViewModel::class)
     fun createDirectRoomViewModelFactory(factory: CreateDirectRoomViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(QrCodeScannerViewModel::class)
+    fun qrCodeViewModelFactory(factory: QrCodeScannerViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
     @Binds
     @IntoMap
     @MavericksViewModelKey(RoomNotificationSettingsViewModel::class)
@@ -235,11 +240,6 @@ interface MavericksViewModelModule {
     @MavericksViewModelKey(SharedSecureStorageViewModel::class)
     fun sharedSecureStorageViewModelFactory(factory: SharedSecureStorageViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 
-    @Binds
-    @IntoMap
-    @MavericksViewModelKey(PromoteRestrictedViewModel::class)
-    fun promoteRestrictedViewModelFactory(factory: PromoteRestrictedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
-
     @Binds
     @IntoMap
     @MavericksViewModelKey(UserListViewModel::class)
@@ -537,8 +537,8 @@ interface MavericksViewModelModule {
 
     @Binds
     @IntoMap
-    @MavericksViewModelKey(RoomDetailViewModel::class)
-    fun roomDetailViewModelFactory(factory: RoomDetailViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+    @MavericksViewModelKey(TimelineViewModel::class)
+    fun roomDetailViewModelFactory(factory: TimelineViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 
     @Binds
     @IntoMap
diff --git a/vector/src/main/java/im/vector/app/core/di/NamedGlobalScope.kt b/vector/src/main/java/im/vector/app/core/di/NamedGlobalScope.kt
new file mode 100644
index 0000000000..cc1ac829a1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/NamedGlobalScope.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.core.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class NamedGlobalScope
diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
index 0e19cd4388..a5575ef536 100644
--- a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
@@ -26,13 +26,16 @@ 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.config.analyticsConfig
 import im.vector.app.core.dispatchers.CoroutineDispatchers
 import im.vector.app.core.error.DefaultErrorFormatter
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.time.Clock
 import im.vector.app.core.time.DefaultClock
+import im.vector.app.features.analytics.AnalyticsConfig
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.analytics.impl.DefaultVectorAnalytics
@@ -42,12 +45,15 @@ import im.vector.app.features.navigation.DefaultNavigator
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.pin.PinCodeStore
 import im.vector.app.features.pin.SharedPrefPinCodeStore
+import im.vector.app.features.room.VectorRoomDisplayNameFallbackProvider
 import im.vector.app.features.ui.SharedPreferencesUiStateRepository
 import im.vector.app.features.ui.UiStateRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+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.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
@@ -107,8 +113,17 @@ object VectorStaticModule {
     }
 
     @Provides
-    fun providesMatrix(context: Context): Matrix {
-        return Matrix.getInstance(context)
+    fun providesMatrixConfiguration(vectorRoomDisplayNameFallbackProvider: VectorRoomDisplayNameFallbackProvider): MatrixConfiguration {
+        return MatrixConfiguration(
+                applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION,
+                roomDisplayNameFallbackProvider = vectorRoomDisplayNameFallbackProvider
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun providesMatrix(context: Context, configuration: MatrixConfiguration): Matrix {
+        return Matrix.createInstance(context, configuration)
     }
 
     @Provides
@@ -147,4 +162,16 @@ object VectorStaticModule {
     fun providesCoroutineDispatchers(): CoroutineDispatchers {
         return CoroutineDispatchers(io = Dispatchers.IO, computation = Dispatchers.Default)
     }
+
+    @Suppress("EXPERIMENTAL_API_USAGE")
+    @Provides
+    @NamedGlobalScope
+    fun providesGlobalScope(): CoroutineScope {
+        return GlobalScope
+    }
+
+    @Provides
+    fun providesAnalyticsConfig(): AnalyticsConfig {
+        return analyticsConfig
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
index 5295cbaec3..14ba34cc52 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
@@ -76,6 +76,9 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
     @EpoxyAttribute
     var locationPinProvider: LocationPinProvider? = null
 
+    @EpoxyAttribute
+    var locationOwnerId: String? = null
+
     @EpoxyAttribute
     var movementMethod: MovementMethod? = null
 
@@ -109,7 +112,7 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
                     .apply(RequestOptions.centerCropTransform())
                     .into(holder.staticMapImageView)
 
-            locationPinProvider?.create(matrixItem.id) { pinDrawable ->
+            locationPinProvider?.create(locationOwnerId) { pinDrawable ->
                 GlideApp.with(holder.staticMapPinImageView)
                         .load(pinDrawable)
                         .into(holder.staticMapPinImageView)
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Activity.kt b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
index aa96a4a30c..829790f857 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
@@ -28,6 +28,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
+import im.vector.app.R
 
 fun ComponentActivity.registerStartForActivityResult(onResult: (ActivityResult) -> Unit): ActivityResultLauncher<Intent> {
     return registerForActivityResult(ActivityResultContracts.StartActivityForResult(), onResult)
@@ -66,8 +67,12 @@ fun <T : Fragment> AppCompatActivity.replaceFragment(
         fragmentClass: Class<T>,
         params: Parcelable? = null,
         tag: String? = null,
-        allowStateLoss: Boolean = false) {
+        allowStateLoss: Boolean = false,
+        useCustomAnimation: Boolean = false) {
     supportFragmentManager.commitTransaction(allowStateLoss) {
+        if (useCustomAnimation) {
+            setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
+        }
         replace(container.id, fragmentClass, params.toMvRxBundle(), tag)
     }
 }
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 1063d30a41..b1e24c9502 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
@@ -18,12 +18,18 @@ package im.vector.app.core.extensions
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ImageSpan
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.annotation.FloatRange
 import androidx.core.content.ContextCompat
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
 import dagger.hilt.EntryPoints
+import im.vector.app.core.datastore.dataStoreProvider
 import im.vector.app.core.di.SingletonEntryPoint
 import kotlin.math.roundToInt
 
@@ -31,6 +37,16 @@ fun Context.singletonEntryPoint(): SingletonEntryPoint {
     return EntryPoints.get(applicationContext, SingletonEntryPoint::class.java)
 }
 
+fun Context.getDrawableAsSpannable(@DrawableRes drawableRes: Int, alignment: Int = ImageSpan.ALIGN_BOTTOM): Spannable {
+    return SpannableString(" ").apply {
+        val span = ContextCompat.getDrawable(this@getDrawableAsSpannable, drawableRes)?.let {
+            it.setBounds(0, 0, it.intrinsicWidth, it.intrinsicHeight)
+            ImageSpan(it, alignment)
+        }
+        setSpan(span, 0, 1, Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
+    }
+}
+
 fun Context.getResTintedDrawable(@DrawableRes drawableRes: Int, @ColorRes tint: Int, @FloatRange(from = 0.0, to = 1.0) alpha: Float = 1f): Drawable? {
     return getTintedDrawable(drawableRes, ContextCompat.getColor(this, tint), alpha)
 }
@@ -50,3 +66,5 @@ fun Context.getTintedDrawable(@DrawableRes drawableRes: Int,
 private fun Float.toAndroidAlpha(): Int {
     return (this * 255).roundToInt()
 }
+
+val Context.dataStoreProvider: (String) -> DataStore<Preferences> by dataStoreProvider()
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 90b08ef92b..87ed51522f 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
@@ -21,6 +21,7 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ProcessLifecycleOwner
 import im.vector.app.core.services.VectorSyncService
+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
@@ -76,3 +77,5 @@ fun Session.cannotLogoutSafely(): Boolean {
             // That are not backed up
             !sharedSecretStorageService.isRecoverySetup())
 }
+
+fun Session.vectorStore(context: Context) = VectorSessionStore(context, myUserId)
diff --git a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
index cb34b95fa1..0564f2055b 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
@@ -129,6 +129,10 @@ fun TextView.setLeftDrawable(drawable: Drawable?) {
     setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
 }
 
+fun TextView.clearDrawables() {
+    setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0)
+}
+
 /**
  * Set long click listener to copy the current text of the TextView to the clipboard and show a Snackbar
  */
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 8164df9c55..2c161feb37 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
@@ -67,8 +67,7 @@ import im.vector.app.core.utils.toast
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.analytics.AnalyticsTracker
-import im.vector.app.features.analytics.plan.Screen
-import im.vector.app.features.analytics.screen.ScreenEvent
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.configuration.VectorConfiguration
 import im.vector.app.features.consent.ConsentNotGivenHelper
 import im.vector.app.features.navigation.Navigator
@@ -97,8 +96,7 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
      * Analytics
      * ========================================================================================== */
 
-    protected var analyticsScreenName: Screen.ScreenName? = null
-    private var screenEvent: ScreenEvent? = null
+    protected var analyticsScreenName: MobileScreen.ScreenName? = null
 
     protected lateinit var analyticsTracker: AnalyticsTracker
 
@@ -337,7 +335,9 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
     override fun onResume() {
         super.onResume()
         Timber.i("onResume Activity ${javaClass.simpleName}")
-        screenEvent = analyticsScreenName?.let { ScreenEvent(it) }
+        analyticsScreenName?.let {
+            analyticsTracker.screen(MobileScreen(screenName = it))
+        }
         configurationViewModel.onActivityResumed()
 
         if (this !is BugReportActivity && vectorPreferences.useRageshake()) {
@@ -376,7 +376,6 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
     override fun onPause() {
         super.onPause()
-        screenEvent?.send(analyticsTracker, analyticsScreenName)
         Timber.i("onPause Activity ${javaClass.simpleName}")
 
         rageShake.stop()
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 7e6a429274..ddc281fdd1 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
@@ -38,8 +38,7 @@ import im.vector.app.core.extensions.singletonEntryPoint
 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.Screen
-import im.vector.app.features.analytics.screen.ScreenEvent
+import im.vector.app.features.analytics.plan.MobileScreen
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
@@ -53,8 +52,7 @@ abstract class VectorBaseBottomSheetDialogFragment<VB : ViewBinding> : BottomShe
      * Analytics
      * ========================================================================================== */
 
-    protected var analyticsScreenName: Screen.ScreenName? = null
-    private var screenEvent: ScreenEvent? = null
+    protected var analyticsScreenName: MobileScreen.ScreenName? = null
 
     protected lateinit var analyticsTracker: AnalyticsTracker
 
@@ -139,12 +137,9 @@ abstract class VectorBaseBottomSheetDialogFragment<VB : ViewBinding> : BottomShe
     override fun onResume() {
         super.onResume()
         Timber.i("onResume BottomSheet ${javaClass.simpleName}")
-        screenEvent = analyticsScreenName?.let { ScreenEvent(it) }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        screenEvent?.send(analyticsTracker)
+        analyticsScreenName?.let {
+            analyticsTracker.screen(MobileScreen(screenName = it))
+        }
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
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 8a1b9051cc..70b265ff9f 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
@@ -44,8 +44,7 @@ import im.vector.app.core.extensions.singletonEntryPoint
 import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.utils.ToolbarConfig
 import im.vector.app.features.analytics.AnalyticsTracker
-import im.vector.app.features.analytics.plan.Screen
-import im.vector.app.features.analytics.screen.ScreenEvent
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.navigation.Navigator
 import im.vector.lib.ui.styles.dialogs.MaterialProgressDialog
 import kotlinx.coroutines.flow.launchIn
@@ -58,8 +57,7 @@ abstract class VectorBaseFragment<VB : ViewBinding> : Fragment(), MavericksView
      * Analytics
      * ========================================================================================== */
 
-    protected var analyticsScreenName: Screen.ScreenName? = null
-    private var screenEvent: ScreenEvent? = null
+    protected var analyticsScreenName: MobileScreen.ScreenName? = null
 
     protected lateinit var analyticsTracker: AnalyticsTracker
 
@@ -145,14 +143,15 @@ abstract class VectorBaseFragment<VB : ViewBinding> : Fragment(), MavericksView
     override fun onResume() {
         super.onResume()
         Timber.i("onResume Fragment ${javaClass.simpleName}")
-        screenEvent = analyticsScreenName?.let { ScreenEvent(it) }
+        analyticsScreenName?.let {
+            analyticsTracker.screen(MobileScreen(screenName = it))
+        }
     }
 
     @CallSuper
     override fun onPause() {
         super.onPause()
         Timber.i("onPause Fragment ${javaClass.simpleName}")
-        screenEvent?.send(analyticsTracker)
     }
 
     @CallSuper
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorDummyViewState.kt b/vector/src/main/java/im/vector/app/core/platform/VectorDummyViewState.kt
new file mode 100644
index 0000000000..3c293b1072
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorDummyViewState.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.core.platform
+
+import com.airbnb.mvrx.MavericksState
+
+data class VectorDummyViewState(
+        val isDummy: Unit = Unit
+) : MavericksState
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 6a9d434aea..fdb5f21b61 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
@@ -17,6 +17,8 @@
 package im.vector.app.core.resources
 
 import android.content.res.Resources
+import android.text.TextUtils
+import android.view.View
 import androidx.core.os.ConfigurationCompat
 import java.util.Locale
 import javax.inject.Inject
@@ -29,3 +31,7 @@ class LocaleProvider @Inject constructor(private val resources: Resources) {
 }
 
 fun LocaleProvider.isEnglishSpeaking() = current().language.startsWith("en")
+
+fun LocaleProvider.getLayoutDirectionFromCurrentLocale() =  TextUtils.getLayoutDirectionFromLocale(current())
+
+fun LocaleProvider.isRTL() = getLayoutDirectionFromCurrentLocale() == View.LAYOUT_DIRECTION_RTL
diff --git a/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
index 9ab3b9bf45..3aa1964d8d 100644
--- a/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
@@ -48,4 +48,8 @@ class UserPreferencesProvider @Inject constructor(private val vectorPreferences:
     fun shouldShowAvatarDisplayNameChanges(): Boolean {
         return vectorPreferences.showAvatarDisplayNameChangeMessages()
     }
+
+    fun areThreadMessagesEnabled(): Boolean {
+        return vectorPreferences.areThreadMessagesEnabled()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
index a6f6d8d82f..8621c28d57 100644
--- a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
@@ -35,6 +35,7 @@ import im.vector.app.R
 import im.vector.app.core.platform.PendingIntentCompat
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.settings.BackgroundSyncMode
+import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.internal.session.sync.job.SyncService
 import timber.log.Timber
 import javax.inject.Inject
@@ -75,6 +76,9 @@ class VectorSyncService : SyncService() {
     }
 
     @Inject lateinit var notificationUtils: NotificationUtils
+    @Inject lateinit var matrix: Matrix
+
+    override fun provideMatrix() = matrix
 
     override fun getDefaultSyncDelaySeconds() = BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS
 
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
index fe59c82ce9..d4838289a6 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
@@ -19,6 +19,7 @@ import android.graphics.Typeface
 import android.view.Gravity
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.button.MaterialButton
@@ -55,6 +56,9 @@ abstract class GenericButtonItem : VectorEpoxyModel<GenericButtonItem.Holder>()
     @EpoxyAttribute
     var bold: Boolean = false
 
+    @EpoxyAttribute
+    var highlight: Boolean = true
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.button.text = text
@@ -70,6 +74,12 @@ abstract class GenericButtonItem : VectorEpoxyModel<GenericButtonItem.Holder>()
         val textStyle = if (bold) Typeface.BOLD else Typeface.NORMAL
         holder.button.setTypeface(null, textStyle)
 
+        holder.button.rippleColor = if (highlight) {
+            ContextCompat.getColorStateList(holder.view.context, R.color.mtrl_btn_text_btn_ripple_color)
+        } else {
+            null
+        }
+
         holder.button.onClick(buttonClickAction)
     }
 
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 b4706780b7..33b735551c 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -29,6 +29,7 @@ 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
@@ -40,6 +41,7 @@ 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.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.themes.ActivityOtherThemes
@@ -143,13 +145,15 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
             startNextActivityAndFinish()
             return
         }
+
+        val onboardingStore = session.vectorStore(this)
         when {
             args.isAccountDeactivated -> {
                 lifecycleScope.launch {
                     // Just do the local cleanup
                     Timber.w("Account deactivated, start app")
                     sessionHolder.clearActiveSession()
-                    doLocalCleanup(clearPreferences = true)
+                    doLocalCleanup(clearPreferences = true, onboardingStore)
                     startNextActivityAndFinish()
                 }
             }
@@ -163,14 +167,14 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
                     }
                     Timber.w("SIGN_OUT: success, start app")
                     sessionHolder.clearActiveSession()
-                    doLocalCleanup(clearPreferences = true)
+                    doLocalCleanup(clearPreferences = true, onboardingStore)
                     startNextActivityAndFinish()
                 }
             }
             args.clearCache           -> {
                 lifecycleScope.launch {
                     session.clearCache()
-                    doLocalCleanup(clearPreferences = false)
+                    doLocalCleanup(clearPreferences = false, onboardingStore)
                     session.startSyncing(applicationContext)
                     startNextActivityAndFinish()
                 }
@@ -183,7 +187,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
         Timber.w("Ignoring invalid token global error")
     }
 
-    private suspend fun doLocalCleanup(clearPreferences: Boolean) {
+    private suspend fun doLocalCleanup(clearPreferences: Boolean, vectorSessionStore: VectorSessionStore) {
         // On UI Thread
         Glide.get(this@MainActivity).clearMemory()
 
@@ -193,6 +197,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
             pinLocker.unlock()
             pinCodeStore.deleteEncodedPin()
             vectorAnalytics.onSignOut()
+            vectorSessionStore.clear()
         }
         withContext(Dispatchers.IO) {
             // On BG thread
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 03e9954b2c..fe8d58fb51 100644
--- a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
+++ b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
@@ -36,5 +36,5 @@ class DefaultVectorFeatures : VectorFeatures {
     override fun onboardingVariant(): VectorFeatures.OnboardingVariant = BuildConfig.ONBOARDING_VARIANT
     override fun isOnboardingAlreadyHaveAccountSplashEnabled() = true
     override fun isOnboardingSplashCarouselEnabled() = true
-    override fun isOnboardingUseCaseEnabled() = false
+    override fun isOnboardingUseCaseEnabled() = true
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsTracker.kt b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsTracker.kt
index e1da0f4434..2389fbd724 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsTracker.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsTracker.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.analytics
 
 import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
 import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
+import im.vector.app.features.analytics.plan.UserProperties
 
 interface AnalyticsTracker {
     /**
@@ -29,4 +30,9 @@ interface AnalyticsTracker {
      * Track a displayed screen
      */
     fun screen(screen: VectorAnalyticsScreen)
+
+    /**
+     * Update user specific properties
+     */
+    fun updateUserProperties(userProperties: UserProperties)
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt b/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt
index 5d65d7ea42..3b92e7c4de 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt
@@ -17,7 +17,6 @@
 package im.vector.app.features.analytics.accountdata
 
 import androidx.lifecycle.asFlow
-import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -26,6 +25,7 @@ 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.VectorDummyViewState
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.analytics.log.analyticsTag
@@ -42,24 +42,20 @@ import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
 import java.util.UUID
 
-data class DummyState(
-        val dummy: Boolean = false
-) : MavericksState
-
 class AnalyticsAccountDataViewModel @AssistedInject constructor(
-        @Assisted initialState: DummyState,
+        @Assisted initialState: VectorDummyViewState,
         private val session: Session,
         private val analytics: VectorAnalytics
-) : VectorViewModel<DummyState, EmptyAction, EmptyViewEvents>(initialState) {
+) : VectorViewModel<VectorDummyViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     private var checkDone: Boolean = false
 
     @AssistedFactory
-    interface Factory : MavericksAssistedViewModelFactory<AnalyticsAccountDataViewModel, DummyState> {
-        override fun create(initialState: DummyState): AnalyticsAccountDataViewModel
+    interface Factory : MavericksAssistedViewModelFactory<AnalyticsAccountDataViewModel, VectorDummyViewState> {
+        override fun create(initialState: VectorDummyViewState): AnalyticsAccountDataViewModel
     }
 
-    companion object : MavericksViewModelFactory<AnalyticsAccountDataViewModel, DummyState> by hiltMavericksViewModelFactory() {
+    companion object : MavericksViewModelFactory<AnalyticsAccountDataViewModel, VectorDummyViewState> by hiltMavericksViewModelFactory() {
         private const val ANALYTICS_EVENT_TYPE = "im.vector.analytics"
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt b/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt
index ff23fd9a64..c13f8295f2 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.analytics.extensions
 import im.vector.app.features.analytics.plan.JoinedRoom
 import org.matrix.android.sdk.api.extensions.orFalse
 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.roomdirectory.PublicRoom
 
 fun Int?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
@@ -35,6 +36,7 @@ fun Int?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
 fun RoomSummary?.toAnalyticsJoinedRoom(): JoinedRoom {
     return JoinedRoom(
             isDM = this?.isDirect.orFalse(),
+            isSpace = this?.roomType == RoomType.SPACE,
             roomSize = this?.joinedMembersCount?.toAnalyticsRoomSize() ?: JoinedRoom.RoomSize.Two
     )
 }
@@ -42,6 +44,7 @@ fun RoomSummary?.toAnalyticsJoinedRoom(): JoinedRoom {
 fun PublicRoom.toAnalyticsJoinedRoom(): JoinedRoom {
     return JoinedRoom(
             isDM = false,
+            isSpace = false,
             roomSize = numJoinedMembers.toAnalyticsRoomSize()
     )
 }
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
new file mode 100644
index 0000000000..7fad43783b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/UserPropertiesExt.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.analytics.extensions
+
+import im.vector.app.features.analytics.plan.UserProperties
+import im.vector.app.features.onboarding.FtueUseCase
+
+fun FtueUseCase.toTrackingValue(): UserProperties.FtueUseCaseSelection {
+    return when (this) {
+        FtueUseCase.FRIENDS_FAMILY -> UserProperties.FtueUseCaseSelection.PersonalMessaging
+        FtueUseCase.TEAMS          -> UserProperties.FtueUseCaseSelection.WorkMessaging
+        FtueUseCase.COMMUNITIES    -> UserProperties.FtueUseCaseSelection.CommunityMessaging
+        FtueUseCase.SKIP           -> UserProperties.FtueUseCaseSelection.Skip
+    }
+}
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 eaf2e42705..7b653ef44b 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
@@ -16,17 +16,18 @@
 
 package im.vector.app.features.analytics.impl
 
-import android.content.Context
+import com.posthog.android.Options
 import com.posthog.android.PostHog
 import com.posthog.android.Properties
-import im.vector.app.BuildConfig
-import im.vector.app.config.analyticsConfig
+import im.vector.app.core.di.NamedGlobalScope
+import im.vector.app.features.analytics.AnalyticsConfig
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
 import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import im.vector.app.features.analytics.log.analyticsTag
+import im.vector.app.features.analytics.plan.UserProperties
 import im.vector.app.features.analytics.store.AnalyticsStore
-import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -34,17 +35,35 @@ import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private val REUSE_EXISTING_ID: String? = null
+private val IGNORED_OPTIONS: Options? = null
+
 @Singleton
 class DefaultVectorAnalytics @Inject constructor(
-        private val context: Context,
-        private val analyticsStore: AnalyticsStore
+        postHogFactory: PostHogFactory,
+        analyticsConfig: AnalyticsConfig,
+        private val analyticsStore: AnalyticsStore,
+        private val lateInitUserPropertiesFactory: LateInitUserPropertiesFactory,
+        @NamedGlobalScope private val globalScope: CoroutineScope
 ) : VectorAnalytics {
-    private var posthog: PostHog? = null
+
+    private val posthog: PostHog? = when {
+        analyticsConfig.isEnabled -> postHogFactory.createPosthog()
+        else                      -> {
+            Timber.tag(analyticsTag.value).w("Analytics is disabled")
+            null
+        }
+    }
 
     // Cache for the store values
     private var userConsent: Boolean? = null
     private var analyticsId: String? = null
 
+    override fun init() {
+        observeUserConsent()
+        observeAnalyticsId()
+    }
+
     override fun getUserConsent(): Flow<Boolean> {
         return analyticsStore.userConsentFlow
     }
@@ -77,13 +96,6 @@ class DefaultVectorAnalytics @Inject constructor(
         setAnalyticsId("")
     }
 
-    override fun init() {
-        observeUserConsent()
-        observeAnalyticsId()
-        createAnalyticsClient()
-    }
-
-    @Suppress("EXPERIMENTAL_API_USAGE")
     private fun observeAnalyticsId() {
         getAnalyticsId()
                 .onEach { id ->
@@ -91,21 +103,20 @@ class DefaultVectorAnalytics @Inject constructor(
                     analyticsId = id
                     identifyPostHog()
                 }
-                .launchIn(GlobalScope)
+                .launchIn(globalScope)
     }
 
-    private fun identifyPostHog() {
+    private suspend fun identifyPostHog() {
         val id = analyticsId ?: return
         if (id.isEmpty()) {
             Timber.tag(analyticsTag.value).d("reset")
             posthog?.reset()
         } else {
             Timber.tag(analyticsTag.value).d("identify")
-            posthog?.identify(id)
+            posthog?.identify(id, lateInitUserPropertiesFactory.createUserProperties()?.getProperties()?.toPostHogUserProperties(), IGNORED_OPTIONS)
         }
     }
 
-    @Suppress("EXPERIMENTAL_API_USAGE")
     private fun observeUserConsent() {
         getUserConsent()
                 .onEach { consent ->
@@ -113,49 +124,13 @@ class DefaultVectorAnalytics @Inject constructor(
                     userConsent = consent
                     optOutPostHog()
                 }
-                .launchIn(GlobalScope)
+                .launchIn(globalScope)
     }
 
     private fun optOutPostHog() {
         userConsent?.let { posthog?.optOut(!it) }
     }
 
-    private fun createAnalyticsClient() {
-        Timber.tag(analyticsTag.value).d("createAnalyticsClient()")
-
-        if (analyticsConfig.isEnabled.not()) {
-            Timber.tag(analyticsTag.value).w("Analytics is disabled")
-            return
-        }
-
-        posthog = PostHog.Builder(context, analyticsConfig.postHogApiKey, analyticsConfig.postHogHost)
-                // Record certain application events automatically! (off/false by default)
-                // .captureApplicationLifecycleEvents()
-                // Record screen views automatically! (off/false by default)
-                // .recordScreenViews()
-                // Capture deep links as part of the screen call. (off by default)
-                // .captureDeepLinks()
-                // Maximum number of events to keep in queue before flushing (default 20)
-                // .flushQueueSize(20)
-                // Max delay before flushing the queue (30 seconds)
-                // .flushInterval(30, TimeUnit.SECONDS)
-                // Enable or disable collection of ANDROID_ID (true)
-                .collectDeviceId(false)
-                .logLevel(getLogLevel())
-                .build()
-
-        optOutPostHog()
-        identifyPostHog()
-    }
-
-    private fun getLogLevel(): PostHog.LogLevel {
-        return if (BuildConfig.DEBUG) {
-            PostHog.LogLevel.DEBUG
-        } else {
-            PostHog.LogLevel.INFO
-        }
-    }
-
     override fun capture(event: VectorAnalyticsEvent) {
         Timber.tag(analyticsTag.value).d("capture($event)")
         posthog
@@ -170,11 +145,25 @@ class DefaultVectorAnalytics @Inject constructor(
                 ?.screen(screen.getName(), screen.getProperties()?.toPostHogProperties())
     }
 
-    private fun Map<String, Any>?.toPostHogProperties(): Properties? {
+    override fun updateUserProperties(userProperties: UserProperties) {
+        posthog?.identify(REUSE_EXISTING_ID, userProperties.getProperties()?.toPostHogUserProperties(), IGNORED_OPTIONS)
+    }
+
+    private fun Map<String, Any?>?.toPostHogProperties(): Properties? {
         if (this == null) return null
 
         return Properties().apply {
             putAll(this@toPostHogProperties)
         }
     }
+
+    /**
+     * We avoid sending nulls as part of the UserProperties as this will reset the values across all devices
+     * The UserProperties event has nullable properties to allow for clients to opt in
+     */
+    private fun Map<String, Any?>.toPostHogUserProperties(): Properties {
+        return Properties().apply {
+            putAll(this@toPostHogUserProperties.filter { it.value != null })
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/LateInitUserPropertiesFactory.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/LateInitUserPropertiesFactory.kt
new file mode 100644
index 0000000000..d961ceaadc
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/LateInitUserPropertiesFactory.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.analytics.impl
+
+import android.content.Context
+import im.vector.app.ActiveSessionDataSource
+import im.vector.app.core.extensions.vectorStore
+import im.vector.app.features.analytics.extensions.toTrackingValue
+import im.vector.app.features.analytics.plan.UserProperties
+import javax.inject.Inject
+
+class LateInitUserPropertiesFactory @Inject constructor(
+        private val activeSessionDataSource: ActiveSessionDataSource,
+        private val context: Context,
+) {
+    suspend fun createUserProperties(): UserProperties? {
+        val useCase = activeSessionDataSource.currentValue?.orNull()?.vectorStore(context)?.readUseCase()
+        return useCase?.let {
+            UserProperties(ftueUseCaseSelection = it.toTrackingValue())
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/PostHogFactory.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/PostHogFactory.kt
new file mode 100644
index 0000000000..029732f76c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/PostHogFactory.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.features.analytics.impl
+
+import android.content.Context
+import com.posthog.android.PostHog
+import im.vector.app.BuildConfig
+import im.vector.app.config.analyticsConfig
+import javax.inject.Inject
+
+class PostHogFactory @Inject constructor(private val context: Context) {
+
+    fun createPosthog(): PostHog {
+        return PostHog.Builder(context, analyticsConfig.postHogApiKey, analyticsConfig.postHogHost)
+                // Record certain application events automatically! (off/false by default)
+                // .captureApplicationLifecycleEvents()
+                // Record screen views automatically! (off/false by default)
+                // .recordScreenViews()
+                // Capture deep links as part of the screen call. (off by default)
+                // .captureDeepLinks()
+                // Maximum number of events to keep in queue before flushing (default 20)
+                // .flushQueueSize(20)
+                // Max delay before flushing the queue (30 seconds)
+                // .flushInterval(30, TimeUnit.SECONDS)
+                // Enable or disable collection of ANDROID_ID (true)
+                .collectDeviceId(false)
+                .logLevel(getLogLevel())
+                .build()
+    }
+
+    private fun getLogLevel(): PostHog.LogLevel {
+        return if (BuildConfig.DEBUG) {
+            PostHog.LogLevel.DEBUG
+        } else {
+            PostHog.LogLevel.INFO
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/itf/VectorAnalyticsEvent.kt b/vector/src/main/java/im/vector/app/features/analytics/itf/VectorAnalyticsEvent.kt
index c6acb3b87a..2797734343 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/itf/VectorAnalyticsEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/itf/VectorAnalyticsEvent.kt
@@ -18,5 +18,5 @@ package im.vector.app.features.analytics.itf
 
 interface VectorAnalyticsEvent {
     fun getName(): String
-    fun getProperties(): Map<String, Any>?
+    fun getProperties(): Map<String, Any?>?
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/Identity.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/Composer.kt
similarity index 61%
rename from vector/src/main/java/im/vector/app/features/analytics/plan/Identity.kt
rename to vector/src/main/java/im/vector/app/features/analytics/plan/Composer.kt
index 1cc433aa7e..a3b847a1bd 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/Identity.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/Composer.kt
@@ -22,42 +22,32 @@ import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
 // https://github.com/matrix-org/matrix-analytics-events/
 
 /**
- * The user properties to apply when identifying
+ * Triggered when the user sends a message via the composer.
  */
-data class Identity(
+data class Composer(
         /**
-         * The selected messaging use case during the onboarding flow.
+         * Whether the user was using the composer inside of a thread.
          */
-        val ftueUseCaseSelection: FtueUseCaseSelection? = null,
+        val inThread: Boolean,
+        /**
+         * Whether the user's composer interaction was editing a previously sent
+         * event.
+         */
+        val isEditing: Boolean,
+        /**
+         * Whether the user's composer interaction was a reply to a previously
+         * sent event.
+         */
+        val isReply: Boolean,
 ) : VectorAnalyticsEvent {
 
-    enum class FtueUseCaseSelection {
-        /**
-         * The third option, Communities.
-         */
-        CommunityMessaging,
-
-        /**
-         * The first option, Friends and family.
-         */
-        PersonalMessaging,
-
-        /**
-         * The footer option to skip the question.
-         */
-        Skip,
-
-        /**
-         * The second option, Teams.
-         */
-        WorkMessaging,
-    }
-
-    override fun getName() = "Identity"
+    override fun getName() = "Composer"
 
     override fun getProperties(): Map<String, Any>? {
         return mutableMapOf<String, Any>().apply {
-            ftueUseCaseSelection?.let { put("ftueUseCaseSelection", it.name) }
+            put("inThread", inThread)
+            put("isEditing", isEditing)
+            put("isReply", isReply)
         }.takeIf { it.isNotEmpty() }
     }
 }
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
new file mode 100644
index 0000000000..7bdc7740e1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
@@ -0,0 +1,250 @@
+/*
+ * 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 clicks/taps/activates a UI element.
+ */
+data class Interaction(
+        /**
+         * The index of the element, if its in a list of elements.
+         */
+        val index: Int? = null,
+        /**
+         * The manner with which the user activated the UI element.
+         */
+        val interactionType: InteractionType? = null,
+        /**
+         * The unique name of this element.
+         */
+        val name: Name,
+) : VectorAnalyticsEvent {
+
+    enum class Name {
+        /**
+         * User tapped the already selected space from the space list.
+         */
+        SpacePanelSelectedSpace,
+
+        /**
+         * User tapped an unselected space from the space list -> space
+         * switching should occur.
+         */
+        SpacePanelSwitchSpace,
+
+        /**
+         * User clicked the create room button in the + context menu of the room
+         * list header in Element Web/Desktop.
+         */
+        WebAddExistingToSpaceDialogCreateRoomButton,
+
+        /**
+         * User clicked the create room button in the home page of Element
+         * Web/Desktop.
+         */
+        WebHomeCreateRoomButton,
+
+        /**
+         * User interacted with pin to sidebar checkboxes in the quick settings
+         * menu of Element Web/Desktop.
+         */
+        WebQuickSettingsPinToSidebarCheckbox,
+
+        /**
+         * User interacted with the theme dropdown in the quick settings menu of
+         * Element Web/Desktop.
+         */
+        WebQuickSettingsThemeDropdown,
+
+        /**
+         * User accessed the room invite flow using the button at the top of the
+         * room member list in the right panel of Element Web/Desktop.
+         */
+        WebRightPanelMemberListInviteButton,
+
+        /**
+         * User accessed room member list using the 'People' button in the right
+         * panel room summary card of Element Web/Desktop.
+         */
+        WebRightPanelRoomInfoPeopleButton,
+
+        /**
+         * User accessed room settings using the 'Settings' button in the right
+         * panel room summary card of Element Web/Desktop.
+         */
+        WebRightPanelRoomInfoSettingsButton,
+
+        /**
+         * User accessed room member list using the back button in the right
+         * panel user info card of Element Web/Desktop.
+         */
+        WebRightPanelRoomUserInfoBackButton,
+
+        /**
+         * User invited someone to room by clicking invite on the right panel
+         * user info card in Element Web/Desktop.
+         */
+        WebRightPanelRoomUserInfoInviteButton,
+
+        /**
+         * User clicked the create room button in the room directory of Element
+         * Web/Desktop.
+         */
+        WebRoomDirectoryCreateRoomButton,
+
+        /**
+         * User adjusted their favourites using the context menu on the header
+         * of a room in Element Web/Desktop.
+         */
+        WebRoomHeaderContextMenuFavouriteToggle,
+
+        /**
+         * User accessed the room invite flow using the context menu on the
+         * header of a room in Element Web/Desktop.
+         */
+        WebRoomHeaderContextMenuInviteItem,
+
+        /**
+         * User interacted with leave action in the context menu on the header
+         * of a room in Element Web/Desktop.
+         */
+        WebRoomHeaderContextMenuLeaveItem,
+
+        /**
+         * User accessed their room notification settings via the context menu
+         * on the header of a room in Element Web/Desktop.
+         */
+        WebRoomHeaderContextMenuNotificationsItem,
+
+        /**
+         * User accessed room member list using the context menu on the header
+         * of a room in Element Web/Desktop.
+         */
+        WebRoomHeaderContextMenuPeopleItem,
+
+        /**
+         * User accessed room settings using the context menu on the header of a
+         * room in Element Web/Desktop.
+         */
+        WebRoomHeaderContextMenuSettingsItem,
+
+        /**
+         * User clicked the create room button in the + context menu of the room
+         * list header in Element Web/Desktop.
+         */
+        WebRoomListHeaderPlusMenuCreateRoomItem,
+
+        /**
+         * User adjusted their favourites using the context menu on a room tile
+         * in the room list in Element Web/Desktop.
+         */
+        WebRoomListRoomTileContextMenuFavouriteToggle,
+
+        /**
+         * User accessed the room invite flow using the context menu on a room
+         * tile in the room list in Element Web/Desktop.
+         */
+        WebRoomListRoomTileContextMenuInviteItem,
+
+        /**
+         * User interacted with leave action in the context menu on a room tile
+         * in the room list in Element Web/Desktop.
+         */
+        WebRoomListRoomTileContextMenuLeaveItem,
+
+        /**
+         * User accessed room settings using the context menu on a room tile in
+         * the room list in Element Web/Desktop.
+         */
+        WebRoomListRoomTileContextMenuSettingsItem,
+
+        /**
+         * User accessed their room notification settings via the context menu
+         * on a room tile in the room list in Element Web/Desktop.
+         */
+        WebRoomListRoomTileNotificationsMenu,
+
+        /**
+         * User clicked the create room button in the + context menu of the
+         * rooms sublist in Element Web/Desktop.
+         */
+        WebRoomListRoomsSublistPlusMenuCreateRoomItem,
+
+        /**
+         * User interacted with leave action in the general tab of the room
+         * settings dialog in Element Web/Desktop.
+         */
+        WebRoomSettingsLeaveButton,
+
+        /**
+         * User interacted with the prompt to create a new room when adjusting
+         * security settings in an existing room in Element Web/Desktop.
+         */
+        WebRoomSettingsSecurityTabCreateNewRoomButton,
+
+        /**
+         * User interacted with the theme radio selector in the Appearance tab
+         * of Settings in Element Web/Desktop.
+         */
+        WebSettingsAppearanceTabThemeSelector,
+
+        /**
+         * User interacted with the pre-built space checkboxes in the Sidebar
+         * tab of Settings in Element Web/Desktop.
+         */
+        WebSettingsSidebarTabSpacesCheckbox,
+
+        /**
+         * User clicked the create room button in the + context menu of the room
+         * list header in Element Web/Desktop.
+         */
+        WebSpaceContextMenuNewRoomItem,
+
+        /**
+         * User clicked the create room button in the + context menu of the room
+         * list header in Element Web/Desktop.
+         */
+        WebSpaceHomeCreateRoomButton,
+
+        /**
+         * User clicked the theme toggle button in the user menu of Element
+         * Web/Desktop.
+         */
+        WebUserMenuThemeToggleButton,
+    }
+
+    enum class InteractionType {
+        Keyboard,
+        Pointer,
+        Touch,
+    }
+
+    override fun getName() = "Interaction"
+
+    override fun getProperties(): Map<String, Any>? {
+        return mutableMapOf<String, Any>().apply {
+            index?.let { put("index", it) }
+            interactionType?.let { put("interactionType", it.name) }
+            put("name", name.name)
+        }.takeIf { it.isNotEmpty() }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/JoinedRoom.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/JoinedRoom.kt
index 97ac19ec93..d2fb6832ba 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/JoinedRoom.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/JoinedRoom.kt
@@ -29,15 +29,46 @@ data class JoinedRoom(
          * Whether the room is a DM.
          */
         val isDM: Boolean,
+        /**
+         * Whether the room is a Space.
+         */
+        val isSpace: Boolean,
         /**
          * The size of the room.
          */
         val roomSize: RoomSize,
+        /**
+         * The trigger for a room being joined if known.
+         */
+        val trigger: Trigger? = null,
 ) : VectorAnalyticsEvent {
 
+    enum class Trigger {
+        /**
+         * Room joined via a push/desktop notification.
+         */
+        Notification,
+
+        /**
+         * Room joined via the public rooms directory.
+         */
+        RoomDirectory,
+
+        /**
+         * Room joined via the space hierarchy view.
+         */
+        SpaceHierarchy,
+
+        /**
+         * Room joined via a timeline pill or link in another room.
+         */
+        Timeline,
+    }
+
     enum class RoomSize {
         ElevenToOneHundred,
         MoreThanAThousand,
+        One,
         OneHundredAndOneToAThousand,
         ThreeToTen,
         Two,
@@ -48,7 +79,9 @@ data class JoinedRoom(
     override fun getProperties(): Map<String, Any>? {
         return mutableMapOf<String, Any>().apply {
             put("isDM", isDM)
+            put("isSpace", isSpace)
             put("roomSize", roomSize.name)
+            trigger?.let { put("trigger", it.name) }
         }.takeIf { it.isNotEmpty() }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/Screen.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/MobileScreen.kt
similarity index 89%
rename from vector/src/main/java/im/vector/app/features/analytics/plan/Screen.kt
rename to vector/src/main/java/im/vector/app/features/analytics/plan/MobileScreen.kt
index db4dcd0fac..758a0540bf 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/Screen.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/MobileScreen.kt
@@ -22,9 +22,9 @@ import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 // https://github.com/matrix-org/matrix-analytics-events/
 
 /**
- * Triggered when the user changed screen
+ * Triggered when the user changed screen on Element Android/iOS
  */
-data class Screen(
+data class MobileScreen(
         /**
          * How long the screen was displayed for in milliseconds.
          */
@@ -33,6 +33,11 @@ data class Screen(
 ) : VectorAnalyticsScreen {
 
     enum class ScreenName {
+        /**
+         * The screen that displays the user's breadcrumbs.
+         */
+        Breadcrumbs,
+
         /**
          * The screen shown to create a new (non-direct) room.
          */
@@ -43,6 +48,16 @@ data class Screen(
          */
         DeactivateAccount,
 
+        /**
+         * The tab on mobile that displays the dialpad.
+         */
+        Dialpad,
+
+        /**
+         * The Favourites tab on mobile that lists your favourite people/rooms.
+         */
+        Favourites,
+
         /**
          * The form for the forgot password use case
          */
@@ -54,11 +69,15 @@ data class Screen(
         Group,
 
         /**
-         * The Home tab on iOS | possibly the same on Android? | The Home space
-         * on Web?
+         * The Home tab on iOS | possibly the same on Android?
          */
         Home,
 
+        /**
+         * The screen shown to share a link to download the app.
+         */
+        InviteFriends,
+
         /**
          * The screen that displays the login flow (when the user already has an
          * account).
@@ -66,70 +85,14 @@ data class Screen(
         Login,
 
         /**
-         * The screen that displays the user's breadcrumbs.
+         * Legacy: The screen that shows all groups/communities you have joined.
          */
-        MobileBreadcrumbs,
-
-        /**
-         * The tab on mobile that displays the dialpad.
-         */
-        MobileDialpad,
-
-        /**
-         * The Favourites tab on mobile that lists your favourite people/rooms.
-         */
-        MobileFavourites,
-
-        /**
-         * The screen shown to share a link to download the app.
-         */
-        MobileInviteFriends,
+        MyGroups,
 
         /**
          * The People tab on mobile that lists all the DM rooms you have joined.
          */
-        MobilePeople,
-
-        /**
-         * The Rooms tab on mobile that lists all the (non-direct) rooms you've
-         * joined.
-         */
-        MobileRooms,
-
-        /**
-         * The Files tab shown in the global search screen on Mobile.
-         */
-        MobileSearchFiles,
-
-        /**
-         * The Messages tab shown in the global search screen on Mobile.
-         */
-        MobileSearchMessages,
-
-        /**
-         * The People tab shown in the global search screen on Mobile.
-         */
-        MobileSearchPeople,
-
-        /**
-         * The Rooms tab shown in the global search screen on Mobile.
-         */
-        MobileSearchRooms,
-
-        /**
-         * The sidebar shown on mobile with spaces, settings etc.
-         */
-        MobileSidebar,
-
-        /**
-         * The screen shown to select which room directory you'd like to use.
-         */
-        MobileSwitchDirectory,
-
-        /**
-         * Legacy: The screen that shows all groups/communities you have joined.
-         */
-        MyGroups,
+        People,
 
         /**
          * The screen that displays the registration flow (when the user wants
@@ -186,6 +149,32 @@ data class Screen(
          */
         RoomUploads,
 
+        /**
+         * The Rooms tab on mobile that lists all the (non-direct) rooms you've
+         * joined.
+         */
+        Rooms,
+
+        /**
+         * The Files tab shown in the global search screen on Mobile.
+         */
+        SearchFiles,
+
+        /**
+         * The Messages tab shown in the global search screen on Mobile.
+         */
+        SearchMessages,
+
+        /**
+         * The People tab shown in the global search screen on Mobile.
+         */
+        SearchPeople,
+
+        /**
+         * The Rooms tab shown in the global search screen on Mobile.
+         */
+        SearchRooms,
+
         /**
          * The global settings screen shown in the app.
          */
@@ -206,36 +195,41 @@ data class Screen(
          */
         SettingsSecurity,
 
+        /**
+         * The sidebar shown on mobile with spaces, settings etc.
+         */
+        Sidebar,
+
+        /**
+         * Screen that displays the list of rooms and spaces of a space
+         */
+        SpaceExploreRooms,
+
+        /**
+         * Screen that displays the list of members of a space
+         */
+        SpaceMembers,
+
+        /**
+         * The bottom sheet that list all space options
+         */
+        SpaceMenu,
+
         /**
          * The screen shown to create a new direct room.
          */
         StartChat,
 
+        /**
+         * The screen shown to select which room directory you'd like to use.
+         */
+        SwitchDirectory,
+
         /**
          * A screen that shows information about a room member.
          */
         User,
 
-        /**
-         * ?
-         */
-        WebCompleteSecurity,
-
-        /**
-         * ?
-         */
-        WebE2ESetup,
-
-        /**
-         * ?
-         */
-        WebLoading,
-
-        /**
-         * ?
-         */
-        WebSoftLogout,
-
         /**
          * The splash screen.
          */
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/PerformanceTimer.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/PerformanceTimer.kt
index 59dd997f92..2770d668e5 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/PerformanceTimer.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/PerformanceTimer.kt
@@ -83,13 +83,15 @@ data class PerformanceTimer(
         StartupLaunchScreen,
 
         /**
-         * The time to preload data in the MXStore on iOS.
+         * The time to preload data in the MXStore on iOS. In this case,
+         * `itemCount` should contain the number of rooms in the store.
          */
         StartupStorePreload,
 
         /**
          * The time to load all data from the store (including
-         * StartupStorePreload time).
+         * StartupStorePreload time). In this case, `itemCount` should contain
+         * the number of rooms loaded into the session
          */
         StartupStoreReady,
     }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/Click.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/SlashCommand.kt
similarity index 70%
rename from vector/src/main/java/im/vector/app/features/analytics/plan/Click.kt
rename to vector/src/main/java/im/vector/app/features/analytics/plan/SlashCommand.kt
index fbc847165d..33d3545487 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/Click.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/SlashCommand.kt
@@ -22,29 +22,25 @@ import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
 // https://github.com/matrix-org/matrix-analytics-events/
 
 /**
- * Triggered when the user clicks/taps on a UI element.
+ * Triggered when the user runs a slash command in their composer.
  */
-data class Click(
+data class SlashCommand(
         /**
-         * The index of the element, if its in a list of elements.
+         * The name of this command.
          */
-        val index: Int? = null,
-        /**
-         * The unique name of this element.
-         */
-        val name: Name,
+        val command: Command,
 ) : VectorAnalyticsEvent {
 
-    enum class Name {
-        SendMessageButton,
+    enum class Command {
+        Invite,
+        Part,
     }
 
-    override fun getName() = "Click"
+    override fun getName() = "SlashCommand"
 
     override fun getProperties(): Map<String, Any>? {
         return mutableMapOf<String, Any>().apply {
-            index?.let { put("index", it) }
-            put("name", name.name)
+            put("command", command.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
new file mode 100644
index 0000000000..dea499edde
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/UserProperties.kt
@@ -0,0 +1,95 @@
+/*
+ * 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
+
+// GENERATED FILE, DO NOT EDIT. FOR MORE INFORMATION VISIT
+// https://github.com/matrix-org/matrix-analytics-events/
+
+/**
+ * The user properties to apply when identifying. This is not an event
+ * definition. These properties must all be device independent.
+ */
+data class UserProperties(
+        /**
+         * Whether the user has the favourites space enabled
+         */
+        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,
+        /**
+         * The selected messaging use case during the onboarding flow.
+         */
+        val ftueUseCaseSelection: FtueUseCaseSelection? = null,
+        /**
+         * Number of joined rooms the user has favourited
+         */
+        val numFavouriteRooms: Int? = null,
+        /**
+         * Number of spaces (and sub-spaces) the user is joined to
+         */
+        val numSpaces: Int? = null,
+) {
+
+    enum class FtueUseCaseSelection {
+        /**
+         * The third option, Communities.
+         */
+        CommunityMessaging,
+
+        /**
+         * The first option, Friends and family.
+         */
+        PersonalMessaging,
+
+        /**
+         * The footer option to skip the question.
+         */
+        Skip,
+
+        /**
+         * The second option, Teams.
+         */
+        WorkMessaging,
+    }
+
+    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) }
+            ftueUseCaseSelection?.let { put("ftueUseCaseSelection", it.name) }
+            numFavouriteRooms?.let { put("numFavouriteRooms", it) }
+            numSpaces?.let { put("numSpaces", it) }
+        }.takeIf { it.isNotEmpty() }
+    }
+}
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
new file mode 100644
index 0000000000..50c74a64c1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/ViewRoom.kt
@@ -0,0 +1,190 @@
+/*
+ * 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 rooms.
+ */
+data class ViewRoom(
+        /**
+         * The reason for the room change if known.
+         */
+        val trigger: Trigger? = null,
+        /**
+         * Whether the interaction was performed via the keyboard input.
+         */
+        val viaKeyboard: Boolean? = null,
+) : VectorAnalyticsEvent {
+
+    enum class Trigger {
+        /**
+         * Room accessed due to being just created.
+         */
+        Created,
+
+        /**
+         * Room switched due to user interacting with a message search result.
+         */
+        MessageSearch,
+
+        /**
+         * Room switched due to user selecting a user to go to a DM with.
+         */
+        MessageUser,
+
+        /**
+         * Room accessed via a push/desktop notification.
+         */
+        Notification,
+
+        /**
+         * Room accessed via the predecessor link at the top of the upgraded
+         * room.
+         */
+        Predecessor,
+
+        /**
+         * Room accessed via the public rooms directory.
+         */
+        RoomDirectory,
+
+        /**
+         * Room accessed via the room list.
+         */
+        RoomList,
+
+        /**
+         * Room accessed via a slash command in Element Web/Desktop like /goto.
+         */
+        SlashCommand,
+
+        /**
+         * Room accessed via the space hierarchy view.
+         */
+        SpaceHierarchy,
+
+        /**
+         * Room accessed via a timeline pill or link in another room.
+         */
+        Timeline,
+
+        /**
+         * Room accessed via a tombstone at the bottom of a predecessor room.
+         */
+        Tombstone,
+
+        /**
+         * Room switched due to user interacting with incoming verification
+         * request.
+         */
+        VerificationRequest,
+
+        /**
+         * Room switched due to accepting a call in a different room in Element
+         * Web/Desktop.
+         */
+        WebAcceptCall,
+
+        /**
+         * Room switched due to making a call via the dial pad in Element
+         * Web/Desktop.
+         */
+        WebDialPad,
+
+        /**
+         * Room accessed via interacting with the floating call or Jitsi PIP in
+         * Element Web/Desktop.
+         */
+        WebFloatingCallWindow,
+
+        /**
+         * Room accessed via the shortcut in Element Web/Desktop's forward
+         * modal.
+         */
+        WebForwardShortcut,
+
+        /**
+         * Room accessed via the Element Web/Desktop horizontal breadcrumbs at
+         * the top of the room list.
+         */
+        WebHorizontalBreadcrumbs,
+
+        /**
+         * Room accessed via an Element Web/Desktop keyboard shortcut like go to
+         * next room with unread messages.
+         */
+        WebKeyboardShortcut,
+
+        /**
+         * Room accessed via Element Web/Desktop's notification panel.
+         */
+        WebNotificationPanel,
+
+        /**
+         * Room accessed via the predecessor link in Settings > Advanced in
+         * Element Web/Desktop.
+         */
+        WebPredecessorSettings,
+
+        /**
+         * Room accessed via clicking on a notifications badge on a room list
+         * sublist in Element Web/Desktop.
+         */
+        WebRoomListNotificationBadge,
+
+        /**
+         * Room switched due to the user changing space in Element Web/Desktop.
+         */
+        WebSpaceContextSwitch,
+
+        /**
+         * Room accessed via clicking on the notifications badge on the
+         * currently selected space in Element Web/Desktop.
+         */
+        WebSpacePanelNotificationBadge,
+
+        /**
+         * Room accessed via Element Web/Desktop's Unified Search modal.
+         */
+        WebUnifiedSearch,
+
+        /**
+         * Room accessed via the Element Web/Desktop vertical breadcrumb hover
+         * menu.
+         */
+        WebVerticalBreadcrumbs,
+
+        /**
+         * Room switched due to widget interaction.
+         */
+        Widget,
+    }
+
+    override fun getName() = "ViewRoom"
+
+    override fun getProperties(): Map<String, Any>? {
+        return mutableMapOf<String, Any>().apply {
+            trigger?.let { put("trigger", it.name) }
+            viaKeyboard?.let { put("viaKeyboard", it) }
+        }.takeIf { it.isNotEmpty() }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/screen/ScreenEvent.kt b/vector/src/main/java/im/vector/app/features/analytics/screen/ScreenEvent.kt
deleted file mode 100644
index 8e0513f25a..0000000000
--- a/vector/src/main/java/im/vector/app/features/analytics/screen/ScreenEvent.kt
+++ /dev/null
@@ -1,50 +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.analytics.screen
-
-import android.os.SystemClock
-import im.vector.app.features.analytics.AnalyticsTracker
-import im.vector.app.features.analytics.plan.Screen
-import timber.log.Timber
-
-/**
- * Track a screen display. Unique usage.
- */
-class ScreenEvent(val screenName: Screen.ScreenName) {
-    private val startTime = SystemClock.elapsedRealtime()
-
-    // Protection to avoid multiple sending
-    private var isSent = false
-
-    /**
-     * @param screenNameOverride can be used to override the screen name passed in constructor parameter
-     */
-    fun send(analyticsTracker: AnalyticsTracker,
-             screenNameOverride: Screen.ScreenName? = null) {
-        if (isSent) {
-            Timber.w("Event $screenName Already sent!")
-            return
-        }
-        isSent = true
-        analyticsTracker.screen(
-                Screen(
-                        screenName = screenNameOverride ?: screenName,
-                        durationMs = (SystemClock.elapsedRealtime() - startTime).toInt()
-                )
-        )
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteHeaderItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteHeaderItem.kt
new file mode 100644
index 0000000000..f287104415
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteHeaderItem.kt
@@ -0,0 +1,39 @@
+/*
+ * 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.autocomplete
+
+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(layout = R.layout.item_autocomplete_header_item)
+abstract class AutocompleteHeaderItem : VectorEpoxyModel<AutocompleteHeaderItem.Holder>() {
+
+    @EpoxyAttribute var title: String? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.titleView.text = title
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val titleView by bind<TextView>(R.id.headerItemAutocompleteTitle)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
index 9888f1e35e..5e4528d381 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
@@ -18,17 +18,26 @@ package im.vector.app.features.autocomplete.command
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.features.autocomplete.AutocompleteClickListener
 import im.vector.app.features.autocomplete.RecyclerViewPresenter
 import im.vector.app.features.command.Command
 import im.vector.app.features.settings.VectorPreferences
-import javax.inject.Inject
 
-class AutocompleteCommandPresenter @Inject constructor(context: Context,
-                                                       private val controller: AutocompleteCommandController,
-                                                       private val vectorPreferences: VectorPreferences) :
+class AutocompleteCommandPresenter @AssistedInject constructor(
+        @Assisted val isInThreadTimeline: Boolean,
+        context: Context,
+        private val controller: AutocompleteCommandController,
+        private val vectorPreferences: VectorPreferences) :
         RecyclerViewPresenter<Command>(context), AutocompleteClickListener<Command> {
 
+    @AssistedFactory
+    interface Factory {
+        fun create(isFromThreadTimeline: Boolean): AutocompleteCommandPresenter
+    }
+
     init {
         controller.listener = this
     }
@@ -46,6 +55,13 @@ class AutocompleteCommandPresenter @Inject constructor(context: Context,
                 .filter {
                     !it.isDevCommand || vectorPreferences.developerMode()
                 }
+                .filter {
+                    if (vectorPreferences.areThreadMessagesEnabled() && isInThreadTimeline) {
+                        it.isThreadCommand
+                    } else {
+                        true
+                    }
+                }
                 .filter {
                     if (query.isNullOrEmpty()) {
                         true
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt
index 9b4bd78504..2034cee90a 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt
@@ -16,31 +16,81 @@
 
 package im.vector.app.features.autocomplete.member
 
+import android.content.Context
 import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
 import im.vector.app.features.autocomplete.AutocompleteClickListener
+import im.vector.app.features.autocomplete.autocompleteHeaderItem
 import im.vector.app.features.autocomplete.autocompleteMatrixItem
 import im.vector.app.features.home.AvatarRenderer
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.util.toEveryoneInRoomMatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class AutocompleteMemberController @Inject constructor() : TypedEpoxyController<List<RoomMemberSummary>>() {
+class AutocompleteMemberController @Inject constructor(private val context: Context) :
+        TypedEpoxyController<List<AutocompleteMemberItem>>() {
 
-    var listener: AutocompleteClickListener<RoomMemberSummary>? = null
+    /* ==========================================================================================
+     * Fields
+     * ========================================================================================== */
+
+    var listener: AutocompleteClickListener<AutocompleteMemberItem>? = null
+
+    /* ==========================================================================================
+     * Dependencies
+     * ========================================================================================== */
 
     @Inject lateinit var avatarRenderer: AvatarRenderer
 
-    override fun buildModels(data: List<RoomMemberSummary>?) {
+    /* ==========================================================================================
+     * Specialization
+     * ========================================================================================== */
+
+    override fun buildModels(data: List<AutocompleteMemberItem>?) {
         if (data.isNullOrEmpty()) {
             return
         }
+        data.forEach { item ->
+            when (item) {
+                is AutocompleteMemberItem.Header     -> buildHeaderItem(item)
+                is AutocompleteMemberItem.RoomMember -> buildRoomMemberItem(item)
+                is AutocompleteMemberItem.Everyone   -> buildEveryoneItem(item)
+            }
+        }
+    }
+
+    /* ==========================================================================================
+     * Helper methods
+     * ========================================================================================== */
+
+    private fun buildHeaderItem(header: AutocompleteMemberItem.Header) {
+        autocompleteHeaderItem {
+            id(header.id)
+            title(header.title)
+        }
+    }
+
+    private fun buildRoomMemberItem(roomMember: AutocompleteMemberItem.RoomMember) {
         val host = this
-        data.forEach { user ->
-            autocompleteMatrixItem {
+        autocompleteMatrixItem {
+            roomMember.roomMemberSummary.let { user ->
                 id(user.userId)
                 matrixItem(user.toMatrixItem())
                 avatarRenderer(host.avatarRenderer)
-                clickListener { host.listener?.onItemClick(user) }
+                clickListener { host.listener?.onItemClick(roomMember) }
+            }
+        }
+    }
+
+    private fun buildEveryoneItem(everyone: AutocompleteMemberItem.Everyone) {
+        val host = this
+        autocompleteMatrixItem {
+            everyone.roomSummary.let { room ->
+                id(room.roomId)
+                matrixItem(room.toEveryoneInRoomMatrixItem())
+                subName(host.context.getString(R.string.room_message_notify_everyone))
+                avatarRenderer(host.avatarRenderer)
+                clickListener { host.listener?.onItemClick(everyone) }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberItem.kt
new file mode 100644
index 0000000000..77c5069938
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberItem.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.autocomplete.member
+
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+sealed class AutocompleteMemberItem {
+    data class Header(val id: String, val title: String) : AutocompleteMemberItem()
+    data class RoomMember(val roomMemberSummary: RoomMemberSummary) : AutocompleteMemberItem()
+    data class Everyone(val roomSummary: RoomSummary) : AutocompleteMemberItem()
+}
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 4976cb39b9..ce3b9c6a7e 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
@@ -21,26 +21,44 @@ import androidx.recyclerview.widget.RecyclerView
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.R
 import im.vector.app.features.autocomplete.AutocompleteClickListener
 import im.vector.app.features.autocomplete.RecyclerViewPresenter
+import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
 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.Event
+import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
 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.RoomMemberSummary
+import org.matrix.android.sdk.api.util.MatrixItem
 
 class AutocompleteMemberPresenter @AssistedInject constructor(context: Context,
                                                               @Assisted val roomId: String,
-                                                              session: Session,
+                                                              private val session: Session,
                                                               private val controller: AutocompleteMemberController
-) : RecyclerViewPresenter<RoomMemberSummary>(context), AutocompleteClickListener<RoomMemberSummary> {
+) : RecyclerViewPresenter<AutocompleteMemberItem>(context), AutocompleteClickListener<AutocompleteMemberItem> {
+
+    /* ==========================================================================================
+     * Fields
+     * ========================================================================================== */
 
     private val room by lazy { session.getRoom(roomId)!! }
 
+    /* ==========================================================================================
+     * Init
+     * ========================================================================================== */
+
     init {
         controller.listener = this
     }
 
+    /* ==========================================================================================
+     * Public api
+     * ========================================================================================== */
+
     fun clear() {
         controller.listener = null
     }
@@ -50,29 +68,100 @@ class AutocompleteMemberPresenter @AssistedInject constructor(context: Context,
         fun create(roomId: String): AutocompleteMemberPresenter
     }
 
+    /* ==========================================================================================
+     * Specialization
+     * ========================================================================================== */
+
     override fun instantiateAdapter(): RecyclerView.Adapter<*> {
         return controller.adapter
     }
 
-    override fun onItemClick(t: RoomMemberSummary) {
+    override fun onItemClick(t: AutocompleteMemberItem) {
         dispatchClick(t)
     }
 
     override fun onQuery(query: CharSequence?) {
-        val queryParams = roomMemberQueryParams {
-            displayName = if (query.isNullOrBlank()) {
-                QueryStringValue.IsNotEmpty
-            } else {
-                QueryStringValue.Contains(query.toString(), QueryStringValue.Case.INSENSITIVE)
+        val queryParams = createQueryParams(query)
+        val membersHeader = createMembersHeader()
+        val members = createMemberItems(queryParams)
+        val everyone = createEveryoneItem(query)
+        // add headers only when user can notify everyone
+        val canAddHeaders = canNotifyEveryone()
+
+        val items = mutableListOf<AutocompleteMemberItem>().apply {
+            if (members.isNotEmpty()) {
+                if (canAddHeaders) {
+                    add(membersHeader)
+                }
+                addAll(members)
+            }
+            everyone?.let {
+                val everyoneHeader = createEveryoneHeader()
+                add(everyoneHeader)
+                add(it)
             }
-            memberships = listOf(Membership.JOIN)
-            excludeSelf = true
         }
-        val members = room.getRoomMembers(queryParams)
-                .asSequence()
-                .sortedBy { it.displayName }
-                .disambiguate()
-        controller.setData(members.toList())
+
+        controller.setData(items)
+    }
+
+    /* ==========================================================================================
+     * Helper methods
+     * ========================================================================================== */
+
+    private fun createQueryParams(query: CharSequence?) = roomMemberQueryParams {
+        displayName = if (query.isNullOrBlank()) {
+            QueryStringValue.IsNotEmpty
+        } else {
+            QueryStringValue.Contains(query.toString(), QueryStringValue.Case.INSENSITIVE)
+        }
+        memberships = listOf(Membership.JOIN)
+        excludeSelf = true
+    }
+
+    private fun createMembersHeader() =
+            AutocompleteMemberItem.Header(
+                    ID_HEADER_MEMBERS,
+                    context.getString(R.string.room_message_autocomplete_users)
+            )
+
+    private fun createMemberItems(queryParams: RoomMemberQueryParams) =
+            room.getRoomMembers(queryParams)
+                    .asSequence()
+                    .sortedBy { it.displayName }
+                    .disambiguate()
+                    .map { AutocompleteMemberItem.RoomMember(it) }
+                    .toList()
+
+    private fun createEveryoneHeader() =
+            AutocompleteMemberItem.Header(
+                    ID_HEADER_EVERYONE,
+                    context.getString(R.string.room_message_autocomplete_notification)
+            )
+
+    private fun createEveryoneItem(query: CharSequence?) =
+            room.roomSummary()
+                    ?.takeIf { canNotifyEveryone() }
+                    ?.takeIf { query.isNullOrBlank() || MatrixItem.NOTIFY_EVERYONE.startsWith("@$query") }
+                    ?.let {
+                        AutocompleteMemberItem.Everyone(it)
+                    }
+
+    private fun canNotifyEveryone() = session.resolveSenderNotificationPermissionCondition(
+            Event(
+                    senderId = session.myUserId,
+                    roomId = roomId
+            ),
+            SenderNotificationPermissionCondition(PowerLevelsContent.NOTIFICATIONS_ROOM_KEY)
+    )
+
+    /* ==========================================================================================
+     * Const
+     * ========================================================================================== */
+
+    companion object {
+        private const val ID_HEADER_MEMBERS = "ID_HEADER_MEMBERS"
+        private const val ID_HEADER_EVERYONE = "ID_HEADER_EVERYONE"
     }
 }
 
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 642d259723..23c7b79914 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
@@ -54,13 +54,14 @@ import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.databinding.ActivityCallBinding
 import im.vector.app.features.call.dialpad.CallDialPadBottomSheet
 import im.vector.app.features.call.dialpad.DialPadFragment
+import im.vector.app.features.call.transfer.CallTransferActivity
 import im.vector.app.features.call.utils.EglUtils
 import im.vector.app.features.call.webrtc.WebRtcCall
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 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.RoomDetailArgs
+import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import io.github.hyuwah.draggableviewlib.DraggableView
 import io.github.hyuwah.draggableviewlib.setupDraggable
 import kotlinx.parcelize.Parcelize
@@ -165,6 +166,7 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
                 ?.let {
                     callViewModel.handle(VectorCallViewActions.SwitchCall(it))
                 }
+        this.intent = intent
     }
 
     override fun getMenuRes() = R.menu.vector_call
@@ -522,14 +524,21 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
                 val callId = withState(callViewModel) { it.callId }
                 navigator.openCallTransfer(this, callTransferActivityResultLauncher, callId)
             }
+            is VectorCallViewEvents.FailToTransfer         -> showSnackbar(getString(R.string.call_transfer_failure))
             null                                           -> {
             }
         }
     }
 
     private val callTransferActivityResultLauncher = registerStartForActivityResult { activityResult ->
-        if (activityResult.resultCode == Activity.RESULT_CANCELED) {
-            callViewModel.handle(VectorCallViewActions.CallTransferSelectionCancelled)
+        when (activityResult.resultCode) {
+            Activity.RESULT_CANCELED -> {
+                callViewModel.handle(VectorCallViewActions.CallTransferSelectionCancelled)
+            }
+            Activity.RESULT_OK       -> {
+                CallTransferActivity.getCallTransferResult(activityResult.data)
+                        ?.let { callViewModel.handle(VectorCallViewActions.CallTransferSelectionResult(it)) }
+            }
         }
     }
 
@@ -571,7 +580,7 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
 
     private fun returnToChat() {
         val roomId = withState(callViewModel) { it.roomId }
-        val args = RoomDetailArgs(roomId)
+        val args = TimelineArgs(roomId)
         val intent = RoomDetailActivity.newIntent(this, args).apply {
             flags = FLAG_ACTIVITY_CLEAR_TOP
         }
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt
index fb39660282..d1ed961814 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.call
 
 import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.features.call.audio.CallAudioManager
+import im.vector.app.features.call.transfer.CallTransferResult
 
 sealed class VectorCallViewActions : VectorViewModelAction {
     object EndCall : VectorCallViewActions()
@@ -37,5 +38,6 @@ sealed class VectorCallViewActions : VectorViewModelAction {
     object ToggleHDSD : VectorCallViewActions()
     object InitiateCallTransfer : VectorCallViewActions()
     object CallTransferSelectionCancelled : VectorCallViewActions()
+    data class CallTransferSelectionResult(val callTransferResult: CallTransferResult) : VectorCallViewActions()
     object TransferCall : VectorCallViewActions()
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt
index 5a0a2f127c..7c29d7eea3 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt
@@ -29,6 +29,7 @@ sealed class VectorCallViewEvents : VectorViewEvents {
     ) : VectorCallViewEvents()
     object ShowDialPad : VectorCallViewEvents()
     object ShowCallTransferScreen : VectorCallViewEvents()
+    object FailToTransfer : VectorCallViewEvents()
 //    data class CallAnswered(val content: CallAnswerContent) : VectorCallViewEvents()
 //    data class CallHangup(val content: CallHangupContent) : VectorCallViewEvents()
 //    object CallAccepted : VectorCallViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
index 4aca0ea499..a26eec04f3 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
@@ -29,13 +29,17 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.call.audio.CallAudioManager
+import im.vector.app.features.call.dialpad.DialPadLookup
+import im.vector.app.features.call.transfer.CallTransferResult
 import im.vector.app.features.call.webrtc.WebRtcCall
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.call.webrtc.getOpponentAsMatrixItem
+import im.vector.app.features.createdirect.DirectRoomHelper
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.call.CallState
 import org.matrix.android.sdk.api.session.call.MxCall
@@ -47,7 +51,9 @@ class VectorCallViewModel @AssistedInject constructor(
         @Assisted initialState: VectorCallViewState,
         val session: Session,
         val callManager: WebRtcCallManager,
-        val proximityManager: CallProximityManager
+        val proximityManager: CallProximityManager,
+        private val dialPadLookup: DialPadLookup,
+        private val directRoomHelper: DirectRoomHelper,
 ) : VectorViewModel<VectorCallViewState, VectorCallViewActions, VectorCallViewEvents>(initialState) {
 
     private var call: WebRtcCall? = null
@@ -327,6 +333,9 @@ class VectorCallViewModel @AssistedInject constructor(
             VectorCallViewActions.CallTransferSelectionCancelled -> {
                 call?.updateRemoteOnHold(false)
             }
+            is VectorCallViewActions.CallTransferSelectionResult -> {
+                handleCallTransferSelectionResult(action.callTransferResult)
+            }
             VectorCallViewActions.TransferCall         -> {
                 handleCallTransfer()
             }
@@ -345,6 +354,53 @@ class VectorCallViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleCallTransferSelectionResult(result: CallTransferResult) {
+        when (result) {
+            is CallTransferResult.ConnectWithUserId      -> connectWithUserId(result)
+            is CallTransferResult.ConnectWithPhoneNumber -> connectWithPhoneNumber(result)
+        }.exhaustive
+    }
+
+    private fun connectWithUserId(result: CallTransferResult.ConnectWithUserId) {
+        viewModelScope.launch {
+            try {
+                if (result.consultFirst) {
+                    val dmRoomId = directRoomHelper.ensureDMExists(result.selectedUserId)
+                    callManager.startOutgoingCall(
+                            nativeRoomId = dmRoomId,
+                            otherUserId = result.selectedUserId,
+                            isVideoCall = call?.mxCall?.isVideoCall.orFalse(),
+                            transferee = call
+                    )
+                } else {
+                    call?.transferToUser(result.selectedUserId, null)
+                }
+            } catch (failure: Throwable) {
+                _viewEvents.post(VectorCallViewEvents.FailToTransfer)
+            }
+        }
+    }
+
+    private fun connectWithPhoneNumber(action: CallTransferResult.ConnectWithPhoneNumber) {
+        viewModelScope.launch {
+            try {
+                val result = dialPadLookup.lookupPhoneNumber(action.phoneNumber)
+                if (action.consultFirst) {
+                    callManager.startOutgoingCall(
+                            nativeRoomId = result.roomId,
+                            otherUserId = result.userId,
+                            isVideoCall = call?.mxCall?.isVideoCall.orFalse(),
+                            transferee = call
+                    )
+                } else {
+                    call?.transferToUser(result.userId, result.roomId)
+                }
+            } catch (failure: Throwable) {
+                _viewEvents.post(VectorCallViewEvents.FailToTransfer)
+            }
+        }
+    }
+
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<VectorCallViewModel, VectorCallViewState> {
         override fun create(initialState: VectorCallViewState): VectorCallViewModel
diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
index 5fc866a4dd..606ba1d1e9 100644
--- a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
@@ -40,8 +40,7 @@ import com.android.dialer.dialpadview.DigitsEditText
 import im.vector.app.R
 import im.vector.app.core.extensions.singletonEntryPoint
 import im.vector.app.features.analytics.AnalyticsTracker
-import im.vector.app.features.analytics.plan.Screen
-import im.vector.app.features.analytics.screen.ScreenEvent
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.themes.ThemeUtils
 
 class DialPadFragment : Fragment(), TextWatcher {
@@ -66,15 +65,9 @@ class DialPadFragment : Fragment(), TextWatcher {
         analyticsTracker = singletonEntryPoint.analyticsTracker()
     }
 
-    private var screenEvent: ScreenEvent? = null
     override fun onResume() {
         super.onResume()
-        screenEvent = ScreenEvent(Screen.ScreenName.MobileDialpad)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        screenEvent?.send(analyticsTracker)
+        analyticsTracker.screen(MobileScreen(screenName = MobileScreen.ScreenName.Dialpad))
     }
 
     override fun onCreateView(
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 0e63316bbe..d8eede6a55 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
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.call.transfer
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -27,6 +26,7 @@ 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.extensions.exhaustive
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityCallTransferBinding
 import kotlinx.parcelize.Parcelize
@@ -56,10 +56,8 @@ class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>() {
 
         callTransferViewModel.observeViewEvents {
             when (it) {
-                is CallTransferViewEvents.Complete        -> handleComplete()
-                CallTransferViewEvents.Loading           -> showWaitingView()
-                is CallTransferViewEvents.FailToTransfer -> showSnackbar(getString(R.string.call_transfer_failure))
-            }
+                is CallTransferViewEvents.Complete -> handleComplete()
+            }.exhaustive
         }
 
         sectionsPagerAdapter = CallTransferPagerAdapter(this)
@@ -82,29 +80,41 @@ class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>() {
             when (views.callTransferTabLayout.selectedTabPosition) {
                 CallTransferPagerAdapter.USER_LIST_INDEX -> {
                     val selectedUser = sectionsPagerAdapter.userListFragment?.getCurrentState()?.getSelectedMatrixId()?.firstOrNull() ?: return@debouncedClicks
-                    val action = CallTransferAction.ConnectWithUserId(views.callTransferConsultCheckBox.isChecked, selectedUser)
-                    callTransferViewModel.handle(action)
+                    val result = CallTransferResult.ConnectWithUserId(views.callTransferConsultCheckBox.isChecked, selectedUser)
+                    handleComplete(result)
                 }
                 CallTransferPagerAdapter.DIAL_PAD_INDEX  -> {
                     val phoneNumber = sectionsPagerAdapter.dialPadFragment?.getRawInput() ?: return@debouncedClicks
-                    val action = CallTransferAction.ConnectWithPhoneNumber(views.callTransferConsultCheckBox.isChecked, phoneNumber)
-                    callTransferViewModel.handle(action)
+                    val result = CallTransferResult.ConnectWithPhoneNumber(views.callTransferConsultCheckBox.isChecked, phoneNumber)
+                    handleComplete(result)
                 }
             }
         }
     }
 
-    private fun handleComplete() {
-        setResult(Activity.RESULT_OK)
+    private fun handleComplete(callTransferResult: CallTransferResult? = null) {
+        if (callTransferResult != null) {
+            val intent = Intent().apply {
+                putExtra(EXTRA_TRANSFER_RESULT, callTransferResult)
+            }
+            setResult(RESULT_OK, intent)
+        } else {
+            setResult(RESULT_OK)
+        }
         finish()
     }
 
     companion object {
+        private const val EXTRA_TRANSFER_RESULT = "EXTRA_TRANSFER_RESULT"
 
         fun newIntent(context: Context, callId: String): Intent {
             return Intent(context, CallTransferActivity::class.java).also {
                 it.putExtra(Mavericks.KEY_ARG, CallTransferArgs(callId))
             }
         }
+
+        fun getCallTransferResult(intent: Intent?): CallTransferResult? {
+            return intent?.extras?.getParcelable(EXTRA_TRANSFER_RESULT)
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferAction.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferResult.kt
similarity index 64%
rename from vector/src/main/java/im/vector/app/features/call/transfer/CallTransferAction.kt
rename to vector/src/main/java/im/vector/app/features/call/transfer/CallTransferResult.kt
index bd694ad14e..0629e91d35 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferAction.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferResult.kt
@@ -16,9 +16,10 @@
 
 package im.vector.app.features.call.transfer
 
-import im.vector.app.core.platform.VectorViewModelAction
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
-sealed class CallTransferAction : VectorViewModelAction {
-    data class ConnectWithUserId(val consultFirst: Boolean, val selectedUserId: String) : CallTransferAction()
-    data class ConnectWithPhoneNumber(val consultFirst: Boolean, val phoneNumber: String) : CallTransferAction()
+sealed class CallTransferResult : Parcelable {
+    @Parcelize data class ConnectWithUserId(val consultFirst: Boolean, val selectedUserId: String) : CallTransferResult()
+    @Parcelize data class ConnectWithPhoneNumber(val consultFirst: Boolean, val phoneNumber: String) : CallTransferResult()
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewEvents.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewEvents.kt
index a8451e4fb5..4202506d23 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewEvents.kt
@@ -20,6 +20,4 @@ import im.vector.app.core.platform.VectorViewEvents
 
 sealed class CallTransferViewEvents : VectorViewEvents {
     object Complete : CallTransferViewEvents()
-    object Loading : CallTransferViewEvents()
-    object FailToTransfer : CallTransferViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
index de6a5de539..1765b58a02 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
@@ -22,22 +22,16 @@ 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.exhaustive
+import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.call.dialpad.DialPadLookup
 import im.vector.app.features.call.webrtc.WebRtcCall
 import im.vector.app.features.call.webrtc.WebRtcCallManager
-import im.vector.app.features.createdirect.DirectRoomHelper
-import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.call.CallState
 import org.matrix.android.sdk.api.session.call.MxCall
 
 class CallTransferViewModel @AssistedInject constructor(@Assisted initialState: CallTransferViewState,
-                                                        private val dialPadLookup: DialPadLookup,
-                                                        private val directRoomHelper: DirectRoomHelper,
                                                         private val callManager: WebRtcCallManager) :
-    VectorViewModel<CallTransferViewState, CallTransferAction, CallTransferViewEvents>(initialState) {
+    VectorViewModel<CallTransferViewState, EmptyAction, CallTransferViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<CallTransferViewModel, CallTransferViewState> {
@@ -68,53 +62,5 @@ class CallTransferViewModel @AssistedInject constructor(@Assisted initialState:
         call?.removeListener(callListener)
     }
 
-    override fun handle(action: CallTransferAction) {
-        when (action) {
-            is CallTransferAction.ConnectWithUserId      -> connectWithUserId(action)
-            is CallTransferAction.ConnectWithPhoneNumber -> connectWithPhoneNumber(action)
-        }.exhaustive
-    }
-
-    private fun connectWithUserId(action: CallTransferAction.ConnectWithUserId) {
-        viewModelScope.launch {
-            try {
-                if (action.consultFirst) {
-                    val dmRoomId = directRoomHelper.ensureDMExists(action.selectedUserId)
-                    callManager.startOutgoingCall(
-                            nativeRoomId = dmRoomId,
-                            otherUserId = action.selectedUserId,
-                            isVideoCall = call?.mxCall?.isVideoCall.orFalse(),
-                            transferee = call
-                    )
-                } else {
-                    call?.transferToUser(action.selectedUserId, null)
-                }
-                _viewEvents.post(CallTransferViewEvents.Complete)
-            } catch (failure: Throwable) {
-                _viewEvents.post(CallTransferViewEvents.FailToTransfer)
-            }
-        }
-    }
-
-    private fun connectWithPhoneNumber(action: CallTransferAction.ConnectWithPhoneNumber) {
-        viewModelScope.launch {
-            try {
-                _viewEvents.post(CallTransferViewEvents.Loading)
-                val result = dialPadLookup.lookupPhoneNumber(action.phoneNumber)
-                if (action.consultFirst) {
-                    callManager.startOutgoingCall(
-                            nativeRoomId = result.roomId,
-                            otherUserId = result.userId,
-                            isVideoCall = call?.mxCall?.isVideoCall.orFalse(),
-                            transferee = call
-                    )
-                } else {
-                    call?.transferToUser(result.userId, result.roomId)
-                }
-                _viewEvents.post(CallTransferViewEvents.Complete)
-            } catch (failure: Throwable) {
-                _viewEvents.post(CallTransferViewEvents.FailToTransfer)
-            }
-        }
-    }
+    override fun handle(action: EmptyAction) { }
 }
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 01f8cf234b..421c83c9fe 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
@@ -28,41 +28,42 @@ enum class Command(val command: String,
                    val aliases: Array<CharSequence>?,
                    val parameters: String,
                    @StringRes val description: Int,
-                   val isDevCommand: Boolean) {
-    EMOTE("/me", null, "<message>", R.string.command_description_emote, false),
-    BAN_USER("/ban", null, "<user-id> [reason]", R.string.command_description_ban_user, false),
-    UNBAN_USER("/unban", null, "<user-id> [reason]", R.string.command_description_unban_user, false),
-    IGNORE_USER("/ignore", null, "<user-id> [reason]", R.string.command_description_ignore_user, false),
-    UNIGNORE_USER("/unignore", null, "<user-id>", R.string.command_description_unignore_user, false),
-    SET_USER_POWER_LEVEL("/op", null, "<user-id> [<power-level>]", R.string.command_description_op_user, false),
-    RESET_USER_POWER_LEVEL("/deop", null, "<user-id>", R.string.command_description_deop_user, false),
-    ROOM_NAME("/roomname", null, "<name>", R.string.command_description_room_name, false),
-    INVITE("/invite", null, "<user-id> [reason]", R.string.command_description_invite_user, false),
-    JOIN_ROOM("/join", arrayOf("/j", "/goto"), "<room-address> [reason]", R.string.command_description_join_room, false),
-    PART("/part", null, "[<room-address>]", R.string.command_description_part_room, false),
-    TOPIC("/topic", null, "<topic>", R.string.command_description_topic, false),
-    REMOVE_USER("/remove", arrayOf("/kick"), "<user-id> [reason]", R.string.command_description_remove_user, false),
-    CHANGE_DISPLAY_NAME("/nick", null, "<display-name>", R.string.command_description_nick, false),
-    CHANGE_DISPLAY_NAME_FOR_ROOM("/myroomnick", arrayOf("/roomnick"), "<display-name>", R.string.command_description_nick_for_room, false),
-    ROOM_AVATAR("/roomavatar", null, "<mxc_url>", R.string.command_description_room_avatar, true /* Since user has to know the mxc url */),
-    CHANGE_AVATAR_FOR_ROOM("/myroomavatar", null, "<mxc_url>", R.string.command_description_avatar_for_room, true /* Since user has to know the mxc url */),
-    MARKDOWN("/markdown", null, "<on|off>", R.string.command_description_markdown, false),
-    RAINBOW("/rainbow", null, "<message>", R.string.command_description_rainbow, false),
-    RAINBOW_EMOTE("/rainbowme", null, "<message>", R.string.command_description_rainbow_emote, false),
-    CLEAR_SCALAR_TOKEN("/clear_scalar_token", null, "", R.string.command_description_clear_scalar_token, false),
-    SPOILER("/spoiler", null, "<message>", R.string.command_description_spoiler, false),
-    SHRUG("/shrug", null, "<message>", R.string.command_description_shrug, false),
-    LENNY("/lenny", null, "<message>", R.string.command_description_lenny, false),
-    PLAIN("/plain", null, "<message>", R.string.command_description_plain, false),
-    WHOIS("/whois", null, "<user-id>", R.string.command_description_whois, false),
-    DISCARD_SESSION("/discardsession", null, "", R.string.command_description_discard_session, false),
-    CONFETTI("/confetti", null, "<message>", R.string.command_confetti, false),
-    SNOWFALL("/snowfall", null, "<message>", R.string.command_snow, false),
-    CREATE_SPACE("/createspace", null, "<name> <invitee>*", R.string.command_description_create_space, true),
-    ADD_TO_SPACE("/addToSpace", null, "spaceId", R.string.command_description_add_to_space, true),
-    JOIN_SPACE("/joinSpace", null, "spaceId", R.string.command_description_join_space, true),
-    LEAVE_ROOM("/leave", null, "<roomId?>", R.string.command_description_leave_room, true),
-    UPGRADE_ROOM("/upgraderoom", null, "newVersion", R.string.command_description_upgrade_room, true);
+                   val isDevCommand: Boolean,
+                   val isThreadCommand: Boolean) {
+    EMOTE("/me", null, "<message>", R.string.command_description_emote, false, true),
+    BAN_USER("/ban", null, "<user-id> [reason]", R.string.command_description_ban_user, false, false),
+    UNBAN_USER("/unban", null, "<user-id> [reason]", R.string.command_description_unban_user, false, false),
+    IGNORE_USER("/ignore", null, "<user-id> [reason]", R.string.command_description_ignore_user, false, true),
+    UNIGNORE_USER("/unignore", null, "<user-id>", R.string.command_description_unignore_user, false, true),
+    SET_USER_POWER_LEVEL("/op", null, "<user-id> [<power-level>]", R.string.command_description_op_user, false, false),
+    RESET_USER_POWER_LEVEL("/deop", null, "<user-id>", R.string.command_description_deop_user, false, false),
+    ROOM_NAME("/roomname", null, "<name>", R.string.command_description_room_name, false, false),
+    INVITE("/invite", null, "<user-id> [reason]", R.string.command_description_invite_user, false, false),
+    JOIN_ROOM("/join", arrayOf("/j", "/goto"), "<room-address> [reason]", R.string.command_description_join_room, false, false),
+    PART("/part", null, "[<room-address>]", R.string.command_description_part_room, false, false),
+    TOPIC("/topic", null, "<topic>", R.string.command_description_topic, false, false),
+    REMOVE_USER("/remove", arrayOf("/kick"), "<user-id> [reason]", R.string.command_description_remove_user, false, false),
+    CHANGE_DISPLAY_NAME("/nick", null, "<display-name>", R.string.command_description_nick, false, false),
+    CHANGE_DISPLAY_NAME_FOR_ROOM("/myroomnick", arrayOf("/roomnick"), "<display-name>", R.string.command_description_nick_for_room, false, false),
+    ROOM_AVATAR("/roomavatar", null, "<mxc_url>", R.string.command_description_room_avatar, true /* User has to know the mxc url */, false),
+    CHANGE_AVATAR_FOR_ROOM("/myroomavatar", null, "<mxc_url>", R.string.command_description_avatar_for_room, true /* User has to know the mxc url */, false),
+    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),
+    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),
+    LENNY("/lenny", null, "<message>", R.string.command_description_lenny, false, true),
+    PLAIN("/plain", null, "<message>", R.string.command_description_plain, false, true),
+    WHOIS("/whois", null, "<user-id>", R.string.command_description_whois, false, true),
+    DISCARD_SESSION("/discardsession", null, "", R.string.command_description_discard_session, false, false),
+    CONFETTI("/confetti", null, "<message>", R.string.command_confetti, false, false),
+    SNOWFALL("/snowfall", null, "<message>", R.string.command_snow, false, false),
+    CREATE_SPACE("/createspace", null, "<name> <invitee>*", R.string.command_description_create_space, true, false),
+    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);
 
     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 9d854fdbee..b8bef506b1 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
@@ -33,7 +33,7 @@ class CommandParser @Inject constructor() {
      * @param textMessage   the text message
      * @return a parsed slash command (ok or error)
      */
-    fun parseSlashCommand(textMessage: CharSequence): ParsedCommand {
+    fun parseSlashCommand(textMessage: CharSequence, isInThreadTimeline: Boolean): ParsedCommand {
         // check if it has the Slash marker
         return if (!textMessage.startsWith("/")) {
             ParsedCommand.ErrorNotACommand
@@ -63,6 +63,10 @@ class CommandParser @Inject constructor() {
             val slashCommand = messageParts.first()
             val message = textMessage.substring(slashCommand.length).trim()
 
+            getNotSupportedByThreads(isInThreadTimeline, slashCommand)?.let {
+                return ParsedCommand.ErrorCommandNotSupportedInThreads(it)
+            }
+
             when {
                 Command.PLAIN.matches(slashCommand)                        -> {
                     if (message.isNotEmpty()) {
@@ -400,6 +404,28 @@ class CommandParser @Inject constructor() {
         }
     }
 
+    private val notSupportedThreadsCommands: List<Command> by lazy {
+        Command.values().filter {
+            !it.isThreadCommand
+        }
+    }
+
+    /**
+     * Checks whether or not the current command is not supported by threads
+     * @param slashCommand the slash command that will be checked
+     * @param isInThreadTimeline if its true we are in a thread timeline
+     * @return The command that is not supported
+     */
+    private fun getNotSupportedByThreads(isInThreadTimeline: Boolean, slashCommand: String): Command? {
+        return if (isInThreadTimeline) {
+            notSupportedThreadsCommands.firstOrNull {
+                it.command == slashCommand
+            }
+        } else {
+            null
+        }
+    }
+
     private fun trimParts(message: CharSequence, messageParts: List<String>): String? {
         val partsSize = messageParts.sumOf { it.length }
         val gapsNumber = messageParts.size - 1
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 5f2e7f56a5..771f721d3c 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
@@ -28,6 +28,8 @@ sealed interface ParsedCommand {
 
     object ErrorEmptySlashCommand : ParsedCommand
 
+    class ErrorCommandNotSupportedInThreads(val command: Command) : ParsedCommand
+
     // Unknown/Unsupported slash command
     data class ErrorUnknownSlashCommand(val slashCommand: String) : ParsedCommand
 
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt
index da3425d326..83c7f0a13b 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt
@@ -23,4 +23,8 @@ sealed class CreateDirectRoomAction : VectorViewModelAction {
     data class CreateRoomAndInviteSelectedUsers(
             val selections: Set<PendingSelection>
     ) : CreateDirectRoomAction()
+
+    data class QrScannedAction(
+            val result: String
+    ) : CreateDirectRoomAction()
 }
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 0df9426852..9df4f52d0f 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
@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
@@ -42,8 +43,12 @@ import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 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.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.contactsbook.ContactsBookFragment
+import im.vector.app.features.qrcode.QrCodeScannerEvents
+import im.vector.app.features.qrcode.QrCodeScannerFragment
+import im.vector.app.features.qrcode.QrCodeScannerViewModel
+import im.vector.app.features.qrcode.QrScannerArgs
 import im.vector.app.features.userdirectory.UserListFragment
 import im.vector.app.features.userdirectory.UserListFragmentArgs
 import im.vector.app.features.userdirectory.UserListSharedAction
@@ -59,12 +64,14 @@ import javax.inject.Inject
 class CreateDirectRoomActivity : SimpleFragmentActivity() {
 
     private val viewModel: CreateDirectRoomViewModel by viewModel()
+    private val qrViewModel: QrCodeScannerViewModel by viewModel()
+
     private lateinit var sharedActionViewModel: UserListSharedActionViewModel
     @Inject lateinit var errorFormatter: ErrorFormatter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.StartChat
+        analyticsScreenName = MobileScreen.ScreenName.StartChat
         views.toolbar.visibility = View.GONE
 
         sharedActionViewModel = viewModelProvider.get(UserListSharedActionViewModel::class.java)
@@ -93,11 +100,38 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
         viewModel.onEach(CreateDirectRoomViewState::createAndInviteState) {
             renderCreateAndInviteState(it)
         }
+
+        viewModel.observeViewEvents {
+            when (it) {
+                CreateDirectRoomViewEvents.InvalidCode -> {
+                    Toast.makeText(this, R.string.invalid_qr_code_uri, Toast.LENGTH_SHORT).show()
+                    finish()
+                }
+                CreateDirectRoomViewEvents.DmSelf      -> {
+                    Toast.makeText(this, R.string.cannot_dm_self, Toast.LENGTH_SHORT).show()
+                    finish()
+                }
+            }.exhaustive
+        }
+
+        qrViewModel.observeViewEvents {
+            when (it) {
+                is QrCodeScannerEvents.CodeParsed  -> {
+                    viewModel.handle(CreateDirectRoomAction.QrScannedAction(it.result))
+                }
+                is QrCodeScannerEvents.ParseFailed -> {
+                    Toast.makeText(this, R.string.qr_code_not_scanned, Toast.LENGTH_SHORT).show()
+                    finish()
+                }
+                else                               -> Unit
+            }.exhaustive
+        }
     }
 
     private fun openAddByQrCode() {
         if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this, permissionCameraLauncher)) {
-            addFragment(views.container, CreateDirectRoomByQrCodeFragment::class.java)
+            val args = QrScannerArgs(showExtraButtons = false, R.string.add_by_qr_code)
+            addFragment(views.container, QrCodeScannerFragment::class.java, args)
         }
     }
 
@@ -118,7 +152,8 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
 
     private val permissionCameraLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
         if (allGranted) {
-            addFragment(views.container, CreateDirectRoomByQrCodeFragment::class.java)
+            val args = QrScannerArgs(showExtraButtons = false, R.string.add_by_qr_code)
+            addFragment(views.container, QrCodeScannerFragment::class.java, args)
         } else if (deniedPermanently) {
             onPermissionDeniedSnackbar(R.string.permissions_denied_qr_code)
         }
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomByQrCodeFragment.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomByQrCodeFragment.kt
deleted file mode 100644
index 766a6f5156..0000000000
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomByQrCodeFragment.kt
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 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.createdirect
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import com.airbnb.mvrx.activityViewModel
-import com.google.zxing.Result
-import com.google.zxing.ResultMetadataType
-import im.vector.app.R
-import im.vector.app.core.extensions.hideKeyboard
-import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-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.FragmentQrCodeScannerBinding
-import im.vector.app.features.userdirectory.PendingSelection
-import me.dm7.barcodescanner.zxing.ZXingScannerView
-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
-import javax.inject.Inject
-
-class CreateDirectRoomByQrCodeFragment @Inject constructor() : VectorBaseFragment<FragmentQrCodeScannerBinding>(), ZXingScannerView.ResultHandler {
-
-    private val viewModel: CreateDirectRoomViewModel by activityViewModel()
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQrCodeScannerBinding {
-        return FragmentQrCodeScannerBinding.inflate(inflater, container, false)
-    }
-
-    private val openCameraActivityResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
-        if (allGranted) {
-            startCamera()
-        } else if (deniedPermanently) {
-            activity?.onPermissionDeniedDialog(R.string.denied_permission_camera)
-        }
-    }
-
-    private fun startCamera() {
-        // Start camera on resume
-        views.scannerView.startCamera()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupToolbar(views.qrScannerToolbar)
-                .setTitle(R.string.add_by_qr_code)
-                .allowBack(useCross = true)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        view?.hideKeyboard()
-        // Register ourselves as a handler for scan results.
-        views.scannerView.setResultHandler(this)
-        // Start camera on resume
-        if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, requireActivity(), openCameraActivityResultLauncher)) {
-            startCamera()
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        // Unregister ourselves as a handler for scan results.
-        views.scannerView.setResultHandler(null)
-        // Stop camera on pause
-        views.scannerView.stopCamera()
-    }
-
-    // Copied from https://github.com/markusfisch/BinaryEye/blob/
-    // 9d57889b810dcaa1a91d7278fc45c262afba1284/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt#L434
-    private fun getRawBytes(result: Result): ByteArray? {
-        val metadata = result.resultMetadata ?: return null
-        val segments = metadata[ResultMetadataType.BYTE_SEGMENTS] ?: return null
-        var bytes = ByteArray(0)
-        @Suppress("UNCHECKED_CAST")
-        for (seg in segments as Iterable<ByteArray>) {
-            bytes += seg
-        }
-        // byte segments can never be shorter than the text.
-        // Zxing cuts off content prefixes like "WIFI:"
-        return if (bytes.size >= result.text.length) bytes else null
-    }
-
-    private fun addByQrCode(value: String) {
-        val mxid = (PermalinkParser.parse(value) as? PermalinkData.UserLink)?.userId
-
-        if (mxid === null) {
-            Toast.makeText(requireContext(), R.string.invalid_qr_code_uri, Toast.LENGTH_SHORT).show()
-            requireActivity().finish()
-        } else {
-            // The following assumes MXIDs are case insensitive
-            if (mxid.equals(other = viewModel.session.myUserId, ignoreCase = true)) {
-                Toast.makeText(requireContext(), R.string.cannot_dm_self, Toast.LENGTH_SHORT).show()
-                requireActivity().finish()
-            } else {
-                // Try to get user from known users and fall back to creating a User object from MXID
-                val qrInvitee = if (viewModel.session.getUser(mxid) != null) viewModel.session.getUser(mxid)!! else User(mxid, null, null)
-
-                viewModel.handle(
-                        CreateDirectRoomAction.CreateRoomAndInviteSelectedUsers(setOf(PendingSelection.UserPendingSelection(qrInvitee)))
-                )
-            }
-        }
-    }
-
-    override fun handleResult(result: Result?) {
-        if (result === null) {
-            Toast.makeText(requireContext(), R.string.qr_code_not_scanned, Toast.LENGTH_SHORT).show()
-            requireActivity().finish()
-        } else {
-            val rawBytes = getRawBytes(result)
-            val rawBytesStr = rawBytes?.toString(Charsets.ISO_8859_1)
-            val value = rawBytesStr ?: result.text
-            addByQrCode(value)
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt
index 0c9804e9a4..060cb0c327 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt
@@ -18,4 +18,7 @@ package im.vector.app.features.createdirect
 
 import im.vector.app.core.platform.VectorViewEvents
 
-sealed class CreateDirectRoomViewEvents : VectorViewEvents
+sealed class CreateDirectRoomViewEvents : VectorViewEvents {
+    object InvalidCode : CreateDirectRoomViewEvents()
+    object DmSelf : CreateDirectRoomViewEvents()
+}
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 41360eab93..9dd3ef6a9b 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
@@ -34,13 +34,16 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
+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,
                                                             val session: Session) :
-    VectorViewModel<CreateDirectRoomViewState, CreateDirectRoomAction, CreateDirectRoomViewEvents>(initialState) {
+        VectorViewModel<CreateDirectRoomViewState, CreateDirectRoomAction, CreateDirectRoomViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<CreateDirectRoomViewModel, CreateDirectRoomViewState> {
@@ -51,15 +54,33 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
 
     override fun handle(action: CreateDirectRoomAction) {
         when (action) {
-            is CreateDirectRoomAction.CreateRoomAndInviteSelectedUsers -> onSubmitInvitees(action)
+            is CreateDirectRoomAction.CreateRoomAndInviteSelectedUsers -> onSubmitInvitees(action.selections)
+            is CreateDirectRoomAction.QrScannedAction                  -> onCodeParsed(action)
         }.exhaustive
     }
 
+    private fun onCodeParsed(action: CreateDirectRoomAction.QrScannedAction) {
+        val mxid = (PermalinkParser.parse(action.result) as? PermalinkData.UserLink)?.userId
+
+        if (mxid === null) {
+            _viewEvents.post(CreateDirectRoomViewEvents.InvalidCode)
+        } else {
+            // The following assumes MXIDs are case insensitive
+            if (mxid.equals(other = session.myUserId, ignoreCase = true)) {
+                _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)
+                onSubmitInvitees(setOf(PendingSelection.UserPendingSelection(qrInvitee)))
+            }
+        }
+    }
+
     /**
      * If users already have a DM room then navigate to it instead of creating a new room.
      */
-    private fun onSubmitInvitees(action: CreateDirectRoomAction.CreateRoomAndInviteSelectedUsers) {
-        val existingRoomId = action.selections.singleOrNull()?.getMxId()?.let { userId ->
+    private fun onSubmitInvitees(selections: Set<PendingSelection>) {
+        val existingRoomId = selections.singleOrNull()?.getMxId()?.let { userId ->
             session.getExistingDirectRoomWithUser(userId)
         }
         if (existingRoomId != null) {
@@ -69,7 +90,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
             }
         } else {
             // Create the DM
-            createRoomAndInviteSelectedUsers(action.selections)
+            createRoomAndInviteSelectedUsers(selections)
         }
     }
 
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 14ffda58a9..3a3f1054f1 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
@@ -21,7 +21,7 @@ import im.vector.app.core.platform.VectorBaseActivity
 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.RoomDetailArgs
+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 org.matrix.android.sdk.api.session.Session
@@ -142,7 +142,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
                     R.drawable.ic_shield_black,
                     shouldBeDisplayedIn = { activity ->
                         if (activity is RoomDetailActivity) {
-                            activity.intent?.extras?.getParcelable<RoomDetailArgs>(RoomDetailActivity.EXTRA_ROOM_DETAIL_ARGS)?.let {
+                            activity.intent?.extras?.getParcelable<TimelineArgs>(RoomDetailActivity.EXTRA_ROOM_DETAIL_ARGS)?.let {
                                 it.roomId != pr.roomId
                             } ?: true
                         } else true
diff --git a/vector/src/main/java/im/vector/app/features/home/AdaptiveIconTransformation.kt b/vector/src/main/java/im/vector/app/features/home/AdaptiveIconTransformation.kt
new file mode 100644
index 0000000000..6eb41a1d85
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/AdaptiveIconTransformation.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.home
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
+import com.bumptech.glide.util.Util
+import java.nio.ByteBuffer
+import java.security.MessageDigest
+
+private const val ADAPTIVE_TRANSFORMATION_ID = "adaptive-icon-transform"
+private val ID_BYTES = ADAPTIVE_TRANSFORMATION_ID.toByteArray()
+
+class AdaptiveIconTransformation(private val adaptiveIconSize: Int, private val adaptiveIconOuterSides: Float) : BitmapTransformation() {
+
+    override fun updateDiskCacheKey(messageDigest: MessageDigest) {
+        messageDigest.update(ID_BYTES)
+        messageDigest.update(ByteBuffer.allocate(8).putInt(adaptiveIconSize).putFloat(adaptiveIconOuterSides).array())
+    }
+
+    override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap {
+        val insetBmp = Bitmap.createBitmap(adaptiveIconSize, adaptiveIconSize, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(insetBmp)
+        canvas.drawBitmap(toTransform, adaptiveIconOuterSides, adaptiveIconOuterSides, null)
+        canvas.setBitmap(null)
+        return insetBmp
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is AdaptiveIconTransformation) {
+            other.adaptiveIconSize == adaptiveIconSize && other.adaptiveIconOuterSides == adaptiveIconOuterSides
+        } else {
+            false
+        }
+    }
+
+    override fun hashCode() = Util.hashCode(ADAPTIVE_TRANSFORMATION_ID.hashCode(), Util.hashCode(adaptiveIconSize, Util.hashCode(adaptiveIconOuterSides)))
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
index 2ee3233637..3678808b2d 100644
--- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
@@ -26,12 +26,14 @@ import androidx.core.graphics.drawable.toBitmap
 import com.amulyakhare.textdrawable.TextDrawable
 import com.bumptech.glide.load.MultiTransformation
 import com.bumptech.glide.load.Transformation
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.DrawableImageViewTarget
 import com.bumptech.glide.request.target.Target
+import com.bumptech.glide.signature.ObjectKey
 import im.vector.app.core.contacts.MappedContact
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.glide.AvatarPlaceholder
@@ -157,25 +159,45 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
     fun shortcutDrawable(glideRequests: GlideRequests, matrixItem: MatrixItem, iconSize: Int): Bitmap {
         return glideRequests
                 .asBitmap()
-                .let {
-                    val resolvedUrl = resolvedUrl(matrixItem.avatarUrl)
-                    if (resolvedUrl != null) {
-                        it.load(resolvedUrl)
-                    } else {
-                        val avatarColor = matrixItemColorProvider.getColor(matrixItem)
-                        it.load(TextDrawable.builder()
-                                .beginConfig()
-                                .bold()
-                                .endConfig()
-                                .buildRect(matrixItem.firstLetterOfDisplayName(), avatarColor)
-                                .toBitmap(width = iconSize, height = iconSize))
-                    }
-                }
+                .avatarOrText(matrixItem, iconSize)
                 .apply(RequestOptions.centerCropTransform())
                 .submit(iconSize, iconSize)
                 .get()
     }
 
+    @AnyThread
+    @Throws
+    fun adaptiveShortcutDrawable(glideRequests: GlideRequests,
+                                 matrixItem: MatrixItem, iconSize: Int,
+                                 adaptiveIconSize: Int,
+                                 adaptiveIconOuterSides: Float): Bitmap {
+        return glideRequests
+                .asBitmap()
+                .avatarOrText(matrixItem, iconSize)
+                .transform(CenterCrop(), AdaptiveIconTransformation(adaptiveIconSize, adaptiveIconOuterSides))
+                .signature(ObjectKey("adaptive-icon"))
+                .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                .submit(iconSize, iconSize)
+                .get()
+    }
+
+    private fun GlideRequest<Bitmap>.avatarOrText(matrixItem: MatrixItem, iconSize: Int): GlideRequest<Bitmap> {
+        return this.let {
+            val resolvedUrl = resolvedUrl(matrixItem.avatarUrl)
+            if (resolvedUrl != null) {
+                it.load(resolvedUrl)
+            } else {
+                val avatarColor = matrixItemColorProvider.getColor(matrixItem)
+                it.load(TextDrawable.builder()
+                        .beginConfig()
+                        .bold()
+                        .endConfig()
+                        .buildRect(matrixItem.firstLetterOfDisplayName(), avatarColor)
+                        .toBitmap(width = iconSize, height = iconSize))
+            }
+        }
+    }
+
     @UiThread
     fun renderBlur(matrixItem: MatrixItem,
                    imageView: ImageView,
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 d9719cb28f..47f1a9208b 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
@@ -48,8 +48,7 @@ import im.vector.app.databinding.ActivityHomeBinding
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.analytics.accountdata.AnalyticsAccountDataViewModel
-import im.vector.app.features.analytics.plan.Screen
-import im.vector.app.features.analytics.screen.ScreenEvent
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.disclaimer.showDisclaimerDialog
 import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.navigation.Navigator
@@ -66,7 +65,6 @@ 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.RestrictedPromoBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
@@ -111,7 +109,6 @@ class HomeActivity :
     private val userColorAccountDataViewModel: UserColorAccountDataViewModel by viewModel()
 
     private val serverBackupStatusViewModel: ServerBackupStatusViewModel by viewModel()
-    private val promoteRestrictedViewModel: PromoteRestrictedViewModel by viewModel()
 
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var vectorUncaughtExceptionHandler: VectorUncaughtExceptionHandler
@@ -165,14 +162,8 @@ class HomeActivity :
     }
 
     private val drawerListener = object : DrawerLayout.SimpleDrawerListener() {
-        private var drawerScreenEvent: ScreenEvent? = null
         override fun onDrawerOpened(drawerView: View) {
-            drawerScreenEvent = ScreenEvent(Screen.ScreenName.MobileSidebar)
-        }
-
-        override fun onDrawerClosed(drawerView: View) {
-            drawerScreenEvent?.send(analyticsTracker)
-            drawerScreenEvent = null
+            analyticsTracker.screen(MobileScreen(screenName = MobileScreen.ScreenName.Sidebar))
         }
 
         override fun onDrawerStateChanged(newState: Int) {
@@ -186,7 +177,7 @@ class HomeActivity :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.Home
+        analyticsScreenName = MobileScreen.ScreenName.Home
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
         FcmHelper.ensureFcmTokenIsRetrieved(this, pushManager, vectorPreferences.areNotificationEnabledForDevice())
         sharedActionViewModel = viewModelProvider.get(HomeSharedActionViewModel::class.java)
@@ -267,21 +258,6 @@ class HomeActivity :
 
         shortcutsHandler.observeRoomsAndBuildShortcuts(lifecycleScope)
 
-        if (!vectorPreferences.didPromoteNewRestrictedFeature()) {
-            promoteRestrictedViewModel.onEach {
-                if (it.activeSpaceSummary != null && !it.activeSpaceSummary.isPublic &&
-                        it.activeSpaceSummary.otherMemberIds.isNotEmpty()) {
-                    // It's a private space with some members show this once
-                    if (it.canUserManageSpace && !popupAlertManager.hasAlertsToShow()) {
-                        if (!vectorPreferences.didPromoteNewRestrictedFeature()) {
-                            vectorPreferences.setDidPromoteNewRestrictedFeature()
-                            RestrictedPromoBottomSheet().show(supportFragmentManager, "RestrictedPromoBottomSheet")
-                        }
-                    }
-                }
-            }
-        }
-
         if (isFirstCreation()) {
             handleIntent(intent)
         }
@@ -473,14 +449,14 @@ class HomeActivity :
     override fun onResume() {
         super.onResume()
 
-        if (vectorUncaughtExceptionHandler.didAppCrash(this)) {
-            vectorUncaughtExceptionHandler.clearAppCrashStatus(this)
+        if (vectorUncaughtExceptionHandler.didAppCrash()) {
+            vectorUncaughtExceptionHandler.clearAppCrashStatus()
 
             MaterialAlertDialogBuilder(this)
                     .setMessage(R.string.send_bug_report_app_crashed)
                     .setCancelable(false)
                     .setPositiveButton(R.string.yes) { _, _ -> bugReporter.openBugReportScreen(this) }
-                    .setNegativeButton(R.string.no) { _, _ -> bugReporter.deleteCrashFile(this) }
+                    .setNegativeButton(R.string.no) { _, _ -> bugReporter.deleteCrashFile() }
                     .show()
         } else {
             showDisclaimerDialog(this)
@@ -550,7 +526,7 @@ class HomeActivity :
         return true
     }
 
-    override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?): Boolean {
+    override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?, rootThreadEventId: String?): Boolean {
         if (roomId == null) return false
         MatrixToBottomSheet.withLink(deepLink.toString())
                 .show(supportFragmentManager, "HA#MatrixToBottomSheet")
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 a07409d063..ea03b833ac 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
@@ -457,7 +457,7 @@ class HomeDetailFragment @Inject constructor(
         backgroundColor = if (highlight) {
             ThemeUtils.getColor(requireContext(), R.attr.colorError)
         } else {
-            ThemeUtils.getColor(requireContext(), R.attr.vctr_unread_room_badge)
+            ThemeUtils.getColor(requireContext(), R.attr.vctr_content_secondary)
         }
     }
 
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 9af06ef801..1aee0257f4 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
@@ -30,7 +30,7 @@ import im.vector.app.core.extensions.replaceChildFragment
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.FragmentHomeDrawerBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.spaces.SpaceListFragment
@@ -98,7 +98,7 @@ class HomeDrawerFragment @Inject constructor(
 
         views.homeDrawerInviteFriendButton.debouncedClicks {
             session.permalinkService().createPermalink(sharedActionViewModel.session.myUserId)?.let { permalink ->
-                analyticsTracker.screen(Screen(screenName = Screen.ScreenName.MobileInviteFriends))
+                analyticsTracker.screen(MobileScreen(screenName = MobileScreen.ScreenName.InviteFriends))
                 val text = getString(R.string.invite_friends_text, permalink)
 
                 startSharePlainTextIntent(
diff --git a/vector/src/main/java/im/vector/app/features/home/PromoteRestrictedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/PromoteRestrictedViewModel.kt
deleted file mode 100644
index 5c66e7c52d..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/PromoteRestrictedViewModel.kt
+++ /dev/null
@@ -1,82 +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.home
-
-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.AppStateHandler
-import im.vector.app.RoomGroupingMethod
-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.EmptyAction
-import im.vector.app.core.platform.EmptyViewEvents
-import im.vector.app.core.platform.VectorViewModel
-import kotlinx.coroutines.flow.distinctUntilChanged
-import org.matrix.android.sdk.api.query.QueryStringValue
-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.PowerLevelsContent
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
-
-data class ActiveSpaceViewState(
-        val isInSpaceMode: Boolean = false,
-        val activeSpaceSummary: RoomSummary? = null,
-        val canUserManageSpace: Boolean = false
-) : MavericksState
-
-class PromoteRestrictedViewModel @AssistedInject constructor(
-        @Assisted initialState: ActiveSpaceViewState,
-        private val activeSessionHolder: ActiveSessionHolder,
-        appStateHandler: AppStateHandler
-) : VectorViewModel<ActiveSpaceViewState, EmptyAction, EmptyViewEvents>(initialState) {
-
-    init {
-        appStateHandler.selectedRoomGroupingFlow.distinctUntilChanged().execute { state ->
-            val groupingMethod = state.invoke()?.orNull()
-            val isSpaceMode = groupingMethod is RoomGroupingMethod.BySpace
-            val currentSpace = (groupingMethod as? RoomGroupingMethod.BySpace)?.spaceSummary
-            val canManage = currentSpace?.roomId?.let { roomId ->
-                activeSessionHolder.getSafeActiveSession()
-                        ?.getRoom(roomId)
-                        ?.getStateEvent(EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.NoCondition)
-                        ?.content?.toModel<PowerLevelsContent>()?.let {
-                            PowerLevelsHelper(it).isUserAllowedToSend(activeSessionHolder.getActiveSession().myUserId, true, EventType.STATE_SPACE_CHILD)
-                        } ?: false
-            } ?: false
-
-            copy(
-                    isInSpaceMode = isSpaceMode,
-                    activeSpaceSummary = currentSpace,
-                    canUserManageSpace = canManage
-            )
-        }
-    }
-
-    @AssistedFactory
-    interface Factory : MavericksAssistedViewModelFactory<PromoteRestrictedViewModel, ActiveSpaceViewState> {
-        override fun create(initialState: ActiveSpaceViewState): PromoteRestrictedViewModel
-    }
-
-    companion object : MavericksViewModelFactory<PromoteRestrictedViewModel, ActiveSpaceViewState> by hiltMavericksViewModelFactory()
-
-    override fun handle(action: EmptyAction) {}
-}
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 ee7edc021d..082d318cc7 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
@@ -19,7 +19,6 @@ package im.vector.app.features.home
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.graphics.Bitmap
-import android.graphics.Canvas
 import android.os.Build
 import androidx.annotation.WorkerThread
 import androidx.core.content.pm.ShortcutInfoCompat
@@ -61,7 +60,12 @@ class ShortcutCreator @Inject constructor(
     fun create(roomSummary: RoomSummary, rank: Int = 1): ShortcutInfoCompat {
         val intent = RoomDetailActivity.shortcutIntent(context, roomSummary.roomId)
         val bitmap = try {
-            avatarRenderer.shortcutDrawable(GlideApp.with(context), roomSummary.toMatrixItem(), iconSize)
+            val glideRequests = GlideApp.with(context)
+            val matrixItem = roomSummary.toMatrixItem()
+            when (useAdaptiveIcon) {
+                true  -> avatarRenderer.adaptiveShortcutDrawable(glideRequests, matrixItem, iconSize, adaptiveIconSize, adaptiveIconOuterSides.toFloat())
+                false -> avatarRenderer.shortcutDrawable(glideRequests, matrixItem, iconSize)
+            }
         } catch (failure: Throwable) {
             null
         }
@@ -83,11 +87,7 @@ class ShortcutCreator @Inject constructor(
 
     private fun Bitmap.toProfileImageIcon(): IconCompat {
         return if (useAdaptiveIcon) {
-            val insetBmp = Bitmap.createBitmap(adaptiveIconSize, adaptiveIconSize, Bitmap.Config.ARGB_8888)
-            val canvas = Canvas(insetBmp)
-            canvas.drawBitmap(this, adaptiveIconOuterSides.toFloat(), adaptiveIconOuterSides.toFloat(), null)
-
-            IconCompat.createWithAdaptiveBitmap(insetBmp)
+            IconCompat.createWithAdaptiveBitmap(this)
         } else {
             IconCompat.createWithBitmap(this)
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/UserColorAccountDataViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UserColorAccountDataViewModel.kt
index 3d4f219a7c..37e15af8b3 100644
--- a/vector/src/main/java/im/vector/app/features/home/UserColorAccountDataViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UserColorAccountDataViewModel.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.home
 
-import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -25,6 +24,7 @@ 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.VectorDummyViewState
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
 import kotlinx.coroutines.flow.launchIn
@@ -37,22 +37,18 @@ import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.unwrap
 import timber.log.Timber
 
-data class DummyState(
-        val dummy: Boolean = false
-) : MavericksState
-
 class UserColorAccountDataViewModel @AssistedInject constructor(
-        @Assisted initialState: DummyState,
+        @Assisted initialState: VectorDummyViewState,
         private val session: Session,
         private val matrixItemColorProvider: MatrixItemColorProvider
-) : VectorViewModel<DummyState, EmptyAction, EmptyViewEvents>(initialState) {
+) : VectorViewModel<VectorDummyViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
-    interface Factory : MavericksAssistedViewModelFactory<UserColorAccountDataViewModel, DummyState> {
-        override fun create(initialState: DummyState): UserColorAccountDataViewModel
+    interface Factory : MavericksAssistedViewModelFactory<UserColorAccountDataViewModel, VectorDummyViewState> {
+        override fun create(initialState: VectorDummyViewState): UserColorAccountDataViewModel
     }
 
-    companion object : MavericksViewModelFactory<UserColorAccountDataViewModel, DummyState> by hiltMavericksViewModelFactory()
+    companion object : MavericksViewModelFactory<UserColorAccountDataViewModel, VectorDummyViewState> by hiltMavericksViewModelFactory()
 
     init {
         observeAccountData()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
index 7dbd8cc3b5..be5f9c0bb4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
@@ -33,6 +33,7 @@ import im.vector.app.features.autocomplete.command.AutocompleteCommandPresenter
 import im.vector.app.features.autocomplete.command.CommandAutocompletePolicy
 import im.vector.app.features.autocomplete.emoji.AutocompleteEmojiPresenter
 import im.vector.app.features.autocomplete.group.AutocompleteGroupPresenter
+import im.vector.app.features.autocomplete.member.AutocompleteMemberItem
 import im.vector.app.features.autocomplete.member.AutocompleteMemberPresenter
 import im.vector.app.features.autocomplete.room.AutocompleteRoomPresenter
 import im.vector.app.features.command.Command
@@ -41,17 +42,18 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.html.PillImageSpan
 import im.vector.app.features.themes.ThemeUtils
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
-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.util.MatrixItem
+import org.matrix.android.sdk.api.util.toEveryoneInRoomMatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.api.util.toRoomAliasMatrixItem
 
 class AutoCompleter @AssistedInject constructor(
         @Assisted val roomId: String,
+        @Assisted val isInThreadTimeline: Boolean,
         private val avatarRenderer: AvatarRenderer,
         private val commandAutocompletePolicy: CommandAutocompletePolicy,
-        private val autocompleteCommandPresenter: AutocompleteCommandPresenter,
+        AutocompleteCommandPresenterFactory: AutocompleteCommandPresenter.Factory,
         private val autocompleteMemberPresenterFactory: AutocompleteMemberPresenter.Factory,
         private val autocompleteRoomPresenter: AutocompleteRoomPresenter,
         private val autocompleteGroupPresenter: AutocompleteGroupPresenter,
@@ -62,7 +64,11 @@ class AutoCompleter @AssistedInject constructor(
 
     @AssistedFactory
     interface Factory {
-        fun create(roomId: String): AutoCompleter
+        fun create(roomId: String, isInThreadTimeline: Boolean): AutoCompleter
+    }
+
+    private val autocompleteCommandPresenter: AutocompleteCommandPresenter by lazy {
+        AutocompleteCommandPresenterFactory.create(isInThreadTimeline)
     }
 
     private var editText: EditText? = null
@@ -101,7 +107,7 @@ class AutoCompleter @AssistedInject constructor(
         Autocomplete.on<Command>(editText)
                 .with(commandAutocompletePolicy)
                 .with(autocompleteCommandPresenter)
-                .with(ELEVATION)
+                .with(ELEVATION_DP)
                 .with(backgroundDrawable)
                 .with(object : AutocompleteCallback<Command> {
                     override fun onPopupItemClicked(editable: Editable, item: Command): Boolean {
@@ -120,15 +126,24 @@ class AutoCompleter @AssistedInject constructor(
 
     private fun setupMembers(backgroundDrawable: ColorDrawable, editText: EditText) {
         autocompleteMemberPresenter = autocompleteMemberPresenterFactory.create(roomId)
-        Autocomplete.on<RoomMemberSummary>(editText)
-                .with(CharPolicy('@', true))
+        Autocomplete.on<AutocompleteMemberItem>(editText)
+                .with(CharPolicy(TRIGGER_AUTO_COMPLETE_MEMBERS, true))
                 .with(autocompleteMemberPresenter)
-                .with(ELEVATION)
+                .with(ELEVATION_DP)
                 .with(backgroundDrawable)
-                .with(object : AutocompleteCallback<RoomMemberSummary> {
-                    override fun onPopupItemClicked(editable: Editable, item: RoomMemberSummary): Boolean {
-                        insertMatrixItem(editText, editable, "@", item.toMatrixItem())
-                        return true
+                .with(object : AutocompleteCallback<AutocompleteMemberItem> {
+                    override fun onPopupItemClicked(editable: Editable, item: AutocompleteMemberItem): Boolean {
+                        return when (item) {
+                            is AutocompleteMemberItem.Header     -> false // do nothing header is not clickable
+                            is AutocompleteMemberItem.RoomMember -> {
+                                insertMatrixItem(editText, editable, TRIGGER_AUTO_COMPLETE_MEMBERS, item.roomMemberSummary.toMatrixItem())
+                                true
+                            }
+                            is AutocompleteMemberItem.Everyone   -> {
+                                insertMatrixItem(editText, editable, TRIGGER_AUTO_COMPLETE_MEMBERS, item.roomSummary.toEveryoneInRoomMatrixItem())
+                                true
+                            }
+                        }
                     }
 
                     override fun onPopupVisibilityChanged(shown: Boolean) {
@@ -139,13 +154,13 @@ class AutoCompleter @AssistedInject constructor(
 
     private fun setupRooms(backgroundDrawable: ColorDrawable, editText: EditText) {
         Autocomplete.on<RoomSummary>(editText)
-                .with(CharPolicy('#', true))
+                .with(CharPolicy(TRIGGER_AUTO_COMPLETE_ROOMS, true))
                 .with(autocompleteRoomPresenter)
-                .with(ELEVATION)
+                .with(ELEVATION_DP)
                 .with(backgroundDrawable)
                 .with(object : AutocompleteCallback<RoomSummary> {
                     override fun onPopupItemClicked(editable: Editable, item: RoomSummary): Boolean {
-                        insertMatrixItem(editText, editable, "#", item.toRoomAliasMatrixItem())
+                        insertMatrixItem(editText, editable, TRIGGER_AUTO_COMPLETE_ROOMS, item.toRoomAliasMatrixItem())
                         return true
                     }
 
@@ -157,13 +172,13 @@ class AutoCompleter @AssistedInject constructor(
 
     private fun setupGroups(backgroundDrawable: ColorDrawable, editText: EditText) {
         Autocomplete.on<GroupSummary>(editText)
-                .with(CharPolicy('+', true))
+                .with(CharPolicy(TRIGGER_AUTO_COMPLETE_GROUPS, true))
                 .with(autocompleteGroupPresenter)
-                .with(ELEVATION)
+                .with(ELEVATION_DP)
                 .with(backgroundDrawable)
                 .with(object : AutocompleteCallback<GroupSummary> {
                     override fun onPopupItemClicked(editable: Editable, item: GroupSummary): Boolean {
-                        insertMatrixItem(editText, editable, "+", item.toMatrixItem())
+                        insertMatrixItem(editText, editable, TRIGGER_AUTO_COMPLETE_GROUPS, item.toMatrixItem())
                         return true
                     }
 
@@ -175,9 +190,9 @@ class AutoCompleter @AssistedInject constructor(
 
     private fun setupEmojis(backgroundDrawable: Drawable, editText: EditText) {
         Autocomplete.on<String>(editText)
-                .with(CharPolicy(':', false))
+                .with(CharPolicy(TRIGGER_AUTO_COMPLETE_EMOJIS, false))
                 .with(autocompleteEmojiPresenter)
-                .with(ELEVATION)
+                .with(ELEVATION_DP)
                 .with(backgroundDrawable)
                 .with(object : AutocompleteCallback<String> {
                     override fun onPopupItemClicked(editable: Editable, item: String): Boolean {
@@ -205,7 +220,7 @@ class AutoCompleter @AssistedInject constructor(
                 .build()
     }
 
-    private fun insertMatrixItem(editText: EditText, editable: Editable, firstChar: String, matrixItem: MatrixItem) {
+    private fun insertMatrixItem(editText: EditText, editable: Editable, firstChar: Char, matrixItem: MatrixItem) {
         // Detect last firstChar and remove it
         var startIndex = editable.lastIndexOf(firstChar)
         if (startIndex == -1) {
@@ -223,7 +238,7 @@ class AutoCompleter @AssistedInject constructor(
 
         // Adding trailing space " " or ": " if the user started mention someone
         val displayNameSuffix =
-                if (firstChar == "@" && startIndex == 0) {
+                if (matrixItem is MatrixItem.UserItem) {
                     ": "
                 } else {
                     " "
@@ -244,6 +259,10 @@ class AutoCompleter @AssistedInject constructor(
     }
 
     companion object {
-        private const val ELEVATION = 6f
+        private const val ELEVATION_DP = 6f
+        private const val TRIGGER_AUTO_COMPLETE_MEMBERS = '@'
+        private const val TRIGGER_AUTO_COMPLETE_ROOMS = '#'
+        private const val TRIGGER_AUTO_COMPLETE_GROUPS = '+'
+        private const val TRIGGER_AUTO_COMPLETE_EMOJIS = ':'
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/JoinReplacementRoomBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/JoinReplacementRoomBottomSheet.kt
index ba559677c9..99843084ec 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/JoinReplacementRoomBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/JoinReplacementRoomBottomSheet.kt
@@ -44,7 +44,7 @@ class JoinReplacementRoomBottomSheet :
     @Inject
     lateinit var errorFormatter: ErrorFormatter
 
-    private val viewModel: RoomDetailViewModel by parentFragmentViewModel()
+    private val viewModel: TimelineViewModel by parentFragmentViewModel()
 
     override val showExpanded: Boolean
         get() = true
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 9a7b8e64f7..aa4ee825dc 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
@@ -35,9 +35,9 @@ import im.vector.app.core.extensions.keepScreenOn
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityRoomDetailBinding
-import im.vector.app.features.analytics.plan.Screen
-import im.vector.app.features.analytics.screen.ScreenEvent
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment
+import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
 import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.navigation.Navigator
@@ -97,17 +97,17 @@ class RoomDetailActivity :
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
         waitingView = views.waitingView.waitingView
-        val roomDetailArgs: RoomDetailArgs? = if (intent?.action == ACTION_ROOM_DETAILS_FROM_SHORTCUT) {
-            RoomDetailArgs(roomId = intent?.extras?.getString(EXTRA_ROOM_ID)!!)
+        val timelineArgs: TimelineArgs? = if (intent?.action == ACTION_ROOM_DETAILS_FROM_SHORTCUT) {
+            TimelineArgs(roomId = intent?.extras?.getString(EXTRA_ROOM_ID)!!)
         } else {
             intent?.extras?.getParcelable(EXTRA_ROOM_DETAIL_ARGS)
         }
-        if (roomDetailArgs == null) return
-        intent.putExtra(Mavericks.KEY_ARG, roomDetailArgs)
-        currentRoomId = roomDetailArgs.roomId
+        if (timelineArgs == null) return
+        intent.putExtra(Mavericks.KEY_ARG, timelineArgs)
+        currentRoomId = timelineArgs.roomId
 
         if (isFirstCreation()) {
-            replaceFragment(views.roomDetailContainer, RoomDetailFragment::class.java, roomDetailArgs)
+            replaceFragment(views.roomDetailContainer, TimelineFragment::class.java, timelineArgs)
             replaceFragment(views.roomDetailDrawerContainer, BreadcrumbsFragment::class.java)
         }
 
@@ -145,7 +145,7 @@ class RoomDetailActivity :
         if (currentRoomId != switchToRoom.roomId) {
             currentRoomId = switchToRoom.roomId
             requireActiveMembershipViewModel.handle(RequireActiveMembershipAction.ChangeRoom(switchToRoom.roomId))
-            replaceFragment(views.roomDetailContainer, RoomDetailFragment::class.java, RoomDetailArgs(switchToRoom.roomId))
+            replaceFragment(views.roomDetailContainer, TimelineFragment::class.java, TimelineArgs(switchToRoom.roomId))
         }
     }
 
@@ -157,14 +157,8 @@ class RoomDetailActivity :
     }
 
     private val drawerListener = object : DrawerLayout.SimpleDrawerListener() {
-        private var drawerScreenEvent: ScreenEvent? = null
         override fun onDrawerOpened(drawerView: View) {
-            drawerScreenEvent = ScreenEvent(Screen.ScreenName.MobileBreadcrumbs)
-        }
-
-        override fun onDrawerClosed(drawerView: View) {
-            drawerScreenEvent?.send(analyticsTracker)
-            drawerScreenEvent = null
+            analyticsTracker.screen(MobileScreen(screenName = MobileScreen.ScreenName.Breadcrumbs))
         }
 
         override fun onDrawerStateChanged(newState: Int) {
@@ -196,9 +190,9 @@ class RoomDetailActivity :
         const val EXTRA_ROOM_ID = "EXTRA_ROOM_ID"
         const val ACTION_ROOM_DETAILS_FROM_SHORTCUT = "ROOM_DETAILS_FROM_SHORTCUT"
 
-        fun newIntent(context: Context, roomDetailArgs: RoomDetailArgs): Intent {
+        fun newIntent(context: Context, timelineArgs: TimelineArgs): Intent {
             return Intent(context, RoomDetailActivity::class.java).apply {
-                putExtra(EXTRA_ROOM_DETAIL_ARGS, roomDetailArgs)
+                putExtra(EXTRA_ROOM_DETAIL_ARGS, timelineArgs)
             }
         }
 
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 86240a5ffe..d08a27324c 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
@@ -29,7 +29,7 @@ import java.io.File
  * Transient events for RoomDetail
  */
 sealed class RoomDetailViewEvents : VectorViewEvents {
-    data class Failure(val throwable: Throwable) : RoomDetailViewEvents()
+    data class Failure(val throwable: Throwable, val showInDialog: Boolean = false) : RoomDetailViewEvents()
     data class OnNewTimelineEvents(val eventIds: List<String>) : RoomDetailViewEvents()
 
     data class ActionSuccess(val action: RoomDetailAction) : 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 d963030013..71a299e11b 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
@@ -19,6 +19,7 @@ package im.vector.app.features.home.room.detail
 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 org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.initsync.SyncStatusService
@@ -26,6 +27,7 @@ import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 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.sync.SyncState
+import org.matrix.android.sdk.api.session.threads.ThreadNotificationBadgeState
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 
@@ -47,6 +49,7 @@ data class JitsiState(
 data class RoomDetailViewState(
         val roomId: String,
         val eventId: String?,
+        val isInviteAlreadyAccepted: Boolean,
         val myRoomMember: Async<RoomMemberSummary> = Uninitialized,
         val asyncInviter: Async<RoomMemberSummary> = Uninitialized,
         val asyncRoomSummary: Async<RoomSummary> = Uninitialized,
@@ -67,22 +70,30 @@ data class RoomDetailViewState(
         val isAllowedToSetupEncryption: Boolean = true,
         val hasFailedSending: Boolean = false,
         val jitsiState: JitsiState = JitsiState(),
-        val switchToParentSpace: Boolean = false
+        val switchToParentSpace: Boolean = false,
+        val rootThreadEventId: String? = null,
+        val threadNotificationBadgeState: ThreadNotificationBadgeState = ThreadNotificationBadgeState()
 ) : MavericksState {
 
-    constructor(args: RoomDetailArgs) : this(
+    constructor(args: TimelineArgs) : this(
             roomId = args.roomId,
             eventId = args.eventId,
+            isInviteAlreadyAccepted = args.isInviteAlreadyAccepted,
             // Also highlight the target event, if any
             highlightedEventId = args.eventId,
-            switchToParentSpace = args.switchToParentSpace
+            switchToParentSpace = args.switchToParentSpace,
+            rootThreadEventId = args.threadTimelineArgs?.rootThreadEventId
     )
 
     fun isWebRTCCallOptionAvailable() = (asyncRoomSummary.invoke()?.joinedMembersCount ?: 0) <= 2
 
+    fun isSearchAvailable() = asyncRoomSummary()?.isEncrypted == false
+
     // This checks directly on the active room widgets.
     // It can differs for a short period of time on the JitsiState as its computed async.
     fun hasActiveJitsiWidget() = activeRoomWidgets()?.any { it.type == WidgetType.Jitsi && it.isActive }.orFalse()
 
     fun isDm() = asyncRoomSummary()?.isDirect == true
+
+    fun isThreadTimeline() = rootThreadEventId != null
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
index 6b5ed3ba66..193dc42f33 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
@@ -32,7 +32,7 @@ class StartCallActionsHandler(
         private val fragment: Fragment,
         private val callManager: WebRtcCallManager,
         private val vectorPreferences: VectorPreferences,
-        private val roomDetailViewModel: RoomDetailViewModel,
+        private val timelineViewModel: TimelineViewModel,
         private val startCallActivityResultLauncher: ActivityResultLauncher<Array<String>>,
         private val showDialogWithMessage: (String) -> Unit,
         private val onTapToReturnToCall: () -> Unit) {
@@ -45,7 +45,7 @@ class StartCallActionsHandler(
         handleCallRequest(false)
     }
 
-    private fun handleCallRequest(isVideoCall: Boolean) = withState(roomDetailViewModel) { state ->
+    private fun handleCallRequest(isVideoCall: Boolean) = withState(timelineViewModel) { state ->
         val roomSummary = state.asyncRoomSummary.invoke() ?: return@withState
         when (roomSummary.joinedMembersCount) {
             1    -> {
@@ -95,7 +95,7 @@ class StartCallActionsHandler(
                                 .setMessage(R.string.audio_video_meeting_description)
                                 .setPositiveButton(fragment.getString(R.string.create)) { _, _ ->
                                     // create the widget, then navigate to it..
-                                    roomDetailViewModel.handle(RoomDetailAction.AddJitsiWidget(isVideoCall))
+                                    timelineViewModel.handle(RoomDetailAction.AddJitsiWidget(isVideoCall))
                                 }
                                 .setNegativeButton(fragment.getString(R.string.action_cancel), null)
                                 .show()
@@ -121,22 +121,22 @@ class StartCallActionsHandler(
 
     private fun safeStartCall2(isVideoCall: Boolean) {
         val startCallAction = RoomDetailAction.StartCall(isVideoCall)
-        roomDetailViewModel.pendingAction = startCallAction
+        timelineViewModel.pendingAction = startCallAction
         if (isVideoCall) {
             if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL,
                             fragment.requireActivity(),
                             startCallActivityResultLauncher,
                             R.string.permissions_rationale_msg_camera_and_audio)) {
-                roomDetailViewModel.pendingAction = null
-                roomDetailViewModel.handle(startCallAction)
+                timelineViewModel.pendingAction = null
+                timelineViewModel.handle(startCallAction)
             }
         } else {
             if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL,
                             fragment.requireActivity(),
                             startCallActivityResultLauncher,
                             R.string.permissions_rationale_msg_record_audio)) {
-                roomDetailViewModel.pendingAction = null
-                roomDetailViewModel.handle(startCallAction)
+                timelineViewModel.pendingAction = null
+                timelineViewModel.handle(startCallAction)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
similarity index 81%
rename from vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index b58a1d627e..b6cbd538f3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -25,7 +25,6 @@ import android.graphics.Typeface
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.os.Parcelable
 import android.text.Spannable
 import android.text.format.DateUtils
 import android.view.HapticFeedbackConstants
@@ -37,12 +36,14 @@ 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.annotation.StringRes
 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
@@ -87,6 +88,7 @@ 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.ColorProvider
+import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.core.time.Clock
 import im.vector.app.core.ui.views.CurrentCallsView
 import im.vector.app.core.ui.views.CurrentCallsViewPresenter
@@ -116,9 +118,9 @@ import im.vector.app.core.utils.shareText
 import im.vector.app.core.utils.startInstallFromSourceIntent
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.DialogReportContentBinding
-import im.vector.app.databinding.FragmentRoomDetailBinding
-import im.vector.app.features.analytics.plan.Click
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.databinding.FragmentTimelineBinding
+import im.vector.app.features.analytics.plan.Composer
+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
@@ -136,6 +138,7 @@ import im.vector.app.features.command.Command
 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
@@ -167,6 +170,7 @@ import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
 import im.vector.app.features.home.room.detail.upgrade.MigrateRoomBottomSheet
 import im.vector.app.features.home.room.detail.views.RoomDetailLazyLoadedViews
 import im.vector.app.features.home.room.detail.widget.RoomWidgetsBottomSheet
+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
@@ -200,7 +204,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlinx.parcelize.Parcelize
 import nl.dionsegijn.konfetti.models.Shape
 import nl.dionsegijn.konfetti.models.Size
 import org.billcarsonfr.jsonviewer.JSonViewerDialog
@@ -240,16 +243,7 @@ import java.net.URL
 import java.util.UUID
 import javax.inject.Inject
 
-@Parcelize
-data class RoomDetailArgs(
-        val roomId: String,
-        val eventId: String? = null,
-        val sharedData: SharedData? = null,
-        val openShareSpaceForId: String? = null,
-        val switchToParentSpace: Boolean = false
-) : Parcelable
-
-class RoomDetailFragment @Inject constructor(
+class TimelineFragment @Inject constructor(
         private val session: Session,
         private val avatarRenderer: AvatarRenderer,
         private val timelineEventController: TimelineEventController,
@@ -260,6 +254,7 @@ class RoomDetailFragment @Inject constructor(
         private val vectorPreferences: VectorPreferences,
         private val colorProvider: ColorProvider,
         private val dimensionConverter: DimensionConverter,
+        private val userPreferencesProvider: UserPreferencesProvider,
         private val notificationUtils: NotificationUtils,
         private val matrixItemColorProvider: MatrixItemColorProvider,
         private val imageContentRenderer: ImageContentRenderer,
@@ -269,7 +264,7 @@ class RoomDetailFragment @Inject constructor(
         private val voiceMessagePlaybackTracker: VoiceMessagePlaybackTracker,
         private val clock: Clock
 ) :
-        VectorBaseFragment<FragmentRoomDetailBinding>(),
+        VectorBaseFragment<FragmentTimelineBinding>(),
         TimelineEventController.Callback,
         VectorInviteView.Callback,
         AttachmentTypeSelectorView.Callback,
@@ -297,31 +292,34 @@ class RoomDetailFragment @Inject constructor(
 
     private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
 
-    private val roomDetailArgs: RoomDetailArgs by args()
+    private val timelineArgs: TimelineArgs by args()
     private val glideRequests by lazy {
         GlideApp.with(this)
     }
     private val pillsPostProcessor by lazy {
-        pillsPostProcessorFactory.create(roomDetailArgs.roomId)
+        pillsPostProcessorFactory.create(timelineArgs.roomId)
     }
 
     private val autoCompleter: AutoCompleter by lazy {
-        autoCompleterFactory.create(roomDetailArgs.roomId)
+        autoCompleterFactory.create(timelineArgs.roomId, isThreadTimeLine())
     }
-    private val roomDetailViewModel: RoomDetailViewModel by fragmentViewModel()
+
+    private val timelineViewModel: TimelineViewModel by fragmentViewModel()
     private val messageComposerViewModel: MessageComposerViewModel by fragmentViewModel()
     private val debouncer = Debouncer(createUIHandler())
 
     private lateinit var scrollOnNewMessageCallback: ScrollOnNewMessageCallback
     private lateinit var scrollOnHighlightedEventCallback: ScrollOnHighlightedEventCallback
 
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRoomDetailBinding {
-        return FragmentRoomDetailBinding.inflate(inflater, container, false)
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentTimelineBinding {
+        return FragmentTimelineBinding.inflate(inflater, container, false)
     }
 
     override fun getMenuRes() = R.menu.menu_timeline
 
     private lateinit var sharedActionViewModel: MessageSharedActionViewModel
+    private lateinit var sharedActivityActionViewModel: RoomDetailSharedActionViewModel
+
     private lateinit var knownCallsViewModel: SharedKnownCallsViewModel
 
     private lateinit var layoutManager: LinearLayoutManager
@@ -344,10 +342,10 @@ class RoomDetailFragment @Inject constructor(
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.Room
+        analyticsScreenName = MobileScreen.ScreenName.Room
         setFragmentResultListener(MigrateRoomBottomSheet.REQUEST_KEY) { _, bundle ->
             bundle.getString(MigrateRoomBottomSheet.BUNDLE_KEY_REPLACEMENT_ROOM)?.let { replacementRoomId ->
-                roomDetailViewModel.handle(RoomDetailAction.RoomUpgradeSuccess(replacementRoomId))
+                timelineViewModel.handle(RoomDetailAction.RoomUpgradeSuccess(replacementRoomId))
             }
         }
     }
@@ -356,13 +354,14 @@ class RoomDetailFragment @Inject constructor(
         lifecycle.addObserver(ConferenceEventObserver(vectorBaseActivity, this::onBroadcastJitsiEvent))
         super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
+        sharedActivityActionViewModel = activityViewModelProvider.get(RoomDetailSharedActionViewModel::class.java)
         knownCallsViewModel = activityViewModelProvider.get(SharedKnownCallsViewModel::class.java)
         attachmentsHelper = AttachmentsHelper(requireContext(), this).register()
         callActionsHandler = StartCallActionsHandler(
-                roomId = roomDetailArgs.roomId,
+                roomId = timelineArgs.roomId,
                 fragment = this,
                 vectorPreferences = vectorPreferences,
-                roomDetailViewModel = roomDetailViewModel,
+                timelineViewModel = timelineViewModel,
                 callManager = callManager,
                 startCallActivityResultLauncher = startCallActivityResultLauncher,
                 showDialogWithMessage = ::showDialogWithMessage,
@@ -382,8 +381,8 @@ class RoomDetailFragment @Inject constructor(
         setupRemoveJitsiWidgetView()
         setupVoiceMessageView()
 
-        views.roomToolbarContentView.debouncedClicks {
-            navigator.openRoomProfile(requireActivity(), roomDetailArgs.roomId)
+        views.includeRoomToolbar.roomToolbarContentView.debouncedClicks {
+            navigator.openRoomProfile(requireActivity(), timelineArgs.roomId)
         }
 
         sharedActionViewModel
@@ -400,7 +399,7 @@ class RoomDetailFragment @Inject constructor(
                     invalidateOptionsMenu()
                 }
 
-        roomDetailViewModel.onEach(RoomDetailViewState::canShowJumpToReadMarker, RoomDetailViewState::unreadState) { _, _ ->
+        timelineViewModel.onEach(RoomDetailViewState::canShowJumpToReadMarker, RoomDetailViewState::unreadState) { _, _ ->
             updateJumpToReadMarkerViewVisibility()
         }
 
@@ -417,7 +416,7 @@ class RoomDetailFragment @Inject constructor(
             }
         }
 
-        roomDetailViewModel.onEach(
+        timelineViewModel.onEach(
                 RoomDetailViewState::syncState,
                 RoomDetailViewState::incrementalSyncStatus,
                 RoomDetailViewState::pushCounter
@@ -447,9 +446,9 @@ class RoomDetailFragment @Inject constructor(
             }.exhaustive
         }
 
-        roomDetailViewModel.observeViewEvents {
+        timelineViewModel.observeViewEvents {
             when (it) {
-                is RoomDetailViewEvents.Failure                          -> showErrorInSnackbar(it.throwable)
+                is RoomDetailViewEvents.Failure                          -> displayErrorMessage(it)
                 is RoomDetailViewEvents.OnNewTimelineEvents              -> scrollOnNewMessageCallback.addNewTimelineEventIds(it.eventIds)
                 is RoomDetailViewEvents.ActionSuccess                    -> displayRoomDetailActionSuccess(it)
                 is RoomDetailViewEvents.ActionFailure                    -> displayRoomDetailActionFailure(it)
@@ -470,7 +469,7 @@ class RoomDetailFragment @Inject constructor(
                 RoomDetailViewEvents.HideWaitingView                     -> vectorBaseActivity.hideWaitingView()
                 is RoomDetailViewEvents.RequestNativeWidgetPermission    -> requestNativeWidgetPermission(it)
                 is RoomDetailViewEvents.OpenRoom                         -> handleOpenRoom(it)
-                RoomDetailViewEvents.OpenInvitePeople                    -> navigator.openInviteUsersToRoom(requireContext(), roomDetailArgs.roomId)
+                RoomDetailViewEvents.OpenInvitePeople                    -> navigator.openInviteUsersToRoom(requireContext(), timelineArgs.roomId)
                 RoomDetailViewEvents.OpenSetRoomAvatarDialog             -> galleryOrCameraDialogHelper.show()
                 RoomDetailViewEvents.OpenRoomSettings                    -> handleOpenRoomSettings(RoomProfileActivity.EXTRA_DIRECT_ACCESS_ROOM_SETTINGS)
                 RoomDetailViewEvents.OpenRoomProfile                     -> handleOpenRoomSettings()
@@ -513,12 +512,12 @@ class RoomDetailFragment @Inject constructor(
 
     private fun setupRemoveJitsiWidgetView() {
         views.removeJitsiWidgetView.onCompleteSliding = {
-            withState(roomDetailViewModel) {
+            withState(timelineViewModel) {
                 val jitsiWidgetId = it.jitsiState.widgetId ?: return@withState
                 if (it.jitsiState.hasJoined) {
                     leaveJitsiConference()
                 }
-                roomDetailViewModel.handle(RoomDetailAction.RemoveWidget(jitsiWidgetId))
+                timelineViewModel.handle(RoomDetailAction.RemoveWidget(jitsiWidgetId))
             }
         }
     }
@@ -528,7 +527,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun onBroadcastJitsiEvent(conferenceEvent: ConferenceEvent) {
-        roomDetailViewModel.handle(RoomDetailAction.UpdateJoinJitsiCallStatus(conferenceEvent))
+        timelineViewModel.handle(RoomDetailAction.UpdateJoinJitsiCallStatus(conferenceEvent))
     }
 
     private fun onCannotRecord() {
@@ -554,7 +553,7 @@ class RoomDetailFragment @Inject constructor(
 
     private fun handleShowRoomUpgradeDialog(roomDetailViewEvents: MessageComposerViewEvents.ShowRoomUpgradeDialog) {
         val tag = MigrateRoomBottomSheet::javaClass.name
-        MigrateRoomBottomSheet.newInstance(roomDetailArgs.roomId, roomDetailViewEvents.newVersion)
+        MigrateRoomBottomSheet.newInstance(timelineArgs.roomId, roomDetailViewEvents.newVersion)
                 .show(parentFragmentManager, tag)
     }
 
@@ -589,7 +588,7 @@ class RoomDetailFragment @Inject constructor(
 
     override fun onImageReady(uri: Uri?) {
         uri ?: return
-        roomDetailViewModel.handle(
+        timelineViewModel.handle(
                 RoomDetailAction.SetAvatarAction(
                         newAvatarUri = uri,
                         newAvatarFileName = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString()
@@ -600,7 +599,7 @@ class RoomDetailFragment @Inject constructor(
     private fun handleOpenRoomSettings(directAccess: Int? = null) {
         navigator.openRoomProfile(
                 requireContext(),
-                roomDetailArgs.roomId,
+                timelineArgs.roomId,
                 directAccess
         )
     }
@@ -613,16 +612,21 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun handleShowLocationPreview(locationContent: MessageLocationContent, senderId: String) {
+        val isSelfLocation = locationContent.isSelfLocation()
         navigator
                 .openLocationSharing(
                         context = requireContext(),
-                        roomId = roomDetailArgs.roomId,
+                        roomId = timelineArgs.roomId,
                         mode = LocationSharingMode.PREVIEW,
                         initialLocationData = locationContent.toLocationData(),
-                        locationOwnerId = senderId
+                        locationOwnerId = if (isSelfLocation) senderId else null
                 )
     }
 
+    private fun displayErrorMessage(error: RoomDetailViewEvents.Failure) {
+        if (error.showInDialog) displayErrorDialog(error.throwable) else showErrorInSnackbar(error.throwable)
+    }
+
     private fun requestNativeWidgetPermission(it: RoomDetailViewEvents.RequestNativeWidgetPermission) {
         val tag = RoomWidgetPermissionBottomSheet::class.java.name
         val dFrag = childFragmentManager.findFragmentByTag(tag) as? RoomWidgetPermissionBottomSheet
@@ -633,13 +637,13 @@ class RoomDetailFragment @Inject constructor(
                     WidgetArgs(
                             baseUrl = it.domain,
                             kind = WidgetKind.ROOM,
-                            roomId = roomDetailArgs.roomId,
+                            roomId = timelineArgs.roomId,
                             widgetId = it.widget.widgetId
                     )
             ).apply {
                 directListener = { granted ->
                     if (granted) {
-                        roomDetailViewModel.handle(RoomDetailAction.EnsureNativeWidgetAllowed(
+                        timelineViewModel.handle(RoomDetailAction.EnsureNativeWidgetAllowed(
                                 widget = it.widget,
                                 userJustAccepted = true,
                                 grantedEvents = it.grantedEvents
@@ -659,7 +663,7 @@ class RoomDetailFragment @Inject constructor(
         navigator.openIntegrationManager(
                 context = requireContext(),
                 activityResultLauncher = integrationManagerActivityResultLauncher,
-                roomId = roomDetailArgs.roomId,
+                roomId = timelineArgs.roomId,
                 integId = null,
                 screen = screen
         )
@@ -719,13 +723,13 @@ class RoomDetailFragment @Inject constructor(
                         .setMessage(getString(R.string.event_status_delete_all_failed_dialog_message))
                         .setNegativeButton(R.string.no, null)
                         .setPositiveButton(R.string.yes) { _, _ ->
-                            roomDetailViewModel.handle(RoomDetailAction.RemoveAllFailedMessages)
+                            timelineViewModel.handle(RoomDetailAction.RemoveAllFailedMessages)
                         }
                         .show()
             }
 
             override fun onRetryClicked() {
-                roomDetailViewModel.handle(RoomDetailAction.ResendAll)
+                timelineViewModel.handle(RoomDetailAction.ResendAll)
             }
         }
     }
@@ -747,7 +751,7 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onVoiceRecordingCancelled() {
-                messageComposerViewModel.handle(MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true))
+                messageComposerViewModel.handle(MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true, rootThreadEventId = getRootThreadEventId()))
                 vibrate(requireContext())
                 updateRecordingUiState(RecordingUiState.Idle)
             }
@@ -763,37 +767,42 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onSendVoiceMessage() {
-                messageComposerViewModel.handle(MessageComposerAction.EndRecordingVoiceMessage(isCancelled = false))
+                messageComposerViewModel.handle(
+                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = false, rootThreadEventId = getRootThreadEventId()))
                 updateRecordingUiState(RecordingUiState.Idle)
             }
 
             override fun onDeleteVoiceMessage() {
-                messageComposerViewModel.handle(MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true))
+                messageComposerViewModel.handle(
+                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true, rootThreadEventId = getRootThreadEventId()))
                 updateRecordingUiState(RecordingUiState.Idle)
             }
 
             override fun onRecordingLimitReached() {
-                messageComposerViewModel.handle(MessageComposerAction.PauseRecordingVoiceMessage)
+                messageComposerViewModel.handle(
+                        MessageComposerAction.PauseRecordingVoiceMessage)
                 updateRecordingUiState(RecordingUiState.Draft)
             }
 
             override fun onRecordingWaveformClicked() {
-                messageComposerViewModel.handle(MessageComposerAction.PauseRecordingVoiceMessage)
+                messageComposerViewModel.handle(
+                        MessageComposerAction.PauseRecordingVoiceMessage)
                 updateRecordingUiState(RecordingUiState.Draft)
             }
 
             private fun updateRecordingUiState(state: RecordingUiState) {
-                messageComposerViewModel.handle(MessageComposerAction.OnVoiceRecordingUiStateChanged(state))
+                messageComposerViewModel.handle(
+                        MessageComposerAction.OnVoiceRecordingUiStateChanged(state))
             }
         }
     }
 
     private fun joinJitsiRoom(jitsiWidget: Widget, enableVideo: Boolean) {
-        navigator.openRoomWidget(requireContext(), roomDetailArgs.roomId, jitsiWidget, mapOf(JitsiCallViewModel.ENABLE_VIDEO_OPTION to enableVideo))
+        navigator.openRoomWidget(requireContext(), timelineArgs.roomId, jitsiWidget, mapOf(JitsiCallViewModel.ENABLE_VIDEO_OPTION to enableVideo))
     }
 
     private fun openStickerPicker(event: RoomDetailViewEvents.OpenStickerPicker) {
-        navigator.openStickerPicker(requireContext(), stickerActivityResultLauncher, roomDetailArgs.roomId, event.widget)
+        navigator.openStickerPicker(requireContext(), stickerActivityResultLauncher, timelineArgs.roomId, event.widget)
     }
 
     private fun startOpenFileIntent(action: RoomDetailViewEvents.OpenFile) {
@@ -817,7 +826,7 @@ class RoomDetailFragment @Inject constructor(
         val safeContext = context ?: return
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             if (!safeContext.packageManager.canRequestPackageInstalls()) {
-                roomDetailViewModel.pendingEvent = action
+                timelineViewModel.pendingEvent = action
                 startInstallFromSourceIntent(safeContext, installApkActivityResultLauncher)
             } else {
                 openFile(action)
@@ -829,7 +838,7 @@ class RoomDetailFragment @Inject constructor(
 
     private val installApkActivityResultLauncher = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
-            roomDetailViewModel.pendingEvent?.let {
+            timelineViewModel.pendingEvent?.let {
                 if (it is RoomDetailViewEvents.OpenFile) {
                     openFile(it)
                 }
@@ -837,7 +846,7 @@ class RoomDetailFragment @Inject constructor(
         } else {
             // User cancelled
         }
-        roomDetailViewModel.pendingEvent = null
+        timelineViewModel.pendingEvent = null
     }
 
     private fun displayPromptForIntegrationManager() {
@@ -863,7 +872,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun handleShareData() {
-        when (val sharedData = roomDetailArgs.sharedData) {
+        when (val sharedData = timelineArgs.sharedData) {
             is SharedData.Text        -> {
                 messageComposerViewModel.handle(MessageComposerAction.EnterRegularMode(sharedData.text, fromSharing = true))
             }
@@ -876,7 +885,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun handleSpaceShare() {
-        roomDetailArgs.openShareSpaceForId?.let { spaceId ->
+        timelineArgs.openShareSpaceForId?.let { spaceId ->
             ShareSpaceBottomSheet.show(childFragmentManager, spaceId, true)
             view?.post {
                 handleChatEffect(ChatEffect.CONFETTI)
@@ -897,18 +906,18 @@ class RoomDetailFragment @Inject constructor(
     }
 
     override fun onDestroy() {
-        roomDetailViewModel.handle(RoomDetailAction.ExitTrackingUnreadMessagesState)
+        timelineViewModel.handle(RoomDetailAction.ExitTrackingUnreadMessagesState)
         super.onDestroy()
     }
 
     private fun setupJumpToBottomView() {
         views.jumpToBottomView.visibility = View.INVISIBLE
         views.jumpToBottomView.debouncedClicks {
-            roomDetailViewModel.handle(RoomDetailAction.ExitTrackingUnreadMessagesState)
+            timelineViewModel.handle(RoomDetailAction.ExitTrackingUnreadMessagesState)
             views.jumpToBottomView.visibility = View.INVISIBLE
-            if (!roomDetailViewModel.timeline.isLive) {
+            if (!timelineViewModel.timeline.isLive) {
                 scrollOnNewMessageCallback.forceScrollOnNextUpdate()
-                roomDetailViewModel.timeline.restartWithEventId(null)
+                timelineViewModel.timeline.restartWithEventId(null)
             } else {
                 layoutManager.scrollToPosition(0)
             }
@@ -927,7 +936,7 @@ class RoomDetailFragment @Inject constructor(
             onJumpToReadMarkerClicked()
         }
         views.jumpToReadMarkerView.setOnCloseIconClickListener {
-            roomDetailViewModel.handle(RoomDetailAction.MarkAllAsRead)
+            timelineViewModel.handle(RoomDetailAction.MarkAllAsRead)
         }
     }
 
@@ -970,11 +979,11 @@ class RoomDetailFragment @Inject constructor(
     private fun setupNotificationView() {
         views.notificationAreaView.delegate = object : NotificationAreaView.Delegate {
             override fun onTombstoneEventClicked() {
-                roomDetailViewModel.handle(RoomDetailAction.JoinAndOpenReplacementRoom)
+                timelineViewModel.handle(RoomDetailAction.JoinAndOpenReplacementRoom)
             }
 
             override fun onMisconfiguredEncryptionClicked() {
-                roomDetailViewModel.handle(RoomDetailAction.OnClickMisconfiguredEncryption)
+                timelineViewModel.handle(RoomDetailAction.OnClickMisconfiguredEncryption)
             }
         }
     }
@@ -989,15 +998,23 @@ class RoomDetailFragment @Inject constructor(
         }
         val joinConfItem = menu.findItem(R.id.join_conference)
         (joinConfItem.actionView as? JoinConferenceView)?.onJoinClicked = {
-            roomDetailViewModel.handle(RoomDetailAction.JoinJitsiCall)
+            timelineViewModel.handle(RoomDetailAction.JoinJitsiCall)
+        }
+
+        // Custom thread notification menu item
+        menu.findItem(R.id.menu_timeline_thread_list)?.let { menuItem ->
+            menuItem.actionView.setOnClickListener {
+                onOptionsItemSelected(menuItem)
+            }
         }
     }
 
     override fun onPrepareOptionsMenu(menu: Menu) {
         menu.forEach {
-            it.isVisible = roomDetailViewModel.isMenuItemVisible(it.itemId)
+            it.isVisible = timelineViewModel.isMenuItemVisible(it.itemId)
         }
-        withState(roomDetailViewModel) { state ->
+
+        withState(timelineViewModel) { state ->
             // Set the visual state of the call buttons (voice/video) to enabled/disabled according to user permissions
             val hasCallInRoom = callManager.getCallsByRoomId(state.roomId).isNotEmpty() || state.jitsiState.hasJoined
             val callButtonsEnabled = !hasCallInRoom && when (state.asyncRoomSummary.invoke()?.joinedMembersCount) {
@@ -1028,49 +1045,113 @@ class RoomDetailFragment @Inject constructor(
                 actionView.findViewById<TextView>(R.id.cart_badge).setTextOrHide("$widgetsCount")
                 matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
             }
+
+            // Handle custom threads badge notification
+            updateMenuThreadNotificationBadge(menu, state)
         }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.invite           -> {
-                navigator.openInviteUsersToRoom(requireActivity(), roomDetailArgs.roomId)
+            R.id.invite                            -> {
+                navigator.openInviteUsersToRoom(requireActivity(), timelineArgs.roomId)
                 true
             }
-            R.id.timeline_setting -> {
-                navigator.openRoomProfile(requireActivity(), roomDetailArgs.roomId)
+            R.id.timeline_setting                  -> {
+                navigator.openRoomProfile(requireActivity(), timelineArgs.roomId)
                 true
             }
-            R.id.open_matrix_apps -> {
-                roomDetailViewModel.handle(RoomDetailAction.ManageIntegrations)
+            R.id.open_matrix_apps                  -> {
+                timelineViewModel.handle(RoomDetailAction.ManageIntegrations)
                 true
             }
-            R.id.voice_call       -> {
+            R.id.voice_call                        -> {
                 callActionsHandler.onVoiceCallClicked()
                 true
             }
-            R.id.video_call       -> {
+            R.id.video_call                        -> {
                 callActionsHandler.onVideoCallClicked()
                 true
             }
-            R.id.search           -> {
+            R.id.menu_timeline_thread_list         -> {
+                navigateToThreadList()
+                true
+            }
+            R.id.search                            -> {
                 handleSearchAction()
                 true
             }
-            R.id.dev_tools        -> {
-                navigator.openDevTools(requireContext(), roomDetailArgs.roomId)
+            R.id.dev_tools                         -> {
+                navigator.openDevTools(requireContext(), timelineArgs.roomId)
                 true
             }
-            else                  -> super.onOptionsItemSelected(item)
+            R.id.menu_thread_timeline_copy_link    -> {
+                getRootThreadEventId()?.let {
+                    val permalink = session.permalinkService().createPermalink(timelineArgs.roomId, it)
+                    copyToClipboard(requireContext(), permalink, false)
+                    showSnackWithMessage(getString(R.string.copied_to_clipboard))
+                }
+                true
+            }
+            R.id.menu_thread_timeline_view_in_room -> {
+                handleViewInRoomAction()
+                true
+            }
+            R.id.menu_thread_timeline_share        -> {
+                getRootThreadEventId()?.let {
+                    val permalink = session.permalinkService().createPermalink(timelineArgs.roomId, it)
+                    shareText(requireContext(), permalink)
+                }
+                true
+            }
+            else                                   -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    /**
+     * Update menu thread notification badge appropriately
+     */
+    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 badgeTextView = menuThreadList.findViewById<TextView>(R.id.threadNotificationBadgeTextView)
+
+        val unreadThreadMessages = state.threadNotificationBadgeState.numberOfLocalUnreadThreads
+        val userIsMentioned = state.threadNotificationBadgeState.isUserMentioned
+
+        if (unreadThreadMessages > 0) {
+            badgeFrameLayout.isVisible = true
+            badgeTextView.text = unreadThreadMessages.toString()
+            val badgeDrawable = DrawableCompat.wrap(badgeFrameLayout.background)
+            val color = ContextCompat.getColor(requireContext(), if (userIsMentioned) R.color.palette_vermilion else R.color.palette_gray_200)
+            DrawableCompat.setTint(badgeDrawable, color)
+            badgeFrameLayout.background = badgeDrawable
+        } else {
+            badgeFrameLayout.isVisible = false
+        }
+    }
+
+    /**
+     * View and highlight the original root thread message in the main timeline
+     */
+    private fun handleViewInRoomAction() {
+        getRootThreadEventId()?.let {
+            val newRoom = timelineArgs.copy(threadTimelineArgs = null, eventId = it)
+            context?.let { con ->
+                val int = RoomDetailActivity.newIntent(con, newRoom)
+                int.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
+                con.startActivity(int)
+            }
         }
     }
 
     private fun handleSearchAction() {
-        if (session.getRoom(roomDetailArgs.roomId)?.isEncrypted() == false) {
-            navigator.openSearch(requireContext(), roomDetailArgs.roomId)
-        } else {
-            showDialogWithMessage(getString(R.string.search_is_not_supported_in_e2e_room))
-        }
+        navigator.openSearch(
+                context = requireContext(),
+                roomId = timelineArgs.roomId,
+                roomDisplayName = timelineViewModel.getRoomSummary()?.displayName,
+                roomAvatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl
+        )
     }
 
     private fun displayDisabledIntegrationDialog() {
@@ -1150,7 +1231,7 @@ class RoomDetailFragment @Inject constructor(
 
     override fun onResume() {
         super.onResume()
-        notificationDrawerManager.setCurrentRoom(roomDetailArgs.roomId)
+        notificationDrawerManager.setCurrentRoom(timelineArgs.roomId)
         roomDetailPendingActionStore.data?.let { handlePendingAction(it) }
         roomDetailPendingActionStore.data = null
 
@@ -1161,11 +1242,11 @@ class RoomDetailFragment @Inject constructor(
     private fun handlePendingAction(roomDetailPendingAction: RoomDetailPendingAction) {
         when (roomDetailPendingAction) {
             is RoomDetailPendingAction.JumpToReadReceipt ->
-                roomDetailViewModel.handle(RoomDetailAction.JumpToReadReceipt(roomDetailPendingAction.userId))
+                timelineViewModel.handle(RoomDetailAction.JumpToReadReceipt(roomDetailPendingAction.userId))
             is RoomDetailPendingAction.MentionUser       ->
                 insertUserDisplayNameInTextEditor(roomDetailPendingAction.userId)
             is RoomDetailPendingAction.OpenOrCreateDm    ->
-                roomDetailViewModel.handle(RoomDetailAction.OpenOrCreateDm(roomDetailPendingAction.userId))
+                timelineViewModel.handle(RoomDetailAction.OpenOrCreateDm(roomDetailPendingAction.userId))
             is RoomDetailPendingAction.OpenRoom          ->
                 handleOpenRoom(RoomDetailViewEvents.OpenRoom(roomDetailPendingAction.roomId, roomDetailPendingAction.closeCurrentRoom))
         }.exhaustive
@@ -1218,7 +1299,7 @@ class RoomDetailFragment @Inject constructor(
         if (activityResult.resultCode == Activity.RESULT_OK) {
             val sendData = AttachmentsPreviewActivity.getOutput(data)
             val keepOriginalSize = AttachmentsPreviewActivity.getKeepOriginalSize(data)
-            roomDetailViewModel.handle(RoomDetailAction.SendMedia(sendData, !keepOriginalSize))
+            timelineViewModel.handle(RoomDetailAction.SendMedia(sendData, !keepOriginalSize))
         }
     }
 
@@ -1227,7 +1308,7 @@ class RoomDetailFragment @Inject constructor(
             val eventId = EmojiReactionPickerActivity.getOutputEventId(activityResult.data)
             val reaction = EmojiReactionPickerActivity.getOutputReaction(activityResult.data)
             if (eventId != null && reaction != null) {
-                roomDetailViewModel.handle(RoomDetailAction.SendReaction(eventId, reaction))
+                timelineViewModel.handle(RoomDetailAction.SendReaction(eventId, reaction))
             }
         }
     }
@@ -1237,16 +1318,16 @@ class RoomDetailFragment @Inject constructor(
         if (activityResult.resultCode == Activity.RESULT_OK) {
             WidgetActivity.getOutput(data).toModel<MessageStickerContent>()
                     ?.let { content ->
-                        roomDetailViewModel.handle(RoomDetailAction.SendSticker(content))
+                        timelineViewModel.handle(RoomDetailAction.SendSticker(content))
                     }
         }
     }
 
     private val startCallActivityResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
         if (allGranted) {
-            (roomDetailViewModel.pendingAction as? RoomDetailAction.StartCall)?.let {
-                roomDetailViewModel.pendingAction = null
-                roomDetailViewModel.handle(it)
+            (timelineViewModel.pendingAction as? RoomDetailAction.StartCall)?.let {
+                timelineViewModel.pendingAction = null
+                timelineViewModel.handle(it)
             }
         } else {
             if (deniedPermanently) {
@@ -1260,7 +1341,7 @@ class RoomDetailFragment @Inject constructor(
 
     private fun setupRecyclerView() {
         timelineEventController.callback = this
-        timelineEventController.timeline = roomDetailViewModel.timeline
+        timelineEventController.timeline = timelineViewModel.timeline
 
         views.timelineRecyclerView.trackItemsVisibilityChange()
         layoutManager = object : LinearLayoutManager(context, RecyclerView.VERTICAL, true) {
@@ -1328,8 +1409,9 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun updateJumpToReadMarkerViewVisibility() {
+        if (isThreadTimeLine()) return
         viewLifecycleOwner.lifecycleScope.launchWhenResumed {
-            val state = roomDetailViewModel.awaitState()
+            val state = timelineViewModel.awaitState()
             val showJumpToUnreadBanner = when (state.unreadState) {
                 UnreadState.Unknown,
                 UnreadState.HasNoUnread            -> false
@@ -1387,8 +1469,12 @@ class RoomDetailFragment @Inject constructor(
         views.composerLayout.callback = object : MessageComposerView.Callback {
             override fun onAddAttachment() {
                 if (!::attachmentTypeSelector.isInitialized) {
-                    attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@RoomDetailFragment)
-                    attachmentTypeSelector.setAttachmentVisibility(AttachmentTypeSelectorView.Type.LOCATION, vectorPreferences.isLocationSharingEnabled())
+                    attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@TimelineFragment)
+                    attachmentTypeSelector.setAttachmentVisibility(
+                            AttachmentTypeSelectorView.Type.LOCATION,
+                            vectorPreferences.isLocationSharingEnabled())
+                    attachmentTypeSelector.setAttachmentVisibility(
+                            AttachmentTypeSelectorView.Type.POLL, !isThreadTimeLine())
                 }
                 attachmentTypeSelector.show(views.composerLayout.views.attachmentButton)
             }
@@ -1417,7 +1503,9 @@ class RoomDetailFragment @Inject constructor(
             return
         }
         if (text.isNotBlank()) {
-            analyticsTracker.capture(Click(name = Click.Name.SendMessageButton))
+            withState(messageComposerViewModel) { state ->
+                analyticsTracker.capture(Composer(isThreadTimeLine(), isEditing = state.sendMode is SendMode.Edit, isReply = state.sendMode is SendMode.Reply))
+            }
             // We collapse ASAP, if not there will be a slight annoying delay
             views.composerLayout.collapse(true)
             lockSendButton = true
@@ -1427,6 +1515,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun observerUserTyping() {
+        if (isThreadTimeLine()) return
         views.composerLayout.views.composerEditText.textChanges()
                 .skipInitialValue()
                 .debounce(300)
@@ -1439,7 +1528,7 @@ class RoomDetailFragment @Inject constructor(
 
         views.composerLayout.views.composerEditText.focusChanges()
                 .onEach {
-                    roomDetailViewModel.handle(RoomDetailAction.ComposerFocusChange(it))
+                    timelineViewModel.handle(RoomDetailAction.ComposerFocusChange(it))
                 }
                 .launchIn(viewLifecycleOwner.lifecycleScope)
     }
@@ -1453,7 +1542,7 @@ class RoomDetailFragment @Inject constructor(
         return isHandled
     }
 
-    override fun invalidate() = withState(roomDetailViewModel, messageComposerViewModel) { mainState, messageComposerState ->
+    override fun invalidate() = withState(timelineViewModel, messageComposerViewModel) { mainState, messageComposerState ->
         invalidateOptionsMenu()
         val summary = mainState.asyncRoomSummary()
         renderToolbar(summary, mainState.formattedTypingUsers)
@@ -1496,7 +1585,7 @@ class RoomDetailFragment @Inject constructor(
         } else if (summary?.membership == Membership.INVITE && inviter != null) {
             views.hideComposerViews()
             lazyLoadedViews.inviteView(true)?.apply {
-                callback = this@RoomDetailFragment
+                callback = this@TimelineFragment
                 isVisible = true
                 render(inviter, VectorInviteView.Mode.LARGE, mainState.changeMembershipState)
                 setOnClickListener(null)
@@ -1507,29 +1596,43 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-    private fun FragmentRoomDetailBinding.hideComposerViews() {
+    private fun FragmentTimelineBinding.hideComposerViews() {
         composerLayout.isVisible = false
         voiceMessageRecorderView.isVisible = false
     }
 
     private fun renderToolbar(roomSummary: RoomSummary?, typingMessage: String?) {
-        if (roomSummary == null) {
-            views.roomToolbarContentView.isClickable = false
+        if (!isThreadTimeLine()) {
+            views.includeRoomToolbar.roomToolbarContentView.isVisible = true
+            views.includeThreadToolbar.roomToolbarThreadConstraintLayout.isVisible = false
+            if (roomSummary == null) {
+                views.includeRoomToolbar.roomToolbarContentView.isClickable = false
+            } else {
+                views.includeRoomToolbar.roomToolbarContentView.isClickable = roomSummary.membership == Membership.JOIN
+                views.includeRoomToolbar.roomToolbarTitleView.text = roomSummary.displayName
+                avatarRenderer.render(roomSummary.toMatrixItem(), views.includeRoomToolbar.roomToolbarAvatarImageView)
+                renderSubTitle(typingMessage, roomSummary.topic)
+                views.includeRoomToolbar.roomToolbarDecorationImageView.render(roomSummary.roomEncryptionTrustLevel)
+                views.includeRoomToolbar.roomToolbarPresenceImageView.render(roomSummary.isDirect, roomSummary.directUserPresence)
+                views.includeRoomToolbar.roomToolbarPublicImageView.isVisible = roomSummary.isPublic && !roomSummary.isDirect
+            }
         } else {
-            views.roomToolbarContentView.isClickable = roomSummary.membership == Membership.JOIN
-            views.roomToolbarTitleView.text = roomSummary.displayName
-            avatarRenderer.render(roomSummary.toMatrixItem(), views.roomToolbarAvatarImageView)
-            renderSubTitle(typingMessage, roomSummary.topic)
-            views.roomToolbarDecorationImageView.render(roomSummary.roomEncryptionTrustLevel)
-            views.roomToolbarPresenceImageView.render(roomSummary.isDirect, roomSummary.directUserPresence)
-            views.roomToolbarPublicImageView.isVisible = roomSummary.isPublic && !roomSummary.isDirect
+            views.includeRoomToolbar.roomToolbarContentView.isVisible = false
+            views.includeThreadToolbar.roomToolbarThreadConstraintLayout.isVisible = true
+            timelineArgs.threadTimelineArgs?.let {
+                val matrixItem = MatrixItem.RoomItem(it.roomId, it.displayName, it.avatarUrl)
+                avatarRenderer.render(matrixItem, views.includeThreadToolbar.roomToolbarThreadImageView)
+                views.includeThreadToolbar.roomToolbarThreadShieldImageView.render(it.roomEncryptionTrustLevel)
+                views.includeThreadToolbar.roomToolbarThreadSubtitleTextView.text = it.displayName
+            }
+            views.includeThreadToolbar.roomToolbarThreadTitleTextView.text = resources.getText(R.string.thread_timeline_title)
         }
     }
 
     private fun renderSubTitle(typingMessage: String?, topic: String) {
         // TODO Temporary place to put typing data
         val subtitle = typingMessage?.takeIf { it.isNotBlank() } ?: topic
-        views.roomToolbarSubtitleView.apply {
+        views.includeRoomToolbar.roomToolbarSubtitleView.apply {
             setTextOrHide(subtitle)
             if (typingMessage.isNullOrBlank()) {
                 setTextColor(colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary))
@@ -1543,27 +1646,30 @@ class RoomDetailFragment @Inject constructor(
 
     private fun renderSendMessageResult(sendMessageResult: MessageComposerViewEvents.SendMessageResult) {
         when (sendMessageResult) {
-            is MessageComposerViewEvents.SlashCommandLoading        -> {
+            is MessageComposerViewEvents.SlashCommandLoading               -> {
                 showLoading(null)
             }
-            is MessageComposerViewEvents.SlashCommandError          -> {
+            is MessageComposerViewEvents.SlashCommandError                 -> {
                 displayCommandError(getString(R.string.command_problem_with_parameters, sendMessageResult.command.command))
             }
-            is MessageComposerViewEvents.SlashCommandUnknown        -> {
+            is MessageComposerViewEvents.SlashCommandUnknown               -> {
                 displayCommandError(getString(R.string.unrecognized_command, sendMessageResult.command))
             }
-            is MessageComposerViewEvents.SlashCommandResultOk       -> {
+            is MessageComposerViewEvents.SlashCommandResultOk              -> {
                 dismissLoadingDialog()
                 views.composerLayout.setTextIfDifferent("")
                 sendMessageResult.messageRes?.let { showSnackWithMessage(getString(it)) }
             }
-            is MessageComposerViewEvents.SlashCommandResultError    -> {
+            is MessageComposerViewEvents.SlashCommandResultError           -> {
                 dismissLoadingDialog()
                 displayCommandError(errorFormatter.toHumanReadable(sendMessageResult.throwable))
             }
-            is MessageComposerViewEvents.SlashCommandNotImplemented -> {
+            is MessageComposerViewEvents.SlashCommandNotImplemented        -> {
                 displayCommandError(getString(R.string.not_implemented))
             }
+            is MessageComposerViewEvents.SlashCommandNotSupportedInThreads -> {
+                displayCommandError(getString(R.string.command_not_supported_in_threads, sendMessageResult.command.command))
+            }
         } // .exhaustive
 
         lockSendButton = false
@@ -1601,7 +1707,7 @@ class RoomDetailFragment @Inject constructor(
                 .setView(layout)
                 .setPositiveButton(R.string.report_content_custom_submit) { _, _ ->
                     val reason = views.dialogReportContentInput.text.toString()
-                    roomDetailViewModel.handle(RoomDetailAction.ReportContent(action.eventId, action.senderId, reason))
+                    timelineViewModel.handle(RoomDetailAction.ReportContent(action.eventId, action.senderId, reason))
                 }
                 .setNegativeButton(R.string.action_cancel, null)
                 .show()
@@ -1617,7 +1723,7 @@ class RoomDetailFragment @Inject constructor(
                         reasonHintRes = R.string.delete_event_dialog_reason_hint,
                         titleRes = action.dialogTitleRes
                 ) { reason ->
-                    roomDetailViewModel.handle(RoomDetailAction.RedactAction(action.eventId, reason))
+                    timelineViewModel.handle(RoomDetailAction.RedactAction(action.eventId, reason))
                 }
     }
 
@@ -1639,7 +1745,7 @@ class RoomDetailFragment @Inject constructor(
                                 .setMessage(R.string.content_reported_as_spam_content)
                                 .setPositiveButton(R.string.ok, null)
                                 .setNegativeButton(R.string.block_user) { _, _ ->
-                                    roomDetailViewModel.handle(RoomDetailAction.IgnoreUser(data.senderId))
+                                    timelineViewModel.handle(RoomDetailAction.IgnoreUser(data.senderId))
                                 }
                                 .show()
                     }
@@ -1649,7 +1755,7 @@ class RoomDetailFragment @Inject constructor(
                                 .setMessage(R.string.content_reported_as_inappropriate_content)
                                 .setPositiveButton(R.string.ok, null)
                                 .setNegativeButton(R.string.block_user) { _, _ ->
-                                    roomDetailViewModel.handle(RoomDetailAction.IgnoreUser(data.senderId))
+                                    timelineViewModel.handle(RoomDetailAction.IgnoreUser(data.senderId))
                                 }
                                 .show()
                     }
@@ -1659,7 +1765,7 @@ class RoomDetailFragment @Inject constructor(
                                 .setMessage(R.string.content_reported_content)
                                 .setPositiveButton(R.string.ok, null)
                                 .setNegativeButton(R.string.block_user) { _, _ ->
-                                    roomDetailViewModel.handle(RoomDetailAction.IgnoreUser(data.senderId))
+                                    timelineViewModel.handle(RoomDetailAction.IgnoreUser(data.senderId))
                                 }
                                 .show()
                     }
@@ -1668,14 +1774,14 @@ class RoomDetailFragment @Inject constructor(
             is RoomDetailAction.RequestVerification       -> {
                 Timber.v("## SAS RequestVerification action")
                 VerificationBottomSheet.withArgs(
-                        roomDetailArgs.roomId,
+                        timelineArgs.roomId,
                         data.userId
                 ).show(parentFragmentManager, "REQ")
             }
             is RoomDetailAction.AcceptVerificationRequest -> {
                 Timber.v("## SAS AcceptVerificationRequest action")
                 VerificationBottomSheet.withArgs(
-                        roomDetailArgs.roomId,
+                        timelineArgs.roomId,
                         data.otherUserId,
                         data.transactionId
                 ).show(parentFragmentManager, "REQ")
@@ -1686,7 +1792,7 @@ class RoomDetailFragment @Inject constructor(
                     setArguments(VerificationBottomSheet.VerificationArgs(
                             otherUserId = otherUserId,
                             verificationId = data.transactionId,
-                            roomId = roomDetailArgs.roomId
+                            roomId = timelineArgs.roomId
                     ))
                 }.show(parentFragmentManager, "REQ")
             }
@@ -1694,25 +1800,39 @@ class RoomDetailFragment @Inject constructor(
     }
 
     // TimelineEventController.Callback ************************************************************
-
     override fun onUrlClicked(url: String, title: String): Boolean {
         viewLifecycleOwner.lifecycleScope.launch {
             val isManaged = permalinkHandler
                     .launch(requireActivity(), url, object : NavigationInterceptor {
-                        override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?): Boolean {
+                        override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?, rootThreadEventId: String?): Boolean {
                             // Same room?
-                            if (roomId == roomDetailArgs.roomId) {
-                                // Navigation to same room
-                                if (eventId == null) {
+                            if (roomId != timelineArgs.roomId) return false
+                            // Navigation to same room
+                            if (!isThreadTimeLine()) {
+                                if (rootThreadEventId != null && userPreferencesProvider.areThreadMessagesEnabled()) {
+                                    // Thread link, so PermalinkHandler will handle the navigation
+                                    return false
+                                }
+                                return if (eventId == null) {
                                     showSnackWithMessage(getString(R.string.navigate_to_room_when_already_in_the_room))
+                                    true
                                 } else {
                                     // Highlight and scroll to this event
-                                    roomDetailViewModel.handle(RoomDetailAction.NavigateToEvent(eventId, true))
+                                    timelineViewModel.handle(RoomDetailAction.NavigateToEvent(eventId, true))
+                                    true
+                                }
+                            } else {
+                                return if (rootThreadEventId == getRootThreadEventId() && eventId == null) {
+                                    showSnackWithMessage(getString(R.string.navigate_to_thread_when_already_in_the_thread))
+                                    true
+                                } else if (rootThreadEventId == getRootThreadEventId() && eventId != null) {
+                                    // we are in the same thread
+                                    timelineViewModel.handle(RoomDetailAction.NavigateToEvent(eventId, true))
+                                    true
+                                } else {
+                                    false
                                 }
-                                return true
                             }
-                            // Not handled
-                            return false
                         }
 
                         override fun navToMemberProfile(userId: String, deepLink: Uri): Boolean {
@@ -1754,11 +1874,11 @@ class RoomDetailFragment @Inject constructor(
     }
 
     override fun onEventVisible(event: TimelineEvent) {
-        roomDetailViewModel.handle(RoomDetailAction.TimelineEventTurnsVisible(event))
+        timelineViewModel.handle(RoomDetailAction.TimelineEventTurnsVisible(event))
     }
 
     override fun onEventInvisible(event: TimelineEvent) {
-        roomDetailViewModel.handle(RoomDetailAction.TimelineEventTurnsInvisible(event))
+        timelineViewModel.handle(RoomDetailAction.TimelineEventTurnsInvisible(event))
     }
 
     override fun onEncryptedMessageClicked(informationData: MessageInformationData, view: View) {
@@ -1768,7 +1888,7 @@ class RoomDetailFragment @Inject constructor(
     override fun onImageMessageClicked(messageImageContent: MessageImageInfoContent, mediaData: ImageContentRenderer.Data, view: View) {
         navigator.openMediaViewer(
                 activity = requireActivity(),
-                roomId = roomDetailArgs.roomId,
+                roomId = timelineArgs.roomId,
                 mediaData = mediaData,
                 view = view
         ) { pairs ->
@@ -1780,7 +1900,7 @@ class RoomDetailFragment @Inject constructor(
     override fun onVideoMessageClicked(messageVideoContent: MessageVideoContent, mediaData: VideoContentRenderer.Data, view: View) {
         navigator.openMediaViewer(
                 activity = requireActivity(),
-                roomId = roomDetailArgs.roomId,
+                roomId = timelineArgs.roomId,
                 mediaData = mediaData,
                 view = view
         ) { pairs ->
@@ -1789,60 +1909,51 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-//    override fun onFileMessageClicked(eventId: String, messageFileContent: MessageFileContent) {
-//        val isEncrypted = messageFileContent.encryptedFileInfo != null
-//        val action = RoomDetailAction.DownloadOrOpen(eventId, messageFileContent, isEncrypted)
-//        // We need WRITE_EXTERNAL permission
-// //        if (!isEncrypted || checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this, PERMISSION_REQUEST_CODE_DOWNLOAD_FILE)) {
-//            showSnackWithMessage(getString(R.string.downloading_file, messageFileContent.getFileName()))
-//            roomDetailViewModel.handle(action)
-// //        } else {
-// //            roomDetailViewModel.pendingAction = action
-// //        }
-//    }
-
     private fun cleanUpAfterPermissionNotGranted() {
         // Reset all pending data
-        roomDetailViewModel.pendingAction = null
+        timelineViewModel.pendingAction = null
         attachmentsHelper.pendingType = null
     }
 
-//    override fun onAudioMessageClicked(messageAudioContent: MessageAudioContent) {
-//        vectorBaseActivity.notImplemented("open audio file")
-//    }
-
     override fun onLoadMore(direction: Timeline.Direction) {
-        roomDetailViewModel.handle(RoomDetailAction.LoadMoreTimelineEvents(direction))
+        timelineViewModel.handle(RoomDetailAction.LoadMoreTimelineEvents(direction))
     }
 
-    override fun onEventCellClicked(informationData: MessageInformationData, messageContent: Any?, view: View) {
+    override fun onAddMoreReaction(event: TimelineEvent) {
+        openEmojiReactionPicker(event.eventId)
+    }
+
+    override fun onEventCellClicked(informationData: MessageInformationData, messageContent: Any?, view: View, isRootThreadEvent: Boolean) {
         when (messageContent) {
             is MessageVerificationRequestContent -> {
-                roomDetailViewModel.handle(RoomDetailAction.ResumeVerification(informationData.eventId, null))
+                timelineViewModel.handle(RoomDetailAction.ResumeVerification(informationData.eventId, null))
             }
             is MessageWithAttachmentContent      -> {
                 val action = RoomDetailAction.DownloadOrOpen(informationData.eventId, informationData.senderId, messageContent)
-                roomDetailViewModel.handle(action)
+                timelineViewModel.handle(action)
             }
             is EncryptedEventContent             -> {
-                roomDetailViewModel.handle(RoomDetailAction.TapOnFailedToDecrypt(informationData.eventId))
+                timelineViewModel.handle(RoomDetailAction.TapOnFailedToDecrypt(informationData.eventId))
             }
             is MessageLocationContent            -> {
                 handleShowLocationPreview(messageContent, informationData.senderId)
             }
             else                                 -> {
-                Timber.d("No click action defined for this message content")
+                val handled = onThreadSummaryClicked(informationData.eventId, isRootThreadEvent)
+                if (!handled) {
+                    Timber.d("No click action defined for this message content")
+                }
             }
         }
     }
 
     override fun onEventLongClicked(informationData: MessageInformationData, messageContent: Any?, view: View): Boolean {
         view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
-        val roomId = roomDetailArgs.roomId
+        val roomId = timelineArgs.roomId
         this.view?.hideKeyboard()
 
         MessageActionsBottomSheet
-                .newInstance(roomId, informationData)
+                .newInstance(roomId, informationData, isThreadTimeLine())
                 .show(requireActivity().supportFragmentManager, "MESSAGE_CONTEXTUAL_ACTIONS")
 
         return true
@@ -1850,26 +1961,35 @@ class RoomDetailFragment @Inject constructor(
 
     private fun handleCancelSend(action: EventSharedAction.Cancel) {
         if (action.force) {
-            roomDetailViewModel.handle(RoomDetailAction.CancelSend(action.eventId, true))
+            timelineViewModel.handle(RoomDetailAction.CancelSend(action.eventId, true))
         } else {
             MaterialAlertDialogBuilder(requireContext())
                     .setTitle(R.string.dialog_title_confirmation)
                     .setMessage(getString(R.string.event_status_cancel_sending_dialog_message))
                     .setNegativeButton(R.string.no, null)
                     .setPositiveButton(R.string.yes) { _, _ ->
-                        roomDetailViewModel.handle(RoomDetailAction.CancelSend(action.eventId, false))
+                        timelineViewModel.handle(RoomDetailAction.CancelSend(action.eventId, false))
                     }
                     .show()
         }
     }
 
+    override fun onThreadSummaryClicked(eventId: String, isRootThreadEvent: Boolean): Boolean {
+        return if (vectorPreferences.areThreadMessagesEnabled() && isRootThreadEvent && !isThreadTimeLine()) {
+            navigateToThreadTimeline(eventId)
+            true
+        } else {
+            false
+        }
+    }
+
     override fun onAvatarClicked(informationData: MessageInformationData) {
         // roomDetailViewModel.handle(RoomDetailAction.RequestVerification(informationData.userId))
         openRoomMemberProfile(informationData.senderId)
     }
 
     private fun openRoomMemberProfile(userId: String) {
-        navigator.openRoomMemberProfile(userId = userId, roomId = roomDetailArgs.roomId, context = requireActivity())
+        navigator.openRoomMemberProfile(userId = userId, roomId = timelineArgs.roomId, context = requireActivity())
     }
 
     override fun onMemberNameClicked(informationData: MessageInformationData) {
@@ -1879,36 +1999,36 @@ class RoomDetailFragment @Inject constructor(
     override fun onClickOnReactionPill(informationData: MessageInformationData, reaction: String, on: Boolean) {
         if (on) {
             // we should test the current real state of reaction on this event
-            roomDetailViewModel.handle(RoomDetailAction.SendReaction(informationData.eventId, reaction))
+            timelineViewModel.handle(RoomDetailAction.SendReaction(informationData.eventId, reaction))
         } else {
             // I need to redact a reaction
-            roomDetailViewModel.handle(RoomDetailAction.UndoReaction(informationData.eventId, reaction))
+            timelineViewModel.handle(RoomDetailAction.UndoReaction(informationData.eventId, reaction))
         }
     }
 
     override fun onLongClickOnReactionPill(informationData: MessageInformationData, reaction: String) {
-        ViewReactionsBottomSheet.newInstance(roomDetailArgs.roomId, informationData)
+        ViewReactionsBottomSheet.newInstance(timelineArgs.roomId, informationData)
                 .show(requireActivity().supportFragmentManager, "DISPLAY_REACTIONS")
     }
 
     override fun onEditedDecorationClicked(informationData: MessageInformationData) {
-        ViewEditHistoryBottomSheet.newInstance(roomDetailArgs.roomId, informationData)
+        ViewEditHistoryBottomSheet.newInstance(timelineArgs.roomId, informationData)
                 .show(requireActivity().supportFragmentManager, "DISPLAY_EDITS")
     }
 
     override fun onTimelineItemAction(itemAction: RoomDetailAction) {
-        roomDetailViewModel.handle(itemAction)
+        timelineViewModel.handle(itemAction)
     }
 
     override fun getPreviewUrlRetriever(): PreviewUrlRetriever {
-        return roomDetailViewModel.previewUrlRetriever
+        return timelineViewModel.previewUrlRetriever
     }
 
     override fun onRoomCreateLinkClicked(url: String) {
         viewLifecycleOwner.lifecycleScope.launchWhenResumed {
             permalinkHandler
                     .launch(requireContext(), url, object : NavigationInterceptor {
-                        override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?): Boolean {
+                        override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?, rootThreadEventId: String?): Boolean {
                             requireActivity().finish()
                             return false
                         }
@@ -1922,7 +2042,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     override fun onReadMarkerVisible() {
-        roomDetailViewModel.handle(RoomDetailAction.EnterTrackingUnreadMessagesState)
+        timelineViewModel.handle(RoomDetailAction.EnterTrackingUnreadMessagesState)
     }
 
     override fun onPreviewUrlClicked(url: String) {
@@ -1930,7 +2050,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     override fun onPreviewUrlCloseClicked(eventId: String, url: String) {
-        roomDetailViewModel.handle(RoomDetailAction.DoNotShowPreviewUrlFor(eventId, url))
+        timelineViewModel.handle(RoomDetailAction.DoNotShowPreviewUrlFor(eventId, url))
     }
 
     override fun onPreviewUrlImageClicked(sharedView: View?, mxcUrl: String?, title: String?) {
@@ -2007,10 +2127,10 @@ class RoomDetailFragment @Inject constructor(
                 openRoomMemberProfile(action.userId)
             }
             is EventSharedAction.AddReaction                -> {
-                emojiActivityResultLauncher.launch(EmojiReactionPickerActivity.intent(requireContext(), action.eventId))
+                openEmojiReactionPicker(action.eventId)
             }
             is EventSharedAction.ViewReactions              -> {
-                ViewReactionsBottomSheet.newInstance(roomDetailArgs.roomId, action.messageInformationData)
+                ViewReactionsBottomSheet.newInstance(timelineArgs.roomId, action.messageInformationData)
                         .show(requireActivity().supportFragmentManager, "DISPLAY_REACTIONS")
             }
             is EventSharedAction.Copy                       -> {
@@ -2046,11 +2166,11 @@ class RoomDetailFragment @Inject constructor(
             }
             is EventSharedAction.QuickReact                 -> {
                 // eventId,ClickedOn,Add
-                roomDetailViewModel.handle(RoomDetailAction.UpdateQuickReactAction(action.eventId, action.clickedOn, action.add))
+                timelineViewModel.handle(RoomDetailAction.UpdateQuickReactAction(action.eventId, action.clickedOn, action.add))
             }
             is EventSharedAction.Edit                       -> {
                 if (action.eventType == EventType.POLL_START) {
-                    navigator.openCreatePoll(requireContext(), roomDetailArgs.roomId, action.eventId, PollMode.EDIT)
+                    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()))
                 } else {
@@ -2067,26 +2187,40 @@ class RoomDetailFragment @Inject constructor(
                     requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
                 }
             }
+            is EventSharedAction.ReplyInThread              -> {
+                if (withState(messageComposerViewModel) { it.isVoiceMessageIdle }) {
+                    navigateToThreadTimeline(action.eventId)
+                } else {
+                    requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
+                }
+            }
+            is EventSharedAction.ViewInRoom                 -> {
+                if (withState(messageComposerViewModel) { it.isVoiceMessageIdle }) {
+                    handleViewInRoomAction()
+                } else {
+                    requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
+                }
+            }
             is EventSharedAction.CopyPermalink              -> {
-                val permalink = session.permalinkService().createPermalink(roomDetailArgs.roomId, action.eventId)
+                val permalink = session.permalinkService().createPermalink(timelineArgs.roomId, action.eventId)
                 copyToClipboard(requireContext(), permalink, false)
                 showSnackWithMessage(getString(R.string.copied_to_clipboard))
             }
             is EventSharedAction.Resend                     -> {
-                roomDetailViewModel.handle(RoomDetailAction.ResendMessage(action.eventId))
+                timelineViewModel.handle(RoomDetailAction.ResendMessage(action.eventId))
             }
             is EventSharedAction.Remove                     -> {
-                roomDetailViewModel.handle(RoomDetailAction.RemoveFailedEcho(action.eventId))
+                timelineViewModel.handle(RoomDetailAction.RemoveFailedEcho(action.eventId))
             }
             is EventSharedAction.Cancel                     -> {
                 handleCancelSend(action)
             }
             is EventSharedAction.ReportContentSpam          -> {
-                roomDetailViewModel.handle(RoomDetailAction.ReportContent(
+                timelineViewModel.handle(RoomDetailAction.ReportContent(
                         action.eventId, action.senderId, "This message is spam", spam = true))
             }
             is EventSharedAction.ReportContentInappropriate -> {
-                roomDetailViewModel.handle(RoomDetailAction.ReportContent(
+                timelineViewModel.handle(RoomDetailAction.ReportContent(
                         action.eventId, action.senderId, "This message is inappropriate", inappropriate = true))
             }
             is EventSharedAction.ReportContentCustom        -> {
@@ -2102,7 +2236,7 @@ class RoomDetailFragment @Inject constructor(
                 onUrlLongClicked(action.url)
             }
             is EventSharedAction.ReRequestKey               -> {
-                roomDetailViewModel.handle(RoomDetailAction.ReRequestKeys(action.eventId))
+                timelineViewModel.handle(RoomDetailAction.ReRequestKeys(action.eventId))
             }
             is EventSharedAction.UseKeyBackup               -> {
                 context?.let {
@@ -2115,13 +2249,17 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
+    private fun openEmojiReactionPicker(eventId: String) {
+        emojiActivityResultLauncher.launch(EmojiReactionPickerActivity.intent(requireContext(), eventId))
+    }
+
     private fun askConfirmationToEndPoll(eventId: String) {
         MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog)
                 .setTitle(R.string.end_poll_confirmation_title)
                 .setMessage(R.string.end_poll_confirmation_description)
                 .setNegativeButton(R.string.action_cancel, null)
                 .setPositiveButton(R.string.end_poll_confirmation_approve_button) { _, _ ->
-                    roomDetailViewModel.handle(RoomDetailAction.EndPoll(eventId))
+                    timelineViewModel.handle(RoomDetailAction.EndPoll(eventId))
                 }
                 .show()
     }
@@ -2132,7 +2270,7 @@ class RoomDetailFragment @Inject constructor(
                 .setMessage(R.string.room_participants_action_ignore_prompt_msg)
                 .setNegativeButton(R.string.action_cancel, null)
                 .setPositiveButton(R.string.room_participants_action_ignore) { _, _ ->
-                    roomDetailViewModel.handle(RoomDetailAction.IgnoreUser(senderId))
+                    timelineViewModel.handle(RoomDetailAction.IgnoreUser(senderId))
                 }
                 .show()
     }
@@ -2152,7 +2290,7 @@ class RoomDetailFragment @Inject constructor(
             views.composerLayout.views.composerEditText.setText(Command.EMOTE.command + " ")
             views.composerLayout.views.composerEditText.setSelection(Command.EMOTE.command.length + 1)
         } else {
-            val roomMember = roomDetailViewModel.getMember(userId)
+            val roomMember = timelineViewModel.getMember(userId)
             // TODO move logic outside of fragment
             (roomMember?.displayName ?: userId)
                     .let { sanitizeDisplayName(it) }
@@ -2205,29 +2343,58 @@ class RoomDetailFragment @Inject constructor(
                 .show()
     }
 
-// VectorInviteView.Callback
+    /**
+     * Navigate to Threads timeline for the specified rootThreadEventId
+     * using the ThreadsActivity
+     */
 
+    private fun navigateToThreadTimeline(rootThreadEventId: String) {
+        context?.let {
+            val roomThreadDetailArgs = ThreadTimelineArgs(
+                    roomId = timelineArgs.roomId,
+                    displayName = timelineViewModel.getRoomSummary()?.displayName,
+                    avatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl,
+                    roomEncryptionTrustLevel = timelineViewModel.getRoomSummary()?.roomEncryptionTrustLevel,
+                    rootThreadEventId = rootThreadEventId)
+            navigator.openThread(it, roomThreadDetailArgs)
+        }
+    }
+
+    /**
+     * Navigate to Threads list for the current room
+     * using the ThreadsActivity
+     */
+
+    private fun navigateToThreadList() {
+        context?.let {
+            val roomThreadDetailArgs = ThreadTimelineArgs(
+                    roomId = timelineArgs.roomId,
+                    displayName = timelineViewModel.getRoomSummary()?.displayName,
+                    roomEncryptionTrustLevel = timelineViewModel.getRoomSummary()?.roomEncryptionTrustLevel,
+                    avatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl)
+            navigator.openThreadList(it, roomThreadDetailArgs)
+        }
+    }
+
+    // VectorInviteView.Callback
     override fun onAcceptInvite() {
-        notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(roomDetailArgs.roomId) }
-        roomDetailViewModel.handle(RoomDetailAction.AcceptInvite)
+        timelineViewModel.handle(RoomDetailAction.AcceptInvite)
     }
 
     override fun onRejectInvite() {
-        notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(roomDetailArgs.roomId) }
-        roomDetailViewModel.handle(RoomDetailAction.RejectInvite)
+        timelineViewModel.handle(RoomDetailAction.RejectInvite)
     }
 
-    private fun onJumpToReadMarkerClicked() = withState(roomDetailViewModel) {
+    private fun onJumpToReadMarkerClicked() = withState(timelineViewModel) {
         if (it.unreadState is UnreadState.HasUnread) {
-            roomDetailViewModel.handle(RoomDetailAction.NavigateToEvent(it.unreadState.firstUnreadEventId, false))
+            timelineViewModel.handle(RoomDetailAction.NavigateToEvent(it.unreadState.firstUnreadEventId, false))
         }
         if (it.unreadState is UnreadState.ReadMarkerNotLoaded) {
-            roomDetailViewModel.handle(RoomDetailAction.NavigateToEvent(it.unreadState.readMarkerId, false))
+            timelineViewModel.handle(RoomDetailAction.NavigateToEvent(it.unreadState.readMarkerId, false))
         }
     }
 
-// AttachmentTypeSelectorView.Callback
-
+    // AttachmentTypeSelectorView.Callback
     private val typeSelectedActivityResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
         if (allGranted) {
             val pendingType = attachmentsHelper.pendingType
@@ -2262,13 +2429,13 @@ class RoomDetailFragment @Inject constructor(
             AttachmentTypeSelectorView.Type.FILE     -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
             AttachmentTypeSelectorView.Type.GALLERY  -> attachmentsHelper.selectGallery(attachmentMediaActivityResultLauncher)
             AttachmentTypeSelectorView.Type.CONTACT  -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.STICKER  -> roomDetailViewModel.handle(RoomDetailAction.SelectStickerAttachment)
-            AttachmentTypeSelectorView.Type.POLL     -> navigator.openCreatePoll(requireContext(), roomDetailArgs.roomId, null, PollMode.CREATE)
+            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 = roomDetailArgs.roomId,
+                                roomId = timelineArgs.roomId,
                                 mode = LocationSharingMode.STATIC_SHARING,
                                 initialLocationData = null,
                                 locationOwnerId = session.myUserId
@@ -2277,13 +2444,12 @@ class RoomDetailFragment @Inject constructor(
         }.exhaustive
     }
 
-// AttachmentsHelper.Callback
-
+    // AttachmentsHelper.Callback
     override fun onContentAttachmentsReady(attachments: List<ContentAttachmentData>) {
         val grouped = attachments.toGroupedContentAttachmentData()
         if (grouped.notPreviewables.isNotEmpty()) {
             // Send the not previewable attachments right now (?)
-            roomDetailViewModel.handle(RoomDetailAction.SendMedia(grouped.notPreviewables, false))
+            timelineViewModel.handle(RoomDetailAction.SendMedia(grouped.notPreviewables, false))
         }
         if (grouped.previewables.isNotEmpty()) {
             val intent = AttachmentsPreviewActivity.newIntent(requireContext(), AttachmentsPreviewArgs(grouped.previewables))
@@ -2321,4 +2487,14 @@ class RoomDetailFragment @Inject constructor(
             }
         }
     }
+
+    /**
+     * Returns true if the current room is a Thread room, false otherwise
+     */
+    private fun isThreadTimeLine(): Boolean = timelineArgs.threadTimelineArgs?.rootThreadEventId != null
+
+    /**
+     * Returns the root thread event if we are in a thread room, otherwise returns null
+     */
+    fun getRootThreadEventId(): String? = timelineArgs.threadTimelineArgs?.rootThreadEventId
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
similarity index 90%
rename from vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
index 9149ae1dca..0198c77280 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -53,6 +53,7 @@ import im.vector.app.features.home.room.detail.sticker.StickerPickerActionHandle
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineFactory
 import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
 import im.vector.app.features.home.room.typing.TypingHelper
+import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorDataStore
@@ -78,6 +79,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 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.RelationType
 import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.toContent
@@ -90,11 +92,14 @@ 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.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 import org.matrix.android.sdk.api.session.room.model.tombstone.RoomTombstoneContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 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 org.matrix.android.sdk.api.session.threads.ThreadNotificationBadgeState
+import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.flow.flow
@@ -103,7 +108,7 @@ import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicBoolean
 
-class RoomDetailViewModel @AssistedInject constructor(
+class TimelineViewModel @AssistedInject constructor(
         @Assisted private val initialState: RoomDetailViewState,
         private val vectorPreferences: VectorPreferences,
         private val vectorDataStore: VectorDataStore,
@@ -119,6 +124,7 @@ class RoomDetailViewModel @AssistedInject constructor(
         private val analyticsTracker: AnalyticsTracker,
         private val activeConferenceHolder: JitsiActiveConferenceHolder,
         private val decryptionFailureTracker: DecryptionFailureTracker,
+        private val notificationDrawerManager: NotificationDrawerManager,
         timelineFactory: TimelineFactory,
         appStateHandler: AppStateHandler
 ) : VectorViewModel<RoomDetailViewState, RoomDetailAction, RoomDetailViewEvents>(initialState),
@@ -129,7 +135,7 @@ class RoomDetailViewModel @AssistedInject constructor(
     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)
+    val timeline = timelineFactory.createTimeline(viewModelScope, room, eventId, initialState.rootThreadEventId)
 
     // Same lifecycle than the ViewModel (survive to screen rotation)
     val previewUrlRetriever = PreviewUrlRetriever(session, viewModelScope)
@@ -146,16 +152,16 @@ class RoomDetailViewModel @AssistedInject constructor(
     private var prepareToEncrypt: Async<Unit> = Uninitialized
 
     @AssistedFactory
-    interface Factory : MavericksAssistedViewModelFactory<RoomDetailViewModel, RoomDetailViewState> {
-        override fun create(initialState: RoomDetailViewState): RoomDetailViewModel
+    interface Factory : MavericksAssistedViewModelFactory<TimelineViewModel, RoomDetailViewState> {
+        override fun create(initialState: RoomDetailViewState): TimelineViewModel
     }
 
-    companion object : MavericksViewModelFactory<RoomDetailViewModel, RoomDetailViewState> by hiltMavericksViewModelFactory() {
+    companion object : MavericksViewModelFactory<TimelineViewModel, RoomDetailViewState> by hiltMavericksViewModelFactory() {
         const val PAGINATION_COUNT = 50
     }
 
     init {
-        timeline.start()
+        timeline.start(initialState.rootThreadEventId)
         timeline.addListener(this)
         observeRoomSummary()
         observeMembershipChanges()
@@ -186,6 +192,11 @@ class RoomDetailViewModel @AssistedInject constructor(
             prepareForEncryption()
         }
 
+        // If the user had already accepted the invitation in the room list
+        if (initialState.isInviteAlreadyAccepted) {
+            handleAcceptInvite()
+        }
+
         if (initialState.switchToParentSpace) {
             // We are coming from a notification, try to switch to the most relevant space
             // so that when hitting back the room will appear in the list
@@ -203,6 +214,17 @@ class RoomDetailViewModel @AssistedInject constructor(
                 }
             }
         }
+
+        // Threads
+        initThreads()
+    }
+
+    /**
+     * Threads specific initialization
+     */
+    private fun initThreads() {
+        markThreadTimelineAsReadLocal()
+        observeLocalThreadNotifications()
     }
 
     private fun observeDataStore() {
@@ -316,8 +338,40 @@ class RoomDetailViewModel @AssistedInject constructor(
                 .launchIn(viewModelScope)
     }
 
+    /**
+     * Mark the thread as read, while the user navigated within the thread
+     * This is a local implementation has nothing to do with APIs
+     */
+    private fun markThreadTimelineAsReadLocal() {
+        initialState.rootThreadEventId?.let {
+            session.coroutineScope.launch {
+                room.markThreadAsRead(it)
+            }
+        }
+    }
+
+    /**
+     * 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))
+                }
+    }
+
     fun getOtherUserIds() = room.roomSummary()?.otherMemberIds
 
+    fun getRoomSummary() = room.roomSummary()
+
     override fun handle(action: RoomDetailAction) {
         when (action) {
             is RoomDetailAction.ComposerFocusChange              -> handleComposerFocusChange(action)
@@ -463,7 +517,11 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleSendSticker(action: RoomDetailAction.SendSticker) {
-        room.sendEvent(EventType.STICKER, action.stickerContent.toContent())
+        val content = initialState.rootThreadEventId?.let {
+            action.stickerContent.copy(relatesTo = RelationDefaultContent(RelationType.IO_THREAD, it))
+        } ?: action.stickerContent
+
+        room.sendEvent(EventType.STICKER, content.toContent())
     }
 
     private fun handleStartCall(action: RoomDetailAction.StartCall) {
@@ -650,20 +708,30 @@ class RoomDetailViewModel @AssistedInject constructor(
     private fun isIntegrationEnabled() = session.integrationManagerService().isIntegrationEnabled()
 
     fun isMenuItemVisible(@IdRes itemId: Int): Boolean = com.airbnb.mvrx.withState(this) { state ->
+
         if (state.asyncRoomSummary()?.membership != Membership.JOIN) {
             return@withState false
         }
-        when (itemId) {
-            R.id.timeline_setting -> true
-            R.id.invite           -> state.canInvite
-            R.id.open_matrix_apps -> true
-            R.id.voice_call       -> state.isWebRTCCallOptionAvailable()
-            R.id.video_call       -> state.isWebRTCCallOptionAvailable() || state.jitsiState.confId == null || state.jitsiState.hasJoined
-            // Show Join conference button only if there is an active conf id not joined. Otherwise fallback to default video disabled. ^
-            R.id.join_conference  -> !state.isWebRTCCallOptionAvailable() && state.jitsiState.confId != null && !state.jitsiState.hasJoined
-            R.id.search           -> true
-            R.id.dev_tools        -> vectorPreferences.developerMode()
-            else                  -> false
+
+        if (initialState.isThreadTimeline()) {
+            when (itemId) {
+                R.id.menu_thread_timeline_more -> true
+                else                           -> false
+            }
+        } else {
+            when (itemId) {
+                R.id.timeline_setting          -> true
+                R.id.invite                    -> state.canInvite
+                R.id.open_matrix_apps          -> true
+                R.id.voice_call                -> state.isWebRTCCallOptionAvailable()
+                R.id.video_call                -> state.isWebRTCCallOptionAvailable() || state.jitsiState.confId == null || state.jitsiState.hasJoined
+                // Show Join conference button only if there is an active conf id not joined. Otherwise fallback to default video disabled. ^
+                R.id.join_conference           -> !state.isWebRTCCallOptionAvailable() && state.jitsiState.confId != null && !state.jitsiState.hasJoined
+                R.id.search                    -> state.isSearchAvailable()
+                R.id.menu_timeline_thread_list -> vectorPreferences.areThreadMessagesEnabled()
+                R.id.dev_tools                 -> vectorPreferences.developerMode()
+                else                           -> false
+            }
         }
     }
 
@@ -679,19 +747,32 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleUndoReact(action: RoomDetailAction.UndoReaction) {
-        room.undoReaction(action.targetEventId, action.reaction)
+        viewModelScope.launch {
+            tryOrNull {
+                room.undoReaction(action.targetEventId, action.reaction)
+            }
+        }
     }
 
     private fun handleUpdateQuickReaction(action: RoomDetailAction.UpdateQuickReactAction) {
         if (action.add) {
             room.sendReaction(action.targetEventId, action.selectedReaction)
         } else {
-            room.undoReaction(action.targetEventId, action.selectedReaction)
+            viewModelScope.launch {
+                tryOrNull {
+                    room.undoReaction(action.targetEventId, action.selectedReaction)
+                }
+            }
         }
     }
 
     private fun handleSendMedia(action: RoomDetailAction.SendMedia) {
-        room.sendMedias(action.attachments, action.compressBeforeSending, emptySet())
+        room.sendMedias(
+                action.attachments,
+                action.compressBeforeSending,
+                emptySet(),
+                initialState.rootThreadEventId
+        )
     }
 
     private fun handleEventVisible(action: RoomDetailAction.TimelineEventTurnsVisible) {
@@ -726,16 +807,24 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleRejectInvite() {
+        notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(initialState.roomId) }
         viewModelScope.launch {
-            tryOrNull { room.leave(null) }
+            try {
+               session.leaveRoom(room.roomId)
+            } catch (throwable: Throwable) {
+                _viewEvents.post(RoomDetailViewEvents.Failure(throwable, showInDialog = true))
+            }
         }
     }
 
     private fun handleAcceptInvite() {
+        notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(initialState.roomId) }
         viewModelScope.launch {
-            tryOrNull {
-                room.join()
+            try {
+                session.joinRoom(room.roomId)
                 analyticsTracker.capture(room.roomSummary().toAnalyticsJoinedRoom())
+            } catch (throwable: Throwable) {
+                _viewEvents.post(RoomDetailViewEvents.Failure(throwable, showInDialog = true))
             }
         }
     }
@@ -1128,6 +1217,9 @@ class RoomDetailViewModel @AssistedInject constructor(
         chatEffectManager.delegate = null
         chatEffectManager.dispose()
         callManager.removeProtocolsCheckerListener(this)
+        // we should also mark it as read here, for the scenario that the user
+        // is already in the thread timeline
+        markThreadTimelineAsReadLocal()
         super.onCleared()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/arguments/TimelineArgs.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/arguments/TimelineArgs.kt
new file mode 100644
index 0000000000..a21567acb1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/arguments/TimelineArgs.kt
@@ -0,0 +1,33 @@
+/*
+ * 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.arguments
+
+import android.os.Parcelable
+import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
+import im.vector.app.features.share.SharedData
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class TimelineArgs(
+        val roomId: String,
+        val eventId: String? = null,
+        val sharedData: SharedData? = null,
+        val openShareSpaceForId: String? = null,
+        val threadTimelineArgs: ThreadTimelineArgs? = null,
+        val switchToParentSpace: Boolean = false,
+        val isInviteAlreadyAccepted: Boolean = false
+) : Parcelable
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 690f127cbd..10cef39942 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
@@ -35,7 +35,7 @@ sealed class MessageComposerAction : VectorViewModelAction {
     data class InitializeVoiceRecorder(val attachmentData: ContentAttachmentData) : MessageComposerAction()
     data class OnVoiceRecordingUiStateChanged(val uiState: VoiceMessageRecorderView.RecordingUiState) : MessageComposerAction()
     object StartRecordingVoiceMessage : MessageComposerAction()
-    data class EndRecordingVoiceMessage(val isCancelled: Boolean) : MessageComposerAction()
+    data class EndRecordingVoiceMessage(val isCancelled: Boolean, val rootThreadEventId: String?) : MessageComposerAction()
     object PauseRecordingVoiceMessage : MessageComposerAction()
     data class PlayOrPauseVoicePlayback(val eventId: String, val messageAudioContent: MessageAudioContent) : MessageComposerAction()
     object PlayOrPauseRecordingPlayback : MessageComposerAction()
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 07c58c9196..c1af838795 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
@@ -32,6 +32,8 @@ sealed class MessageComposerViewEvents : VectorViewEvents {
     data class JoinRoomCommandSuccess(val roomId: String) : SendMessageResult()
     class SlashCommandError(val command: Command) : SendMessageResult()
     class SlashCommandUnknown(val command: String) : SendMessageResult()
+    class SlashCommandNotSupportedInThreads(val command: Command) : SendMessageResult()
+    data class SlashCommandHandled(@StringRes val messageRes: Int? = null) : SendMessageResult()
     object SlashCommandLoading : SendMessageResult()
     data class SlashCommandResultOk(@StringRes val messageRes: Int? = null) : SendMessageResult()
     class SlashCommandResultError(val throwable: Throwable) : SendMessageResult()
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 a2d9b50edd..6adf248af9 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
@@ -46,6 +46,8 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 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.getRootThreadEventId
+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.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
@@ -53,6 +55,7 @@ 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.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
@@ -98,7 +101,7 @@ class MessageComposerViewModel @AssistedInject constructor(
             is MessageComposerAction.OnTextChanged                  -> handleOnTextChanged(action)
             is MessageComposerAction.OnVoiceRecordingUiStateChanged -> handleOnVoiceRecordingUiStateChanged(action)
             is MessageComposerAction.StartRecordingVoiceMessage     -> handleStartRecordingVoiceMessage()
-            is MessageComposerAction.EndRecordingVoiceMessage       -> handleEndRecordingVoiceMessage(action.isCancelled)
+            is MessageComposerAction.EndRecordingVoiceMessage       -> handleEndRecordingVoiceMessage(action.isCancelled, action.rootThreadEventId)
             is MessageComposerAction.PlayOrPauseVoicePlayback       -> handlePlayOrPauseVoicePlayback(action)
             MessageComposerAction.PauseRecordingVoiceMessage        -> handlePauseRecordingVoiceMessage()
             MessageComposerAction.PlayOrPauseRecordingPlayback      -> handlePlayOrPauseRecordingPlayback()
@@ -187,135 +190,185 @@ class MessageComposerViewModel @AssistedInject constructor(
         withState { state ->
             when (state.sendMode) {
                 is SendMode.Regular -> {
-                    when (val slashCommandResult = commandParser.parseSlashCommand(action.text)) {
-                        is ParsedCommand.ErrorNotACommand         -> {
+                    when (val slashCommandResult = commandParser.parseSlashCommand(
+                            textMessage = action.text,
+                            isInThreadTimeline = state.isInThreadTimeline())) {
+                        is ParsedCommand.ErrorNotACommand                  -> {
                             // Send the text message to the room
-                            room.sendTextMessage(action.text, autoMarkdown = action.autoMarkdown)
+                            if (state.rootThreadEventId != null) {
+                                room.replyInThread(
+                                        rootThreadEventId = state.rootThreadEventId,
+                                        replyInThreadText = action.text,
+                                        autoMarkdown = action.autoMarkdown)
+                            } else {
+                                room.sendTextMessage(action.text, autoMarkdown = action.autoMarkdown)
+                            }
+
                             _viewEvents.post(MessageComposerViewEvents.MessageSent)
                             popDraft()
                         }
-                        is ParsedCommand.ErrorSyntax              -> {
+                        is ParsedCommand.ErrorSyntax                       -> {
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandError(slashCommandResult.command))
                         }
-                        is ParsedCommand.ErrorEmptySlashCommand   -> {
+                        is ParsedCommand.ErrorEmptySlashCommand            -> {
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandUnknown("/"))
                         }
-                        is ParsedCommand.ErrorUnknownSlashCommand -> {
+                        is ParsedCommand.ErrorUnknownSlashCommand          -> {
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandUnknown(slashCommandResult.slashCommand))
                         }
-                        is ParsedCommand.SendPlainText            -> {
+                        is ParsedCommand.ErrorCommandNotSupportedInThreads -> {
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandNotSupportedInThreads(slashCommandResult.command))
+                        }
+                        is ParsedCommand.SendPlainText                     -> {
                             // Send the text message to the room, without markdown
-                            room.sendTextMessage(slashCommandResult.message, autoMarkdown = false)
+                            if (state.rootThreadEventId != null) {
+                                room.replyInThread(
+                                        rootThreadEventId = state.rootThreadEventId,
+                                        replyInThreadText = slashCommandResult.message,
+                                        autoMarkdown = false)
+                            } else {
+                                room.sendTextMessage(slashCommandResult.message, autoMarkdown = false)
+                            }
                             _viewEvents.post(MessageComposerViewEvents.MessageSent)
                             popDraft()
                         }
-                        is ParsedCommand.ChangeRoomName           -> {
+                        is ParsedCommand.ChangeRoomName                    -> {
                             handleChangeRoomNameSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.Invite                   -> {
+                        is ParsedCommand.Invite                            -> {
                             handleInviteSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.Invite3Pid               -> {
+                        is ParsedCommand.Invite3Pid                        -> {
                             handleInvite3pidSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.SetUserPowerLevel        -> {
+                        is ParsedCommand.SetUserPowerLevel                 -> {
                             handleSetUserPowerLevel(slashCommandResult)
                         }
-                        is ParsedCommand.ClearScalarToken         -> {
+                        is ParsedCommand.ClearScalarToken                  -> {
                             // TODO
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandNotImplemented)
                         }
-                        is ParsedCommand.SetMarkdown              -> {
+                        is ParsedCommand.SetMarkdown                       -> {
                             vectorPreferences.setMarkdownEnabled(slashCommandResult.enable)
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(
                                     if (slashCommandResult.enable) R.string.markdown_has_been_enabled else R.string.markdown_has_been_disabled))
                             popDraft()
                         }
-                        is ParsedCommand.BanUser                  -> {
+                        is ParsedCommand.BanUser                           -> {
                             handleBanSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.UnbanUser                -> {
+                        is ParsedCommand.UnbanUser                         -> {
                             handleUnbanSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.IgnoreUser               -> {
+                        is ParsedCommand.IgnoreUser                        -> {
                             handleIgnoreSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.UnignoreUser             -> {
+                        is ParsedCommand.UnignoreUser                      -> {
                             handleUnignoreSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.RemoveUser               -> {
+                        is ParsedCommand.RemoveUser                        -> {
                             handleRemoveSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.JoinRoom                 -> {
+                        is ParsedCommand.JoinRoom                          -> {
                             handleJoinToAnotherRoomSlashCommand(slashCommandResult)
                             popDraft()
                         }
-                        is ParsedCommand.PartRoom                 -> {
+                        is ParsedCommand.PartRoom                          -> {
                             handlePartSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.SendEmote                -> {
-                            room.sendTextMessage(slashCommandResult.message, msgType = MessageType.MSGTYPE_EMOTE, autoMarkdown = action.autoMarkdown)
-                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
-                            popDraft()
-                        }
-                        is ParsedCommand.SendRainbow              -> {
-                            slashCommandResult.message.toString().let {
-                                room.sendFormattedTextMessage(it, rainbowGenerator.generate(it))
+                        is ParsedCommand.SendEmote                         -> {
+                            if (state.rootThreadEventId != null) {
+                                room.replyInThread(
+                                        rootThreadEventId = state.rootThreadEventId,
+                                        replyInThreadText = slashCommandResult.message,
+                                        msgType = MessageType.MSGTYPE_EMOTE,
+                                        autoMarkdown = action.autoMarkdown)
+                            } else {
+                                room.sendTextMessage(slashCommandResult.message, msgType = MessageType.MSGTYPE_EMOTE, autoMarkdown = action.autoMarkdown)
                             }
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
-                        is ParsedCommand.SendRainbowEmote         -> {
-                            slashCommandResult.message.toString().let {
-                                room.sendFormattedTextMessage(it, rainbowGenerator.generate(it), MessageType.MSGTYPE_EMOTE)
+                        is ParsedCommand.SendRainbow                       -> {
+                            val message = slashCommandResult.message.toString()
+                            if (state.rootThreadEventId != null) {
+                                room.replyInThread(
+                                        rootThreadEventId = state.rootThreadEventId,
+                                        replyInThreadText = slashCommandResult.message,
+                                        formattedText = rainbowGenerator.generate(message))
+                            } else {
+                                room.sendFormattedTextMessage(message, rainbowGenerator.generate(message))
                             }
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
-                        is ParsedCommand.SendSpoiler              -> {
-                            room.sendFormattedTextMessage(
-                                    "[${stringProvider.getString(R.string.spoiler)}](${slashCommandResult.message})",
-                                    "<span data-mx-spoiler>${slashCommandResult.message}</span>"
-                            )
+                        is ParsedCommand.SendRainbowEmote                  -> {
+                            val message = slashCommandResult.message.toString()
+                            if (state.rootThreadEventId != null) {
+                                room.replyInThread(
+                                        rootThreadEventId = state.rootThreadEventId,
+                                        replyInThreadText = slashCommandResult.message,
+                                        msgType = MessageType.MSGTYPE_EMOTE,
+                                        formattedText = rainbowGenerator.generate(message))
+                            } else {
+                                room.sendFormattedTextMessage(message, rainbowGenerator.generate(message), MessageType.MSGTYPE_EMOTE)
+                            }
+
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
-                        is ParsedCommand.SendShrug                -> {
-                            sendPrefixedMessage("¯\\_(ツ)_/¯", slashCommandResult.message)
+                        is ParsedCommand.SendSpoiler                       -> {
+                            val text = "[${stringProvider.getString(R.string.spoiler)}](${slashCommandResult.message})"
+                            val formattedText = "<span data-mx-spoiler>${slashCommandResult.message}</span>"
+                            if (state.rootThreadEventId != null) {
+                                room.replyInThread(
+                                        rootThreadEventId = state.rootThreadEventId,
+                                        replyInThreadText = text,
+                                        formattedText = formattedText)
+                            } else {
+                                room.sendFormattedTextMessage(
+                                        text,
+                                        formattedText)
+                            }
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
-                        is ParsedCommand.SendLenny                -> {
-                            sendPrefixedMessage("( ͡° ͜ʖ ͡°)", slashCommandResult.message)
+                        is ParsedCommand.SendShrug                         -> {
+                            sendPrefixedMessage("¯\\_(ツ)_/¯", slashCommandResult.message, state.rootThreadEventId)
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
-                        is ParsedCommand.SendChatEffect           -> {
+                        is ParsedCommand.SendLenny                         -> {
+                            sendPrefixedMessage("( ͡° ͜ʖ ͡°)", slashCommandResult.message, state.rootThreadEventId)
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
+                            popDraft()
+                        }
+                        is ParsedCommand.SendChatEffect                    -> {
                             sendChatEffect(slashCommandResult)
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
-                        is ParsedCommand.ChangeTopic              -> {
+                        is ParsedCommand.ChangeTopic                       -> {
                             handleChangeTopicSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.ChangeDisplayName        -> {
+                        is ParsedCommand.ChangeDisplayName                 -> {
                             handleChangeDisplayNameSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.ChangeDisplayNameForRoom -> {
+                        is ParsedCommand.ChangeDisplayNameForRoom          -> {
                             handleChangeDisplayNameForRoomSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.ChangeRoomAvatar         -> {
+                        is ParsedCommand.ChangeRoomAvatar                  -> {
                             handleChangeRoomAvatarSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.ChangeAvatarForRoom      -> {
+                        is ParsedCommand.ChangeAvatarForRoom               -> {
                             handleChangeAvatarForRoomSlashCommand(slashCommandResult)
                         }
-                        is ParsedCommand.ShowUser                 -> {
+                        is ParsedCommand.ShowUser                          -> {
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             handleWhoisSlashCommand(slashCommandResult)
                             popDraft()
                         }
-                        is ParsedCommand.DiscardSession           -> {
+                        is ParsedCommand.DiscardSession                    -> {
                             if (room.isEncrypted()) {
                                 session.cryptoService().discardOutboundSession(room.roomId)
                                 _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
@@ -328,7 +381,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                                 )
                             }
                         }
-                        is ParsedCommand.CreateSpace              -> {
+                        is ParsedCommand.CreateSpace                       -> {
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandLoading)
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
@@ -352,7 +405,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                             }
                             Unit
                         }
-                        is ParsedCommand.AddToSpace               -> {
+                        is ParsedCommand.AddToSpace                        -> {
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandLoading)
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
@@ -371,7 +424,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                             }
                             Unit
                         }
-                        is ParsedCommand.JoinSpace                -> {
+                        is ParsedCommand.JoinSpace                         -> {
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandLoading)
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
@@ -384,10 +437,10 @@ class MessageComposerViewModel @AssistedInject constructor(
                             }
                             Unit
                         }
-                        is ParsedCommand.LeaveRoom                -> {
+                        is ParsedCommand.LeaveRoom                         -> {
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
-                                    session.getRoom(slashCommandResult.roomId)?.leave(null)
+                                    session.leaveRoom(slashCommandResult.roomId)
                                     popDraft()
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                                 } catch (failure: Throwable) {
@@ -396,7 +449,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                             }
                             Unit
                         }
-                        is ParsedCommand.UpgradeRoom              -> {
+                        is ParsedCommand.UpgradeRoom                       -> {
                             _viewEvents.post(
                                     MessageComposerViewEvents.ShowRoomUpgradeDialog(
                                             slashCommandResult.newVersion,
@@ -410,7 +463,20 @@ class MessageComposerViewModel @AssistedInject constructor(
                 }
                 is SendMode.Edit    -> {
                     // is original event a reply?
-                    val inReplyTo = state.sendMode.timelineEvent.getRelationContent()?.inReplyTo?.eventId
+                    val relationContent = state.sendMode.timelineEvent.getRelationContent()
+                    val inReplyTo = if (state.rootThreadEventId != null) {
+                        if (relationContent?.inReplyTo?.shouldRenderInThread() == true) {
+                            // Reply within a thread event
+                            relationContent.inReplyTo?.eventId
+                        } else {
+                            // Normal thread event
+                            null
+                        }
+                    } else {
+                        // Normal event
+                        relationContent?.inReplyTo?.eventId
+                    }
+
                     if (inReplyTo != null) {
                         // TODO check if same content?
                         room.getTimeLineEvent(inReplyTo)?.let {
@@ -432,16 +498,34 @@ class MessageComposerViewModel @AssistedInject constructor(
                     popDraft()
                 }
                 is SendMode.Quote   -> {
-                    room.sendQuotedTextMessage(state.sendMode.timelineEvent, action.text.toString(), action.autoMarkdown)
+                    room.sendQuotedTextMessage(
+                            quotedEvent = state.sendMode.timelineEvent,
+                            text = action.text.toString(),
+                            autoMarkdown = action.autoMarkdown,
+                            rootThreadEventId = state.rootThreadEventId)
                     _viewEvents.post(MessageComposerViewEvents.MessageSent)
                     popDraft()
                 }
                 is SendMode.Reply   -> {
-                    state.sendMode.timelineEvent.let {
-                        room.replyToMessage(it, action.text.toString(), action.autoMarkdown)
-                        _viewEvents.post(MessageComposerViewEvents.MessageSent)
-                        popDraft()
-                    }
+                    val timelineEvent = state.sendMode.timelineEvent
+                    val showInThread = state.sendMode.timelineEvent.root.isThread() && state.rootThreadEventId == null
+                    val rootThreadEventId = if (showInThread) timelineEvent.root.getRootThreadEventId() else null
+                    state.rootThreadEventId?.let {
+                        room.replyInThread(
+                                rootThreadEventId = it,
+                                replyInThreadText = action.text.toString(),
+                                autoMarkdown = action.autoMarkdown,
+                                eventReplied = timelineEvent)
+                    } ?: room.replyToMessage(
+                            eventReplied = timelineEvent,
+                            replyText = action.text.toString(),
+                            autoMarkdown = action.autoMarkdown,
+                            showInThread = showInThread,
+                            rootThreadEventId = rootThreadEventId
+                    )
+
+                    _viewEvents.post(MessageComposerViewEvents.MessageSent)
+                    popDraft()
                 }
                 is SendMode.Voice   -> {
                     // do nothing
@@ -599,7 +683,9 @@ class MessageComposerViewModel @AssistedInject constructor(
                         ?.roomId
                         ?.let { session.getRoom(it) }
             }
-                    ?.leave(reason = null)
+                    ?.let {
+                        session.leaveRoom(it.roomId)
+                    }
         }
     }
 
@@ -677,7 +763,7 @@ class MessageComposerViewModel @AssistedInject constructor(
         _viewEvents.post(MessageComposerViewEvents.OpenRoomMemberProfile(whois.userId))
     }
 
-    private fun sendPrefixedMessage(prefix: String, message: CharSequence) {
+    private fun sendPrefixedMessage(prefix: String, message: CharSequence, rootThreadEventId: String?) {
         val sequence = buildString {
             append(prefix)
             if (message.isNotEmpty()) {
@@ -685,7 +771,9 @@ class MessageComposerViewModel @AssistedInject constructor(
                 append(message)
             }
         }
-        room.sendTextMessage(sequence)
+        rootThreadEventId?.let {
+            room.replyInThread(it, sequence)
+        } ?: room.sendTextMessage(sequence)
     }
 
     /**
@@ -722,14 +810,18 @@ class MessageComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleEndRecordingVoiceMessage(isCancelled: Boolean) {
+    private fun handleEndRecordingVoiceMessage(isCancelled: Boolean, rootThreadEventId: String? = null) {
         voiceMessageHelper.stopPlayback()
         if (isCancelled) {
             voiceMessageHelper.deleteRecording()
         } else {
             voiceMessageHelper.stopRecording(convertForSending = true)?.let { audioType ->
                 if (audioType.duration > 1000) {
-                    room.sendMedia(audioType.toContentAttachmentData(isVoiceMessage = true), false, emptySet())
+                    room.sendMedia(
+                            attachment = audioType.toContentAttachmentData(isVoiceMessage = true),
+                            compressBeforeSending = false,
+                            roomIds = emptySet(),
+                            rootThreadEventId = rootThreadEventId)
                 } else {
                     voiceMessageHelper.deleteRecording()
                 }
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 915e1b3338..f90f3975c6 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
@@ -17,7 +17,7 @@
 package im.vector.app.features.home.room.detail.composer
 
 import com.airbnb.mvrx.MavericksState
-import im.vector.app.features.home.room.detail.RoomDetailArgs
+import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
@@ -61,12 +61,13 @@ data class MessageComposerViewState(
         val roomId: String,
         val canSendMessage: CanSendStatus = CanSendStatus.Allowed,
         val isSendButtonVisible: Boolean = false,
+        val rootThreadEventId: String? = null,
         val sendMode: SendMode = SendMode.Regular("", false),
         val voiceRecordingUiState: VoiceMessageRecorderView.RecordingUiState = VoiceMessageRecorderView.RecordingUiState.Idle
 ) : MavericksState {
 
     val isVoiceRecording = when (voiceRecordingUiState) {
-        VoiceMessageRecorderView.RecordingUiState.Idle      -> false
+        VoiceMessageRecorderView.RecordingUiState.Idle         -> false
         is VoiceMessageRecorderView.RecordingUiState.Locked,
         VoiceMessageRecorderView.RecordingUiState.Draft,
         is VoiceMessageRecorderView.RecordingUiState.Recording -> true
@@ -77,6 +78,9 @@ data class MessageComposerViewState(
     val isComposerVisible = canSendMessage.boolean() && !isVoiceRecording
     val isVoiceMessageRecorderVisible = canSendMessage.boolean() && !isSendButtonVisible
 
-    @Suppress("UNUSED") // needed by mavericks
-    constructor(args: RoomDetailArgs) : this(roomId = args.roomId)
+    constructor(args: TimelineArgs) : this(
+            roomId = args.roomId,
+            rootThreadEventId = args.threadTimelineArgs?.rootThreadEventId)
+
+    fun isInThreadTimeline(): Boolean = rootThreadEventId != null
 }
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 4a285da5f2..62c142238e 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
@@ -37,13 +37,17 @@ import im.vector.app.core.extensions.trackItemsVisibilityChange
 import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSearchBinding
+import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.getRootThreadEventId
 import javax.inject.Inject
 
 @Parcelize
 data class SearchArgs(
-        val roomId: String
+        val roomId: String,
+        val roomDisplayName: String?,
+        val roomAvatarUrl: String?
 ) : Parcelable
 
 class SearchFragment @Inject constructor(
@@ -111,10 +115,25 @@ class SearchFragment @Inject constructor(
         searchViewModel.handle(SearchAction.Retry)
     }
 
-    override fun onItemClicked(event: Event) {
-        event.roomId?.let {
-            navigator.openRoom(requireContext(), it, event.eventId)
-        }
+    override fun onItemClicked(event: Event) =
+            navigateToEvent(event)
+
+    /**
+     * Navigate and highlight the event. If this is a thread event,
+     * user will be redirected to the appropriate thread room
+     * @param event the event to navigate and highlight
+     */
+    private fun navigateToEvent(event: Event) {
+        val roomId = event.roomId ?: return
+        event.getRootThreadEventId()?.let {
+            val threadTimelineArgs = ThreadTimelineArgs(
+                    roomId = roomId,
+                    displayName = fragmentArgs.roomDisplayName,
+                    avatarUrl = fragmentArgs.roomAvatarUrl,
+                    roomEncryptionTrustLevel = null,
+                    rootThreadEventId = it)
+            navigator.openThread(requireContext(), threadTimelineArgs, event.eventId)
+        } ?: navigator.openRoom(requireContext(), roomId, event.eventId)
     }
 
     override fun loadMore() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
index ccf83011a8..2cdc1a0d90 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.core.ui.list.GenericHeaderItem_
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
@@ -43,7 +44,8 @@ class SearchResultController @Inject constructor(
         private val session: Session,
         private val avatarRenderer: AvatarRenderer,
         private val stringProvider: StringProvider,
-        private val dateFormatter: VectorDateFormatter
+        private val dateFormatter: VectorDateFormatter,
+        private val userPreferencesProvider: UserPreferencesProvider
 ) : TypedEpoxyController<SearchViewState>() {
 
     var listener: Listener? = null
@@ -122,6 +124,8 @@ class SearchResultController @Inject constructor(
                     .spannable(spannable.toEpoxyCharSequence())
                     .sender(eventAndSender.sender
                             ?: eventAndSender.event.senderId?.let { session.getRoomMember(it, data.roomId) }?.toMatrixItem())
+                    .threadDetails(event.threadDetails)
+                    .areThreadMessagesEnabled(userPreferencesProvider.areThreadMessagesEnabled())
                     .listener { listener?.onItemClicked(eventAndSender.event) }
                     .let { result.add(it) }
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
index 95dea2b8d2..2ec786fab2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
@@ -18,6 +18,8 @@ package im.vector.app.features.home.room.detail.search
 
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
@@ -29,6 +31,7 @@ import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
+import org.matrix.android.sdk.api.session.threads.ThreadDetails
 import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_search_result)
@@ -38,6 +41,9 @@ abstract class SearchResultItem : VectorEpoxyModel<SearchResultItem.Holder>() {
     @EpoxyAttribute var formattedDate: String? = null
     @EpoxyAttribute lateinit var spannable: EpoxyCharSequence
     @EpoxyAttribute var sender: MatrixItem? = null
+    @EpoxyAttribute var threadDetails: ThreadDetails? = null
+    @EpoxyAttribute var areThreadMessagesEnabled: Boolean = false
+
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: ClickListener? = null
 
     override fun bind(holder: Holder) {
@@ -48,6 +54,36 @@ abstract class SearchResultItem : VectorEpoxyModel<SearchResultItem.Holder>() {
         holder.memberNameView.setTextOrHide(sender?.getBestName())
         holder.timeView.text = formattedDate
         holder.contentView.text = spannable.charSequence
+
+        if (areThreadMessagesEnabled) {
+            threadDetails?.let {
+                if (it.isRootThread) {
+                    showThreadSummary(holder)
+                    holder.threadSummaryCounterTextView.text = it.numberOfThreads.toString()
+                    holder.threadSummaryInfoTextView.text = it.threadSummaryLatestTextMessage.orEmpty()
+
+                    val userId = it.threadSummarySenderInfo?.userId ?: return@let
+                    val displayName = it.threadSummarySenderInfo?.displayName
+                    val avatarUrl = it.threadSummarySenderInfo?.avatarUrl
+                    avatarRenderer.render(MatrixItem.UserItem(userId, displayName, avatarUrl), holder.threadSummaryAvatarImageView)
+                } else {
+                    showFromThread(holder)
+                }
+            } ?: run {
+                holder.threadSummaryConstraintLayout.isVisible = false
+                holder.fromThreadConstraintLayout.isVisible = false
+            }
+        }
+    }
+
+    private fun showThreadSummary(holder: Holder, show: Boolean = true) {
+        holder.threadSummaryConstraintLayout.isVisible = show
+        holder.fromThreadConstraintLayout.isVisible = !show
+    }
+
+    private fun showFromThread(holder: Holder, show: Boolean = true) {
+        holder.threadSummaryConstraintLayout.isVisible = !show
+        holder.fromThreadConstraintLayout.isVisible = show
     }
 
     class Holder : VectorEpoxyHolder() {
@@ -55,5 +91,10 @@ abstract class SearchResultItem : VectorEpoxyModel<SearchResultItem.Holder>() {
         val memberNameView by bind<TextView>(R.id.messageMemberNameView)
         val timeView by bind<TextView>(R.id.messageTimeView)
         val contentView by bind<TextView>(R.id.messageContentView)
+        val threadSummaryConstraintLayout by bind<ConstraintLayout>(R.id.searchThreadSummaryConstraintLayout)
+        val threadSummaryCounterTextView by bind<TextView>(R.id.messageThreadSummaryCounterTextView)
+        val threadSummaryAvatarImageView by bind<ImageView>(R.id.messageThreadSummaryAvatarImageView)
+        val threadSummaryInfoTextView by bind<TextView>(R.id.messageThreadSummaryInfoTextView)
+        val fromThreadConstraintLayout by bind<ConstraintLayout>(R.id.searchFromThreadConstraintLayout)
     }
 }
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 4a9a03789f..43fa9e0c2e 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
@@ -41,6 +41,7 @@ import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFact
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactoryParams
 import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import im.vector.app.features.home.room.detail.timeline.helper.ReactionsSummaryFactory
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineControllerInterceptorHelper
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventDiffUtilCallback
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
@@ -86,7 +87,8 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                                                   @TimelineEventControllerHandler
                                                   private val backgroundHandler: Handler,
                                                   private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper,
-                                                  private val readReceiptsItemFactory: ReadReceiptsItemFactory
+                                                  private val readReceiptsItemFactory: ReadReceiptsItemFactory,
+                                                  private val reactionListFactory: ReactionsSummaryFactory
 ) : EpoxyController(backgroundHandler, backgroundHandler), Timeline.Listener, EpoxyController.Interceptor {
 
     /**
@@ -96,21 +98,26 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             val unreadState: UnreadState = UnreadState.Unknown,
             val highlightedEventId: String? = null,
             val jitsiState: JitsiState = JitsiState(),
-            val roomSummary: RoomSummary? = null
+            val roomSummary: RoomSummary? = null,
+            val rootThreadEventId: String? = null
     ) {
 
         constructor(state: RoomDetailViewState) : this(
                 unreadState = state.unreadState,
                 highlightedEventId = state.highlightedEventId,
                 jitsiState = state.jitsiState,
-                roomSummary = state.asyncRoomSummary()
+                roomSummary = state.asyncRoomSummary(),
+                rootThreadEventId = state.rootThreadEventId
         )
+
+        fun isFromThreadTimeline(): Boolean = rootThreadEventId != null
     }
 
     interface Callback :
             BaseCallback,
             ReactionPillCallback,
             AvatarCallback,
+            ThreadCallback,
             UrlClickCallback,
             ReadReceiptsCallback,
             PreviewUrlCallback {
@@ -133,6 +140,8 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         fun getPreviewUrlRetriever(): PreviewUrlRetriever
 
         fun onVoiceControlButtonClicked(eventId: String, messageAudioContent: MessageAudioContent)
+
+        fun onAddMoreReaction(event: TimelineEvent)
     }
 
     interface ReactionPillCallback {
@@ -141,7 +150,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     }
 
     interface BaseCallback {
-        fun onEventCellClicked(informationData: MessageInformationData, messageContent: Any?, view: View)
+        fun onEventCellClicked(informationData: MessageInformationData, messageContent: Any?, view: View, isRootThreadEvent: Boolean)
         fun onEventLongClicked(informationData: MessageInformationData, messageContent: Any?, view: View): Boolean
     }
 
@@ -150,6 +159,10 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         fun onMemberNameClicked(informationData: MessageInformationData)
     }
 
+    interface ThreadCallback {
+        fun onThreadSummaryClicked(eventId: String, isRootThreadEvent: Boolean): Boolean
+    }
+
     interface ReadReceiptsCallback {
         fun onReadReceiptsClicked(readReceipts: List<ReadReceiptData>)
         fun onReadMarkerVisible()
@@ -198,7 +211,12 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                 // In some cases onChanged will be called before onRemoved and onInserted so position will be bigger than currentSnapshot.size.
                 val prevList = currentSnapshot.subList(0, min(position, currentSnapshot.size))
                 val prevDisplayableEventIndex = prevList.indexOfLast {
-                    timelineEventVisibilityHelper.shouldShowEvent(it, partialState.highlightedEventId)
+                    timelineEventVisibilityHelper.shouldShowEvent(
+                            timelineEvent = it,
+                            highlightedEventId = partialState.highlightedEventId,
+                            isFromThreadTimeline = partialState.isFromThreadTimeline(),
+                            rootThreadEventId = partialState.rootThreadEventId
+                    )
                 }
                 if (prevDisplayableEventIndex != -1 && currentSnapshot.getOrNull(prevDisplayableEventIndex)?.senderInfo?.userId == invalidatedSenderId) {
                     modelCache[prevDisplayableEventIndex] = null
@@ -269,6 +287,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         super.onAttachedToRecyclerView(recyclerView)
         timeline?.addListener(this)
         timelineMediaSizeProvider.recyclerView = recyclerView
+        reactionListFactory.onRequestBuild = { requestModelBuild() }
     }
 
     override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
@@ -276,6 +295,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         contentUploadStateTrackerBinder.clear()
         contentDownloadStateTrackerBinder.clear()
         timeline?.removeListener(this)
+        reactionListFactory.onRequestBuild = null
         super.onDetachedFromRecyclerView(recyclerView)
     }
 
@@ -313,6 +333,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     }
 
     private fun submitSnapshot(newSnapshot: List<TimelineEvent>) {
+        // Update is triggered on any DB change
         backgroundHandler.post {
             inSubmitList = true
             val diffCallback = TimelineEventDiffUtilCallback(currentSnapshot, newSnapshot)
@@ -367,16 +388,28 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         (0 until modelCache.size).forEach { position ->
             val event = currentSnapshot[position]
             val nextEvent = currentSnapshot.nextOrNull(position)
-            val prevEvent = currentSnapshot.prevOrNull(position)
-            val nextDisplayableEvent = currentSnapshot.subList(position + 1, currentSnapshot.size).firstOrNull {
-                timelineEventVisibilityHelper.shouldShowEvent(it, partialState.highlightedEventId)
-            }
             // Should be build if not cached or if model should be refreshed
-            if (modelCache[position] == null || modelCache[position]?.isCacheable(partialState) == false) {
+            if (modelCache[position] == null || modelCache[position]?.isCacheable(partialState) == false || reactionListFactory.needsRebuild(event)) {
+                val prevEvent = currentSnapshot.prevOrNull(position)
+                val prevDisplayableEvent = currentSnapshot.subList(0, position).lastOrNull {
+                    timelineEventVisibilityHelper.shouldShowEvent(
+                            timelineEvent = it,
+                            highlightedEventId = partialState.highlightedEventId,
+                            isFromThreadTimeline = partialState.isFromThreadTimeline(),
+                            rootThreadEventId = partialState.rootThreadEventId)
+                }
+                val nextDisplayableEvent = currentSnapshot.subList(position + 1, currentSnapshot.size).firstOrNull {
+                    timelineEventVisibilityHelper.shouldShowEvent(
+                            timelineEvent = it,
+                            highlightedEventId = partialState.highlightedEventId,
+                            isFromThreadTimeline = partialState.isFromThreadTimeline(),
+                            rootThreadEventId = partialState.rootThreadEventId)
+                }
                 val timelineEventsGroup = timelineEventsGroups.getOrNull(event)
                 val params = TimelineItemFactoryParams(
                         event = event,
                         prevEvent = prevEvent,
+                        prevDisplayableEvent = prevDisplayableEvent,
                         nextEvent = nextEvent,
                         nextDisplayableEvent = nextDisplayableEvent,
                         partialState = partialState,
@@ -436,7 +469,12 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         }
         val readReceipts = receiptsByEvents[event.eventId].orEmpty()
         return copy(
-                readReceiptsItem = readReceiptsItemFactory.create(event.eventId, readReceipts, callback),
+                readReceiptsItem = readReceiptsItemFactory.create(
+                        event.eventId,
+                        readReceipts,
+                        callback,
+                        partialState.isFromThreadTimeline()
+                ),
                 formattedDayModel = formattedDayModel,
                 mergedHeaderModel = mergedHeaderModel
         )
@@ -453,7 +491,12 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                 return null
             }
             // If the event is not shown, we go to the next one
-            if (!timelineEventVisibilityHelper.shouldShowEvent(event, partialState.highlightedEventId)) {
+            if (!timelineEventVisibilityHelper.shouldShowEvent(
+                            timelineEvent = event,
+                            highlightedEventId = partialState.highlightedEventId,
+                            isFromThreadTimeline = partialState.isFromThreadTimeline(),
+                            rootThreadEventId = partialState.rootThreadEventId
+                    )) {
                 continue
             }
             // If the event is sent by us, we update the holder with the eventId and stop the search
@@ -473,9 +516,13 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             val event = itr.previous()
             timelineEventsGroups.addOrIgnore(event)
             val currentReadReceipts = ArrayList(event.readReceipts).filter {
-                it.user.userId != session.myUserId
+                it.roomMember.userId != session.myUserId
             }
-            if (timelineEventVisibilityHelper.shouldShowEvent(event, partialState.highlightedEventId)) {
+            if (timelineEventVisibilityHelper.shouldShowEvent(
+                            timelineEvent = event,
+                            highlightedEventId = partialState.highlightedEventId,
+                            isFromThreadTimeline = partialState.isFromThreadTimeline(),
+                            rootThreadEventId = partialState.rootThreadEventId)) {
                 lastShownEventId = event.eventId
             }
             if (lastShownEventId == null) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
index d7a57e6577..048a4754f5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
@@ -48,6 +48,12 @@ sealed class EventSharedAction(@StringRes val titleRes: Int,
     data class Reply(val eventId: String) :
             EventSharedAction(R.string.reply, R.drawable.ic_reply)
 
+    data class ReplyInThread(val eventId: String) :
+            EventSharedAction(R.string.reply_in_thread, R.drawable.ic_reply_in_thread)
+
+    object ViewInRoom :
+            EventSharedAction(R.string.view_in_room, R.drawable.ic_thread_view_in_room_menu_item)
+
     data class Share(val eventId: String, val messageContent: MessageContent) :
             EventSharedAction(R.string.action_share, R.drawable.ic_share)
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
index c1c145040e..0cf7e60eae 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
@@ -49,10 +49,15 @@ data class MessageActionState(
         // For actions
         val actions: List<EventSharedAction> = emptyList(),
         val expendedReportContentMenu: Boolean = false,
-        val actionPermissions: ActionPermissions = ActionPermissions()
+        val actionPermissions: ActionPermissions = ActionPermissions(),
+        val isFromThreadTimeline: Boolean = false
 ) : MavericksState {
 
-    constructor(args: TimelineEventFragmentArgs) : this(roomId = args.roomId, eventId = args.eventId, informationData = args.informationData)
+    constructor(args: TimelineEventFragmentArgs) : this(
+            roomId = args.roomId,
+            eventId = args.eventId,
+            informationData = args.informationData,
+            isFromThreadTimeline = args.isFromThreadTimeline)
 
     fun senderName(): String = informationData.memberName?.toString() ?: ""
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
index 5e0db19d9e..24c5679438 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
@@ -93,13 +93,14 @@ class MessageActionsBottomSheet :
     }
 
     companion object {
-        fun newInstance(roomId: String, informationData: MessageInformationData): MessageActionsBottomSheet {
+        fun newInstance(roomId: String, informationData: MessageInformationData, isFromThreadTimeline: Boolean): MessageActionsBottomSheet {
             return MessageActionsBottomSheet().apply {
                 setArguments(
                         TimelineEventFragmentArgs(
                                 informationData.eventId,
                                 roomId,
-                                informationData
+                                informationData,
+                                isFromThreadTimeline
                         )
                 )
             }
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 086a093068..27937047a5 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
@@ -45,6 +45,7 @@ import im.vector.app.features.location.toLocationData
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageLocationContent
@@ -77,10 +78,12 @@ class MessageActionsEpoxyController @Inject constructor(
         val formattedDate = dateFormatter.format(date, DateFormatKind.MESSAGE_DETAIL)
         val body = state.messageBody.linkify(host.listener)
         val bindingOptions = spanUtils.getBindingOptions(body)
-        val locationUrl = state.timelineEvent()?.root?.getClearContent()
+
+        val locationContent = state.timelineEvent()?.root?.getClearContent()
                 ?.toModel<MessageLocationContent>(catchError = true)
-                ?.toLocationData()
+        val locationUrl = locationContent?.toLocationData()
                 ?.let { urlMapProvider.buildStaticMapUrl(it, INITIAL_MAP_ZOOM_IN_TIMELINE, 1200, 800) }
+        val locationOwnerId = if (locationContent?.isSelfLocation().orTrue()) state.informationData.matrixItem.id else null
 
         bottomSheetMessagePreviewItem {
             id("preview")
@@ -96,6 +99,7 @@ class MessageActionsEpoxyController @Inject constructor(
             time(formattedDate)
             locationUrl(locationUrl)
             locationPinProvider(host.locationPinProvider)
+            locationOwnerId(locationOwnerId)
         }
 
         // Send state
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 ea54d91a78..745cb0c731 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
@@ -46,6 +46,7 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
+import org.matrix.android.sdk.api.session.events.model.isThread
 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.MessageFormat
@@ -59,6 +60,8 @@ 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.isSticker
 import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.unwrap
 
@@ -324,6 +327,14 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                 add(EventSharedAction.Reply(eventId))
             }
 
+            if (canReplyInThread(timelineEvent, messageContent, actionPermissions)) {
+                add(EventSharedAction.ReplyInThread(eventId))
+            }
+
+            if (canViewInRoom(timelineEvent, messageContent, actionPermissions)) {
+                add(EventSharedAction.ViewInRoom)
+            }
+
             if (canEndPoll(timelineEvent, actionPermissions)) {
                 add(EventSharedAction.EndPoll(timelineEvent.eventId))
             }
@@ -430,6 +441,59 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
         }
     }
 
+    /**
+     * Determine whether or not the Reply In Thread bottom sheet action will be visible
+     * to the user
+     */
+    private fun canReplyInThread(event: TimelineEvent,
+                                 messageContent: MessageContent?,
+                                 actionPermissions: ActionPermissions): Boolean {
+        if (!vectorPreferences.areThreadMessagesEnabled()) return false
+        if (initialState.isFromThreadTimeline) return false
+        if (event.root.isThread()) return false
+        if (event.root.getClearType() != EventType.MESSAGE &&
+                !event.isSticker() && !event.isPoll()) return false
+        if (!actionPermissions.canSendMessage) return false
+        return when (messageContent?.msgType) {
+            MessageType.MSGTYPE_TEXT,
+            MessageType.MSGTYPE_NOTICE,
+            MessageType.MSGTYPE_EMOTE,
+            MessageType.MSGTYPE_IMAGE,
+            MessageType.MSGTYPE_VIDEO,
+            MessageType.MSGTYPE_AUDIO,
+            MessageType.MSGTYPE_FILE,
+            MessageType.MSGTYPE_POLL_START,
+            MessageType.MSGTYPE_STICKER_LOCAL -> true
+            else                              -> false
+        }
+    }
+
+    /**
+     * Determine whether or not the view in room action will be available for the current event
+     */
+    private fun canViewInRoom(event: TimelineEvent,
+                              messageContent: MessageContent?,
+                              actionPermissions: ActionPermissions): Boolean {
+        if (!vectorPreferences.areThreadMessagesEnabled()) return false
+        if (!initialState.isFromThreadTimeline) return false
+        if (event.root.getClearType() != EventType.MESSAGE &&
+                !event.isSticker() && !event.isPoll()) return false
+        if (!actionPermissions.canSendMessage) return false
+
+        return when (messageContent?.msgType) {
+            MessageType.MSGTYPE_TEXT,
+            MessageType.MSGTYPE_NOTICE,
+            MessageType.MSGTYPE_EMOTE,
+            MessageType.MSGTYPE_IMAGE,
+            MessageType.MSGTYPE_VIDEO,
+            MessageType.MSGTYPE_AUDIO,
+            MessageType.MSGTYPE_FILE,
+            MessageType.MSGTYPE_POLL_START,
+            MessageType.MSGTYPE_STICKER_LOCAL -> event.root.threadDetails?.isRootThread ?: false
+            else                              -> false
+        }
+    }
+
     private fun canQuote(event: TimelineEvent, messageContent: MessageContent?, actionPermissions: ActionPermissions): Boolean {
         // Only event of type EventType.MESSAGE are supported for the moment
         if (event.root.getClearType() != EventType.MESSAGE) return false
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
index 1bb1a876bd..2bd3c54d52 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
@@ -24,5 +24,6 @@ import kotlinx.parcelize.Parcelize
 data class TimelineEventFragmentArgs(
         val eventId: String,
         val roomId: String,
-        val informationData: MessageInformationData
+        val informationData: MessageInformationData,
+        val isFromThreadTimeline: Boolean = false
 ) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
index 97f2618fe6..0161f0b55d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
@@ -101,7 +101,11 @@ class CallItemFactory @Inject constructor(
                 createCallTileTimelineItem(
                         roomSummary = roomSummary,
                         callId = callEventGrouper.callId,
-                        callStatus = if (callEventGrouper.callWasMissed()) CallTileTimelineItem.CallStatus.MISSED else CallTileTimelineItem.CallStatus.ENDED,
+                        callStatus = if (callEventGrouper.callWasAnswered()) {
+                            CallTileTimelineItem.CallStatus.ENDED
+                        } else {
+                            CallTileTimelineItem.CallStatus.MISSED
+                        },
                         callKind = callKind,
                         callback = params.callback,
                         highlight = params.isHighlighted,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
index 4f8a36e234..bc2497392c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
@@ -106,8 +106,14 @@ class EncryptedItemFactory @Inject constructor(private val messageInformationDat
                 }
 
                 val informationData = messageInformationDataFactory.create(params)
-                val attributes = attributesFactory.create(event.root.content.toModel<EncryptedEventContent>(), informationData, params.callback)
+                val threadDetails = if (params.isFromThreadTimeline()) null else event.root.threadDetails
+                val attributes = attributesFactory.create(
+                        messageContent = event.root.content.toModel<EncryptedEventContent>(),
+                        informationData = informationData,
+                        callback = params.callback,
+                        threadDetails = threadDetails)
                 return MessageTextItem_()
+                        .layout(informationData.messageLayout.layoutRes)
                         .leftGuideline(avatarSizeProvider.leftGuideline)
                         .highlighted(params.isHighlighted)
                         .attributes(attributes)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index e378969b4a..76ed024370 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home.room.detail.timeline.factory
 
+import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.prevOrNull
 import im.vector.app.features.home.AvatarRenderer
@@ -26,10 +27,10 @@ import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisi
 import im.vector.app.features.home.room.detail.timeline.helper.canBeMerged
 import im.vector.app.features.home.room.detail.timeline.helper.isRoomConfiguration
 import im.vector.app.features.home.room.detail.timeline.item.BasedMergedItem
-import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem
-import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem_
 import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem
 import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem_
+import im.vector.app.features.home.room.detail.timeline.item.MergedSimilarEventsItem
+import im.vector.app.features.home.room.detail.timeline.item.MergedSimilarEventsItem_
 import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.query.QueryStringValue
@@ -82,8 +83,14 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                                                    event: TimelineEvent,
                                                    eventIdToHighlight: String?,
                                                    requestModelBuild: () -> Unit,
-                                                   callback: TimelineEventController.Callback?): MergedMembershipEventsItem_? {
-        val mergedEvents = timelineEventVisibilityHelper.prevSameTypeEvents(items, currentPosition, 2, eventIdToHighlight)
+                                                   callback: TimelineEventController.Callback?): MergedSimilarEventsItem_? {
+        val mergedEvents = timelineEventVisibilityHelper.prevSameTypeEvents(
+                items,
+                currentPosition,
+                2,
+                eventIdToHighlight,
+                partialState.rootThreadEventId,
+                partialState.isFromThreadTimeline())
         return if (mergedEvents.isEmpty()) {
             null
         } else {
@@ -116,23 +123,31 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                 collapsedEventIds.removeAll(mergedEventIds)
             }
             val mergeId = mergedEventIds.joinToString(separator = "_") { it.toString() }
-            val attributes = MergedMembershipEventsItem.Attributes(
-                    isCollapsed = isCollapsed,
-                    mergeData = mergedData,
-                    avatarRenderer = avatarRenderer,
-                    onCollapsedStateChanged = {
-                        mergeItemCollapseStates[event.localId] = it
-                        requestModelBuild()
-                    }
-            )
-            MergedMembershipEventsItem_()
-                    .id(mergeId)
-                    .leftGuideline(avatarSizeProvider.leftGuideline)
-                    .highlighted(isCollapsed && highlighted)
-                    .attributes(attributes)
-                    .also {
-                        it.setOnVisibilityStateChanged(MergedTimelineEventVisibilityStateChangedListener(callback, mergedEvents))
-                    }
+            val summaryTitleResId = when (event.root.getClearType()) {
+                EventType.STATE_ROOM_MEMBER     -> R.plurals.membership_changes
+                EventType.STATE_ROOM_SERVER_ACL -> R.plurals.notice_room_server_acl_changes
+                else                            -> null
+            }
+            summaryTitleResId?.let { summaryTitle ->
+                val attributes = MergedSimilarEventsItem.Attributes(
+                        summaryTitleResId = summaryTitle,
+                        isCollapsed = isCollapsed,
+                        mergeData = mergedData,
+                        avatarRenderer = avatarRenderer,
+                        onCollapsedStateChanged = {
+                            mergeItemCollapseStates[event.localId] = it
+                            requestModelBuild()
+                        }
+                )
+                MergedSimilarEventsItem_()
+                        .id(mergeId)
+                        .leftGuideline(avatarSizeProvider.leftGuideline)
+                        .highlighted(isCollapsed && highlighted)
+                        .attributes(attributes)
+                        .also {
+                            it.setOnVisibilityStateChanged(MergedTimelineEventVisibilityStateChangedListener(callback, mergedEvents))
+                        }
+            }
         }
     }
 
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 352b87a4d8..aa1758dd6c 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
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.home.room.detail.timeline.factory
 
-import android.content.res.Resources
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.Spanned
@@ -44,8 +43,6 @@ import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttrib
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
-import im.vector.app.features.home.room.detail.timeline.item.MessageBlockCodeItem
-import im.vector.app.features.home.room.detail.timeline.item.MessageBlockCodeItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem
@@ -64,9 +61,9 @@ import im.vector.app.features.home.room.detail.timeline.item.RedactedMessageItem
 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.tools.createLinkMovementMethod
 import im.vector.app.features.home.room.detail.timeline.tools.linkify
-import im.vector.app.features.html.CodeVisitor
 import im.vector.app.features.html.EventHtmlRenderer
 import im.vector.app.features.html.PillsPostProcessor
 import im.vector.app.features.html.SpanUtils
@@ -79,11 +76,11 @@ import im.vector.app.features.media.VideoContentRenderer
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
 import me.gujun.android.span.span
-import org.commonmark.node.Document
 import org.matrix.android.sdk.api.MatrixUrls.isMxcUrl
 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.RelationType
+import org.matrix.android.sdk.api.session.events.model.isThread
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
@@ -106,6 +103,7 @@ import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.database.lightweight.LightweightSettingsStorage
 import javax.inject.Inject
 
 class MessageItemFactory @Inject constructor(
@@ -115,6 +113,7 @@ class MessageItemFactory @Inject constructor(
         private val timelineMediaSizeProvider: TimelineMediaSizeProvider,
         private val htmlRenderer: Lazy<EventHtmlRenderer>,
         private val htmlCompressor: VectorHtmlCompressor,
+        private val textRendererFactory: EventTextRenderer.Factory,
         private val stringProvider: StringProvider,
         private val imageContentRenderer: ImageContentRenderer,
         private val messageInformationDataFactory: MessageInformationDataFactory,
@@ -125,13 +124,13 @@ class MessageItemFactory @Inject constructor(
         private val noticeItemFactory: NoticeItemFactory,
         private val avatarSizeProvider: AvatarSizeProvider,
         private val pillsPostProcessorFactory: PillsPostProcessor.Factory,
+        private val lightweightSettingsStorage: LightweightSettingsStorage,
         private val spanUtils: SpanUtils,
         private val session: Session,
         private val voiceMessagePlaybackTracker: VoiceMessagePlaybackTracker,
         private val locationPinProvider: LocationPinProvider,
         private val vectorPreferences: VectorPreferences,
         private val urlMapProvider: UrlMapProvider,
-        private val resources: Resources
 ) {
 
     // TODO inject this properly?
@@ -141,6 +140,10 @@ class MessageItemFactory @Inject constructor(
         pillsPostProcessorFactory.create(roomId)
     }
 
+    private val textRenderer by lazy {
+        textRendererFactory.create(roomId)
+    }
+
     fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
         val event = params.event
         val highlight = params.isHighlighted
@@ -148,9 +151,11 @@ class MessageItemFactory @Inject constructor(
         event.root.eventId ?: return null
         roomId = event.roomId
         val informationData = messageInformationDataFactory.create(params)
+        val threadDetails = if (params.isFromThreadTimeline()) null else event.root.threadDetails
+
         if (event.root.isRedacted()) {
             // message is redacted
-            val attributes = messageItemAttributesFactory.create(null, informationData, callback)
+            val attributes = messageItemAttributesFactory.create(null, informationData, callback, threadDetails)
             return buildRedactedItem(attributes, highlight)
         }
 
@@ -165,11 +170,18 @@ class MessageItemFactory @Inject constructor(
             // This is an edit event, we should display it when debugging as a notice event
             return noticeItemFactory.create(params)
         }
-        val attributes = messageItemAttributesFactory.create(messageContent, informationData, callback)
+
+        if (lightweightSettingsStorage.areThreadMessagesEnabled() && !params.isFromThreadTimeline() && event.root.isThread()) {
+            // This is a thread event and we will [debug] display it when we are in the main timeline
+            return noticeItemFactory.create(params)
+        }
+
+        // always hide summary when we are on thread timeline
+        val attributes = messageItemAttributesFactory.create(messageContent, informationData, callback, threadDetails)
 
 //        val all = event.root.toContent()
 //        val ev = all.toModel<Event>()
-        return when (messageContent) {
+        val messageItem = when (messageContent) {
             is MessageEmoteContent               -> buildEmoteMessageItem(messageContent, informationData, highlight, callback, attributes)
             is MessageTextContent                -> buildItemForTextContent(messageContent, informationData, highlight, callback, attributes)
             is MessageImageInfoContent           -> buildImageMessageItem(messageContent, informationData, highlight, callback, attributes)
@@ -194,23 +206,30 @@ class MessageItemFactory @Inject constructor(
             }
             else                                 -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
         }
+        return messageItem?.apply {
+            layout(informationData.messageLayout.layoutRes)
+        }
     }
 
     private fun buildLocationItem(locationContent: MessageLocationContent,
                                   informationData: MessageInformationData,
                                   highlight: Boolean,
                                   attributes: AbsMessageItem.Attributes): MessageLocationItem? {
-        val width = resources.displayMetrics.widthPixels - dimensionConverter.dpToPx(60)
+        val width = timelineMediaSizeProvider.getMaxSize().first
         val height = dimensionConverter.dpToPx(200)
 
         val locationUrl = locationContent.toLocationData()?.let {
             urlMapProvider.buildStaticMapUrl(it, INITIAL_MAP_ZOOM_IN_TIMELINE, width, height)
         }
 
+        val userId = if (locationContent.isSelfLocation()) informationData.senderId else null
+
         return MessageLocationItem_()
                 .attributes(attributes)
                 .locationUrl(locationUrl)
-                .userId(informationData.senderId)
+                .mapWidth(width)
+                .mapHeight(height)
+                .userId(userId)
                 .locationPinProvider(locationPinProvider)
                 .highlighted(highlight)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
@@ -512,46 +531,22 @@ class MessageItemFactory @Inject constructor(
                                         highlight: Boolean,
                                         callback: TimelineEventController.Callback?,
                                         attributes: AbsMessageItem.Attributes): VectorEpoxyModel<*>? {
-        val isFormatted = messageContent.matrixFormattedBody.isNullOrBlank().not()
-        return if (isFormatted) {
-            // First detect if the message contains some code block(s) or inline code
-            val localFormattedBody = htmlRenderer.get().parse(messageContent.body) as Document
-            val codeVisitor = CodeVisitor()
-            codeVisitor.visit(localFormattedBody)
-            when (codeVisitor.codeKind) {
-                CodeVisitor.Kind.BLOCK  -> {
-                    val codeFormattedBlock = htmlRenderer.get().render(localFormattedBody)
-                    if (codeFormattedBlock == null) {
-                        buildFormattedTextItem(messageContent, informationData, highlight, callback, attributes)
-                    } else {
-                        buildCodeBlockItem(codeFormattedBlock, informationData, highlight, callback, attributes)
-                    }
-                }
-                CodeVisitor.Kind.INLINE -> {
-                    val codeFormatted = htmlRenderer.get().render(localFormattedBody)
-                    if (codeFormatted == null) {
-                        buildFormattedTextItem(messageContent, informationData, highlight, callback, attributes)
-                    } else {
-                        buildMessageTextItem(codeFormatted, false, informationData, highlight, callback, attributes)
-                    }
-                }
-                CodeVisitor.Kind.NONE   -> {
-                    buildFormattedTextItem(messageContent, informationData, highlight, callback, attributes)
-                }
-            }
+        val matrixFormattedBody = messageContent.matrixFormattedBody
+        return if (matrixFormattedBody != null) {
+            buildFormattedTextItem(matrixFormattedBody, informationData, highlight, callback, attributes)
         } else {
             buildMessageTextItem(messageContent.body, false, informationData, highlight, callback, attributes)
         }
     }
 
-    private fun buildFormattedTextItem(messageContent: MessageTextContent,
+    private fun buildFormattedTextItem(matrixFormattedBody: String,
                                        informationData: MessageInformationData,
                                        highlight: Boolean,
                                        callback: TimelineEventController.Callback?,
                                        attributes: AbsMessageItem.Attributes): MessageTextItem? {
-        val compressed = htmlCompressor.compress(messageContent.formattedBody!!)
-        val formattedBody = htmlRenderer.get().render(compressed, pillsPostProcessor)
-        return buildMessageTextItem(formattedBody, true, informationData, highlight, callback, attributes)
+        val compressed = htmlCompressor.compress(matrixFormattedBody)
+        val renderedFormattedBody = htmlRenderer.get().render(compressed, pillsPostProcessor) as Spanned
+        return buildMessageTextItem(renderedFormattedBody, true, informationData, highlight, callback, attributes)
     }
 
     private fun buildMessageTextItem(body: CharSequence,
@@ -560,8 +555,9 @@ class MessageItemFactory @Inject constructor(
                                      highlight: Boolean,
                                      callback: TimelineEventController.Callback?,
                                      attributes: AbsMessageItem.Attributes): MessageTextItem? {
-        val bindingOptions = spanUtils.getBindingOptions(body)
-        val linkifiedBody = body.linkify(callback)
+        val renderedBody = textRenderer.render(body)
+        val bindingOptions = spanUtils.getBindingOptions(renderedBody)
+        val linkifiedBody = renderedBody.linkify(callback)
 
         return MessageTextItem_()
                 .message(
@@ -584,24 +580,6 @@ class MessageItemFactory @Inject constructor(
                 .movementMethod(createLinkMovementMethod(callback))
     }
 
-    private fun buildCodeBlockItem(formattedBody: CharSequence,
-                                   informationData: MessageInformationData,
-                                   highlight: Boolean,
-                                   callback: TimelineEventController.Callback?,
-                                   attributes: AbsMessageItem.Attributes): MessageBlockCodeItem? {
-        return MessageBlockCodeItem_()
-                .apply {
-                    if (informationData.hasBeenEdited) {
-                        val spannable = annotateWithEdited("", callback, informationData)
-                        editedSpan(spannable.toEpoxyCharSequence())
-                    }
-                }
-                .leftGuideline(avatarSizeProvider.leftGuideline)
-                .attributes(attributes)
-                .highlighted(highlight)
-                .message(formattedBody.toEpoxyCharSequence())
-    }
-
     private fun annotateWithEdited(linkifiedBody: CharSequence,
                                    callback: TimelineEventController.Callback?,
                                    informationData: MessageInformationData): Spannable {
@@ -707,6 +685,7 @@ class MessageItemFactory @Inject constructor(
     private fun buildRedactedItem(attributes: AbsMessageItem.Attributes,
                                   highlight: Boolean): RedactedMessageItem? {
         return RedactedMessageItem_()
+                .layout(attributes.informationData.messageLayout.layoutRes)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .attributes(attributes)
                 .highlighted(highlight)
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 8a74a6d207..e66dd4b043 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
@@ -26,13 +26,17 @@ import javax.inject.Inject
 
 class ReadReceiptsItemFactory @Inject constructor(private val avatarRenderer: AvatarRenderer) {
 
-    fun create(eventId: String, readReceipts: List<ReadReceipt>, callback: TimelineEventController.Callback?): ReadReceiptsItem? {
+    fun create(
+            eventId: String,
+            readReceipts: List<ReadReceipt>,
+            callback: TimelineEventController.Callback?,
+            isFromThreadTimeLine: Boolean): ReadReceiptsItem? {
         if (readReceipts.isEmpty()) {
             return null
         }
         val readReceiptsData = readReceipts
                 .map {
-                    ReadReceiptData(it.user.userId, it.user.avatarUrl, it.user.displayName, it.originServerTs)
+                    ReadReceiptData(it.roomMember.userId, it.roomMember.avatarUrl, it.roomMember.displayName, it.originServerTs)
                 }
                 .toList()
 
@@ -41,6 +45,7 @@ class ReadReceiptsItemFactory @Inject constructor(private val avatarRenderer: Av
                 .eventId(eventId)
                 .readReceipts(readReceiptsData)
                 .avatarRenderer(avatarRenderer)
+                .shouldHideReadReceipts(isFromThreadTimeLine)
                 .clickListener {
                     callback?.onReadReceiptsClicked(readReceiptsData)
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineFactory.kt
index b57e39b3cf..3ec1366131 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineFactory.kt
@@ -35,8 +35,14 @@ private val secondaryTimelineAllowedTypes = listOf(
 
 class TimelineFactory @Inject constructor(private val session: Session, private val timelineSettingsFactory: TimelineSettingsFactory) {
 
-    fun createTimeline(coroutineScope: CoroutineScope, mainRoom: Room, eventId: String?): Timeline {
-        val settings = timelineSettingsFactory.create()
+    fun createTimeline(
+            coroutineScope: CoroutineScope,
+            mainRoom: Room,
+            eventId: String?,
+            rootThreadEventId: String?
+    ): Timeline {
+        val settings = timelineSettingsFactory.create(rootThreadEventId)
+
         if (!session.vectorCallService.protocolChecker.supportVirtualRooms) {
             return mainRoom.createTimeline(eventId, settings)
         }
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 dfe1cc1d9b..b41e1d8f25 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
@@ -44,8 +44,17 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
     fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*> {
         val event = params.event
         val computedModel = try {
-            if (!timelineEventVisibilityHelper.shouldShowEvent(event, params.highlightedEventId)) {
-                return buildEmptyItem(event, params.prevEvent, params.highlightedEventId)
+            if (!timelineEventVisibilityHelper.shouldShowEvent(
+                            timelineEvent = event,
+                            highlightedEventId = params.highlightedEventId,
+                            isFromThreadTimeline = params.isFromThreadTimeline(),
+                            rootThreadEventId = params.rootThreadEventId)) {
+                return buildEmptyItem(
+                        event,
+                        params.prevEvent,
+                        params.highlightedEventId,
+                        params.rootThreadEventId,
+                        params.isFromThreadTimeline())
             }
 
             // Manage state event differently, to check validity
@@ -134,11 +143,24 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
             Timber.e(throwable, "failed to create message item")
             defaultItemFactory.create(params, throwable)
         }
-        return computedModel ?: buildEmptyItem(event, params.prevEvent, params.highlightedEventId)
+        return computedModel ?: buildEmptyItem(
+                event,
+                params.prevEvent,
+                params.highlightedEventId,
+                params.rootThreadEventId,
+                params.isFromThreadTimeline())
     }
 
-    private fun buildEmptyItem(timelineEvent: TimelineEvent, prevEvent: TimelineEvent?, highlightedEventId: String?): TimelineEmptyItem {
-        val isNotBlank = prevEvent == null || timelineEventVisibilityHelper.shouldShowEvent(prevEvent, highlightedEventId)
+    private fun buildEmptyItem(timelineEvent: TimelineEvent,
+                               prevEvent: TimelineEvent?,
+                               highlightedEventId: String?,
+                               rootThreadEventId: String?,
+                               isFromThreadTimeline: Boolean): TimelineEmptyItem {
+        val isNotBlank = prevEvent == null || timelineEventVisibilityHelper.shouldShowEvent(
+                timelineEvent = prevEvent,
+                highlightedEventId = highlightedEventId,
+                isFromThreadTimeline = isFromThreadTimeline,
+                rootThreadEventId = rootThreadEventId)
         return TimelineEmptyItem_()
                 .id(timelineEvent.localId)
                 .eventId(timelineEvent.eventId)
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 cdfedb2925..46ae01a794 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
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 data class TimelineItemFactoryParams(
         val event: TimelineEvent,
         val prevEvent: TimelineEvent? = null,
+        val prevDisplayableEvent: TimelineEvent? = null,
         val nextEvent: TimelineEvent? = null,
         val nextDisplayableEvent: TimelineEvent? = null,
         val partialState: TimelineEventController.PartialState = TimelineEventController.PartialState(),
@@ -34,5 +35,10 @@ data class TimelineItemFactoryParams(
     val highlightedEventId: String?
         get() = partialState.highlightedEventId
 
+    val rootThreadEventId: String?
+        get() = partialState.rootThreadEventId
+
     val isHighlighted = highlightedEventId == event.eventId
+
+    fun isFromThreadTimeline(): Boolean = rootThreadEventId != null
 }
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 ae541217bf..c7be395693 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
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.extensions.appendNl
 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.isThread
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -104,6 +105,7 @@ class NoticeEventFormatter @Inject constructor(
             EventType.STATE_SPACE_CHILD,
             EventType.STATE_SPACE_PARENT,
             EventType.REDACTION,
+            EventType.STICKER,
             EventType.POLL_RESPONSE,
             EventType.POLL_END                      -> formatDebug(timelineEvent.root)
             else                                    -> {
@@ -194,7 +196,8 @@ class NoticeEventFormatter @Inject constructor(
     }
 
     private fun formatDebug(event: Event): CharSequence {
-        return "Debug: event type \"${event.getClearType()}\""
+            val threadPrefix = if (event.isThread()) "thread" else ""
+            return "Debug: $threadPrefix event type \"${event.getClearType()}\""
     }
 
     private fun formatRoomCreateEvent(event: Event, isDm: Boolean): CharSequence? {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
index 5fc5deb407..a34c216fad 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
@@ -17,14 +17,22 @@
 package im.vector.app.features.home.room.detail.timeline.helper
 
 import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.home.room.detail.timeline.style.TimelineLayoutSettings
+import im.vector.app.features.home.room.detail.timeline.style.TimelineLayoutSettingsProvider
 import javax.inject.Inject
 
-class AvatarSizeProvider @Inject constructor(private val dimensionConverter: DimensionConverter) {
+class AvatarSizeProvider @Inject constructor(private val dimensionConverter: DimensionConverter,
+                                             private val layoutSettingsProvider: TimelineLayoutSettingsProvider) {
 
-    private val avatarStyle = AvatarStyle.SMALL
+    private val avatarStyle by lazy {
+        when (layoutSettingsProvider.getLayoutSettings()) {
+            TimelineLayoutSettings.MODERN -> AvatarStyle.SMALL
+            TimelineLayoutSettings.BUBBLE -> AvatarStyle.BUBBLE
+        }
+    }
 
     val leftGuideline: Int by lazy {
-        dimensionConverter.dpToPx(avatarStyle.avatarSizeDP + 8)
+        dimensionConverter.dpToPx(avatarStyle.avatarSizeDP + avatarStyle.marginDP)
     }
 
     val avatarSize: Int by lazy {
@@ -33,11 +41,12 @@ class AvatarSizeProvider @Inject constructor(private val dimensionConverter: Dim
 
     companion object {
 
-        enum class AvatarStyle(val avatarSizeDP: Int) {
-            BIG(50),
-            MEDIUM(40),
-            SMALL(30),
-            NONE(0)
+        enum class AvatarStyle(val avatarSizeDP: Int, val marginDP: Int) {
+            BIG(50, 8),
+            MEDIUM(40, 8),
+            SMALL(30, 8),
+            BUBBLE(28, 4),
+            NONE(0, 8)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
index caf0131144..8f5f80c834 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
@@ -22,16 +22,12 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import dagger.hilt.android.scopes.ActivityScoped
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.error.ErrorFormatter
-import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
 import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem
 import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
 import javax.inject.Inject
 
 @ActivityScoped
-class ContentDownloadStateTrackerBinder @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
-                                                            private val messageColorProvider: MessageColorProvider,
-                                                            private val errorFormatter: ErrorFormatter) {
+class ContentDownloadStateTrackerBinder @Inject constructor(private val activeSessionHolder: ActiveSessionHolder) {
 
     private val updateListeners = mutableMapOf<String, ContentDownloadUpdater>()
 
@@ -39,7 +35,7 @@ class ContentDownloadStateTrackerBinder @Inject constructor(private val activeSe
              holder: MessageFileItem.Holder) {
         activeSessionHolder.getSafeActiveSession()?.also { session ->
             val downloadStateTracker = session.contentDownloadProgressTracker()
-            val updateListener = ContentDownloadUpdater(holder, messageColorProvider, errorFormatter)
+            val updateListener = ContentDownloadUpdater(holder)
             updateListeners[mxcUrl] = updateListener
             downloadStateTracker.track(mxcUrl, updateListener)
         }
@@ -62,9 +58,7 @@ class ContentDownloadStateTrackerBinder @Inject constructor(private val activeSe
     }
 }
 
-private class ContentDownloadUpdater(private val holder: MessageFileItem.Holder,
-                                     private val messageColorProvider: MessageColorProvider,
-                                     private val errorFormatter: ErrorFormatter) : ContentDownloadStateTracker.UpdateListener {
+private class ContentDownloadUpdater(private val holder: MessageFileItem.Holder) : ContentDownloadStateTracker.UpdateListener {
 
     override fun onDownloadStateUpdate(state: ContentDownloadStateTracker.State) {
         when (state) {
@@ -124,7 +118,7 @@ private class ContentDownloadUpdater(private val holder: MessageFileItem.Holder,
     private fun handleSuccess() {
         stop()
         holder.fileDownloadProgress.isIndeterminate = false
-        holder.fileDownloadProgress.progress = 100
+        holder.fileDownloadProgress.progress = 0
         holder.fileImageView.setImageResource(R.drawable.ic_paperclip)
     }
 }
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 e92376c44d..0cf30c8c01 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
@@ -45,7 +45,17 @@ class LocationPinProvider @Inject constructor(
         GlideApp.with(context)
     }
 
-    fun create(userId: String, callback: (Drawable) -> Unit) {
+    /**
+     * Creates a pin drawable. If userId is null then a generic pin drawable will be created.
+     * @param userId userId that will be used to retrieve user avatar
+     * @param callback Pin drawable will be sent through the callback
+     */
+    fun create(userId: String?, callback: (Drawable) -> Unit) {
+        if (userId == null) {
+            callback(ContextCompat.getDrawable(context, R.drawable.ic_location_pin)!!)
+            return
+        }
+
         if (cache.contains(userId)) {
             callback(cache[userId]!!)
             return
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 b30286163e..59b39d17ef 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
@@ -24,10 +24,9 @@ import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import im.vector.app.features.home.room.detail.timeline.item.PollResponseData
 import im.vector.app.features.home.room.detail.timeline.item.PollVoteSummaryData
-import im.vector.app.features.home.room.detail.timeline.item.ReactionInfoData
 import im.vector.app.features.home.room.detail.timeline.item.ReferencesInfoData
 import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
-import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayoutFactory
 import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
@@ -41,7 +40,6 @@ 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.isEdition
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 import javax.inject.Inject
 
@@ -51,35 +49,29 @@ import javax.inject.Inject
  */
 class MessageInformationDataFactory @Inject constructor(private val session: Session,
                                                         private val dateFormatter: VectorDateFormatter,
-                                                        private val visibilityHelper: TimelineEventVisibilityHelper,
-                                                        private val vectorPreferences: VectorPreferences) {
+                                                        private val messageLayoutFactory: TimelineMessageLayoutFactory,
+                                                        private val reactionsSummaryFactory: ReactionsSummaryFactory) {
 
     fun create(params: TimelineItemFactoryParams): MessageInformationData {
         val event = params.event
         val nextDisplayableEvent = params.nextDisplayableEvent
+        val prevDisplayableEvent = params.prevDisplayableEvent
         val eventId = event.eventId
+        val isSentByMe = event.root.senderId == session.myUserId
+        val roomSummary = params.partialState.roomSummary
 
         val date = event.root.localDateTime()
         val nextDate = nextDisplayableEvent?.root?.localDateTime()
         val addDaySeparator = date.toLocalDate() != nextDate?.toLocalDate()
-        val isNextMessageReceivedMoreThanOneHourAgo = nextDate?.isBefore(date.minusMinutes(60))
-                ?: false
 
-        val showInformation =
-                addDaySeparator ||
-                        event.senderInfo.avatarUrl != nextDisplayableEvent?.senderInfo?.avatarUrl ||
-                        event.senderInfo.disambiguatedDisplayName != nextDisplayableEvent?.senderInfo?.disambiguatedDisplayName ||
-                        nextDisplayableEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED) ||
-                        isNextMessageReceivedMoreThanOneHourAgo ||
-                        isTileTypeMessage(nextDisplayableEvent) ||
-                        nextDisplayableEvent.isEdition()
+        val isFirstFromThisSender = nextDisplayableEvent?.root?.senderId != event.root.senderId || addDaySeparator
+        val isLastFromThisSender = prevDisplayableEvent?.root?.senderId != event.root.senderId ||
+                prevDisplayableEvent?.root?.localDateTime()?.toLocalDate() != date.toLocalDate()
 
         val time = dateFormatter.format(event.root.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
-        val roomSummary = params.partialState.roomSummary
         val e2eDecoration = getE2EDecoration(roomSummary, event)
 
         // SendState Decoration
-        val isSentByMe = event.root.senderId == session.myUserId
         val sendStateDecoration = if (isSentByMe) {
             getSendStateDecoration(
                     event = event,
@@ -90,6 +82,8 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
             SendStateDecoration.NONE
         }
 
+        val messageLayout = messageLayoutFactory.create(params)
+
         return MessageInformationData(
                 eventId = eventId,
                 senderId = event.root.senderId ?: "",
@@ -98,13 +92,8 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                 ageLocalTS = event.root.ageLocalTs,
                 avatarUrl = event.senderInfo.avatarUrl,
                 memberName = event.senderInfo.disambiguatedDisplayName,
-                showInformation = showInformation,
-                forceShowTimestamp = vectorPreferences.alwaysShowTimeStamps(),
-                orderedReactionList = event.annotations?.reactionsSummary
-                        // ?.filter { isSingleEmoji(it.key) }
-                        ?.map {
-                            ReactionInfoData(it.key, it.count, it.addedByMe, it.localEchoEvents.isEmpty())
-                        },
+                messageLayout = messageLayout,
+                reactionsSummary = reactionsSummaryFactory.create(event, params.callback),
                 pollResponseAggregatedSummary = event.annotations?.pollResponseSummary?.let {
                     PollResponseData(
                             myVote = it.aggregatedContent?.myVote,
@@ -127,6 +116,8 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                     ReferencesInfoData(verificationState)
                 },
                 sentByMe = isSentByMe,
+                isFirstFromThisSender = isFirstFromThisSender,
+                isLastFromThisSender = isLastFromThisSender,
                 e2eDecoration = e2eDecoration,
                 sendStateDecoration = sendStateDecoration
         )
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
index 679613d262..845b765101 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
@@ -16,22 +16,29 @@
 package im.vector.app.features.home.room.detail.timeline.helper
 
 import im.vector.app.EmojiCompatFontProvider
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import org.matrix.android.sdk.api.session.threads.ThreadDetails
 import javax.inject.Inject
 
 class MessageItemAttributesFactory @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
         private val messageColorProvider: MessageColorProvider,
         private val avatarSizeProvider: AvatarSizeProvider,
+        private val stringProvider: StringProvider,
+        private val preferencesProvider: UserPreferencesProvider,
         private val emojiCompatFontProvider: EmojiCompatFontProvider) {
 
     fun create(messageContent: Any?,
                informationData: MessageInformationData,
-               callback: TimelineEventController.Callback?): AbsMessageItem.Attributes {
+               callback: TimelineEventController.Callback?,
+               threadDetails: ThreadDetails? = null): AbsMessageItem.Attributes {
         return AbsMessageItem.Attributes(
                 avatarSize = avatarSizeProvider.avatarSize,
                 informationData = informationData,
@@ -41,15 +48,19 @@ class MessageItemAttributesFactory @Inject constructor(
                     callback?.onEventLongClicked(informationData, messageContent, view) ?: false
                 },
                 itemClickListener = { view ->
-                    callback?.onEventCellClicked(informationData, messageContent, view)
+                    callback?.onEventCellClicked(informationData, messageContent, view, threadDetails?.isRootThread ?: false)
                 },
                 memberClickListener = {
                     callback?.onMemberNameClicked(informationData)
                 },
                 reactionPillCallback = callback,
                 avatarCallback = callback,
+                threadCallback = callback,
                 readReceiptsCallback = callback,
-                emojiTypeFace = emojiCompatFontProvider.typeface
+                emojiTypeFace = emojiCompatFontProvider.typeface,
+                decryptionErrorMessage = stringProvider.getString(R.string.encrypted_message),
+                threadDetails = threadDetails,
+                areThreadMessagesEnabled = preferencesProvider.areThreadMessagesEnabled()
         )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ReactionsSummaryFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ReactionsSummaryFactory.kt
new file mode 100644
index 0000000000..fcc98ff729
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ReactionsSummaryFactory.kt
@@ -0,0 +1,65 @@
+/*
+ * 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.timeline.helper
+
+import dagger.hilt.android.scopes.ActivityScoped
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.item.ReactionInfoData
+import im.vector.app.features.home.room.detail.timeline.item.ReactionsSummaryData
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import javax.inject.Inject
+
+@ActivityScoped
+class ReactionsSummaryFactory @Inject constructor() {
+
+    var onRequestBuild: (() -> Unit)? = null
+    private val showAllReactionsByEvent = HashSet<String>()
+    private val eventsRequestingBuild = HashSet<String>()
+
+    fun needsRebuild(event: TimelineEvent): Boolean {
+        return eventsRequestingBuild.remove(event.eventId)
+    }
+
+    fun create(event: TimelineEvent, callback: TimelineEventController.Callback?): ReactionsSummaryData {
+        val eventId = event.eventId
+        val showAllStates = showAllReactionsByEvent.contains(eventId)
+        val reactions = event.annotations?.reactionsSummary
+                ?.map {
+                    ReactionInfoData(it.key, it.count, it.addedByMe, it.localEchoEvents.isEmpty())
+                }
+        return ReactionsSummaryData(
+                reactions = reactions,
+                showAll = showAllStates,
+                onShowMoreClicked = {
+                    showAllReactionsByEvent.add(eventId)
+                    onRequestBuild(eventId)
+                },
+                onShowLessClicked = {
+                    showAllReactionsByEvent.remove(eventId)
+                    onRequestBuild(eventId)
+                },
+                onAddMoreClicked = {
+                    callback?.onAddMoreReaction(event)
+                }
+        )
+    }
+
+    private fun onRequestBuild(eventId: String) {
+        eventsRequestingBuild.add(eventId)
+        onRequestBuild?.invoke()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
index 7165921b35..8a0e1e18fd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
@@ -115,7 +115,10 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
     private fun MutableList<EpoxyModel<*>>.addForwardPrefetchIfNeeded(timeline: Timeline?, callback: TimelineEventController.Callback?) {
         val shouldAddForwardPrefetch = timeline?.hasMoreToLoad(Timeline.Direction.FORWARDS) ?: false
         if (shouldAddForwardPrefetch) {
-            val indexOfPrefetchForward = DEFAULT_PREFETCH_THRESHOLD.coerceAtMost(size - 1)
+            val indexOfPrefetchForward = DEFAULT_PREFETCH_THRESHOLD
+                    .coerceAtMost(size - 1)
+                    .coerceAtLeast(0)
+
             val loadingItem = LoadingItem_()
                     .id("prefetch_forward_loading${System.currentTimeMillis()}")
                     .showLoader(false)
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 bcccbc9f7c..53a9fbbaea 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
@@ -56,7 +56,8 @@ object TimelineDisplayableEvents {
 }
 
 fun TimelineEvent.canBeMerged(): Boolean {
-    return root.getClearType() == EventType.STATE_ROOM_MEMBER
+    return root.getClearType() == EventType.STATE_ROOM_MEMBER ||
+            root.getClearType() == EventType.STATE_ROOM_SERVER_ACL
 }
 
 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 580d7d18cf..f317eb4f9a 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
@@ -21,6 +21,8 @@ import im.vector.app.core.resources.UserPreferencesProvider
 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.getRootThreadEventId
+import org.matrix.android.sdk.api.session.events.model.isThread
 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
@@ -37,7 +39,13 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
      *
      * @return a list of timeline events which have sequentially the same type following the next direction.
      */
-    fun nextSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int, eventIdToHighlight: String?): List<TimelineEvent> {
+    private fun nextSameTypeEvents(
+            timelineEvents: List<TimelineEvent>,
+            index: Int,
+            minSize: Int,
+            eventIdToHighlight: String?,
+            rootThreadEventId: String?,
+            isFromThreadTimeline: Boolean): List<TimelineEvent> {
         if (index >= timelineEvents.size - 1) {
             return emptyList()
         }
@@ -59,11 +67,18 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
         } else {
             nextSameDayEvents.subList(0, indexOfFirstDifferentEventType)
         }
-        val filteredSameTypeEvents = sameTypeEvents.filter { shouldShowEvent(it, eventIdToHighlight) }
+        val filteredSameTypeEvents = sameTypeEvents.filter {
+            shouldShowEvent(
+                    timelineEvent = it,
+                    highlightedEventId = eventIdToHighlight,
+                    isFromThreadTimeline = isFromThreadTimeline,
+                    rootThreadEventId = rootThreadEventId
+            )
+        }
         if (filteredSameTypeEvents.size < minSize) {
             return emptyList()
         }
-        return  filteredSameTypeEvents
+        return filteredSameTypeEvents
     }
 
     /**
@@ -74,23 +89,35 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
      *
      * @return a list of timeline events which have sequentially the same type following the prev direction.
      */
-    fun prevSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int, eventIdToHighlight: String?): List<TimelineEvent> {
+    fun prevSameTypeEvents(
+            timelineEvents: List<TimelineEvent>,
+            index: Int,
+            minSize: Int,
+            eventIdToHighlight: String?,
+            rootThreadEventId: String?,
+            isFromThreadTimeline: Boolean): List<TimelineEvent> {
         val prevSub = timelineEvents.subList(0, index + 1)
         return prevSub
                 .reversed()
                 .let {
-                    nextSameTypeEvents(it, 0, minSize, eventIdToHighlight)
+                    nextSameTypeEvents(it, 0, minSize, eventIdToHighlight, rootThreadEventId, isFromThreadTimeline)
                 }
     }
 
     /**
      * @param timelineEvent the event to check for visibility
      * @param highlightedEventId can be checked to force visibility to true
+     * @param rootThreadEventId if this param is null it means we are in the original timeline
      * @return true if the event should be shown in the timeline.
      */
-    fun shouldShowEvent(timelineEvent: TimelineEvent, highlightedEventId: String?): Boolean {
+    fun shouldShowEvent(
+            timelineEvent: TimelineEvent,
+            highlightedEventId: String?,
+            isFromThreadTimeline: Boolean,
+            rootThreadEventId: String?
+    ): Boolean {
         // If show hidden events is true we should always display something
-        if (userPreferencesProvider.shouldShowHiddenEvents()) {
+        if (userPreferencesProvider.shouldShowHiddenEvents() && !isFromThreadTimeline) {
             return true
         }
         // We always show highlighted event
@@ -100,18 +127,35 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
         if (!timelineEvent.isDisplayable()) {
             return false
         }
+
         // Check for special case where we should hide the event, like redacted, relation, memberships... according to user preferences.
-        return !timelineEvent.shouldBeHidden()
+        return !timelineEvent.shouldBeHidden(rootThreadEventId, isFromThreadTimeline)
     }
 
     private fun TimelineEvent.isDisplayable(): Boolean {
         return TimelineDisplayableEvents.DISPLAYABLE_TYPES.contains(root.getClearType())
     }
 
-    private fun TimelineEvent.shouldBeHidden(): Boolean {
-        if (root.isRedacted() && !userPreferencesProvider.shouldShowRedactedMessages()) {
+    private fun TimelineEvent.shouldBeHidden(rootThreadEventId: String?, isFromThreadTimeline: Boolean): Boolean {
+        if (root.isRedacted() && !userPreferencesProvider.shouldShowRedactedMessages() && root.threadDetails?.isRootThread == false) {
             return true
         }
+
+        // We should not display deleted thread messages within the normal timeline
+        if (root.isRedacted() &&
+                userPreferencesProvider.areThreadMessagesEnabled() &&
+                !isFromThreadTimeline &&
+                (root.isThread() || root.threadDetails?.isThread == true)) {
+            return true
+        }
+        if (root.isRedacted() &&
+                !userPreferencesProvider.shouldShowRedactedMessages() &&
+                userPreferencesProvider.areThreadMessagesEnabled() &&
+                isFromThreadTimeline &&
+                root.isThread()) {
+            return true
+        }
+
         if (root.getRelationContent()?.type == RelationType.REPLACE) {
             return true
         }
@@ -120,6 +164,18 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
             if ((diff.isJoin || diff.isPart) && !userPreferencesProvider.shouldShowJoinLeaves()) return true
             if ((diff.isAvatarChange || diff.isDisplaynameChange) && !userPreferencesProvider.shouldShowAvatarDisplayNameChanges()) return true
         }
+
+        if (userPreferencesProvider.areThreadMessagesEnabled() && !isFromThreadTimeline && root.isThread()) {
+            return true
+        }
+
+        // Allow only the the threads within the rootThreadEventId along with the root event
+        if (userPreferencesProvider.areThreadMessagesEnabled() && isFromThreadTimeline) {
+            return if (root.getRootThreadEventId() == rootThreadEventId) {
+                false
+            } else root.eventId != rootThreadEventId
+        }
+
         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 3910204293..4ff8a9fa43 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
@@ -108,11 +108,8 @@ class CallSignalingEventsGroup(private val group: TimelineEventsGroup) {
         }
     }
 
-    /**
-     * Returns true if there are only events from one side.
-     */
-    fun callWasMissed(): Boolean {
-        return group.events.distinctBy { it.senderInfo.userId }.size == 1
+    fun callWasAnswered(): Boolean {
+        return getAnswer() != null
     }
 
     private fun getAnswer(): TimelineEvent? {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
index 9ec61e6054..53c2f6c0d4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
@@ -16,13 +16,17 @@
 
 package im.vector.app.features.home.room.detail.timeline.helper
 
+import android.content.res.Resources
 import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.scopes.ActivityScoped
+import im.vector.app.R
+import im.vector.app.features.settings.VectorPreferences
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
 @ActivityScoped
-class TimelineMediaSizeProvider @Inject constructor() {
+class TimelineMediaSizeProvider @Inject constructor(private val resources: Resources,
+                                                    private val vectorPreferences: VectorPreferences) {
 
     var recyclerView: RecyclerView? = null
     private var cachedSize: Pair<Int, Int>? = null
@@ -41,9 +45,14 @@ class TimelineMediaSizeProvider @Inject constructor() {
             maxImageWidth = (width * 0.7f).roundToInt()
             maxImageHeight = (height * 0.5f).roundToInt()
         } else {
-            maxImageWidth = (width * 0.5f).roundToInt()
+            maxImageWidth = (width * 0.7f).roundToInt()
             maxImageHeight = (height * 0.7f).roundToInt()
         }
-        return Pair(maxImageWidth, maxImageHeight)
+        return if (vectorPreferences.useMessageBubblesLayout()) {
+            val bubbleMaxImageWidth = maxImageWidth.coerceAtMost(resources.getDimensionPixelSize(R.dimen.chat_bubble_fixed_size))
+            Pair(bubbleMaxImageWidth, maxImageHeight)
+        } else {
+            Pair(maxImageWidth, maxImageHeight)
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
index 3aee65bf19..8b7dcc9c72 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
@@ -22,9 +22,11 @@ import javax.inject.Inject
 
 class TimelineSettingsFactory @Inject constructor(private val userPreferencesProvider: UserPreferencesProvider) {
 
-    fun create(): TimelineSettings {
+    fun create(rootThreadEventId: String?): TimelineSettings {
         return TimelineSettings(
                 initialSize = 30,
-                buildReadReceipts = userPreferencesProvider.shouldShowReadReceipts())
+                buildReadReceipts = userPreferencesProvider.shouldShowReadReceipts(),
+                rootThreadEventId = rootThreadEventId
+        )
     }
 }
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 080b766258..430e0970bb 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
@@ -16,23 +16,34 @@
 
 package im.vector.app.features.home.room.detail.timeline.item
 
+import android.annotation.SuppressLint
+import android.graphics.Typeface
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.IdRes
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.core.content.ContextCompat.getDrawable
 import androidx.core.view.isVisible
+import androidx.core.widget.TextViewCompat
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.getDrawableAsSpannable
 import im.vector.app.core.ui.views.ShieldImageView
+import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
 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.crypto.RoomEncryptionTrustLevel
 import org.matrix.android.sdk.api.session.room.send.SendState
 
+private const val MAX_REACTIONS_TO_SHOW = 8
+
 /**
  * Base timeline item with reactions and read receipts.
  * Manages associated click listeners and send status.
@@ -64,27 +75,10 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder> : BaseEventItem
         return listOf(baseAttributes.informationData.eventId)
     }
 
+    @SuppressLint("SetTextI18n")
     override fun bind(holder: H) {
         super.bind(holder)
-        val reactions = baseAttributes.informationData.orderedReactionList
-        if (!shouldShowReactionAtBottom() || reactions.isNullOrEmpty()) {
-            holder.reactionsContainer.isVisible = false
-        } else {
-            holder.reactionsContainer.isVisible = true
-            holder.reactionsContainer.removeAllViews()
-            reactions.take(8).forEach { reaction ->
-                val reactionButton = ReactionButton(holder.view.context)
-                reactionButton.reactedListener = reactionClickListener
-                reactionButton.setTag(R.id.reactionsContainer, reaction.key)
-                reactionButton.reactionString = reaction.key
-                reactionButton.reactionCount = reaction.count
-                reactionButton.setChecked(reaction.addedByMe)
-                reactionButton.isEnabled = reaction.synced
-                holder.reactionsContainer.addView(reactionButton)
-            }
-            holder.reactionsContainer.setOnLongClickListener(baseAttributes.itemLongClickListener)
-        }
-
+        renderReactions(holder, baseAttributes.informationData.reactionsSummary)
         when (baseAttributes.informationData.e2eDecoration) {
             E2EDecoration.NONE                 -> {
                 holder.e2EDecorationView.render(null)
@@ -98,6 +92,59 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder> : BaseEventItem
 
         holder.view.onClick(baseAttributes.itemClickListener)
         holder.view.setOnLongClickListener(baseAttributes.itemLongClickListener)
+        (holder.view as? TimelineMessageLayoutRenderer)?.renderMessageLayout(baseAttributes.informationData.messageLayout)
+    }
+
+    private fun renderReactions(holder: H, reactionsSummary: ReactionsSummaryData) {
+        val reactions = reactionsSummary.reactions
+        if (!shouldShowReactionAtBottom() || reactions.isNullOrEmpty()) {
+            holder.reactionsContainer.isVisible = false
+        } else {
+            holder.reactionsContainer.isVisible = true
+            holder.reactionsContainer.removeAllViews()
+            val reactionsToShow = if (reactionsSummary.showAll) {
+                reactions
+            } else {
+                reactions.take(MAX_REACTIONS_TO_SHOW)
+            }
+            reactionsToShow.forEach { reaction ->
+                val reactionButton = ReactionButton(holder.view.context)
+                reactionButton.reactedListener = reactionClickListener
+                reactionButton.setTag(R.id.reactionsContainer, reaction.key)
+                reactionButton.reactionString = reaction.key
+                reactionButton.reactionCount = reaction.count
+                reactionButton.setChecked(reaction.addedByMe)
+                reactionButton.isEnabled = reaction.synced
+                holder.reactionsContainer.addView(reactionButton)
+            }
+            if (reactions.count() > MAX_REACTIONS_TO_SHOW) {
+                val showReactionsTextView = createReactionTextView(holder)
+                if (reactionsSummary.showAll) {
+                    showReactionsTextView.setText(R.string.message_reaction_show_less)
+                    showReactionsTextView.onClick { reactionsSummary.onShowLessClicked() }
+                } else {
+                    val moreCount = reactions.count() - MAX_REACTIONS_TO_SHOW
+                    showReactionsTextView.text = holder.view.resources.getQuantityString(R.plurals.message_reaction_show_more, moreCount, moreCount)
+                    showReactionsTextView.onClick { reactionsSummary.onShowMoreClicked() }
+                }
+                holder.reactionsContainer.addView(showReactionsTextView)
+            }
+            val addMoreReactionsTextView = createReactionTextView(holder)
+
+            addMoreReactionsTextView.text = holder.view.context.getDrawableAsSpannable(R.drawable.ic_add_reaction_small)
+            addMoreReactionsTextView.onClick { reactionsSummary.onAddMoreClicked() }
+            holder.reactionsContainer.addView(addMoreReactionsTextView)
+            holder.reactionsContainer.setOnLongClickListener(baseAttributes.itemLongClickListener)
+        }
+    }
+
+    private fun createReactionTextView(holder: H): TextView {
+        return TextView(ContextThemeWrapper(holder.view.context, R.style.TimelineReactionView)).apply {
+            background = getDrawable(context, R.drawable.reaction_rounded_rect_shape_off)
+            TextViewCompat.setTextAppearance(this, R.style.TextAppearance_Vector_Micro)
+            setTypeface(typeface, Typeface.BOLD)
+            setTextColor(ThemeUtils.getColor(context, R.attr.vctr_content_secondary))
+        }
     }
 
     override fun unbind(holder: H) {
@@ -113,6 +160,9 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder> : BaseEventItem
     }
 
     abstract class Holder(@IdRes stubId: Int) : BaseEventItem.BaseHolder(stubId) {
+        val dimensionConverter by lazy {
+            DimensionConverter(view.resources)
+        }
         val reactionsContainer by bind<ViewGroup>(R.id.reactionsContainer)
         val e2EDecorationView by bind<ShieldImageView>(R.id.messageE2EDecoration)
     }
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 b53495fdaf..9e8f86c26e 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
@@ -19,11 +19,14 @@ package im.vector.app.features.home.room.detail.timeline.item
 import android.graphics.Typeface
 import android.view.View
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.ProgressBar
+import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.annotation.IdRes
-import androidx.core.view.isInvisible
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
@@ -32,6 +35,8 @@ import im.vector.app.core.ui.views.SendStateImageView
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.session.threads.ThreadDetails
+import org.matrix.android.sdk.api.util.MatrixItem
 
 /**
  * Base timeline item that adds an optional information bar with the sender avatar, name, time, send state
@@ -61,43 +66,77 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
         }
     }
 
+    private val _threadClickListener = object : ClickListener {
+        override fun invoke(p1: View) {
+            attributes.threadCallback?.onThreadSummaryClicked(attributes.informationData.eventId, attributes.threadDetails?.isRootThread ?: false)
+        }
+    }
+
     override fun bind(holder: H) {
         super.bind(holder)
-        if (attributes.informationData.showInformation) {
+        if (attributes.informationData.messageLayout.showAvatar) {
             holder.avatarImageView.layoutParams = holder.avatarImageView.layoutParams?.apply {
                 height = attributes.avatarSize
                 width = attributes.avatarSize
             }
-            holder.avatarImageView.visibility = View.VISIBLE
-            holder.avatarImageView.onClick(_avatarClickListener)
-            holder.memberNameView.visibility = View.VISIBLE
-            holder.memberNameView.onClick(_memberNameClickListener)
-            holder.timeView.visibility = View.VISIBLE
-            holder.timeView.text = attributes.informationData.time
-            holder.memberNameView.text = attributes.informationData.memberName
-            holder.memberNameView.setTextColor(attributes.getMemberNameColor())
             attributes.avatarRenderer.render(attributes.informationData.matrixItem, holder.avatarImageView)
             holder.avatarImageView.setOnLongClickListener(attributes.itemLongClickListener)
-            holder.memberNameView.setOnLongClickListener(attributes.itemLongClickListener)
+            holder.avatarImageView.isVisible = true
+            holder.avatarImageView.onClick(_avatarClickListener)
         } else {
             holder.avatarImageView.setOnClickListener(null)
-            holder.memberNameView.setOnClickListener(null)
-            holder.avatarImageView.visibility = View.GONE
-            if (attributes.informationData.forceShowTimestamp) {
-                holder.memberNameView.isInvisible = true
-                holder.timeView.isVisible = true
-                holder.timeView.text = attributes.informationData.time
-            } else {
-                holder.memberNameView.isVisible = false
-                holder.timeView.isVisible = false
-            }
             holder.avatarImageView.setOnLongClickListener(null)
-            holder.memberNameView.setOnLongClickListener(null)
+            holder.avatarImageView.isVisible = false
+        }
+        if (attributes.informationData.messageLayout.showDisplayName) {
+            holder.memberNameView.isVisible = true
+            holder.memberNameView.text = attributes.informationData.memberName
+            holder.memberNameView.setTextColor(attributes.getMemberNameColor())
+            holder.memberNameView.onClick(_memberNameClickListener)
+            holder.memberNameView.setOnLongClickListener(attributes.itemLongClickListener)
+        } else {
+            holder.memberNameView.setOnClickListener(null)
+            holder.memberNameView.setOnLongClickListener(null)
+            holder.memberNameView.isVisible = false
+        }
+        if (attributes.informationData.messageLayout.showTimestamp) {
+            holder.timeView.isVisible = true
+            holder.timeView.text = attributes.informationData.time
+        } else {
+            holder.timeView.isVisible = false
         }
-
         // Render send state indicator
         holder.sendStateImageView.render(attributes.informationData.sendStateDecoration)
         holder.eventSendingIndicator.isVisible = attributes.informationData.sendStateDecoration == SendStateDecoration.SENDING_MEDIA
+
+        // Threads
+        if (attributes.areThreadMessagesEnabled) {
+            holder.threadSummaryConstraintLayout.onClick(_threadClickListener)
+            attributes.threadDetails?.let { threadDetails ->
+                holder.threadSummaryConstraintLayout.isVisible = threadDetails.isRootThread
+                holder.threadSummaryCounterTextView.text = threadDetails.numberOfThreads.toString()
+                holder.threadSummaryInfoTextView.text = threadDetails.threadSummaryLatestTextMessage ?: attributes.decryptionErrorMessage
+
+                val userId = threadDetails.threadSummarySenderInfo?.userId ?: return@let
+                val displayName = threadDetails.threadSummarySenderInfo?.displayName
+                val avatarUrl = threadDetails.threadSummarySenderInfo?.avatarUrl
+                attributes.avatarRenderer.render(MatrixItem.UserItem(userId, displayName, avatarUrl), holder.threadSummaryAvatarImageView)
+                updateHighlightedMessageHeight(holder, true)
+            } ?: run {
+                holder.threadSummaryConstraintLayout.isVisible = false
+                updateHighlightedMessageHeight(holder, false)
+            }
+        }
+    }
+
+    private fun updateHighlightedMessageHeight(holder: Holder, isExpanded: Boolean) {
+        holder.checkableBackground.updateLayoutParams<RelativeLayout.LayoutParams> {
+            if (isExpanded) {
+                addRule(RelativeLayout.ALIGN_BOTTOM, holder.threadSummaryConstraintLayout.id)
+            } else {
+                addRule(RelativeLayout.ALIGN_BOTTOM, holder.informationBottom.id)
+            }
+        }
     }
 
     override fun unbind(holder: H) {
@@ -106,17 +145,25 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
         holder.avatarImageView.setOnLongClickListener(null)
         holder.memberNameView.setOnClickListener(null)
         holder.memberNameView.setOnLongClickListener(null)
+        attributes.avatarRenderer.clear(holder.threadSummaryAvatarImageView)
+        holder.threadSummaryConstraintLayout.setOnClickListener(null)
         super.unbind(holder)
     }
 
     private fun Attributes.getMemberNameColor() = messageColorProvider.getMemberNameTextColor(informationData.matrixItem)
 
     abstract class Holder(@IdRes stubId: Int) : AbsBaseMessageItem.Holder(stubId) {
+
         val avatarImageView by bind<ImageView>(R.id.messageAvatarImageView)
         val memberNameView by bind<TextView>(R.id.messageMemberNameView)
         val timeView by bind<TextView>(R.id.messageTimeView)
         val sendStateImageView by bind<SendStateImageView>(R.id.messageSendStateImageView)
         val eventSendingIndicator by bind<ProgressBar>(R.id.eventSendingIndicator)
+        val informationBottom by bind<LinearLayout>(R.id.informationBottom)
+        val threadSummaryConstraintLayout by bind<ConstraintLayout>(R.id.messageThreadSummaryConstraintLayout)
+        val threadSummaryCounterTextView by bind<TextView>(R.id.messageThreadSummaryCounterTextView)
+        val threadSummaryAvatarImageView by bind<ImageView>(R.id.messageThreadSummaryAvatarImageView)
+        val threadSummaryInfoTextView by bind<TextView>(R.id.messageThreadSummaryInfoTextView)
     }
 
     /**
@@ -132,8 +179,12 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
             val memberClickListener: ClickListener? = null,
             override val reactionPillCallback: TimelineEventController.ReactionPillCallback? = null,
             val avatarCallback: TimelineEventController.AvatarCallback? = null,
+            val threadCallback: TimelineEventController.ThreadCallback? = null,
             override val readReceiptsCallback: TimelineEventController.ReadReceiptsCallback? = null,
-            val emojiTypeFace: Typeface? = null
+            val emojiTypeFace: Typeface? = null,
+            val decryptionErrorMessage: String? = null,
+            val threadDetails: ThreadDetails? = null,
+            val areThreadMessagesEnabled: Boolean = false
     ) : AbsBaseMessageItem.Attributes {
 
         // Have to override as it's used to diff epoxy items
@@ -145,6 +196,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
 
             if (avatarSize != other.avatarSize) return false
             if (informationData != other.informationData) return false
+            if (threadDetails != other.threadDetails) return false
 
             return true
         }
@@ -152,6 +204,8 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
         override fun hashCode(): Int {
             var result = avatarSize
             result = 31 * result + informationData.hashCode()
+            result = 31 * result + threadDetails.hashCode()
+
             return result
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
index 5dfbf5d8f6..8ea761830a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
@@ -26,7 +26,6 @@ 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.CheckableView
-import im.vector.app.core.utils.DimensionConverter
 
 /**
  * Children must override getViewType()
@@ -40,8 +39,18 @@ abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>
     @EpoxyAttribute
     open var leftGuideline: Int = 0
 
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
-    lateinit var dimensionConverter: DimensionConverter
+    final override fun getViewType(): Int {
+        // This makes sure we have a unique integer for the combination of layout and ViewStubId.
+        val pairingResult = pairingFunction(layout.toLong(), getViewStubId().toLong())
+        return (pairingResult - Int.MAX_VALUE).toInt()
+    }
+
+    abstract fun getViewStubId(): Int
+
+    // Szudzik function
+    private fun pairingFunction(a: Long, b: Long): Long {
+        return if (a >= b) a * a + a + b else a + b * b
+    }
 
     @CallSuper
     override fun bind(holder: H) {
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 5abc9d714c..6db0b0c380 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
@@ -50,7 +50,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
     @EpoxyAttribute
     lateinit var attributes: Attributes
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     override fun bind(holder: Holder) {
         super.bind(holder)
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 9d0a3b9a9c..9d437754d0 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
@@ -46,7 +46,7 @@ abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
         return listOf(attributes.informationData.eventId)
     }
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     class Holder : BaseHolder(STUB_ID) {
         val avatarImageView by bind<ImageView>(R.id.itemDefaultAvatarView)
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 1e8e96426f..9f631f7a0e 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
@@ -51,7 +51,7 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var movementMethod: MovementMethod? = null
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     override fun bind(holder: Holder) {
         super.bind(holder)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedSimilarEventsItem.kt
similarity index 90%
rename from vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedSimilarEventsItem.kt
index a52ddf8336..f012ca6cdc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedSimilarEventsItem.kt
@@ -20,6 +20,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.PluralsRes
 import androidx.core.view.children
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
@@ -27,9 +28,9 @@ import im.vector.app.R
 import im.vector.app.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
-abstract class MergedMembershipEventsItem : BasedMergedItem<MergedMembershipEventsItem.Holder>() {
+abstract class MergedSimilarEventsItem : BasedMergedItem<MergedSimilarEventsItem.Holder>() {
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     @EpoxyAttribute
     override lateinit var attributes: Attributes
@@ -37,7 +38,7 @@ abstract class MergedMembershipEventsItem : BasedMergedItem<MergedMembershipEven
     override fun bind(holder: Holder) {
         super.bind(holder)
         if (attributes.isCollapsed) {
-            val summary = holder.expandView.resources.getQuantityString(R.plurals.membership_changes, attributes.mergeData.size, attributes.mergeData.size)
+            val summary = holder.expandView.resources.getQuantityString(attributes.summaryTitleResId, attributes.mergeData.size, attributes.mergeData.size)
             holder.summaryView.text = summary
             holder.summaryView.visibility = View.VISIBLE
             holder.avatarListView.visibility = View.VISIBLE
@@ -66,6 +67,7 @@ abstract class MergedMembershipEventsItem : BasedMergedItem<MergedMembershipEven
     }
 
     data class Attributes(
+            @PluralsRes val summaryTitleResId: Int,
             override val isCollapsed: Boolean,
             override val mergeData: List<Data>,
             override val avatarRenderer: AvatarRenderer,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
deleted file mode 100644
index 915ad6a17d..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
+++ /dev/null
@@ -1,57 +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.home.room.detail.timeline.item
-
-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.onClick
-import im.vector.app.core.extensions.setTextOrHide
-import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
-import me.saket.bettermovementmethod.BetterLinkMovementMethod
-
-@EpoxyModelClass(layout = R.layout.item_timeline_event_base)
-abstract class MessageBlockCodeItem : AbsMessageItem<MessageBlockCodeItem.Holder>() {
-
-    @EpoxyAttribute
-    var message: EpoxyCharSequence? = null
-
-    @EpoxyAttribute
-    var editedSpan: EpoxyCharSequence? = null
-
-    override fun bind(holder: Holder) {
-        super.bind(holder)
-        holder.messageView.text = message?.charSequence
-        renderSendState(holder.messageView, holder.messageView)
-        holder.messageView.onClick(attributes.itemClickListener)
-        holder.messageView.setOnLongClickListener(attributes.itemLongClickListener)
-        holder.editedView.movementMethod = BetterLinkMovementMethod.getInstance()
-        holder.editedView.setTextOrHide(editedSpan?.charSequence)
-    }
-
-    override fun getViewType() = STUB_ID
-
-    class Holder : AbsMessageItem.Holder(STUB_ID) {
-        val messageView by bind<TextView>(R.id.codeBlockTextView)
-        val editedView by bind<TextView>(R.id.codeBlockEditedView)
-    }
-
-    companion object {
-        private const val STUB_ID = R.id.messageContentCodeBlockStub
-    }
-}
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 b15f909b79..8b6899daee 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
@@ -16,6 +16,8 @@
 
 package im.vector.app.features.home.room.detail.timeline.item
 
+import android.content.res.ColorStateList
+import android.graphics.Color
 import android.graphics.Paint
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -29,6 +31,8 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
+import im.vector.app.features.themes.ThemeUtils
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
@@ -73,15 +77,19 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
         } else {
             if (izDownloaded) {
                 holder.fileImageView.setImageResource(iconRes)
-                holder.fileDownloadProgress.progress = 100
+                holder.fileDownloadProgress.progress = 0
             } else {
                 contentDownloadStateTrackerBinder.bind(mxcUrl, holder)
                 holder.fileImageView.setImageResource(R.drawable.ic_download)
-                holder.fileDownloadProgress.progress = 0
             }
         }
 //        holder.view.setOnClickListener(clickListener)
-
+        val backgroundTint = if (attributes.informationData.messageLayout is TimelineMessageLayout.Bubble) {
+            Color.TRANSPARENT
+        } else {
+            ThemeUtils.getColor(holder.view.context, R.attr.vctr_content_quinary)
+        }
+        holder.mainLayout.backgroundTintList = ColorStateList.valueOf(backgroundTint)
         holder.filenameView.onClick(attributes.itemClickListener)
         holder.filenameView.setOnLongClickListener(attributes.itemLongClickListener)
         holder.fileImageWrapper.onClick(attributes.itemClickListener)
@@ -95,9 +103,10 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
         contentDownloadStateTrackerBinder.unbind(mxcUrl)
     }
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageItem.Holder(STUB_ID) {
+        val mainLayout by bind<ViewGroup>(R.id.messageFileMainLayout)
         val progressLayout by bind<ViewGroup>(R.id.messageFileUploadProgressLayout)
         val fileLayout by bind<ViewGroup>(R.id.messageFileLayout)
         val fileImageView by bind<ImageView>(R.id.messageFileIconView)
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 3ae91db97c..8485c40ef9 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
@@ -23,12 +23,16 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.files.LocalFilesHelper
 import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
+import im.vector.app.features.home.room.detail.timeline.style.granularRoundedCorners
 import im.vector.app.features.media.ImageContentRenderer
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
@@ -54,7 +58,14 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
 
     override fun bind(holder: Holder) {
         super.bind(holder)
-        imageContentRenderer.render(mediaData, mode, holder.imageView)
+        val messageLayout = baseAttributes.informationData.messageLayout
+        val dimensionConverter = DimensionConverter(holder.view.resources)
+        val imageCornerTransformation = if (messageLayout is TimelineMessageLayout.Bubble) {
+            messageLayout.cornersRadius.granularRoundedCorners()
+        } else {
+            RoundedCorners(dimensionConverter.dpToPx(8))
+        }
+        imageContentRenderer.render(mediaData, mode, holder.imageView, imageCornerTransformation)
         if (!attributes.informationData.sendState.hasFailed()) {
             contentUploadStateTrackerBinder.bind(
                     attributes.informationData.eventId,
@@ -81,7 +92,7 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
         super.unbind(holder)
     }
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageItem.Holder(STUB_ID) {
         val progressLayout by bind<ViewGroup>(R.id.messageMediaUploadProgressLayout)
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 8258f797f1..2b68742e7e 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
@@ -17,6 +17,7 @@
 package im.vector.app.features.home.room.detail.timeline.item
 
 import android.os.Parcelable
+import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.session.room.send.SendState
@@ -31,17 +32,17 @@ data class MessageInformationData(
         val ageLocalTS: Long?,
         val avatarUrl: String?,
         val memberName: CharSequence? = null,
-        val showInformation: Boolean = true,
-        val forceShowTimestamp: Boolean = false,
-        /*List of reactions (emoji,count,isSelected)*/
-        val orderedReactionList: List<ReactionInfoData>? = null,
+        val messageLayout: TimelineMessageLayout,
+        val reactionsSummary: ReactionsSummaryData,
         val pollResponseAggregatedSummary: PollResponseData? = null,
         val hasBeenEdited: Boolean = false,
         val hasPendingEdits: Boolean = false,
         val referencesInfoData: ReferencesInfoData? = null,
         val sentByMe: Boolean,
         val e2eDecoration: E2EDecoration = E2EDecoration.NONE,
-        val sendStateDecoration: SendStateDecoration = SendStateDecoration.NONE
+        val sendStateDecoration: SendStateDecoration = SendStateDecoration.NONE,
+        val isFirstFromThisSender: Boolean = false,
+        val isLastFromThisSender: Boolean = false
 ) : Parcelable {
 
     val matrixItem: MatrixItem
@@ -53,6 +54,16 @@ data class ReferencesInfoData(
         val verificationStatus: VerificationState
 ) : Parcelable
 
+@Parcelize
+data class ReactionsSummaryData(
+        /*List of reactions (emoji,count,isSelected)*/
+        val reactions: List<ReactionInfoData>? = null,
+        val showAll: Boolean = false,
+        val onShowMoreClicked: () -> Unit,
+        val onShowLessClicked: () -> Unit,
+        val onAddMoreClicked: () -> Unit
+) : Parcelable
+
 @Parcelize
 data class ReactionInfoData(
         val key: String,
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 6f0b6abb72..1e2808afd8 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
@@ -16,13 +16,25 @@
 
 package im.vector.app.features.home.room.detail.timeline.item
 
+import android.graphics.drawable.Drawable
 import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions
+import com.bumptech.glide.request.target.Target
 import im.vector.app.R
 import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
+import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
+import im.vector.app.features.home.room.detail.timeline.style.granularRoundedCorners
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageLocationItem : AbsMessageItem<MessageLocationItem.Holder>() {
@@ -34,32 +46,66 @@ abstract class MessageLocationItem : AbsMessageItem<MessageLocationItem.Holder>(
     var userId: String? = null
 
     @EpoxyAttribute
+    var mapWidth: Int = 0
+
+    @EpoxyAttribute
+    var mapHeight: Int = 0
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var locationPinProvider: LocationPinProvider? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
         renderSendState(holder.view, null)
-
         val location = locationUrl ?: return
-        val locationOwnerId = userId ?: return
-
+        val messageLayout = attributes.informationData.messageLayout
+        val dimensionConverter = DimensionConverter(holder.view.resources)
+        val imageCornerTransformation = if (messageLayout is TimelineMessageLayout.Bubble) {
+            messageLayout.cornersRadius.granularRoundedCorners()
+        } else {
+            RoundedCorners(dimensionConverter.dpToPx(8))
+        }
+        holder.staticMapImageView.updateLayoutParams {
+            width = mapWidth
+            height = mapHeight
+        }
         GlideApp.with(holder.staticMapImageView)
                 .load(location)
                 .apply(RequestOptions.centerCropTransform())
-                .into(holder.staticMapImageView)
+                .listener(object : RequestListener<Drawable> {
+                    override fun onLoadFailed(e: GlideException?,
+                                              model: Any?,
+                                              target: Target<Drawable>?,
+                                              isFirstResource: Boolean): Boolean {
+                        holder.staticMapPinImageView.setImageResource(R.drawable.ic_location_pin_failed)
+                        holder.staticMapErrorTextView.isVisible = true
+                        return false
+                    }
 
-        locationPinProvider?.create(locationOwnerId) { pinDrawable ->
-            GlideApp.with(holder.staticMapPinImageView)
-                    .load(pinDrawable)
-                    .into(holder.staticMapPinImageView)
-        }
+                    override fun onResourceReady(resource: Drawable?,
+                                                 model: Any?,
+                                                 target: Target<Drawable>?,
+                                                 dataSource: DataSource?,
+                                                 isFirstResource: Boolean): Boolean {
+                        locationPinProvider?.create(userId) { pinDrawable ->
+                            GlideApp.with(holder.staticMapPinImageView)
+                                    .load(pinDrawable)
+                                    .into(holder.staticMapPinImageView)
+                        }
+                        holder.staticMapErrorTextView.isVisible = false
+                        return false
+                    }
+                })
+                .transform(imageCornerTransformation)
+                .into(holder.staticMapImageView)
     }
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageItem.Holder(STUB_ID) {
         val staticMapImageView by bind<ImageView>(R.id.staticMapImageView)
         val staticMapPinImageView by bind<ImageView>(R.id.staticMapPinImageView)
+        val staticMapErrorTextView by bind<TextView>(R.id.staticMapErrorTextView)
     }
 
     companion object {
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 e5ac321d90..bc9e4a7ff1 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
@@ -80,6 +80,7 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
             safePreviewUrlRetriever.addListener(attributes.informationData.eventId, previewUrlViewUpdater)
         }
         holder.previewUrlView.delegate = previewUrlCallback
+        holder.previewUrlView.renderMessageLayout(attributes.informationData.messageLayout)
 
         if (useBigFont) {
             holder.messageView.textSize = 44F
@@ -121,7 +122,7 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
         previewUrlRetriever?.removeListener(attributes.informationData.eventId, previewUrlViewUpdater)
     }
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageItem.Holder(STUB_ID) {
         val messageView by bind<AppCompatTextView>(R.id.messageTextView)
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 f006c2aa35..e9f728d976 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
@@ -16,7 +16,10 @@
 
 package im.vector.app.features.home.room.detail.timeline.item
 
+import android.content.res.ColorStateList
+import android.graphics.Color
 import android.text.format.DateUtils
+import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.TextView
@@ -29,6 +32,8 @@ import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
+import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
+import im.vector.app.features.themes.ThemeUtils
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
@@ -80,6 +85,12 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
             }
         }
 
+        val backgroundTint = if (attributes.informationData.messageLayout is TimelineMessageLayout.Bubble) {
+            Color.TRANSPARENT
+        } else {
+            ThemeUtils.getColor(holder.view.context, R.attr.vctr_content_quinary)
+        }
+        holder.voicePlaybackLayout.backgroundTintList = ColorStateList.valueOf(backgroundTint)
         holder.voicePlaybackControlButton.setOnClickListener { playbackControlButtonClickListener?.invoke(it) }
 
         voiceMessagePlaybackTracker.track(attributes.informationData.eventId, object : VoiceMessagePlaybackTracker.Listener {
@@ -120,9 +131,10 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
         voiceMessagePlaybackTracker.unTrack(attributes.informationData.eventId)
     }
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageItem.Holder(STUB_ID) {
+        val voicePlaybackLayout by bind<View>(R.id.voicePlaybackLayout)
         val voiceLayout by bind<ViewGroup>(R.id.voiceLayout)
         val voicePlaybackControlButton by bind<ImageButton>(R.id.voicePlaybackControlButton)
         val voicePlaybackTime by bind<TextView>(R.id.voicePlaybackTime)
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 689d7e6768..3c3510a073 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
@@ -64,7 +64,7 @@ abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>() {
         return listOf(attributes.informationData.eventId)
     }
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     class Holder : BaseHolder(STUB_ID) {
         val avatarImageView by bind<ImageView>(R.id.itemNoticeAvatarView)
@@ -78,7 +78,8 @@ abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>() {
             val noticeText: EpoxyCharSequence,
             val itemLongClickListener: View.OnLongClickListener? = null,
             val readReceiptsCallback: TimelineEventController.ReadReceiptsCallback? = null,
-            val avatarClickListener: ClickListener? = null
+            val avatarClickListener: ClickListener? = null,
+            val threadSummaryClickListener: ClickListener? = null
     )
 
     companion object {
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 b660ee9a59..2327a0f2e2 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
@@ -50,6 +50,8 @@ abstract class PollItem : AbsMessageItem<PollItem.Holder>() {
     @EpoxyAttribute
     lateinit var optionViewStates: List<PollOptionViewState>
 
+    override fun getViewStubId() = STUB_ID
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         val relatedEventId = eventId ?: return
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
index 650c804cfa..4f29253264 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home.room.detail.timeline.item
 
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
@@ -31,6 +32,7 @@ abstract class ReadReceiptsItem : EpoxyModelWithHolder<ReadReceiptsItem.Holder>(
 
     @EpoxyAttribute lateinit var eventId: String
     @EpoxyAttribute lateinit var readReceipts: List<ReadReceiptData>
+    @EpoxyAttribute var shouldHideReadReceipts: Boolean = false
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var clickListener: ClickListener
 
@@ -42,6 +44,7 @@ abstract class ReadReceiptsItem : EpoxyModelWithHolder<ReadReceiptsItem.Holder>(
         super.bind(holder)
         holder.readReceiptsView.onClick(clickListener)
         holder.readReceiptsView.render(readReceipts, avatarRenderer)
+        holder.readReceiptsView.isVisible = !shouldHideReadReceipts
     }
 
     override fun unbind(holder: Holder) {
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 282550daec..204bab2254 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
@@ -22,7 +22,7 @@ import im.vector.app.R
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class RedactedMessageItem : AbsMessageItem<RedactedMessageItem.Holder>() {
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     override fun shouldShowReactionAtBottom() = false
 
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 a3d9d3995c..fdde087b44 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
@@ -40,7 +40,7 @@ abstract class StatusTileTimelineItem : AbsBaseMessageItem<StatusTileTimelineIte
     @EpoxyAttribute
     lateinit var attributes: Attributes
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     @SuppressLint("SetTextI18n")
     override fun bind(holder: Holder) {
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 f4e093a428..1c1b064bf5 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
@@ -51,7 +51,7 @@ abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestI
     @EpoxyAttribute
     var callback: TimelineEventController.Callback? = null
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     @SuppressLint("SetTextI18n")
     override fun bind(holder: Holder) {
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 07b55c8ec2..151a044b2e 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
@@ -41,7 +41,7 @@ abstract class WidgetTileTimelineItem : AbsBaseMessageItem<WidgetTileTimelineIte
     @EpoxyAttribute
     lateinit var attributes: Attributes
 
-    override fun getViewType() = STUB_ID
+    override fun getViewStubId() = STUB_ID
 
     @SuppressLint("SetTextI18n")
     override fun bind(holder: Holder) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
index 535b733dc2..55e0cce9f7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
@@ -110,7 +110,7 @@ class MergedTimelines(
         secondaryTimeline.removeAllListeners()
     }
 
-    override fun start() {
+    override fun start(rootThreadEventId: String?) {
         mainTimeline.start()
         secondaryTimeline.start()
     }
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
new file mode 100644
index 0000000000..d50a6fb297
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.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.home.room.detail.timeline.render
+
+import android.content.Context
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.html.PillImageSpan
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.MatrixItem
+
+class EventTextRenderer @AssistedInject constructor(@Assisted private val roomId: String?,
+                                                    private val context: Context,
+                                                    private val avatarRenderer: AvatarRenderer,
+                                                    private val sessionHolder: ActiveSessionHolder) {
+
+    /* ==========================================================================================
+     * Public api
+     * ========================================================================================== */
+
+    @AssistedFactory
+    interface Factory {
+        fun create(roomId: String?): EventTextRenderer
+    }
+
+    /**
+     * @param text the text you want to render
+     */
+    fun render(text: CharSequence): CharSequence {
+        return if (roomId != null && text.contains(MatrixItem.NOTIFY_EVERYONE)) {
+            SpannableStringBuilder(text).apply {
+                addNotifyEveryoneSpans(this, roomId)
+            }
+        } else {
+            text
+        }
+    }
+
+    /* ==========================================================================================
+     * Helper methods
+     * ========================================================================================== */
+
+    private fun addNotifyEveryoneSpans(text: Spannable, roomId: String) {
+        val room: RoomSummary? = sessionHolder.getSafeActiveSession()?.getRoomSummary(roomId)
+        val matrixItem = MatrixItem.EveryoneInRoomItem(
+                id = roomId,
+                avatarUrl = room?.avatarUrl,
+                roomDisplayName = room?.displayName
+        )
+
+        // search for notify everyone text
+        var foundIndex = text.indexOf(MatrixItem.NOTIFY_EVERYONE, 0)
+        while (foundIndex >= 0) {
+            val endSpan = foundIndex + MatrixItem.NOTIFY_EVERYONE.length
+            addPillSpan(text, createPillImageSpan(matrixItem), foundIndex, endSpan)
+            foundIndex = text.indexOf(MatrixItem.NOTIFY_EVERYONE, endSpan)
+        }
+    }
+
+    private fun createPillImageSpan(matrixItem: MatrixItem) =
+            PillImageSpan(GlideApp.with(context), avatarRenderer, context, matrixItem)
+
+    private fun addPillSpan(
+            renderedText: Spannable,
+            pillSpan: PillImageSpan,
+            startSpan: Int,
+            endSpan: Int
+    ) {
+        renderedText.setSpan(pillSpan, startSpan, endSpan, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/CornersRadius.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/CornersRadius.kt
new file mode 100644
index 0000000000..c10bebdcf4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/CornersRadius.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.home.room.detail.timeline.style
+
+import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners
+import com.google.android.material.shape.CornerFamily
+import com.google.android.material.shape.ShapeAppearanceModel
+
+fun TimelineMessageLayout.Bubble.CornersRadius.granularRoundedCorners(): GranularRoundedCorners {
+    return GranularRoundedCorners(topStartRadius, topEndRadius, bottomEndRadius, bottomStartRadius)
+}
+
+fun TimelineMessageLayout.Bubble.CornersRadius.shapeAppearanceModel(): ShapeAppearanceModel {
+    return ShapeAppearanceModel().toBuilder()
+            .setTopRightCorner(topEndRadius.cornerFamily(), topEndRadius)
+            .setBottomRightCorner(bottomEndRadius.cornerFamily(), bottomEndRadius)
+            .setTopLeftCorner(topStartRadius.cornerFamily(), topStartRadius)
+            .setBottomLeftCorner(bottomStartRadius.cornerFamily(), bottomStartRadius)
+            .build()
+}
+
+private fun Float.cornerFamily(): Int {
+    return if (this == 0F) CornerFamily.CUT else CornerFamily.ROUNDED
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineLayoutSettings.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineLayoutSettings.kt
new file mode 100644
index 0000000000..873ef8c907
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineLayoutSettings.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.detail.timeline.style
+
+enum class TimelineLayoutSettings {
+    MODERN,
+    BUBBLE
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineLayoutSettingsProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineLayoutSettingsProvider.kt
new file mode 100644
index 0000000000..9e351a706d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineLayoutSettingsProvider.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.room.detail.timeline.style
+
+import im.vector.app.features.settings.VectorPreferences
+import javax.inject.Inject
+
+class TimelineLayoutSettingsProvider @Inject constructor(private val vectorPreferences: VectorPreferences) {
+
+    fun getLayoutSettings(): TimelineLayoutSettings {
+        return if (vectorPreferences.useMessageBubblesLayout()) {
+            TimelineLayoutSettings.BUBBLE
+        } else {
+            TimelineLayoutSettings.MODERN
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
new file mode 100644
index 0000000000..c87680de0a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.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.home.room.detail.timeline.style
+
+import android.os.Parcelable
+import im.vector.app.R
+import kotlinx.parcelize.Parcelize
+
+sealed interface TimelineMessageLayout : Parcelable {
+    val layoutRes: Int
+    val showAvatar: Boolean
+    val showDisplayName: Boolean
+    val showTimestamp: Boolean
+
+    @Parcelize
+    data class Default(override val showAvatar: Boolean,
+                       override val showDisplayName: Boolean,
+                       override val showTimestamp: Boolean,
+            // Keep defaultLayout generated on epoxy items
+                       override val layoutRes: Int = 0) : TimelineMessageLayout
+
+    @Parcelize
+    data class Bubble(
+            override val showAvatar: Boolean,
+            override val showDisplayName: Boolean,
+            override val showTimestamp: Boolean = true,
+            val isIncoming: Boolean,
+            val isPseudoBubble: Boolean,
+            val cornersRadius: CornersRadius,
+            val timestampAsOverlay: Boolean,
+            override val layoutRes: Int = if (isIncoming) {
+                R.layout.item_timeline_event_bubble_incoming_base
+            } else {
+                R.layout.item_timeline_event_bubble_outgoing_base
+            }
+    ) : TimelineMessageLayout {
+
+        @Parcelize
+        data class CornersRadius(
+                val topStartRadius: Float,
+                val topEndRadius: Float,
+                val bottomStartRadius: Float,
+                val bottomEndRadius: Float
+        ) : Parcelable
+    }
+}
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
new file mode 100644
index 0000000000..8c1c308bb5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.style
+
+import android.content.res.Resources
+import im.vector.app.R
+import im.vector.app.core.extensions.localDateTime
+import im.vector.app.core.resources.LocaleProvider
+import im.vector.app.core.resources.isRTL
+import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactoryParams
+import im.vector.app.features.settings.VectorPreferences
+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.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 javax.inject.Inject
+
+class TimelineMessageLayoutFactory @Inject constructor(private val session: Session,
+                                                       private val layoutSettingsProvider: TimelineLayoutSettingsProvider,
+                                                       private val localeProvider: LocaleProvider,
+                                                       private val resources: Resources,
+                                                       private val vectorPreferences: VectorPreferences) {
+
+    companion object {
+        // Can be rendered in bubbles, other types will fallback to default
+        private val EVENT_TYPES_WITH_BUBBLE_LAYOUT = setOf(
+                EventType.MESSAGE,
+                EventType.POLL_START,
+                EventType.ENCRYPTED,
+                EventType.STICKER
+        )
+
+        // Can't be rendered in bubbles, so get back to default layout
+        private val MSG_TYPES_WITHOUT_BUBBLE_LAYOUT = setOf(
+                MessageType.MSGTYPE_VERIFICATION_REQUEST
+        )
+
+        // Use the bubble layout but without borders
+        private val MSG_TYPES_WITH_PSEUDO_BUBBLE_LAYOUT = setOf(
+                MessageType.MSGTYPE_IMAGE,
+                MessageType.MSGTYPE_VIDEO,
+                MessageType.MSGTYPE_STICKER_LOCAL,
+                MessageType.MSGTYPE_EMOTE
+        )
+        private val MSG_TYPES_WITH_TIMESTAMP_AS_OVERLAY = setOf(
+                MessageType.MSGTYPE_IMAGE, MessageType.MSGTYPE_VIDEO
+        )
+    }
+
+    private val cornerRadius: Float by lazy {
+        resources.getDimensionPixelSize(R.dimen.chat_bubble_corner_radius).toFloat()
+    }
+
+    private val isRTL: Boolean by lazy {
+       localeProvider.isRTL()
+    }
+
+    fun create(params: TimelineItemFactoryParams): TimelineMessageLayout {
+        val event = params.event
+        val nextDisplayableEvent = params.nextDisplayableEvent
+        val prevDisplayableEvent = params.prevDisplayableEvent
+        val isSentByMe = event.root.senderId == session.myUserId
+
+        val date = event.root.localDateTime()
+        val nextDate = nextDisplayableEvent?.root?.localDateTime()
+        val addDaySeparator = date.toLocalDate() != nextDate?.toLocalDate()
+
+        val isNextMessageReceivedMoreThanOneHourAgo = nextDate?.isBefore(date.minusMinutes(60))
+                ?: false
+
+        val showInformation = addDaySeparator ||
+                event.senderInfo.avatarUrl != nextDisplayableEvent?.senderInfo?.avatarUrl ||
+                event.senderInfo.disambiguatedDisplayName != nextDisplayableEvent?.senderInfo?.disambiguatedDisplayName ||
+                nextDisplayableEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED) ||
+                isNextMessageReceivedMoreThanOneHourAgo ||
+                isTileTypeMessage(nextDisplayableEvent) ||
+                nextDisplayableEvent.isEdition()
+
+        val messageLayout = when (layoutSettingsProvider.getLayoutSettings()) {
+            TimelineLayoutSettings.MODERN -> {
+                buildModernLayout(showInformation)
+            }
+            TimelineLayoutSettings.BUBBLE -> {
+                val shouldBuildBubbleLayout = event.shouldBuildBubbleLayout()
+                if (shouldBuildBubbleLayout) {
+                    val isFirstFromThisSender = nextDisplayableEvent == null || !nextDisplayableEvent.shouldBuildBubbleLayout() ||
+                            nextDisplayableEvent.root.senderId != event.root.senderId || addDaySeparator
+
+                    val isLastFromThisSender = prevDisplayableEvent == null || !prevDisplayableEvent.shouldBuildBubbleLayout() ||
+                            prevDisplayableEvent.root.senderId != event.root.senderId ||
+                            prevDisplayableEvent.root.localDateTime().toLocalDate() != date.toLocalDate()
+
+                    val cornersRadius = buildCornersRadius(
+                            isIncoming = !isSentByMe,
+                            isFirstFromThisSender = isFirstFromThisSender,
+                            isLastFromThisSender = isLastFromThisSender
+                    )
+
+                    val messageContent = event.getLastMessageContent()
+                    TimelineMessageLayout.Bubble(
+                            showAvatar = showInformation && !isSentByMe,
+                            showDisplayName = showInformation && !isSentByMe,
+                            isIncoming = !isSentByMe,
+                            cornersRadius = cornersRadius,
+                            isPseudoBubble = messageContent.isPseudoBubble(),
+                            timestampAsOverlay = messageContent.timestampAsOverlay()
+                    )
+                } else {
+                    buildModernLayout(showInformation)
+                }
+            }
+        }
+        return messageLayout
+    }
+
+    private fun MessageContent?.isPseudoBubble(): Boolean {
+        if (this == null) return false
+        if (msgType == MessageType.MSGTYPE_LOCATION) return vectorPreferences.labsRenderLocationsInTimeline()
+        return this.msgType in MSG_TYPES_WITH_PSEUDO_BUBBLE_LAYOUT
+    }
+
+    private fun MessageContent?.timestampAsOverlay(): Boolean {
+        if (this == null) return false
+        if (msgType == MessageType.MSGTYPE_LOCATION) return vectorPreferences.labsRenderLocationsInTimeline()
+        return this.msgType in MSG_TYPES_WITH_TIMESTAMP_AS_OVERLAY
+    }
+
+    private fun TimelineEvent.shouldBuildBubbleLayout(): Boolean {
+        val type = root.getClearType()
+        if (type in EVENT_TYPES_WITH_BUBBLE_LAYOUT) {
+            val messageContent = getLastMessageContent()
+            return messageContent?.msgType !in MSG_TYPES_WITHOUT_BUBBLE_LAYOUT
+        }
+        return false
+    }
+
+    private fun buildModernLayout(showInformation: Boolean): TimelineMessageLayout.Default {
+        return TimelineMessageLayout.Default(
+                showAvatar = showInformation,
+                showDisplayName = showInformation,
+                showTimestamp = showInformation || vectorPreferences.alwaysShowTimeStamps()
+        )
+    }
+
+    private fun buildCornersRadius(isIncoming: Boolean,
+                                   isFirstFromThisSender: Boolean,
+                                   isLastFromThisSender: Boolean): TimelineMessageLayout.Bubble.CornersRadius {
+        return if ((isIncoming && !isRTL) || (!isIncoming && isRTL)) {
+            TimelineMessageLayout.Bubble.CornersRadius(
+                    topStartRadius = if (isFirstFromThisSender) cornerRadius else 0f,
+                    topEndRadius = cornerRadius,
+                    bottomStartRadius = if (isLastFromThisSender) cornerRadius else 0f,
+                    bottomEndRadius = cornerRadius
+            )
+        } else {
+            TimelineMessageLayout.Bubble.CornersRadius(
+                    topStartRadius = cornerRadius,
+                    topEndRadius = if (isFirstFromThisSender) cornerRadius else 0f,
+                    bottomStartRadius = cornerRadius,
+                    bottomEndRadius = if (isLastFromThisSender) cornerRadius else 0f
+            )
+        }
+    }
+
+    /**
+     * Tiles type message never show the sender information (like verification request), so we should repeat it for next message
+     * even if same sender
+     */
+    private fun isTileTypeMessage(event: TimelineEvent?): Boolean {
+        return when (event?.root?.getClearType()) {
+            EventType.KEY_VERIFICATION_DONE,
+            EventType.KEY_VERIFICATION_CANCEL -> true
+            EventType.MESSAGE                 -> {
+                event.getLastMessageContent() is MessageVerificationRequestContent
+            }
+            else                              -> false
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
index 631f00819c..bb306c2016 100755
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
@@ -17,17 +17,21 @@
 package im.vector.app.features.home.room.detail.timeline.url
 
 import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
 import android.util.AttributeSet
 import android.view.View
 import androidx.core.view.isVisible
 import com.google.android.material.card.MaterialCardView
 import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.databinding.ViewUrlPreviewBinding
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
+import im.vector.app.features.home.room.detail.timeline.view.TimelineMessageLayoutRenderer
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.themes.ThemeUtils
-import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.media.PreviewUrlData
 
 /**
@@ -37,7 +41,7 @@ class PreviewUrlView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0
-) : MaterialCardView(context, attrs, defStyleAttr), View.OnClickListener {
+) : MaterialCardView(context, attrs, defStyleAttr), View.OnClickListener, TimelineMessageLayoutRenderer {
 
     private lateinit var views: ViewUrlPreviewBinding
 
@@ -47,7 +51,6 @@ class PreviewUrlView @JvmOverloads constructor(
         setupView()
         radius = resources.getDimensionPixelSize(R.dimen.preview_url_view_corner_radius).toFloat()
         cardElevation = 0f
-        setCardBackgroundColor(ThemeUtils.getColor(context, R.attr.vctr_system))
     }
 
     private var state: PreviewUrlUiState = PreviewUrlUiState.Unknown
@@ -76,6 +79,22 @@ class PreviewUrlView @JvmOverloads constructor(
         }
     }
 
+    override fun renderMessageLayout(messageLayout: TimelineMessageLayout) {
+        when (messageLayout) {
+            is TimelineMessageLayout.Default -> {
+                val backgroundColor = ThemeUtils.getColor(context, R.attr.vctr_system)
+                setCardBackgroundColor(backgroundColor)
+                val guidelineBegin = DimensionConverter(resources).dpToPx(8)
+                views.urlPreviewStartGuideline.setGuidelineBegin(guidelineBegin)
+            }
+            is TimelineMessageLayout.Bubble  -> {
+                setCardBackgroundColor(Color.TRANSPARENT)
+                rippleColor = ColorStateList.valueOf(Color.TRANSPARENT)
+                views.urlPreviewStartGuideline.setGuidelineBegin(0)
+            }
+        }
+    }
+
     override fun onClick(v: View?) {
         when (val finalState = state) {
             is PreviewUrlUiState.Data -> delegate?.onPreviewUrlClicked(finalState.url)
@@ -127,7 +146,7 @@ class PreviewUrlView @JvmOverloads constructor(
         isVisible = true
 
         views.urlPreviewTitle.setTextOrHide(previewUrlData.title)
-        views.urlPreviewImage.isVisible = previewUrlData.mxcUrl?.let { imageContentRenderer.render(it, views.urlPreviewImage) }.orFalse()
+        views.urlPreviewImage.isVisible = imageContentRenderer.render(previewUrlData, views.urlPreviewImage)
         views.urlPreviewDescription.setTextOrHide(previewUrlData.description)
         views.urlPreviewDescription.maxLines = when {
             previewUrlData.mxcUrl != null -> 2
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
new file mode 100644
index 0000000000..422dfb0dbd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
@@ -0,0 +1,162 @@
+/*
+ * 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.timeline.view
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.RippleDrawable
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewOutlineProvider
+import android.widget.RelativeLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.core.content.ContextCompat
+import androidx.core.content.withStyledAttributes
+import androidx.core.graphics.drawable.DrawableCompat
+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.getLayoutDirectionFromCurrentLocale
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.databinding.ViewMessageBubbleBinding
+import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
+import im.vector.app.features.home.room.detail.timeline.style.shapeAppearanceModel
+import im.vector.app.features.themes.ThemeUtils
+import timber.log.Timber
+
+class MessageBubbleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
+                                                  defStyleAttr: Int = 0) :
+        RelativeLayout(context, attrs, defStyleAttr), TimelineMessageLayoutRenderer {
+
+    private var isIncoming: Boolean = false
+
+    private val horizontalStubPadding = DimensionConverter(resources).dpToPx(12)
+    private val verticalStubPadding = DimensionConverter(resources).dpToPx(4)
+
+    private lateinit var views: ViewMessageBubbleBinding
+    private lateinit var bubbleDrawable: MaterialShapeDrawable
+    private lateinit var rippleMaskDrawable: MaterialShapeDrawable
+
+    init {
+        inflate(context, R.layout.view_message_bubble, this)
+        context.withStyledAttributes(attrs, R.styleable.MessageBubble) {
+            isIncoming = getBoolean(R.styleable.MessageBubble_incoming_style, false)
+        }
+    }
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        views = ViewMessageBubbleBinding.bind(this)
+        val currentLayoutDirection = LocaleProvider(resources).getLayoutDirectionFromCurrentLocale()
+        val layoutDirectionToSet = if (isIncoming) {
+            currentLayoutDirection
+        } else {
+            if (currentLayoutDirection == View.LAYOUT_DIRECTION_LTR) {
+                View.LAYOUT_DIRECTION_RTL
+            } else {
+                View.LAYOUT_DIRECTION_LTR
+            }
+        }
+        views.informationBottom.layoutDirection = layoutDirectionToSet
+        views.messageThreadSummaryContainer.layoutDirection = layoutDirectionToSet
+        views.bubbleWrapper.layoutDirection = layoutDirectionToSet
+        views.bubbleView.layoutDirection = currentLayoutDirection
+
+        bubbleDrawable = MaterialShapeDrawable()
+        rippleMaskDrawable = MaterialShapeDrawable()
+        DrawableCompat.setTint(rippleMaskDrawable, Color.WHITE)
+        views.bubbleView.apply {
+            outlineProvider = ViewOutlineProvider.BACKGROUND
+            clipToOutline = true
+            background = RippleDrawable(
+                    ContextCompat.getColorStateList(context, R.color.mtrl_btn_ripple_color) ?: ColorStateList.valueOf(Color.TRANSPARENT),
+                    bubbleDrawable,
+                    rippleMaskDrawable)
+        }
+    }
+
+    override fun renderMessageLayout(messageLayout: TimelineMessageLayout) {
+        if (messageLayout !is TimelineMessageLayout.Bubble) {
+            Timber.v("Can't render messageLayout $messageLayout")
+            return
+        }
+        updateDrawables(messageLayout)
+        ConstraintSet().apply {
+            clone(views.bubbleView)
+            clear(R.id.viewStubContainer, ConstraintSet.END)
+            if (messageLayout.timestampAsOverlay) {
+                val timeColor = ContextCompat.getColor(context, R.color.palette_white)
+                views.messageTimeView.setTextColor(timeColor)
+                connect(R.id.viewStubContainer, ConstraintSet.END, R.id.parent, ConstraintSet.END, 0)
+            } else {
+                val timeColor = ThemeUtils.getColor(context, R.attr.vctr_content_tertiary)
+                views.messageTimeView.setTextColor(timeColor)
+                connect(R.id.viewStubContainer, ConstraintSet.END, R.id.messageTimeView, ConstraintSet.START, 0)
+            }
+            applyTo(views.bubbleView)
+        }
+        if (messageLayout.timestampAsOverlay) {
+            views.messageOverlayView.isVisible = true
+            (views.messageOverlayView.background as? GradientDrawable)?.cornerRadii = messageLayout.cornersRadius.toFloatArray()
+        } else {
+            views.messageOverlayView.isVisible = false
+        }
+        if (messageLayout.isPseudoBubble && messageLayout.timestampAsOverlay) {
+            views.viewStubContainer.root.setPadding(0, 0, 0, 0)
+        } else {
+            views.viewStubContainer.root.setPadding(horizontalStubPadding, verticalStubPadding, horizontalStubPadding, verticalStubPadding)
+        }
+        if (isIncoming) {
+            views.messageEndGuideline.updateLayoutParams<LayoutParams> {
+                marginEnd = resources.getDimensionPixelSize(R.dimen.chat_bubble_margin_end)
+            }
+            views.messageStartGuideline.updateLayoutParams<LayoutParams> {
+                marginStart = resources.getDimensionPixelSize(R.dimen.chat_bubble_margin_start)
+            }
+        } else {
+            views.messageEndGuideline.updateLayoutParams<LayoutParams> {
+                marginEnd = resources.getDimensionPixelSize(R.dimen.chat_bubble_margin_start)
+            }
+            views.messageStartGuideline.updateLayoutParams<LayoutParams> {
+                marginStart = resources.getDimensionPixelSize(R.dimen.chat_bubble_margin_end)
+            }
+        }
+    }
+
+    private fun TimelineMessageLayout.Bubble.CornersRadius.toFloatArray(): FloatArray {
+        return floatArrayOf(topStartRadius, topStartRadius, topEndRadius, topEndRadius, bottomEndRadius, bottomEndRadius, bottomStartRadius, bottomStartRadius)
+    }
+
+    private fun updateDrawables(messageLayout: TimelineMessageLayout.Bubble) {
+        val shapeAppearanceModel = messageLayout.cornersRadius.shapeAppearanceModel()
+        bubbleDrawable.apply {
+            this.shapeAppearanceModel = shapeAppearanceModel
+            this.fillColor = if (messageLayout.isPseudoBubble) {
+                ColorStateList.valueOf(Color.TRANSPARENT)
+            } else {
+                val backgroundColorAttr = if (isIncoming) R.attr.vctr_message_bubble_inbound else R.attr.vctr_message_bubble_outbound
+                val backgroundColor = ThemeUtils.getColor(context, backgroundColorAttr)
+                ColorStateList.valueOf(backgroundColor)
+            }
+        }
+        rippleMaskDrawable.shapeAppearanceModel = shapeAppearanceModel
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/TimelineMessageLayoutRenderer.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/TimelineMessageLayoutRenderer.kt
new file mode 100644
index 0000000000..0c42662801
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/TimelineMessageLayoutRenderer.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.home.room.detail.timeline.view
+
+import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
+
+interface TimelineMessageLayoutRenderer {
+    fun renderMessageLayout(messageLayout: TimelineMessageLayout)
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/views/RoomDetailLazyLoadedViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/views/RoomDetailLazyLoadedViews.kt
index fafb49ad5c..a7eb6ee78f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/views/RoomDetailLazyLoadedViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/views/RoomDetailLazyLoadedViews.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.home.room.detail.views
 import android.view.View
 import android.view.ViewStub
 import im.vector.app.core.ui.views.FailedMessagesWarningView
-import im.vector.app.databinding.FragmentRoomDetailBinding
+import im.vector.app.databinding.FragmentTimelineBinding
 import im.vector.app.features.invite.VectorInviteView
 import kotlin.reflect.KMutableProperty0
 
@@ -29,12 +29,12 @@ import kotlin.reflect.KMutableProperty0
  */
 class RoomDetailLazyLoadedViews {
 
-    private var roomDetailBinding: FragmentRoomDetailBinding? = null
+    private var roomDetailBinding: FragmentTimelineBinding? = null
 
     private var failedMessagesWarningView: FailedMessagesWarningView? = null
     private var inviteView: VectorInviteView? = null
 
-    fun bind(roomDetailBinding: FragmentRoomDetailBinding) {
+    fun bind(roomDetailBinding: FragmentTimelineBinding) {
         this.roomDetailBinding = roomDetailBinding
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
index aa6966254f..65f3d16ad4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
@@ -30,8 +30,8 @@ import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.databinding.BottomSheetGenericListWithTitleBinding
 import im.vector.app.features.home.room.detail.RoomDetailAction
-import im.vector.app.features.home.room.detail.RoomDetailViewModel
 import im.vector.app.features.home.room.detail.RoomDetailViewState
+import im.vector.app.features.home.room.detail.TimelineViewModel
 import im.vector.app.features.navigation.Navigator
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import javax.inject.Inject
@@ -48,7 +48,7 @@ class RoomWidgetsBottomSheet :
     @Inject lateinit var colorProvider: ColorProvider
     @Inject lateinit var navigator: Navigator
 
-    private val roomDetailViewModel: RoomDetailViewModel by parentFragmentViewModel()
+    private val timelineViewModel: TimelineViewModel by parentFragmentViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetGenericListWithTitleBinding {
         return BottomSheetGenericListWithTitleBinding.inflate(inflater, container, false)
@@ -61,7 +61,7 @@ class RoomWidgetsBottomSheet :
         views.bottomSheetTitle.textSize = 20f
         views.bottomSheetTitle.setTextColor(colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
         epoxyController.listener = this
-        roomDetailViewModel.onAsync(RoomDetailViewState::activeRoomWidgets) {
+        timelineViewModel.onAsync(RoomDetailViewState::activeRoomWidgets) {
             epoxyController.setData(it)
         }
     }
@@ -72,13 +72,13 @@ class RoomWidgetsBottomSheet :
         super.onDestroyView()
     }
 
-    override fun didSelectWidget(widget: Widget) = withState(roomDetailViewModel) {
+    override fun didSelectWidget(widget: Widget) = withState(timelineViewModel) {
         navigator.openRoomWidget(requireContext(), it.roomId, widget)
         dismiss()
     }
 
     override fun didSelectManageWidgets() {
-        roomDetailViewModel.handle(RoomDetailAction.OpenIntegrationManager)
+        timelineViewModel.handle(RoomDetailAction.OpenIntegrationManager)
         dismiss()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt
index 0e16b4b0df..cf7c4a0e80 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt
@@ -24,7 +24,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityFilteredRoomsBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.home.room.list.RoomListFragment
 import im.vector.app.features.home.room.list.RoomListParams
@@ -43,7 +43,7 @@ class FilteredRoomsActivity : VectorBaseActivity<ActivityFilteredRoomsBinding>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.RoomFilter
+        analyticsScreenName = MobileScreen.ScreenName.RoomFilter
         setupToolbar(views.filteredRoomsToolbar)
                 .allowBack()
         if (isFirstCreation()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
deleted file mode 100644
index 94a79f5fbd..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
+++ /dev/null
@@ -1,38 +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.home.room.list
-
-import androidx.core.util.Predicate
-import im.vector.app.features.home.RoomListDisplayMode
-import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-
-class RoomListDisplayModeFilter(private val displayMode: RoomListDisplayMode) : Predicate<RoomSummary> {
-
-    override fun test(roomSummary: RoomSummary): Boolean {
-        if (roomSummary.membership.isLeft()) {
-            return false
-        }
-        return when (displayMode) {
-            RoomListDisplayMode.NOTIFICATIONS ->
-                roomSummary.notificationCount > 0 || roomSummary.membership == Membership.INVITE || roomSummary.userDrafts.isNotEmpty()
-            RoomListDisplayMode.PEOPLE        -> roomSummary.isDirect && roomSummary.membership.isActive()
-            RoomListDisplayMode.ROOMS         -> !roomSummary.isDirect && roomSummary.membership.isActive()
-            RoomListDisplayMode.FILTERED      -> roomSummary.membership == Membership.JOIN
-        }
-    }
-}
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 b6481c9cbb..28849204c4 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
@@ -42,7 +42,7 @@ 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.databinding.FragmentRoomListBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.home.room.filtered.FilteredRoomFooterItem
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
@@ -104,8 +104,8 @@ class RoomListFragment @Inject constructor(
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         analyticsScreenName = when (roomListParams.displayMode) {
-            RoomListDisplayMode.PEOPLE -> Screen.ScreenName.MobilePeople
-            RoomListDisplayMode.ROOMS  -> Screen.ScreenName.MobileRooms
+            RoomListDisplayMode.PEOPLE -> MobileScreen.ScreenName.People
+            RoomListDisplayMode.ROOMS  -> MobileScreen.ScreenName.Rooms
             else                       -> null
         }
     }
@@ -121,7 +121,7 @@ class RoomListFragment @Inject constructor(
             when (it) {
                 is RoomListViewEvents.Loading                   -> showLoading(it.message)
                 is RoomListViewEvents.Failure                   -> showFailure(it.throwable)
-                is RoomListViewEvents.SelectRoom                -> handleSelectRoom(it)
+                is RoomListViewEvents.SelectRoom                -> handleSelectRoom(it, it.isInviteAlreadyAccepted)
                 is RoomListViewEvents.Done                      -> Unit
                 is RoomListViewEvents.NavigateToMxToBottomSheet -> handleShowMxToLink(it.link)
             }.exhaustive
@@ -184,8 +184,8 @@ class RoomListFragment @Inject constructor(
         super.onDestroyView()
     }
 
-    private fun handleSelectRoom(event: RoomListViewEvents.SelectRoom) {
-        navigator.openRoom(requireActivity(), event.roomSummary.roomId)
+    private fun handleSelectRoom(event: RoomListViewEvents.SelectRoom, isInviteAlreadyAccepted: Boolean) {
+        navigator.openRoom(context = requireActivity(), roomId = event.roomSummary.roomId, isInviteAlreadyAccepted = isInviteAlreadyAccepted)
     }
 
     private fun setupCreateRoomButton() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt
index df2ff58da6..15e16c464f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt
@@ -27,7 +27,7 @@ sealed class RoomListViewEvents : VectorViewEvents {
     data class Loading(val message: CharSequence? = null) : RoomListViewEvents()
     data class Failure(val throwable: Throwable) : RoomListViewEvents()
 
-    data class SelectRoom(val roomSummary: RoomSummary) : RoomListViewEvents()
+    data class SelectRoom(val roomSummary: RoomSummary, val isInviteAlreadyAccepted: Boolean = false) : RoomListViewEvents()
     object Done : RoomListViewEvents()
     data class NavigateToMxToBottomSheet(val link: String) : RoomListViewEvents()
 }
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 42c800ab9d..4a81a8b526 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
@@ -33,7 +33,6 @@ import im.vector.app.core.extensions.exhaustive
 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.extensions.toAnalyticsJoinedRoom
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.invite.AutoAcceptInvites
 import im.vector.app.features.settings.VectorPreferences
@@ -174,7 +173,7 @@ class RoomListViewModel @AssistedInject constructor(
     // PRIVATE METHODS *****************************************************************************
 
     private fun handleSelectRoom(action: RoomListAction.SelectRoom) = withState {
-        _viewEvents.post(RoomListViewEvents.SelectRoom(action.roomSummary))
+        _viewEvents.post(RoomListViewEvents.SelectRoom(action.roomSummary, false))
     }
 
     private fun handleToggleSection(roomSection: RoomsSection) {
@@ -208,6 +207,7 @@ class RoomListViewModel @AssistedInject constructor(
             Timber.w("Try to join an already joining room. Should not happen")
             return@withState
         }
+        _viewEvents.post(RoomListViewEvents.SelectRoom(action.roomSummary, true))
 
         // quick echo
         setState {
@@ -221,19 +221,6 @@ class RoomListViewModel @AssistedInject constructor(
                     }
             )
         }
-
-        val room = session.getRoom(roomId) ?: return@withState
-        viewModelScope.launch {
-            try {
-                room.join()
-                analyticsTracker.capture(action.roomSummary.toAnalyticsJoinedRoom())
-                // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
-                // Instead, we wait for the room to be joined
-            } catch (failure: Throwable) {
-                // Notify the user
-                _viewEvents.post(RoomListViewEvents.Failure(failure))
-            }
-        }
     }
 
     private fun handleRejectInvitation(action: RoomListAction.RejectInvitation) = withState { state ->
@@ -245,10 +232,9 @@ class RoomListViewModel @AssistedInject constructor(
             return@withState
         }
 
-        val room = session.getRoom(roomId) ?: return@withState
         viewModelScope.launch {
             try {
-                room.leave(null)
+                session.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.
@@ -333,9 +319,8 @@ class RoomListViewModel @AssistedInject constructor(
 
     private fun handleLeaveRoom(action: RoomListAction.LeaveRoom) {
         _viewEvents.post(RoomListViewEvents.Loading(null))
-        val room = session.getRoom(action.roomId) ?: return
         viewModelScope.launch {
-            val value = runCatching { room.leave(null) }
+            val value = runCatching { session.leaveRoom(action.roomId) }
                     .fold({ RoomListViewEvents.Done }, { RoomListViewEvents.Failure(it) })
             _viewEvents.post(value)
         }
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
new file mode 100644
index 0000000000..ca18060c51
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
@@ -0,0 +1,163 @@
+/*
+ * 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.threads
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.FragmentTransaction
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+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.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.TimelineFragment
+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 org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
+
+    @Inject
+    lateinit var avatarRenderer: AvatarRenderer
+
+//    private val roomThreadDetailFragment: RoomThreadDetailFragment?
+//        get() {
+//            return supportFragmentManager.findFragmentByTag(FRAGMENT_TAG) as? RoomThreadDetailFragment
+//        }
+
+    override fun getBinding() = ActivityThreadsBinding.inflate(layoutInflater)
+
+    override fun getCoordinatorLayout() = views.coordinatorLayout
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initFragment()
+    }
+
+    private fun initFragment() {
+        if (isFirstCreation()) {
+            when (val fragment = fragmentToNavigate()) {
+                is DisplayFragment.ThreadList     -> {
+                    initThreadListFragment(fragment.threadListArgs)
+                }
+                is DisplayFragment.ThreadTimeLine -> {
+                    initThreadTimelineFragment(fragment.threadTimelineArgs)
+                }
+                is DisplayFragment.ErrorFragment  -> {
+                    finish()
+                }
+            }
+        }
+    }
+
+    private fun initThreadListFragment(threadListArgs: ThreadListArgs) {
+        replaceFragment(
+                views.threadsActivityFragmentContainer,
+                ThreadListFragment::class.java,
+                threadListArgs)
+    }
+
+    private fun initThreadTimelineFragment(threadTimelineArgs: ThreadTimelineArgs) =
+            replaceFragment(
+                    views.threadsActivityFragmentContainer,
+                    TimelineFragment::class.java,
+                    TimelineArgs(
+                            roomId = threadTimelineArgs.roomId,
+                            eventId = getEventIdToNavigate(),
+                            threadTimelineArgs = threadTimelineArgs
+                    ))
+
+    /**
+     * This function is used to navigate to the selected thread timeline.
+     * One usage of that is from the Threads Activity
+     */
+    fun navigateToThreadTimeline(
+            timelineEvent: TimelineEvent) {
+        val roomThreadDetailArgs = ThreadTimelineArgs(
+                roomId = timelineEvent.roomId,
+                displayName = timelineEvent.senderInfo.displayName,
+                avatarUrl = timelineEvent.senderInfo.avatarUrl,
+                roomEncryptionTrustLevel = null,
+                rootThreadEventId = timelineEvent.eventId)
+        val commonOption: (FragmentTransaction) -> Unit = {
+            it.setCustomAnimations(
+                    R.anim.animation_slide_in_right,
+                    R.anim.animation_slide_out_left,
+                    R.anim.animation_slide_in_left,
+                    R.anim.animation_slide_out_right)
+        }
+        addFragmentToBackstack(
+                container = views.threadsActivityFragmentContainer,
+                fragmentClass = TimelineFragment::class.java,
+                params = TimelineArgs(
+                        roomId = timelineEvent.roomId,
+                        threadTimelineArgs = roomThreadDetailArgs
+                ),
+                option = commonOption
+        )
+    }
+
+    /**
+     * Determine in witch fragment we should navigate
+     */
+    private fun fragmentToNavigate(): DisplayFragment {
+        getThreadTimelineArgs()?.let {
+            return DisplayFragment.ThreadTimeLine(it)
+        }
+        getThreadListArgs()?.let {
+            return DisplayFragment.ThreadList(it)
+        }
+        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 getEventIdToNavigate(): String? = intent?.extras?.getString(THREAD_EVENT_ID_TO_NAVIGATE)
+
+    companion object {
+        //        private val FRAGMENT_TAG = RoomThreadDetailFragment::class.simpleName
+        const val THREAD_TIMELINE_ARGS = "THREAD_TIMELINE_ARGS"
+        const val THREAD_EVENT_ID_TO_NAVIGATE = "THREAD_EVENT_ID_TO_NAVIGATE"
+        const val THREAD_LIST_ARGS = "THREAD_LIST_ARGS"
+
+        fun newIntent(
+                context: Context,
+                threadTimelineArgs: ThreadTimelineArgs?,
+                threadListArgs: ThreadListArgs?,
+                eventIdToNavigate: String? = null
+        ): Intent {
+            return Intent(context, ThreadsActivity::class.java).apply {
+                putExtra(THREAD_TIMELINE_ARGS, threadTimelineArgs)
+                putExtra(THREAD_EVENT_ID_TO_NAVIGATE, eventIdToNavigate)
+                putExtra(THREAD_LIST_ARGS, threadListArgs)
+            }
+        }
+    }
+
+    sealed class DisplayFragment {
+        data class ThreadList(val threadListArgs: ThreadListArgs) : DisplayFragment()
+        data class ThreadTimeLine(val threadTimelineArgs: ThreadTimelineArgs) : DisplayFragment()
+        object ErrorFragment : DisplayFragment()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/arguments/ThreadListArgs.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/arguments/ThreadListArgs.kt
new file mode 100644
index 0000000000..aa3746ea41
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/arguments/ThreadListArgs.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.threads.arguments
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+
+@Parcelize
+data class ThreadListArgs(
+        val roomId: String,
+        val displayName: String?,
+        val avatarUrl: String?,
+        val roomEncryptionTrustLevel: RoomEncryptionTrustLevel?
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/arguments/ThreadTimelineArgs.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/arguments/ThreadTimelineArgs.kt
new file mode 100644
index 0000000000..aadad3d97c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/arguments/ThreadTimelineArgs.kt
@@ -0,0 +1,30 @@
+/*
+ * 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.threads.arguments
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+
+@Parcelize
+data class ThreadTimelineArgs(
+        val roomId: String,
+        val displayName: String?,
+        val avatarUrl: String?,
+        val roomEncryptionTrustLevel: RoomEncryptionTrustLevel?,
+        val rootThreadEventId: String? = null
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt
new file mode 100644
index 0000000000..2364e86166
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt
@@ -0,0 +1,106 @@
+/*
+ * 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.model
+
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+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.extensions.clearDrawables
+import im.vector.app.core.extensions.setLeftDrawable
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.displayname.getBestName
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_thread)
+abstract class ThreadListItem : VectorEpoxyModel<ThreadListItem.Holder>() {
+
+    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute lateinit var title: String
+    @EpoxyAttribute lateinit var date: String
+    @EpoxyAttribute lateinit var rootMessage: String
+    @EpoxyAttribute lateinit var lastMessage: String
+    @EpoxyAttribute var threadNotificationState: ThreadNotificationState = ThreadNotificationState.NO_NEW_MESSAGE
+    @EpoxyAttribute lateinit var lastMessageCounter: String
+    @EpoxyAttribute var rootMessageDeleted: Boolean = false
+    @EpoxyAttribute var lastMessageMatrixItem: MatrixItem? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemClickListener: ClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.rootView.onClick(itemClickListener)
+        avatarRenderer.render(matrixItem, holder.avatarImageView)
+        holder.avatarImageView.contentDescription = matrixItem.getBestName()
+        holder.titleTextView.text = title
+        holder.dateTextView.text = date
+        if (rootMessageDeleted) {
+            holder.rootMessageTextView.text = holder.view.context.getString(R.string.event_redacted)
+            holder.rootMessageTextView.setLeftDrawable(R.drawable.ic_trash_16, R.attr.vctr_content_tertiary)
+            holder.rootMessageTextView.compoundDrawablePadding = DimensionConverter(holder.view.context.resources).dpToPx(10)
+        } else {
+            holder.rootMessageTextView.text = rootMessage
+            holder.rootMessageTextView.clearDrawables()
+        }
+        // Last message summary
+        lastMessageMatrixItem?.let {
+            avatarRenderer.render(it, holder.lastMessageAvatarImageView)
+        }
+        holder.lastMessageAvatarImageView.contentDescription = lastMessageMatrixItem?.getBestName()
+        holder.lastMessageTextView.text = lastMessage
+        holder.lastMessageCounterTextView.text = lastMessageCounter
+        renderNotificationState(holder)
+    }
+
+    private fun renderNotificationState(holder: Holder) {
+        when (threadNotificationState) {
+            ThreadNotificationState.NEW_MESSAGE             -> {
+                holder.unreadImageView.isVisible = true
+                holder.unreadImageView.setColorFilter(ContextCompat.getColor(holder.view.context, R.color.palette_gray_200))
+            }
+            ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE -> {
+                holder.unreadImageView.isVisible = true
+                holder.unreadImageView.setColorFilter(ContextCompat.getColor(holder.view.context, R.color.palette_vermilion))
+            }
+            else                                            -> {
+                holder.unreadImageView.isVisible = false
+            }
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.threadSummaryAvatarImageView)
+        val titleTextView by bind<TextView>(R.id.threadSummaryTitleTextView)
+        val dateTextView by bind<TextView>(R.id.threadSummaryDateTextView)
+        val rootMessageTextView by bind<TextView>(R.id.threadSummaryRootMessageTextView)
+        val lastMessageAvatarImageView by bind<ImageView>(R.id.messageThreadSummaryAvatarImageView)
+        val lastMessageCounterTextView by bind<TextView>(R.id.messageThreadSummaryCounterTextView)
+        val lastMessageTextView by bind<TextView>(R.id.messageThreadSummaryInfoTextView)
+        val unreadImageView by bind<ImageView>(R.id.threadSummaryUnreadImageView)
+        val rootView by bind<ConstraintLayout>(R.id.threadSummaryRootConstraintLayout)
+    }
+}
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
new file mode 100644
index 0000000000..8bc6bd73e9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListController.kt
@@ -0,0 +1,86 @@
+/*
+ * 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.EpoxyController
+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.features.home.AvatarRenderer
+import im.vector.app.features.home.room.threads.list.model.threadListItem
+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 javax.inject.Inject
+
+class ThreadListController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val stringProvider: StringProvider,
+        private val dateFormatter: VectorDateFormatter
+) : EpoxyController() {
+
+    var listener: Listener? = null
+
+    private var viewState: ThreadListViewState? = null
+
+    fun update(viewState: ThreadListViewState) {
+        this.viewState = viewState
+        requestModelBuild()
+    }
+
+    override fun buildModels() {
+        val safeViewState = viewState ?: return
+        val host = this
+
+        safeViewState.rootThreadEventList.invoke()
+                ?.filter {
+                    if (safeViewState.shouldFilterThreads) {
+                        it.isParticipating
+                    } else {
+                        true
+                    }
+                }?.map {
+                    it.timelineEvent
+                }
+                ?.forEach { timelineEvent ->
+                    val date = dateFormatter.format(timelineEvent.root.threadDetails?.lastMessageTimestamp, DateFormatKind.ROOM_LIST)
+                    val decryptionErrorMessage = stringProvider.getString(R.string.encrypted_message)
+                    val lastRootThreadEdition = timelineEvent.root.threadDetails?.lastRootThreadEdition
+                    threadListItem {
+                        id(timelineEvent.eventId)
+                        avatarRenderer(host.avatarRenderer)
+                        matrixItem(timelineEvent.senderInfo.toMatrixItem())
+                        title(timelineEvent.senderInfo.displayName)
+                        date(date)
+                        rootMessageDeleted(timelineEvent.root.isRedacted())
+                        threadNotificationState(timelineEvent.root.threadDetails?.threadNotificationState ?: ThreadNotificationState.NO_NEW_MESSAGE)
+                        rootMessage(lastRootThreadEdition ?: timelineEvent.root.getDecryptedTextSummary() ?: decryptionErrorMessage)
+                        lastMessage(timelineEvent.root.threadDetails?.threadSummaryLatestTextMessage ?: decryptionErrorMessage)
+                        lastMessageCounter(timelineEvent.root.threadDetails?.numberOfThreads.toString())
+                        lastMessageMatrixItem(timelineEvent.root.threadDetails?.threadSummarySenderInfo?.toMatrixItem())
+                        itemClickListener {
+                            host.listener?.onThreadClicked(timelineEvent)
+                        }
+                    }
+                }
+    }
+
+    interface Listener {
+        fun onThreadClicked(timelineEvent: TimelineEvent)
+    }
+}
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
new file mode 100644
index 0000000000..d82b5d6ccf
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.threads.list.viewmodel
+
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MavericksViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.home.room.threads.list.views.ThreadListFragment
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import org.matrix.android.sdk.api.session.Session
+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 session: Session) :
+        VectorViewModel<ThreadListViewState, EmptyAction, EmptyViewEvents>(initialState) {
+
+    private val room = session.getRoom(initialState.roomId)
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: ThreadListViewState): ThreadListViewModel
+    }
+
+    companion object : MavericksViewModelFactory<ThreadListViewModel, ThreadListViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: ThreadListViewState): ThreadListViewModel? {
+            val fragment: ThreadListFragment = (viewModelContext as FragmentViewModelContext).fragment()
+            return fragment.threadListViewModelFactory.create(state)
+        }
+    }
+
+    init {
+        observeThreadsList()
+    }
+
+    override fun handle(action: EmptyAction) {}
+
+    private fun observeThreadsList() {
+        room?.flow()
+                ?.liveThreadList()
+                ?.map { room.mapEventsWithEdition(it) }
+                ?.map {
+                    it.map { threadRootEvent ->
+                        val isParticipating = room.isUserParticipatingInThread(threadRootEvent.eventId)
+                        ThreadTimelineEvent(threadRootEvent, isParticipating)
+                    }
+                }
+                ?.flowOn(room.coroutineDispatchers.io)
+                ?.execute { asyncThreads ->
+                    copy(rootThreadEventList = asyncThreads)
+                }
+    }
+
+    fun applyFiltering(shouldFilterThreads: Boolean) {
+        setState {
+            copy(shouldFilterThreads = shouldFilterThreads)
+        }
+    }
+}
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
new file mode 100644
index 0000000000..2a70a5be1e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewState.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.threads.list.viewmodel
+
+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.threads.ThreadTimelineEvent
+
+data class ThreadListViewState(
+        val rootThreadEventList: Async<List<ThreadTimelineEvent>> = Uninitialized,
+        val shouldFilterThreads: Boolean = false,
+        val roomId: String
+) : MavericksState {
+
+    constructor(args: ThreadListArgs) : this(roomId = args.roomId)
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListBottomSheet.kt
new file mode 100644
index 0000000000..7ad4804e5b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListBottomSheet.kt
@@ -0,0 +1,85 @@
+/*
+ * 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.threads.list.views
+
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.AttrRes
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import com.airbnb.mvrx.parentFragmentViewModel
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetThreadListBinding
+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.themes.ThemeUtils
+
+class ThreadListBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetThreadListBinding>() {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetThreadListBinding {
+        return BottomSheetThreadListBinding.inflate(inflater, container, false)
+    }
+
+    private val threadListViewModel: ThreadListViewModel by parentFragmentViewModel()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        threadListViewModel.onEach {
+            renderState(it)
+        }
+        views.threadListModalAllThreads.views.bottomSheetActionClickableZone.debouncedClicks {
+            threadListViewModel.applyFiltering(false)
+            dismiss()
+        }
+        views.threadListModalMyThreads.views.bottomSheetActionClickableZone.debouncedClicks {
+            threadListViewModel.applyFiltering(true)
+            dismiss()
+        }
+    }
+
+    private fun renderState(state: ThreadListViewState) {
+        val radioOffDrawable = ContextCompat.getDrawable(requireContext(), R.drawable.ic_radio_off)
+        val radioOnDrawable = ContextCompat.getDrawable(requireContext(), R.drawable.ic_radio_on)
+
+        if (state.shouldFilterThreads) {
+            setRightIconDrawableAllThreads(radioOffDrawable, R.attr.vctr_content_primary)
+            setRightIconDrawableMyThreads(radioOnDrawable, R.attr.colorPrimary)
+        } else {
+            setRightIconDrawableAllThreads(radioOnDrawable, R.attr.colorPrimary)
+            setRightIconDrawableMyThreads(radioOffDrawable, R.attr.vctr_content_primary)
+        }
+    }
+
+    private fun setRightIconDrawableAllThreads(drawable: Drawable?, @AttrRes tint: Int) {
+        views.threadListModalAllThreads.rightIcon = drawable
+        views.threadListModalAllThreads.rightIcon?.setTintFromAttribute(tint)
+    }
+
+    private fun setRightIconDrawableMyThreads(drawable: Drawable?, @AttrRes tint: Int) {
+        views.threadListModalMyThreads.rightIcon = drawable
+        views.threadListModalMyThreads.rightIcon?.setTintFromAttribute(tint)
+    }
+
+    private fun Drawable.setTintFromAttribute(@AttrRes tint: Int) {
+        DrawableCompat.setTint(this, ThemeUtils.getColor(requireContext(), tint))
+    }
+}
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
new file mode 100644
index 0000000000..180e6226d0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
@@ -0,0 +1,122 @@
+/*
+ * 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.threads.list.views
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.args
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+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.databinding.FragmentThreadListBinding
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.animation.TimelineItemAnimator
+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.list.viewmodel.ThreadListController
+import im.vector.app.features.home.room.threads.list.viewmodel.ThreadListViewModel
+import im.vector.app.features.home.room.threads.list.viewmodel.ThreadListViewState
+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 threadListController: ThreadListController,
+        val threadListViewModelFactory: ThreadListViewModel.Factory
+) : VectorBaseFragment<FragmentThreadListBinding>(),
+        ThreadListController.Listener {
+
+    private val threadListViewModel: ThreadListViewModel by fragmentViewModel()
+
+    private val threadListArgs: ThreadListArgs by args()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentThreadListBinding {
+        return FragmentThreadListBinding.inflate(inflater, container, false)
+    }
+
+    override fun getMenuRes() = R.menu.menu_thread_list
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.menu_thread_list_filter -> {
+                ThreadListBottomSheet().show(childFragmentManager, "Filtering")
+                true
+            }
+            else                         -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initToolbar()
+        initTextConstants()
+        views.threadListRecyclerView.configureWith(threadListController, TimelineItemAnimator(), hasFixedSize = false)
+        threadListController.listener = this
+    }
+
+    override fun onDestroyView() {
+        views.threadListRecyclerView.cleanup()
+        threadListController.listener = null
+        super.onDestroyView()
+    }
+
+    private fun initToolbar() {
+        setupToolbar(views.threadListToolbar).allowBack()
+        renderToolbar()
+    }
+
+    private fun initTextConstants() {
+        views.threadListEmptyNoticeTextView.text = String.format(
+                resources.getString(R.string.thread_list_empty_notice),
+                resources.getString(R.string.reply_in_thread))
+    }
+
+    override fun invalidate() = withState(threadListViewModel) { state ->
+        renderEmptyStateIfNeeded(state)
+        threadListController.update(state)
+    }
+
+    private fun renderToolbar() {
+        views.includeThreadListToolbar.roomToolbarThreadConstraintLayout.isVisible = true
+        val matrixItem = MatrixItem.RoomItem(threadListArgs.roomId, threadListArgs.displayName, threadListArgs.avatarUrl)
+        avatarRenderer.render(matrixItem, views.includeThreadListToolbar.roomToolbarThreadImageView)
+        views.includeThreadListToolbar.roomToolbarThreadShieldImageView.render(threadListArgs.roomEncryptionTrustLevel)
+        views.includeThreadListToolbar.roomToolbarThreadTitleTextView.text = resources.getText(R.string.thread_list_title)
+        views.includeThreadListToolbar.roomToolbarThreadSubtitleTextView.text = threadListArgs.displayName
+    }
+
+    override fun onThreadClicked(timelineEvent: TimelineEvent) {
+        (activity as? ThreadsActivity)?.navigateToThreadTimeline(timelineEvent)
+    }
+
+    private fun renderEmptyStateIfNeeded(state: ThreadListViewState) {
+        val show = state.rootThreadEventList.invoke().isNullOrEmpty()
+        views.threadListEmptyConstraintLayout.isVisible = show
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/html/CodeVisitor.kt b/vector/src/main/java/im/vector/app/features/html/CodeVisitor.kt
deleted file mode 100644
index f1612c3717..0000000000
--- a/vector/src/main/java/im/vector/app/features/html/CodeVisitor.kt
+++ /dev/null
@@ -1,55 +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.html
-
-import org.commonmark.node.AbstractVisitor
-import org.commonmark.node.Code
-import org.commonmark.node.FencedCodeBlock
-import org.commonmark.node.IndentedCodeBlock
-
-/**
- * This class is in charge of visiting nodes and tells if we have some code nodes (inline or block).
- */
-class CodeVisitor : AbstractVisitor() {
-
-    var codeKind: Kind = Kind.NONE
-        private set
-
-    override fun visit(fencedCodeBlock: FencedCodeBlock?) {
-        if (codeKind == Kind.NONE) {
-            codeKind = Kind.BLOCK
-        }
-    }
-
-    override fun visit(indentedCodeBlock: IndentedCodeBlock?) {
-        if (codeKind == Kind.NONE) {
-            codeKind = Kind.BLOCK
-        }
-    }
-
-    override fun visit(code: Code?) {
-        if (codeKind == Kind.NONE) {
-            codeKind = Kind.INLINE
-        }
-    }
-
-    enum class Kind {
-        NONE,
-        INLINE,
-        BLOCK
-    }
-}
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 36acad8854..7d78be3584 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
@@ -17,9 +17,11 @@
 package im.vector.app.features.html
 
 import android.content.Context
+import android.content.res.Resources
 import android.text.Spannable
 import androidx.core.text.toSpannable
 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
@@ -53,11 +55,11 @@ class EventHtmlRenderer @Inject constructor(
                 .usePlugin(object : AbstractMarkwonPlugin() { // Markwon expects maths to be in a specific format: https://noties.io/Markwon/docs/v4/ext-latex
                     override fun processMarkdown(markdown: String): String {
                         return markdown
-                                .replace(Regex("""<span\s+data-mx-maths="([^"]*)">.*?</span>""")) {
-                                    matchResult -> "$$" + matchResult.groupValues[1] + "$$"
+                                .replace(Regex("""<span\s+data-mx-maths="([^"]*)">.*?</span>""")) { matchResult ->
+                                    "$$" + matchResult.groupValues[1] + "$$"
                                 }
-                                .replace(Regex("""<div\s+data-mx-maths="([^"]*)">.*?</div>""")) {
-                                    matchResult -> "\n$$\n" + matchResult.groupValues[1] + "\n$$\n"
+                                .replace(Regex("""<div\s+data-mx-maths="([^"]*)">.*?</div>""")) { matchResult ->
+                                    "\n$$\n" + matchResult.groupValues[1] + "\n$$\n"
                                 }
                     }
                 })
@@ -112,12 +114,15 @@ class EventHtmlRenderer @Inject constructor(
     }
 }
 
-class MatrixHtmlPluginConfigure @Inject constructor(private val colorProvider: ColorProvider) : HtmlPlugin.HtmlConfigure {
+class MatrixHtmlPluginConfigure @Inject constructor(private val colorProvider: ColorProvider, private val resources: Resources) : HtmlPlugin.HtmlConfigure {
 
     override fun configureHtml(plugin: HtmlPlugin) {
         plugin
                 .addHandler(FontTagHandler())
+                .addHandler(ParagraphHandler(DimensionConverter(resources)))
                 .addHandler(MxReplyTagHandler())
+                .addHandler(CodePreTagHandler())
+                .addHandler(CodeTagHandler())
                 .addHandler(SpanHandler(colorProvider))
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/html/HtmlCodeHandlers.kt b/vector/src/main/java/im/vector/app/features/html/HtmlCodeHandlers.kt
new file mode 100644
index 0000000000..1010625370
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/html/HtmlCodeHandlers.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.html
+
+import io.noties.markwon.MarkwonVisitor
+import io.noties.markwon.SpannableBuilder
+import io.noties.markwon.html.HtmlTag
+import io.noties.markwon.html.MarkwonHtmlRenderer
+import io.noties.markwon.html.TagHandler
+
+class CodeTagHandler : TagHandler() {
+
+    override fun handle(visitor: MarkwonVisitor, renderer: MarkwonHtmlRenderer, tag: HtmlTag) {
+        SpannableBuilder.setSpans(
+                visitor.builder(),
+                HtmlCodeSpan(visitor.configuration().theme(), false),
+                tag.start(),
+                tag.end()
+        )
+    }
+
+    override fun supportedTags(): List<String> {
+        return listOf("code")
+    }
+}
+
+/**
+ * Pre tag are already handled by HtmlPlugin to keep the formatting.
+ * We are only using it to check for <pre><code>*</code></pre> tags.
+ */
+class CodePreTagHandler : TagHandler() {
+    override fun handle(visitor: MarkwonVisitor, renderer: MarkwonHtmlRenderer, tag: HtmlTag) {
+        val htmlCodeSpan = visitor.builder()
+                .getSpans(tag.start(), tag.end())
+                .firstOrNull {
+                    it.what is HtmlCodeSpan
+                }
+        if (htmlCodeSpan != null) {
+            (htmlCodeSpan.what as HtmlCodeSpan).isBlock = true
+        }
+    }
+
+    override fun supportedTags(): List<String> {
+        return listOf("pre")
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/html/HtmlCodeSpan.kt b/vector/src/main/java/im/vector/app/features/html/HtmlCodeSpan.kt
new file mode 100644
index 0000000000..7f01321aab
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/html/HtmlCodeSpan.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.html
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
+import android.text.Layout
+import android.text.TextPaint
+import android.text.style.LeadingMarginSpan
+import android.text.style.MetricAffectingSpan
+import io.noties.markwon.core.MarkwonTheme
+
+class HtmlCodeSpan(private val theme: MarkwonTheme, var isBlock: Boolean) : MetricAffectingSpan(), LeadingMarginSpan {
+
+    private val rect = Rect()
+    private val paint = Paint()
+
+    override fun updateDrawState(p: TextPaint) {
+        applyTextStyle(p)
+        if (!isBlock) {
+            p.bgColor = theme.getCodeBackgroundColor(p)
+        }
+    }
+
+    override fun updateMeasureState(p: TextPaint) {
+        applyTextStyle(p)
+    }
+
+    private fun applyTextStyle(p: TextPaint) {
+        if (isBlock) {
+            theme.applyCodeBlockTextStyle(p)
+        } else {
+            theme.applyCodeTextStyle(p)
+        }
+    }
+
+    override fun getLeadingMargin(first: Boolean): Int {
+        return theme.codeBlockMargin
+    }
+
+    override fun drawLeadingMargin(
+            c: Canvas,
+            p: Paint?,
+            x: Int,
+            dir: Int,
+            top: Int,
+            baseline: Int,
+            bottom: Int,
+            text: CharSequence?,
+            start: Int,
+            end: Int,
+            first: Boolean,
+            layout: Layout?
+    ) {
+        if (!isBlock) return
+
+        paint.style = Paint.Style.FILL
+        paint.color = theme.getCodeBlockBackgroundColor(p!!)
+        val left: Int
+        val right: Int
+        if (dir > 0) {
+            left = x
+            right = c.width
+        } else {
+            left = x - c.width
+            right = x
+        }
+        rect[left, top, right] = bottom
+        c.drawRect(rect, paint)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt b/vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt
index 391c5f9477..118369e3c8 100644
--- a/vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt
@@ -17,28 +17,17 @@
 package im.vector.app.features.html
 
 import io.noties.markwon.MarkwonVisitor
-import io.noties.markwon.SpannableBuilder
 import io.noties.markwon.html.HtmlTag
 import io.noties.markwon.html.MarkwonHtmlRenderer
 import io.noties.markwon.html.TagHandler
-import org.commonmark.node.BlockQuote
 
 class MxReplyTagHandler : TagHandler() {
 
     override fun supportedTags() = listOf("mx-reply")
 
     override fun handle(visitor: MarkwonVisitor, renderer: MarkwonHtmlRenderer, tag: HtmlTag) {
-        val configuration = visitor.configuration()
-        val factory = configuration.spansFactory().get(BlockQuote::class.java)
-        if (factory != null) {
-            SpannableBuilder.setSpans(
-                    visitor.builder(),
-                    factory.getSpans(configuration, visitor.renderProps()),
-                    tag.start(),
-                    tag.end()
-            )
-            val replyText = visitor.builder().removeFromEnd(tag.end())
-            visitor.builder().append("\n\n").append(replyText)
-        }
+        visitChildren(visitor, renderer, tag.asBlock)
+        val replyText = visitor.builder().removeFromEnd(tag.end())
+        visitor.builder().append("\n\n").append(replyText)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/html/ParagraphHandler.kt b/vector/src/main/java/im/vector/app/features/html/ParagraphHandler.kt
new file mode 100644
index 0000000000..3dd1b4f091
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/html/ParagraphHandler.kt
@@ -0,0 +1,42 @@
+/*
+ * 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.html
+
+import im.vector.app.core.utils.DimensionConverter
+import io.noties.markwon.MarkwonVisitor
+import io.noties.markwon.SpannableBuilder
+import io.noties.markwon.html.HtmlTag
+import io.noties.markwon.html.MarkwonHtmlRenderer
+import io.noties.markwon.html.TagHandler
+import me.gujun.android.span.style.VerticalPaddingSpan
+
+class ParagraphHandler(private val dimensionConverter: DimensionConverter) : TagHandler() {
+
+    override fun supportedTags() = listOf("p")
+
+    override fun handle(visitor: MarkwonVisitor, renderer: MarkwonHtmlRenderer, tag: HtmlTag) {
+        if (tag.isBlock) {
+            visitChildren(visitor, renderer, tag.asBlock)
+        }
+        SpannableBuilder.setSpans(
+                visitor.builder(),
+                VerticalPaddingSpan(dimensionConverter.dpToPx(4), dimensionConverter.dpToPx(4)),
+                tag.start(),
+                tag.end()
+        )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
index c1040a8cc0..ae285b074c 100644
--- a/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
+++ b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
@@ -19,6 +19,7 @@
 package im.vector.app.features.html
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
@@ -32,6 +33,7 @@ import im.vector.app.R
 import im.vector.app.core.glide.GlideRequests
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.themes.ThemeUtils
 import org.matrix.android.sdk.api.session.room.send.MatrixItemSpan
 import org.matrix.android.sdk.api.util.MatrixItem
 import java.lang.ref.WeakReference
@@ -65,10 +67,15 @@ class PillImageSpan(private val glideRequests: GlideRequests,
                          fm: Paint.FontMetricsInt?): Int {
         val rect = pillDrawable.bounds
         if (fm != null) {
-            fm.ascent = -rect.bottom
-            fm.descent = 0
-            fm.top = fm.ascent
-            fm.bottom = 0
+            val fmPaint = paint.fontMetricsInt
+            val fontHeight = fmPaint.bottom - fmPaint.top
+            val drHeight = rect.bottom - rect.top
+            val top = drHeight / 2 - fontHeight / 4
+            val bottom = drHeight / 2 + fontHeight / 4
+            fm.ascent = -bottom
+            fm.top = -bottom
+            fm.bottom = top
+            fm.descent = top
         }
         return rect.right
     }
@@ -82,7 +89,9 @@ class PillImageSpan(private val glideRequests: GlideRequests,
                       bottom: Int,
                       paint: Paint) {
         canvas.save()
-        val transY = bottom - pillDrawable.bounds.bottom
+        val fm = paint.fontMetricsInt
+        val transY: Int = y + (fm.descent + fm.ascent - pillDrawable.bounds.bottom) / 2
+        canvas.save()
         canvas.translate(x, transY.toFloat())
         pillDrawable.draw(canvas)
         canvas.restore()
@@ -110,6 +119,11 @@ class PillImageSpan(private val glideRequests: GlideRequests,
             setChipMinHeightResource(R.dimen.pill_min_height)
             setChipIconSizeResource(R.dimen.pill_avatar_size)
             chipIcon = icon
+            if (matrixItem is MatrixItem.EveryoneInRoomItem) {
+                chipBackgroundColor = ColorStateList.valueOf(ThemeUtils.getColor(context, R.attr.colorError))
+                // setTextColor API does not exist right now for ChipDrawable, use textAppearance
+                setTextAppearanceResource(R.style.TextAppearance_Vector_Body_OnError)
+            }
             setBounds(0, 0, intrinsicWidth, intrinsicHeight)
         }
     }
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 f8a2ee5137..506f5e773c 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
@@ -36,57 +36,87 @@ class PillsPostProcessor @AssistedInject constructor(@Assisted private val roomI
                                                      private val context: Context,
                                                      private val avatarRenderer: AvatarRenderer,
                                                      private val sessionHolder: ActiveSessionHolder) :
-    EventHtmlRenderer.PostProcessor {
+        EventHtmlRenderer.PostProcessor {
+
+    /* ==========================================================================================
+     * Public api
+     * ========================================================================================== */
 
     @AssistedFactory
     interface Factory {
         fun create(roomId: String?): PillsPostProcessor
     }
 
+    /* ==========================================================================================
+     * Specialization
+     * ========================================================================================== */
+
     override fun afterRender(renderedText: Spannable) {
         addPillSpans(renderedText, roomId)
     }
 
+    /* ==========================================================================================
+     * Helper methods
+     * ========================================================================================== */
+
     private fun addPillSpans(renderedText: Spannable, roomId: String?) {
+        addLinkSpans(renderedText, roomId)
+    }
+
+    private fun addPillSpan(
+            renderedText: Spannable,
+            pillSpan: PillImageSpan,
+            startSpan: Int,
+            endSpan: Int
+    ) {
+        renderedText.setSpan(pillSpan, startSpan, endSpan, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    }
+
+    private fun addLinkSpans(renderedText: Spannable, roomId: String?) {
         // We let markdown handle links and then we add PillImageSpan if needed.
         val linkSpans = renderedText.getSpans(0, renderedText.length, LinkSpan::class.java)
         linkSpans.forEach { linkSpan ->
             val pillSpan = linkSpan.createPillSpan(roomId) ?: return@forEach
             val startSpan = renderedText.getSpanStart(linkSpan)
             val endSpan = renderedText.getSpanEnd(linkSpan)
-            renderedText.setSpan(pillSpan, startSpan, endSpan, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            addPillSpan(renderedText, pillSpan, startSpan, endSpan)
         }
     }
 
+    private fun createPillImageSpan(matrixItem: MatrixItem) =
+            PillImageSpan(GlideApp.with(context), avatarRenderer, context, matrixItem)
+
     private fun LinkSpan.createPillSpan(roomId: String?): PillImageSpan? {
-        val permalinkData = PermalinkParser.parse(url)
-        val matrixItem = when (permalinkData) {
-            is PermalinkData.UserLink -> {
-                if (roomId == null) {
-                    sessionHolder.getSafeActiveSession()?.getUser(permalinkData.userId)?.toMatrixItem()
-                } else {
-                    sessionHolder.getSafeActiveSession()?.getRoomMember(permalinkData.userId, roomId)?.toMatrixItem()
-                }
-            }
-            is PermalinkData.RoomLink -> {
-                if (permalinkData.eventId == null) {
-                    val room: RoomSummary? = sessionHolder.getSafeActiveSession()?.getRoomSummary(permalinkData.roomIdOrAlias)
-                    if (permalinkData.isRoomAlias) {
-                        MatrixItem.RoomAliasItem(permalinkData.roomIdOrAlias, room?.displayName, room?.avatarUrl)
-                    } else {
-                        MatrixItem.RoomItem(permalinkData.roomIdOrAlias, room?.displayName, room?.avatarUrl)
-                    }
-                } else {
-                    // Exclude event link (used in reply events, we do not want to pill the "in reply to")
-                    null
-                }
-            }
-            is PermalinkData.GroupLink -> {
-                val group = sessionHolder.getSafeActiveSession()?.getGroupSummary(permalinkData.groupId)
-                MatrixItem.GroupItem(permalinkData.groupId, group?.displayName, group?.avatarUrl)
-            }
+        val matrixItem = when (val permalinkData = PermalinkParser.parse(url)) {
+            is PermalinkData.UserLink  -> permalinkData.toMatrixItem(roomId)
+            is PermalinkData.RoomLink  -> permalinkData.toMatrixItem()
+            is PermalinkData.GroupLink -> permalinkData.toMatrixItem()
             else                       -> null
         } ?: return null
-        return PillImageSpan(GlideApp.with(context), avatarRenderer, context, matrixItem)
+        return createPillImageSpan(matrixItem)
+    }
+
+    private fun PermalinkData.UserLink.toMatrixItem(roomId: String?): MatrixItem? =
+            if (roomId == null) {
+                sessionHolder.getSafeActiveSession()?.getUser(userId)?.toMatrixItem()
+            } else {
+                sessionHolder.getSafeActiveSession()?.getRoomMember(userId, roomId)?.toMatrixItem()
+            }
+
+    private fun PermalinkData.RoomLink.toMatrixItem(): MatrixItem? =
+            if (eventId == null) {
+                val room: RoomSummary? = sessionHolder.getSafeActiveSession()?.getRoomSummary(roomIdOrAlias)
+                when {
+                    isRoomAlias -> MatrixItem.RoomAliasItem(roomIdOrAlias, room?.displayName, room?.avatarUrl)
+                    else        -> MatrixItem.RoomItem(roomIdOrAlias, room?.displayName, room?.avatarUrl)
+                }
+            } else {
+                // Exclude event link (used in reply events, we do not want to pill the "in reply to")
+                null
+            }
+
+    private fun PermalinkData.GroupLink.toMatrixItem(): MatrixItem? {
+        val group = sessionHolder.getSafeActiveSession()?.getGroupSummary(groupId)
+        return MatrixItem.GroupItem(groupId, group?.displayName, group?.avatarUrl)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/invite/InvitesAcceptor.kt b/vector/src/main/java/im/vector/app/features/invite/InvitesAcceptor.kt
index 73876bf6e9..a482998f77 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InvitesAcceptor.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InvitesAcceptor.kt
@@ -34,7 +34,6 @@ import kotlinx.coroutines.sync.withPermit
 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.room.Room
 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.roomSummaryQueryParams
@@ -109,7 +108,7 @@ class InvitesAcceptor @Inject constructor(
 
     private suspend fun Session.joinRoomSafely(roomId: String) {
         if (shouldRejectRoomIds.contains(roomId)) {
-            getRoom(roomId)?.rejectInviteSafely()
+            rejectInviteSafely(roomId)
             return
         }
         val roomMembershipChanged = getChangeMemberships(roomId)
@@ -126,16 +125,16 @@ class InvitesAcceptor @Inject constructor(
                     // if the inviting user is on the same HS, there can only be one cause: they left, so we try to reject the invite.
                     if (inviterId?.endsWith(sessionParams.credentials.homeServer.orEmpty()).orFalse()) {
                         shouldRejectRoomIds.add(roomId)
-                        room.rejectInviteSafely()
+                        rejectInviteSafely(roomId)
                     }
                 }
             }
         }
     }
 
-    private suspend fun Room.rejectInviteSafely() {
+    private suspend fun Session.rejectInviteSafely(roomId: String) {
         try {
-            leave(null)
+            leaveRoom(roomId)
             shouldRejectRoomIds.remove(roomId)
         } catch (failure: Throwable) {
             Timber.v("Fail rejecting invite for room: $roomId")
diff --git a/vector/src/main/java/im/vector/app/features/location/Config.kt b/vector/src/main/java/im/vector/app/features/location/Config.kt
index 29ca6b81a9..6f947290e2 100644
--- a/vector/src/main/java/im/vector/app/features/location/Config.kt
+++ b/vector/src/main/java/im/vector/app/features/location/Config.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.location
 
 const val MAP_BASE_URL = "https://api.maptiler.com/maps/streets/style.json"
 const val STATIC_MAP_BASE_URL = "https://api.maptiler.com/maps/basic/static/"
+const val DEFAULT_PIN_ID = "DEFAULT_PIN_ID"
 
 const val INITIAL_MAP_ZOOM_IN_PREVIEW = 15.0
 const val INITIAL_MAP_ZOOM_IN_TIMELINE = 17.0
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt
index c4f2f148bf..db837f4823 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt
@@ -54,8 +54,11 @@ class LocationPreviewFragment @Inject constructor(
 
         mapView = WeakReference(views.mapView)
         views.mapView.onCreate(savedInstanceState)
-        views.mapView.initialize(urlMapProvider.mapUrl)
-        loadPinDrawable()
+
+        lifecycleScope.launchWhenCreated {
+            views.mapView.initialize(urlMapProvider.getMapUrl())
+            loadPinDrawable()
+        }
     }
 
     override fun onResume() {
@@ -121,7 +124,7 @@ class LocationPreviewFragment @Inject constructor(
                         MapState(
                                 zoomOnlyOnce = true,
                                 pinLocationData = location,
-                                pinId = args.locationOwnerId,
+                                pinId = args.locationOwnerId ?: DEFAULT_PIN_ID,
                                 pinDrawable = pinDrawable
                         )
                 )
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 67b36b8442..10c271727b 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
@@ -30,7 +30,7 @@ data class LocationSharingArgs(
         val roomId: String,
         val mode: LocationSharingMode,
         val initialLocationData: LocationData?,
-        val locationOwnerId: String
+        val locationOwnerId: String?
 ) : Parcelable
 
 @AndroidEntryPoint
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 f6bad2826b..a7e93a3f6c 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
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isGone
+import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -53,7 +54,10 @@ class LocationSharingFragment @Inject constructor(
 
         mapView = WeakReference(views.mapView)
         views.mapView.onCreate(savedInstanceState)
-        views.mapView.initialize(urlMapProvider.mapUrl)
+
+        lifecycleScope.launchWhenCreated {
+            views.mapView.initialize(urlMapProvider.getMapUrl())
+        }
 
         views.shareLocationContainer.debouncedClicks {
             viewModel.handle(LocationSharingAction.OnShareLocation)
@@ -118,8 +122,4 @@ class LocationSharingFragment @Inject constructor(
         views.mapView.render(state.toMapState())
         views.shareLocationGpsLoading.isGone = state.lastKnownLocation != null
     }
-
-    companion object {
-        const val USER_PIN_NAME = "USER_PIN_NAME"
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
index f3b937855a..a9a24094eb 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
@@ -42,6 +42,6 @@ data class LocationSharingViewState(
 fun LocationSharingViewState.toMapState() = MapState(
         zoomOnlyOnce = true,
         pinLocationData = lastKnownLocation,
-        pinId = LocationSharingFragment.USER_PIN_NAME,
+        pinId = DEFAULT_PIN_ID,
         pinDrawable = pinDrawable
 )
diff --git a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
index 76d44f5ece..adb5c27a02 100644
--- a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
@@ -16,22 +16,34 @@
 
 package im.vector.app.features.location
 
-import android.content.res.Resources
 import im.vector.app.BuildConfig
-import im.vector.app.R
+import im.vector.app.core.resources.LocaleProvider
+import im.vector.app.core.resources.isRTL
+import im.vector.app.features.raw.wellknown.getElementWellknown
+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 javax.inject.Inject
 
 class UrlMapProvider @Inject constructor(
-        private val resources: Resources
+        private val localeProvider: LocaleProvider,
+        private val session: Session,
+        private val rawService: RawService
 ) {
     private val keyParam = "?key=${BuildConfig.mapTilerKey}"
 
-    // This is static so no need for a fun
-    val mapUrl = buildString {
+    private val fallbackMapUrl = buildString {
         append(MAP_BASE_URL)
         append(keyParam)
     }
 
+    suspend fun getMapUrl(): String {
+        val upstreamMapUrl = tryOrNull { rawService.getElementWellknown(session.sessionParams) }
+                ?.mapTileServerConfig
+                ?.mapStyleUrl
+        return upstreamMapUrl ?: fallbackMapUrl
+    }
+
     fun buildStaticMapUrl(locationData: LocationData,
                           zoom: Double,
                           width: Int,
@@ -49,7 +61,7 @@ class UrlMapProvider @Inject constructor(
             append(height)
             append(".png")
             append(keyParam)
-            if (!resources.getBoolean(R.bool.is_rtl)) {
+            if (!localeProvider.isRTL()) {
                 // On LTR languages we want the legal mentions to be displayed on the bottom left of the image
                 append("&attribution=bottomleft")
             }
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 edc77d73f6..bf596fc6aa 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
@@ -38,7 +38,7 @@ import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityLoginBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.login.terms.LoginTermsFragment
 import im.vector.app.features.login.terms.LoginTermsFragmentArgument
@@ -81,7 +81,7 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
     override fun getCoordinatorLayout() = views.coordinatorLayout
 
     override fun initUiAndData() {
-        analyticsScreenName = Screen.ScreenName.Login
+        analyticsScreenName = MobileScreen.ScreenName.Login
 
         if (isFirstCreation()) {
             addFirstFragment()
@@ -203,7 +203,7 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
         if (loginViewState.isUserLogged()) {
             if (loginViewState.signMode == SignMode.SignUp) {
                 // change the screen name
-                analyticsScreenName = Screen.ScreenName.Register
+                analyticsScreenName = MobileScreen.ScreenName.Register
             }
             val intent = HomeActivity.newIntent(
                     this,
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 0328d09427..d121245532 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
@@ -31,7 +31,7 @@ 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.databinding.FragmentLoginResetPasswordBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
@@ -48,7 +48,7 @@ class LoginResetPasswordFragment @Inject constructor() : AbstractLoginFragment<F
     private var showWarning = true
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        analyticsScreenName = Screen.ScreenName.ForgotPassword
+        analyticsScreenName = MobileScreen.ScreenName.ForgotPassword
         super.onCreate(savedInstanceState)
     }
 
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 b6090a88c7..5e476be8ac 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
@@ -26,7 +26,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.databinding.FragmentLoginSplashBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.failure.Failure
 import java.net.UnknownHostException
@@ -44,7 +44,7 @@ class LoginSplashFragment @Inject constructor(
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        analyticsScreenName = Screen.ScreenName.Welcome
+        analyticsScreenName = MobileScreen.ScreenName.Welcome
         super.onCreate(savedInstanceState)
     }
 
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 ca21e96d20..bb73ed79b2 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
@@ -51,7 +51,7 @@ class LoginWebFragment @Inject constructor(
         private val assetReader: AssetReader
 ) : AbstractLoginFragment<FragmentLoginWebBinding>() {
 
-    val softLogoutViewModel: SoftLogoutViewModel by activityViewModel()
+    private val softLogoutViewModel: SoftLogoutViewModel by activityViewModel()
 
     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/login2/LoginWebFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt
index ebe59ee1b9..4427f08309 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt
@@ -56,7 +56,7 @@ class LoginWebFragment2 @Inject constructor(
         return FragmentLoginWebBinding.inflate(inflater, container, false)
     }
 
-    val softLogoutViewModel: SoftLogoutViewModel by activityViewModel()
+    private val softLogoutViewModel: SoftLogoutViewModel by activityViewModel()
 
     private var isWebViewLoaded = false
     private var isForSessionRecovery = false
@@ -82,7 +82,7 @@ class LoginWebFragment2 @Inject constructor(
     private fun setupTitle(state: LoginViewState2) {
         toolbar?.title = when (state.signMode) {
             SignMode2.SignIn -> getString(R.string.login_signin)
-            else            -> getString(R.string.login_signup)
+            else             -> getString(R.string.login_signup)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
index c56481d3f2..2f71089a39 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
@@ -41,7 +41,8 @@ class SpaceCardRenderer @Inject constructor(
     fun render(spaceSummary: RoomSummary?,
                peopleYouKnow: List<User>,
                matrixLinkCallback: TimelineEventController.UrlClickCallback?,
-               inCard: FragmentMatrixToRoomSpaceCardBinding) {
+               inCard: FragmentMatrixToRoomSpaceCardBinding,
+               showDescription: Boolean) {
         if (spaceSummary == null) {
             inCard.matrixToCardContentVisibility.isVisible = false
             inCard.matrixToCardButtonLoading.isVisible = true
@@ -70,6 +71,8 @@ class SpaceCardRenderer @Inject constructor(
                 inCard.matrixToMemberPills.isVisible = false
             }
 
+            inCard.matrixToCardDescText.isVisible = showDescription
+
             renderPeopleYouKnow(inCard, peopleYouKnow.map { it.toMatrixItem() })
         }
         inCard.matrixToCardDescText.movementMethod = createLinkMovementMethod(object : TimelineEventController.UrlClickCallback {
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 8d6d1f467b..65c99362b9 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
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.media
 
+import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Parcelable
@@ -23,6 +24,7 @@ import android.view.View
 import android.widget.ImageView
 import androidx.core.view.updateLayoutParams
 import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.Transformation
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
@@ -42,6 +44,7 @@ import im.vector.app.core.utils.DimensionConverter
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.api.session.media.PreviewUrlData
 import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 import timber.log.Timber
 import java.io.File
@@ -59,6 +62,9 @@ interface AttachmentData : Parcelable {
     val allowNonMxcUrls: Boolean
 }
 
+private const val URL_PREVIEW_IMAGE_MIN_FULL_WIDTH_PX = 600
+private const val URL_PREVIEW_IMAGE_MIN_FULL_HEIGHT_PX = 315
+
 class ImageContentRenderer @Inject constructor(private val localFilesHelper: LocalFilesHelper,
                                                private val activeSessionHolder: ActiveSessionHolder,
                                                private val dimensionConverter: DimensionConverter) {
@@ -87,12 +93,20 @@ class ImageContentRenderer @Inject constructor(private val localFilesHelper: Loc
     /**
      * For url preview
      */
-    fun render(mxcUrl: String, imageView: ImageView): Boolean {
+    fun render(previewUrlData: PreviewUrlData, imageView: ImageView): Boolean {
         val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
-        val imageUrl = contentUrlResolver.resolveFullSize(mxcUrl) ?: return false
-
+        val imageUrl = contentUrlResolver.resolveFullSize(previewUrlData.mxcUrl) ?: return false
+        val maxHeight = dimensionConverter.resources.getDimensionPixelSize(R.dimen.preview_url_view_image_max_height)
+        val height = previewUrlData.imageHeight ?: URL_PREVIEW_IMAGE_MIN_FULL_HEIGHT_PX
+        val width = previewUrlData.imageWidth ?: URL_PREVIEW_IMAGE_MIN_FULL_WIDTH_PX
+        if (height < URL_PREVIEW_IMAGE_MIN_FULL_HEIGHT_PX || width < URL_PREVIEW_IMAGE_MIN_FULL_WIDTH_PX) {
+            imageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
+        } else {
+            imageView.scaleType = ImageView.ScaleType.CENTER_CROP
+        }
         GlideApp.with(imageView)
                 .load(imageUrl)
+                .override(width, height.coerceAtMost(maxHeight))
                 .into(imageView)
         return true
     }
@@ -109,7 +123,7 @@ class ImageContentRenderer @Inject constructor(private val localFilesHelper: Loc
                 .into(imageView)
     }
 
-    fun render(data: Data, mode: Mode, imageView: ImageView) {
+    fun render(data: Data, mode: Mode, imageView: ImageView, cornerTransformation: Transformation<Bitmap> = RoundedCorners(dimensionConverter.dpToPx(8))) {
         val size = processSize(data, mode)
         imageView.updateLayoutParams {
             width = size.width
@@ -120,7 +134,7 @@ class ImageContentRenderer @Inject constructor(private val localFilesHelper: Loc
 
         createGlideRequest(data, mode, imageView, size)
                 .dontAnimate()
-                .transform(RoundedCorners(dimensionConverter.dpToPx(8)))
+                .transform(cornerTransformation)
                 // .thumbnail(0.3f)
                 .into(imageView)
     }
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 8f0b1723a0..cc02687d93 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
@@ -53,10 +53,13 @@ import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.debug.DebugMenuActivity
 import im.vector.app.features.devtools.RoomDevToolActivity
 import im.vector.app.features.home.room.detail.RoomDetailActivity
-import im.vector.app.features.home.room.detail.RoomDetailArgs
+import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.detail.search.SearchActivity
 import im.vector.app.features.home.room.detail.search.SearchArgs
 import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
+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.invite.InviteUsersToRoomActivity
 import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.LocationSharingActivity
@@ -140,12 +143,18 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
-    override fun openRoom(context: Context, roomId: String, eventId: String?, buildTask: Boolean) {
+    override fun openRoom(
+            context: Context,
+            roomId: String,
+            eventId: String?,
+            buildTask: Boolean,
+            isInviteAlreadyAccepted: Boolean
+    ) {
         if (sessionHolder.getSafeActiveSession()?.getRoom(roomId) == null) {
             fatalError("Trying to open an unknown room $roomId", vectorPreferences.failFast())
             return
         }
-        val args = RoomDetailArgs(roomId, eventId)
+        val args = TimelineArgs(roomId = roomId, eventId = eventId, isInviteAlreadyAccepted = isInviteAlreadyAccepted)
         val intent = RoomDetailActivity.newIntent(context, args)
         startActivity(context, intent, buildTask)
     }
@@ -168,7 +177,7 @@ class DefaultNavigator @Inject constructor(
                 startActivity(context, SpaceManageActivity.newIntent(context, spaceId, ManageType.AddRooms), false)
             }
             is Navigator.PostSwitchSpaceAction.OpenDefaultRoom   -> {
-                val args = RoomDetailArgs(
+                val args = TimelineArgs(
                         postSwitchSpaceAction.roomId,
                         eventId = null,
                         openShareSpaceForId = spaceId.takeIf { postSwitchSpaceAction.showShareSheet }
@@ -266,7 +275,7 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openRoomForSharingAndFinish(activity: Activity, roomId: String, sharedData: SharedData) {
-        val args = RoomDetailArgs(roomId, null, sharedData)
+        val args = TimelineArgs(roomId, null, sharedData)
         val intent = RoomDetailActivity.newIntent(activity, args)
         activity.startActivity(intent)
         activity.finish()
@@ -515,8 +524,11 @@ class DefaultNavigator @Inject constructor(
         }
     }
 
-    override fun openSearch(context: Context, roomId: String) {
-        val intent = SearchActivity.newIntent(context, SearchArgs(roomId))
+    override fun openSearch(context: Context,
+                            roomId: String,
+                            roomDisplayName: String?,
+                            roomAvatarUrl: String?) {
+        val intent = SearchActivity.newIntent(context, SearchArgs(roomId, roomDisplayName, roomAvatarUrl))
         context.startActivity(intent)
     }
 
@@ -545,7 +557,7 @@ class DefaultNavigator @Inject constructor(
                                      roomId: String,
                                      mode: LocationSharingMode,
                                      initialLocationData: LocationData?,
-                                     locationOwnerId: String) {
+                                     locationOwnerId: String?) {
         val intent = LocationSharingActivity.getIntent(
                 context,
                 LocationSharingArgs(roomId = roomId, mode = mode, initialLocationData = initialLocationData, locationOwnerId = locationOwnerId)
@@ -562,4 +574,25 @@ class DefaultNavigator @Inject constructor(
             context.startActivity(intent)
         }
     }
+
+    override fun openThread(context: Context, threadTimelineArgs: ThreadTimelineArgs, eventIdToNavigate: String?) {
+        context.startActivity(ThreadsActivity.newIntent(
+                context = context,
+                threadTimelineArgs = threadTimelineArgs,
+                threadListArgs = null,
+                eventIdToNavigate = eventIdToNavigate
+        ))
+    }
+
+    override fun openThreadList(context: Context, threadTimelineArgs: ThreadTimelineArgs) {
+        context.startActivity(ThreadsActivity.newIntent(
+                context = context,
+                threadTimelineArgs = null,
+                threadListArgs = ThreadListArgs(
+                        roomId = threadTimelineArgs.roomId,
+                        displayName = threadTimelineArgs.displayName,
+                        avatarUrl = threadTimelineArgs.avatarUrl,
+                        roomEncryptionTrustLevel = threadTimelineArgs.roomEncryptionTrustLevel
+                )))
+    }
 }
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 d6ca83a8a3..a31dc8fb89 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
@@ -25,6 +25,7 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.core.util.Pair
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.displayname.getBestName
+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
@@ -49,7 +50,7 @@ interface Navigator {
 
     fun softLogout(context: Context)
 
-    fun openRoom(context: Context, roomId: String, eventId: String? = null, buildTask: Boolean = false)
+    fun openRoom(context: Context, roomId: String, eventId: String? = null, buildTask: Boolean = false, isInviteAlreadyAccepted: Boolean = false)
 
     sealed class PostSwitchSpaceAction {
         object None : PostSwitchSpaceAction()
@@ -145,7 +146,7 @@ interface Navigator {
                         inMemory: List<AttachmentData> = emptyList(),
                         options: ((MutableList<Pair<View, String>>) -> Unit)?)
 
-    fun openSearch(context: Context, roomId: String)
+    fun openSearch(context: Context, roomId: String, roomDisplayName: String?, roomAvatarUrl: String?)
 
     fun openDevTools(context: Context, roomId: String)
 
@@ -161,5 +162,9 @@ interface Navigator {
                             roomId: String,
                             mode: LocationSharingMode,
                             initialLocationData: LocationData?,
-                            locationOwnerId: String)
+                            locationOwnerId: String?)
+
+    fun openThread(context: Context, threadTimelineArgs: ThreadTimelineArgs, eventIdToNavigate: String? = null)
+
+    fun openThreadList(context: Context, threadTimelineArgs: ThreadTimelineArgs)
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/BitmapLoader.kt b/vector/src/main/java/im/vector/app/features/notifications/BitmapLoader.kt
deleted file mode 100644
index d1c4624cdc..0000000000
--- a/vector/src/main/java/im/vector/app/features/notifications/BitmapLoader.kt
+++ /dev/null
@@ -1,67 +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.notifications
-
-import android.content.Context
-import android.graphics.Bitmap
-import androidx.annotation.WorkerThread
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.DecodeFormat
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class BitmapLoader @Inject constructor(private val context: Context) {
-
-    /**
-     * Avatar Url -> Bitmap
-     */
-    private val cache = HashMap<String, Bitmap?>()
-
-    /**
-     * Get icon of a room.
-     * If already in cache, use it, else load it and call BitmapLoaderListener.onBitmapsLoaded() when ready
-     */
-    @WorkerThread
-    fun getRoomBitmap(path: String?): Bitmap? {
-        if (path == null) {
-            return null
-        }
-
-        return cache.getOrPut(path) {
-            loadRoomBitmap(path)
-        }
-    }
-
-    @WorkerThread
-    private fun loadRoomBitmap(path: String): Bitmap? {
-        return path.let {
-            try {
-                Glide.with(context)
-                        .asBitmap()
-                        .load(path)
-                        .format(DecodeFormat.PREFER_ARGB_8888)
-                        .submit()
-                        .get()
-            } catch (e: Exception) {
-                Timber.e(e, "decodeFile failed")
-                null
-            }
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/notifications/IconLoader.kt b/vector/src/main/java/im/vector/app/features/notifications/IconLoader.kt
deleted file mode 100644
index 3e68744c88..0000000000
--- a/vector/src/main/java/im/vector/app/features/notifications/IconLoader.kt
+++ /dev/null
@@ -1,73 +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.notifications
-
-import android.content.Context
-import android.os.Build
-import androidx.annotation.WorkerThread
-import androidx.core.graphics.drawable.IconCompat
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.DecodeFormat
-import com.bumptech.glide.request.RequestOptions
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class IconLoader @Inject constructor(private val context: Context) {
-
-    /**
-     * Avatar Url -> IconCompat
-     */
-    private val cache = HashMap<String, IconCompat?>()
-
-    /**
-     * Get icon of a user.
-     * If already in cache, use it, else load it and call IconLoaderListener.onIconsLoaded() when ready
-     * Before Android P, this does nothing because the icon won't be used
-     */
-    @WorkerThread
-    fun getUserIcon(path: String?): IconCompat? {
-        if (path == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            return null
-        }
-
-        return cache.getOrPut(path) {
-            loadUserIcon(path)
-        }
-    }
-
-    @WorkerThread
-    private fun loadUserIcon(path: String): IconCompat? {
-        return path.let {
-            try {
-                Glide.with(context)
-                        .asBitmap()
-                        .load(path)
-                        .apply(RequestOptions.circleCropTransform()
-                                .format(DecodeFormat.PREFER_ARGB_8888))
-                        .submit()
-                        .get()
-            } catch (e: Exception) {
-                Timber.e(e, "decodeFile failed")
-                null
-            }?.let { bitmap ->
-                IconCompat.createWithBitmap(bitmap)
-            }
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBitmapLoader.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBitmapLoader.kt
new file mode 100644
index 0000000000..518b011ffd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBitmapLoader.kt
@@ -0,0 +1,92 @@
+/*
+ * 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.notifications
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.os.Build
+import androidx.annotation.WorkerThread
+import androidx.core.graphics.drawable.IconCompat
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DecodeFormat
+import com.bumptech.glide.load.resource.bitmap.CircleCrop
+import com.bumptech.glide.signature.ObjectKey
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NotificationBitmapLoader @Inject constructor(private val context: Context) {
+
+    /**
+     * Get icon of a room
+     */
+    @WorkerThread
+    fun getRoomBitmap(path: String?): Bitmap? {
+        if (path == null) {
+            return null
+        }
+        return loadRoomBitmap(path)
+    }
+
+    @WorkerThread
+    private fun loadRoomBitmap(path: String): Bitmap? {
+        return try {
+            Glide.with(context)
+                    .asBitmap()
+                    .load(path)
+                    .format(DecodeFormat.PREFER_ARGB_8888)
+                    .signature(ObjectKey("room-icon-notification"))
+                    .submit()
+                    .get()
+        } catch (e: Exception) {
+            Timber.e(e, "decodeFile failed")
+            null
+        }
+    }
+
+    /**
+     * Get icon of a user.
+     * Before Android P, this does nothing because the icon won't be used
+     */
+    @WorkerThread
+    fun getUserIcon(path: String?): IconCompat? {
+        if (path == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            return null
+        }
+
+        return loadUserIcon(path)
+    }
+
+    @WorkerThread
+    private fun loadUserIcon(path: String): IconCompat? {
+        return try {
+            val bitmap = Glide.with(context)
+                    .asBitmap()
+                    .load(path)
+                    .transform(CircleCrop())
+                    .format(DecodeFormat.PREFER_ARGB_8888)
+                    .signature(ObjectKey("user-icon-notification"))
+                    .submit()
+                    .get()
+            IconCompat.createWithBitmap(bitmap)
+        } catch (e: Exception) {
+            Timber.e(e, "decodeFile failed")
+            null
+        }
+    }
+}
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 ac2ec06474..01c1117ab2 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
@@ -83,7 +83,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
             if (room != null) {
                 session.coroutineScope.launch {
                     tryOrNull {
-                        room.join()
+                        session.joinRoom(room.roomId)
                         analyticsTracker.capture(room.roomSummary().toAnalyticsJoinedRoom())
                     }
                 }
@@ -93,11 +93,8 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
 
     private fun handleRejectRoom(roomId: String) {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
-            val room = session.getRoom(roomId)
-            if (room != null) {
-                session.coroutineScope.launch {
-                    tryOrNull { room.leave() }
-                }
+            session.coroutineScope.launch {
+                tryOrNull { session.leaveRoom(roomId) }
             }
         }
     }
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 27568dae95..d39926f620 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
@@ -58,7 +58,7 @@ import im.vector.app.features.call.webrtc.WebRtcCall
 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.RoomDetailArgs
+import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.troubleshoot.TestNotificationReceiver
 import im.vector.app.features.themes.ThemeUtils
@@ -514,7 +514,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
 
         val contentPendingIntent = TaskStackBuilder.create(context)
                 .addNextIntentWithParentStack(HomeActivity.newIntent(context))
-                .addNextIntent(RoomDetailActivity.newIntent(context, RoomDetailArgs(callInformation.nativeRoomId)))
+                .addNextIntent(RoomDetailActivity.newIntent(context, TimelineArgs(callInformation.nativeRoomId)))
                 .getPendingIntent(System.currentTimeMillis().toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE)
 
         builder.setContentIntent(contentPendingIntent)
@@ -773,7 +773,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
     }
 
     private fun buildOpenRoomIntent(roomId: String): PendingIntent? {
-        val roomIntentTap = RoomDetailActivity.newIntent(context, RoomDetailArgs(roomId = roomId, switchToParentSpace = true))
+        val roomIntentTap = RoomDetailActivity.newIntent(context, TimelineArgs(roomId = roomId, switchToParentSpace = true))
         roomIntentTap.action = TAP_TO_VIEW_ACTION
         // pending intent get reused by system, this will mess up the extra params, so put unique info to avoid that
         roomIntentTap.data = createIgnoredUri("openRoom?$roomId")
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 b57c81f686..8310c15daa 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
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.notifications
 
-import android.content.Context
 import android.graphics.Bitmap
 import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
@@ -28,11 +27,9 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class RoomGroupMessageCreator @Inject constructor(
-        private val iconLoader: IconLoader,
-        private val bitmapLoader: BitmapLoader,
+        private val bitmapLoader: NotificationBitmapLoader,
         private val stringProvider: StringProvider,
-        private val notificationUtils: NotificationUtils,
-        private val appContext: Context
+        private val notificationUtils: NotificationUtils
 ) {
 
     fun createRoomMessage(events: List<NotifiableMessageEvent>, roomId: String, userDisplayName: String, userAvatarUrl: String?): RoomNotification.Message {
@@ -41,7 +38,7 @@ class RoomGroupMessageCreator @Inject constructor(
         val roomIsGroup = !firstKnownRoomEvent.roomIsDirect
         val style = NotificationCompat.MessagingStyle(Person.Builder()
                 .setName(userDisplayName)
-                .setIcon(iconLoader.getUserIcon(userAvatarUrl))
+                .setIcon(bitmapLoader.getUserIcon(userAvatarUrl))
                 .setKey(firstKnownRoomEvent.matrixID)
                 .build()
         ).also {
@@ -92,7 +89,7 @@ class RoomGroupMessageCreator @Inject constructor(
             } else {
                 Person.Builder()
                         .setName(event.senderName)
-                        .setIcon(iconLoader.getUserIcon(event.senderAvatarPath))
+                        .setIcon(bitmapLoader.getUserIcon(event.senderAvatarPath))
                         .setKey(event.senderId)
                         .build()
             }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/FtueUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/FtueUseCase.kt
index e720b7307c..952612b43f 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/FtueUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/FtueUseCase.kt
@@ -16,9 +16,13 @@
 
 package im.vector.app.features.onboarding
 
-enum class FtueUseCase {
-    FRIENDS_FAMILY,
-    TEAMS,
-    COMMUNITIES,
-    SKIP
+enum class FtueUseCase(val persistableValue: String) {
+    FRIENDS_FAMILY("friends_family"),
+    TEAMS("teams"),
+    COMMUNITIES("communities"),
+    SKIP("skip");
+
+    companion object {
+        fun from(persistedValue: String) = values().first { it.persistableValue == persistedValue }
+    }
 }
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 2ca6a1f2fd..3ddea5ca2e 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
@@ -21,7 +21,6 @@ import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.login.ServerType
 import im.vector.app.features.login.SignMode
 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.internal.network.ssl.Fingerprint
 
@@ -71,11 +70,6 @@ sealed class OnboardingAction : VectorViewModelAction {
     // Homeserver history
     object ClearHomeServerHistory : OnboardingAction()
 
-    // For the soft logout case
-    data class SetupSsoForSessionRecovery(val homeServerUrl: String,
-                                          val deviceId: String,
-                                          val ssoIdentityProviders: List<SsoIdentityProvider>?) : OnboardingAction()
-
     data class PostViewEvent(val viewEvent: OnboardingViewEvents) : OnboardingAction()
 
     data class UserAcceptCertificate(val fingerprint: Fingerprint) : OnboardingAction()
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 43f37f4601..d279c5bbe9 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
@@ -32,10 +32,14 @@ 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.exhaustive
+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.utils.ensureTrailingSlash
 import im.vector.app.features.VectorFeatures
+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.login.HomeServerConnectionConfigFactory
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.login.LoginMode
@@ -73,7 +77,8 @@ class OnboardingViewModel @AssistedInject constructor(
         private val reAuthHelper: ReAuthHelper,
         private val stringProvider: StringProvider,
         private val homeServerHistoryService: HomeServerHistoryService,
-        private val vectorFeatures: VectorFeatures
+        private val vectorFeatures: VectorFeatures,
+        private val analyticsTracker: AnalyticsTracker
 ) : VectorViewModel<OnboardingViewState, OnboardingAction, OnboardingViewEvents>(initialState) {
 
     @AssistedFactory
@@ -125,7 +130,7 @@ class OnboardingViewModel @AssistedInject constructor(
         when (action) {
             is OnboardingAction.OnGetStarted               -> handleSplashAction(action.resetLoginConfig, action.onboardingFlow)
             is OnboardingAction.OnIAlreadyHaveAnAccount    -> handleSplashAction(action.resetLoginConfig, action.onboardingFlow)
-            is OnboardingAction.UpdateUseCase              -> handleUpdateUseCase()
+            is OnboardingAction.UpdateUseCase              -> handleUpdateUseCase(action)
             OnboardingAction.ResetUseCase                  -> resetUseCase()
             is OnboardingAction.UpdateServerType           -> handleUpdateServerType(action)
             is OnboardingAction.UpdateSignMode             -> handleUpdateSignMode(action)
@@ -138,7 +143,6 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.ResetPasswordMailConfirmed -> handleResetPasswordMailConfirmed()
             is OnboardingAction.RegisterAction             -> handleRegisterAction(action)
             is OnboardingAction.ResetAction                -> handleResetAction(action)
-            is OnboardingAction.SetupSsoForSessionRecovery -> handleSetupSsoForSessionRecovery(action)
             is OnboardingAction.UserAcceptCertificate      -> handleUserAcceptCertificate(action)
             OnboardingAction.ClearHomeServerHistory        -> handleClearHomeServerHistory()
             is OnboardingAction.PostViewEvent              -> _viewEvents.post(action.viewEvent)
@@ -244,18 +248,6 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleSetupSsoForSessionRecovery(action: OnboardingAction.SetupSsoForSessionRecovery) {
-        setState {
-            copy(
-                    signMode = SignMode.SignIn,
-                    loginMode = LoginMode.Sso(action.ssoIdentityProviders),
-                    homeServerUrlFromUser = action.homeServerUrl,
-                    homeServerUrl = action.homeServerUrl,
-                    deviceId = action.deviceId
-            )
-        }
-    }
-
     private fun handleRegisterAction(action: OnboardingAction.RegisterAction) {
         when (action) {
             is OnboardingAction.CaptchaDone                  -> handleCaptchaDone(action)
@@ -458,13 +450,13 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleUpdateUseCase() {
-        // TODO act on the use case selection
+    private fun handleUpdateUseCase(action: OnboardingAction.UpdateUseCase) {
+        setState { copy(useCase = action.useCase) }
         _viewEvents.post(OnboardingViewEvents.OpenServerSelection)
     }
 
     private fun resetUseCase() {
-        // TODO remove stored use case
+        setState { copy(useCase = null) }
     }
 
     private fun handleUpdateServerType(action: OnboardingAction.UpdateServerType) {
@@ -745,6 +737,10 @@ class OnboardingViewModel @AssistedInject constructor(
     }
 
     private suspend fun onSessionCreated(session: Session) {
+        awaitState().useCase?.let { useCase ->
+            session.vectorStore(applicationContext).setUseCase(useCase)
+            analyticsTracker.updateUserProperties(UserProperties(ftueUseCaseSelection = useCase.toTrackingValue()))
+        }
         activeSessionHolder.setActiveSession(session)
 
         authenticationService.reset()
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 fd25f3901e..d05a8294f6 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
@@ -40,6 +40,8 @@ data class OnboardingViewState(
         @PersistState
         val serverType: ServerType = ServerType.Unknown,
         @PersistState
+        val useCase: FtueUseCase? = null,
+        @PersistState
         val signMode: SignMode = SignMode.Unknown,
         @PersistState
         val resetPasswordEmail: String? = null,
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 879830a1c0..4c99a4d1d8 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
@@ -30,7 +30,6 @@ 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
@@ -40,8 +39,6 @@ import im.vector.app.features.login.SignMode
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewState
-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.internal.di.MoshiProvider
 import timber.log.Timber
@@ -56,14 +53,11 @@ class FtueAuthWebFragment @Inject constructor(
         private val assetReader: AssetReader
 ) : AbstractFtueAuthFragment<FragmentLoginWebBinding>() {
 
-    val softLogoutViewModel: SoftLogoutViewModel by activityViewModel()
-
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginWebBinding {
         return FragmentLoginWebBinding.inflate(inflater, container, false)
     }
 
     private var isWebViewLoaded = false
-    private var isForSessionRecovery = false
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -75,8 +69,6 @@ class FtueAuthWebFragment @Inject constructor(
     override fun updateWithState(state: OnboardingViewState) {
         setupTitle(state)
 
-        isForSessionRecovery = state.deviceId?.isNotBlank() == true
-
         if (!isWebViewLoaded) {
             setupWebView(state)
             isWebViewLoaded = true
@@ -239,11 +231,7 @@ class FtueAuthWebFragment @Inject constructor(
     }
 
     private fun notifyViewModel(credentials: Credentials) {
-        if (isForSessionRecovery) {
-            softLogoutViewModel.handle(SoftLogoutAction.WebLoginSuccess(credentials))
-        } else {
-            viewModel.handle(OnboardingAction.WebLoginSuccess(credentials))
-        }
+        viewModel.handle(OnboardingAction.WebLoginSuccess(credentials))
     }
 
     override fun resetViewModel() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt
index da5f8b6379..006492f6dc 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt
@@ -43,26 +43,26 @@ class SplashCarouselStateFactory @Inject constructor(
         fun hero(@DrawableRes lightDrawable: Int, @DrawableRes darkDrawable: Int) = if (lightTheme) lightDrawable else darkDrawable
         return SplashCarouselState(listOf(
                 SplashCarouselState.Item(
-                        R.string.ftue_auth_carousel_1_title.colorTerminatingFullStop(R.attr.colorAccent),
-                        R.string.ftue_auth_carousel_body_secure,
+                        R.string.ftue_auth_carousel_secure_title.colorTerminatingFullStop(R.attr.colorAccent),
+                        R.string.ftue_auth_carousel_secure_body,
                         hero(R.drawable.ic_splash_conversations, R.drawable.ic_splash_conversations_dark),
                         background(R.drawable.bg_carousel_page_1)
                 ),
                 SplashCarouselState.Item(
-                        R.string.ftue_auth_carousel_2_title.colorTerminatingFullStop(R.attr.colorAccent),
-                        R.string.ftue_auth_carousel_body_control,
+                        R.string.ftue_auth_carousel_control_title.colorTerminatingFullStop(R.attr.colorAccent),
+                        R.string.ftue_auth_carousel_control_body,
                         hero(R.drawable.ic_splash_control, R.drawable.ic_splash_control_dark),
                         background(R.drawable.bg_carousel_page_2)
                 ),
                 SplashCarouselState.Item(
-                        R.string.ftue_auth_carousel_3_title.colorTerminatingFullStop(R.attr.colorAccent),
-                        R.string.ftue_auth_carousel_body_encrypted,
+                        R.string.ftue_auth_carousel_encrypted_title.colorTerminatingFullStop(R.attr.colorAccent),
+                        R.string.ftue_auth_carousel_encrypted_body,
                         hero(R.drawable.ic_splash_secure, R.drawable.ic_splash_secure_dark),
                         background(R.drawable.bg_carousel_page_3)
                 ),
                 SplashCarouselState.Item(
                         collaborationTitle().colorTerminatingFullStop(R.attr.colorAccent),
-                        R.string.ftue_auth_carousel_body_workplace,
+                        R.string.ftue_auth_carousel_workplace_body,
                         hero(R.drawable.ic_splash_collaboration, R.drawable.ic_splash_collaboration_dark),
                         background(R.drawable.bg_carousel_page_4)
                 )
@@ -72,7 +72,7 @@ class SplashCarouselStateFactory @Inject constructor(
     private fun collaborationTitle(): Int {
         return when {
             localeProvider.isEnglishSpeaking() -> R.string.cut_the_slack_from_teams
-            else                               -> R.string.ftue_auth_carousel_title_messaging
+            else                               -> R.string.ftue_auth_carousel_workplace_title
         }
     }
 
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 40cc0b3e13..b67e779a33 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
@@ -22,21 +22,26 @@ import androidx.core.net.toUri
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.isIgnored
+import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.core.utils.toast
+import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 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.getRootThreadEventId
 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.permalinks.PermalinkService
 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
 import javax.inject.Inject
 
 class PermalinkHandler @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
+                                           private val userPreferencesProvider: UserPreferencesProvider,
                                            private val navigator: Navigator) {
 
     suspend fun launch(
@@ -80,13 +85,20 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
         return when (permalinkData) {
             is PermalinkData.RoomLink            -> {
                 val roomId = permalinkData.getRoomId()
+                val session = activeSessionHolder.getSafeActiveSession()
+
+                val rootThreadEventId = permalinkData.eventId?.let { eventId ->
+                    val room = roomId?.let { session?.getRoom(it) }
+                    room?.getTimeLineEvent(eventId)?.root?.getRootThreadEventId()
+                }
                 openRoom(
                         navigationInterceptor,
                         context = context,
                         roomId = roomId,
                         permalinkData = permalinkData,
                         rawLink = rawLink,
-                        buildTask = buildTask
+                        buildTask = buildTask,
+                        rootThreadEventId = rootThreadEventId
                 )
                 true
             }
@@ -150,7 +162,8 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
             roomId: String?,
             permalinkData: PermalinkData.RoomLink,
             rawLink: Uri,
-            buildTask: Boolean
+            buildTask: Boolean,
+            rootThreadEventId: String? = null
     ) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         if (roomId == null) {
@@ -167,7 +180,7 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
             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)
+                    navigationInterceptor.openJoinedRoomScreen(buildTask, roomId, eventId, rawLink, context, rootThreadEventId, roomSummary)
                 } else {
                     // maybe open space preview navigator.openSpacePreview(context, roomId)? if already joined?
                     navigator.openMatrixToBottomSheet(context, rawLink.toString())
@@ -180,9 +193,26 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
         }
     }
 
-    private fun NavigationInterceptor?.openJoinedRoomScreen(buildTask: Boolean, roomId: String, eventId: String?, rawLink: Uri, context: Context) {
-        if (this?.navToRoom(roomId, eventId, rawLink) != true) {
-            navigator.openRoom(context, roomId, eventId, buildTask)
+    private fun NavigationInterceptor?.openJoinedRoomScreen(buildTask: Boolean,
+                                                            roomId: String,
+                                                            eventId: String?,
+                                                            rawLink: Uri,
+                                                            context: Context,
+                                                            rootThreadEventId: String?,
+                                                            roomSummary: RoomSummary
+    ) {
+        if (this?.navToRoom(roomId, eventId, rawLink, rootThreadEventId) != true) {
+            if (rootThreadEventId != null && userPreferencesProvider.areThreadMessagesEnabled()) {
+                val threadTimelineArgs = ThreadTimelineArgs(
+                        roomId = roomId,
+                        displayName = roomSummary.displayName,
+                        avatarUrl = roomSummary.avatarUrl,
+                        roomEncryptionTrustLevel = roomSummary.roomEncryptionTrustLevel,
+                        rootThreadEventId = rootThreadEventId)
+                navigator.openThread(context, threadTimelineArgs, eventId)
+            } else {
+                navigator.openRoom(context, roomId, eventId, buildTask)
+            }
         }
     }
 
@@ -198,7 +228,7 @@ interface NavigationInterceptor {
     /**
      * Return true if the navigation has been intercepted
      */
-    fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri? = null): Boolean {
+    fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri? = null, rootThreadEventId: String? = null): Boolean {
         return false
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
index d938b98eed..b4f61dbc1f 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
@@ -54,7 +54,6 @@ class CreatePollController @Inject constructor(
             title(host.stringProvider.getString(R.string.poll_type_title).toEpoxyCharSequence())
         }
 
-        /*
         pollTypeSelectionItem {
             id("poll_type_selection")
             pollType(currentState.pollType)
@@ -68,7 +67,6 @@ class CreatePollController @Inject constructor(
                 )
             }
         }
-         */
 
         genericItem {
             id("question_title")
@@ -121,6 +119,7 @@ class CreatePollController @Inject constructor(
                 textColor(host.colorProvider.getColor(R.color.palette_element_green))
                 gravity(Gravity.START)
                 bold(true)
+                highlight(false)
                 buttonClickAction {
                     host.callback?.onAddOption()
                 }
diff --git a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerAction.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerAction.kt
new file mode 100644
index 0000000000..910f0246d3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerAction.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.qrcode
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class QrCodeScannerAction : VectorViewModelAction {
+    data class CodeDecoded(
+            val result: String,
+            val isQrCode: Boolean
+    ) : QrCodeScannerAction()
+
+    object ScanFailed : QrCodeScannerAction()
+
+    object SwitchMode : QrCodeScannerAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
index d347bc0250..dda7b2e2eb 100644
--- a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
@@ -19,57 +19,55 @@ package im.vector.app.features.qrcode
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.Result
-import com.google.zxing.ResultMetadataType
+import com.airbnb.mvrx.viewModel
 import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 
 @AndroidEntryPoint
-class QrCodeScannerActivity : VectorBaseActivity<ActivitySimpleBinding>() {
+class QrCodeScannerActivity() : VectorBaseActivity<ActivitySimpleBinding>() {
 
     override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
 
     override fun getCoordinatorLayout() = views.coordinatorLayout
 
+    private val qrViewModel: QrCodeScannerViewModel by viewModel()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        qrViewModel.observeViewEvents {
+            when (it) {
+                is QrCodeScannerEvents.CodeParsed  -> {
+                    setResultAndFinish(it.result, it.isQrCode)
+                }
+                is QrCodeScannerEvents.ParseFailed -> {
+                    Toast.makeText(this, R.string.qr_code_not_scanned, Toast.LENGTH_SHORT).show()
+                    finish()
+                }
+                else                               -> Unit
+            }.exhaustive
+        }
+
         if (isFirstCreation()) {
-            replaceFragment(views.simpleFragmentContainer, QrCodeScannerFragment::class.java)
+            val args = QrScannerArgs(showExtraButtons = false, R.string.verification_scan_their_code)
+            replaceFragment(views.simpleFragmentContainer, QrCodeScannerFragment::class.java, args)
         }
     }
 
-    fun setResultAndFinish(result: Result?) {
-        if (result != null) {
-            val rawBytes = getRawBytes(result)
-            val rawBytesStr = rawBytes?.toString(Charsets.ISO_8859_1)
-
-            setResult(RESULT_OK, Intent().apply {
-                putExtra(EXTRA_OUT_TEXT, rawBytesStr ?: result.text)
-                putExtra(EXTRA_OUT_IS_QR_CODE, result.barcodeFormat == BarcodeFormat.QR_CODE)
-            })
-        }
+    private fun setResultAndFinish(result: String, isQrCode: Boolean) {
+        setResult(RESULT_OK, Intent().apply {
+            putExtra(EXTRA_OUT_TEXT, result)
+            putExtra(EXTRA_OUT_IS_QR_CODE, isQrCode)
+        })
         finish()
     }
 
-    // Copied from https://github.com/markusfisch/BinaryEye/blob/
-    // 9d57889b810dcaa1a91d7278fc45c262afba1284/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt#L434
-    private fun getRawBytes(result: Result): ByteArray? {
-        val metadata = result.resultMetadata ?: return null
-        val segments = metadata[ResultMetadataType.BYTE_SEGMENTS] ?: return null
-        var bytes = ByteArray(0)
-        @Suppress("UNCHECKED_CAST")
-        for (seg in segments as Iterable<ByteArray>) {
-            bytes += seg
-        }
-        // byte segments can never be shorter than the text.
-        // Zxing cuts off content prefixes like "WIFI:"
-        return if (bytes.size >= result.text.length) bytes else null
-    }
-
     companion object {
         private const val EXTRA_OUT_TEXT = "EXTRA_OUT_TEXT"
         private const val EXTRA_OUT_IS_QR_CODE = "EXTRA_OUT_IS_QR_CODE"
diff --git a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerEvents.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerEvents.kt
new file mode 100644
index 0000000000..69a500238e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerEvents.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.qrcode
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class QrCodeScannerEvents : VectorViewEvents {
+    data class CodeParsed(val result: String, val isQrCode: Boolean) : QrCodeScannerEvents()
+    object ParseFailed : QrCodeScannerEvents()
+    object SwitchMode : QrCodeScannerEvents()
+}
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 a7231a0c5b..9dc7fa6548 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 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.
@@ -16,50 +16,157 @@
 
 package im.vector.app.features.qrcode
 
+import android.app.Activity
 import android.os.Bundle
+import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import androidx.annotation.StringRes
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.args
+import com.google.zxing.BarcodeFormat
 import com.google.zxing.Result
+import com.google.zxing.ResultMetadataType
 import im.vector.app.R
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+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.FragmentQrCodeScannerBinding
+import im.vector.app.features.usercode.QRCodeBitmapDecodeHelper
+import im.vector.lib.multipicker.MultiPicker
+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
 
-class QrCodeScannerFragment @Inject constructor() :
-    VectorBaseFragment<FragmentQrCodeScannerBinding>(),
-        ZXingScannerView.ResultHandler {
+@Parcelize
+data class QrScannerArgs(
+        val showExtraButtons: Boolean,
+        @StringRes val titleRes: Int
+) : Parcelable
+
+class QrCodeScannerFragment @Inject constructor() : VectorBaseFragment<FragmentQrCodeScannerBinding>(), ZXingScannerView.ResultHandler {
+
+    private val qrViewModel: QrCodeScannerViewModel by activityViewModel()
+    private val scannerArgs: QrScannerArgs by args()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQrCodeScannerBinding {
         return FragmentQrCodeScannerBinding.inflate(inflater, container, false)
     }
 
+    private val openCameraActivityResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
+        if (allGranted) {
+            startCamera()
+        } else if (deniedPermanently) {
+            activity?.onPermissionDeniedDialog(R.string.denied_permission_camera)
+        }
+    }
+
+    private val pickImageActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            MultiPicker
+                    .get(MultiPicker.IMAGE)
+                    .getSelectedFiles(requireActivity(), activityResult.data)
+                    .firstOrNull()
+                    ?.contentUri
+                    ?.let { uri ->
+                        // try to see if it is a valid matrix code
+                        val bitmap = ImageUtils.getBitmap(requireContext(), uri)
+                                ?: return@let Unit.also {
+                                    Toast.makeText(requireContext(), getString(R.string.qr_code_not_scanned), Toast.LENGTH_SHORT).show()
+                                }
+                        handleResult(tryOrNull { QRCodeBitmapDecodeHelper.decodeQRFromBitmap(bitmap) })
+                    }
+        }
+    }
+
+    private var autoFocus = true
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        val title = scannerArgs.titleRes.let { getString(it) }
+
         setupToolbar(views.qrScannerToolbar)
-                .setTitle(R.string.verification_scan_their_code)
+                .setTitle(title)
                 .allowBack(useCross = true)
+
+        scannerArgs.showExtraButtons.let { showButtons ->
+            views.userCodeMyCodeButton.isVisible = showButtons
+            views.userCodeOpenGalleryButton.isVisible = showButtons
+
+            if (showButtons) {
+                views.userCodeOpenGalleryButton.debouncedClicks {
+                    MultiPicker.get(MultiPicker.IMAGE).single().startWith(pickImageActivityResultLauncher)
+                }
+                views.userCodeMyCodeButton.debouncedClicks {
+                    qrViewModel.handle(QrCodeScannerAction.SwitchMode)
+                }
+            }
+        }
+    }
+
+    private fun startCamera() {
+        with(views.qrScannerView) {
+            startCamera()
+            setAutoFocus(autoFocus)
+            debouncedClicks {
+                autoFocus = !autoFocus
+                setAutoFocus(autoFocus)
+            }
+        }
     }
 
     override fun onResume() {
         super.onResume()
+        view?.hideKeyboard()
+
         // Register ourselves as a handler for scan results.
-        views.scannerView.setResultHandler(this)
-        // Start camera on resume
-        views.scannerView.startCamera()
+        views.qrScannerView.setResultHandler(this)
+
+        if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, requireActivity(), openCameraActivityResultLauncher)) {
+            startCamera()
+        }
     }
 
     override fun onPause() {
         super.onPause()
-        // Stop camera on pause
-        views.scannerView.stopCamera()
+        views.qrScannerView.setResultHandler(null)
+        views.qrScannerView.stopCamera()
+    }
+
+    // Copied from https://github.com/markusfisch/BinaryEye/blob/
+    // 9d57889b810dcaa1a91d7278fc45c262afba1284/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt#L434
+    private fun getRawBytes(result: Result): ByteArray? {
+        val metadata = result.resultMetadata ?: return null
+        val segments = metadata[ResultMetadataType.BYTE_SEGMENTS] ?: return null
+        var bytes = ByteArray(0)
+        @Suppress("UNCHECKED_CAST")
+        for (seg in segments as Iterable<ByteArray>) {
+            bytes += seg
+        }
+        // byte segments can never be shorter than the text.
+        // Zxing cuts off content prefixes like "WIFI:"
+        return if (bytes.size >= result.text.length) bytes else null
     }
 
     override fun handleResult(rawResult: Result?) {
-        // Do something with the result here
-        // This is not intended to be used outside of QrCodeScannerActivity for the moment
-        (requireActivity() as? QrCodeScannerActivity)?.setResultAndFinish(rawResult)
+        if (rawResult == null) {
+            qrViewModel.handle(QrCodeScannerAction.ScanFailed)
+        } else {
+            val rawBytes = getRawBytes(rawResult)
+            val rawBytesStr = rawBytes?.toString(Charsets.ISO_8859_1)
+            val result = rawBytesStr ?: rawResult.text
+            val isQrCode = rawResult.barcodeFormat == BarcodeFormat.QR_CODE
+            qrViewModel.handle(QrCodeScannerAction.CodeDecoded(result, isQrCode))
+        }
     }
 }
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
new file mode 100644
index 0000000000..ef47ea1a6e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerViewModel.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.qrcode
+
+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 org.matrix.android.sdk.api.session.Session
+
+class QrCodeScannerViewModel @AssistedInject constructor(
+        @Assisted initialState: VectorDummyViewState,
+        val session: Session
+) : VectorViewModel<VectorDummyViewState, QrCodeScannerAction, QrCodeScannerEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<QrCodeScannerViewModel, VectorDummyViewState> {
+        override fun create(initialState: VectorDummyViewState): QrCodeScannerViewModel
+    }
+
+    companion object : MavericksViewModelFactory<QrCodeScannerViewModel, VectorDummyViewState> by hiltMavericksViewModelFactory()
+
+    override fun handle(action: QrCodeScannerAction) {
+        _viewEvents.post(
+                when (action) {
+                    is QrCodeScannerAction.CodeDecoded -> QrCodeScannerEvents.CodeParsed(action.result, action.isQrCode)
+                    is QrCodeScannerAction.SwitchMode  -> QrCodeScannerEvents.SwitchMode
+                    is QrCodeScannerAction.ScanFailed  -> QrCodeScannerEvents.ParseFailed
+                }
+        )
+    }
+}
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 0aec24f4ac..2d4bc704a4 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
@@ -151,7 +151,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
         views.bugReportProgressView.isVisible = true
         views.bugReportProgressView.progress = 0
 
-        bugReporter.sendBugReport(this,
+        bugReporter.sendBugReport(
                 reportType,
                 views.bugReportButtonIncludeLogs.isChecked,
                 views.bugReportButtonIncludeCrashLogs.isChecked,
@@ -249,7 +249,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
     override fun onBackPressed() {
         // Ensure there is no crash status remaining, which will be sent later on by mistake
-        bugReporter.deleteCrashFile(this)
+        bugReporter.deleteCrashFile()
 
         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 b62a182fd8..b6454b89e4 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
@@ -68,11 +68,13 @@ import javax.inject.Singleton
  */
 @Singleton
 class BugReporter @Inject constructor(
+        private val context: Context,
         private val activeSessionHolder: ActiveSessionHolder,
         private val versionProvider: VersionProvider,
         private val vectorPreferences: VectorPreferences,
         private val vectorFileLogger: VectorFileLogger,
-        private val systemLocaleProvider: SystemLocaleProvider
+        private val systemLocaleProvider: SystemLocaleProvider,
+        private val matrix: Matrix
 ) {
     var inMultiWindowMode = false
 
@@ -153,7 +155,6 @@ class BugReporter @Inject constructor(
     /**
      * Send a bug report.
      *
-     * @param context           the application context
      * @param reportType        The report type (bug, suggestion, feedback)
      * @param withDevicesLogs   true to include the device log
      * @param withCrashLogs     true to include the crash logs
@@ -163,8 +164,7 @@ class BugReporter @Inject constructor(
      * @param listener          the listener
      */
     @SuppressLint("StaticFieldLeak")
-    fun sendBugReport(context: Context,
-                      reportType: ReportType,
+    fun sendBugReport(reportType: ReportType,
                       withDevicesLogs: Boolean,
                       withCrashLogs: Boolean,
                       withKeyRequestHistory: Boolean,
@@ -182,7 +182,7 @@ class BugReporter @Inject constructor(
             var reportURL: String? = null
             withContext(Dispatchers.IO) {
                 var bugDescription = theBugDescription
-                val crashCallStack = getCrashDescription(context)
+                val crashCallStack = getCrashDescription()
 
                 if (null != crashCallStack) {
                     bugDescription += "\n\n\n\n--------------------------------- crash call stack ---------------------------------\n"
@@ -203,7 +203,7 @@ class BugReporter @Inject constructor(
                 }
 
                 if (!mIsCancelled && (withCrashLogs || withDevicesLogs)) {
-                    val gzippedLogcat = saveLogCat(context, false)
+                    val gzippedLogcat = saveLogCat(false)
 
                     if (null != gzippedLogcat) {
                         if (gzippedFiles.size == 0) {
@@ -213,7 +213,7 @@ class BugReporter @Inject constructor(
                         }
                     }
 
-                    val crashDescription = getCrashFile(context)
+                    val crashDescription = getCrashFile()
                     if (crashDescription.exists()) {
                         val compressedCrashDescription = compressFile(crashDescription)
 
@@ -265,8 +265,8 @@ class BugReporter @Inject constructor(
                     // build the multi part request
                     val builder = BugReporterMultipartBody.Builder()
                             .addFormDataPart("text", text)
-                            .addFormDataPart("app", rageShakeAppNameForReport(context, reportType))
-                            .addFormDataPart("user_agent", Matrix.getInstance(context).getUserAgent())
+                            .addFormDataPart("app", rageShakeAppNameForReport(reportType))
+                            .addFormDataPart("user_agent", matrix.getUserAgent())
                             .addFormDataPart("user_id", userId)
                             .addFormDataPart("can_contact", canContact.toString())
                             .addFormDataPart("device_id", deviceId)
@@ -352,9 +352,9 @@ class BugReporter @Inject constructor(
                         }
                     }
 
-                    if (getCrashFile(context).exists()) {
+                    if (getCrashFile().exists()) {
                         builder.addFormDataPart("label", "crash")
-                        deleteCrashFile(context)
+                        deleteCrashFile()
                     }
 
                     val requestBody = builder.build()
@@ -487,20 +487,16 @@ class BugReporter @Inject constructor(
         activity.startActivity(BugReportActivity.intent(activity, reportType))
     }
 
-    private fun rageShakeAppNameForReport(context: Context, reportType: ReportType): String {
+    private fun rageShakeAppNameForReport(reportType: ReportType): String {
         // As per https://github.com/matrix-org/rageshake
         // app: Identifier for the application (eg 'riot-web').
         // Should correspond to a mapping configured in the configuration file for github issue reporting to work.
         // (see R.string.bug_report_url for configured RS server)
-        return when (reportType) {
+        return context.getString(when (reportType) {
             ReportType.AUTO_UISI_SENDER,
-            ReportType.AUTO_UISI -> {
-                context.getString(R.string.bug_report_auto_uisi_app_name)
-            }
-            else                 -> {
-               context.getString(R.string.bug_report_app_name)
-            }
-        }
+            ReportType.AUTO_UISI -> R.string.bug_report_auto_uisi_app_name
+            else                 -> R.string.bug_report_app_name
+        })
     }
 // ==============================================================================================================
 // crash report management
@@ -509,20 +505,17 @@ class BugReporter @Inject constructor(
     /**
      * Provides the crash file
      *
-     * @param context the context
      * @return the crash file
      */
-    private fun getCrashFile(context: Context): File {
+    private fun getCrashFile(): File {
         return File(context.cacheDir.absolutePath, CRASH_FILENAME)
     }
 
     /**
      * Remove the crash file
-     *
-     * @param context
      */
-    fun deleteCrashFile(context: Context) {
-        val crashFile = getCrashFile(context)
+    fun deleteCrashFile() {
+        val crashFile = getCrashFile()
 
         if (crashFile.exists()) {
             crashFile.delete()
@@ -535,11 +528,10 @@ class BugReporter @Inject constructor(
     /**
      * Save the crash report
      *
-     * @param context          the context
      * @param crashDescription teh crash description
      */
-    fun saveCrashReport(context: Context, crashDescription: String) {
-        val crashFile = getCrashFile(context)
+    fun saveCrashReport(crashDescription: String) {
+        val crashFile = getCrashFile()
 
         if (crashFile.exists()) {
             crashFile.delete()
@@ -557,11 +549,10 @@ class BugReporter @Inject constructor(
     /**
      * Read the crash description file and return its content.
      *
-     * @param context teh context
      * @return the crash description
      */
-    private fun getCrashDescription(context: Context): String? {
-        val crashFile = getCrashFile(context)
+    private fun getCrashDescription(): String? {
+        val crashFile = getCrashFile()
 
         if (crashFile.exists()) {
             try {
@@ -650,11 +641,10 @@ class BugReporter @Inject constructor(
     /**
      * Save the logcat
      *
-     * @param context       the context
      * @param isErrorLogcat true to save the error logcat
      * @return the file if the operation succeeds
      */
-    private fun saveLogCat(context: Context, isErrorLogcat: Boolean): File? {
+    private fun saveLogCat(isErrorLogcat: Boolean): File? {
         val logCatErrFile = File(context.cacheDir.absolutePath, if (isErrorLogcat) LOG_CAT_ERROR_FILENAME else LOG_CAT_FILENAME)
 
         if (logCatErrFile.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 6954b9c87b..bd2f0b67bd 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
@@ -30,9 +30,12 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class VectorUncaughtExceptionHandler @Inject constructor(private val bugReporter: BugReporter,
-                                                         private val versionProvider: VersionProvider,
-                                                         private val versionCodeProvider: VersionCodeProvider) : Thread.UncaughtExceptionHandler {
+class VectorUncaughtExceptionHandler @Inject constructor(
+        context: Context,
+        private val bugReporter: BugReporter,
+        private val versionProvider: VersionProvider,
+        private val versionCodeProvider: VersionCodeProvider
+) : Thread.UncaughtExceptionHandler {
 
     // key to save the crash status
     companion object {
@@ -41,13 +44,12 @@ class VectorUncaughtExceptionHandler @Inject constructor(private val bugReporter
 
     private var previousHandler: Thread.UncaughtExceptionHandler? = null
 
-    private lateinit var context: Context
+    private val preferences = DefaultSharedPreferences.getInstance(context)
 
     /**
      * Activate this handler
      */
-    fun activate(context: Context) {
-        this.context = context
+    fun activate() {
         previousHandler = Thread.getDefaultUncaughtExceptionHandler()
         Thread.setDefaultUncaughtExceptionHandler(this)
     }
@@ -61,7 +63,7 @@ class VectorUncaughtExceptionHandler @Inject constructor(private val bugReporter
      */
     override fun uncaughtException(thread: Thread, throwable: Throwable) {
         Timber.v("Uncaught exception: $throwable")
-        DefaultSharedPreferences.getInstance(context).edit {
+        preferences.edit(commit = true) {
             putBoolean(PREFS_CRASH_KEY, true)
         }
         val b = StringBuilder()
@@ -103,7 +105,7 @@ class VectorUncaughtExceptionHandler @Inject constructor(private val bugReporter
         val bugDescription = b.toString()
         Timber.e("FATAL EXCEPTION $bugDescription")
 
-        bugReporter.saveCrashReport(context, bugDescription)
+        bugReporter.saveCrashReport(bugDescription)
 
         // Show the classical system popup
         previousHandler?.uncaughtException(thread, throwable)
@@ -114,16 +116,15 @@ class VectorUncaughtExceptionHandler @Inject constructor(private val bugReporter
      *
      * @return true if the application crashed
      */
-    fun didAppCrash(context: Context): Boolean {
-        return DefaultSharedPreferences.getInstance(context)
-                .getBoolean(PREFS_CRASH_KEY, false)
+    fun didAppCrash(): Boolean {
+        return preferences.getBoolean(PREFS_CRASH_KEY, false)
     }
 
     /**
      * Clear the crash status
      */
-    fun clearAppCrashStatus(context: Context) {
-        DefaultSharedPreferences.getInstance(context).edit {
+    fun clearAppCrashStatus() {
+        preferences.edit {
             remove(PREFS_CRASH_KEY)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
index dc8090bc7c..0ae2a16b71 100644
--- a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
@@ -35,7 +35,10 @@ data class ElementWellKnown(
         val elementE2E: E2EWellKnownConfig? = null,
 
         @Json(name = "im.vector.riot.e2ee")
-        val riotE2E: E2EWellKnownConfig? = null
+        val riotE2E: E2EWellKnownConfig? = null,
+
+        @Json(name = "org.matrix.msc3488.tile_server")
+        val mapTileServerConfig: MapTileServerConfig? = null
 )
 
 @JsonClass(generateAdapter = true)
@@ -53,3 +56,9 @@ data class WellKnownPreferredConfig(
         @Json(name = "preferredDomain")
         val preferredDomain: String? = null
 )
+
+@JsonClass(generateAdapter = true)
+data class MapTileServerConfig(
+        @Json(name = "map_style_url")
+        val mapStyleUrl: String? = null
+)
diff --git a/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
index 67095b974a..7340953f32 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.reactions.widget
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
-import android.view.Gravity
 import android.view.View
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
@@ -26,7 +25,6 @@ import androidx.core.content.withStyledAttributes
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.EmojiSpanify
 import im.vector.app.R
-import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.core.utils.TextUtils
 import im.vector.app.databinding.ReactionButtonBinding
 import javax.inject.Inject
@@ -38,8 +36,9 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class ReactionButton @JvmOverloads constructor(context: Context,
                                                attrs: AttributeSet? = null,
-                                               defStyleAttr: Int = 0) :
-        LinearLayout(context, attrs, defStyleAttr), View.OnClickListener, View.OnLongClickListener {
+                                               defStyleAttr: Int = 0,
+                                               defStyleRes: Int = R.style.TimelineReactionView) :
+        LinearLayout(context, attrs, defStyleAttr, defStyleRes), View.OnClickListener, View.OnLongClickListener {
 
     @Inject lateinit var emojiSpanify: EmojiSpanify
 
@@ -68,8 +67,7 @@ class ReactionButton @JvmOverloads constructor(context: Context,
     init {
         inflate(context, R.layout.reaction_button, this)
         orientation = HORIZONTAL
-        minimumHeight = DimensionConverter(context.resources).dpToPx(30)
-        gravity = Gravity.CENTER
+        layoutDirection = View.LAYOUT_DIRECTION_LOCALE
         views = ReactionButtonBinding.bind(this)
         views.reactionCount.text = TextUtils.formatCountToShortDecimal(reactionCount)
         context.withStyledAttributes(attrs, R.styleable.ReactionButton, defStyleAttr) {
diff --git a/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt
index 7a5363100f..7e4af1b7d5 100644
--- a/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt
@@ -17,7 +17,7 @@
 package im.vector.app.features.room
 
 import com.airbnb.mvrx.MavericksState
-import im.vector.app.features.home.room.detail.RoomDetailArgs
+import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.roommemberprofile.RoomMemberProfileArgs
 import im.vector.app.features.roomprofile.RoomProfileArgs
 
@@ -25,7 +25,7 @@ data class RequireActiveMembershipViewState(
         val roomId: String? = null
 ) : MavericksState {
 
-    constructor(args: RoomDetailArgs) : this(roomId = args.roomId)
+    constructor(args: TimelineArgs) : this(roomId = args.roomId)
 
     constructor(args: RoomProfileArgs) : this(roomId = args.roomId)
 
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 33e63434ce..0be2a21ef4 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
@@ -19,8 +19,9 @@ package im.vector.app.features.room
 import android.content.Context
 import im.vector.app.R
 import org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider
+import javax.inject.Inject
 
-class VectorRoomDisplayNameFallbackProvider(
+class VectorRoomDisplayNameFallbackProvider @Inject constructor(
         private val context: Context
 ) : RoomDisplayNameFallbackProvider {
 
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 b6b8aa9653..14b50c2745 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
@@ -127,7 +127,7 @@ class PublicRoomsFragment @Inject constructor(
             val permalink = session.permalinkService().createPermalink(roomIdOrAlias)
             val isHandled = permalinkHandler
                     .launch(requireContext(), permalink, object : NavigationInterceptor {
-                        override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?): Boolean {
+                        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/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt
index 3cd9955e74..48da9f4fa0 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt
@@ -28,7 +28,7 @@ import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.extensions.popBackstack
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.roomdirectory.createroom.CreateRoomArgs
@@ -51,7 +51,7 @@ class RoomDirectoryActivity : VectorBaseActivity<ActivitySimpleBinding>(), Matri
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.RoomDirectory
+        analyticsScreenName = MobileScreen.ScreenName.RoomDirectory
         sharedActionViewModel = viewModelProvider.get(RoomDirectorySharedActionViewModel::class.java)
 
         if (isFirstCreation()) {
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 339c819a65..e4c350b88e 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
@@ -26,7 +26,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.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
 import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
 import kotlinx.coroutines.flow.launchIn
@@ -57,7 +57,7 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.CreateRoom
+        analyticsScreenName = MobileScreen.ScreenName.CreateRoom
         sharedActionViewModel = viewModelProvider.get(RoomDirectorySharedActionViewModel::class.java)
         sharedActionViewModel
                 .stream()
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 48610dda7b..cb71f93a0e 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
@@ -29,7 +29,7 @@ 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.databinding.FragmentRoomDirectoryPickerBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.roomdirectory.RoomDirectoryAction
 import im.vector.app.features.roomdirectory.RoomDirectoryData
 import im.vector.app.features.roomdirectory.RoomDirectoryServer
@@ -54,7 +54,7 @@ class RoomDirectoryPickerFragment @Inject constructor(private val roomDirectoryP
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.MobileSwitchDirectory
+        analyticsScreenName = MobileScreen.ScreenName.SwitchDirectory
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
index b1fa0e974a..42bec8c8b3 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
@@ -251,6 +251,7 @@ class RoomPreviewViewModel @AssistedInject constructor(
                 analyticsTracker.capture(JoinedRoom(
                         // Always false in this case (?)
                         isDM = false,
+                        isSpace = false,
                         roomSize = state.numJoinMembers.toAnalyticsRoomSize()
                 ))
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
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 c68bfca973..fcebe9adbb 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
@@ -47,7 +47,7 @@ import im.vector.app.databinding.DialogBaseEditTextBinding
 import im.vector.app.databinding.DialogShareQrCodeBinding
 import im.vector.app.databinding.FragmentMatrixProfileBinding
 import im.vector.app.databinding.ViewStubRoomMemberProfileHeaderBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.AvatarRenderer
@@ -91,7 +91,7 @@ class RoomMemberProfileFragment @Inject constructor(
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.User
+        analyticsScreenName = MobileScreen.ScreenName.User
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
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 8acf53088d..251b99e318 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
@@ -44,7 +44,7 @@ import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.FragmentMatrixProfileBinding
 import im.vector.app.databinding.ViewStubRoomProfileHeaderBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailPendingAction
 import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
@@ -89,7 +89,7 @@ class RoomProfileFragment @Inject constructor(
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.RoomSettings
+        analyticsScreenName = MobileScreen.ScreenName.RoomSettings
         setFragmentResultListener(MigrateRoomBottomSheet.REQUEST_KEY) { _, bundle ->
             bundle.getString(MigrateRoomBottomSheet.BUNDLE_KEY_REPLACEMENT_ROOM)?.let { replacementRoomId ->
                 roomDetailPendingActionStore.data = RoomDetailPendingAction.OpenRoom(replacementRoomId, closeCurrentRoom = true)
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 363cb1ea31..b7c7d24888 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
@@ -186,7 +186,7 @@ class RoomProfileViewModel @AssistedInject constructor(
         _viewEvents.post(RoomProfileViewEvents.Loading(stringProvider.getString(R.string.room_profile_leaving_room)))
         viewModelScope.launch {
             try {
-                room.leave(null)
+                session.leaveRoom(room.roomId)
                 // Do nothing, we will be closing the room automatically when it will get back from sync
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomProfileViewEvents.Failure(failure))
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 3c1a763072..a0adf42d5b 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
@@ -34,7 +34,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.saveMedia
 import im.vector.app.core.utils.shareMedia
 import im.vector.app.databinding.FragmentRoomUploadsBinding
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.roomprofile.RoomProfileArgs
@@ -57,7 +57,7 @@ class RoomUploadsFragment @Inject constructor(
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.RoomUploads
+        analyticsScreenName = MobileScreen.ScreenName.RoomUploads
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/vector/src/main/java/im/vector/app/features/session/VectorSessionStore.kt b/vector/src/main/java/im/vector/app/features/session/VectorSessionStore.kt
new file mode 100644
index 0000000000..a2f3196979
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/session/VectorSessionStore.kt
@@ -0,0 +1,58 @@
+/*
+ * 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.session
+
+import android.content.Context
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import im.vector.app.core.extensions.dataStoreProvider
+import im.vector.app.features.onboarding.FtueUseCase
+import kotlinx.coroutines.flow.first
+import org.matrix.android.sdk.internal.util.md5
+
+/**
+ * User session scoped storage for:
+ * - messaging use case (Enum/String)
+ */
+class VectorSessionStore constructor(
+        context: Context,
+        myUserId: String
+) {
+
+    private val useCaseKey = stringPreferencesKey("use_case")
+    private val dataStore by lazy { context.dataStoreProvider("vector_session_store_${myUserId.md5()}") }
+
+    suspend fun readUseCase() = dataStore.data.first().let { preferences ->
+        preferences[useCaseKey]?.let { FtueUseCase.from(it) }
+    }
+
+    suspend fun setUseCase(useCase: FtueUseCase) {
+        dataStore.edit { settings ->
+            settings[useCaseKey] = useCase.persistableValue
+        }
+    }
+
+    suspend fun resetUseCase() {
+        dataStore.edit { settings ->
+            settings.remove(useCaseKey)
+        }
+    }
+
+    suspend fun clear() {
+        dataStore.edit { settings -> settings.clear() }
+    }
+}
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 eb620f8e5c..6a4b5484eb 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
@@ -83,6 +83,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         // interface
         const val SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY = "SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY"
         const val SETTINGS_INTERFACE_TEXT_SIZE_KEY = "SETTINGS_INTERFACE_TEXT_SIZE_KEY"
+        const val SETTINGS_INTERFACE_BUBBLE_KEY = "SETTINGS_INTERFACE_BUBBLE_KEY"
         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"
@@ -185,7 +186,6 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         private const val SETTINGS_DISPLAY_ALL_EVENTS_KEY = "SETTINGS_DISPLAY_ALL_EVENTS_KEY"
 
         private const val DID_ASK_TO_ENABLE_SESSION_PUSH = "DID_ASK_TO_ENABLE_SESSION_PUSH"
-        private const val DID_PROMOTE_NEW_RESTRICTED_JOIN_RULE = "DID_PROMOTE_NEW_RESTRICTED_JOIN_RULE"
 
         // Location Sharing
         const val SETTINGS_PREF_ENABLE_LOCATION_SHARING = "SETTINGS_PREF_ENABLE_LOCATION_SHARING"
@@ -200,6 +200,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         private const val TAKE_PHOTO_VIDEO_MODE = "TAKE_PHOTO_VIDEO_MODE"
 
         private const val SETTINGS_LABS_RENDER_LOCATIONS_IN_TIMELINE = "SETTINGS_LABS_RENDER_LOCATIONS_IN_TIMELINE"
+        const val SETTINGS_LABS_ENABLE_THREAD_MESSAGES = "SETTINGS_LABS_ENABLE_THREAD_MESSAGES"
 
         // Possible values for TAKE_PHOTO_VIDEO_MODE
         const val TAKE_PHOTO_VIDEO_MODE_ALWAYS_ASK = 0
@@ -355,16 +356,6 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         }
     }
 
-    fun didPromoteNewRestrictedFeature(): Boolean {
-        return defaultPrefs.getBoolean(DID_PROMOTE_NEW_RESTRICTED_JOIN_RULE, false)
-    }
-
-    fun setDidPromoteNewRestrictedFeature() {
-        defaultPrefs.edit {
-            putBoolean(DID_PROMOTE_NEW_RESTRICTED_JOIN_RULE, true)
-        }
-    }
-
     /**
      * Tells if we have already asked the user to disable battery optimisations on android >= M devices.
      *
@@ -859,6 +850,15 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_SHOW_EMOJI_KEYBOARD, true)
     }
 
+    /**
+     * Tells if the timeline messages should be shown in a bubble or not.
+     *
+     * @return true to show timeline message in bubble.
+     */
+    fun useMessageBubblesLayout(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_INTERFACE_BUBBLE_KEY, false)
+    }
+
     /**
      * Tells if the rage shake is used.
      *
@@ -1002,4 +1002,8 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     fun labsRenderLocationsInTimeline(): Boolean {
         return defaultPrefs.getBoolean(SETTINGS_LABS_RENDER_LOCATIONS_IN_TIMELINE, true)
     }
+
+    fun areThreadMessagesEnabled(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_THREAD_MESSAGES, false)
+    }
 }
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 7cefd20269..dae234eecc 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
@@ -30,8 +30,7 @@ import im.vector.app.core.extensions.singletonEntryPoint
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.toast
 import im.vector.app.features.analytics.AnalyticsTracker
-import im.vector.app.features.analytics.plan.Screen
-import im.vector.app.features.analytics.screen.ScreenEvent
+import im.vector.app.features.analytics.plan.MobileScreen
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.session.Session
@@ -43,8 +42,7 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), Maverick
      * Analytics
      * ========================================================================================== */
 
-    protected var analyticsScreenName: Screen.ScreenName? = null
-    private var screenEvent: ScreenEvent? = null
+    protected var analyticsScreenName: MobileScreen.ScreenName? = null
 
     protected lateinit var analyticsTracker: AnalyticsTracker
 
@@ -91,17 +89,14 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), Maverick
     override fun onResume() {
         super.onResume()
         Timber.i("onResume Fragment ${javaClass.simpleName}")
-        screenEvent = analyticsScreenName?.let { ScreenEvent(it) }
+        analyticsScreenName?.let {
+            analyticsTracker.screen(MobileScreen(screenName = it))
+        }
         vectorActivity.supportActionBar?.setTitle(titleRes)
         // find the view from parent activity
         mLoadingView = vectorActivity.findViewById(R.id.vector_settings_spinner_views)
     }
 
-    override fun onPause() {
-        super.onPause()
-        screenEvent?.send(analyticsTracker)
-    }
-
     abstract fun bindPref()
 
     abstract var titleRes: Int
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
index a83b4c33f4..118e820f84 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
@@ -16,12 +16,18 @@
 
 package im.vector.app.features.settings
 
+import androidx.preference.Preference
 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 org.matrix.android.sdk.internal.database.lightweight.LightweightSettingsStorage
 import javax.inject.Inject
 
 class VectorSettingsLabsFragment @Inject constructor(
-        private val vectorPreferences: VectorPreferences
+        private val vectorPreferences: VectorPreferences,
+        private val lightweightSettingsStorage: LightweightSettingsStorage
+
 ) : VectorSettingsBaseFragment() {
 
     override var titleRes = R.string.room_settings_labs_pref_title
@@ -32,5 +38,15 @@ class VectorSettingsLabsFragment @Inject constructor(
             // ensure correct default
             pref.isChecked = vectorPreferences.labsAutoReportUISI()
         }
+
+        // clear cache
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_ENABLE_THREAD_MESSAGES)?.let {
+            it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                lightweightSettingsStorage.setThreadMessagesEnabled(vectorPreferences.areThreadMessagesEnabled())
+                displayLoadingView()
+                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = true))
+                false
+            }
+        }
     }
 }
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 fb5d83239b..51011e29a2 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
@@ -19,7 +19,7 @@ package im.vector.app.features.settings
 import android.os.Bundle
 import im.vector.app.R
 import im.vector.app.core.preference.VectorPreference
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import javax.inject.Inject
 
 class VectorSettingsRootFragment @Inject constructor() : VectorSettingsBaseFragment() {
@@ -29,7 +29,7 @@ class VectorSettingsRootFragment @Inject constructor() : VectorSettingsBaseFragm
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.Settings
+        analyticsScreenName = MobileScreen.ScreenName.Settings
     }
 
     override fun bindPref() {
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 31fce00f3c..ef87d908ea 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
@@ -51,7 +51,7 @@ 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.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewActions
 import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewModel
 import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewState
@@ -94,7 +94,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.SettingsSecurity
+        analyticsScreenName = MobileScreen.ScreenName.SettingsSecurity
     }
 
     // cryptography
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 867526c009..631c375e62 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
@@ -31,7 +31,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentDeactivateAccountBinding
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.auth.ReAuthActivity
 import im.vector.app.features.settings.VectorSettingsActivity
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
@@ -66,7 +66,7 @@ class DeactivateAccountFragment @Inject constructor() : VectorBaseFragment<Fragm
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.DeactivateAccount
+        analyticsScreenName = MobileScreen.ScreenName.DeactivateAccount
     }
 
     override fun onResume() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsDefaultNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsDefaultNotificationPreferenceFragment.kt
index b6f2098209..2179e0eee2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsDefaultNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsDefaultNotificationPreferenceFragment.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.settings.notifications
 import android.os.Bundle
 import im.vector.app.R
 import im.vector.app.core.preference.VectorPreferenceCategory
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import org.matrix.android.sdk.api.pushrules.RuleIds
 
 class VectorSettingsDefaultNotificationPreferenceFragment :
@@ -38,7 +38,7 @@ class VectorSettingsDefaultNotificationPreferenceFragment :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.SettingsDefaultNotifications
+        analyticsScreenName = MobileScreen.ScreenName.SettingsDefaultNotifications
     }
 
     override fun bindPref() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
index b7cf7f6bbe..731f4b3228 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
@@ -25,7 +25,7 @@ import im.vector.app.core.preference.KeywordPreference
 import im.vector.app.core.preference.VectorCheckboxPreference
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.preference.VectorPreferenceCategory
-import im.vector.app.features.analytics.plan.Screen
+import im.vector.app.features.analytics.plan.MobileScreen
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -45,7 +45,7 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        analyticsScreenName = Screen.ScreenName.SettingsMentionsAndKeywords
+        analyticsScreenName = MobileScreen.ScreenName.SettingsMentionsAndKeywords
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
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 52986a1f3b..00422d8872 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
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.signout.soft
 
-import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MavericksViewModelFactory
@@ -26,8 +25,10 @@ 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.ActiveSessionHolder
 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.extensions.hasUnsavedKeys
 import im.vector.app.core.platform.VectorViewModel
@@ -55,16 +56,30 @@ class SoftLogoutViewModel @AssistedInject constructor(
 
     companion object : MavericksViewModelFactory<SoftLogoutViewModel, SoftLogoutViewState> by hiltMavericksViewModelFactory() {
 
-        override fun initialState(viewModelContext: ViewModelContext): SoftLogoutViewState? {
-            val activity: SoftLogoutActivity = (viewModelContext as ActivityViewModelContext).activity()
-            val userId = activity.session.myUserId
-            return SoftLogoutViewState(
-                    homeServerUrl = activity.session.sessionParams.homeServerUrl,
-                    userId = userId,
-                    deviceId = activity.session.sessionParams.deviceId ?: "",
-                    userDisplayName = activity.session.getUser(userId)?.displayName ?: userId,
-                    hasUnsavedKeys = activity.session.hasUnsavedKeys()
-            )
+        override fun initialState(viewModelContext: ViewModelContext): SoftLogoutViewState {
+            val sessionHolder = EntryPoints.get(viewModelContext.app(), SingletonEntryPoint::class.java)
+                    .activeSessionHolder()
+
+            return if (sessionHolder.hasActiveSession()) {
+                val session = sessionHolder.getActiveSession()
+                val userId = session.myUserId
+
+                SoftLogoutViewState(
+                        homeServerUrl = session.sessionParams.homeServerUrl,
+                        userId = userId,
+                        deviceId = session.sessionParams.deviceId.orEmpty(),
+                        userDisplayName = session.getUser(userId)?.displayName ?: userId,
+                        hasUnsavedKeys = session.hasUnsavedKeys()
+                )
+            } else {
+                SoftLogoutViewState(
+                        homeServerUrl = "",
+                        userId = "",
+                        deviceId = "",
+                        userDisplayName = "",
+                        hasUnsavedKeys = false
+                )
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/RestrictedPromoBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/RestrictedPromoBottomSheet.kt
deleted file mode 100644
index dbea6807ce..0000000000
--- a/vector/src/main/java/im/vector/app/features/spaces/RestrictedPromoBottomSheet.kt
+++ /dev/null
@@ -1,72 +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.spaces
-
-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.R
-import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.app.databinding.BottomSheetSpaceAdvertiseRestrictedBinding
-
-class RestrictedPromoBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpaceAdvertiseRestrictedBinding>() {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
-            BottomSheetSpaceAdvertiseRestrictedBinding.inflate(inflater, container, false)
-
-    override val showExpanded = true
-
-    var learnMoreMode: Boolean = false
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        render()
-        views.skipButton.debouncedClicks {
-            dismiss()
-        }
-
-        views.learnMore.debouncedClicks {
-            if (learnMoreMode) {
-                dismiss()
-            } else {
-                learnMoreMode = true
-                render()
-            }
-        }
-    }
-
-    private fun render() {
-        if (learnMoreMode) {
-            views.title.text = getString(R.string.new_let_people_in_spaces_find_and_join)
-            views.topDescription.text = getString(R.string.to_help_space_members_find_and_join)
-            views.imageHint.isVisible = true
-            views.bottomDescription.isVisible = true
-            views.bottomDescription.text = getString(R.string.this_makes_it_easy_for_rooms_to_stay_private_to_a_space)
-            views.skipButton.isVisible = false
-            views.learnMore.text = getString(R.string.ok)
-        } else {
-            views.title.text = getString(R.string.help_space_members)
-            views.topDescription.text = getString(R.string.help_people_in_spaces_find_and_join)
-            views.imageHint.isVisible = false
-            views.bottomDescription.isVisible = false
-            views.skipButton.isVisible = true
-            views.learnMore.text = getString(R.string.learn_more)
-        }
-    }
-}
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 02771abc95..20af5b5827 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
@@ -256,7 +256,7 @@ class SpaceListViewModel @AssistedInject constructor(@Assisted initialState: Spa
     private fun handleLeaveSpace(action: SpaceListAction.LeaveSpace) {
         viewModelScope.launch {
             tryOrNull("Failed to leave space ${action.spaceSummary.roomId}") {
-                session.spaceService().getSpace(action.spaceSummary.roomId)?.leave(null)
+                session.spaceService().leaveSpace(action.spaceSummary.roomId)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
index 2e9af2eacb..9b95b5328f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
@@ -131,7 +131,7 @@ class SpaceMenuViewModel @AssistedInject constructor(
         session.coroutineScope.launch {
             try {
                 if (state.leaveMode == SpaceMenuState.LeaveMode.LEAVE_NONE) {
-                    session.getRoom(initialState.spaceId)?.leave(null)
+                    session.spaceService().leaveSpace(initialState.spaceId)
                 } else if (state.leaveMode == SpaceMenuState.LeaveMode.LEAVE_ALL) {
                     // need to find all child rooms that i have joined
 
@@ -143,13 +143,13 @@ class SpaceMenuViewModel @AssistedInject constructor(
                             }
                     ).forEach {
                         try {
-                            session.getRoom(it.roomId)?.leave(null)
+                            session.spaceService().leaveSpace(it.roomId)
                         } catch (failure: Throwable) {
                             // silently ignore?
                             Timber.e(failure, "Fail to leave sub rooms/spaces")
                         }
                     }
-                    session.getRoom(initialState.spaceId)?.leave(null)
+                    session.spaceService().leaveSpace(initialState.spaceId)
                 }
 
                 // We observe the membership and to dismiss when we have remote echo of leaving
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 bbf6ac79ca..955fedd7dc 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
@@ -170,7 +170,7 @@ class SpaceDirectoryFragment @Inject constructor(
                     ?: getString(R.string.space_explore_activity_title)
         }
 
-        spaceCardRenderer.render(state.currentRootSummary, emptyList(), this, views.spaceCard)
+        spaceCardRenderer.render(state.currentRootSummary, emptyList(), this, views.spaceCard, showDescription = false)
         views.addOrCreateChatRoomButton.isVisible = state.canAddRooms
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
index 815175c977..91cb6194b1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
@@ -118,7 +118,7 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
             views.inviterMxid.isVisible = false
         }
 
-        spaceCardRenderer.render(summary, state.peopleYouKnow.invoke().orEmpty(), null, views.spaceCard)
+        spaceCardRenderer.render(summary, state.peopleYouKnow.invoke().orEmpty(), null, views.spaceCard, showDescription = true)
 
         views.spaceCard.matrixToCardMainButton.button.text = getString(R.string.action_accept)
         views.spaceCard.matrixToCardSecondaryButton.button.text = getString(R.string.action_decline)
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 79ad043813..9c6b092135 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
@@ -104,7 +104,7 @@ class SpaceInviteBottomSheetViewModel @AssistedInject constructor(
                 setState { copy(joinActionState = Loading()) }
                 session.coroutineScope.launch(Dispatchers.IO) {
                     try {
-                        session.getRoom(initialState.spaceId)?.join()
+                        session.spaceService().joinSpace(initialState.spaceId)
                         setState { copy(joinActionState = Success(Unit)) }
                     } catch (failure: Throwable) {
                         setState { copy(joinActionState = Fail(failure)) }
@@ -116,7 +116,7 @@ class SpaceInviteBottomSheetViewModel @AssistedInject constructor(
                 setState { copy(rejectActionState = Loading()) }
                 session.coroutineScope.launch(Dispatchers.IO) {
                     try {
-                        session.getRoom(initialState.spaceId)?.leave()
+                        session.spaceService().leaveSpace(initialState.spaceId)
                         setState { copy(rejectActionState = Success(Unit)) }
                     } catch (failure: Throwable) {
                         setState { copy(rejectActionState = Fail(failure)) }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
index e9b75836e9..fc241e711c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
@@ -72,14 +72,14 @@ class SpaceLeaveAdvancedViewModel @AssistedInject constructor(
                     try {
                         state.selectedRooms.forEach {
                             try {
-                                session.getRoom(it)?.leave(null)
+                                session.leaveRoom(it)
                             } catch (failure: Throwable) {
                                 // silently ignore?
                                 Timber.e(failure, "Fail to leave sub rooms/spaces")
                             }
                         }
 
-                        session.getRoom(initialState.spaceId)?.leave(null)
+                        session.spaceService().leaveSpace(initialState.spaceId)
                         // We observe the membership and to dismiss when we have remote echo of leaving
                     } catch (failure: Throwable) {
                         setState { copy(leaveState = Fail(failure)) }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
index 6a98aa3cf8..69dab07b1e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
@@ -85,6 +85,7 @@ class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpa
                 is ShareSpaceViewEvents.NavigateToInviteUser -> {
                     val intent = InviteUsersToRoomActivity.getIntent(requireContext(), event.spaceId)
                     startActivity(intent)
+                    dismissAllowingStateLoss()
                 }
                 is ShareSpaceViewEvents.ShowInviteByLink     -> {
                     startSharePlainTextIntent(
@@ -94,6 +95,7 @@ class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpa
                             text = getString(R.string.share_space_link_message, event.spaceName, event.permalink),
                             extraTitle = getString(R.string.share_space_link_message, event.spaceName, event.permalink)
                     )
+                    dismissAllowingStateLoss()
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/usercode/ScanUserCodeFragment.kt b/vector/src/main/java/im/vector/app/features/usercode/ScanUserCodeFragment.kt
deleted file mode 100644
index a7d632bd7b..0000000000
--- a/vector/src/main/java/im/vector/app/features/usercode/ScanUserCodeFragment.kt
+++ /dev/null
@@ -1,156 +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.usercode
-
-import android.Manifest
-import android.app.Activity
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import com.airbnb.mvrx.activityViewModel
-import com.google.zxing.Result
-import com.google.zxing.ResultMetadataType
-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.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.app.core.utils.checkPermissions
-import im.vector.app.core.utils.registerForPermissionsResult
-import im.vector.app.databinding.FragmentQrCodeScannerWithButtonBinding
-import im.vector.lib.multipicker.MultiPicker
-import im.vector.lib.multipicker.utils.ImageUtils
-import me.dm7.barcodescanner.zxing.ZXingScannerView
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import javax.inject.Inject
-
-class ScanUserCodeFragment @Inject constructor() :
-    VectorBaseFragment<FragmentQrCodeScannerWithButtonBinding>(),
-        ZXingScannerView.ResultHandler {
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQrCodeScannerWithButtonBinding {
-        return FragmentQrCodeScannerWithButtonBinding.inflate(inflater, container, false)
-    }
-
-    val sharedViewModel: UserCodeSharedViewModel by activityViewModel()
-
-    var autoFocus = true
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupToolbar(views.qrScannerToolbar)
-                .allowBack(useCross = true)
-
-        views.userCodeMyCodeButton.debouncedClicks {
-            sharedViewModel.handle(UserCodeActions.SwitchMode(UserCodeState.Mode.SHOW))
-        }
-
-        views.userCodeOpenGalleryButton.debouncedClicks {
-            MultiPicker.get(MultiPicker.IMAGE).single().startWith(pickImageActivityResultLauncher)
-        }
-    }
-
-    private val openCameraActivityResultLauncher = registerForPermissionsResult { allGranted, _ ->
-        if (allGranted) {
-            startCamera()
-        } else {
-            // For now just go back
-            sharedViewModel.handle(UserCodeActions.SwitchMode(UserCodeState.Mode.SHOW))
-        }
-    }
-
-    private val pickImageActivityResultLauncher = registerStartForActivityResult { activityResult ->
-        if (activityResult.resultCode == Activity.RESULT_OK) {
-            MultiPicker
-                    .get(MultiPicker.IMAGE)
-                    .getSelectedFiles(requireActivity(), activityResult.data)
-                    .firstOrNull()
-                    ?.contentUri
-                    ?.let { uri ->
-                        // try to see if it is a valid matrix code
-                        val bitmap = ImageUtils.getBitmap(requireContext(), uri)
-                                ?: return@let Unit.also {
-                                    Toast.makeText(requireContext(), getString(R.string.qr_code_not_scanned), Toast.LENGTH_SHORT).show()
-                                }
-                        handleResult(tryOrNull { QRCodeBitmapDecodeHelper.decodeQRFromBitmap(bitmap) })
-                    }
-        }
-    }
-
-    private fun startCamera() {
-        views.userCodeScannerView.startCamera()
-        views.userCodeScannerView.setAutoFocus(autoFocus)
-        views.userCodeScannerView.debouncedClicks {
-            this.autoFocus = !autoFocus
-            views.userCodeScannerView.setAutoFocus(autoFocus)
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, requireActivity(), openCameraActivityResultLauncher)) {
-            startCamera()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        // Register ourselves as a handler for scan results.
-        views.userCodeScannerView.setResultHandler(this)
-        if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-            startCamera()
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        views.userCodeScannerView.setResultHandler(null)
-        // Stop camera on pause
-        views.userCodeScannerView.stopCamera()
-    }
-
-    override fun handleResult(result: Result?) {
-        if (result === null) {
-            Toast.makeText(requireContext(), R.string.qr_code_not_scanned, Toast.LENGTH_SHORT).show()
-            requireActivity().finish()
-        } else {
-            val rawBytes = getRawBytes(result)
-            val rawBytesStr = rawBytes?.toString(Charsets.ISO_8859_1)
-            val value = rawBytesStr ?: result.text
-            sharedViewModel.handle(UserCodeActions.DecodedQRCode(value))
-        }
-    }
-
-    // Copied from https://github.com/markusfisch/BinaryEye/blob/
-    // 9d57889b810dcaa1a91d7278fc45c262afba1284/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt#L434
-    private fun getRawBytes(result: Result): ByteArray? {
-        val metadata = result.resultMetadata ?: return null
-        val segments = metadata[ResultMetadataType.BYTE_SEGMENTS] ?: return null
-        var bytes = ByteArray(0)
-        @Suppress("UNCHECKED_CAST")
-        for (seg in segments as Iterable<ByteArray>) {
-            bytes += seg
-        }
-        // byte segments can never be shorter than the text.
-        // Zxing cuts off content prefixes like "WIFI:"
-        return if (bytes.size >= result.text.length) bytes else null
-    }
-}
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 7011f8c280..356893aee2 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
@@ -30,12 +30,16 @@ 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.extensions.commitTransaction
 import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.onPermissionDeniedSnackbar
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.matrixto.MatrixToBottomSheet
+import im.vector.app.features.qrcode.QrCodeScannerEvents
+import im.vector.app.features.qrcode.QrCodeScannerFragment
+import im.vector.app.features.qrcode.QrCodeScannerViewModel
+import im.vector.app.features.qrcode.QrScannerArgs
 import kotlinx.parcelize.Parcelize
 import kotlin.reflect.KClass
 
@@ -44,6 +48,7 @@ class UserCodeActivity : VectorBaseActivity<ActivitySimpleBinding>(),
         MatrixToBottomSheet.InteractionListener {
 
     val sharedViewModel: UserCodeSharedViewModel by viewModel()
+    private val qrViewModel: QrCodeScannerViewModel by viewModel()
 
     @Parcelize
     data class Args(
@@ -81,10 +86,13 @@ class UserCodeActivity : VectorBaseActivity<ActivitySimpleBinding>(),
 
         sharedViewModel.onEach(UserCodeState::mode) { mode ->
             when (mode) {
-                UserCodeState.Mode.SHOW      -> showFragment(ShowUserCodeFragment::class, Bundle.EMPTY)
-                UserCodeState.Mode.SCAN      -> showFragment(ScanUserCodeFragment::class, Bundle.EMPTY)
+                UserCodeState.Mode.SHOW      -> showFragment(ShowUserCodeFragment::class)
+                UserCodeState.Mode.SCAN      -> {
+                    val args = QrScannerArgs(showExtraButtons = true, R.string.user_code_scan)
+                    showFragment(QrCodeScannerFragment::class, args)
+                }
                 is UserCodeState.Mode.RESULT -> {
-                    showFragment(ShowUserCodeFragment::class, Bundle.EMPTY)
+                    showFragment(ShowUserCodeFragment::class)
                     MatrixToBottomSheet.withLink(mode.rawLink).show(supportFragmentManager, "MatrixToBottomSheet")
                 }
             }
@@ -106,6 +114,21 @@ class UserCodeActivity : VectorBaseActivity<ActivitySimpleBinding>(),
                 }
             }
         }
+
+        qrViewModel.observeViewEvents {
+            when (it) {
+                is QrCodeScannerEvents.CodeParsed  -> {
+                    sharedViewModel.handle(UserCodeActions.DecodedQRCode(it.result))
+                }
+                QrCodeScannerEvents.SwitchMode     -> {
+                    sharedViewModel.handle(UserCodeActions.SwitchMode(UserCodeState.Mode.SHOW))
+                }
+                is QrCodeScannerEvents.ParseFailed -> {
+                    Toast.makeText(this, R.string.qr_code_not_scanned, Toast.LENGTH_SHORT).show()
+                    finish()
+                }
+            }.exhaustive
+        }
     }
 
     override fun onDestroy() {
@@ -113,16 +136,9 @@ class UserCodeActivity : VectorBaseActivity<ActivitySimpleBinding>(),
         super.onDestroy()
     }
 
-    private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
+    private fun showFragment(fragmentClass: KClass<out Fragment>, params: Parcelable? = null) {
         if (supportFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
-            supportFragmentManager.commitTransaction {
-                setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
-                replace(views.simpleFragmentContainer.id,
-                        fragmentClass.java,
-                        bundle,
-                        fragmentClass.simpleName
-                )
-            }
+            replaceFragment(views.simpleFragmentContainer, fragmentClass.java, params, fragmentClass.simpleName, useCustomAnimation = true)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
index 58cfebba94..91371b1f73 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
@@ -53,7 +53,6 @@ class RoomWidgetPermissionBottomSheet :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
         setupViews()
     }
 
diff --git a/vector/src/main/res/drawable-nodpi/room_settings.png b/vector/src/main/res/drawable-nodpi/room_settings.png
deleted file mode 100644
index 2e3fb404fa..0000000000
Binary files a/vector/src/main/res/drawable-nodpi/room_settings.png and /dev/null differ
diff --git a/vector/src/main/res/drawable/bg_avatar_border.xml b/vector/src/main/res/drawable/bg_avatar_border.xml
new file mode 100644
index 0000000000..e22731c1a3
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_avatar_border.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@android:color/transparent"/>
+
+    <stroke
+        android:width="2dp"
+        android:color="?android:colorBackground"/>
+
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification.xml b/vector/src/main/res/drawable/bg_unread_notification.xml
index 7c9ea18eec..4926f588da 100644
--- a/vector/src/main/res/drawable/bg_unread_notification.xml
+++ b/vector/src/main/res/drawable/bg_unread_notification.xml
@@ -4,5 +4,5 @@
 
     <corners android:radius="40dp" />
 
-    <solid android:color="?vctr_unread_room_badge" />
-</shape>
\ No newline at end of file
+    <solid android:color="?vctr_content_secondary" />
+</shape>
diff --git a/vector/src/main/res/drawable/ic_add_reaction_small.xml b/vector/src/main/res/drawable/ic_add_reaction_small.xml
new file mode 100644
index 0000000000..ddd4367ce0
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_add_reaction_small.xml
@@ -0,0 +1,4 @@
+<vector android:height="14dp" android:viewportHeight="16"
+    android:viewportWidth="16" android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#737D8C" android:fillType="evenOdd" android:pathData="M13.3334,0.667C12.9652,0.667 12.6667,0.9655 12.6667,1.3337V2.667L11.3334,2.667C10.9652,2.667 10.6667,2.9655 10.6667,3.3337C10.6667,3.7018 10.9652,4.0003 11.3334,4.0003H12.6667V5.3337C12.6667,5.7018 12.9652,6.0003 13.3334,6.0003C13.7016,6.0003 14,5.7018 14,5.3337V4.0003H15.3334C15.7016,4.0003 16,3.7018 16,3.3337C16,2.9655 15.7016,2.667 15.3334,2.667L14,2.667V1.3337C14,0.9655 13.7016,0.667 13.3334,0.667ZM4.6667,6.3337C4.6667,5.7803 5.1134,5.3337 5.6667,5.3337C6.22,5.3337 6.6667,5.7803 6.6667,6.3337C6.6667,6.887 6.22,7.3337 5.6667,7.3337C5.1134,7.3337 4.6667,6.887 4.6667,6.3337ZM10.3334,7.3337C10.8867,7.3337 11.3334,6.887 11.3334,6.3337C11.3334,5.7803 10.8867,5.3337 10.3334,5.3337C9.78,5.3337 9.3334,5.7803 9.3334,6.3337C9.3334,6.887 9.78,7.3337 10.3334,7.3337ZM8,11.667C9.5534,11.667 10.8734,10.6937 11.4067,9.3337H4.5934C5.1267,10.6937 6.4467,11.667 8,11.667ZM2.6667,8.0003C2.6667,5.0548 5.0545,2.667 8,2.667C8.4073,2.667 8.803,2.7125 9.1828,2.7985C9.542,2.8797 9.8989,2.6545 9.9802,2.2954C10.0615,1.9363 9.8362,1.5793 9.4771,1.498C9.0014,1.3903 8.5069,1.3337 8,1.3337C4.3181,1.3337 1.3334,4.3184 1.3334,8.0003C1.3334,11.6822 4.3181,14.667 8,14.667C11.6819,14.667 14.6667,11.6822 14.6667,8.0003C14.6667,7.8589 14.6623,7.7184 14.6536,7.579C14.6306,7.2115 14.3141,6.9322 13.9467,6.9552C13.5792,6.9781 13.2999,7.2946 13.3228,7.6621C13.3298,7.7738 13.3334,7.8866 13.3334,8.0003C13.3334,10.9458 10.9456,13.3337 8,13.3337C5.0545,13.3337 2.6667,10.9458 2.6667,8.0003Z"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_filter.xml b/vector/src/main/res/drawable/ic_filter.xml
index 740585b17e..35fd8db97d 100644
--- a/vector/src/main/res/drawable/ic_filter.xml
+++ b/vector/src/main/res/drawable/ic_filter.xml
@@ -4,17 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M4,6.5h16"
-      android:strokeWidth="1.8"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M6,12.5h12M9,18.5h6"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+      android:pathData="M10.9996,18H12.9996C13.5496,18 13.9996,17.55 13.9996,17C13.9996,16.45 13.5496,16 12.9996,16H10.9996C10.4496,16 9.9996,16.45 9.9996,17C9.9996,17.55 10.4496,18 10.9996,18ZM2.9996,7C2.9996,7.55 3.4496,8 3.9996,8H19.9996C20.5496,8 20.9996,7.55 20.9996,7C20.9996,6.45 20.5496,6 19.9996,6H3.9996C3.4496,6 2.9996,6.45 2.9996,7ZM6.9996,13H16.9996C17.5496,13 17.9996,12.55 17.9996,12C17.9996,11.45 17.5496,11 16.9996,11H6.9996C6.4496,11 5.9996,11.45 5.9996,12C5.9996,12.55 6.4496,13 6.9996,13Z"
+      android:fillColor="#737D8C"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_location_pin.xml b/vector/src/main/res/drawable/ic_location_pin.xml
new file mode 100644
index 0000000000..8227ea4e05
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_location_pin.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="51dp"
+    android:height="54dp"
+    android:viewportWidth="51"
+    android:viewportHeight="54">
+  <path
+      android:pathData="M27.2956,44.2191C37.5577,42.7292 45.4403,33.8952 45.4403,23.2202C45.4403,11.5006 35.9397,2 24.2202,2C12.5006,2 3,11.5006 3,23.2202C3,33.8953 10.8827,42.7293 21.1449,44.2191L24.2202,47.1784L27.2956,44.2191Z"
+      android:fillColor="#0DBD8B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M23.8041,15.073C20.5837,15.073 17.979,17.7486 17.979,21.0567C17.979,24.6213 21.6572,29.5365 23.1717,31.4085C23.5046,31.8188 24.112,31.8188 24.4449,31.4085C25.9511,29.5365 29.6293,24.6213 29.6293,21.0567C29.6293,17.7486 27.0246,15.073 23.8041,15.073ZM23.8041,23.1937C22.6558,23.1937 21.7237,22.2364 21.7237,21.0567C21.7237,19.8771 22.6558,18.9197 23.8041,18.9197C24.9525,18.9197 25.8846,19.8771 25.8846,21.0567C25.8846,22.2364 24.9525,23.1937 23.8041,23.1937Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_location_pin_failed.xml b/vector/src/main/res/drawable/ic_location_pin_failed.xml
new file mode 100644
index 0000000000..250d048836
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_location_pin_failed.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="70dp"
+    android:height="70dp"
+    android:viewportWidth="70"
+    android:viewportHeight="70">
+  <path
+      android:pathData="M34.9997,5.8335C23.7122,5.8335 14.583,15.2112 14.583,26.8059C14.583,39.2995 27.4747,56.5269 32.783,63.0882C33.9497,64.5264 36.0788,64.5264 37.2455,63.0882C42.5247,56.5269 55.4163,39.2995 55.4163,26.8059C55.4163,15.2112 46.2872,5.8335 34.9997,5.8335ZM34.9997,34.2961C30.9747,34.2961 27.708,30.9405 27.708,26.8059C27.708,22.6714 30.9747,19.3158 34.9997,19.3158C39.0247,19.3158 42.2913,22.6714 42.2913,26.8059C42.2913,30.9405 39.0247,34.2961 34.9997,34.2961Z"
+      android:fillColor="#C1C6CD"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_reply_in_thread.xml b/vector/src/main/res/drawable/ic_reply_in_thread.xml
new file mode 100644
index 0000000000..3b9b595bd3
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_reply_in_thread.xml
@@ -0,0 +1,8 @@
+<vector android:height="24dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#737D8C" android:pathData="M3,22H2C2,22.3788 2.214,22.725 2.5528,22.8944C2.8916,23.0638 3.297,23.0273 3.6,22.8L3,22ZM6.4667,19.4L7.0667,20.2L6.4667,19.4ZM5,4H19V2H5V4ZM4,19V5H2V19H4ZM20,4.9994C20,5.0023 20,5.0052 20,5.008C20,5.0109 20,5.0138 20,5.0167C20,5.0196 20,5.0224 20,5.0253C20,5.0282 20,5.0311 20,5.034C20,5.0369 20,5.0398 20,5.0427C20,5.0456 20,5.0485 20,5.0514C20,5.0543 20,5.0572 20,5.0601C20,5.063 20,5.0659 20,5.0688C20,5.0717 20,5.0746 20,5.0775C20,5.0804 20,5.0834 20,5.0863C20,5.0892 20,5.0921 20,5.095C20,5.0979 20,5.1009 20,5.1038C20,5.1067 20,5.1096 20,5.1126C20,5.1155 20,5.1184 20,5.1213C20,5.1243 20,5.1272 20,5.1301C20,5.1331 20,5.136 20,5.139C20,5.1419 20,5.1448 20,5.1478C20,5.1507 20,5.1537 20,5.1566C20,5.1596 20,5.1625 20,5.1655C20,5.1684 20,5.1714 20,5.1743C20,5.1773 20,5.1802 20,5.1832C20,5.1861 20,5.1891 20,5.192C20,5.195 20,5.198 20,5.2009C20,5.2039 20,5.2069 20,5.2098C20,5.2128 20,5.2158 20,5.2188C20,5.2217 20,5.2247 20,5.2277C20,5.2306 20,5.2336 20,5.2366C20,5.2396 20,5.2426 20,5.2456C20,5.2485 20,5.2515 20,5.2545C20,5.2575 20,5.2605 20,5.2635C20,5.2665 20,5.2695 20,5.2724C20,5.2754 20,5.2784 20,5.2814C20,5.2844 20,5.2874 20,5.2904C20,5.2934 20,5.2964 20,5.2994C20,5.3025 20,5.3054 20,5.3085C20,5.3115 20,5.3145 20,5.3175C20,5.3205 20,5.3235 20,5.3265C20,5.3295 20,5.3326 20,5.3356C20,5.3386 20,5.3416 20,5.3446C20,5.3477 20,5.3507 20,5.3537C20,5.3567 20,5.3598 20,5.3628C20,5.3658 20,5.3689 20,5.3719C20,5.3749 20,5.378 20,5.381C20,5.384 20,5.3871 20,5.3901C20,5.3931 20,5.3962 20,5.3992C20,5.4023 20,5.4053 20,5.4084C20,5.4114 20,5.4145 20,5.4175C20,5.4205 20,5.4236 20,5.4267C20,5.4297 20,5.4328 20,5.4358C20,5.4389 20,5.4419 20,5.445C20,5.4481 20,5.4511 20,5.4542C20,5.4572 20,5.4603 20,5.4634C20,5.4664 20,5.4695 20,5.4726C20,5.4756 20,5.4787 20,5.4818C20,5.4848 20,5.4879 20,5.491C20,5.4941 20,5.4971 20,5.5002C20,5.5033 20,5.5064 20,5.5095C20,5.5125 20,5.5156 20,5.5187C20,5.5218 20,5.5249 20,5.528C20,5.5311 20,5.5342 20,5.5373C20,5.5403 20,5.5434 20,5.5465C20,5.5496 20,5.5527 20,5.5558C20,5.5589 20,5.562 20,5.5651C20,5.5682 20,5.5713 20,5.5744C20,5.5775 20,5.5806 20,5.5837C20,5.5869 20,5.59 20,5.5931C20,5.5962 20,5.5993 20,5.6024C20,5.6055 20,5.6086 20,5.6117C20,5.6149 20,5.618 20,5.6211C20,5.6242 20,5.6273 20,5.6305C20,5.6336 20,5.6367 20,5.6398C20,5.643 20,5.6461 20,5.6492C20,5.6523 20,5.6555 20,5.6586C20,5.6617 20,5.6649 20,5.668C20,5.6711 20,5.6743 20,5.6774C20,5.6805 20,5.6837 20,5.6868C20,5.69 20,5.6931 20,5.6962C20,5.6994 20,5.7025 20,5.7057C20,5.7088 20,5.712 20,5.7151C20,5.7183 20,5.7214 20,5.7246C20,5.7277 20,5.7309 20,5.734C20,5.7372 20,5.7403 20,5.7435C20,5.7467 20,5.7498 20,5.753C20,5.7561 20,5.7593 20,5.7625C20,5.7656 20,5.7688 20,5.7719C20,5.7751 20,5.7783 20,5.7814C20,5.7846 20,5.7878 20,5.7909C20,5.7941 20,5.7973 20,5.8005C20,5.8036 20,5.8068 20,5.81C20,5.8132 20,5.8163 20,5.8195C20,5.8227 20,5.8259 20,5.8291C20,5.8323 20,5.8354 20,5.8386C20,5.8418 20,5.845 20,5.8482C20,5.8514 20,5.8545 20,5.8577C20,5.8609 20,5.8641 20,5.8673C20,5.8705 20,5.8737 20,5.8769C20,5.8801 20,5.8833 20,5.8865C20,5.8897 20,5.8929 20,5.8961C20,5.8993 20,5.9025 20,5.9057C20,5.9089 20,5.9121 20,5.9153C20,5.9185 20,5.9217 20,5.9249C20,5.9281 20,5.9313 20,5.9345C20,5.9377 20,5.941 20,5.9442C20,5.9474 20,5.9506 20,5.9538C20,5.957 20,5.9602 20,5.9635C20,5.9667 20,5.9699 20,5.9731C20,5.9763 20,5.9796 20,5.9828C20,5.986 20,5.9892 20,5.9925C20,5.9957 20,5.9989 20,6.0021C20,6.0054 20,6.0086 20,6.0118C20,6.015 20,6.0183 20,6.0215C20,6.0248 20,6.028 20,6.0312C20,6.0345 20,6.0377 20,6.0409C20,6.0442 20,6.0474 20,6.0506C20,6.0539 20,6.0571 20,6.0604C20,6.0636 20,6.0669 20,6.0701C20,6.0733 20,6.0766 20,6.0798C20,6.0831 20,6.0863 20,6.0896C20,6.0928 20,6.0961 20,6.0993C20,6.1026 20,6.1058 20,6.1091C20,6.1123 20,6.1156 20,6.1188C20,6.1221 20,6.1253 20,6.1286C20,6.1319 20,6.1351 20,6.1384C20,6.1416 20,6.1449 20,6.1482C20,6.1514 20,6.1547 20,6.1579C20,6.1612 20,6.1645 20,6.1677C20,6.171 20,6.1743 20,6.1775C20,6.1808 20,6.1841 20,6.1874C20,6.1906 20,6.1939 20,6.1972C20,6.2004 20,6.2037 20,6.207C20,6.2103 20,6.2136 20,6.2168C20,6.2201 20,6.2234 20,6.2267C20,6.2299 20,6.2332 20,6.2365C20,6.2398 20,6.2431 20,6.2463C20,6.2496 20,6.2529 20,6.2562C20,6.2595 20,6.2628 20,6.2661C20,6.2693 20,6.2726 20,6.2759C20,6.2792 20,6.2825 20,6.2858C20,6.2891 20,6.2924 20,6.2957C20,6.299 20,6.3023 20,6.3056C20,6.3088 20,6.3121 20,6.3154C20,6.3187 20,6.322 20,6.3253C20,6.3286 20,6.3319 20,6.3352C20,6.3385 20,6.3418 20,6.3451C20,6.3484 20,6.3517 20,6.3551C20,6.3583 20,6.3617 20,6.365C20,6.3683 20,6.3716 20,6.3749C20,6.3782 20,6.3815 20,6.3848C20,6.3881 20,6.3914 20,6.3948C20,6.3981 20,6.4014 20,6.4047C20,6.408 20,6.4113 20,6.4146C20,6.418 20,6.4213 20,6.4246C20,6.4279 20,6.4312 20,6.4345C20,6.4378 20,6.4412 20,6.4445C20,6.4478 20,6.4511 20,6.4545C20,6.4578 20,6.4611 20,6.4644C20,6.4678 20,6.4711 20,6.4744C20,6.4777 20,6.4811 20,6.4844C20,6.4877 20,6.491 20,6.4944C20,6.4977 20,6.501 20,6.5044C20,6.5077 20,6.511 20,6.5144C20,6.5177 20,6.521 20,6.5244C20,6.5277 20,6.531 20,6.5344C20,6.5377 20,6.541 20,6.5444C20,6.5477 20,6.5511 20,6.5544C20,6.5577 20,6.5611 20,6.5644C20,6.5677 20,6.5711 20,6.5744C20,6.5778 20,6.5811 20,6.5845C20,6.5878 20,6.5911 20,6.5945C20,6.5978 20,6.6012 20,6.6045C20,6.6079 20,6.6112 20,6.6146C20,6.6179 20,6.6213 20,6.6246C20,6.628 20,6.6313 20,6.6347C20,6.638 20,6.6414 20,6.6447C20,6.6481 20,6.6514 20,6.6548C20,6.6581 20,6.6615 20,6.6649C20,6.6682 20,6.6716 20,6.6749C20,6.6783 20,6.6816 20,6.685C20,6.6884 20,6.6917 20,6.6951C20,6.6984 20,6.7018 20,6.7051C20,6.7085 20,6.7119 20,6.7152C20,6.7186 20,6.722 20,6.7253C20,6.7287 20,6.732 20,6.7354C20,6.7388 20,6.7421 20,6.7455C20,6.7489 20,6.7522 20,6.7556C20,6.759 20,6.7623 20,6.7657C20,6.7691 20,6.7724 20,6.7758C20,6.7792 20,6.7826 20,6.7859C20,6.7893 20,6.7927 20,6.796C20,6.7994 20,6.8028 20,6.8062C20,6.8095 20,6.8129 20,6.8163C20,6.8197 20,6.823 20,6.8264C20,6.8298 20,6.8332 20,6.8365C20,6.8399 20,6.8433 20,6.8467C20,6.85 20,6.8534 20,6.8568C20,6.8602 20,6.8636 20,6.867C20,6.8703 20,6.8737 20,6.8771C20,6.8805 20,6.8839 20,6.8872C20,6.8906 20,6.894 20,6.8974C20,6.9008 20,6.9042 20,6.9075C20,6.9109 20,6.9143 20,6.9177C20,6.9211 20,6.9245 20,6.9279C20,6.9312 20,6.9346 20,6.938C20,6.9414 20,6.9448 20,6.9482C20,6.9516 20,6.955 20,6.9584C20,6.9617 20,6.9651 20,6.9685C20,6.9719 20,6.9753 20,6.9787C20,6.9821 20,6.9855 20,6.9889C20,6.9923 20,6.9957 20,6.9991C20,7.0024 20,7.0058 20,7.0092C20,7.0126 20,7.016 20,7.0194C20,7.0228 20,7.0262 20,7.0296C20,7.033 20,7.0364 20,7.0398C20,7.0432 20,7.0466 20,7.05C20,7.0534 20,7.0568 20,7.0602C20,7.0636 20,7.067 20,7.0704C20,7.0738 20,7.0772 20,7.0806C20,7.084 20,7.0874 20,7.0908C20,7.0942 20,7.0976 20,7.101C20,7.1044 20,7.1078 20,7.1112C20,7.1146 20,7.118 20,7.1214C20,7.1248 20,7.1282 20,7.1316C20,7.135 20,7.1384 20,7.1418C20,7.1452 20,7.1486 20,7.152C20,7.1554 20,7.1589 20,7.1623C20,7.1657 20,7.1691 20,7.1725C20,7.1759 20,7.1793 20,7.1827C20,7.1861 20,7.1895 20,7.1929C20,7.1963 20,7.1997 20,7.2031C20,7.2066 20,7.21 20,7.2134C20,7.2168 20,7.2202 20,7.2236C20,7.227 20,7.2304 20,7.2338C20,7.2372 20,7.2407 20,7.2441C20,7.2475 20,7.2509 20,7.2543C20,7.2577 20,7.2611 20,7.2645C20,7.2679 20,7.2714 20,7.2748C20,7.2782 20,7.2816 20,7.285C20,7.2884 20,7.2918 20,7.2952C20,7.2987 20,7.3021 20,7.3055C20,7.3089 20,7.3123 20,7.3157C20,7.3191 20,7.3226 20,7.326C20,7.3294 20,7.3328 20,7.3362C20,7.3396 20,7.3431 20,7.3465C20,7.3499 20,7.3533 20,7.3567C20,7.3601 20,7.3636 20,7.367C20,7.3704 20,7.3738 20,7.3772C20,7.3806 20,7.384 20,7.3875C20,7.3909 20,7.3943 20,7.3977C20,7.4011 20,7.4046 20,7.408C20,7.4114 20,7.4148 20,7.4182C20,7.4216 20,7.4251 20,7.4285C20,7.4319 20,7.4353 20,7.4387C20,7.4422 20,7.4456 20,7.449C20,7.4524 20,7.4558 20,7.4592C20,7.4627 20,7.4661 20,7.4695C20,7.4729 20,7.4763 20,7.4798C20,7.4832 20,7.4866 20,7.49C20,7.4934 20,7.4969 20,7.5003C20,7.5037 20,7.5071 20,7.5105C20,7.514 20,7.5174 20,7.5208C20,7.5242 20,7.5276 20,7.5311C20,7.5345 20,7.5379 20,7.5413C20,7.5448 20,7.5482 20,7.5516C20,7.555 20,7.5584 20,7.5619C20,7.5653 20,7.5687 20,7.5721C20,7.5755 20,7.5789 20,7.5824C20,7.5858 20,7.5892 20,7.5926C20,7.5961 20,7.5995 20,7.6029C20,7.6063 20,7.6097 20,7.6132C20,7.6166 20,7.62 20,7.6234C20,7.6269 20,7.6303 20,7.6337C20,7.6371 20,7.6405 20,7.6439C20,7.6474 20,7.6508 20,7.6542C20,7.6576 20,7.6611 20,7.6645C20,7.6679 20,7.6713 20,7.6747C20,7.6782 20,7.6816 20,7.685C20,7.6884 20,7.6918 20,7.6953C20,7.6987 20,7.7021 20,7.7055C20,7.709 20,7.7124 20,7.7158C20,7.7192 20,7.7226 20,7.726C20,7.7295 20,7.7329 20,7.7363C20,7.7397 20,7.7432 20,7.7466C20,7.75 20,7.7534 20,7.7568C20,7.7603 20,7.7637 20,7.7671C20,7.7705 20,7.7739 20,7.7773C20,7.7808 20,7.7842 20,7.7876C20,7.791 20,7.7944 20,7.7979C20,7.8013 20,7.8047 20,7.8081C20,7.8115 20,7.8149 20,7.8184C20,7.8218 20,7.8252 20,7.8286C20,7.832 20,7.8355 20,7.8389C20,7.8423 20,7.8457 20,7.8491C20,7.8525 20,7.856 20,7.8594C20,7.8628 20,7.8662 20,7.8696C20,7.873 20,7.8765 20,7.8799C20,7.8833 20,7.8867 20,7.8901C20,7.8935 20,7.8969 20,7.9004C20,7.9038 20,7.9072 20,7.9106C20,7.914 20,7.9174 20,7.9209C20,7.9243 20,7.9277 20,7.9311C20,7.9345 20,7.9379 20,7.9413C20,7.9448 20,7.9482 20,7.9516C20,7.955 20,7.9584 20,7.9618C20,7.9652 20,7.9686 20,7.9721C20,7.9755 20,7.9789 20,7.9823C20,7.9857 20,7.9891 20,7.9925C20,7.9959 20,7.9994 20,8.0028C20,8.0062 20,8.0096 20,8.013C20,8.0164 20,8.0198 20,8.0232C20,8.0266 20,8.03 20,8.0335C20,8.0368 20,8.0403 20,8.0437C20,8.0471 20,8.0505 20,8.0539C20,8.0573 20,8.0607 20,8.0641C20,8.0675 20,8.0709 20,8.0743C20,8.0777 20,8.0812 20,8.0845C20,8.088 20,8.0914 20,8.0948C20,8.0982 20,8.1016 20,8.105C20,8.1084 20,8.1118 20,8.1152C20,8.1186 20,8.122 20,8.1254C20,8.1288 20,8.1322 20,8.1356C20,8.139 20,8.1424 20,8.1458C20,8.1492 20,8.1526 20,8.156C20,8.1594 20,8.1628 20,8.1662C20,8.1696 20,8.173 20,8.1764C20,8.1798 20,8.1832 20,8.1866C20,8.19 20,8.1934 20,8.1968C20,8.2002 20,8.2036 20,8.207C20,8.2104 20,8.2138 20,8.2172C20,8.2206 20,8.224 20,8.2274C20,8.2308 20,8.2341 20,8.2375C20,8.2409 20,8.2443 20,8.2477C20,8.2511 20,8.2545 20,8.2579C20,8.2613 20,8.2647 20,8.2681C20,8.2715 20,8.2748 20,8.2782C20,8.2816 20,8.285 20,8.2884C20,8.2918 20,8.2952 20,8.2986C20,8.302 20,8.3054 20,8.3087C20,8.3121 20,8.3155 20,8.3189C20,8.3223 20,8.3257 20,8.3291C20,8.3324 20,8.3358 20,8.3392C20,8.3426 20,8.346 20,8.3493C20,8.3527 20,8.3561 20,8.3595C20,8.3629 20,8.3663 20,8.3696C20,8.373 20,8.3764 20,8.3798C20,8.3832 20,8.3865 20,8.3899C20,8.3933 20,8.3967 20,8.4001C20,8.4034 20,8.4068 20,8.4102C20,8.4136 20,8.4169 20,8.4203C20,8.4237 20,8.427 20,8.4304C20,8.4338 20,8.4372 20,8.4405C20,8.4439 20,8.4473 20,8.4507C20,8.454 20,8.4574 20,8.4608C20,8.4641 20,8.4675 20,8.4709C20,8.4742 20,8.4776 20,8.481C20,8.4844 20,8.4877 20,8.4911C20,8.4944 20,8.4978 20,8.5012C20,8.5045 20,8.5079 20,8.5113C20,8.5146 20,8.518 20,8.5214C20,8.5247 20,8.5281 20,8.5315C20,8.5348 20,8.5382 20,8.5415C20,8.5449 20,8.5483 20,8.5516C20,8.555 20,8.5583 20,8.5617C20,8.565 20,8.5684 20,8.5717C20,8.5751 20,8.5785 20,8.5818C20,8.5852 20,8.5885 20,8.5919C20,8.5952 20,8.5986 20,8.6019C20,8.6053 20,8.6086 20,8.612C20,8.6153 20,8.6187 20,8.622C20,8.6254 20,8.6287 20,8.6321C20,8.6354 20,8.6388 20,8.6421C20,8.6454 20,8.6488 20,8.6521C20,8.6555 20,8.6588 20,8.6622C20,8.6655 20,8.6688 20,8.6722C20,8.6755 20,8.6789 20,8.6822C20,8.6855 20,8.6889 20,8.6922C20,8.6956 20,8.6989 20,8.7022C20,8.7056 20,8.7089 20,8.7122C20,8.7156 20,8.7189 20,8.7222C20,8.7256 20,8.7289 20,8.7322C20,8.7356 20,8.7389 20,8.7422C20,8.7456 20,8.7489 20,8.7522C20,8.7555 20,8.7589 20,8.7622C20,8.7655 20,8.7688 20,8.7722C20,8.7755 20,8.7788 20,8.7821C20,8.7855 20,8.7888 20,8.7921C20,8.7954 20,8.7987 20,8.8021C20,8.8054 20,8.8087 20,8.812C20,8.8153 20,8.8187 20,8.822C20,8.8253 20,8.8286 20,8.8319C20,8.8352 20,8.8385 20,8.8419C20,8.8452 20,8.8485 20,8.8518C20,8.8551 20,8.8584 20,8.8617C20,8.865 20,8.8683 20,8.8716C20,8.8749 20,8.8782 20,8.8815C20,8.8848 20,8.8882 20,8.8915C20,8.8948 20,8.8981 20,8.9014C20,8.9047 20,8.908 20,8.9113C20,8.9146 20,8.9179 20,8.9212C20,8.9244 20,8.9277 20,8.931C20,8.9343 20,8.9376 20,8.9409C20,8.9442 20,8.9475 20,8.9508C20,8.9541 20,8.9574 20,8.9607C20,8.964 20,8.9672 20,8.9705C20,8.9738 20,8.9771 20,8.9804C20,8.9837 20,8.987 20,8.9902C20,8.9935 20,8.9968 20,9.0001C20,9.0034 20,9.0067 20,9.0099C20,9.0132 20,9.0165 20,9.0198C20,9.0231 20,9.0263 20,9.0296C20,9.0329 20,9.0361 20,9.0394C20,9.0427 20,9.046 20,9.0492C20,9.0525 20,9.0558 20,9.059C20,9.0623 20,9.0656 20,9.0688C20,9.0721 20,9.0754 20,9.0786C20,9.0819 20,9.0852 20,9.0884C20,9.0917 20,9.0949 20,9.0982C20,9.1015 20,9.1047 20,9.108C20,9.1112 20,9.1145 20,9.1178C20,9.121 20,9.1243 20,9.1275C20,9.1308 20,9.134 20,9.1373C20,9.1405 20,9.1438 20,9.147C20,9.1503 20,9.1535 20,9.1568C20,9.16 20,9.1633 20,9.1665C20,9.1698 20,9.173 20,9.1762C20,9.1795 20,9.1827 20,9.186C20,9.1892 20,9.1924 20,9.1957C20,9.1989 20,9.2022 20,9.2054C20,9.2086 20,9.2119 20,9.2151C20,9.2183 20,9.2215 20,9.2248C20,9.228 20,9.2312 20,9.2345C20,9.2377 20,9.2409 20,9.2441C20,9.2474 20,9.2506 20,9.2538C20,9.257 20,9.2603 20,9.2635C20,9.2667 20,9.2699 20,9.2731C20,9.2764 20,9.2796 20,9.2828C20,9.286 20,9.2892 20,9.2924C20,9.2956 20,9.2989 20,9.3021C20,9.3053 20,9.3085 20,9.3117C20,9.3149 20,9.3181 20,9.3213C20,9.3245 20,9.3277 20,9.3309C20,9.3341 20,9.3373 20,9.3405C20,9.3437 20,9.3469 20,9.3501C20,9.3533 20,9.3565 20,9.3597C20,9.3629 20,9.3661 20,9.3693C20,9.3725 20,9.3757 20,9.3789C20,9.382 20,9.3852 20,9.3884C20,9.3916 20,9.3948 20,9.398C20,9.4012 20,9.4044 20,9.4075C20,9.4107 20,9.4139 20,9.4171C20,9.4203 20,9.4234 20,9.4266C20,9.4298 20,9.433 20,9.4361C20,9.4393 20,9.4425 20,9.4457C20,9.4488 20,9.452 20,9.4552C20,9.4583 20,9.4615 20,9.4647C20,9.4678 20,9.471 20,9.4741C20,9.4773 20,9.4805 20,9.4836C20,9.4868 20,9.49 20,9.4931C20,9.4963 20,9.4994 20,9.5026C20,9.5057 20,9.5089 20,9.512C20,9.5152 20,9.5183 20,9.5215C20,9.5246 20,9.5278 20,9.5309C20,9.5341 20,9.5372 20,9.5404C20,9.5435 20,9.5466 20,9.5498C20,9.5529 20,9.5561 20,9.5592C20,9.5623 20,9.5655 20,9.5686C20,9.5717 20,9.5749 20,9.578C20,9.5811 20,9.5843 20,9.5874C20,9.5905 20,9.5936 20,9.5968C20,9.5999 20,9.603 20,9.6061C20,9.6093 20,9.6124 20,9.6155C20,9.6186 20,9.6217 20,9.6249C20,9.628 20,9.6311 20,9.6342C20,9.6373 20,9.6404 20,9.6435C20,9.6467 20,9.6498 20,9.6529C20,9.656 20,9.6591 20,9.6622C20,9.6653 20,9.6684 20,9.6715C20,9.6746 20,9.6777 20,9.6808C20,9.6839 20,9.687 20,9.6901C20,9.6932 20,9.6963 20,9.6994C20,9.7024 20,9.7055 20,9.7086C20,9.7117 20,9.7148 20,9.7179C20,9.721 20,9.724 20,9.7271C20,9.7302 20,9.7333 20,9.7364C20,9.7395 20,9.7425 20,9.7456C20,9.7487 20,9.7518 20,9.7548C20,9.7579 20,9.761 20,9.764C20,9.7671 20,9.7702 20,9.7732C20,9.7763 20,9.7794 20,9.7824C20,9.7855 20,9.7886 20,9.7916C20,9.7947 20,9.7977 20,9.8008C20,9.8039 20,9.8069 20,9.8099C20,9.813 20,9.8161 20,9.8191C20,9.8222 20,9.8252 20,9.8282C20,9.8313 20,9.8343 20,9.8374C20,9.8404 20,9.8435 20,9.8465C20,9.8495 20,9.8526 20,9.8556C20,9.8587 20,9.8617 20,9.8647C20,9.8678 20,9.8708 20,9.8738C20,9.8768 20,9.8799 20,9.8829C20,9.8859 20,9.8889 20,9.892C20,9.895 20,9.898 20,9.901C20,9.904 20,9.9071 20,9.9101C20,9.9131 20,9.9161 20,9.9191C20,9.9221 20,9.9251 20,9.9282C20,9.9312 20,9.9342 20,9.9372C20,9.9402 20,9.9432 20,9.9462C20,9.9492 20,9.9522 20,9.9552C20,9.9582 20,9.9612 20,9.9642C20,9.9671 20,9.9701 20,9.9731C20,9.9761 20,9.9791 20,9.9821C20,9.9851 20,9.9881 20,9.9911C20,9.994 20,9.997 20,10H22C22,9.997 22,9.994 22,9.9911C22,9.9881 22,9.9851 22,9.9821C22,9.9791 22,9.9761 22,9.9731C22,9.9701 22,9.9671 22,9.9642C22,9.9612 22,9.9582 22,9.9552C22,9.9522 22,9.9492 22,9.9462C22,9.9432 22,9.9402 22,9.9372C22,9.9342 22,9.9312 22,9.9282C22,9.9251 22,9.9221 22,9.9191C22,9.9161 22,9.9131 22,9.9101C22,9.9071 22,9.904 22,9.901C22,9.898 22,9.895 22,9.892C22,9.8889 22,9.8859 22,9.8829C22,9.8799 22,9.8768 22,9.8738C22,9.8708 22,9.8678 22,9.8647C22,9.8617 22,9.8587 22,9.8556C22,9.8526 22,9.8495 22,9.8465C22,9.8435 22,9.8404 22,9.8374C22,9.8343 22,9.8313 22,9.8282C22,9.8252 22,9.8222 22,9.8191C22,9.8161 22,9.813 22,9.8099C22,9.8069 22,9.8039 22,9.8008C22,9.7977 22,9.7947 22,9.7916C22,9.7886 22,9.7855 22,9.7824C22,9.7794 22,9.7763 22,9.7732C22,9.7702 22,9.7671 22,9.764C22,9.761 22,9.7579 22,9.7548C22,9.7518 22,9.7487 22,9.7456C22,9.7425 22,9.7395 22,9.7364C22,9.7333 22,9.7302 22,9.7271C22,9.724 22,9.721 22,9.7179C22,9.7148 22,9.7117 22,9.7086C22,9.7055 22,9.7024 22,9.6994C22,9.6963 22,9.6932 22,9.6901C22,9.687 22,9.6839 22,9.6808C22,9.6777 22,9.6746 22,9.6715C22,9.6684 22,9.6653 22,9.6622C22,9.6591 22,9.656 22,9.6529C22,9.6498 22,9.6467 22,9.6435C22,9.6404 22,9.6373 22,9.6342C22,9.6311 22,9.628 22,9.6249C22,9.6217 22,9.6186 22,9.6155C22,9.6124 22,9.6093 22,9.6061C22,9.603 22,9.5999 22,9.5968C22,9.5936 22,9.5905 22,9.5874C22,9.5843 22,9.5811 22,9.578C22,9.5749 22,9.5717 22,9.5686C22,9.5655 22,9.5623 22,9.5592C22,9.5561 22,9.5529 22,9.5498C22,9.5466 22,9.5435 22,9.5404C22,9.5372 22,9.5341 22,9.5309C22,9.5278 22,9.5246 22,9.5215C22,9.5183 22,9.5152 22,9.512C22,9.5089 22,9.5057 22,9.5026C22,9.4994 22,9.4963 22,9.4931C22,9.49 22,9.4868 22,9.4836C22,9.4805 22,9.4773 22,9.4741C22,9.471 22,9.4678 22,9.4647C22,9.4615 22,9.4583 22,9.4552C22,9.452 22,9.4488 22,9.4457C22,9.4425 22,9.4393 22,9.4361C22,9.433 22,9.4298 22,9.4266C22,9.4234 22,9.4203 22,9.4171C22,9.4139 22,9.4107 22,9.4075C22,9.4044 22,9.4012 22,9.398C22,9.3948 22,9.3916 22,9.3884C22,9.3852 22,9.382 22,9.3789C22,9.3757 22,9.3725 22,9.3693C22,9.3661 22,9.3629 22,9.3597C22,9.3565 22,9.3533 22,9.3501C22,9.3469 22,9.3437 22,9.3405C22,9.3373 22,9.3341 22,9.3309C22,9.3277 22,9.3245 22,9.3213C22,9.3181 22,9.3149 22,9.3117C22,9.3085 22,9.3053 22,9.3021C22,9.2989 22,9.2956 22,9.2924C22,9.2892 22,9.286 22,9.2828C22,9.2796 22,9.2764 22,9.2731C22,9.2699 22,9.2667 22,9.2635C22,9.2603 22,9.257 22,9.2538C22,9.2506 22,9.2474 22,9.2441C22,9.2409 22,9.2377 22,9.2345C22,9.2312 22,9.228 22,9.2248C22,9.2215 22,9.2183 22,9.2151C22,9.2119 22,9.2086 22,9.2054C22,9.2022 22,9.1989 22,9.1957C22,9.1924 22,9.1892 22,9.186C22,9.1827 22,9.1795 22,9.1762C22,9.173 22,9.1698 22,9.1665C22,9.1633 22,9.16 22,9.1568C22,9.1535 22,9.1503 22,9.147C22,9.1438 22,9.1405 22,9.1373C22,9.134 22,9.1308 22,9.1275C22,9.1243 22,9.121 22,9.1178C22,9.1145 22,9.1112 22,9.108C22,9.1047 22,9.1015 22,9.0982C22,9.0949 22,9.0917 22,9.0884C22,9.0852 22,9.0819 22,9.0786C22,9.0754 22,9.0721 22,9.0688C22,9.0656 22,9.0623 22,9.059C22,9.0558 22,9.0525 22,9.0492C22,9.046 22,9.0427 22,9.0394C22,9.0361 22,9.0329 22,9.0296C22,9.0263 22,9.0231 22,9.0198C22,9.0165 22,9.0132 22,9.0099C22,9.0067 22,9.0034 22,9.0001C22,8.9968 22,8.9935 22,8.9902C22,8.987 22,8.9837 22,8.9804C22,8.9771 22,8.9738 22,8.9705C22,8.9672 22,8.964 22,8.9607C22,8.9574 22,8.9541 22,8.9508C22,8.9475 22,8.9442 22,8.9409C22,8.9376 22,8.9343 22,8.931C22,8.9277 22,8.9244 22,8.9212C22,8.9179 22,8.9146 22,8.9113C22,8.908 22,8.9047 22,8.9014C22,8.8981 22,8.8948 22,8.8915C22,8.8882 22,8.8848 22,8.8815C22,8.8782 22,8.8749 22,8.8716C22,8.8683 22,8.865 22,8.8617C22,8.8584 22,8.8551 22,8.8518C22,8.8485 22,8.8452 22,8.8419C22,8.8385 22,8.8352 22,8.8319C22,8.8286 22,8.8253 22,8.822C22,8.8187 22,8.8153 22,8.812C22,8.8087 22,8.8054 22,8.8021C22,8.7987 22,8.7954 22,8.7921C22,8.7888 22,8.7855 22,8.7821C22,8.7788 22,8.7755 22,8.7722C22,8.7688 22,8.7655 22,8.7622C22,8.7589 22,8.7555 22,8.7522C22,8.7489 22,8.7456 22,8.7422C22,8.7389 22,8.7356 22,8.7322C22,8.7289 22,8.7256 22,8.7222C22,8.7189 22,8.7156 22,8.7122C22,8.7089 22,8.7056 22,8.7022C22,8.6989 22,8.6956 22,8.6922C22,8.6889 22,8.6855 22,8.6822C22,8.6789 22,8.6755 22,8.6722C22,8.6688 22,8.6655 22,8.6622C22,8.6588 22,8.6555 22,8.6521C22,8.6488 22,8.6454 22,8.6421C22,8.6388 22,8.6354 22,8.6321C22,8.6287 22,8.6254 22,8.622C22,8.6187 22,8.6153 22,8.612C22,8.6086 22,8.6053 22,8.6019C22,8.5986 22,8.5952 22,8.5919C22,8.5885 22,8.5852 22,8.5818C22,8.5785 22,8.5751 22,8.5717C22,8.5684 22,8.565 22,8.5617C22,8.5583 22,8.555 22,8.5516C22,8.5483 22,8.5449 22,8.5415C22,8.5382 22,8.5348 22,8.5315C22,8.5281 22,8.5247 22,8.5214C22,8.518 22,8.5146 22,8.5113C22,8.5079 22,8.5045 22,8.5012C22,8.4978 22,8.4944 22,8.4911C22,8.4877 22,8.4844 22,8.481C22,8.4776 22,8.4742 22,8.4709C22,8.4675 22,8.4641 22,8.4608C22,8.4574 22,8.454 22,8.4507C22,8.4473 22,8.4439 22,8.4405C22,8.4372 22,8.4338 22,8.4304C22,8.427 22,8.4237 22,8.4203C22,8.4169 22,8.4136 22,8.4102C22,8.4068 22,8.4034 22,8.4001C22,8.3967 22,8.3933 22,8.3899C22,8.3865 22,8.3832 22,8.3798C22,8.3764 22,8.373 22,8.3696C22,8.3663 22,8.3629 22,8.3595C22,8.3561 22,8.3527 22,8.3493C22,8.346 22,8.3426 22,8.3392C22,8.3358 22,8.3324 22,8.3291C22,8.3257 22,8.3223 22,8.3189C22,8.3155 22,8.3121 22,8.3087C22,8.3054 22,8.302 22,8.2986C22,8.2952 22,8.2918 22,8.2884C22,8.285 22,8.2816 22,8.2782C22,8.2748 22,8.2715 22,8.2681C22,8.2647 22,8.2613 22,8.2579C22,8.2545 22,8.2511 22,8.2477C22,8.2443 22,8.2409 22,8.2375C22,8.2341 22,8.2308 22,8.2274C22,8.224 22,8.2206 22,8.2172C22,8.2138 22,8.2104 22,8.207C22,8.2036 22,8.2002 22,8.1968C22,8.1934 22,8.19 22,8.1866C22,8.1832 22,8.1798 22,8.1764C22,8.173 22,8.1696 22,8.1662C22,8.1628 22,8.1594 22,8.156C22,8.1526 22,8.1492 22,8.1458C22,8.1424 22,8.139 22,8.1356C22,8.1322 22,8.1288 22,8.1254C22,8.122 22,8.1186 22,8.1152C22,8.1118 22,8.1084 22,8.105C22,8.1016 22,8.0982 22,8.0948C22,8.0914 22,8.088 22,8.0845C22,8.0812 22,8.0777 22,8.0743C22,8.0709 22,8.0675 22,8.0641C22,8.0607 22,8.0573 22,8.0539C22,8.0505 22,8.0471 22,8.0437C22,8.0403 22,8.0368 22,8.0335C22,8.03 22,8.0266 22,8.0232C22,8.0198 22,8.0164 22,8.013C22,8.0096 22,8.0062 22,8.0028C22,7.9994 22,7.9959 22,7.9925C22,7.9891 22,7.9857 22,7.9823C22,7.9789 22,7.9755 22,7.9721C22,7.9686 22,7.9652 22,7.9618C22,7.9584 22,7.955 22,7.9516C22,7.9482 22,7.9448 22,7.9413C22,7.9379 22,7.9345 22,7.9311C22,7.9277 22,7.9243 22,7.9209C22,7.9174 22,7.914 22,7.9106C22,7.9072 22,7.9038 22,7.9004C22,7.8969 22,7.8935 22,7.8901C22,7.8867 22,7.8833 22,7.8799C22,7.8765 22,7.873 22,7.8696C22,7.8662 22,7.8628 22,7.8594C22,7.856 22,7.8525 22,7.8491C22,7.8457 22,7.8423 22,7.8389C22,7.8355 22,7.832 22,7.8286C22,7.8252 22,7.8218 22,7.8184C22,7.8149 22,7.8115 22,7.8081C22,7.8047 22,7.8013 22,7.7979C22,7.7944 22,7.791 22,7.7876C22,7.7842 22,7.7808 22,7.7773C22,7.7739 22,7.7705 22,7.7671C22,7.7637 22,7.7603 22,7.7568C22,7.7534 22,7.75 22,7.7466C22,7.7432 22,7.7397 22,7.7363C22,7.7329 22,7.7295 22,7.726C22,7.7226 22,7.7192 22,7.7158C22,7.7124 22,7.709 22,7.7055C22,7.7021 22,7.6987 22,7.6953C22,7.6918 22,7.6884 22,7.685C22,7.6816 22,7.6782 22,7.6747C22,7.6713 22,7.6679 22,7.6645C22,7.6611 22,7.6576 22,7.6542C22,7.6508 22,7.6474 22,7.6439C22,7.6405 22,7.6371 22,7.6337C22,7.6303 22,7.6269 22,7.6234C22,7.62 22,7.6166 22,7.6132C22,7.6097 22,7.6063 22,7.6029C22,7.5995 22,7.5961 22,7.5926C22,7.5892 22,7.5858 22,7.5824C22,7.5789 22,7.5755 22,7.5721C22,7.5687 22,7.5653 22,7.5619C22,7.5584 22,7.555 22,7.5516C22,7.5482 22,7.5448 22,7.5413C22,7.5379 22,7.5345 22,7.5311C22,7.5276 22,7.5242 22,7.5208C22,7.5174 22,7.514 22,7.5105C22,7.5071 22,7.5037 22,7.5003C22,7.4969 22,7.4934 22,7.49C22,7.4866 22,7.4832 22,7.4798C22,7.4763 22,7.4729 22,7.4695C22,7.4661 22,7.4627 22,7.4592C22,7.4558 22,7.4524 22,7.449C22,7.4456 22,7.4422 22,7.4387C22,7.4353 22,7.4319 22,7.4285C22,7.4251 22,7.4216 22,7.4182C22,7.4148 22,7.4114 22,7.408C22,7.4046 22,7.4011 22,7.3977C22,7.3943 22,7.3909 22,7.3875C22,7.384 22,7.3806 22,7.3772C22,7.3738 22,7.3704 22,7.367C22,7.3636 22,7.3601 22,7.3567C22,7.3533 22,7.3499 22,7.3465C22,7.3431 22,7.3396 22,7.3362C22,7.3328 22,7.3294 22,7.326C22,7.3226 22,7.3191 22,7.3157C22,7.3123 22,7.3089 22,7.3055C22,7.3021 22,7.2987 22,7.2952C22,7.2918 22,7.2884 22,7.285C22,7.2816 22,7.2782 22,7.2748C22,7.2714 22,7.2679 22,7.2645C22,7.2611 22,7.2577 22,7.2543C22,7.2509 22,7.2475 22,7.2441C22,7.2407 22,7.2372 22,7.2338C22,7.2304 22,7.227 22,7.2236C22,7.2202 22,7.2168 22,7.2134C22,7.21 22,7.2066 22,7.2031C22,7.1997 22,7.1963 22,7.1929C22,7.1895 22,7.1861 22,7.1827C22,7.1793 22,7.1759 22,7.1725C22,7.1691 22,7.1657 22,7.1623C22,7.1589 22,7.1554 22,7.152C22,7.1486 22,7.1452 22,7.1418C22,7.1384 22,7.135 22,7.1316C22,7.1282 22,7.1248 22,7.1214C22,7.118 22,7.1146 22,7.1112C22,7.1078 22,7.1044 22,7.101C22,7.0976 22,7.0942 22,7.0908C22,7.0874 22,7.084 22,7.0806C22,7.0772 22,7.0738 22,7.0704C22,7.067 22,7.0636 22,7.0602C22,7.0568 22,7.0534 22,7.05C22,7.0466 22,7.0432 22,7.0398C22,7.0364 22,7.033 22,7.0296C22,7.0262 22,7.0228 22,7.0194C22,7.016 22,7.0126 22,7.0092C22,7.0058 22,7.0024 22,6.9991C22,6.9957 22,6.9923 22,6.9889C22,6.9855 22,6.9821 22,6.9787C22,6.9753 22,6.9719 22,6.9685C22,6.9651 22,6.9617 22,6.9584C22,6.955 22,6.9516 22,6.9482C22,6.9448 22,6.9414 22,6.938C22,6.9346 22,6.9312 22,6.9279C22,6.9245 22,6.9211 22,6.9177C22,6.9143 22,6.9109 22,6.9075C22,6.9042 22,6.9008 22,6.8974C22,6.894 22,6.8906 22,6.8872C22,6.8839 22,6.8805 22,6.8771C22,6.8737 22,6.8703 22,6.867C22,6.8636 22,6.8602 22,6.8568C22,6.8534 22,6.85 22,6.8467C22,6.8433 22,6.8399 22,6.8365C22,6.8332 22,6.8298 22,6.8264C22,6.823 22,6.8197 22,6.8163C22,6.8129 22,6.8095 22,6.8062C22,6.8028 22,6.7994 22,6.796C22,6.7927 22,6.7893 22,6.7859C22,6.7826 22,6.7792 22,6.7758C22,6.7724 22,6.7691 22,6.7657C22,6.7623 22,6.759 22,6.7556C22,6.7522 22,6.7489 22,6.7455C22,6.7421 22,6.7388 22,6.7354C22,6.732 22,6.7287 22,6.7253C22,6.722 22,6.7186 22,6.7152C22,6.7119 22,6.7085 22,6.7051C22,6.7018 22,6.6984 22,6.6951C22,6.6917 22,6.6884 22,6.685C22,6.6816 22,6.6783 22,6.6749C22,6.6716 22,6.6682 22,6.6649C22,6.6615 22,6.6581 22,6.6548C22,6.6514 22,6.6481 22,6.6447C22,6.6414 22,6.638 22,6.6347C22,6.6313 22,6.628 22,6.6246C22,6.6213 22,6.6179 22,6.6146C22,6.6112 22,6.6079 22,6.6045C22,6.6012 22,6.5978 22,6.5945C22,6.5911 22,6.5878 22,6.5845C22,6.5811 22,6.5778 22,6.5744C22,6.5711 22,6.5677 22,6.5644C22,6.5611 22,6.5577 22,6.5544C22,6.5511 22,6.5477 22,6.5444C22,6.541 22,6.5377 22,6.5344C22,6.531 22,6.5277 22,6.5244C22,6.521 22,6.5177 22,6.5144C22,6.511 22,6.5077 22,6.5044C22,6.501 22,6.4977 22,6.4944C22,6.491 22,6.4877 22,6.4844C22,6.4811 22,6.4777 22,6.4744C22,6.4711 22,6.4678 22,6.4644C22,6.4611 22,6.4578 22,6.4545C22,6.4511 22,6.4478 22,6.4445C22,6.4412 22,6.4378 22,6.4345C22,6.4312 22,6.4279 22,6.4246C22,6.4213 22,6.418 22,6.4146C22,6.4113 22,6.408 22,6.4047C22,6.4014 22,6.3981 22,6.3948C22,6.3914 22,6.3881 22,6.3848C22,6.3815 22,6.3782 22,6.3749C22,6.3716 22,6.3683 22,6.365C22,6.3617 22,6.3583 22,6.3551C22,6.3517 22,6.3484 22,6.3451C22,6.3418 22,6.3385 22,6.3352C22,6.3319 22,6.3286 22,6.3253C22,6.322 22,6.3187 22,6.3154C22,6.3121 22,6.3088 22,6.3056C22,6.3023 22,6.299 22,6.2957C22,6.2924 22,6.2891 22,6.2858C22,6.2825 22,6.2792 22,6.2759C22,6.2726 22,6.2693 22,6.2661C22,6.2628 22,6.2595 22,6.2562C22,6.2529 22,6.2496 22,6.2463C22,6.2431 22,6.2398 22,6.2365C22,6.2332 22,6.2299 22,6.2267C22,6.2234 22,6.2201 22,6.2168C22,6.2136 22,6.2103 22,6.207C22,6.2037 22,6.2004 22,6.1972C22,6.1939 22,6.1906 22,6.1874C22,6.1841 22,6.1808 22,6.1775C22,6.1743 22,6.171 22,6.1677C22,6.1645 22,6.1612 22,6.1579C22,6.1547 22,6.1514 22,6.1482C22,6.1449 22,6.1416 22,6.1384C22,6.1351 22,6.1319 22,6.1286C22,6.1253 22,6.1221 22,6.1188C22,6.1156 22,6.1123 22,6.1091C22,6.1058 22,6.1026 22,6.0993C22,6.0961 22,6.0928 22,6.0896C22,6.0863 22,6.0831 22,6.0798C22,6.0766 22,6.0733 22,6.0701C22,6.0669 22,6.0636 22,6.0604C22,6.0571 22,6.0539 22,6.0506C22,6.0474 22,6.0442 22,6.0409C22,6.0377 22,6.0345 22,6.0312C22,6.028 22,6.0248 22,6.0215C22,6.0183 22,6.015 22,6.0118C22,6.0086 22,6.0054 22,6.0021C22,5.9989 22,5.9957 22,5.9925C22,5.9892 22,5.986 22,5.9828C22,5.9796 22,5.9763 22,5.9731C22,5.9699 22,5.9667 22,5.9635C22,5.9602 22,5.957 22,5.9538C22,5.9506 22,5.9474 22,5.9442C22,5.941 22,5.9377 22,5.9345C22,5.9313 22,5.9281 22,5.9249C22,5.9217 22,5.9185 22,5.9153C22,5.9121 22,5.9089 22,5.9057C22,5.9025 22,5.8993 22,5.8961C22,5.8929 22,5.8897 22,5.8865C22,5.8833 22,5.8801 22,5.8769C22,5.8737 22,5.8705 22,5.8673C22,5.8641 22,5.8609 22,5.8577C22,5.8545 22,5.8514 22,5.8482C22,5.845 22,5.8418 22,5.8386C22,5.8354 22,5.8323 22,5.8291C22,5.8259 22,5.8227 22,5.8195C22,5.8163 22,5.8132 22,5.81C22,5.8068 22,5.8036 22,5.8005C22,5.7973 22,5.7941 22,5.7909C22,5.7878 22,5.7846 22,5.7814C22,5.7783 22,5.7751 22,5.7719C22,5.7688 22,5.7656 22,5.7625C22,5.7593 22,5.7561 22,5.753C22,5.7498 22,5.7467 22,5.7435C22,5.7403 22,5.7372 22,5.734C22,5.7309 22,5.7277 22,5.7246C22,5.7214 22,5.7183 22,5.7151C22,5.712 22,5.7088 22,5.7057C22,5.7025 22,5.6994 22,5.6962C22,5.6931 22,5.69 22,5.6868C22,5.6837 22,5.6805 22,5.6774C22,5.6743 22,5.6711 22,5.668C22,5.6649 22,5.6617 22,5.6586C22,5.6555 22,5.6523 22,5.6492C22,5.6461 22,5.643 22,5.6398C22,5.6367 22,5.6336 22,5.6305C22,5.6273 22,5.6242 22,5.6211C22,5.618 22,5.6149 22,5.6117C22,5.6086 22,5.6055 22,5.6024C22,5.5993 22,5.5962 22,5.5931C22,5.59 22,5.5869 22,5.5837C22,5.5806 22,5.5775 22,5.5744C22,5.5713 22,5.5682 22,5.5651C22,5.562 22,5.5589 22,5.5558C22,5.5527 22,5.5496 22,5.5465C22,5.5434 22,5.5403 22,5.5373C22,5.5342 22,5.5311 22,5.528C22,5.5249 22,5.5218 22,5.5187C22,5.5156 22,5.5125 22,5.5095C22,5.5064 22,5.5033 22,5.5002C22,5.4971 22,5.4941 22,5.491C22,5.4879 22,5.4848 22,5.4818C22,5.4787 22,5.4756 22,5.4726C22,5.4695 22,5.4664 22,5.4634C22,5.4603 22,5.4572 22,5.4542C22,5.4511 22,5.4481 22,5.445C22,5.4419 22,5.4389 22,5.4358C22,5.4328 22,5.4297 22,5.4267C22,5.4236 22,5.4205 22,5.4175C22,5.4145 22,5.4114 22,5.4084C22,5.4053 22,5.4023 22,5.3992C22,5.3962 22,5.3931 22,5.3901C22,5.3871 22,5.384 22,5.381C22,5.378 22,5.3749 22,5.3719C22,5.3689 22,5.3658 22,5.3628C22,5.3598 22,5.3567 22,5.3537C22,5.3507 22,5.3477 22,5.3446C22,5.3416 22,5.3386 22,5.3356C22,5.3326 22,5.3295 22,5.3265C22,5.3235 22,5.3205 22,5.3175C22,5.3145 22,5.3115 22,5.3085C22,5.3054 22,5.3025 22,5.2994C22,5.2964 22,5.2934 22,5.2904C22,5.2874 22,5.2844 22,5.2814C22,5.2784 22,5.2754 22,5.2724C22,5.2695 22,5.2665 22,5.2635C22,5.2605 22,5.2575 22,5.2545C22,5.2515 22,5.2485 22,5.2456C22,5.2426 22,5.2396 22,5.2366C22,5.2336 22,5.2306 22,5.2277C22,5.2247 22,5.2217 22,5.2188C22,5.2158 22,5.2128 22,5.2098C22,5.2069 22,5.2039 22,5.2009C22,5.198 22,5.195 22,5.192C22,5.1891 22,5.1861 22,5.1832C22,5.1802 22,5.1773 22,5.1743C22,5.1714 22,5.1684 22,5.1655C22,5.1625 22,5.1596 22,5.1566C22,5.1537 22,5.1507 22,5.1478C22,5.1448 22,5.1419 22,5.139C22,5.136 22,5.1331 22,5.1301C22,5.1272 22,5.1243 22,5.1213C22,5.1184 22,5.1155 22,5.1126C22,5.1096 22,5.1067 22,5.1038C22,5.1009 22,5.0979 22,5.095C22,5.0921 22,5.0892 22,5.0863C22,5.0834 22,5.0804 22,5.0775C22,5.0746 22,5.0717 22,5.0688C22,5.0659 22,5.063 22,5.0601C22,5.0572 22,5.0543 22,5.0514C22,5.0485 22,5.0456 22,5.0427C22,5.0398 22,5.0369 22,5.034C22,5.0311 22,5.0282 22,5.0253C22,5.0224 22,5.0196 22,5.0167C22,5.0138 22,5.0109 22,5.008C22,5.0052 22,5.0023 22,4.9994H20ZM5.8667,18.6L2.4,21.2L3.6,22.8L7.0667,20.2L5.8667,18.6ZM4,22V19H2V22H4ZM7.6667,20H9V18H7.6667V20ZM9,20H19V18H9V20ZM22,17V10H20V17H22ZM19,20C20.6569,20 22,18.6569 22,17H20C20,17.5523 19.5523,18 19,18V20ZM7.0667,20.2C7.2398,20.0702 7.4503,20 7.6667,20V18C7.0176,18 6.386,18.2105 5.8667,18.6L7.0667,20.2ZM19,4C19.5527,4 20,4.4475 20,4.9994H22C22,3.3422 20.6565,2 19,2V4ZM5,2C3.3431,2 2,3.3431 2,5H4C4,4.4477 4.4477,4 5,4V2Z"/>
+    <path android:fillColor="#00000000" android:pathData="M7,9H17"
+        android:strokeColor="#737D8C" android:strokeLineCap="round" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M7,13H12"
+        android:strokeColor="#737D8C" android:strokeLineCap="round" android:strokeWidth="2"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_thread_link_menu_item.xml b/vector/src/main/res/drawable/ic_thread_link_menu_item.xml
new file mode 100644
index 0000000000..779c9d832c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_thread_link_menu_item.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.604,5.761L13.1741,5.1909C14.7488,3.6163 17.2867,3.6012 18.8428,5.1572C20.3988,6.7132 20.3837,9.251 18.809,10.8257L16.1004,13.5342C14.5257,15.1089 11.9877,15.124 10.4317,13.568M11.3962,18.2387L10.8259,18.8091C9.2512,20.3837 6.7133,20.3988 5.1572,18.8428C3.6012,17.2868 3.6163,14.749 5.191,13.1743L7.8995,10.4659C9.4741,8.8913 12.0121,8.8762 13.5681,10.4322"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#737D8C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_thread_menu_item.xml b/vector/src/main/res/drawable/ic_thread_menu_item.xml
new file mode 100644
index 0000000000..2d77251c53
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_thread_menu_item.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="M2,5C2,3.3431 3.3431,2 5,2H19C20.6565,2 22,3.3422 22,4.9994V17C22,18.6569 20.6569,20 19,20H7.6667C7.4503,20 7.2398,20.0702 7.0667,20.2L3.6,22.8C3.297,23.0273 2.8916,23.0638 2.5528,22.8944C2.214,22.725 2,22.3788 2,22V5ZM5,9C5,8.4477 5.4477,8 6,8H18C18.5523,8 19,8.4477 19,9C19,9.5523 18.5523,10 18,10H6C5.4477,10 5,9.5523 5,9ZM6,12C5.4477,12 5,12.4477 5,13C5,13.5523 5.4477,14 6,14H12C12.5523,14 13,13.5523 13,13C13,12.4477 12.5523,12 12,12H6Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_thread_share_menu_item.xml b/vector/src/main/res/drawable/ic_thread_share_menu_item.xml
new file mode 100644
index 0000000000..cb863c39bf
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_thread_share_menu_item.xml
@@ -0,0 +1,19 @@
+<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,7C16,6.4477 16.4477,6 17,6C17.5523,6 18,6.4477 18,7C18,7.5523 17.5523,8 17,8C16.4477,8 16,7.5523 16,7ZM17,4C15.3431,4 14,5.3432 14,7C14,7.0876 14.0038,7.1744 14.0111,7.2601L8.1611,9.9192C7.6154,9.3525 6.8489,9 6,9C4.3432,9 3,10.3431 3,12C3,13.6569 4.3432,15 6,15C6.8488,15 7.6154,14.6474 8.1611,14.0808L14.0111,16.7399C14.0038,16.8256 14,16.9124 14,17C14,18.6569 15.3431,20 17,20C18.6569,20 20,18.6569 20,17C20,15.3431 18.6569,14 17,14C16.1511,14 15.3846,14.3526 14.8389,14.9192L8.9889,12.2601C8.9962,12.1744 9,12.0876 9,12C9,11.9124 8.9962,11.8256 8.9889,11.7399L14.8389,9.0808C15.3846,9.6475 16.1511,10 17,10C18.6569,10 20,8.6568 20,7C20,5.3432 18.6569,4 17,4ZM17,16C16.4477,16 16,16.4477 16,17C16,17.5523 16.4477,18 17,18C17.5523,18 18,17.5523 18,17C18,16.4477 17.5523,16 17,16ZM5,12C5,11.4477 5.4477,11 6,11C6.5523,11 7,11.4477 7,12C7,12.5523 6.5523,13 6,13C5.4477,13 5,12.5523 5,12Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17,17m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M17,7m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M6,12m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_thread_summary.xml b/vector/src/main/res/drawable/ic_thread_summary.xml
new file mode 100644
index 0000000000..5e27ad0a0a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_thread_summary.xml
@@ -0,0 +1,11 @@
+<vector android:height="16dp" android:viewportHeight="18"
+    android:viewportWidth="18" android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#737D8C" android:pathData="M14.9995,1H2.9995C1.8949,1 0.9995,1.8954 0.9995,3V14V17L4.4662,14.4C4.8124,14.1404 5.2334,14 5.6662,14H6.9995H14.9995C16.1041,14 16.9995,13.1046 16.9995,12V8V2.9994C16.9995,1.8948 16.1041,1 14.9995,1Z"/>
+    <path android:fillColor="#737D8C" android:pathData="M4.4662,14.4L4.0162,13.8H4.0162L4.4662,14.4ZM0.9995,17H0.2495C0.2495,17.2841 0.41,17.5438 0.6641,17.6708C0.9182,17.7979 1.2222,17.7704 1.4495,17.6L0.9995,17ZM2.9995,1.75H14.9995V0.25H2.9995V1.75ZM1.7495,14V3H0.2495V14H1.7495ZM16.2495,2.9994V8H17.7495V2.9994H16.2495ZM4.0162,13.8L0.5495,16.4L1.4495,17.6L4.9162,15L4.0162,13.8ZM1.7495,17V14H0.2495V17H1.7495ZM5.6662,14.75H6.9995V13.25H5.6662V14.75ZM6.9995,14.75H14.9995V13.25H6.9995V14.75ZM17.7495,12V8H16.2495V12H17.7495ZM14.9995,14.75C16.5183,14.75 17.7495,13.5188 17.7495,12H16.2495C16.2495,12.6904 15.6899,13.25 14.9995,13.25V14.75ZM4.9162,15C5.1325,14.8377 5.3957,14.75 5.6662,14.75V13.25C5.0712,13.25 4.4922,13.443 4.0162,13.8L4.9162,15ZM14.9995,1.75C15.6902,1.75 16.2495,2.3093 16.2495,2.9994H17.7495C17.7495,1.4803 16.518,0.25 14.9995,0.25V1.75ZM2.9995,0.25C1.4807,0.25 0.2495,1.4812 0.2495,3H1.7495C1.7495,2.3096 2.3092,1.75 2.9995,1.75V0.25Z"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M4.9995,6C4.9995,6 9.0943,6 12.9995,6"
+        android:strokeColor="#F4F6FA" android:strokeLineCap="round" android:strokeWidth="1.5"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M4.9995,9H8.9995"
+        android:strokeColor="#F4F6FA" android:strokeLineCap="round" android:strokeWidth="1.5"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_thread_view_in_room_menu_item.xml b/vector/src/main/res/drawable/ic_thread_view_in_room_menu_item.xml
new file mode 100644
index 0000000000..f408f99713
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_thread_view_in_room_menu_item.xml
@@ -0,0 +1,30 @@
+<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="M3,4H21"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#737D8C"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,10H16"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#737D8C"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,14H11"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#737D8C"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,20H21"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#737D8C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/notification_badge.xml b/vector/src/main/res/drawable/notification_badge.xml
new file mode 100644
index 0000000000..11f4b1d274
--- /dev/null
+++ b/vector/src/main/res/drawable/notification_badge.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- "background shadow" -->
+    <!-- background color -->
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="15dp"/>
+            <solid android:color="?vctr_content_secondary"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/overlay_bubble_media.xml b/vector/src/main/res/drawable/overlay_bubble_media.xml
new file mode 100644
index 0000000000..ce34a39037
--- /dev/null
+++ b/vector/src/main/res/drawable/overlay_bubble_media.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:type="linear"
+        android:angle="270"
+        android:startColor="#00000000"
+        android:endColor="#33000000"/>
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/reaction_divider.xml b/vector/src/main/res/drawable/reaction_divider.xml
index d68b6a9094..1d7ee57084 100644
--- a/vector/src/main/res/drawable/reaction_divider.xml
+++ b/vector/src/main/res/drawable/reaction_divider.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <size
-        android:width="8dp"
-        android:height="8dp" />
+        android:width="4dp"
+        android:height="4dp" />
     <solid android:color="#00000000" />
 </shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_threads.xml b/vector/src/main/res/layout/activity_threads.xml
new file mode 100644
index 0000000000..c34be9687d
--- /dev/null
+++ b/vector/src/main/res/layout/activity_threads.xml
@@ -0,0 +1,24 @@
+<?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:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/threadsActivityFragmentContainer"
+            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>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml b/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
deleted file mode 100644
index 7cc243ee75..0000000000
--- a/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://www.figma.com/file/HOGxCoUWoedha639SjD90n/%5BBeta%5D-Restricted-room-access?node-id=107%3A61157 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?colorSurface"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="12dp"
-        android:importantForAccessibility="no"
-        android:src="@drawable/ic_beta_pill" />
-
-    <TextView
-        style="@style/Widget.Vector.TextView.Title"
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="12dp"
-        android:gravity="start"
-        tools:text="@string/new_let_people_in_spaces_find_and_join"
-        android:textColor="?vctr_content_primary"
-        android:textStyle="bold" />
-
-    <TextView
-        style="@style/Widget.Vector.TextView.Body"
-        android:id="@+id/topDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:gravity="start"
-        android:textColor="?vctr_content_secondary"
-        tools:text="@string/help_people_in_spaces_find_and_join" />
-
-    <ImageView
-        android:id="@+id/imageHint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:importantForAccessibility="no"
-        android:maxWidth="300dp"
-        android:src="@drawable/room_settings"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <TextView
-        style="@style/Widget.Vector.TextView.Body"
-        android:id="@+id/bottomDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:gravity="start"
-        android:text="@string/this_makes_it_easy_for_rooms_to_stay_private_to_a_space"
-        android:textColor="?vctr_content_secondary"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_vertical_margin"
-        android:gravity="end"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/skipButton"
-            style="@style/Widget.Vector.Button.Text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:text="@string/action_skip"
-            android:textAllCaps="true" />
-
-        <Button
-            android:id="@+id/learnMore"
-            style="@style/Widget.Vector.Button.Positive"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/learn_more"
-            android:textAllCaps="true" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_thread_list.xml b/vector/src/main/res/layout/bottom_sheet_thread_list.xml
new file mode 100644
index 0000000000..e736f30edc
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_thread_list.xml
@@ -0,0 +1,46 @@
+<?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:background="?colorSurface"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <TextView
+        android:id="@+id/threadListModalTitle"
+        style="@style/Widget.Vector.TextView.Subtitle.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="22dp"
+        android:text="@string/thread_list_modal_title"
+        android:textColor="?vctr_content_secondary"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/threadListModalAllThreads"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        app:actionDescription="@string/thread_list_modal_all_threads_subtitle"
+        app:actionTitle="@string/thread_list_modal_all_threads_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/threadListModalTitle"
+        app:tint="?vctr_content_primary"
+        app:titleTextColor="?vctr_content_primary" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/threadListModalMyThreads"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        app:actionDescription="@string/thread_list_modal_my_threads_subtitle"
+        app:actionTitle="@string/thread_list_modal_my_threads_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/threadListModalAllThreads"
+        app:tint="?vctr_content_primary"
+        app:titleTextColor="?vctr_content_primary" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/dialog_event_content.xml b/vector/src/main/res/layout/dialog_event_content.xml
deleted file mode 100644
index d3c52a61ed..0000000000
--- a/vector/src/main/res/layout/dialog_event_content.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/event_content_text_view"
-        style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        android:fontFamily="monospace"
-        android:textColor="?vctr_content_primary"
-        android:textIsSelectable="true"
-        tools:text="Event content" />
-
-</ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml b/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml
index 21a70ded6e..76f29aaab9 100644
--- a/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml
+++ b/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml
@@ -79,7 +79,7 @@
 
         <TextView
             android:id="@+id/useCaseOptionOne"
-            style="@style/Widget.Vector.TextView.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle.Medium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -97,7 +97,7 @@
 
         <TextView
             android:id="@+id/useCaseOptionTwo"
-            style="@style/Widget.Vector.TextView.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle.Medium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -115,7 +115,7 @@
 
         <TextView
             android:id="@+id/useCaseOptionThree"
-            style="@style/Widget.Vector.TextView.Subtitle"
+            style="@style/Widget.Vector.TextView.Subtitle.Medium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -133,10 +133,12 @@
 
         <TextView
             android:id="@+id/useCaseSkip"
+            style="@style/Widget.Vector.TextView.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:clickable="true"
             android:gravity="center"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/contentFooterSpacing"
             app:layout_constraintEnd_toEndOf="@id/useCaseGutterEnd"
             app:layout_constraintStart_toStartOf="@id/useCaseGutterStart"
@@ -153,10 +155,12 @@
 
         <TextView
             android:id="@+id/useCaseFooter"
+            style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/ftue_auth_use_case_join_existing_server"
+            android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/useCaseConnectToServer"
             app:layout_constraintEnd_toEndOf="@id/useCaseGutterEnd"
             app:layout_constraintStart_toStartOf="@id/useCaseGutterStart"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index d85bd707ce..9f9bd2f58f 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="200dp"
-        android:padding="16dp"
+        android:padding="@dimen/layout_horizontal_margin"
         android:visibility="gone"
         tools:visibility="visible">
 
@@ -19,11 +19,9 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginTop="20dp"
-            android:importantForAccessibility="no"
             android:elevation="4dp"
+            android:importantForAccessibility="no"
             android:transitionName="profile"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@sample/room_round_avatars" />
@@ -31,21 +29,23 @@
         <TextView
             android:id="@+id/matrixToCardNameText"
             style="@style/Widget.Vector.TextView.Subtitle"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:maxLines="1"
             android:singleLine="true"
             android:textAlignment="textStart"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
-            app:layout_constraintTop_toBottomOf="@id/matrixToCardAvatar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/matrixToCardAvatar"
+            app:layout_constraintTop_toTopOf="@id/matrixToCardAvatar"
             tools:text="@sample/rooms.json/data/name" />
 
         <TextView
             android:id="@+id/matrixToCardAliasText"
             style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:maxLines="1"
@@ -53,6 +53,8 @@
             android:textAlignment="textStart"
             android:textColor="?vctr_content_secondary"
             android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/matrixToCardNameText"
             app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
             app:layout_goneMarginTop="0dp"
             tools:text="@sample/rooms.json/data/alias"
@@ -65,7 +67,7 @@
             android:importantForAccessibility="no"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@id/matrixToAccessText"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="@id/matrixToCardNameText"
             app:layout_constraintTop_toTopOf="@id/matrixToAccessText"
             app:tint="?vctr_content_secondary"
             tools:ignore="MissingPrefix"
@@ -75,7 +77,7 @@
         <TextView
             android:id="@+id/matrixToAccessText"
             style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
@@ -89,6 +91,13 @@
             tools:text="Public Space"
             tools:visibility="visible" />
 
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/matrixToHeaderBarrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="matrixToAccessText, matrixToCardAvatar" />
+
         <LinearLayout
             android:id="@+id/matrixToMemberPills"
             android:layout_width="wrap_content"
@@ -105,7 +114,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/matrixToAccessText">
+            app:layout_constraintTop_toBottomOf="@id/matrixToHeaderBarrier">
 
             <ImageView
                 android:id="@+id/spaceChildMemberCountIcon"
diff --git a/vector/src/main/res/layout/fragment_qr_code_scanner.xml b/vector/src/main/res/layout/fragment_qr_code_scanner.xml
index c17c0d90da..fbde73c709 100644
--- a/vector/src/main/res/layout/fragment_qr_code_scanner.xml
+++ b/vector/src/main/res/layout/fragment_qr_code_scanner.xml
@@ -1,6 +1,7 @@
 <?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">
 
@@ -21,7 +22,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <me.dm7.barcodescanner.zxing.ZXingScannerView
-        android:id="@+id/scannerView"
+        android:id="@+id/qrScannerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -30,29 +31,44 @@
         app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
     <!-- TODO In the future we could add a toggle to switch the flash, and other possible settings -->
+    <Button
+        android:id="@+id/userCodeMyCodeButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/layout_vertical_margin_big"
+        android:maxWidth="160dp"
+        android:text="@string/user_code_my_code"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:visibility="visible" />
 
-    <!-- TODO add take from album option.. -->
-    <!--    <Button-->
-    <!--        android:id="@+id/openAlbumButton"-->
-    <!--        style="@style/Widget.MaterialComponents.Button.Icon"-->
-    <!--        android:layout_width="34dp"-->
-    <!--        android:layout_height="34dp"-->
-    <!--        android:layout_marginEnd="@dimen/layout_horizontal_margin"-->
-    <!--        android:layout_marginBottom="@dimen/layout_vertical_margin_big"-->
-    <!--        android:backgroundTint="?vctr_bottom_nav_background_color"-->
-    <!--        android:elevation="0dp"-->
-    <!--        android:insetLeft="0dp"-->
-    <!--        android:insetTop="0dp"-->
-    <!--        android:insetRight="0dp"-->
-    <!--        android:insetBottom="0dp"-->
-    <!--        android:padding="0dp"-->
-    <!--        app:cornerRadius="17dp"-->
-    <!--        app:icon="@drawable/ic_picture_icon"-->
-    <!--        app:iconGravity="textStart"-->
-    <!--        app:iconPadding="0dp"-->
-    <!--        app:iconSize="20dp"-->
-    <!--        app:iconTint="?colorPrimary"-->
-    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--        app:layout_constraintEnd_toEndOf="parent"/>-->
+    <Button
+        android:id="@+id/userCodeOpenGalleryButton"
+        style="@style/Widget.MaterialComponents.Button.Icon"
+        android:layout_width="34dp"
+        android:layout_height="34dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:backgroundTint="?colorSurface"
+        android:elevation="0dp"
+        android:insetLeft="0dp"
+        android:insetTop="0dp"
+        android:insetRight="0dp"
+        android:insetBottom="0dp"
+        android:padding="0dp"
+        android:visibility="gone"
+        app:cornerRadius="17dp"
+        app:icon="@drawable/ic_picture_icon"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:iconSize="20dp"
+        app:iconTint="?colorPrimary"
+        app:layout_constraintBottom_toBottomOf="@id/userCodeMyCodeButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/userCodeMyCodeButton"
+        app:layout_constraintTop_toTopOf="@id/userCodeMyCodeButton"
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml b/vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
deleted file mode 100644
index 88b07a7655..0000000000
--- a/vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
+++ /dev/null
@@ -1,67 +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"
-    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/qrScannerToolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?actionBarSize"
-            app:title="@string/user_code_scan" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <me.dm7.barcodescanner.zxing.ZXingScannerView
-        android:id="@+id/userCodeScannerView"
-        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" />
-
-    <Button
-        android:id="@+id/userCodeMyCodeButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/layout_vertical_margin_big"
-        android:maxWidth="160dp"
-        android:text="@string/user_code_my_code"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Button
-        android:id="@+id/userCodeOpenGalleryButton"
-        style="@style/Widget.MaterialComponents.Button.Icon"
-        android:layout_width="34dp"
-        android:layout_height="34dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:backgroundTint="?colorSurface"
-        android:elevation="0dp"
-        android:insetLeft="0dp"
-        android:insetTop="0dp"
-        android:insetRight="0dp"
-        android:insetBottom="0dp"
-        android:padding="0dp"
-        app:cornerRadius="17dp"
-        app:icon="@drawable/ic_picture_icon"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:iconSize="20dp"
-        app:iconTint="?colorPrimary"
-        app:layout_constraintBottom_toBottomOf="@id/userCodeMyCodeButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/userCodeMyCodeButton"
-        app:layout_constraintTop_toTopOf="@id/userCodeMyCodeButton" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index e1e555eace..e3e5fe7e45 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -13,7 +13,7 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/Widget.Vector.TextView.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -53,12 +53,23 @@
             android:layout_marginBottom="16dp"
             app:icon="@drawable/ic_member_small"
             app:iconTint="?vctr_content_secondary"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/changeLaterText"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:subTitle="@string/create_spaces_private_teammates"
             app:title="@string/create_spaces_me_and_teammates" />
 
+        <TextView
+            android:id="@+id/changeLaterText"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="24dp"
+            android:gravity="center"
+            android:text="@string/create_spaces_you_can_change_later"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index b675ec9b30..dd448bc967 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -12,26 +12,14 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/Widget.Vector.TextView.Subtitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/create_spaces_type_header"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
             style="@style/Widget.Vector.TextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
             android:gravity="center"
             android:text="@string/create_spaces_choose_type_label"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
-            app:layout_constraintTop_toBottomOf="@id/headerText"
-            app:layout_constraintVertical_bias="1" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/joinInfoHelpText"
@@ -42,7 +30,7 @@
             android:gravity="center"
             android:text="@string/create_spaces_join_info_help"
             android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@id/publicButton" />
+            app:layout_constraintTop_toBottomOf="@id/headerText" />
 
         <im.vector.app.features.spaces.create.WizardButtonView
             android:id="@+id/publicButton"
diff --git a/vector/src/main/res/layout/fragment_thread_list.xml b/vector/src/main/res/layout/fragment_thread_list.xml
new file mode 100644
index 0000000000..7e7c79f8c3
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_thread_list.xml
@@ -0,0 +1,115 @@
+<?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/threadListAppBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/threadListToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?actionBarSize"
+            android:transitionName="toolbar">
+
+            <include
+                android:id="@+id/includeThreadListToolbar"
+                layout="@layout/view_room_detail_thread_toolbar" />
+
+        </com.google.android.material.appbar.MaterialToolbar>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/threadListRecyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="?android:colorBackground"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/threadListAppBarLayout"
+        tools:listitem="@layout/item_thread"
+        tools:visibility="gone" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/threadListEmptyConstraintLayout"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
+        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">
+
+        <ImageView
+            android:id="@+id/threadListEmptyImageView"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="24dp"
+            android:background="@drawable/bg_rounded_button"
+            android:backgroundTint="?vctr_system"
+            android:contentDescription="@string/avatar"
+            android:padding="18dp"
+            app:layout_constraintBottom_toTopOf="@id/threadListEmptyTitleTextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:srcCompat="@drawable/ic_thread_menu_item"
+            app:tint="?vctr_content_secondary" />
+
+        <TextView
+            android:id="@+id/threadListEmptyTitleTextView"
+            style="@style/Widget.Vector.TextView.Subtitle.Medium"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:textColor="?vctr_content_primary"
+            app:layout_constraintBottom_toTopOf="@id/threadListEmptySubtitleTextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:gravity="center"
+            app:layout_constraintTop_toBottomOf="@id/threadListEmptyImageView"
+            android:text="@string/thread_list_empty_title" />
+
+        <TextView
+            android:id="@+id/threadListEmptySubtitleTextView"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:gravity="center"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toTopOf="@id/threadListEmptyNoticeTextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/threadListEmptyTitleTextView"
+            android:text="@string/thread_list_empty_subtitle" />
+
+        <TextView
+            android:id="@+id/threadListEmptyNoticeTextView"
+            style="@style/Widget.Vector.TextView.Caption"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            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/threadListEmptySubtitleTextView"
+            tools:text="@string/thread_list_empty_notice" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_timeline.xml
similarity index 59%
rename from vector/src/main/res/layout/fragment_room_detail.xml
rename to vector/src/main/res/layout/fragment_timeline.xml
index 65c106d6f3..cb8e984cc6 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_timeline.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:minHeight="48dp"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="gone" />
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/roomToolbar"
@@ -26,99 +26,13 @@
             android:layout_height="?actionBarSize"
             android:transitionName="toolbar">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/roomToolbarContentView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+            <include
+                android:id="@+id/includeThreadToolbar"
+                layout="@layout/view_room_detail_thread_toolbar" />
 
-                <ImageView
-                    android:id="@+id/roomToolbarAvatarImageView"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:importantForAccessibility="no"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@sample/room_round_avatars" />
-
-                <im.vector.app.core.ui.views.ShieldImageView
-                    android:id="@+id/roomToolbarDecorationImageView"
-                    android:layout_width="17dp"
-                    android:layout_height="17dp"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginTop="2dp"
-                    app:layout_constraintBottom_toBottomOf="@id/roomToolbarTitleView"
-                    app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
-                    app:layout_constraintTop_toTopOf="@id/roomToolbarTitleView" />
-
-                <im.vector.app.core.ui.views.PresenceStateImageView
-                    android:id="@+id/roomToolbarPresenceImageView"
-                    android:layout_width="12dp"
-                    android:layout_height="12dp"
-                    android:background="@drawable/background_circle"
-                    android:padding="2dp"
-                    android:visibility="gone"
-                    app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
-                    app:layout_constraintCircleAngle="135"
-                    app:layout_constraintCircleRadius="20dp"
-                    tools:ignore="MissingConstraints"
-                    tools:layout_constraintCircleRadius="8dp"
-                    tools:src="@drawable/ic_presence_offline"
-                    tools:visibility="visible" />
-
-                <ImageView
-                    android:id="@+id/roomToolbarPublicImageView"
-                    android:layout_width="13dp"
-                    android:layout_height="13dp"
-                    android:background="@drawable/background_circle"
-                    android:contentDescription="@string/a11y_public_room"
-                    android:padding="1dp"
-                    android:src="@drawable/ic_public_room"
-                    android:visibility="gone"
-                    app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
-                    app:layout_constraintCircleAngle="135"
-                    app:layout_constraintCircleRadius="20dp"
-                    tools:ignore="MissingConstraints"
-                    tools:visibility="visible" />
-
-                <TextView
-                    android:id="@+id/roomToolbarTitleView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginEnd="8dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textAppearance="@style/TextAppearance.Vector.Widget.ActionBarTitle"
-                    app:layout_constraintBottom_toTopOf="@id/roomToolbarSubtitleView"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@id/roomToolbarDecorationImageView"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed"
-                    app:layout_goneMarginStart="7dp"
-                    tools:text="@sample/rooms.json/data/name" />
-
-                <TextView
-                    android:id="@+id/roomToolbarSubtitleView"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="7dp"
-                    android:layout_marginEnd="8dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textAppearance="@style/TextAppearance.Vector.Widget.ActionBarSubTitle"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
-                    app:layout_constraintTop_toBottomOf="@id/roomToolbarTitleView"
-                    tools:text="@sample/rooms.json/data/topic"
-                    tools:visibility="visible" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            <include
+                android:id="@+id/includeRoomToolbar"
+                layout="@layout/view_room_detail_toolbar" />
 
         </com.google.android.material.appbar.MaterialToolbar>
 
diff --git a/vector/src/main/res/layout/item_autocomplete_header_item.xml b/vector/src/main/res/layout/item_autocomplete_header_item.xml
new file mode 100644
index 0000000000..f842129e0c
--- /dev/null
+++ b/vector/src/main/res/layout/item_autocomplete_header_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:colorBackground"
+    android:orientation="horizontal"
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
+
+    <TextView
+        android:id="@+id/headerItemAutocompleteTitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:maxLines="1"
+        android:textColor="?vctr_content_secondary"
+        tools:text="Users" />
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index e40760e046..b41fda99fb 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -35,6 +35,7 @@
         android:singleLine="true"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toStartOf="@id/bottom_sheet_message_preview_timestamp"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toTopOf="@id/bottom_sheet_message_preview_avatar"
@@ -78,6 +79,7 @@
         android:maxLines="3"
         android:textColor="?vctr_content_secondary"
         android:textIsSelectable="false"
+        android:textAlignment="viewStart"
         app:layout_constraintBottom_toTopOf="@id/bottom_sheet_message_preview_body_details"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
@@ -96,6 +98,7 @@
         android:textColor="?vctr_content_tertiary"
         android:textIsSelectable="false"
         android:visibility="gone"
+        android:textAlignment="viewStart"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/bottom_sheet_message_preview_body"
         app:layout_constraintStart_toStartOf="@id/bottom_sheet_message_preview_body"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 41cc2cb02a..7dc7984b4a 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -15,7 +15,7 @@
         android:id="@+id/roomUnreadIndicator"
         android:layout_width="4dp"
         android:layout_height="0dp"
-        android:background="?colorSecondary"
+        android:background="?vctr_content_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -165,7 +165,6 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/roomNameView"
         app:layout_constraintEnd_toStartOf="@id/roomLastEventTimeView"
-        app:layout_constraintStart_toEndOf="@id/roomDraftBadge"
         app:layout_constraintTop_toTopOf="@id/roomNameView"
         tools:background="@drawable/bg_unread_highlight"
         tools:text="4"
@@ -192,6 +191,7 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAlignment="viewStart"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/roomNameView"
@@ -207,6 +207,7 @@
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAlignment="viewStart"
         android:textColor="?colorPrimary"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index bdd1294b88..3264a7d230 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -62,4 +62,66 @@
         app:layout_constraintTop_toBottomOf="@id/messageMemberNameView"
         tools:text="@sample/messages.json/data/message" />
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/searchThreadSummaryConstraintLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constrainedWidth="true"
+        android:layout_below="@id/informationBottom"
+        app:layout_constraintHorizontal_bias="0"
+        android:layout_toEndOf="@id/messageStartGuideline"
+        android:background="@drawable/rounded_rect_shape_8"
+        android:contentDescription="@string/room_threads_filter"
+        android:maxWidth="496dp"
+        android:minWidth="144dp"
+        android:paddingStart="13dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="13dp"
+        android:paddingBottom="10dp"
+        android:visibility="gone"
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="@id/messageContentView"
+        app:layout_constraintStart_toStartOf="@id/messageContentView"
+        app:layout_constraintTop_toBottomOf="@id/messageContentView"
+        tools:visibility="gone">
+
+        <include layout="@layout/view_thread_room_summary" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/searchFromThreadConstraintLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:paddingBottom="12dp"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="@id/messageContentView"
+        app:layout_constraintTop_toBottomOf="@id/messageContentView"
+        tools:visibility="visible">
+
+        <ImageView
+            android:id="@+id/searchFromThreadImageView"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_marginTop="2dp"
+            android:contentDescription="@string/room_threads_filter"
+            android:src="@drawable/ic_thread_summary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/searchFromThreadTextView"
+            style="@style/Widget.Vector.TextView.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:minEms="1"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/searchFromThreadImageView"
+            app:layout_constraintTop_toTopOf="parent"
+            android:text="@string/search_thread_from_a_thread" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_thread.xml b/vector/src/main/res/layout/item_thread.xml
new file mode 100644
index 0000000000..37186f031c
--- /dev/null
+++ b/vector/src/main/res/layout/item_thread.xml
@@ -0,0 +1,111 @@
+<?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/threadSummaryRootConstraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:colorBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    android:paddingStart="12dp"
+    android:paddingTop="12dp"
+    android:paddingEnd="0dp">
+
+    <ImageView
+        android:id="@+id/threadSummaryAvatarImageView"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/user_round_avatars" />
+
+    <TextView
+        android:id="@+id/threadSummaryTitleTextView"
+        style="@style/Widget.Vector.TextView.Body.Medium"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/element_name_04"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@id/threadSummaryDateTextView"
+        app:layout_constraintStart_toEndOf="@id/threadSummaryAvatarImageView"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Aris Kots" />
+
+
+    <TextView
+        android:id="@+id/threadSummaryDateTextView"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="28dp"
+        android:gravity="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_secondary"
+        app:layout_constraintBottom_toBottomOf="@id/threadSummaryTitleTextView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/threadSummaryTitleTextView"
+        tools:text="10 minutes" />
+
+    <ImageView
+        android:id="@+id/threadSummaryUnreadImageView"
+        android:layout_width="8dp"
+        android:layout_height="8dp"
+        android:src="@drawable/notification_badge"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/threadSummaryDateTextView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/threadSummaryDateTextView"
+        app:layout_constraintTop_toTopOf="@id/threadSummaryDateTextView"
+        app:tint="@color/palette_gray_200"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/threadSummaryRootMessageTextView"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="25dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?vctr_content_primary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/threadSummaryTitleTextView"
+        app:layout_constraintTop_toBottomOf="@id/threadSummaryTitleTextView"
+        tools:text="It’s really encouraging to feel like you are a part of something greater than yourself. I It’s really encouraging to feel like you are a part of something greater than yourself. I " />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/threadSummaryConstraintLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="25dp"
+        android:contentDescription="@string/room_threads_filter"
+        android:maxWidth="496dp"
+        android:minWidth="144dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/threadSummaryTitleTextView"
+        app:layout_constraintTop_toBottomOf="@id/threadSummaryRootMessageTextView"
+        tools:visibility="visible">
+
+        <include layout="@layout/view_thread_room_summary" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?vctr_content_quinary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/threadSummaryConstraintLayout"
+        app:layout_constraintTop_toBottomOf="@id/threadSummaryConstraintLayout" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 6360b287d0..bc02728f6e 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -34,6 +34,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="4dp"
+        android:textAlignment="viewStart"
         android:layout_toStartOf="@id/messageTimeView"
         android:layout_toEndOf="@id/messageStartGuideline"
         android:ellipsize="end"
@@ -76,66 +77,16 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-    <FrameLayout
+    <include
         android:id="@+id/viewStubContainer"
-        android:layout_width="match_parent"
+        layout="@layout/item_timeline_event_view_stubs_container"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/messageMemberNameView"
         android:layout_marginEnd="8dp"
         android:layout_toStartOf="@id/messageSendStateImageView"
         android:layout_toEndOf="@id/messageStartGuideline"
-        android:addStatesFromChildren="true">
-
-        <ViewStub
-            android:id="@+id/messageContentTextStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:layout="@layout/item_timeline_event_text_message_stub"
-            tools:visibility="visible" />
-
-        <ViewStub
-            android:id="@+id/messageContentCodeBlockStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:layout="@layout/item_timeline_event_code_block_stub"
-            tools:visibility="visible" />
-
-        <ViewStub
-            android:id="@+id/messageContentMediaStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/messageContentMedia"
-            android:layout="@layout/item_timeline_event_media_message_stub" />
-
-        <ViewStub
-            android:id="@+id/messageContentFileStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:layout="@layout/item_timeline_event_file_stub" />
-
-        <ViewStub
-            android:id="@+id/messageContentRedactedStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout_height="wrap_content"
-            android:layout="@layout/item_timeline_event_redacted_stub" />
-
-        <ViewStub
-            android:id="@+id/messageContentVoiceStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout="@layout/item_timeline_event_voice_stub"
-            tools:visibility="visible" />
-
-        <ViewStub
-            android:id="@+id/messageContentPollStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout="@layout/item_timeline_event_poll" />
-
-        <ViewStub
-            android:id="@+id/messageContentLocationStub"
-            style="@style/TimelineContentStubBaseParams"
-            android:layout="@layout/item_timeline_event_location_stub" />
-
-    </FrameLayout>
+        android:addStatesFromChildren="true" />
 
     <im.vector.app.core.ui.views.SendStateImageView
         android:id="@+id/messageSendStateImageView"
@@ -196,4 +147,27 @@
         </com.google.android.flexbox.FlexboxLayout>
     </LinearLayout>
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/messageThreadSummaryConstraintLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/informationBottom"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="4dp"
+        android:paddingStart="13dp"
+        android:paddingEnd="13dp"
+        android:layout_toEndOf="@id/messageStartGuideline"
+        android:background="@drawable/rounded_rect_shape_8"
+        android:contentDescription="@string/room_threads_filter"
+        android:maxWidth="496dp"
+        android:minWidth="144dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <include layout="@layout/view_thread_room_summary" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index f400fc6a9a..28a79de6bf 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -23,6 +23,7 @@
 
     <FrameLayout
         android:id="@+id/viewStubContainer"
+        style="@style/TimelineContentStubContainerParams"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index ba546c040f..927abbfd16 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -31,6 +31,7 @@
 
     <FrameLayout
         android:id="@+id/viewStubContainer"
+        style="@style/TimelineContentStubContainerParams"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
diff --git a/vector/src/main/res/layout/item_timeline_event_bubble_incoming_base.xml b/vector/src/main/res/layout/item_timeline_event_bubble_incoming_base.xml
new file mode 100644
index 0000000000..5052efb46e
--- /dev/null
+++ b/vector/src/main/res/layout/item_timeline_event_bubble_incoming_base.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.features.home.room.detail.timeline.view.MessageBubbleView 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:addStatesFromChildren="true"
+    app:incoming_style="true" />
diff --git a/vector/src/main/res/layout/item_timeline_event_bubble_outgoing_base.xml b/vector/src/main/res/layout/item_timeline_event_bubble_outgoing_base.xml
new file mode 100644
index 0000000000..0a58a53b88
--- /dev/null
+++ b/vector/src/main/res/layout/item_timeline_event_bubble_outgoing_base.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.features.home.room.detail.timeline.view.MessageBubbleView 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:addStatesFromChildren="true"
+    app:incoming_style="false" />
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index 000429cc68..8225f52bb8 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -19,9 +19,8 @@
     <TextView
         android:id="@+id/itemDefaultTextView"
         style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index 8a422ed177..41e4a118a3 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -1,80 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/messageFileLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
+    android:orientation="vertical"
     tools:viewBindingIgnore="true">
 
-    <im.vector.app.core.ui.views.ShieldImageView
-        android:id="@+id/messageFilee2eIcon"
-        android:layout_width="14dp"
-        android:layout_height="14dp"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <!-- the media type -->
-    <RelativeLayout
-        android:id="@+id/messageFileImageView"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="4dp"
-        app:layout_constraintStart_toEndOf="@id/messageFilee2eIcon"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/view_file_icon" />
-    </RelativeLayout>
-
-    <!--    <ImageView-->
-    <!--        android:id="@+id/messageFileImageView"-->
-    <!--        android:layout_width="@dimen/chat_avatar_size"-->
-    <!--        android:layout_height="@dimen/chat_avatar_size"-->
-    <!--        android:layout_marginStart="4dp"-->
-    <!--        app:layout_constraintStart_toEndOf="@id/messageFilee2eIcon"-->
-    <!--        app:layout_constraintTop_toTopOf="parent"-->
-    <!--        tools:src="@drawable/filetype_attachment" />-->
-
-    <!-- the media -->
-    <TextView
-        android:id="@+id/messageFilenameView"
-        style="@style/Widget.Vector.TextView.Body"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/messageFileMainLayout"
+        style="@style/TimelineContentMediaPillStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="32dp"
-        android:autoLink="none"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/chat_avatar_size"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/messageFileImageView"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="A filename here" />
+        tools:viewBindingIgnore="true">
 
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/horizontalBarrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="messageFileImageView,messageFilenameView" />
+        <FrameLayout
+            android:id="@+id/messageFileImageView"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+            <include layout="@layout/view_file_icon" />
+
+        </FrameLayout>
+
+        <!-- the file name-->
+        <TextView
+            android:id="@+id/messageFilenameView"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:autoLink="none"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/messageFileImageView"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:text="A filename here" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
         android:id="@+id/messageFileUploadProgressLayout"
         layout="@layout/media_upload_download_progress_layout"
-        android:layout_width="0dp"
-        android:layout_height="46dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="32dp"
         android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/horizontalBarrier"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_location_stub.xml b/vector/src/main/res/layout/item_timeline_event_location_stub.xml
index 316470b5f1..f735c2b00e 100644
--- a/vector/src/main/res/layout/item_timeline_event_location_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_location_stub.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    app:cardCornerRadius="8dp">
+    android:layout_height="wrap_content">
 
+    <!-- Size will be overrode -->
     <ImageView
         android:id="@+id/staticMapImageView"
-        android:layout_width="match_parent"
+        android:layout_width="300dp"
         android:layout_height="200dp"
-        android:contentDescription="@string/a11y_static_map_image" />
+        android:contentDescription="@string/a11y_static_map_image"
+        android:scaleType="centerCrop"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/backgrounds/scenic" />
 
     <ImageView
         android:id="@+id/staticMapPinImageView"
@@ -19,6 +23,26 @@
         android:layout_gravity="center"
         android:layout_marginBottom="28dp"
         android:importantForAccessibility="no"
-        android:src="@drawable/bg_map_user_pin" />
+        android:src="@drawable/bg_map_user_pin"
+        app:layout_constraintBottom_toBottomOf="@id/staticMapImageView"
+        app:layout_constraintEnd_toEndOf="@id/staticMapImageView"
+        app:layout_constraintStart_toStartOf="@id/staticMapImageView"
+        app:layout_constraintTop_toTopOf="@id/staticMapImageView" />
 
-</com.google.android.material.card.MaterialCardView>
+    <TextView
+        android:id="@+id/staticMapErrorTextView"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|bottom"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="54dp"
+        android:text="@string/location_timeline_failed_to_load_map"
+        android:textColor="?vctr_content_tertiary"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@id/staticMapPinImageView"
+        app:layout_constraintStart_toStartOf="@id/staticMapPinImageView"
+        app:layout_constraintTop_toBottomOf="@id/staticMapPinImageView"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
index 60fe8dafcd..7b3c5199b7 100644
--- a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
@@ -10,7 +10,6 @@
         android:id="@+id/messageThumbnailView"
         android:layout_width="375dp"
         android:layout_height="0dp"
-        android:layout_marginEnd="32dp"
         android:contentDescription="@string/a11y_image"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
@@ -25,6 +24,7 @@
         android:layout_height="40dp"
         android:contentDescription="@string/action_play"
         android:src="@drawable/ic_material_play_circle"
+        app:tint="?vctr_system"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/messageThumbnailView"
         app:layout_constraintEnd_toEndOf="@id/messageThumbnailView"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index e6ccdc4256..9d3a3c4098 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -19,9 +19,8 @@
     <TextView
         android:id="@+id/itemNoticeTextView"
         style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_poll.xml b/vector/src/main/res/layout/item_timeline_event_poll.xml
index 575b2b4d4e..64444e2c69 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll.xml
@@ -2,17 +2,19 @@
 <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:minWidth="@dimen/chat_bubble_fixed_size"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/questionTextView"
         style="@style/Widget.Vector.TextView.Subtitle"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
+        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 3f9feb93af..e2a11c7926 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -17,11 +17,10 @@
 
     <im.vector.app.features.home.room.detail.timeline.url.PreviewUrlView
         android:id="@+id/messageUrlPreview"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="4dp"
-        android:foreground="?attr/selectableItemBackground"
         android:visibility="gone"
         tools:visibility="visible" />
 
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
new file mode 100644
index 0000000000..667db8fee2
--- /dev/null
+++ b/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/TimelineContentStubContainerParams"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:addStatesFromChildren="true">
+
+    <ViewStub
+        android:id="@+id/messageContentTextStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout="@layout/item_timeline_event_text_message_stub"
+        tools:visibility="visible" />
+
+    <ViewStub
+        android:id="@+id/messageContentMediaStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inflatedId="@+id/messageContentMedia"
+        android:layout="@layout/item_timeline_event_media_message_stub" />
+
+    <ViewStub
+        android:id="@+id/messageContentFileStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout="@layout/item_timeline_event_file_stub"
+        tools:visibility="gone" />
+
+    <ViewStub
+        android:id="@+id/messageContentRedactedStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout="@layout/item_timeline_event_redacted_stub" />
+
+    <ViewStub
+        android:id="@+id/messageContentVoiceStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout="@layout/item_timeline_event_voice_stub"
+        tools:visibility="gone" />
+
+    <ViewStub
+        android:id="@+id/messageContentPollStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout="@layout/item_timeline_event_poll" />
+
+    <ViewStub
+        android:id="@+id/messageContentLocationStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout="@layout/item_timeline_event_location_stub" />
+
+
+</FrameLayout>
+
+
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_stub.xml
index 5cdd5a815a..a180afbf8e 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_stub.xml
@@ -1,31 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/voiceLayout"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minWidth="@dimen/chat_bubble_fixed_size"
     tools:viewBindingIgnore="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/voicePlaybackLayout"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/bg_voice_playback"
-        android:backgroundTint="?vctr_content_quinary"
-        android:minHeight="48dp"
-        android:paddingStart="8dp"
-        android:paddingTop="6dp"
-        android:paddingEnd="8dp"
-        android:paddingBottom="6dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        style="@style/TimelineContentMediaPillStyle">
 
         <ImageButton
             android:id="@+id/voicePlaybackControlButton"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/item_event_message_media_button_size"
+            android:layout_height="@dimen/item_event_message_media_button_size"
             android:background="@drawable/bg_voice_play_pause_button"
             android:backgroundTint="?android:colorBackground"
             android:contentDescription="@string/a11y_play_voice_message"
@@ -65,16 +58,12 @@
     <include
         android:id="@+id/messageFileUploadProgressLayout"
         layout="@layout/media_upload_download_progress_layout"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="46dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="32dp"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/voicePlaybackLayout"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index a6d84407ce..ca1b17984b 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -3,11 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-    android:layout_height="26dp"
+    android:layout_height="wrap_content"
     android:background="@drawable/reaction_rounded_rect_shape"
     android:clipChildren="false"
     android:gravity="center"
-    android:minWidth="44dp"
     tools:parentTag="android.widget.LinearLayout">
 
     <!--<View-->
@@ -20,12 +19,10 @@
         android:id="@+id/reactionText"
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
-        android:layout_marginStart="6dp"
+        android:layout_height="wrap_content"
         android:ellipsize="middle"
         android:gravity="center"
         android:maxEms="10"
-        android:minWidth="20dp"
         android:singleLine="true"
         android:textColor="@color/emoji_color"
         tools:text="* Party Parrot Again * 👀" />
@@ -36,7 +33,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="2dp"
-        android:layout_marginEnd="8dp"
         android:gravity="center"
         android:maxLines="1"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/view_file_icon.xml b/vector/src/main/res/layout/view_file_icon.xml
index 1c5268a50b..db88802ba1 100644
--- a/vector/src/main/res/layout/view_file_icon.xml
+++ b/vector/src/main/res/layout/view_file_icon.xml
@@ -2,22 +2,22 @@
 <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="50dp"
-    android:layout_height="50dp"
-    tools:parentTag="android.widget.RelativeLayout">
+    android:layout_width="32dp"
+    android:layout_height="32dp"
+    tools:parentTag="android.widget.FrameLayout">
 
     <ProgressBar
         android:id="@+id/messageFileProgressbar"
         style="@style/Widget.Vector.ProgressBar.Horizontal.File"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:progress="40" />
+        tools:progress="40" />
 
     <ImageView
         android:id="@+id/messageFileIconView"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_centerInParent="true"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_gravity="center"
         android:contentDescription="@string/attachment_type_file"
         android:src="@drawable/ic_download"
         app:tint="?vctr_notice_secondary"
diff --git a/vector/src/main/res/layout/view_message_bubble.xml b/vector/src/main/res/layout/view_message_bubble.xml
new file mode 100644
index 0000000000..e6f24e43c5
--- /dev/null
+++ b/vector/src/main/res/layout/view_message_bubble.xml
@@ -0,0 +1,228 @@
+<?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="android.widget.RelativeLayout">
+
+    <im.vector.app.core.platform.CheckableView
+        android:id="@+id/messageSelectedBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignBottom="@id/informationBottom"
+        android:layout_alignParentTop="true"
+        android:background="@drawable/highlighted_message_background" />
+
+    <ImageView
+        android:id="@+id/messageAvatarImageView"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="4dp"
+        android:background="@drawable/bg_avatar_border"
+        android:contentDescription="@string/avatar"
+        android:elevation="2dp"
+        android:padding="2dp"
+        tools:src="@sample/user_round_avatars" />
+
+    <TextView
+        android:id="@+id/messageMemberNameView"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="4dp"
+        android:layout_toEndOf="@id/messageStartGuideline"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="viewStart"
+        android:textColor="?vctr_content_primary"
+        android:textStyle="bold"
+        tools:text="@sample/users.json/data/displayName" />
+
+    <View
+        android:id="@+id/messageStartGuideline"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        tools:layout_marginStart="52dp" />
+
+    <View
+        android:id="@+id/messageEndGuideline"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="64dp" />
+
+    <Space
+        android:id="@+id/decorationSpace"
+        android:layout_width="4dp"
+        android:layout_height="8dp"
+        android:layout_toEndOf="@id/messageStartGuideline" />
+
+    <im.vector.app.core.ui.views.ShieldImageView
+        android:id="@+id/messageE2EDecoration"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_alignTop="@id/bubbleWrapper"
+        android:layout_alignEnd="@id/decorationSpace"
+        android:layout_marginTop="7dp"
+        android:elevation="2dp"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <FrameLayout
+        android:id="@+id/bubbleWrapper"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/messageMemberNameView"
+        android:layout_toStartOf="@id/messageEndGuideline"
+        android:layout_toEndOf="@id/messageStartGuideline"
+        android:addStatesFromChildren="true"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/bubbleView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp"
+            android:addStatesFromChildren="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include
+                android:id="@+id/viewStubContainer"
+                layout="@layout/item_timeline_event_view_stubs_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:addStatesFromChildren="true"
+                app:layout_constrainedWidth="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintWidth_max="@dimen/chat_bubble_fixed_size" />
+
+            <View
+                android:id="@+id/messageOverlayView"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="@drawable/overlay_bubble_media"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@id/viewStubContainer"
+                app:layout_constraintEnd_toEndOf="@id/viewStubContainer"
+                app:layout_constraintStart_toStartOf="@id/viewStubContainer"
+                app:layout_constraintTop_toTopOf="@id/viewStubContainer"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/messageTimeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="4dp"
+                android:textColor="?vctr_content_tertiary"
+                android:textSize="10sp"
+                app:layout_constraintBottom_toBottomOf="@id/viewStubContainer"
+                app:layout_constraintEnd_toEndOf="parent"
+                tools:text="@tools:sample/date/hhmm" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
+
+    <im.vector.app.core.ui.views.SendStateImageView
+        android:id="@+id/messageSendStateImageView"
+        android:layout_width="@dimen/item_event_message_state_size"
+        android:layout_height="@dimen/item_event_message_state_size"
+        android:layout_alignBottom="@id/bubbleWrapper"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="4dp"
+        android:contentDescription="@string/event_status_a11y_sending"
+        android:src="@drawable/ic_sending_message"
+        android:visibility="invisible"
+        tools:tint="?vctr_content_tertiary"
+        tools:visibility="visible" />
+
+    <ProgressBar
+        android:id="@+id/eventSendingIndicator"
+        android:layout_width="@dimen/item_event_message_state_size"
+        android:layout_height="@dimen/item_event_message_state_size"
+        android:layout_alignBottom="@id/bubbleWrapper"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="4dp"
+        android:indeterminateTint="?vctr_content_secondary"
+        android:visibility="gone"
+        app:tint="?vctr_content_tertiary"
+        tools:ignore="MissingPrefix"
+        tools:visibility="visible" />
+
+    <LinearLayout
+        android:id="@+id/informationBottom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/bubbleWrapper"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="2dp"
+        android:layout_toStartOf="@id/messageEndGuideline"
+        android:layout_toEndOf="@id/messageStartGuideline"
+        android:addStatesFromChildren="true"
+        android:orientation="vertical">
+
+        <com.google.android.flexbox.FlexboxLayout
+            android:id="@+id/reactionsContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            app:dividerDrawable="@drawable/reaction_divider"
+            app:flexWrap="wrap"
+            app:showDivider="middle"
+            tools:background="#F0E0F0"
+            tools:layout_height="40dp">
+
+            <!-- ReactionButtons will be added here in the code -->
+            <!--im.vector.app.features.reactions.widget.ReactionButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" /-->
+
+        </com.google.android.flexbox.FlexboxLayout>
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/messageThreadSummaryContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/informationBottom"
+        android:layout_toStartOf="@id/messageEndGuideline"
+        android:layout_toEndOf="@id/messageStartGuideline"
+        android:contentDescription="@string/room_threads_filter">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/messageThreadSummaryConstraintLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:background="@drawable/rounded_rect_shape_8"
+            android:contentDescription="@string/room_threads_filter"
+            android:layoutDirection="locale"
+            android:maxWidth="496dp"
+            android:minWidth="144dp"
+            android:paddingStart="13dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="13dp"
+            android:paddingBottom="8dp"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <include layout="@layout/view_thread_room_summary" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </FrameLayout>
+
+</merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_room_detail_thread_toolbar.xml b/vector/src/main/res/layout/view_room_detail_thread_toolbar.xml
new file mode 100644
index 0000000000..e16912246e
--- /dev/null
+++ b/vector/src/main/res/layout/view_room_detail_thread_toolbar.xml
@@ -0,0 +1,62 @@
+<?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/roomToolbarThreadConstraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    tools:layout_height="?actionBarSize"
+    tools:visibility="visible">
+
+    <TextView
+        android:id="@+id/roomToolbarThreadTitleTextView"
+        style="@style/Widget.Vector.TextView.HeadlineMedium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_primary"
+        app:layout_constraintBottom_toTopOf="@id/roomToolbarThreadImageView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@string/thread_timeline_title" />
+
+    <ImageView
+        android:id="@+id/roomToolbarThreadImageView"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_presence_offline"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/roomToolbarThreadTitleTextView"
+        tools:src="@sample/room_round_avatars" />
+
+    <im.vector.app.core.ui.views.ShieldImageView
+        android:id="@+id/roomToolbarThreadShieldImageView"
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        app:layout_constraintCircle="@id/roomToolbarThreadImageView"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="10dp"
+        tools:ignore="MissingConstraints" />
+
+    <TextView
+        android:id="@+id/roomToolbarThreadSubtitleTextView"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_secondary"
+        app:layout_constraintBottom_toBottomOf="@id/roomToolbarThreadImageView"
+        app:layout_constraintStart_toEndOf="@id/roomToolbarThreadImageView"
+        app:layout_constraintTop_toTopOf="@id/roomToolbarThreadImageView"
+        tools:text="@sample/rooms.json/data/name"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_room_detail_toolbar.xml b/vector/src/main/res/layout/view_room_detail_toolbar.xml
new file mode 100644
index 0000000000..147c5409f8
--- /dev/null
+++ b/vector/src/main/res/layout/view_room_detail_toolbar.xml
@@ -0,0 +1,99 @@
+<?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/roomToolbarContentView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:visibility="visible">
+
+    <ImageView
+        android:id="@+id/roomToolbarAvatarImageView"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/room_round_avatars" />
+
+    <im.vector.app.core.ui.views.ShieldImageView
+        android:id="@+id/roomToolbarDecorationImageView"
+        android:layout_width="17dp"
+        android:layout_height="17dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="2dp"
+        app:layout_constraintBottom_toBottomOf="@id/roomToolbarTitleView"
+        app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
+        app:layout_constraintTop_toTopOf="@id/roomToolbarTitleView" />
+
+    <im.vector.app.core.ui.views.PresenceStateImageView
+        android:id="@+id/roomToolbarPresenceImageView"
+        android:layout_width="12dp"
+        android:layout_height="12dp"
+        android:background="@drawable/background_circle"
+        android:padding="2dp"
+        android:visibility="gone"
+        app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="20dp"
+        tools:ignore="MissingConstraints"
+        tools:layout_constraintCircleRadius="8dp"
+        tools:src="@drawable/ic_presence_offline"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/roomToolbarPublicImageView"
+        android:layout_width="13dp"
+        android:layout_height="13dp"
+        android:background="@drawable/background_circle"
+        android:contentDescription="@string/a11y_public_room"
+        android:padding="1dp"
+        android:src="@drawable/ic_public_room"
+        android:visibility="gone"
+        app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="20dp"
+        tools:ignore="MissingConstraints"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/roomToolbarTitleView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Vector.Widget.ActionBarTitle"
+        app:layout_constraintBottom_toTopOf="@id/roomToolbarSubtitleView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@id/roomToolbarDecorationImageView"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_goneMarginStart="7dp"
+        tools:text="@sample/rooms.json/data/name" />
+
+    <TextView
+        android:id="@+id/roomToolbarSubtitleView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="7dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/TextAppearance.Vector.Widget.ActionBarSubTitle"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
+        app:layout_constraintTop_toBottomOf="@id/roomToolbarTitleView"
+        tools:text="@sample/rooms.json/data/topic"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_thread_notification_badge.xml b/vector/src/main/res/layout/view_thread_notification_badge.xml
new file mode 100644
index 0000000000..81b3f7138e
--- /dev/null
+++ b/vector/src/main/res/layout/view_thread_notification_badge.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="@dimen/menu_item_size"
+    android:layout_height="@dimen/menu_item_size">
+
+    <FrameLayout
+        android:layout_width="@dimen/menu_item_ripple_size"
+        android:layout_height="@dimen/menu_item_ripple_size"
+        android:layout_gravity="center"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="@dimen/menu_item_icon_size"
+            android:layout_height="@dimen/menu_item_icon_size"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_thread_menu_item"
+            tools:ignore="ContentDescription"
+            app:tint="?colorPrimary" />
+
+        <FrameLayout
+            android:id="@+id/threadNotificationBadgeFrameLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="9dp"
+            android:minWidth="9dp"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
+            android:layout_gravity="top|end"
+            android:backgroundTint="@color/palette_gray_200"
+            android:background="@drawable/notification_badge"
+            android:visibility="visible"
+            tools:visibility="visible">
+
+            <TextView
+                android:id="@+id/threadNotificationBadgeTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingEnd="2dp"
+                android:paddingStart="2dp"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:textColor="@color/palette_white"
+                android:maxLength="3"
+                android:visibility="gone"
+                android:textStyle="bold"
+                android:textSize="10sp"
+                tools:text="99" />
+
+        </FrameLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_thread_room_summary.xml b/vector/src/main/res/layout/view_thread_room_summary.xml
new file mode 100644
index 0000000000..0f184edef3
--- /dev/null
+++ b/vector/src/main/res/layout/view_thread_room_summary.xml
@@ -0,0 +1,59 @@
+<?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"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/messageThreadSummaryImageView"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginTop="2dp"
+        android:contentDescription="@string/room_threads_filter"
+        android:src="@drawable/ic_thread_summary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/messageThreadSummaryCounterTextView"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:minEms="1"
+        android:textColor="?vctr_content_secondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/messageThreadSummaryImageView"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="123" />
+
+    <ImageView
+        android:id="@+id/messageThreadSummaryAvatarImageView"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="4dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/messageThreadSummaryCounterTextView"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/user_round_avatars" />
+
+
+    <TextView
+        android:id="@+id/messageThreadSummaryInfoTextView"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_secondary"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/messageThreadSummaryAvatarImageView"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@sample/messages.json/data/message" />
+</merge>
diff --git a/vector/src/main/res/layout/view_url_preview.xml b/vector/src/main/res/layout/view_url_preview.xml
index 93ea4ea2bb..e9774207ca 100644
--- a/vector/src/main/res/layout/view_url_preview.xml
+++ b/vector/src/main/res/layout/view_url_preview.xml
@@ -1,77 +1,102 @@
 <?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:id="@+id/informationUrlPreviewContainer"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:parentTag="com.google.android.material.card.MaterialCardView">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minWidth="208dp"
         android:orientation="vertical">
 
+        <!--Image dimensions will be overrode by ImageContentRenderer -->
         <ImageView
             android:id="@+id/url_preview_image"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintHeight_max="208dp"
+            android:scaleType="centerCrop"
+            android:importantForAccessibility="no"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:src="@tools:sample/backgrounds/scenic" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/url_preview_start_guideline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:importantForAccessibility="no"
-            android:maxHeight="200dp"
-            android:scaleType="fitXY"
-            tools:src="@tools:sample/backgrounds/scenic" />
+            android:orientation="vertical"
+            app:layout_constraintGuide_begin="8dp" />
 
         <TextView
             android:id="@+id/url_preview_site"
             style="@style/Widget.Vector.TextView.Caption"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
             android:layout_marginTop="6dp"
             android:layout_marginEnd="8dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:singleLine="true"
+            app:layout_constraintEnd_toStartOf="@id/url_preview_close"
             android:textColor="?vctr_content_secondary"
+            app:layout_constraintStart_toStartOf="@id/url_preview_start_guideline"
+            app:layout_constraintTop_toBottomOf="@id/url_preview_image"
+            app:layout_goneMarginTop="12dp"
             tools:text="BBC News" />
 
         <TextView
             android:id="@+id/url_preview_title"
             style="@style/Widget.Vector.TextView.Body.Medium"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
             android:layout_marginTop="4dp"
-            android:layout_marginEnd="@dimen/layout_touch_size"
+            android:layout_marginEnd="8dp"
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/url_preview_close"
+            app:layout_constraintStart_toStartOf="@id/url_preview_start_guideline"
+            app:layout_constraintTop_toBottomOf="@id/url_preview_site"
+            app:layout_goneMarginTop="12dp"
             tools:text="Jo Malone denounces her former brand's John Boyega decision" />
 
         <TextView
             android:id="@+id/url_preview_description"
             style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
             android:layout_marginTop="4dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="8dp"
             android:ellipsize="end"
             android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/url_preview_start_guideline"
+            app:layout_constraintTop_toBottomOf="@id/url_preview_title"
             tools:text="The British perfumer says removing actor John Boyega from his own advert was “utterly despicable”." />
 
-    </LinearLayout>
+        <ImageView
+            android:id="@+id/url_preview_close"
+            android:layout_width="@dimen/layout_touch_size"
+            android:layout_height="@dimen/layout_touch_size"
+            android:layout_gravity="top|end"
+            android:contentDescription="@string/action_close"
+            android:scaleType="center"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:src="@drawable/ic_close_with_circular_bg"
+            tools:ignore="MissingPrefix" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <ImageView
-        android:id="@+id/url_preview_close"
-        android:layout_width="@dimen/layout_touch_size"
-        android:layout_height="@dimen/layout_touch_size"
-        android:layout_gravity="top|end"
-        android:contentDescription="@string/action_close"
-        android:scaleType="center"
-        android:src="@drawable/ic_close_with_circular_bg"
-        tools:ignore="MissingPrefix" />
 
 </merge>
\ No newline at end of file
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 31a513d00b..70711e71a6 100644
--- a/vector/src/main/res/layout/view_voice_message_recorder.xml
+++ b/vector/src/main/res/layout/view_voice_message_recorder.xml
@@ -160,7 +160,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:background="@drawable/bg_voice_playback"
+            android:background="@drawable/bg_media_pill"
             android:backgroundTint="?vctr_content_quinary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/home.xml
index 93947a5a7f..f15c31b4e9 100644
--- a/vector/src/main/res/menu/home.xml
+++ b/vector/src/main/res/menu/home.xml
@@ -31,9 +31,9 @@
 
     <item
         android:id="@+id/menu_home_filter"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/ic_filter"
         android:title="@string/home_filter_placeholder_home"
         app:iconTint="?vctr_content_secondary"
         app:showAsAction="always" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/vector/src/main/res/menu/menu_thread_list.xml b/vector/src/main/res/menu/menu_thread_list.xml
new file mode 100644
index 0000000000..6da0f80112
--- /dev/null
+++ b/vector/src/main/res/menu/menu_thread_list.xml
@@ -0,0 +1,13 @@
+<?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">
+
+    <item
+        android:id="@+id/menu_thread_list_filter"
+        android:icon="@drawable/ic_filter"
+        android:title="@string/room_threads_filter"
+        app:iconTint="?vctr_content_secondary"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index d7c3115ce0..962c505e4e 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -37,11 +37,19 @@
         app:showAsAction="always"
         tools:visible="true" />
 
+    <item
+        android:id="@+id/menu_timeline_thread_list"
+        android:title="@string/action_view_threads"
+        android:visible="false"
+        app:iconTint="?colorPrimary"
+        app:actionLayout="@layout/view_thread_notification_badge"
+        app:showAsAction="always"
+        tools:visible="true" />
+
     <item android:id="@+id/join_conference"
         android:title="@string/action_join"
         app:actionLayout="@layout/layout_join_conference_action"
-        app:showAsAction="always"
-        />
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/open_matrix_apps"
@@ -57,4 +65,36 @@
         app:showAsAction="never"
         tools:visible="true" />
 
+    <item
+        android:id="@+id/menu_thread_timeline_more"
+        android:icon="@drawable/ic_more_vertical"
+        android:title="@string/action_thread_view_in_room"
+        app:iconTint="?vctr_content_secondary"
+        app:showAsAction="always">
+
+        <menu>
+            <item
+                android:id="@+id/menu_thread_timeline_view_in_room"
+                android:icon="@drawable/ic_thread_view_in_room_menu_item"
+                android:title="@string/action_thread_view_in_room"
+                app:iconTint="?vctr_content_secondary"
+                app:showAsAction="ifRoom" />
+
+            <item
+                android:id="@+id/menu_thread_timeline_copy_link"
+                android:icon="@drawable/ic_thread_link_menu_item"
+                android:title="@string/action_thread_copy_link_to_thread"
+                app:iconTint="?vctr_content_secondary"
+                app:showAsAction="ifRoom" />
+
+            <item
+                android:id="@+id/menu_thread_timeline_share"
+                android:icon="@drawable/ic_thread_share_menu_item"
+                android:title="@string/action_share"
+                app:iconTint="?vctr_content_secondary"
+                app:showAsAction="ifRoom" />
+        </menu>
+    </item>
+
+
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/raw/emoji_picker_datasource.json b/vector/src/main/res/raw/emoji_picker_datasource.json
index 80131cefac..f4fa7f812a 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"]},"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"]},"face-with-peeking-eye":{"a":"⊛ Face with Peeking Eye","b":"1FAE3","j":["captivated","peep","stare"]},"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"]},"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"]},"face-in-clouds":{"a":"Face in Clouds","b":"1F636-200D-1F32B-FE0F","j":["absentminded","face in clouds","face in the fog","head in clouds"]},"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","face exhaling","gasp","groan","relief","whisper","whistle"]},"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","face with spiral eyes","hypnotized","spiral","trouble","whoa"]},"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"]},"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"]},"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","heart on fire","love","lust","sacred heart"]},"mending-heart":{"a":"Mending Heart","b":"2764-FE0F-200D-1FA79","j":["healthier","improving","mending","mending heart","recovering","recuperating","well"]},"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"]},"leftwards-hand":{"a":"⊛ Leftwards Hand","b":"1FAF2","j":["hand","left","leftward"]},"palm-down-hand":{"a":"⊛ Palm Down Hand","b":"1FAF3","j":["dismiss","drop","shoo"]},"palm-up-hand":{"a":"⊛ Palm Up Hand","b":"1FAF4","j":["beckon","catch","come","offer"]},"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"]},"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"]},"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"]},"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"]},"woman-beard":{"a":"Woman: Beard","b":"1F9D4-200D-2640-FE0F","j":["beard","woman","woman: beard"]},"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"]},"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"]},"pregnant-person":{"a":"⊛ Pregnant Person","b":"1FAC4","j":["belly","bloated","full","pregnant"]},"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"]},"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"]},"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"]},"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"]},"nest-with-eggs":{"a":"⊛ Nest with Eggs","b":"1FABA","j":["nesting"]},"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-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"]},"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"]},"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"]},"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"]},"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"]},"stethoscope":{"a":"Stethoscope","b":"1FA7A","j":["doctor","heart","medicine","health"]},"xray":{"a":"⊛ X-Ray","b":"1FA7B","j":["bones","doctor","medical","skeleton"]},"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"]},"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"]},"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","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"]},"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"]},"face-with-peeking-eye":{"a":"⊛ Face with Peeking Eye","b":"1FAE3","j":["captivated","peep","stare"]},"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"]},"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"]},"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"]},"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"]},"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"]},"leftwards-hand":{"a":"⊛ Leftwards Hand","b":"1FAF2","j":["hand","left","leftward"]},"palm-down-hand":{"a":"⊛ Palm Down Hand","b":"1FAF3","j":["dismiss","drop","shoo"]},"palm-up-hand":{"a":"⊛ Palm Up Hand","b":"1FAF4","j":["beckon","catch","come","offer"]},"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"]},"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"]},"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"]},"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"]},"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"]},"pregnant-person":{"a":"⊛ Pregnant Person","b":"1FAC4","j":["belly","bloated","full","pregnant"]},"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"]},"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"]},"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"]},"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"]},"nest-with-eggs":{"a":"⊛ Nest with Eggs","b":"1FABA","j":["nesting"]},"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-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"]},"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"]},"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"]},"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"]},"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"]},"stethoscope":{"a":"Stethoscope","b":"1FA7A","j":["doctor","heart","medicine","health"]},"xray":{"a":"⊛ X-Ray","b":"1FA7B","j":["bones","doctor","medical","skeleton"]},"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"]},"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"]},"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
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index c15f511543..f1fdf8971c 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -145,12 +145,12 @@
     <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_room_withdraw_with_reason_by_you">أنتَ قد سحبتَ دعوة %1$s. السبب: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">إنَّ %1$s قد سحبَ دعوة %2$s. السبب: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">سحبتَ دعوة %1$s. السبب: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">سحبَ %1$s دعوة %2$s. السبب: %3$s</string>
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">سحبتَ دعوة %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>
     <string name="notice_room_third_party_revoked_invite_with_reason">سحب %1$s دعوة %2$s للإنضمام إلى الغُرفة. السبب: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">أنتَ قد قبلتَ دعوة %1$s. السبب: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">إنَّ %1$s قد قبلَ دعوة %2$s. السبب: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">قبلتَ دعوة %1$s. السبب: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">قبلَ %1$s دعوة %2$s. السبب: %3$s</string>
     <string name="notice_room_third_party_invite_with_reason_by_you">أرسلتَ دعوة إلى %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>
     <string name="notice_room_third_party_invite_with_reason">أرسل %1$s دعوة إلى %2$s للإنضمام إلى الغُرغة. السبب: %3$s</string>
     <string name="notice_room_ban_with_reason_by_you">حظرتَ %1$s. السبب: %2$s</string>
@@ -1338,4 +1338,5 @@
     <string name="keys_backup_unlock_button">فك قفل التأريخ</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">يستورد المفاتيح…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">ينزّل المفاتيح…</string>
+    <string name="room_error_access_unauthorized">لا يسمح لك بالانضمام لهذه الغرفة</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index edab57ba1b..0e8b35a9b6 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -2010,7 +2010,6 @@
     <string name="settings_emails_empty">Не е добавен имейл адрес в профила ви</string>
     <string name="settings_emails">Имейл адрес</string>
     <string name="settings_phone_number_empty">Не е добавен телефонен номер в профила ви</string>
-    <string name="search_is_not_supported_in_e2e_room">Търсенето в шифровани стаи все още не се поддържа.</string>
     <string name="search_banned_user_hint">Филтрирай блокираните потребители</string>
     <string name="room_participants_unban_prompt_msg">Премахването на блокирането ще позволи на потребителя пак да влезе в стаята.</string>
     <string name="room_participants_unban_title">Премахване на блокиране</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 4a0e8c6a47..2ac886d3d1 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -1464,7 +1464,6 @@
 \n
 \nVols iniciar sessió utilitzant un client web\?</string>
     <string name="template_settings_add_3pid_flow_not_supported">No pots fer això des d\'${app_name} per a mòbils</string>
-    <string name="search_is_not_supported_in_e2e_room">La cerca en sales xifrades encara no està disponible.</string>
     <string name="warning_room_not_created_yet">La sala encara no s\'ha acabat de crear. Vols cancel·lar la seva creació\?</string>
     <string name="room_error_not_found">No s\'ha trobat aquesta sala. Assegura\'t que existeixi.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Mostra detalls com per exemple noms de sala i contingut dels missatges.</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index dbbb6d5238..6fb17ebb00 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2456,7 +2456,6 @@
     <string name="settings_troubleshoot_test_push_loop_success">Aplikace přijímá PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Aplikace čeká na PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_title">Testovat push</string>
-    <string name="search_is_not_supported_in_e2e_room">Prohledávání šifrovaných místností ještě není podporováno.</string>
     <string name="search_banned_user_hint">Filtrovat vykázané uživatele</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Nemáte oprávnění k zahájení hovoru</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Nemáte oprávnění k zahájení konferenčního hovoru</string>
@@ -2700,7 +2699,6 @@
     <string name="create_spaces_room_private_header">Na jakých tématech pracujete\?</string>
     <string name="create_spaces_room_public_header_desc">Založíme pro ně místnosti. Můžete přidat další později.</string>
     <string name="create_spaces_details_private_header">Doplňte nějaké podrobnosti, aby jej lidé mohli identifikovat. Můžete je kdykoli změnit.</string>
-    <string name="create_spaces_type_header">Prostory jsou nový způsob organizace místností a lidí</string>
     <string name="spaces_header">Prostory</string>
     <string name="you_are_invited">Jste zváni</string>
     <string name="spaces_beta_welcome_to_spaces">Vítejte v prostorech!</string>
@@ -2914,15 +2912,10 @@
     <string name="settings_notification_other">Další</string>
     <string name="settings_notification_mentions_and_keywords">Zmínky a klíčová slova</string>
     <string name="settings_notification_default">Výchozí oznámení</string>
-    <string name="link_this_email_with_your_account">%s v Nastavení pro příjem pozvánek přímo v Elementu.</string>
+    <string name="template_link_this_email_with_your_account">%s v Nastavení pro příjem pozvánek přímo v ${app_name}u.</string>
     <string name="link_this_email_settings_link">Propojte tento e-mail se svým účtem</string>
     <string name="this_invite_to_this_room_was_sent">Pozvánka do této místnosti byla odeslána na adresu %s, která není spojena s vaším účtem</string>
     <string name="this_invite_to_this_space_was_sent">Pozvánka do tohoto prostoru byla odeslána na adresu %s, která není spojena s vaším účtem</string>
-    <string name="to_help_space_members_find_and_join">Chcete-li členům prostoru pomoci najít soukromou místnost a připojit se k ní, přejděte do nastavení dané místnosti klepnutím na avatar.</string>
-    <string name="help_space_members">Pomozte členům prostoru najít soukromé místnosti</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Díky tomu mohou místnosti zůstat soukromé a zároveň je mohou lidé v prostoru najít a připojit se k nim. Všechny nové místnosti v prostoru budou mít tuto možnost k dispozici.</string>
-    <string name="help_people_in_spaces_find_and_join">Pomozte lidem v prostorech, aby sami našli soukromé místnosti a připojili se k nim, není třeba všechny zvát ručně.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Novinka: Nechat lidi v prostorech vyhledat a připojit se k soukromým místnostem</string>
     <string name="call_jitsi_started">Skupinový hovor zahájen</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Všechny místnosti, ve kterých se nacházíte, se zobrazí v Úvodu.</string>
     <string name="preference_show_all_rooms_in_home">Zobrazit všechny místnosti v Úvodu</string>
@@ -3088,7 +3081,7 @@
     </plurals>
     <string name="preference_system_settings">Systémová nastavení</string>
     <string name="preference_versions">Verze</string>
-    <string name="preference_help_summary">Získejte pomoc při používání Elementu</string>
+    <string name="template_preference_help_summary">Získejte pomoc při používání ${app_name}u</string>
     <string name="preference_help_title">Nápověda a podpora</string>
     <string name="preference_help">Nápověda</string>
     <string name="preference_root_legals">Právní dokumenty</string>
@@ -3101,10 +3094,10 @@
     <string name="analytics_opt_in_list_item_2"><b>Nesdílíme</b> informace s třetími stranami</string>
     <string name="analytics_opt_in_list_item_1"><b>Nezaznamenáváme ani neprofilujeme</b> žádné údaje o účtu</string>
     <string name="analytics_opt_in_content_link">zde</string>
-    <string name="analytics_opt_in_content">Pomozte nám identifikovat problémy a vylepšit Element sdílením anonymních údajů o používání. Abychom pochopili, jak lidé používají více zařízení, vygenerujeme náhodný identifikátor sdílený vašimi zařízeními.
+    <string name="template_analytics_opt_in_content">Pomozte nám identifikovat problémy a vylepšit ${app_name} sdílením anonymních údajů o používání. Abychom pochopili, jak lidé používají více zařízení, vygenerujeme náhodný identifikátor sdílený vašimi zařízeními.
 \n
 \nMůžete si přečíst všechny naše podmínky %s.</string>
-    <string name="analytics_opt_in_title">Pomozte vylepšit Element</string>
+    <string name="template_analytics_opt_in_title">Pomozte vylepšit ${app_name}</string>
     <string name="action_enable">Povolit</string>
     <string name="restart_the_application_to_apply_changes">Restartujte aplikaci, aby se změna projevila.</string>
     <string name="labs_enable_latex_maths">Povolit matematické výrazy LaTeXu</string>
@@ -3119,10 +3112,9 @@
     <string name="labs_auto_report_uisi">Automaticky nahlašovat chyby dešifrování.</string>
     <string name="room_member_override_nick_color">Přepsat barvu přezdívky</string>
     <string name="login_splash_already_have_account">Již mám účet</string>
-    <string name="ftue_auth_carousel_4_title">Zlepšete týmovou komunikaci.</string>
-    <string name="ftue_auth_carousel_3_title">Bezpečené zasílání zpráv.</string>
-    <string name="ftue_auth_carousel_2_title">Máte vše pod kontrolou.</string>
-    <string name="ftue_auth_carousel_1_title">Vlastněte své konverzace.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Bezpečené zasílání zpráv.</string>
+    <string name="ftue_auth_carousel_control_title">Máte vše pod kontrolou.</string>
+    <string name="ftue_auth_carousel_secure_title">Vlastněte své konverzace.</string>
     <string name="tooltip_attachment_location">Sdílet polohu</string>
     <string name="labs_render_locations_in_timeline">Zobrazit polohy uživatele na časové ose</string>
     <string name="settings_enable_location_sharing_summary">Po zapnutí budete moci odeslat svou polohu do libovolné místnosti</string>
@@ -3136,7 +3128,7 @@
     <string name="location_activity_title_static_sharing">Sdílet polohu</string>
     <string name="closed_poll_option_description">Výsledky se zobrazí až po ukončení hlasování</string>
     <string name="closed_poll_option_title">Uzavřené hlasování</string>
-    <string name="open_poll_option_description">Hlasující vidí výsledky ihned po hlasování</string>
+    <string name="open_poll_option_description">Hlasující uvidí výsledky ihned po hlasování</string>
     <string name="open_poll_option_title">Otevřené hlasování</string>
     <string name="poll_type_title">Typ hlasování</string>
     <string name="edit_poll_button">UPRAVIT HLASOVÁNÍ</string>
@@ -3150,10 +3142,43 @@
     <string name="encryption_has_been_misconfigured">Šifrování bylo špatně nakonfigurováno.</string>
     <string name="sent_location">Sdíleli svou polohu</string>
     <string name="login_splash_create_account">Vytvořit účet</string>
-    <string name="ftue_auth_carousel_title_messaging">Zasílání zpráv pro váš tým.</string>
-    <string name="ftue_auth_carousel_body_encrypted">Koncové šifrování bez potřeby telefonního čísla. Žádné reklamy ani vytěžování dat.</string>
-    <string name="ftue_auth_carousel_body_control">Můžete si vybrat, kde budou vaše konverzace uloženy, a získat tak kontrolu a nezávislost. Připojeno přes Matrix.</string>
-    <string name="ftue_auth_carousel_body_secure">Bezpečná a nezávislá komunikace, která vám poskytne stejnou úroveň soukromí jako osobní rozhovor u vás doma.</string>
+    <string name="ftue_auth_carousel_workplace_title">Zasílání zpráv pro váš tým.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Koncové šifrování bez potřeby telefonního čísla. Žádné reklamy ani vytěžování dat.</string>
+    <string name="ftue_auth_carousel_control_body">Můžete si vybrat, kde budou vaše konverzace uloženy, a získat tak kontrolu a nezávislost. Připojeno přes Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Bezpečná a nezávislá komunikace, která vám poskytne stejnou úroveň soukromí jako osobní rozhovor u vás doma.</string>
     <string name="attachment_type_location">Poloha</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">Šifrování bylo špatně nakonfigurováno, takže nelze odesílat zprávy. Kliknutím otevřete nastavení.</string>
+    <string name="message_bubbles">Zobrazit bubliny zpráv</string>
+    <string name="location_timeline_failed_to_load_map">Nepodařilo se načíst mapu</string>
+    <string name="a11y_static_map_image">Mapa</string>
+    <string name="labs_enable_thread_messages_desc">Poznámka: aplikace bude restartována</string>
+    <string name="labs_enable_thread_messages">Povolit zprávy ve vláknech</string>
+    <string name="ftue_auth_use_case_connect_to_server">Připojit se k serveru</string>
+    <string name="ftue_auth_use_case_join_existing_server">Chcete se připojit k existujícímu serveru\?</string>
+    <string name="ftue_auth_use_case_skip_partial">přeskočit tuto otázku</string>
+    <string name="ftue_auth_use_case_skip">Ještě si nejste jisti\? Můžete %s</string>
+    <string name="ftue_auth_use_case_option_three">Komunity</string>
+    <string name="ftue_auth_use_case_option_two">Týmy</string>
+    <string name="ftue_auth_use_case_option_one">Přátelé a rodina</string>
+    <string name="ftue_auth_use_case_subtitle">Pomůžeme vám se připojit.</string>
+    <string name="ftue_auth_use_case_title">S kým si budete povídat nejčastěji\?</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Již si prohlížíte toto vlákno!</string>
+    <string name="view_in_room">Prohlédnout v místnosti</string>
+    <string name="reply_in_thread">Odpovědět ve vlákně</string>
+    <string name="command_not_supported_in_threads">Příkaz „%s“ je rozpoznán, ale není podporován ve vláknech.</string>
+    <string name="search_thread_from_a_thread">Z vlákna</string>
+    <string name="thread_list_empty_notice">Tip: Dlouze klepněte na zprávu a použijte „%s“.</string>
+    <string name="thread_list_empty_subtitle">Vlákna pomáhají udržovat konverzace k tématu a snadno je sledovat.</string>
+    <string name="thread_list_empty_title">Udržujte diskuse organizované pomocí vláken</string>
+    <string name="thread_list_modal_my_threads_subtitle">Zobrazí všechna vlákna, kterých jste se zúčastnili</string>
+    <string name="thread_list_modal_my_threads_title">Moje vlákna</string>
+    <string name="thread_list_modal_all_threads_subtitle">Zobrazí všechna vlákna z aktuální místnosti</string>
+    <string name="thread_list_modal_all_threads_title">Všechna vlákna</string>
+    <string name="thread_list_modal_title">Filtr</string>
+    <string name="thread_list_title">Vlákna</string>
+    <string name="thread_timeline_title">Vlákno</string>
+    <string name="room_threads_filter">Filtrovat vlákna v místnosti</string>
+    <string name="action_thread_copy_link_to_thread">Kopírovat odkaz na vlákno</string>
+    <string name="action_thread_view_in_room">Prohlédnout v místnosti</string>
+    <string name="action_view_threads">Zobrazit vlákna</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index e8a961dba5..195b831141 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -154,7 +154,7 @@
     <string name="notice_widget_modified">%1$s hat das %2$s Widget modifiziert</string>
     <string name="notice_widget_modified_by_you">Du hast das %1$s Widget modifiziert</string>
     <string name="power_level_admin">Admin</string>
-    <string name="power_level_moderator">Moderator</string>
+    <string name="power_level_moderator">Moderation</string>
     <string name="power_level_default">Standard</string>
     <string name="power_level_custom">Benutzerdefiniert (%1$d)</string>
     <string name="power_level_custom_no_value">Benutzerdefiniert</string>
@@ -505,8 +505,8 @@
     <string name="room_participants_action_ban">Verbannen</string>
     <string name="room_participants_action_unban">Verbannung aufheben</string>
     <string name="room_participants_action_set_default_power_level">Zum normalen Benutzer herabstufen</string>
-    <string name="room_participants_action_set_moderator">Zum Moderator machen</string>
-    <string name="room_participants_action_set_admin">Zum Admin machen</string>
+    <string name="room_participants_action_set_moderator">Moderationsrechte vergeben</string>
+    <string name="room_participants_action_set_admin">Administrationsrechte vergeben</string>
     <string name="room_participants_action_ignore">Blockieren</string>
     <string name="room_participants_action_unignore">Alle Nachrichten dieses Nutzers anzeigen</string>
     <string name="room_participants_invite_search_another_user">Nutzer-ID, Name oder E-Mail-Adresse</string>
@@ -845,11 +845,11 @@
     <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="groups_list">Gruppenliste</string>
-    <string name="room_participants_ban_prompt_msg">Ein Bann schließt die Person aus dem Raum aus und verhindert einen erneuten Beitritt.</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_noisy">Alle Nachrichten (laut)</string>
     <string name="room_settings_all_messages">Alle Nachrichten</string>
     <string name="room_settings_mention_only">Nur Erwähnungen</string>
-    <string name="room_settings_mute">Stumm</string>
+    <string name="room_settings_mute">Stummschalten</string>
     <string name="settings_inline_url_preview">URL-Vorschau im Chat</string>
     <string name="settings_vibrate_on_mention">Vibriere beim Erwähnen eines Nutzers</string>
     <string name="room_settings_room_notifications_title">Benachrichtigungen</string>
@@ -1076,7 +1076,7 @@
     <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, Kicks und Banns werden weiterhin angezeigt.</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_enable_send_voice_summary">Diese Option erfordert eine externe Anwendung um Sprachnachrichten aufzuzeichnen.</string>
@@ -1323,7 +1323,7 @@
     <string name="settings_default_media_source">Standard-Medienquelle</string>
     <string name="media_source_choose">Wählen</string>
     <string name="settings_play_shutter_sound">Auslöseton abspielen</string>
-    <string name="action_mark_room_read">Als gelesen markieren</string>
+    <string name="action_mark_room_read">Gelesen</string>
     <string name="settings_notification_privacy_no_background_sync">Die App muss sich <b>nicht</b> im Hintergrund mit dem Homeserver verbinden, dies sollte die Akkunutzung reduzieren</string>
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s: %2$d Nachricht</item>
@@ -1672,7 +1672,7 @@
     <string name="login_splash_text3">Erweitere &amp; individualisiere dein Benutzererlebnis</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 benutzerdefinierten Server verbinden</string>
+    <string name="login_connect_to_a_custom_server">Mit einem individuellen Server verbinden</string>
     <string name="login_signin_to">Bei %1$s anmelden</string>
     <string name="login_signup">Registrieren</string>
     <string name="login_signin">Anmelden</string>
@@ -1864,7 +1864,7 @@
     <string name="room_profile_section_more_leave">Raum verlassen</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_moderators">Moderationen</string>
     <string name="room_member_power_level_custom">Benutzerdefiniert</string>
     <string name="room_member_power_level_invites">Eingeladen</string>
     <string name="room_member_power_level_users">Nutzer</string>
@@ -2273,7 +2273,7 @@
     <string name="three_pid_revoke_invite_dialog_title">Einladung zurücknehmen</string>
     <string name="three_pid_revoke_invite_dialog_content">Einladung zu %1$s zurücknehmen\?</string>
     <string name="member_banned_by">Gebannt von %1$s</string>
-    <string name="failed_to_unban">Aufheben des Banns fehlgeschlagen</string>
+    <string name="failed_to_unban">Aufhebung der Verbannung fehlgeschlagen</string>
     <string name="alert_push_are_disabled_title">Push-Benachrichtigungen sind deaktiviert</string>
     <string name="alert_push_are_disabled_description">Gehe zu deinen Einstellungen um Push-Benachrichtigungen zu aktivieren</string>
     <string name="create_pin_title">Nutze eine PIN für mehr Sicherheit</string>
@@ -2337,7 +2337,7 @@
         <item quantity="other">%d Sekunden</item>
     </plurals>
     <string name="settings_show_room_member_state_events">Status-Ereignisse der Raummitglieder zeigen</string>
-    <string name="settings_show_room_member_state_events_summary">Bezieht Einladungs-/Beitritts-/Verlassen-/Entfernen-/Verbannen-Ereignisse und Avatar-/Anzeigenamen-Wechsel mit ein.</string>
+    <string name="settings_show_room_member_state_events_summary">Bezieht Einladungs-/Beitritts-/Verlassen-/Entfernungs-/Verbannungs-Ereignisse und Wechsel des Avatar/Anzeigenamen mit ein.</string>
     <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>
@@ -2351,7 +2351,6 @@
     <string name="settings_troubleshoot_test_push_loop_success">Die Applikation empfängt den PUSH</string>
     <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_is_not_supported_in_e2e_room">Die Suche in verschlüsselten Räumen wird noch nicht unterstützt.</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_conf_call_in_direct_room">Du hast keine Berechtigung ein Konferenzgespräch zu starten</string>
@@ -2692,7 +2691,6 @@
     <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_join_info_help">Um einem bereits existierenden Space beizutreten, benötigst du eine Einladung.</string>
-    <string name="create_spaces_type_header">Wir haben Spaces entwickelt, damit ihr eure Räume besser organisieren könnt</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>
@@ -2896,12 +2894,11 @@
     <string name="settings_notification_your_keywords">Deine Schlüsselwörter</string>
     <string name="link_this_email_settings_link">Verknüpfe diese E-Mail-Adresse mit deinem Konto</string>
     <string name="this_invite_to_this_room_was_sent">Die Einladung zu diesem Raum wurde an %s gesendet, welche nicht mit deinem Konto verknüpft ist</string>
-    <string name="help_space_members">Hilf Space-Mitgliedern private Räume zu finden</string>
     <string name="settings_mentions_and_keywords_encryption_notice">Auf deinem Mobilgerät wirst du keine Benachrichtigungen für Erwähnungen und Schlüsselwörter in verschlüsselten Räumen erhalten.</string>
     <string name="space_add_existing_spaces">Existierende Spaces hinzufügen</string>
     <string name="space_add_existing_rooms_only">Existierende Räume hinzufügen</string>
-    <string name="leave_specific_ones">Ausgewählte Räume oder Spaces verlassen…</string>
-    <string name="dont_leave_any">Keine Räume und Spaces verlassen</string>
+    <string name="leave_specific_ones">Ausgewählte Räume oder Subspaces verlassen…</string>
+    <string name="dont_leave_any">Keine Räume und Subspaces verlassen</string>
     <string name="you_will_leave_all_in">Du wirst alle Räume und Spaces in %s verlassen.</string>
     <string name="leave_all_rooms_and_spaces">Alle Räume und Spaces verlassen</string>
     <string name="space_leave_prompt_msg_with_name">Willst du %s wirklich verlassen\?</string>
@@ -2926,7 +2923,7 @@
     <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_ban_prompt_msg">Wenn du eine Person bannst, kann sie nicht erneut beitreten.</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
 \nUm sie für immer zu entfernen, solltest du sie bannen.</string>
@@ -2978,7 +2975,7 @@
     <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_content">Hilf uns dabei Probleme zu identifizieren und Element 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.
+    <string name="template_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>
@@ -2988,16 +2985,16 @@
     <string name="settings_discovery_show_identity_server_policy_title">Bedingungen des Identitätsservers 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 Element</string>
+    <string name="template_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="analytics_opt_in_title">Hilf mit, Element zu verbessern</string>
+    <string name="template_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 Nicknamens ändern</string>
-    <string name="ftue_auth_carousel_2_title">Du hast die volle Kontrolle.</string>
+    <string name="ftue_auth_carousel_control_title">Du hast die volle Kontrolle.</string>
     <string name="room_error_access_unauthorized">Du hast nicht die Berechtigung um diesen Raum zu betreten</string>
     <plurals name="poll_total_vote_count_before_ended_and_not_voted">
         <item quantity="one">Keine Stimme abgegeben</item>
@@ -3013,12 +3010,8 @@
     </plurals>
     <string name="restart_the_application_to_apply_changes">Starte die Anwendung neu, damit die Änderung wirksam wird.</string>
     <string name="labs_enable_latex_maths">LaTeX-Mathematik aktivieren</string>
-    <string name="link_this_email_with_your_account">%s in den Einstellungen, um Einladungen direkt in Element zu erhalten.</string>
+    <string name="template_link_this_email_with_your_account">%s in den Einstellungen, um Einladungen direkt in ${app_name} zu erhalten.</string>
     <string name="this_invite_to_this_space_was_sent">Diese Einladung zu diesem Raum wurde an %s gesendet, der nicht mit deinem Konto verbunden ist</string>
-    <string name="to_help_space_members_find_and_join">Um Spacemitgliedern zu helfen, einen privaten Raum zu finden und ihm beizutreten, gehe zu den Einstellungen des Raums, indem du auf den Avatar tippst.</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Dies macht es für Räume einfach, privat in einem Space zu bleiben, während die Leute im Space diese finden und ihnen beitreten können. Alle neuen Räume in einem Raum haben diese Option zur Verfügung.</string>
-    <string name="help_people_in_spaces_find_and_join">Hilf Personen in Spaces, private Räume selbst zu finden und ihnen beizutreten, damit du nicht alle einzeln einladen musst.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Neu: Personen in Spaces können private Räume finden und ihnen beitreten</string>
     <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>
@@ -3026,8 +3019,8 @@
     <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_3_title">Vernetz dich mit jedem.</string>
-    <string name="ftue_auth_carousel_1_title">Besitze deine Konversationen.</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_neutral_policy">Richtlinie</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="identity_server_consent_dialog_content_2">Um bestehende Kontakte zu ermitteln, müssen Sie Kontaktinformationen an deinen Identitätsserver senden.
@@ -3057,7 +3050,6 @@
         <item quantity="one">Endgültiges Ergebnis basiert auf %1$d Stimme</item>
         <item quantity="other">Endgültiges Ergebnis basiert auf %1$d Stimmen</item>
     </plurals>
-    <string name="ftue_auth_carousel_4_title">Element verbindet Datenschutz mit tollen Features.</string>
     <string name="room_profile_section_restore_security">Verschlüsselung wiederherstellen</string>
     <string name="tooltip_attachment_location">Standort freigeben</string>
     <string name="location_share">Standort freigeben</string>
@@ -3077,10 +3069,10 @@
     <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_title_messaging">Nachrichtenaustausch für dein Team.</string>
-    <string name="ftue_auth_carousel_body_encrypted">Ende-zu-Ende-verschlüsselt und ohne Telefonnummer nutzbar. Keine Werbung oder Datenerfassung.</string>
-    <string name="ftue_auth_carousel_body_control">Wähle wo deine Gespräche liegen, für Kontrolle und Unabhängigkeit. Verbunden mit Matrix.</string>
-    <string name="ftue_auth_carousel_body_secure">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_workplace_title">Nachrichtenaustausch 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="attachment_type_location">Standort</string>
     <string name="a11y_trust_level_misconfigured">Fehlerhaft konfiguriertes Vertrauenslevel</string>
     <string name="encryption_misconfigured">Die Verschlüsselung ist fehlerhaft konfiguriert</string>
@@ -3091,4 +3083,37 @@
     <string name="labs_render_locations_in_timeline">Geteilte Standorte anzeigen</string>
     <string name="settings_enable_location_sharing_summary">Sobald aktiviert, kannst du deinen Standort in jeden Raum senden</string>
     <string name="sent_location">Hat den Standort geteilt</string>
+    <string name="labs_enable_thread_messages">Threads aktivieren</string>
+    <string name="ftue_auth_use_case_connect_to_server">Mit Server verbinden</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Du schaust dir diesen Thread schon an!</string>
+    <string name="view_in_room">Im Raum anzeigen</string>
+    <string name="command_not_supported_in_threads">Der Befehl „%s“ wird erkannt, ist in Threads aber nicht unterstützt.</string>
+    <string name="thread_list_empty_notice">Tipp: Drücke lange auf eine Nachricht und wähle “%s”.</string>
+    <string name="thread_list_empty_title">Organisiere Diskussionen mit Threads</string>
+    <string name="room_threads_filter">Threads im Raum filtern</string>
+    <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="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="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>
+    <string name="ftue_auth_use_case_skip_partial">diese Frage überspringen</string>
+    <string name="ftue_auth_use_case_skip">Noch nicht sicher\? Du kannst %s</string>
+    <string name="ftue_auth_use_case_option_one">Freundschaften und Familie</string>
+    <string name="reply_in_thread">In Thread antworten</string>
+    <string name="search_thread_from_a_thread">Aus einem Thread</string>
+    <string name="thread_list_modal_title">Filter</string>
+    <string name="action_thread_view_in_room">Im Raum anzeigen</string>
+    <string name="thread_list_empty_subtitle">Threads helfen dabei, dass deine Konversationen beim Thema und leicht nachverfolgbar bleiben.</string>
+    <string name="thread_list_modal_my_threads_subtitle">Zeigt alle Threads, an denen du teilgenommen hast</string>
+    <string name="thread_list_modal_all_threads_subtitle">Zeigt alle Threads des aktuellen Raums</string>
+    <string name="thread_list_modal_all_threads_title">Alle Threads</string>
+    <string name="thread_list_modal_my_threads_title">Meine Threads</string>
+    <string name="thread_list_title">Threads</string>
+    <string name="thread_timeline_title">Thread</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 48fca269d9..40eadb4bfe 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -593,7 +593,6 @@
     <string name="room_details_settings">Ρυθμίσεις</string>
     <string name="room_details_title">Λεπτομέρειες Δωματίου</string>
     <string name="room_details_people_invited_group_name">ΚΑΛΕΣΜΕΝΟΣ/Η</string>
-    <string name="search_is_not_supported_in_e2e_room">Η αναζήτηση σε κρυπτογραφημένα δωμάτια δεν υποστηρίζεται ακόμα.</string>
     <string name="tab_title_search_files">ΑΡΧΕΙΑ</string>
     <string name="tab_title_search_messages">ΜΗΝΥΜΑΤΑ</string>
     <string name="tab_title_search_rooms">ΔΩΜΑΤΙΑ</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 4a55ada402..bdf8e88ed5 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -1862,7 +1862,6 @@
         <item quantity="one">%1$s ĉambro trovita por %2$s</item>
         <item quantity="other">%1$s ĉambroj trovitaj por %2$s</item>
     </plurals>
-    <string name="search_is_not_supported_in_e2e_room">Serĉado en ĉifritaj ĉambroj ankoraŭ en estas subtenata.</string>
     <string name="search_banned_user_hint">Filtri forbaritajn uzantojn</string>
     <string name="ssl_only_accept">Akceptu la atestilon nur se administranto de la servilo publikigis fingrospuron akordan kun tiu ĉi-supre.</string>
     <string name="ssl_expected_existing_expl">La atestilo ŝanĝiĝis de antaŭe fidata al alia, nefidata. Eble la servilo renovigis sian atestilon. Kontaktu la administranton de la servilo por ricevi la ĝustan fingrospuron.</string>
@@ -2695,7 +2694,6 @@
     <string name="create_spaces_join_info_help">Por aliĝi al jam ekzistanta aro, vi bezonos inviton.</string>
     <string name="create_spaces_you_can_change_later">Vi povos ŝanĝi ĉi tion poste</string>
     <string name="create_spaces_choose_type_label">Kian aron volas vi krei\?</string>
-    <string name="create_spaces_type_header">Aroj estas nova maniero grupigi ĉambrojn kaj personojn</string>
     <string name="your_private_space">Via privata aro</string>
     <string name="your_public_space">Via publika aro</string>
     <string name="add_space">Aldoni aron</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 42054e3c0e..c0a5308ca7 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -62,14 +62,14 @@
     <string name="notice_event_redacted_with_reason">Mensaje eliminado [motivo: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Mensaje eliminado por %1$s [motivo: %2$s]</string>
     <string name="notice_room_third_party_revoked_invite">%1$s ha revocado la invitación a unirse a la sala para %2$s</string>
-    <string name="initial_sync_start_importing_account">Sincronización Inicial
+    <string name="initial_sync_start_importing_account">Sincronización inicial
 \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="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>
     <string name="clear_timeline_send_queue">Borrar cola de envío</string>
     <string name="notice_room_invite_with_reason">%1$s ha invitado a %2$s. Razón: %3$s</string>
@@ -82,14 +82,15 @@
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s ha aceptado la invitación para %2$s. Razón: %3$s</string>
     <string name="notice_room_canonical_alias_unset">%1$s ha eliminado la dirección principal para esta sala.</string>
     <string name="notice_room_update">%s ha actualizado la sala.</string>
-    <string name="initial_sync_start_importing_account_crypto">Sincronización Inicial:
+    <string name="initial_sync_start_importing_account_crypto">Sincronización inicial:
 \nImportando criptografía</string>
     <string name="initial_sync_start_importing_account_joined_rooms">Sincronización Inicial:
-\nImportando Salas a las que te has unido</string>
+\nCargando tus conversaciones
+\nEsto puede tomar un tiempo si te has unido a muchas salas</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Sincronización Inicial:
-\nImportando Salas a las que has sido invitada</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Sincronización Inicial:
-\nImportando Salas Abandonadas</string>
+\nImportando salas a las que te han invitado</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Sincronización inicial:
+\nImportando salas abandonadas</string>
     <string name="notice_room_invite_no_invitee_with_reason">Invitación de %1$s. Razón: %2$s</string>
     <string name="notice_room_unban_with_reason">%1$s ha desbaneado a %2$s. Razón: %3$s</string>
     <string name="notice_room_third_party_invite_with_reason">%1$s envió una invitación a %2$s para que se una a la sala. Razón: %3$s</string>
@@ -504,7 +505,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_participants_header_devices">SESIONES</string>
     <string name="room_participants_action_invite">Invitar</string>
     <string name="room_participants_action_leave">Salir de esta sala</string>
-    <string name="room_participants_action_ban">Vetar</string>
+    <string name="room_participants_action_ban">Banear</string>
     <string name="room_participants_action_unban">Quitar Veto</string>
     <string name="room_participants_action_set_default_power_level">Restablecer a usuario normal</string>
     <string name="room_participants_action_set_moderator">Convertir a moderador</string>
@@ -848,7 +849,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <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="groups_list">Lista de Grupos</string>
-    <string name="room_participants_ban_prompt_msg">El usuario baneado lo echará de esta sala y evitará que se unan nuevamente.</string>
+    <string name="room_participants_ban_prompt_msg">Vetar un usuario lo echará de esta sala y evitará que se una nuevamente.</string>
     <string name="room_settings_all_messages_noisy">Todos los mensajes (ruidoso)</string>
     <string name="room_settings_all_messages">Todos los mensajes</string>
     <string name="room_settings_mention_only">Solo menciones</string>
@@ -1185,7 +1186,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_show_read_receipts">Mostrar recibos de lectura</string>
     <string name="settings_show_read_receipts_summary">Hacer click en los recibos de lectura para mostrar una lista detallada.</string>
     <string name="settings_show_join_leave_messages">Mostrar notificaciones de entrada y salida</string>
-    <string name="settings_show_join_leave_messages_summary">Invitaciones, expulsiones y prohibiciones no se ven afectadas.</string>
+    <string name="settings_show_join_leave_messages_summary">Invitaciones, expulsiones y vetos no se ven afectadas.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Mostrar notificaciones de la cuenta</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Incluye cambios en el avatar y en el nombre.</string>
     <string name="settings_send_message_with_enter">Enviar mensaje con intro</string>
@@ -2357,7 +2358,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_troubleshoot_test_push_loop_success">La aplicación está recibiendo PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">La aplicación está esperando al PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_title">Probar Push</string>
-    <string name="search_is_not_supported_in_e2e_room">Todavía no se puede hacer búsquedas en salas cifradas.</string>
     <string name="search_banned_user_hint">Filtrar usuarios excluidos</string>
     <string name="send_bug_report_include_key_share_history">Enviar la historia de peticiones de claves compartidas</string>
     <string name="no_more_results">No hay más resultados</string>
@@ -2413,7 +2413,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
         <item quantity="one">%d invitación</item>
         <item quantity="other">%d invitaciones</item>
     </plurals>
-    <string name="settings_show_room_member_state_events_summary">Incluye invitar/unirse/expulsar/prohibir/mostrar cambios de nombre.</string>
+    <string name="settings_show_room_member_state_events_summary">Incluye los eventos de invitar/unirse/abandonar/eliminar/vetar y los cambios de avatar/nombre.</string>
     <string name="settings_show_room_member_state_events">Mostrar eventos de los miembros de la sala</string>
     <string name="settings_troubleshoot_test_notification_notification_clicked">¡La notificación ha sido cliqueada!</string>
     <string name="system_theme">Tema del sistema</string>
@@ -2498,7 +2498,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="add_space">Añade un Espacio</string>
     <string name="command_description_create_space">Crea un Espacio</string>
     <string name="activity_create_space_title">Crear un espacio</string>
-    <string name="create_spaces_type_header">Los Espacios son una nueva forma de agrupar salas y personas</string>
     <string name="initial_sync_start_server_computing">Sincronización inicial:
 \nEsperando respuesta del servidor…</string>
     <string name="a11y_error_message_not_sent">El mensaje no se pudo enviar por un error</string>
@@ -2921,7 +2920,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="space_settings_permissions_subtitle">Vea y actualice los roles necesarios para cambiar varias partes del espacio.</string>
     <string name="space_settings_permissions_title">Permisos de espacio</string>
     <string name="space_participants_unban_prompt_msg">Quitar la prohibición al usuario le permitirá unirse al espacio nuevamente.</string>
-    <string name="space_participants_ban_prompt_msg">La prohibición del usuario lo expulsara de este espacio y evitará que se una nuevamente.</string>
+    <string name="space_participants_ban_prompt_msg">Vetar un usuario lo expulsará de este espacio y evitará que se una nuevamente.</string>
     <string name="space_participants_remove_prompt_msg">Patear al usuario lo eliminará de este espacio.
 \n
 \nPara evitar que se unan nuevamente, debe prohibirlos.</string>
@@ -2934,15 +2933,10 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="call_ringing">Llamada sonando…</string>
     <string name="spaces">Espacios</string>
     <string name="learn_more">Aprende más</string>
-    <string name="link_this_email_with_your_account">%s en Configuración para recibir invitaciones directamente en Element.</string>
+    <string name="template_link_this_email_with_your_account">%s en Configuración para recibir invitaciones directamente en ${app_name}.</string>
     <string name="link_this_email_settings_link">Vincula este correo electrónico con tu cuenta</string>
     <string name="this_invite_to_this_space_was_sent">Esta invitación a este espacio se envió a %s que no está asociado con su cuenta</string>
     <string name="this_invite_to_this_room_was_sent">Esta invitación a esta sala se envió a %s que no está asociado con su cuenta</string>
-    <string name="to_help_space_members_find_and_join">Para ayudar a los miembros del espacio a encontrar y unirse a una sala privada, vaya a la configuración de esa sala tocando el avatar.</string>
-    <string name="help_space_members">Ayuda a los miembros del espacio a encontrar salas privadas</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Esto facilita que las habitaciones se mantengan privadas de un espacio, al tiempo que permite que las personas en el espacio las encuentren y se unan. Todas las habitaciones nuevas de un espacio tendrán esta opción disponible.</string>
-    <string name="help_people_in_spaces_find_and_join">Ayude a las personas en los espacios a encontrar y unirse a salas privadas por sí mismas, sin necesidad de invitar a todos manualmente.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Nuevo: Permita que las personas en los espacios encuentren y se unan a salas privadas</string>
     <string name="upgrade_room_for_restricted_note">Tenga en cuenta que la mejora creará una nueva versión de la habitación. Todos los mensajes actuales permanecerán en esta sala archivada.</string>
     <string name="upgrade_room_for_restricted_no_param">Cualquiera en un espacio para padres podrá encontrar y unirse a esta sala, sin necesidad de invitar a todos manualmente. Podrás cambiar esto en la configuración de la habitación en cualquier momento.</string>
     <string name="upgrade_room_for_restricted">Cualquiera en %s podrá encontrar y unirse a esta sala, sin necesidad de invitar a todos manualmente. Podrás cambiar esto en la configuración de la habitación en cualquier momento.</string>
@@ -2970,4 +2964,26 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="all_rooms_youre_in_will_be_shown_in_home">Todas las salas en las que se encuentra se mostraran en inicio.</string>
     <string name="preference_show_all_rooms_in_home">Mostrar todas las salas en inicio</string>
     <string name="space_add_space_to_any_space_you_manage">Agregar un espacio a cualquier espacio que administre.</string>
+    <string name="space_add_existing_spaces">Añadir espacios existentes</string>
+    <string name="shortcut_disabled_reason_sign_out">¡Se ha cerrado la sesión!</string>
+    <string name="shortcut_disabled_reason_room_left">¡Se ha abandonado la sala!</string>
+    <string name="thread_list_empty_notice">Consejo: Pulse prolongadamente un mensaje y use \"%s\" .</string>
+    <string name="thread_list_empty_title">Mantén las conversaciones organizadas con hilos</string>
+    <string name="thread_list_modal_my_threads_subtitle">Muestra todos los hilos en que has participado</string>
+    <string name="thread_list_modal_my_threads_title">Mis Hilos</string>
+    <string name="thread_list_modal_all_threads_subtitle">Muestra todos los hilos de la sala actual</string>
+    <string name="thread_list_modal_all_threads_title">Todos los Hilos</string>
+    <string name="thread_list_title">Hilos</string>
+    <string name="thread_timeline_title">Hilo</string>
+    <string name="room_threads_filter">Filtrar Hilos en la sala</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">El cifrado está mal configurado por lo que no puedes enviar mensajes. Haz clic para abrir los ajustes.</string>
+    <string name="room_unsupported_e2e_algorithm">El cifrado está mal configurado, por lo que no puedes enviar mensajes. Por favor, contacta un administrador para que restablezca el cifrado a un estado válido.</string>
+    <string name="login_error_homeserver_from_url_not_found_enter_manual">Elegir servidor doméstico</string>
+    <string name="login_error_homeserver_from_url_not_found">No se puede acceder al servidor con la URL %s. Por favor revisa el enlace o elige otro servidor manualmente.</string>
+    <string name="action_not_now">Ahora no</string>
+    <string name="action_view_threads">Ver Hilos</string>
+    <string name="notification_listening_for_notifications">Captando notificaciones</string>
+    <string name="action_thread_view_in_room">Ver en la sala</string>
+    <string name="action_enable">Habilitar</string>
+    <string name="room_error_access_unauthorized">No estás autorizado a unirte a esta sala</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 77f854f73b..a9ac3c3bf5 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2399,7 +2399,6 @@
     <string name="settings_troubleshoot_test_push_loop_success">Rakendus võtab vastu tõuketeavitust</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Rakendus ootab tõuketeavitust</string>
     <string name="settings_troubleshoot_test_push_loop_title">Tõuketeavituse test</string>
-    <string name="search_is_not_supported_in_e2e_room">Otsing krüptitud jututubades ei ole veel toetatud.</string>
     <string name="search_banned_user_hint">Otsi suhtluskeelu saanud kasutajaid</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Sul ei ole õigusi siin jututoas helistamiseks</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Sul ei ole piisavalt õigusi, et selles jututoas alustada konverentsikõnet</string>
@@ -2651,7 +2650,7 @@
     <string name="space_add_existing_rooms">Lisa olemasolevaid jututubasid ja kogukonnakeskuseid</string>
     <string name="leave_space">Lahku kogukonnakeskusest</string>
     <string name="space_add_child_title">Lisa jututuba</string>
-    <string name="space_explore_activity_title">Uuri jututubasid</string>
+    <string name="space_explore_activity_title">Tutvu jututubadega</string>
     <plurals name="space_people_you_know">
         <item quantity="one">%d sinu tuttav on juba liitunud</item>
         <item quantity="other">%d sinu tuttavat on juba liitunud</item>
@@ -2700,7 +2699,6 @@
     <string name="create_spaces_join_info_help">Olemasoleva kogukonnakeskusega liitumiseks vajad sa kutset.</string>
     <string name="create_spaces_you_can_change_later">Sa võid seda hiljem muuta</string>
     <string name="create_spaces_choose_type_label">Missugust kogukonnakeskust sooviksid sa luua\?</string>
-    <string name="create_spaces_type_header">Kogukonnakeskused on uus viis jututubade ja inimeste ühendamiseks</string>
     <string name="your_private_space">Sinu privaatne kogukonnakeskus</string>
     <string name="your_public_space">Sinu avalik kogukonnakeskus</string>
     <string name="add_space">Lisa kogukonnakeskus</string>
@@ -2862,15 +2860,10 @@
     <string name="upgrade_room_for_restricted_no_param">Kõik hõlmava kogukonna liikmed saavad antud jututuba leida ja sellega liituda - sa ei pea kedagi ükshaaval kutsuma. Neid jututoa seadistusi saad igal hetkel muuta.</string>
     <string name="upgrade_room_for_restricted">Kõik %s jututoa liikmed saavad antud jututuba leida ja sellega liituda - sa ei pea kedagi ükshaaval kutsuma. Neid jututoa seadistusi saad igal hetkel muuta.</string>
     <string name="call_tap_to_return">%1$s - tagasipöördumiseks klõpsi</string>
-    <string name="link_this_email_with_your_account">%s ja saa kutsed otse Element\'i.</string>
+    <string name="template_link_this_email_with_your_account">%s ja saa kutsed otse ${app_name}\'i.</string>
     <string name="link_this_email_settings_link">Seo see e-posti aadress oma kasutajakontoga</string>
     <string name="this_invite_to_this_space_was_sent">See kutse siia kogukonnakeskusesse saadeti aadressile %s, mis ei ole seotud sinu kontoga</string>
     <string name="this_invite_to_this_room_was_sent">See kutse siia jututuppa saadeti aadressile %s, mis ei ole seotud sinu kontoga</string>
-    <string name="to_help_space_members_find_and_join">Selleks, et kogukonnakeskuse liikmed saaks privaatseid jututube leida ning nendega liituda ava tunnuspildile klõpsides jututoa seadistused.</string>
-    <string name="help_space_members">Aita kogukonnakeskuse liitmetel leida privaatseid jututube</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">See muudab lihtsaks, et jututoad jääksid kogukonnakeskuse piires privaatseks, kuid lasevad kogukonnakeskuses viibivatel inimestel need üles leida ja nendega liituda. Kõik kogukonnakeskuse uued jututoad on selle võimalusega.</string>
-    <string name="help_people_in_spaces_find_and_join">Aita kogukonnakeskuse liikmetel endil leida privaatseid jututube ning nendega liituda nii et sa ei pea kõigile eraldi kutset saatma.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Uus funktsionaalsus: Võimalda kogukonnakeskuse liikmetel leida privaatseid jututube ning nendega liituda</string>
     <string name="call_jitsi_started">Rühmakõne algas</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Kõik sinu jututoad on nähtavad avalehel.</string>
     <string name="preference_show_all_rooms_in_home">Näita kõiki jututubasid avalehel</string>
@@ -3028,7 +3021,7 @@
     </plurals>
     <string name="preference_system_settings">Süsteemiseadistused</string>
     <string name="preference_versions">Versioonid</string>
-    <string name="preference_help_summary">Element\'i kasutamiseks vajalik abiteave</string>
+    <string name="template_preference_help_summary">${app_name}\'i kasutamiseks vajalik abiteave</string>
     <string name="preference_help_title">Abiteave ja kasutajatugi</string>
     <string name="preference_help">Abiteave</string>
     <string name="preference_root_legals">Juriidiline teave</string>
@@ -3041,10 +3034,10 @@
     <string name="analytics_opt_in_list_item_2">Meie <b>ei</b> jaga teavet kolmandate osapooltega</string>
     <string name="analytics_opt_in_list_item_1">Meie <b>ei</b> salvesta ega profileeri sinu kasutajakonto andmeid</string>
     <string name="analytics_opt_in_content_link">siit</string>
-    <string name="analytics_opt_in_content">Võimalike vigade leidmiseks ja Element\'i arendamiseks jaga meiega anonüümseid andmeid. Selleks, et mõistaksime, kuidas kasutajad erinevaid seadmeid pruugivad me loome sinu seadmetele ühise juhusliku tunnuse.
+    <string name="template_analytics_opt_in_content">Võimalike vigade leidmiseks ja ${app_name}\'i arendamiseks jaga meiega anonüümseid andmeid. Selleks, et mõistaksime, kuidas kasutajad erinevaid seadmeid pruugivad me loome sinu seadmetele ühise juhusliku tunnuse.
 \n
 \nMeie kasutustingimused leiad siit - %s.</string>
-    <string name="analytics_opt_in_title">Aita Element\'i arendamisel</string>
+    <string name="template_analytics_opt_in_title">Aita ${app_name}\'i arendamisel</string>
     <string name="action_enable">Võta kasutusele</string>
     <string name="restart_the_application_to_apply_changes">Muudatuste jõustamiseks käivita rakendus uuesti.</string>
     <string name="labs_enable_latex_maths">Kasuta LaTeX-vorminduses matemaatika märgistust</string>
@@ -3060,10 +3053,9 @@
     <string name="labs_auto_report_uisi">Automaatselt teata dekrüptimise vigadest.</string>
     <string name="room_member_override_nick_color">Asenda hüüdnime värvid</string>
     <string name="login_splash_already_have_account">Mul on kasutajakonto juba olemas</string>
-    <string name="ftue_auth_carousel_4_title">Lase tiimidel vabalt tegutseda.</string>
-    <string name="ftue_auth_carousel_3_title">Turvaline sõnumivahetus.</string>
-    <string name="ftue_auth_carousel_2_title">Sul on kontroll oma andmete üle.</string>
-    <string name="ftue_auth_carousel_1_title">Vestlused, mida sa tegelikult ka omad.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Turvaline sõnumivahetus.</string>
+    <string name="ftue_auth_carousel_control_title">Sul on kontroll oma andmete üle.</string>
+    <string name="ftue_auth_carousel_secure_title">Vestlused, mida sa tegelikult ka omad.</string>
     <string name="tooltip_attachment_location">Jaga asukohta</string>
     <string name="labs_render_locations_in_timeline">Kuva ajajoonel kasutaja asukohti</string>
     <string name="settings_enable_location_sharing_summary">Kui see seadistus on kasutusel, siis sa saad oma asukohta jagada igas jututoas</string>
@@ -3090,11 +3082,44 @@
     <string name="encryption_has_been_misconfigured">Krüptimise seadistustes on viga.</string>
     <string name="sent_location">Jagas oma asukohta</string>
     <string name="login_splash_create_account">Loo kasutajakonto</string>
-    <string name="ftue_auth_carousel_title_messaging">Sõnumisuhtlus sinu tiimi või kogukonna jaoks.</string>
-    <string name="ftue_auth_carousel_body_encrypted">Tagatud on andmete läbiv krüptimine ning oma telefoninumbrit ei pea sa jagama. Pole reklaame ega sinu andmete kogumist.</string>
-    <string name="ftue_auth_carousel_body_control">Sa ise valid serveri, kus sinu vestlusi hoitakse ning sellega tagadki kontrolli oma andmete üle. Lahendus põhineb Matrix\'i võrgul.</string>
-    <string name="ftue_auth_carousel_body_secure">Turvaline ja sõltumatu suhtluslahendus, mis tagab sama privaatsuse, kui omavaheline vestlus sinu kodus.</string>
+    <string name="ftue_auth_carousel_workplace_title">Sõnumisuhtlus sinu tiimi või kogukonna jaoks.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Tagatud on andmete läbiv krüptimine ning oma telefoninumbrit ei pea sa jagama. Pole reklaame ega sinu andmete kogumist.</string>
+    <string name="ftue_auth_carousel_control_body">Sa ise valid serveri, kus sinu vestlusi hoitakse ning sellega tagadki kontrolli oma andmete üle. Lahendus põhineb Matrix\'i võrgul.</string>
+    <string name="ftue_auth_carousel_secure_body">Turvaline ja sõltumatu suhtluslahendus, mis tagab sama privaatsuse, kui omavaheline vestlus sinu kodus.</string>
     <string name="attachment_type_location">Asukoht</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">Krüptimise seadistustes on viga ja sa ei saa sõnumeid saata. Seadistuste avamiseks klõpsi siin.</string>
     <string name="room_unsupported_e2e_algorithm">Krüptimise seadistustes on viga ja sa ei saa sõnumeid saata. Kui soovid krüptimist töökorda saada, siis võta ühendust serveri haldajaga.</string>
+    <string name="ftue_auth_use_case_subtitle">Me aitame sind Matrix\'i võrgu kasutamisel.</string>
+    <string name="ftue_auth_use_case_connect_to_server">Alusta koduserveri kasutamist</string>
+    <string name="labs_enable_thread_messages">Võta jutulõngad kasutusele</string>
+    <string name="labs_enable_thread_messages_desc">Märkus: palun käivita rakendus uuesti</string>
+    <string name="location_timeline_failed_to_load_map">Kaardi laadimine ei õnnestunud</string>
+    <string name="a11y_static_map_image">Kaart</string>
+    <string name="message_bubbles">Näita jutumulle</string>
+    <string name="ftue_auth_use_case_join_existing_server">Tahad kasutada mõnda olemasolevat koduserverit\?</string>
+    <string name="ftue_auth_use_case_skip_partial">jätta selle küsimuse vahele</string>
+    <string name="ftue_auth_use_case_skip">Sa pole veel otsustanud\? Sa võid %s</string>
+    <string name="ftue_auth_use_case_option_two">Töökaaslased</string>
+    <string name="ftue_auth_use_case_option_three">Kogukonnad</string>
+    <string name="ftue_auth_use_case_option_one">Perekond ja sõbrad</string>
+    <string name="ftue_auth_use_case_title">Kellega sa kõige rohkem vestled\?</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Sa juba vaatad seda jutulõnga!</string>
+    <string name="view_in_room">Vaata jututoas</string>
+    <string name="reply_in_thread">Vasta jutulõngas</string>
+    <string name="command_not_supported_in_threads">„%s“ käsk on küll arusaadav, kuid ei ole jutulõngas kasutatav.</string>
+    <string name="search_thread_from_a_thread">Jutulõngast</string>
+    <string name="thread_list_empty_notice">Soovitus: Vajuta sõnumil pikalt ning vali „%s“.</string>
+    <string name="thread_list_empty_subtitle">Jutulõngad aitavad hoida vestlused teemakohastena ning mugavalt loetavatena.</string>
+    <string name="thread_list_empty_title">Halda vestlusi jutulõngadena</string>
+    <string name="thread_list_modal_my_threads_subtitle">Näitab kõiki jutulõngasid, kus sa oled osalenud</string>
+    <string name="thread_list_modal_my_threads_title">Minu jutulõngad</string>
+    <string name="thread_list_modal_all_threads_subtitle">Näitab kõiki praeguse jututoa jutulõngasid</string>
+    <string name="thread_list_modal_all_threads_title">Kõik jutulõngad</string>
+    <string name="thread_list_modal_title">Filtreeri</string>
+    <string name="thread_list_title">Jutulõngad</string>
+    <string name="thread_timeline_title">Jutulõng</string>
+    <string name="room_threads_filter">Sirvi jutulõngasid</string>
+    <string name="action_thread_copy_link_to_thread">Kopeeri jutulõnga link</string>
+    <string name="action_thread_view_in_room">Vaata jututoas</string>
+    <string name="action_view_threads">Vaata jutulõngana</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index a3782df603..47af4f0a1c 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -1674,7 +1674,7 @@
     <string name="settings_vibrate_on_mention">لرزیدن گوشی در هنگام ذکر یک کاربر</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">شامل تغییرات نام نمایشی و چهرک.</string>
     <string name="settings_show_avatar_display_name_changes_messages">نمایش پیام‌های مربوط به حساب کاربری</string>
-    <string name="settings_show_join_leave_messages_summary">دعوت‌ها و حذف توسط مدیر به هر صورت نمایش داده می‌شوند.</string>
+    <string name="settings_show_join_leave_messages_summary">دعوت‌ها، برداشتن‌ها و انسدادها تأثیر نمی‌پذیرند.</string>
     <string name="settings_show_join_leave_messages">نمایش پیام‌های پیوستن و ترک اتاق</string>
     <string name="settings_inline_url_preview_summary">پیش‌نمایشی از آدرس‌های URL در پیام‌ها نمایش داده شود.</string>
     <string name="settings_set_workmanager_delay_summary">%s
@@ -1732,7 +1732,6 @@
     <string name="settings_emails_empty">هیچ رایانامه‌ای به حسابتان افزوده نشده</string>
     <string name="settings_emails">نشانی‌های رایانامه</string>
     <string name="settings_phone_number_empty">هیچ شماره تلفنی به حسابتان افزوده نشده</string>
-    <string name="search_is_not_supported_in_e2e_room">قابلیت جستجو در اتاق‌های رمزشده هنوز پیاده‌سازی نشده است.</string>
     <string name="search_no_results">نتیجه‌ای در پی نداشت</string>
     <string name="search_banned_user_hint">فیلترکردن کاربران مسدود شده</string>
     <string name="room_event_action_cancel_download">لغو دانلود</string>
@@ -2704,7 +2703,6 @@
     <string name="create_spaces_join_info_help">برای پیوستن به یک فضای موجود، نیاز به دعوت دارید.</string>
     <string name="create_spaces_you_can_change_later">می‌توانید بعداً این را تغییر دهید</string>
     <string name="create_spaces_choose_type_label">می‌خواهید چه نوع فضایی ایجاد کنید؟</string>
-    <string name="create_spaces_type_header">فضاها راهی جدید برای گروه‌بندی اتاق‌ها و افراد است</string>
     <string name="your_private_space">فضای خصوصیتان</string>
     <string name="your_public_space">فضا عمومیتان</string>
     <string name="add_space">افزودن فضا</string>
@@ -2860,15 +2858,10 @@
     <string name="settings_notification_other">دیگر</string>
     <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="template_link_this_email_with_your_account">%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="to_help_space_members_find_and_join">برای کمک به اعضای فضا برای یافتن و پیوستن به یک اتاق خصوصی، با زدن روی چهرک، به تنظیمات اتاق بروید.</string>
-    <string name="help_space_members">کمک به اعضای فضا برای یافتن اتاق‌های خصوصی</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">این کار، خصوصی ماندن اتاق‌ها در فضا را، در عین اجازه به افراد داخل فضا برای یافتن و پیوستن، آسان می‌کند. تمامی اتاق‌های جدید در یک فضا، این گزینه را موجود دارند.</string>
-    <string name="help_people_in_spaces_find_and_join">به افراد کمک‌کنید خودشان اتاق‌های خصوصی را یافته و بپیوندند. نیازی به دعوت دستی همه نیست.</string>
-    <string name="new_let_people_in_spaces_find_and_join">جدید: بکذارید افراد در فضا، اتاق‌های خصوصی را یافته و بپیوندند</string>
     <string name="call_jitsi_started">تماس گروهی آغاز شد</string>
     <string name="upgrade_public_room_from_to">این اتاق را از %1$s به %2$s ارتقا خواهید داد.</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">تمام اتاق‌هایی که‌در آن‌هایید، در خانه نشان داده خواهند شد.</string>
@@ -3002,7 +2995,7 @@
     <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="analytics_opt_in_content">با هم‌رسانی داده‌ّای استفادهٔ ناشناس، در تشخیص مشکل‌ها و بهبود المنت یاریمان کنید. برای درک چگونگی استفادهٔ مردم از چندین افزاره، شناسه‌ای کاتوره‌ای بین افزاره‌هایتان هم‌رسانی خواهیم کرد.
+    <string name="template_analytics_opt_in_content">با هم‌رسانی داده‌ّای استفادهٔ ناشناس، در تشخیص مشکل‌ها و بهبود المنت یاریمان کنید. برای درک چگونگی استفادهٔ مردم از چندین افزاره، شناسه‌ای کاتوره‌ای بین افزاره‌هایتان هم‌رسانی خواهیم کرد.
 \n
 \nمی‌توانید از %s قوانینمان را بخوانید.</string>
     <string name="delete_poll_dialog_content">مطمئنید که می خواهید این نظرسنجی را بردارید؟ پس از این کار، قادر به بازگردانیش نیستید.</string>
@@ -3019,7 +3012,7 @@
         <item quantity="other">نتیجهٔ نهایی بر مبنای %1$d رأی</item>
     </plurals>
     <plurals name="poll_total_vote_count_before_ended_and_not_voted">
-        <item quantity="one">رأیی داده نشده</item>
+        <item quantity="one">۱ رأی داده شده. برای دیدن نتیجه، رأی دهید</item>
         <item quantity="other">%1$d رأی داده شده. برای دیدن نتیجه، رأی دهید</item>
     </plurals>
     <plurals name="poll_total_vote_count_before_ended_and_voted">
@@ -3032,7 +3025,7 @@
     </plurals>
     <string name="preference_system_settings">تنظیمات سامانه</string>
     <string name="preference_versions">نگارش‌ها</string>
-    <string name="preference_help_summary">کمک در استفاده از المنت</string>
+    <string name="template_preference_help_summary">کمک در استفاده از المنت</string>
     <string name="preference_help_title">کمک و پشتیانی</string>
     <string name="preference_help">کمک</string>
     <string name="preference_root_legals">موارد حقوقی</string>
@@ -3045,7 +3038,7 @@
     <string name="analytics_opt_in_list_item_2">ما اطّلاعات را با سوم‌شخص‌ها هم‌رسانی <b>نمی‌کنیم</b></string>
     <string name="analytics_opt_in_list_item_1">ما هیچ دادهٔ حسابی را ذخیره یا نمایه <b>نمی‌کنیم</b></string>
     <string name="analytics_opt_in_content_link">این‌جا</string>
-    <string name="analytics_opt_in_title">کمک به بهبود المنت</string>
+    <string name="template_analytics_opt_in_title">کمک به بهبود المنت</string>
     <string name="action_enable">به کار انداختن</string>
     <string name="restart_the_application_to_apply_changes">برای اثربخشی تغییر، برنامه را دوباره اجرا کنید.</string>
     <string name="labs_enable_latex_maths">به کار انداختن ریاضیات لاتک</string>
@@ -3059,9 +3052,9 @@
     <string name="labs_auto_report_uisi_desc">سامانه‌تان هنگام‌ مواجهه با خطای ناتوانی در رمزگشایی، گزارش‌ها را به صورت خودکار خواهد فرستاد</string>
     <string name="labs_auto_report_uisi">گزارش خودکار خطاهای رمزگشایی.</string>
     <string name="login_splash_already_have_account">از پیش حساب دارم</string>
-    <string name="ftue_auth_carousel_3_title">پیام‌رسانی امن.</string>
-    <string name="ftue_auth_carousel_2_title">شما کنترل می‌کنید.</string>
-    <string name="ftue_auth_carousel_1_title">صاحب گفت‌وگوهایتان باشید.</string>
+    <string name="ftue_auth_carousel_encrypted_title">پیام‌رسانی امن.</string>
+    <string name="ftue_auth_carousel_control_title">شما کنترل می‌کنید.</string>
+    <string name="ftue_auth_carousel_secure_title">صاحب گفت‌وگوهایتان باشید.</string>
     <string name="tooltip_attachment_location">هم‌رسانی مکان</string>
     <string name="settings_enable_location_sharing">به کار انداختن هم‌رسانی مکان</string>
     <string name="location_share_external">گشودن با</string>
@@ -3078,6 +3071,55 @@
     <string name="room_profile_section_restore_security">بازیابی رمزنگاری</string>
     <string name="sent_location">مکانش را هم‌رسانی کرد</string>
     <string name="login_splash_create_account">ایجاد حساب</string>
-    <string name="ftue_auth_carousel_title_messaging">پیام‌رسانی برای گروهتان.</string>
+    <string name="ftue_auth_carousel_workplace_title">پیام‌رسانی برای گروهتان.</string>
     <string name="attachment_type_location">مکان</string>
+    <string name="labs_render_locations_in_timeline">پرداخت مکان‌های کاربری در خط زمانی</string>
+    <string name="settings_enable_location_sharing_summary">پس از به کار افتادن، قادر خواهید بد مکانتان را به هر اتاقی بفرستید</string>
+    <string name="template_location_not_available_dialog_content">${app_name} نتوانست به مکانتان دست یابد. لطفاً بعداً دوباره تلاش کنید.</string>
+    <string name="template_location_not_available_dialog_title">${app_name} نتوانست به مکانتان دست یابد</string>
+    <string name="closed_poll_option_description">نتایج تنها هنگامی که نظرسنجی را پایان دهید آشکار می‌شوند</string>
+    <string name="open_poll_option_description">رأی دهندگان به محض دادن رأی، نتایج را می‌بینند</string>
+    <string name="a11y_trust_level_misconfigured">سطح اطمنیان بد پیکربندی شده</string>
+    <string name="encryption_misconfigured">رمزنگاری بد پیکربندی شده</string>
+    <string name="room_member_override_nick_color">پایمالی رنگ نام مستعار</string>
+    <string name="contact_admin_to_restore_encryption">لطفاً برای بازگردانی رمزنگاری به یه وضعیتی معتبر، با مدیری تماس بگیرید.</string>
+    <string name="encryption_has_been_misconfigured">رمزنگاری بد پیکربندی شده.</string>
+    <string name="ftue_auth_carousel_encrypted_body">رمزنگاشتهٔ سرتاسری و بدون نیاز به شماره تلفن. بدون تبلیغات یا داده‌کاوی.</string>
+    <string name="ftue_auth_carousel_control_body">مکان نگه‌داری گفت‌وگوهایتان را برگزینید که به شما کنترل و استقلال می‌هد. وصل شده با ماتریکس.</string>
+    <string name="ftue_auth_carousel_secure_body">ارتباطات امن و مستقل که به شما همان سطح محرمانگی گفت‌وگوی رودررو در خانهٔ خودتان را می‌دهد.</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">از آن‌جا که رمزنگاری بد پیکربندی شده، نمی‌توانید پیام بفرستید. برای گشودن تنظیمات، بزنید.</string>
+    <string name="room_unsupported_e2e_algorithm">از آن‌جا که رمزنگاری بد پیکربندی شده، نمی‌توانید پیام بفرستید. لطفاً برای بازگردانی رمزنگاری به یه وضعیت معتبر، با مدیری تماس بگیرید.</string>
+    <string name="message_bubbles">نمایش حباب‌های پیام</string>
+    <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="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_skip">هنوز اطمینان ندارید؟ می‌توانید %s</string>
+    <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_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>
+    <string name="command_not_supported_in_threads">دستور «%s» شناخته شده است ولی در رشته‌ها پشتیبانی نمی‌شود.</string>
+    <string name="search_thread_from_a_thread">از یک رشته</string>
+    <string name="thread_list_empty_notice">ایما: روی پیام نگه داشته و از «%s» استفاده کنید.</string>
+    <string name="thread_list_empty_subtitle">رشته‌ها در روی موضوع نگه داشت گفت‌وگوها و آسانی ردیابیشان کمک می‌کنند.</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">رشته‌هایم</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_list_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="action_view_threads">دیدن رشته‌ها</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 0712d15e4a..a4b217f504 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -2236,7 +2236,6 @@
     <string name="create_spaces_join_info_help">Tarvitset kutsun liittyäksesi olemassa olevaan avaruuteen.</string>
     <string name="create_spaces_you_can_change_later">Voit muuttaa tämän myöhemmin</string>
     <string name="create_spaces_choose_type_label">Minkä tyyppisen avaruuden haluat luoda\?</string>
-    <string name="create_spaces_type_header">Avaruudet ovat uusi tapa ryhmitellä huoneita ja ihmisiä</string>
     <string name="your_private_space">Yksityinen avaruutesi</string>
     <string name="your_public_space">Julkinen avaruutesi</string>
     <string name="add_space">Lisää avaruus</string>
@@ -2518,7 +2517,6 @@
     <string name="settings_remove_three_pid_confirmation_content">Poistetaanko %s\?</string>
     <string name="room_settings_none">Ei mitään</string>
     <string name="room_settings_mention_and_keyword_only">Vain maininnat ja avainsanat</string>
-    <string name="search_is_not_supported_in_e2e_room">Hakeminen salatuista huoneista ei ole vielä tuettu.</string>
     <string name="room_permissions_change_space_name">Vaihda avaruuden nimeä</string>
     <string name="room_permissions_enable_space_encryption">Ota avaruuden salaus käyttöön</string>
     <string name="space_settings_permissions_title">Avaruuden käyttöoikeudet</string>
diff --git a/vector/src/main/res/values-fr-rCA/strings.xml b/vector/src/main/res/values-fr-rCA/strings.xml
index 0cf789c04f..58004d1932 100644
--- a/vector/src/main/res/values-fr-rCA/strings.xml
+++ b/vector/src/main/res/values-fr-rCA/strings.xml
@@ -1443,7 +1443,6 @@
     <string name="room_settings_all_messages_noisy">Notification sonore pour chaque message</string>
     <string name="directory_searching_title">Recherche dans le répertoire…</string>
     <string name="directory_search_results_title">Parcourir le répertoire</string>
-    <string name="search_is_not_supported_in_e2e_room">La recherche dans les salons chiffrés n\'est pas encore prise en charge.</string>
     <string name="tab_title_search_files">FICHIERS</string>
     <string name="tab_title_search_people">PARTICIPANTS</string>
     <string name="tab_title_search_messages">MESSAGES</string>
@@ -2661,7 +2660,6 @@
     <string name="create_spaces_join_info_help">Pour rejoindre un espace existant, il vous faut une invitation.</string>
     <string name="create_spaces_you_can_change_later">Vous pouvez changer ceci plus tard</string>
     <string name="create_spaces_choose_type_label">Quel type d’espace voulez-vous créer\?</string>
-    <string name="create_spaces_type_header">Les espaces sont un nouveau moyen de regrouper les salons et les personnes</string>
     <string name="your_private_space">Votre espace privé</string>
     <string name="your_public_space">Votre espace public</string>
     <string name="add_space">Ajouter un espace</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 08dcb09190..fdc20b2bbd 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2339,7 +2339,6 @@
     <string name="settings_emails_empty">Aucune adresse e-mail n’a été ajoutée à votre compte</string>
     <string name="settings_emails">Adresses e-mail</string>
     <string name="settings_phone_number_empty">Aucun numéro de téléphone n’a été ajouté à votre compte</string>
-    <string name="search_is_not_supported_in_e2e_room">La recherche dans les salons chiffrés n\'est pas encore prise en charge.</string>
     <string name="search_banned_user_hint">Filtrer les utilisateurs exclus</string>
     <string name="room_participants_action_unignore_prompt_msg">Ne plus ignorer cet utilisateur aura pour effet de ré-afficher ses messages.</string>
     <string name="room_participants_remove_prompt_msg">expulser un utilisateur le supprimera de ce salon.
@@ -2648,7 +2647,6 @@
     <string name="event_status_sent_message">Message envoyé</string>
     <string name="create_spaces_you_can_change_later">Vous pouvez changer ceci plus tard</string>
     <string name="create_spaces_choose_type_label">Quel type d’espace voulez-vous créer \?</string>
-    <string name="create_spaces_type_header">Les espaces sont un nouveau moyen de regrouper les salons et les personnes</string>
     <string name="your_private_space">Votre espace privé</string>
     <string name="your_public_space">Votre espace public</string>
     <string name="add_space">Ajouter un espace</string>
@@ -2862,15 +2860,10 @@
     <string name="settings_notification_other">Autre</string>
     <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 Element.</string>
+    <string name="template_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 cet e-mail à 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="to_help_space_members_find_and_join">Pour aider les membres de l’espace à trouver des salons privés, allez aux paramètres du salons en touchant l’avatar.</string>
-    <string name="help_space_members">Aidez les membres de l’espace à trouver des salons privés</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Cela permet de garder facilement un salon privé dans un espace, tout en laissant la possibilité aux gens de trouver l’espace et de le rejoindre. Tous les nouveaux salons de cet espace auront cette option disponible.</string>
-    <string name="help_people_in_spaces_find_and_join">Aide les personnes dans les espaces à trouver et rejoindre des salons privés tout seuls, sans avoir à les inviter manuellement.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Nouveau : aidez les personnes dans les espaces à trouver et rejoindre des salons privés</string>
     <string name="call_jitsi_started">L’appel de groupe a démarré</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>
     <string name="preference_show_all_rooms_in_home">Montrer tous les salons dans Accueil</string>
@@ -3030,7 +3023,7 @@
     </plurals>
     <string name="preference_system_settings">Paramètres système</string>
     <string name="preference_versions">Versions</string>
-    <string name="preference_help_summary">Obtenir de l’aide pour utiliser Element</string>
+    <string name="template_preference_help_summary">Obtenir de l’aide pour utiliser ${app_name}</string>
     <string name="preference_help_title">Aide et support</string>
     <string name="preference_help">Aide</string>
     <string name="preference_root_legals">Mentions légales</string>
@@ -3043,10 +3036,10 @@
     <string name="analytics_opt_in_list_item_2">Nous ne partageons <b>aucune</b> information avec des tiers</string>
     <string name="analytics_opt_in_list_item_1">Nous n’enregistrons ou ne profilons <b>aucune</b> donnée du compte</string>
     <string name="analytics_opt_in_content_link">ici</string>
-    <string name="analytics_opt_in_content">Aidez nous à identifier les problèmes et améliorer Element en envoyant des rapports d’usage anonymes. Pour comprendre de quelle manière les gens utilisent Element sur plusieurs appareils, nous créeront un identifiant aléatoire commun à tous vos appareils.
+    <string name="template_analytics_opt_in_content">Aidez nous à identifier les problèmes et améliorer ${app_name} en envoyant des rapports d’usage anonymes. Pour comprendre de quelle manière les gens utilisent Element sur plusieurs appareils, nous créeront un identifiant aléatoire commun à tous vos appareils.
 \n
 \nVous pouvez lire toutes les conditions %s.</string>
-    <string name="analytics_opt_in_title">Aider à améliorer Element</string>
+    <string name="template_analytics_opt_in_title">Aider à améliorer ${app_name}</string>
     <string name="action_enable">Activer</string>
     <string name="tooltip_attachment_poll">Créer un sondage</string>
     <string name="tooltip_attachment_contact">Ouvrir les contacts</string>
@@ -3060,12 +3053,11 @@
     <string name="labs_auto_report_uisi">Signalement automatique des erreurs de déchiffrement.</string>
     <string name="room_member_override_nick_color">Outrepasser la couleur du pseudo</string>
     <string name="login_splash_already_have_account">J’ai déjà un compte</string>
-    <string name="ftue_auth_carousel_4_title">Être vicTeams, ce n’est pas Slack vous voulez.</string>
-    <string name="ftue_auth_carousel_3_title">Messagerie sécurisée.</string>
-    <string name="ftue_auth_carousel_2_title">Vous êtes aux commandes.</string>
-    <string name="ftue_auth_carousel_1_title">Contrôlez vos conversations.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Messagerie sécurisée.</string>
+    <string name="ftue_auth_carousel_control_title">Vous êtes aux commandes.</string>
+    <string name="ftue_auth_carousel_secure_title">Contrôlez vos conversations.</string>
     <string name="room_error_access_unauthorized">Vous n’êtes pas autorisé à rejoindre ce salon</string>
-    <string name="ftue_auth_carousel_body_control">Choisissez où vos conversations sont stockées, vous avez le contrôle et êtes indépendant. Connecté via Matrix.</string>
+    <string name="ftue_auth_carousel_control_body">Choisissez où vos conversations sont stockées, vous avez le contrôle et êtes indépendant. Connecté via Matrix.</string>
     <string name="room_unsupported_e2e_algorithm">Le chiffrement a été mal configuré ce qui vous empêche d’envoyer des messages. Veuillez contacter un administrateur pour remettre le chiffrement en état de marche.</string>
     <string name="tooltip_attachment_location">Partager la localisation</string>
     <string name="labs_render_locations_in_timeline">Afficher les localisations de l\'utilisateur dans le temps</string>
@@ -3093,9 +3085,9 @@
     <string name="encryption_has_been_misconfigured">Le chiffrement a été mal configuré.</string>
     <string name="sent_location">On partagé leur localisation</string>
     <string name="login_splash_create_account">Créer un compte</string>
-    <string name="ftue_auth_carousel_title_messaging">Messagerie pour votre équipe.</string>
-    <string name="ftue_auth_carousel_body_encrypted">Chiffré de bout en bout et aucun numéro de téléphone n\'est nécessaire. Pas de pubs ni de collecte de données.</string>
-    <string name="ftue_auth_carousel_body_secure">Communication indépendante et sécurisée qui vous donne le même niveau d\'intimité qu\'une discussion face-à-face dans votre maison.</string>
+    <string name="ftue_auth_carousel_workplace_title">Messagerie pour votre équipe.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Chiffré de bout en bout et aucun numéro de téléphone n\'est nécessaire. Pas de pubs ni de collecte de données.</string>
+    <string name="ftue_auth_carousel_secure_body">Communication indépendante et sécurisée qui vous donne le même niveau d\'intimité qu\'une discussion face-à-face dans votre maison.</string>
     <string name="attachment_type_location">Localisation</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">Le chiffrement a été mal configuré ce qui vous empêche d\'envoyer des messages. Cliquez pour ouvrir les paramètres.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index 194d526c5b..c3fd5c36e5 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -1101,7 +1101,7 @@
     <string name="command_description_nick">Wiziget jo werjeftenamme</string>
     <string name="room_widget_permission_display_name">Jo werjeftenamme</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Befettet wizigingen yn avatar en werjeftenamme.</string>
-    <string name="settings_show_room_member_state_events_summary">Befettet útnûging/meidwaan/ferlitten/skopt/ferballe-barrens en wizigingen avatar/werjeftenamme.</string>
+    <string name="settings_show_room_member_state_events_summary">Befettet útnûging/meidwaan/ferlitten/fuortsmiten/ferballe-barrens en wizigingen avatar/werjeftenamme.</string>
     <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} sil periodyk op de eftergrûn syngronisearje (konfigurearber).
 \nDit hat in negative ynfloed op jo batterij- en datagebrûk. Der sil in melding toand wurde ta ynformaasje.</string>
     <string name="settings_messages_containing_display_name">Myn werjeftenamme</string>
@@ -1271,7 +1271,7 @@
     <string name="permissions_action_not_performed_missing_permissions">Sorry. De aksje is net tapast fanwegen ûntbrekkende rjochten</string>
     <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} kin jo adresboek benaderje om oare Matrix-brûkers te finen oan de hân fan harren e-mailadressen en telefoannûmers.
 \n
-\nWolle jo jo adresboek hjir foar diele.</string>
+\nWolle jo jo adresboek hjir foar diele\?</string>
     <string name="template_permissions_rationale_msg_contacts">${app_name} kin jo adresboek benaderje om oare Matrix-brûkers te finen oan de hân fan harren e-mailadressen en telefoannûmers. As jo it goed fine om jo adresboek hjirfoar te dielen, jou dan tagong op de folgjende pop-up.</string>
     <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} hat tagong nedich ta jo kamera en mikrofoan om fideo-oproppen te meitsjen.
 \n
@@ -1320,7 +1320,7 @@
     <string name="call_connecting">Oprop is oan it ferbinen…</string>
     <string name="template_e2e_re_request_encryption_key_dialog_content">Start ${app_name} op in oar apparaat dat it berjocht ûntsiferje kin, sadat it de kaaien nei dizze sesje stjoere kin.</string>
     <string name="login_error_homeserver_from_url_not_found">Thússerver-URL %s net te berikken. Kontrolearje jo keppeling of kies hânmjittich in oare thússerver.</string>
-    <string name="space_participants_ban_prompt_msg">Troch dizze brûker te ferballen sil dy fuortsmiten wurde út dizze romte en foarkommen dat dy opnij ta treed.</string>
+    <string name="space_participants_ban_prompt_msg">Troch dizze brûker te ferballen, sil dy fuortsmiten wurde út dizze romte en foarkommen wurde dat dy opnij binnen komt.</string>
     <string name="room_participants_ban_prompt_msg">As in brûker ferballe wurdt, wurdt dizze út dizze keamer fuortsmiten en wurdt der foarkommen dat dy opnij lid wurdt.</string>
     <string name="room_participants_unban_title">Ferballing brûker ûngedien meitsje</string>
     <string name="room_participants_ban_reason">Reden foar ferballing</string>
@@ -1402,7 +1402,6 @@
         <item quantity="other">%d keamers</item>
     </plurals>
     <string name="directory_search_results_title">Katalogus trochblêdzje</string>
-    <string name="search_is_not_supported_in_e2e_room">Sykjen yn fersifere keamers wurdt op dit stuit net stipe.</string>
     <string name="tab_title_search_files">BESTANNEN</string>
     <string name="tab_title_search_people">PERSOANEN</string>
     <string name="tab_title_search_messages">BERJOCHTEN</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 0a6b6d9a97..01ddffed6c 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1225,9 +1225,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="keys_backup_info_title_signature">Aláírás</string>
     <string name="keys_backup_settings_untrusted_backup">A Kulcs Mentés munkamenetben való felhasználáshoz, állítsd vissza jelmondattal vagy Visszaállítási Kulccsal.</string>
     <string name="new_recovery_method_popup_title">Új Kulcs Mentés</string>
-    <string name="new_recovery_method_popup_description">Új biztonságos üzenet kulcs mentés észlelve.
-
-Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó próbál hozzáférni a fiókodhoz. Azonnal cseréld le a felhasználói fiókod jelszavát és állítsál be új visszaállítási metódust a Beállításokban.</string>
+    <string name="new_recovery_method_popup_description">Egy új biztonságos kulcs mentés észlelve. Ha nem te állítottad be a visszaállítási módot, akkor egy támadó próbál hozzáférni a fiókodhoz. Azonnal cseréld le a felhasználói fiókod jelszavát és állíts be új visszaállítási módot a Beállításokban.</string>
     <string name="new_recovery_method_popup_was_me">Én voltam</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Visszaállítási kulcs kiszámítása…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Kulcsok letöltése…</string>
@@ -2383,7 +2381,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="settings_troubleshoot_test_push_loop_title">Push tesztelése</string>
     <string name="error_threepid_auth_failed">Ellenőrizd, hogy rákattintottál arra a hivatkozásra amit e-mailben küldtünk neked.</string>
     <string name="settings_remove_three_pid_confirmation_content">%s törlése\?</string>
-    <string name="search_is_not_supported_in_e2e_room">Titkosított szobákban való keresés egyelőre nem támogatott.</string>
     <string name="search_banned_user_hint">Kitiltott felhasználók szűrése</string>
     <string name="room_permissions_change_topic">Téma megváltoztatása</string>
     <string name="room_permissions_upgrade_the_room">Szoba fejlesztése</string>
@@ -2508,7 +2505,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="create_spaces_join_info_help">Létező térbe való belépéshez meghívó szükséges.</string>
     <string name="create_spaces_you_can_change_later">Ezt később meg lehet változtatni</string>
     <string name="create_spaces_choose_type_label">Milyen típusú teret szeretnél készíteni\?</string>
-    <string name="create_spaces_type_header">A Terek használata egy új lehetőség a szobák és felhasználók csoportosítására</string>
     <string name="your_private_space">Privát tér</string>
     <string name="your_public_space">Nyilvános tér</string>
     <string name="add_space">Tér hozzáadása</string>
@@ -2656,7 +2652,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \n
 \nAz üzeneteidet zárolással vannak biztosítva és csak neked és a címzetteknek van meg a kulcs hozzá.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Itt az üzenetek nincsenek végponttól végpontig titkosítva.</string>
-    <string name="sent_verification_conclusion">Azonosítás eredménye</string>
+    <string name="sent_verification_conclusion">Hitelesítés eredménye</string>
     <string name="sent_a_poll">Szavazás</string>
     <string name="create_room_in_progress">Szoba létrehozása…</string>
     <string name="create_room_alias_invalid">Néhány karakter nem engedélyezett</string>
@@ -2860,15 +2856,10 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="voice_message_slide_to_cancel">Elhúzás a megszakításhoz</string>
     <string name="a11y_start_voice_message">Hang üzenet felvétele</string>
     <string name="allow_anyone_in_room_to_access">%s tér tagság megtalálhatja és hozzáférhet. Más tereket is beállíthatsz.</string>
-    <string name="link_this_email_with_your_account">%s a Beállításokba a közvetlen meghívások fogadásához az Elemenetben.</string>
+    <string name="template_link_this_email_with_your_account">%s a Beállításokba a közvetlen meghívások fogadásához az ${app_name}.</string>
     <string name="this_invite_to_this_space_was_sent">Ehhez a térhez a meghívó ide lett elküldve: %s, ami nincs összefüggésben a fiókoddal</string>
     <string name="this_invite_to_this_room_was_sent">Ehhez a szobához a meghívó ide lett elküldve: %s, ami nincs összefüggésben a fiókoddal</string>
-    <string name="to_help_space_members_find_and_join">A Tér tagságnak privát szoba megtalálásában és belépésben való segítséghez menj a szoba beállításaiba a profilképre való koppintással.</string>
     <string name="link_this_email_settings_link">Ennek az e-mailnek a fiókhoz való kötése</string>
-    <string name="help_space_members">Segíts a tér tagságának privát szobák megtalálásában</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">A szobák egyszerűbben maradhatnak privátok a téren kívül, amíg a tér tagsága megtalálhatja és beléphet oda. Minden új szoba a téren rendelkezik ezzel a beállítási lehetőséggel.</string>
-    <string name="help_people_in_spaces_find_and_join">Segíts a téren az embereknek privát szobák megtalálásába és a belépésben, nem szükséges a személyes meghívó.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Új: Engedd az embereknek a privát szobák megtalálását és a belépést</string>
     <string name="call_jitsi_started">Csoportos hívás elkezdődött</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Minden szoba amibe beléptél megjelenik a Kezdő téren.</string>
     <string name="preference_show_all_rooms_in_home">Minden szoba megjelenítése a Kezdő téren</string>
@@ -3028,7 +3019,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     </plurals>
     <string name="preference_system_settings">Rendszerbeállítások</string>
     <string name="preference_versions">Verziók</string>
-    <string name="preference_help_summary">Segítség az Element használatában</string>
+    <string name="template_preference_help_summary">Segítség az ${app_name} használatában</string>
     <string name="preference_help_title">Segítség és támogatás</string>
     <string name="preference_help">Segítség</string>
     <string name="legals_no_policy_provided">Ez a szerver nem adott meg szabályzatot.</string>
@@ -3040,16 +3031,16 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="analytics_opt_in_list_item_2"><b>Nem</b> osztjuk meg az információt harmadik féllel</string>
     <string name="analytics_opt_in_list_item_1"><b>Nem</b> küldünk és nem profilozunk semmilyen fiók adatot</string>
     <string name="analytics_opt_in_content_link">itt</string>
-    <string name="analytics_opt_in_content">Segíts észrevennünk a hibákat, és jobbá tenni az Element-et a névtelen használati adatok küldése által. Ahhoz, hogy megértsük, hogyan használnak a felhasználók egyszerre több eszközt, egy véletlenszerű azonosítót generálunk, ami az eszközeid között meg lesz osztva.
+    <string name="template_analytics_opt_in_content">Segíts észrevennünk a hibákat, és jobbá tenni az ${app_name}-et a névtelen használati adatok küldése által. Ahhoz, hogy megértsük, hogyan használnak a felhasználók egyszerre több eszközt, egy véletlenszerű azonosítót generálunk, ami az eszközeid között meg lesz osztva.
 \n
 \nElolvashatod a feltételeinket %s.</string>
-    <string name="analytics_opt_in_title">Segíts az Element-et jobbá tenni</string>
+    <string name="template_analytics_opt_in_title">Segíts az ${app_name}-et jobbá tenni</string>
     <string name="a11y_poll_winner_option">nyerő válasz</string>
     <string name="preference_root_legals">Jogi dolgok</string>
     <string name="restart_the_application_to_apply_changes">A változások életbelépéséhez indítsd újra az alkalmazást.</string>
     <string name="labs_enable_latex_maths">LaTeX matematikai szintaxis engedélyezése</string>
     <string name="room_error_access_unauthorized">Nem léphetsz be ebbe a szobába</string>
-    <string name="ftue_auth_carousel_1_title">Az ön beszélgetései csak az öné.</string>
+    <string name="ftue_auth_carousel_secure_title">Az ön beszélgetései csak az öné.</string>
     <string name="labs_auto_report_uisi_desc">Titkosítás visszafejtési hiba esemény alkalmával a rendszer automatikusan elküldi a logokat</string>
     <string name="labs_auto_report_uisi">Titkosítás visszafejtési hibák automatikus jelentése.</string>
     <string name="tooltip_attachment_poll">Szavazás létrehozása</string>
@@ -3060,16 +3051,15 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="tooltip_attachment_photo">Kamera megnyitása</string>
     <string name="room_member_override_nick_color">Becenév színének megváltoztatása</string>
     <string name="login_splash_already_have_account">Már van fiókom</string>
-    <string name="ftue_auth_carousel_4_title">Rázd fel a csoportjaidat.</string>
-    <string name="ftue_auth_carousel_3_title">Biztonságos üzenetküldés.</string>
-    <string name="ftue_auth_carousel_2_title">Te irányítasz.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Biztonságos üzenetküldés.</string>
+    <string name="ftue_auth_carousel_control_title">Te irányítasz.</string>
     <string name="tooltip_attachment_location">Tartózkodási hely megosztása</string>
     <string name="labs_render_locations_in_timeline">A felhasználó földrajzi helyzetének megjelenítése az idővonalon</string>
     <string name="settings_enable_location_sharing_summary">A beállítás után bármelyik szobában megoszthatod a földrajzi helyzetedet</string>
     <string name="settings_enable_location_sharing">Földrajzi hely megosztás engedélyezése</string>
     <string name="location_share_external">Megnyitás ezzel</string>
-    <string name="template_location_not_available_dialog_content">${app_name} nem fér hozzá a helyadatodhoz. Próbáld újra később.</string>
-    <string name="template_location_not_available_dialog_title">${app_name} nem fér hozzá a földrajzi helyzetedhez</string>
+    <string name="template_location_not_available_dialog_content">Az ${app_name} nem fér hozzá a tartózkodási helyedhez. Próbáld újra később.</string>
+    <string name="template_location_not_available_dialog_title">Az ${app_name} nem tudott hozzáférni a tartózkodási helyedhez</string>
     <string name="location_share">Tartózkodási hely megosztása</string>
     <string name="a11y_location_share_icon">Tartózkodási hely megosztása</string>
     <string name="location_activity_title_preview">Földrajzi helyzet</string>
@@ -3089,11 +3079,44 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="encryption_has_been_misconfigured">A titkosítás beállítása hibás.</string>
     <string name="sent_location">A földrajzi helyzetüket megosztották</string>
     <string name="login_splash_create_account">Fiók létrehozása</string>
-    <string name="ftue_auth_carousel_title_messaging">Üzenetküldés a csoportodnak.</string>
-    <string name="ftue_auth_carousel_body_encrypted">Telefonszám nélkül végpontok között titkosított. Reklámok és adatbányászat nélkül.</string>
-    <string name="ftue_auth_carousel_body_control">Válaszd meg hol legyenek a beszélgetéseid tárolva, visszaadja az irányítást és függetlenné tesz. Csatlakozva a Matrixhoz.</string>
-    <string name="ftue_auth_carousel_body_secure">Biztonságos és független kommunikáció ami olyan biztonságos mintha valakivel négyszemközt beszélgetnél a házadban.</string>
+    <string name="ftue_auth_carousel_workplace_title">Üzenetküldés a csoportodnak.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Telefonszám nélkül végpontok között titkosított. Reklámok és adatbányászat nélkül.</string>
+    <string name="ftue_auth_carousel_control_body">Válaszd meg hol legyenek a beszélgetéseid tárolva, visszaadja az irányítást és függetlenné tesz. Csatlakozva a Matrixhoz.</string>
+    <string name="ftue_auth_carousel_secure_body">Biztonságos és független kommunikáció ami olyan biztonságos mintha valakivel négyszemközt beszélgetnél a házadban.</string>
     <string name="attachment_type_location">Földrajzi helyzet</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">A titkosítás beállítása hibás így nem lehet üzenetet küldeni. Kattints a beállításokért.</string>
     <string name="room_unsupported_e2e_algorithm">A titkosítás beállítása hibás így nem lehet üzenetet küldeni. Kérjük vedd fel a kapcsolatot az adminisztrátorral a titkosítás helyreállításához.</string>
+    <string name="message_bubbles">Üzenet buborékok megjelenítése</string>
+    <string name="location_timeline_failed_to_load_map">Térkép betöltése sikertelen</string>
+    <string name="a11y_static_map_image">Térkép</string>
+    <string name="labs_enable_thread_messages_desc">Figyelem: az alkalmazás újraindul</string>
+    <string name="labs_enable_thread_messages">Üzenetszálak engedélyezése</string>
+    <string name="ftue_auth_use_case_connect_to_server">Szerverhez csatlakozás</string>
+    <string name="ftue_auth_use_case_join_existing_server">Csatlakoznál egy már meglévő szerverhez\?</string>
+    <string name="ftue_auth_use_case_skip_partial">kérdés kihagyása</string>
+    <string name="ftue_auth_use_case_skip">Még nem vagy biztos\? Tudhatsz ilyent: %s</string>
+    <string name="ftue_auth_use_case_option_three">Közösségek</string>
+    <string name="ftue_auth_use_case_option_two">Csoportok</string>
+    <string name="ftue_auth_use_case_option_one">Barátok és család</string>
+    <string name="ftue_auth_use_case_subtitle">Segítünk a kapcsolatteremtésben.</string>
+    <string name="ftue_auth_use_case_title">Kivel beszélgetnék leginkább\?</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Már nézed ezt az üzenetszálat!</string>
+    <string name="view_in_room">Megjelenítés szobában</string>
+    <string name="reply_in_thread">Válasz az üzenetszálban</string>
+    <string name="command_not_supported_in_threads">„%s” parancs ismert, de üzenetszálban nem támogatott.</string>
+    <string name="search_thread_from_a_thread">Az üzenetszálból</string>
+    <string name="thread_list_empty_notice">Tipp: Koppints hosszan az üzenetre és használd ezt: %s.</string>
+    <string name="thread_list_empty_subtitle">Az üzenetszálak segítenek a különböző témájú beszélgetések figyelemmel kísérésében.</string>
+    <string name="thread_list_empty_title">Beszélgetések üzenetszálakba való rendezése</string>
+    <string name="thread_list_modal_my_threads_subtitle">Minden üzenetszál megjelenítése ahol szerepel</string>
+    <string name="thread_list_modal_my_threads_title">Üzenetszálaim</string>
+    <string name="thread_list_modal_all_threads_subtitle">A szobában lévő összes szál mutatása</string>
+    <string name="thread_list_modal_all_threads_title">Minden üzenetszál</string>
+    <string name="thread_list_modal_title">Szűrés</string>
+    <string name="thread_list_title">Üzenetszálak</string>
+    <string name="thread_timeline_title">Üzenetszál</string>
+    <string name="room_threads_filter">Üzenetszálak szűrése a szobában</string>
+    <string name="action_thread_copy_link_to_thread">Üzenetszálra mutató hivatkozás másolása</string>
+    <string name="action_thread_view_in_room">Megjelenítés szobában</string>
+    <string name="action_view_threads">Üzenetszálak megtekintése</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index 62145bf64e..e99c91037f 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -43,7 +43,7 @@
     <string name="rooms_directory_header">Direktori ruang</string>
     <string name="send_bug_report_include_logs">Kirim log</string>
     <string name="send_bug_report_placeholder">Deskripsikan kendala Anda di sini</string>
-    <string name="send_bug_report_sent">Laporan bug telah berhasil dikirimkan</string>
+    <string name="send_bug_report_sent">Laporan kutu telah berhasil dikirimkan</string>
     <string name="read_receipt">Baca</string>
     <string name="create_account">Daftar</string>
     <string name="login">Masuk</string>
@@ -75,7 +75,7 @@
     <string name="cannot_start_call">Tidak dapat memulai panggilan, coba lagi nanti</string>
     <string name="missing_permissions_title_to_start_conf_call">Tidak dapat memulai panggilan</string>
     <string name="action_sign_out">Keluar</string>
-    <string name="offline">Offline</string>
+    <string name="offline">Luring</string>
     <string name="action_global_search">Pencarian global</string>
     <string name="action_mark_all_as_read">Tandai semua sudah dibaca</string>
     <string name="bottom_action_people">Orang</string>
@@ -86,7 +86,7 @@
     <string name="low_priority_header">Prioritas rendah</string>
     <string name="matrix_only_filter">Hanya kontak Matrix</string>
     <string name="rooms_header">Ruangan</string>
-    <string name="send_bug_report">Laporan bug</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="identity_url">URL server identitas</string>
@@ -104,13 +104,13 @@
     <string name="auth_password_dont_match">Kata sandi tidak cocok</string>
     <string name="auth_recaptcha_message">Homeserver ini ingin memastikan bahwa Anda bukan robot</string>
     <string name="auth_home_server">Homeserver:</string>
-    <string name="auth_reset_password_next_step_button">Saya sudah verifikasi alamat email saya</string>
+    <string name="auth_reset_password_next_step_button">Saya telah verifikasi alamat email saya</string>
     <string name="auth_reset_password_missing_password">Kata sandi baru perlu dimasukkan.</string>
     <string name="login_error_must_start_http">URL diawali dengan http[s]://</string>
     <string name="login_error_unable_login">Tidak dapat masuk</string>
     <string name="login_error_unable_register">Tidak dapat registrasi</string>
     <string name="login_error_invalid_home_server">Masukkan URL yang benar</string>
-    <string name="login_error_user_in_use">Nama pengguna sudah terpakai</string>
+    <string name="login_error_user_in_use">Nama pengguna telah terpakai</string>
     <string name="compression_opt_list_original">Asli</string>
     <string name="compression_opt_list_large">Besar</string>
     <string name="compression_opt_list_medium">Sedang</string>
@@ -136,7 +136,7 @@
     <string name="later">Nanti</string>
     <string name="send_anyway">Kirim Saja</string>
     <string name="template_no_contact_access_placeholder">${app_name} belum diizinkan untuk mengakses kontak lokal</string>
-    <string name="send_bug_report_include_crash_logs">Kirim log gangguan</string>
+    <string name="send_bug_report_include_crash_logs">Kirim catat gangguan</string>
     <string name="huge">Raksasa</string>
     <string name="small">Kecil</string>
     <string name="normal">Normal</string>
@@ -169,10 +169,10 @@
         <item quantity="other">%d pengguna</item>
     </plurals>
     <string name="send_bug_report_include_screenshot">Kirim tampilan layar</string>
-    <string name="send_bug_report_description">Mohon uraikan bug tersebut. Apa yang Anda lakukan? Apa yang Anda harapkan terjadi? Apa yang sebenarnya terjadi?</string>
-    <string name="send_bug_report_logs_description">Log dari klien akan dikirim bersama laporan gangguan ini untuk mendalami kendala yang Anda temukan. Laporan gangguan ini, termasuk log dan rekalayar, tidak akan dilihat oleh khalayak umum. Jika Anda hanya ingin mengirimkan tulisan di atas, silahkan hapus centang:</string>
-    <string name="send_bug_report_alert_message">Sepertinya Anda mengguncang telepon akibat frustrasi. Apakah Anda ingin membuka halaman laporan bug?</string>
-    <string name="send_bug_report_failed">Pengiriman laporan bug gagal (%s)</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">Catat dari klien akan dikirim bersama laporan gangguan ini untuk mendalami kendala yang Anda temukan. Laporan gangguan ini, termasuk catat 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_failed">Pengiriman laporan kutu gagal (%s)</string>
     <string name="send_bug_report_progress">Kemajuan (%s%%)</string>
     <string name="send_files_in">Kirim ke</string>
     <string name="username">Nama Pengguna</string>
@@ -320,8 +320,8 @@ Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna ${app_name} yan
     <string name="room_participants_leave_prompt_title">Tinggalkan ruang</string>
     <string name="room_participants_leave_prompt_msg">Apa benar Anda ingin meninggalkan ruangan ini\?</string>
     <string name="room_participants_create">Buat</string>
-    <string name="room_participants_online">Online</string>
-    <string name="room_participants_offline">Offline</string>
+    <string name="room_participants_online">Daring</string>
+    <string name="room_participants_offline">Luring</string>
     <string name="room_participants_idle">Berdiam Diri</string>
     <string name="room_participants_now">%1$s sekarang</string>
     <string name="room_participants_ago">%1$s %2$s yang lalu</string>
@@ -382,7 +382,7 @@ Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna ${app_name} yan
     <string name="ssl_logout_account">Keluar</string>
     <string name="ssl_remain_offline">Abaikan</string>
     <string name="ssl_fingerprint_hash">Sidik jari (%s):</string>
-    <string name="ssl_could_not_verify">Tidak dapat memastikan identitas remote server.</string>
+    <string name="ssl_could_not_verify">Tidak dapat memastikan identitas server jarak jauh.</string>
     <string name="ssl_cert_not_trust">Ini dapat terjadi ketika seseorang sedang mensabotase arus data Anda, atau perangkat Anda tidak percaya terhadap sertifikat remote server.</string>
     <string name="ssl_cert_new_account_expl">Apabila administrator server telah menyatakan ini memang akan terjadi, pastikan sidik jari berikut cocok dengan sidik jari yang mereka sediakan.</string>
     <string name="ssl_unexpected_existing_expl">Sertifikat ini tidak lagi sesuai dengan yang dipercayai oleh perangkat Anda sebelumnya. Ini SANGAT JANGGAL. Kami rekomendasikan Anda untuk TIDAK MENERIMA sertifikat baru ini.</string>
@@ -634,7 +634,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_settings_labs_warning_message">Ini adalah fitur uji coba dan mungkin rusak tanpa terduga. Hati-hati menggunakannya.</string>
     <string name="room_settings_labs_end_to_end">Enkripsi Ujung-ke-Ujung</string>
     <string name="room_settings_labs_end_to_end_is_active">Enkripsi Ujung-ke-Ujung aktif</string>
-    <string name="room_settings_labs_end_to_end_warnings">Anda perlu keluar dulu untuk mengaktifkan enkripsi.</string>
+    <string name="room_settings_labs_end_to_end_warnings">Anda perlu keluar terlebih dahulu untuk mengaktifkan enkripsi.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Enkripsi ke perangkat terverifikasi saja</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Jangan mengirim pesan terenkripsi ke perangkat yang belum diverifikasi di ruangan ini dengan perangkat ini.</string>
     <string name="room_settings_addresses_no_local_addresses">Ruangan ini tidak punya alamat lokal</string>
@@ -795,9 +795,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</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_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 bug untuk kami selidiki.</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 bug untuk kami selidiki.</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_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_failed">Notifikasi dinonaktifkan dalam pengaturan sistem.
@@ -985,7 +985,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="template_settings_add_3pid_flow_not_supported">Anda tidak dapat melakukan ini dari ponsel ${app_name}</string>
     <string name="settings_add_3pid_confirm_password_title">Konfirmasi kata sandi Anda</string>
     <string name="settings_phone_number_empty">Tidak ada nomor telepon yang ditambahkan ke akun Anda</string>
-    <string name="search_is_not_supported_in_e2e_room">Pencarian di ruangan terenkripsi belum didukung.</string>
     <string name="search_banned_user_hint">Saring pengguna yang dicekal</string>
     <string name="room_permissions_change_topic">Mengubah topik</string>
     <string name="room_permissions_upgrade_the_room">Meng-upgrade ruangan ini</string>
@@ -1462,7 +1461,7 @@ 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 sebutan &amp; pemberitahuan keyword tidak tersedia di ruangan terenkripsi di ponsel.</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="settings_play_shutter_sound">Putar suara rana</string>
     <string name="media_source_choose">Pilih</string>
@@ -1710,8 +1709,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="send_attachment">Kirim lampiran</string>
     <string name="error_network_timeout">Sepertinya server terlalu lama merespons, hal ini dapat disebabkan oleh konektivitas yang buruk atau kesalahan pada server. Silakan coba lagi dalam beberapa saat.</string>
     <string name="error_terms_not_accepted">Silakan coba lagi setelah Anda menerima syarat dan ketentuan homeserver Anda.</string>
-    <string name="labs_allow_extended_logging_summary">Log verbose akan membantu pengembang dengan menyediakan lebih banyak log saat Anda mengirim RageShake. Bahkan ketika diaktifkan, aplikasi tidak mencatat isi pesan atau data pribadi lainnya.</string>
-    <string name="labs_allow_extended_logging">Aktifkan log verbose.</string>
+    <string name="labs_allow_extended_logging_summary">Log verbose akan membantu pengembang dengan menyediakan lebih banyak catat saat Anda mengirim RageShake. Bahkan ketika diaktifkan, aplikasi tidak mencatat isi pesan atau data pribadi lainnya.</string>
+    <string name="labs_allow_extended_logging">Aktifkan catat verbose.</string>
     <string name="settings_text_message_sent_wrong_code">Kode verifikasi salah.</string>
     <string name="settings_text_message_sent_hint">Kode</string>
     <string name="settings_text_message_sent">Sebuah pesan teks telah dikirim ke %s. Silakan masukkan kode verifikasi yang ada di dalamnya.</string>
@@ -1825,7 +1824,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \n%s</string>
     <string name="sas_cancelled_dialog_title">Permintaan Dibatalkan</string>
     <string name="sas_verification_request_notification_channel_title">Kunci Verifikasi</string>
-    <string name="sas_legacy_verification_button_title">Gunakan verifikasi legacy.</string>
+    <string name="sas_legacy_verification_button_title">Gunakan verifikasi lama.</string>
     <string name="sas_verifying_keys">Tidak ada yang muncul\? Belum semua client mendukung verifikasi interaktif. Gunakan verifikasi legacy.</string>
     <string name="sas_got_it">Saya mengerti</string>
     <string name="sas_verified_successful_description">Pesan aman dengan pengguna ini dienkripsi ujung-ke-ujung dan tidak dapat dibaca oleh pihak ketiga.</string>
@@ -1921,16 +1920,16 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="keys_backup_setup_step3_please_make_copy">Mohon membuat salinan</string>
     <string name="keys_backup_setup_override_stop">Berhenti</string>
     <string name="keys_backup_setup_override_replace">Ganti</string>
-    <string name="keys_backup_setup_override_backup_prompt_description">Sepertinya Anda sudah menyiapkan cadangan kunci dari sesi lain. Apakah Anda ingin menggantinya dengan yang Anda buat\?</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Sepertinya Anda telah menyiapkan cadangan kunci dari sesi lain. Apakah Anda ingin menggantinya dengan yang Anda buat\?</string>
     <string name="keys_backup_setup_override_backup_prompt_tile">Cadangan sudah ada di homeserver Anda</string>
-    <string name="recovery_key_export_saved">Kunci pemulihan sudah disimpan.</string>
+    <string name="recovery_key_export_saved">Kunci pemulihan telah disimpan.</string>
     <string name="recovery_key_export_saved_as_warning">Kunci pemulihan telah disimpan ke \'%s\'.
 \n
 \nPeringatan: file ini dapat dihapus jika aplikasi dihapus.</string>
     <string name="keys_backup_setup_step3_save_button_title">Simpan sebagai File</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Bagikan</string>
     <string name="keys_backup_setup_step3_copy_button_title">Simpan Kunci Pemulihan</string>
-    <string name="keys_backup_setup_step3_button_title_no_passphrase">Saya sudah membuat salinan</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Saya telah membuat salinan</string>
     <string name="keys_backup_setup_step3_button_title">Selesai</string>
     <string name="keys_backup_setup_step3_text_line2_no_passphrase">Simpan kunci pemulihan Anda di suatu tempat yang sangat aman, seperti manajer kata sandi (atau brankas)</string>
     <string name="keys_backup_setup_step3_text_line2">Kunci pemulihan Anda adalah jaring pengaman — Anda dapat menggunakannya untuk memulihkan akses ke pesan terenkripsi Anda jika Anda lupa frasa sandi Anda.
@@ -1966,7 +1965,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_preferences">Preferensi</string>
     <string name="settings_general_title">Umum</string>
     <string name="quick_reactions">Reaksi Cepat</string>
-    <string name="navigate_to_room_when_already_in_the_room">Anda sudah menampilkan ruangan ini!</string>
+    <string name="navigate_to_room_when_already_in_the_room">Anda telah menampilkan ruangan ini!</string>
     <string name="settings_other_third_party_notices">Pemberitahuan pihak ketiga lainnya</string>
     <string name="settings_sdk_version">Versi SDK Matrix</string>
     <string name="import_e2e_keys_from_file">Impor kunci E2E dari file \"%1$s\".</string>
@@ -2021,7 +2020,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_list_catchup_welcome_body">Lihat pesan yang belum dibaca di sini</string>
     <string name="room_list_catchup_welcome_title">Selamat datang kembali!</string>
     <string name="room_list_catchup_empty_body">Anda tidak mempunyai pesan yang belum dibaca</string>
-    <string name="room_list_catchup_empty_title">Anda sudah melihat semua!</string>
+    <string name="room_list_catchup_empty_title">Anda telah melihat semuanya!</string>
     <string name="invited_by">Diundang oleh %s</string>
     <string name="verification_conclusion_compromised">Salah satu dari yang berikut ini dapat dikompromikan:
 \n
@@ -2288,7 +2287,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_reset_password_success_notice_2">Anda telah keluar dari semua sesi dan tidak akan menerima notifikasi. Untuk mengaktifkan notifikasi, masuk lagi di setiap perangkat.</string>
     <string name="login_reset_password_success_notice">Kata sandi Anda telah direset.</string>
     <string name="login_reset_password_success_title">Berhasil!</string>
-    <string name="login_reset_password_mail_confirmation_submit">Saya sudah memverifikasi alamat email saya</string>
+    <string name="login_reset_password_mail_confirmation_submit">Saya telah memverifikasi alamat email saya</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>
@@ -2300,9 +2299,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_reset_password_email_hint">Email</string>
     <string name="login_reset_password_submit">Lanjut</string>
     <string name="login_reset_password_notice">Email verifikasi akan dikirim ke kotak masuk Anda untuk mengkonfirmasi pengaturan kata sandi baru Anda.</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Ini membuatnya mudah untuk ruangan tetap privat di ruangan, sambil membiarkan orang-orang di space dapat menemukan dan bergabung ke ruangannya. Semua ruangan baru di space akan memiliki opsi ini.</string>
-    <string name="help_people_in_spaces_find_and_join">Bantu orang-orang di space untuk menemukan dan bergabung ruangan privat sendiri, tidak perlu mengundang semua secara manual.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Baru: Izinkan orang-orang di space untuk menemukan dan bergabung ruangan privat</string>
     <string name="upgrade_room_for_restricted_note">Dicatat bahwa meningkatkan akan membuat versi baru dari ruangannya. Semua pesan saat ini akan tetap di ruangan yang diarsip.</string>
     <string name="upgrade_room_for_restricted_no_param">Siapa saja di induk ruangan dapat menemukan dan bergabung ke ruangan ini — tidak perlu mengundang semua secara manual. Anda dapat mengubahnya di pengaturan ruangan kapan saja.</string>
     <string name="upgrade_room_for_restricted">Siapa saja di %s dapat menemukan dan bergabung ke ruangan ini — tidak perlu mengundang semua secara manual. Anda dapat mengubahnya di pengaturan ruangan kapan saja.</string>
@@ -2324,13 +2320,13 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="call_jitsi_started">Panggilan grup dimulai</string>
     <string name="error_failed_to_join_room">Maaf, sebuah kesalahan terjadi saat bergabung: %s</string>
     <string name="room_upgrade_to_recommended_version">Tingkatkan ke versi ruangan yang disarankan</string>
-    <string name="room_using_unstable_room_version">Kamar ini menjalankan versi %s, yang ditandai oleh homeserver ini sebagai tidak stabil.</string>
+    <string name="room_using_unstable_room_version">Ruangan ini menjalankan versi %s, yang ditandai oleh homeserver ini sebagai tidak stabil.</string>
     <string name="allow_anyone_in_room_to_access">Izinkan siapa saja di %s untuk mencari dan mengakses. Anda dapat memilih space yang lain juga.</string>
     <string name="upgrade_room_no_power_to_manage">Anda membutuhkan izin untuk meningkatkan sebuah ruangan</string>
     <string name="upgrade_room_update_parent_space">Otomatis memperbarui induk space</string>
     <string name="upgrade_room_auto_invite">Otomatis undang pengguna</string>
     <string name="upgrade_public_room_from_to">Anda akan meningkatkan ruangan ini dari %1$s ke %2$s.</string>
-    <string name="upgrade_room_warning">Meningkatkan ruangan adalah aksi lanjutan dan hanya disarankan ketika ruangan tidak stabil karena bug yang ada, fitur yang kurang atau rentanan keamanan.
+    <string name="upgrade_room_warning">Meningkatkan ruangan adalah aksi lanjutan dan hanya disarankan ketika ruangan tidak stabil karena kutu yang ada, fitur yang kurang atau rentanan keamanan.
 \nIni biasanya hanya mempengaruhi bagaimana ruangan itu diproses di servernya.</string>
     <string name="upgrade_private_room">Tingkatkan ruangan privat</string>
     <string name="upgrade_public_room">Tingkatkan ruangan publik</string>
@@ -2375,7 +2371,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="leave_all_rooms_and_spaces">Tinggalkan semua ruangan dan space</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 hanya salah satu orang 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 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 Space</string>
     <string name="space_add_child_title">Tambahkan ruangan</string>
@@ -2435,7 +2431,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="create_spaces_join_info_help">Untuk bergabung ke space yang sudah ada, Anda membutuhkan undangan ke space itu.</string>
     <string name="create_spaces_you_can_change_later">Anda dapat mengubahnya nanti</string>
     <string name="create_spaces_choose_type_label">Tipe space apa yang Anda ingin buat\?</string>
-    <string name="create_spaces_type_header">Space adalah cara baru untuk mengelompokkan ruangan dan pengguna</string>
     <string name="your_private_space">Space privat Anda</string>
     <string name="your_public_space">Space publik Anda</string>
     <string name="add_space">Tambahkan Space</string>
@@ -2624,12 +2619,10 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="space_add_space_to_any_space_you_manage">Tambahkan sebuah space ke space apa saja yang Anda dapat kelola.</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 Element.</string>
+    <string name="template_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="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="to_help_space_members_find_and_join">Untuk membantu anggota space menemukan dan bergabung ke ruangan privat, pergilah ke pengaturan ruangannya dengan mengetuk pada avatarnya.</string>
-    <string name="help_space_members">Bantu anggota space untuk menemukan ruangan privat</string>
     <string name="external_link_confirmation_title">Periksa ulang tautan ini</string>
     <string name="error_empty_field_choose_password">Mohon pilih sebuah kata sandi.</string>
     <string name="error_empty_field_choose_user_name">Mohon pilih sebuah nama pengguna.</string>
@@ -2693,9 +2686,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</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>
-    <string name="setup_cross_signing">Aktifkan Tanda Tangan Silang</string>
+    <string name="setup_cross_signing">Aktifkan Penandatanganan Silang</string>
     <string name="upgrade_security">Peningkatan enkripsi tersedia</string>
-    <string name="room_message_placeholder">Pesan…</string>
+    <string name="room_message_placeholder">Kirim pesan…</string>
     <string name="auth_invalid_login_deactivated_account">Akun ini telah dinonaktifkan.</string>
     <string name="auth_invalid_login_param_space_in_password">Nama pengguna dan/atau kata sandi salah. Kata sandi dimulai atau berakhir dengan spasi, mohon dicek.</string>
     <string name="command_description_plain">Mengirim pesan sebagai teks biasa, tanpa mengimpretasikannya sebagai markdown</string>
@@ -2924,8 +2917,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="command_description_avatar_for_room">Mengubah avatar Anda di ruangan saat ini saja</string>
     <string name="command_description_whois">Menampilkan</string>
     <string name="a11y_presence_unavailable">Tidak Tersedia</string>
-    <string name="a11y_presence_offline">Offline</string>
-    <string name="a11y_presence_online">Online</string>
+    <string name="a11y_presence_offline">Luring</string>
+    <string name="a11y_presence_online">Daring</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Pilih homeserver</string>
     <string name="login_error_homeserver_from_url_not_found">Tidak dapat menjangkau homeserver di URL %s. Silakan periksa tautan Anda atau pilih sebuah homeserver secara manual.</string>
     <string name="notification_listening_for_notifications">Mendengarkan notifikasi</string>
@@ -2974,7 +2967,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     </plurals>
     <string name="preference_system_settings">Pengaturan sistem</string>
     <string name="preference_versions">Versi</string>
-    <string name="preference_help_summary">Dapatkan bantuan dalam menggunakan Element</string>
+    <string name="template_preference_help_summary">Dapatkan bantuan dalam menggunakan ${app_name}</string>
     <string name="preference_help_title">Bantuan dan dukungan</string>
     <string name="preference_help">Bantuan</string>
     <string name="preference_root_legals">Hukum</string>
@@ -2987,15 +2980,15 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="analytics_opt_in_list_item_2">Kami <b>tidak</b> membagikan informasi ini dengan pihak ketiga</string>
     <string name="analytics_opt_in_list_item_1">Kami <b>tidak</b> merekam atau memprofil data akun apapun</string>
     <string name="analytics_opt_in_content_link">di sini</string>
-    <string name="analytics_opt_in_content">Bantu kami mengidentifikasi masalah-masalah dan membuat Element lebih baik dengan membagikan data penggunaan anonim. Untuk memahami bagaimana orang-orang menggunakan beberapa perangkat-perangkat, kami akan membuat pengenal acak, yang dibagikan oleh perangkat Anda.
+    <string name="template_analytics_opt_in_content">Bantu kami mengidentifikasi masalah-masalah dan membuat ${app_name} lebih baik dengan membagikan data penggunaan anonim. Untuk memahami bagaimana orang-orang menggunakan beberapa perangkat-perangkat, kami akan membuat pengenal acak, yang dibagikan oleh perangkat Anda.
 \n
 \nAnda dapat membaca semua kebijakan kami %s.</string>
-    <string name="analytics_opt_in_title">Bantu buat Element lebih baik</string>
+    <string name="template_analytics_opt_in_title">Bantu buat ${app_name} lebih baik</string>
     <string name="action_enable">Aktifkan</string>
     <string name="restart_the_application_to_apply_changes">Mulai ulang aplikasi ini untuk menerapkan perubahan.</string>
     <string name="labs_enable_latex_maths">Aktifkan matematika LaTeX</string>
     <string name="room_error_access_unauthorized">Anda tidak diperbolehkan untuk bergabung ke ruangan ini</string>
-    <string name="labs_auto_report_uisi_desc">Sistem Anda akan mengirimkan log secara otomatis ketika sebuah kesalahan dekripsi terjadi</string>
+    <string name="labs_auto_report_uisi_desc">Sistem Anda akan mengirimkan catat secara otomatis ketika sebuah kesalahan dekripsi terjadi</string>
     <string name="tooltip_attachment_poll">Buat poll</string>
     <string name="tooltip_attachment_contact">Buka kontak</string>
     <string name="tooltip_attachment_sticker">Kirim stiker</string>
@@ -3005,10 +2998,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="labs_auto_report_uisi">Laporkan Kesalahan Dekripsi Secara Otomatis.</string>
     <string name="room_member_override_nick_color">Ubah warna nama tampilan</string>
     <string name="login_splash_already_have_account">Saya sudah punya akun</string>
-    <string name="ftue_auth_carousel_4_title">Bebaskan.</string>
-    <string name="ftue_auth_carousel_3_title">Perpesanan yang aman.</string>
-    <string name="ftue_auth_carousel_2_title">Anda dalam kendali.</string>
-    <string name="ftue_auth_carousel_1_title">Miliki percakapan Anda.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Perpesanan yang aman.</string>
+    <string name="ftue_auth_carousel_control_title">Anda dalam kendali.</string>
+    <string name="ftue_auth_carousel_secure_title">Miliki percakapan Anda.</string>
     <string name="tooltip_attachment_location">Bagikan lokasi</string>
     <string name="labs_render_locations_in_timeline">Tampilkan lokasi pengguna di linimasa</string>
     <string name="settings_enable_location_sharing_summary">Setelah diaktifkan Anda akan dapat mengirim lokasi Anda ke ruangan apa saja</string>
@@ -3035,11 +3027,44 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</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_title_messaging">Perpesanan untuk tim Anda.</string>
-    <string name="ftue_auth_carousel_body_encrypted">Terenkripsi secara ujung-ke-ujung dan tidak memerlukan nomor telepon. Tidak ada iklan atau penambangan data.</string>
-    <string name="ftue_auth_carousel_body_control">Anda pilih di mana percakapan Anda disimpan, memberikan Anda kendali dan kebebasan. Terhubung via Matrix.</string>
-    <string name="ftue_auth_carousel_body_secure">Komunikasi aman dan independen yang memberikan tingkat privasi yang sama seperti percakapan wajah-ke-wajah di dalam rumah Anda sendiri.</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_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="ftue_auth_use_case_skip">Belum yakin\? Anda dapat %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="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">melewati pertanyaan ini</string>
+    <string name="ftue_auth_use_case_option_three">Komunitas</string>
+    <string name="ftue_auth_use_case_option_two">Tim</string>
+    <string name="ftue_auth_use_case_option_one">Teman dan keluarga</string>
+    <string name="ftue_auth_use_case_subtitle">Kami akan membantu Anda untuk terhubung.</string>
+    <string name="ftue_auth_use_case_title">Siapa saja yang sering Anda chat\?</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Anda sudah menampilkan utasan ini!</string>
+    <string name="view_in_room">Tampilkan Di Ruangan</string>
+    <string name="reply_in_thread">Balas Di Utasan</string>
+    <string name="command_not_supported_in_threads">Perintah \"%s\" dikenal tetapi tidak didukung dalam utasan.</string>
+    <string name="search_thread_from_a_thread">Dari sebuah Utasan</string>
+    <string name="thread_list_empty_notice">Tip: Tekan lama pada sebuah pesan dan gunakan “%s”.</string>
+    <string name="thread_list_empty_subtitle">Utasan membantu membuat obrolan sesuai topik dan mudah untuk dilacak.</string>
+    <string name="thread_list_empty_title">Buat diskusi tetap teratur dengan utasan</string>
+    <string name="thread_list_modal_my_threads_subtitle">Menampilkan semua utasan yang Anda berpartisipasi</string>
+    <string name="thread_list_modal_my_threads_title">Utasan Saya</string>
+    <string name="thread_list_modal_all_threads_subtitle">Tampilkan semua utama dari ruangan saat ini</string>
+    <string name="thread_list_modal_all_threads_title">Semua Utasan</string>
+    <string name="thread_list_modal_title">Saring</string>
+    <string name="thread_list_title">Utasan</string>
+    <string name="thread_timeline_title">Utasan</string>
+    <string name="room_threads_filter">Saring Utasan di ruangan</string>
+    <string name="action_thread_copy_link_to_thread">Salin tautan ke utasan</string>
+    <string name="action_thread_view_in_room">Tampilkan di ruangan</string>
+    <string name="action_view_threads">Tampilkan Utasan</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 221a996e0c..d0645c1dfd 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2384,7 +2384,6 @@
     <string name="settings_troubleshoot_test_push_loop_failed">Ricezione push fallita. La soluzione può essere di reinstallare l\'applicazione.</string>
     <string name="settings_troubleshoot_test_push_loop_success">L\'applicazione sta ricevendo il PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_title">Prova push</string>
-    <string name="search_is_not_supported_in_e2e_room">La ricerca in stanze cifrate non è ancora supportata.</string>
     <string name="search_banned_user_hint">Filtra utenti banditi</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Non hai il permesso di avviare una chiamata</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Non hai il permesso di avviare una chiamata di gruppo</string>
@@ -2690,7 +2689,6 @@
     <string name="create_spaces_join_info_help">Per unirti ad uno Spazio già esistente, ti serve un invito.</string>
     <string name="create_spaces_you_can_change_later">Puoi cambiarlo in seguito</string>
     <string name="create_spaces_choose_type_label">Che tipo di Spazio vuoi creare\?</string>
-    <string name="create_spaces_type_header">Gli Spazi sono un nuovo modo di raggruppare stanze e contatti</string>
     <string name="your_private_space">Il tuo Spazio privato</string>
     <string name="your_public_space">Il tuo Spazio pubblico</string>
     <string name="add_space">Aggiungi Spazio</string>
@@ -2851,15 +2849,10 @@
     <string name="settings_notification_other">Altro</string>
     <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 Element.</string>
+    <string name="template_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="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="to_help_space_members_find_and_join">Per aiutare i membri dello spazio a trovare ed entrare in una stanza privata, vai nelle impostazioni di quella stanza toccando il suo avatar.</string>
-    <string name="help_space_members">Aiuta i membri dello spazio a trovare stanze private</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Ciò rende facile mantenere private le stanze in uno spazio, mentre le persone potranno trovarle ed unirsi. Tutte le stanze nuove in uno spazio avranno questa opzione disponibile.</string>
-    <string name="help_people_in_spaces_find_and_join">Aiuta le persone negli spazi a trovare ed entrare nelle stanze private da sole, non c\'è bisogno di invitarle a mano.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Novità: consenti alle persone negli spazi di trovare ed entrare nelle stanze private</string>
     <string name="call_jitsi_started">Chiamata di gruppo iniziata</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Tutte le stanze in cui sei appariranno nella pagina principale.</string>
     <string name="preference_show_all_rooms_in_home">Mostra tutte le stanze nella pagina principale</string>
@@ -3019,7 +3012,7 @@
     </plurals>
     <string name="preference_system_settings">Impostazioni di sistema</string>
     <string name="preference_versions">Versioni</string>
-    <string name="preference_help_summary">Ricevi aiuto nell\'uso di Element</string>
+    <string name="template_preference_help_summary">Ricevi aiuto nell\'uso di ${app_name}</string>
     <string name="preference_help_title">Aiuto e supporto</string>
     <string name="preference_help">Aiuto</string>
     <string name="preference_root_legals">Informazioni legali</string>
@@ -3032,10 +3025,10 @@
     <string name="analytics_opt_in_list_item_2"><b>Non</b> condividiamo informazioni con terze parti</string>
     <string name="analytics_opt_in_list_item_1"><b>Non</b> registriamo o profiliamo alcun dato dell\'account</string>
     <string name="analytics_opt_in_content_link">qui</string>
-    <string name="analytics_opt_in_content">Aiutaci a identificare problemi e a migliorare Element condividendo dati di utilizzo anonimi. Per capire come le persone usano diversi dispositivi, genereremo un identificativo casuale, condiviso dai tuoi dispositivi.
+    <string name="template_analytics_opt_in_content">Aiutaci a identificare problemi e a migliorare ${app_name} condividendo dati di utilizzo anonimi. Per capire come le persone usano diversi dispositivi, genereremo un identificativo casuale, condiviso dai tuoi dispositivi.
 \n
 \nPuoi leggere i nostri termini di servizio %s.</string>
-    <string name="analytics_opt_in_title">Aiuta a migliorare Element</string>
+    <string name="template_analytics_opt_in_title">Aiuta a migliorare ${app_name}</string>
     <string name="action_enable">Attiva</string>
     <string name="restart_the_application_to_apply_changes">Riavvia l\'applicazione per applicare le modifiche.</string>
     <string name="labs_enable_latex_maths">Attiva la matematica LaTeX</string>
@@ -3050,10 +3043,9 @@
     <string name="labs_auto_report_uisi">Auto-segnala errori di decifrazione.</string>
     <string name="room_member_override_nick_color">Sovrascrivi colore nick</string>
     <string name="login_splash_already_have_account">Ho già un account</string>
-    <string name="ftue_auth_carousel_4_title">Riduci il carico ai team.</string>
-    <string name="ftue_auth_carousel_3_title">Messaggistica sicura.</string>
-    <string name="ftue_auth_carousel_2_title">Tu hai il controllo.</string>
-    <string name="ftue_auth_carousel_1_title">Prendi il controllo delle tue conversazioni.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Messaggistica sicura.</string>
+    <string name="ftue_auth_carousel_control_title">Tu hai il controllo.</string>
+    <string name="ftue_auth_carousel_secure_title">Prendi il controllo delle tue conversazioni.</string>
     <string name="tooltip_attachment_location">Condividi posizione</string>
     <string name="labs_render_locations_in_timeline">Mostra le posizioni dell\'utente nella linea temporale</string>
     <string name="settings_enable_location_sharing_summary">Una volta attivata, potrai inviare la tua posizione in qualsiasi stanza</string>
@@ -3080,11 +3072,44 @@
     <string name="encryption_has_been_misconfigured">La crittografia è stata configurata male.</string>
     <string name="sent_location">Ha condiviso la sua posizione</string>
     <string name="login_splash_create_account">Crea account</string>
-    <string name="ftue_auth_carousel_title_messaging">Messaggistica per la tua squadra.</string>
-    <string name="ftue_auth_carousel_body_encrypted">Crittografia end-to-end e nessun numero di telefono richiesto. Niente pubblicità o raccolta di dati.</string>
-    <string name="ftue_auth_carousel_body_control">Scegli dove vengono tenute le tue conversazioni, dandoti controllo e indipendenza. Connesso via Matrix.</string>
-    <string name="ftue_auth_carousel_body_secure">Comunicazioni sicure e indipendenti che ti danno lo stesso livello di riservatezza di una conversazione faccia a faccia in casa tua.</string>
+    <string name="ftue_auth_carousel_workplace_title">Messaggistica per la tua squadra.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Crittografia end-to-end e nessun numero di telefono richiesto. Niente pubblicità o raccolta di dati.</string>
+    <string name="ftue_auth_carousel_control_body">Scegli dove vengono tenute le tue conversazioni, dandoti controllo e indipendenza. Connesso via Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Comunicazioni sicure e indipendenti che ti danno lo stesso livello di riservatezza di una conversazione faccia a faccia in casa tua.</string>
     <string name="attachment_type_location">Posizione</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">La crittografia è stata configurata male, perciò non puoi inviare messaggi. Clicca per aprire le impostazioni.</string>
     <string name="room_unsupported_e2e_algorithm">La crittografia è stata configurata male, perciò non puoi inviare messaggi. Contatta l\'amministratore per reimpostare la crittografia ad uno stato valido.</string>
+    <string name="message_bubbles">Mostra bolle di messaggi</string>
+    <string name="location_timeline_failed_to_load_map">Caricamento mappa fallito</string>
+    <string name="a11y_static_map_image">Mappa</string>
+    <string name="labs_enable_thread_messages_desc">Nota: l\'app verrà riavviata</string>
+    <string name="labs_enable_thread_messages">Attiva messaggi in conversazioni</string>
+    <string name="ftue_auth_use_case_connect_to_server">Connetti al server</string>
+    <string name="ftue_auth_use_case_join_existing_server">Vuoi unirti ad un server esistente\?</string>
+    <string name="ftue_auth_use_case_skip_partial">saltare questa domanda</string>
+    <string name="ftue_auth_use_case_skip">Ancora non lo sai\? Puoi %s</string>
+    <string name="ftue_auth_use_case_option_three">Comunità</string>
+    <string name="ftue_auth_use_case_option_two">Squadre</string>
+    <string name="ftue_auth_use_case_option_one">Amici e famiglia</string>
+    <string name="ftue_auth_use_case_subtitle">Vi aiuteremo a connettervi.</string>
+    <string name="ftue_auth_use_case_title">Con chi parlerai di più\?</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Stai già visualizzando questa conversazione!</string>
+    <string name="view_in_room">Vedi nella stanza</string>
+    <string name="reply_in_thread">Rispondi nella conversazione</string>
+    <string name="command_not_supported_in_threads">Il comando \"%s\" è riconosciuto ma non supportato nelle conversazioni.</string>
+    <string name="search_thread_from_a_thread">Da una conversazione</string>
+    <string name="thread_list_empty_notice">Consiglio: tieni premuto un messaggio ed usa “%s”.</string>
+    <string name="thread_list_empty_subtitle">Le conversazioni ti aiutano a tenere le tue discussioni in tema e rintracciabili.</string>
+    <string name="thread_list_empty_title">Tieni le discussioni organizzate con gli argomenti</string>
+    <string name="thread_list_modal_my_threads_subtitle">Mostra tutte le conversazioni a cui hai partecipato</string>
+    <string name="thread_list_modal_my_threads_title">Le mie conversazioni</string>
+    <string name="thread_list_modal_all_threads_subtitle">Mostra tutte le conversazioni dalla stanza attuale</string>
+    <string name="thread_list_modal_all_threads_title">Tutte le conversazioni</string>
+    <string name="thread_list_modal_title">Filtra</string>
+    <string name="thread_list_title">Conversazioni</string>
+    <string name="thread_timeline_title">Conversazione</string>
+    <string name="room_threads_filter">Filtra conversazioni nella stanza</string>
+    <string name="action_thread_copy_link_to_thread">Copia link nella conversazione</string>
+    <string name="action_thread_view_in_room">Vedi nella stanza</string>
+    <string name="action_view_threads">Vedi conversazioni</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index 50cace2348..b6f83d4822 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -126,8 +126,8 @@
     <plurals name="public_room_nb_users">
         <item quantity="one">משתמש %d</item>
         <item quantity="two">%d משתמשים</item>
-        <item quantity="many">מעט</item>
-        <item quantity="other">אחר</item>
+        <item quantity="many">%d משתמשים</item>
+        <item quantity="other">%d משתמש</item>
     </plurals>
     <string name="no_public_room_placeholder">אין חדרים ציבורים</string>
     <string name="no_room_placeholder">אין חדרים</string>
@@ -158,7 +158,7 @@
     <string name="start_voice_call">התחל שיחה קולית</string>
     <string name="start_new_chat">התחל צ\'אט חדש</string>
     <string name="search">חיפוש</string>
-    <string name="identity_url">קישור לשרת הזיהוי</string>
+    <string name="identity_url">קישור שרת הזהות</string>
     <string name="hs_url">קישור לשרת הבית</string>
     <string name="logout">יציאה</string>
     <string name="login">כניסה</string>
@@ -216,7 +216,7 @@
     <string name="auth_identity_server">שרת זיהוי:</string>
     <string name="auth_home_server">שרת הבית:</string>
     <string name="auth_username_in_use">שם משתמש כבר נמצא בשימוש</string>
-    <string name="auth_recaptcha_message">שרת בית זה רוצה לוודא שאתה לא רובוט</string>
+    <string name="auth_recaptcha_message">שרת הבית רוצה לוודא שאתה לא רובוט</string>
     <string name="auth_threepid_warning_message">הרשמה באמצעות דוא\"ל ומספר טלפון בבת אחת עדיין אינה נתמכת עד להתקנת ה- API. רק מספר הטלפון ייקח בחשבון.
 \n
 \nתוכל להוסיף את הדוא\"ל שלך לפרופיל שלך בהגדרות.</string>
@@ -293,7 +293,7 @@
     <string name="room_preview_unlinked_email_warning">הזמנה זו נשלחה אל%s, שאינה משויכת לחשבון זה.
 \nייתכן שתרצה להתחבר עם חשבון אחר, או להוסיף דוא\"ל זה לחשבונך.</string>
     <string name="room_preview_invitation_format">הוזמנת להצטרף לחדר זה על ידי%s</string>
-    <string name="room_jump_to_first_unread">קפיצה להודעה הראשונה שלא נקראה.</string>
+    <string name="room_jump_to_first_unread">עבור להודעה שלא נקראה</string>
     <string name="room_sync_in_progress">מסנכרן…</string>
     <string name="open_chat_header">פתח כותרת</string>
     <string name="list_members">חברי רשימה</string>
@@ -348,7 +348,7 @@
     <string name="call">שִׂיחָה</string>
     <string name="settings_call_ringtone_dialog_title">בחר רינגטון לשיחות:</string>
     <string name="settings_call_ringtone_title">רינגטון שיחה נכנסת</string>
-    <string name="settings_call_ringtone_use_default_stun_sum">ישתמש ב-%s כסיוע כאשר השרת הביתי שלך אינו מציע כזה (כתובת ה- IP שלך תשותף במהלך שיחה)</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">ישתמש ב-%s כסיוע כאשר השרת הבית שלך אינו מציע כזה (כתובת ה- IP שלך תשותף במהלך שיחה)</string>
     <string name="settings_call_ringtone_use_default_stun">אפשר שרת עזרה לשיחות</string>
     <string name="template_settings_call_ringtone_use_app_ringtone">השתמש ברינגטון ברירת המחדל של אלמנט לשיחות נכנסות</string>
     <string name="settings_call_show_confirmation_dialog_summary">בקש אישור לפני שמתחילים בשיחה</string>
@@ -368,10 +368,10 @@
     <string name="compression_opt_list_original">מקור</string>
     <string name="compression_options">שלח כ</string>
     <plurals name="membership_changes">
-        <item quantity="one">שינוי בפרט חברות</item>
-        <item quantity="two">שינוי בפרטי חברות</item>
-        <item quantity="many">שינוי בפרטי חברות</item>
-        <item quantity="other">שינוי בפרטי חברות</item>
+        <item quantity="one">%d שינוי בפרט חברות</item>
+        <item quantity="two">%d שינוי בפרטי חברות</item>
+        <item quantity="many">%d שינוי בפרטי חברות</item>
+        <item quantity="other">%d שינוי בפרטי חברות</item>
     </plurals>
     <string name="groups_list">רשימת קבוצות</string>
     <string name="read_receipts_list">קרא את רשימת הקבלות</string>
@@ -510,6 +510,7 @@
     <string name="room_event_action_cancel_download">בטל הורדה</string>
     <string name="room_event_action_cancel_upload">בטל העלאה</string>
     <string name="room_event_action_report_prompt_ignore_user">האם ברצונך להסתיר את כל ההודעות ממשתמש זה\?
+\n
 \nשים לב שפעולה זו תפעיל מחדש את האפליקציה והיא עשויה להימשך זמן מה.</string>
     <string name="room_event_action_report_prompt_reason">סיבה לדיווח על תוכן זה</string>
     <string name="room_details_people_present_group_name">הצטרף</string>
@@ -537,12 +538,12 @@
     <string name="ssl_do_not_trust">אל תתן אמון</string>
     <string name="ssl_trust">אמון</string>
     <plurals name="room_new_messages_notification">
-        <item quantity="one">הודעה חדשה</item>
-        <item quantity="two">הודעות חדשות</item>
-        <item quantity="many">הודעות חדשות</item>
-        <item quantity="other">הודעות חדשות</item>
+        <item quantity="one">%d הודעה חדשה</item>
+        <item quantity="two">d% הודעות חדשות</item>
+        <item quantity="many">%d הודעות חדשות</item>
+        <item quantity="other">%d הודעות חדשות</item>
     </plurals>
-    <string name="room_do_not_have_permission_to_post">אין לך הרשאה לפרסם בחדר זה</string>
+    <string name="room_do_not_have_permission_to_post">אין לך הרשאה לפרסם בחדר זה.</string>
     <string name="room_message_file_not_found">הקובץ לא נמצא</string>
     <string name="room_delete_unsent_messages">מחק הודעות שלא נשלחו</string>
     <string name="room_resend_unsent_messages">שלח שוב הודעות שלא נשלחו</string>
@@ -565,7 +566,7 @@
     <string name="room_participants_invite_prompt_msg">האם אתה בטוח שברצונך להזמין את%s לצ\'אט זה\?</string>
     <string name="reason_hint">סיבה</string>
     <string name="room_participants_unban_prompt_msg">הסרת נידוי ממשתמש יאפשר לו להצטרף שוב לחדר.</string>
-    <string name="room_participants_ban_prompt_msg">איסור על המשתמש יבעט בהם מחדר זה וימנע מהם להצטרף שוב.</string>
+    <string name="room_participants_ban_prompt_msg">חסימת משתמש תסיר אותם מהחדר הזה ותמנע ממנו להצטרף שוב.</string>
     <string name="room_participants_unban_title">הסר נידוי ממשתמש</string>
     <string name="room_participants_ban_reason">סיבות לנידוי</string>
     <string name="room_participants_ban_title">נדה משתמש</string>
@@ -678,7 +679,6 @@
         <item quantity="other">%d חדרים</item>
     </plurals>
     <string name="directory_search_results_title">חפש בתיקיות</string>
-    <string name="search_is_not_supported_in_e2e_room">עדיין אין תמיכה בחיפוש בחדרים מוצפנים.</string>
     <string name="tab_title_search_files">קבצים</string>
     <string name="tab_title_search_people">אנשים</string>
     <string name="tab_title_search_messages">הודעות</string>
@@ -710,16 +710,16 @@
     </plurals>
     <string name="room_title_one_member">חבר אחד</string>
     <plurals name="room_title_members">
-        <item quantity="one">חבר</item>
-        <item quantity="two">חברים</item>
-        <item quantity="many">חברים</item>
-        <item quantity="other">חברים</item>
+        <item quantity="one">%d חבר</item>
+        <item quantity="two">%d חברים</item>
+        <item quantity="many">%d חברים</item>
+        <item quantity="other">%d חברים</item>
     </plurals>
     <plurals name="room_header_active_members_count">
-        <item quantity="one">חבר פעיל</item>
-        <item quantity="two">חברים פעילים</item>
-        <item quantity="many">חברים פעילים</item>
-        <item quantity="other">חברים פעילים</item>
+        <item quantity="one">%d חבר פעיל</item>
+        <item quantity="two">%d חברים פעילים</item>
+        <item quantity="many">%d חברים פעילים</item>
+        <item quantity="other">%d חברים פעילים</item>
     </plurals>
     <string name="room_creation_add_member">הוסף חבר</string>
     <string name="start_verification">התחל אימות</string>
@@ -2408,4 +2408,360 @@
     <string name="summary_user_sent_sticker">%1$s שלח מדבקה.</string>
     <string name="summary_user_sent_image">%1$s שלח תמונה‮.</string>
     <string name="summary_message">%1$s: %2$s</string>
+    <string name="notice_room_visibility_invited">כל חברי החדר, מהנקודה בה הם הוזמנו.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">את/ה הפכת הודעות עתידיות לגלויות בפני %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s הפך הודעות עתידיות לגלויות בפני %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">חסמת את %1$s. סיבה: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s חסם את %2$s. סיבה: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">ביטלת את החסימה של %1$s. סיבה: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s ביטל החסימה של %2$s. סיבה: %3$s</string>
+    <string name="notice_room_remove_with_reason_by_you">הסרת את %1$s. סיבה: %2$s</string>
+    <string name="notice_room_remove_with_reason">%1$s הסיר את %2$s. סיבה: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">דחית את ההזמנה. סיבה: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s דחה את ההזמנה. סיבה: %2$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_room_leave_with_reason_by_you">יצאת מהחדר. סיבה: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s עזבו את החדר. סיבה: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">הצטרפת. סיבה: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s הצטרף. סיבה: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">הצטרפת לחדר. סיבה: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s הצטרף לחדר. סיבה: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s הזמין אותך. סיבה: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">הזמנת את %1$s. סיבה: %2$s</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s הפעיל הצפנה מקצה לקצה (אלגוריתם לא מזוהה %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">הפעלת הצפנה מקצה לקצה (אלגוריתם לא מזוהה %1$s).</string>
+    <string name="notice_room_invite_with_reason">%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_no_invitee_with_reason">ההזמנה של %1$s. סיבה: %2$s</string>
+    <string name="clear_timeline_send_queue">נקה את תור השליחה</string>
+    <string name="event_status_sending_message">הודעה נשלחת…</string>
+    <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">סנכרון ראשוני:
+\nייבוא חדרים מוזמנים</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">סנכרון ראשוני:
+\nטוען את השיחות שלך
+\nאם הצטרפת להרבה חדרים, זה עשוי לקחת זמן מה</string>
+    <string name="initial_sync_start_importing_account_rooms">סנכרון ראשוני:
+\nייבוא חדרים</string>
+    <string name="initial_sync_start_importing_account_crypto">סנכרון ראשוני:
+\nייבוא קריפטו</string>
+    <string name="initial_sync_start_importing_account">סנכרון ראשוני:
+\nמייבא חשבון…</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>
+    <string name="room_displayname_empty_room">חדר ריק</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s ועוד אחד</item>
+        <item quantity="two">%1$s ו-%2$d אחרים</item>
+        <item quantity="many">%1$s ו-%2$d אחרים</item>
+        <item quantity="other">%1$s ו-%2$d אחר</item>
+    </plurals>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s ו-%4$d אחר</item>
+        <item quantity="two">%1$s, %2$s, %3$s ו-%4$d אחרים</item>
+        <item quantity="many">%1$s, %2$s, %3$s ו-%4$d אחרים</item>
+        <item quantity="other">%1$s, %2$s, %3$s ו-%4$d אחר</item>
+    </plurals>
+    <string name="room_displayname_4_members">%3$s, %2$s, %1$s ו-%4$s</string>
+    <string name="room_displayname_3_members">%2$s, %1$s ו-%3$s</string>
+    <string name="room_displayname_two_members">%1$s ו-%2$s</string>
+    <string name="room_displayname_room_invite">הזמנה לחדר</string>
+    <string name="room_displayname_invite_from">הזמן מ-%s</string>
+    <string name="medium_phone_number">מספר טלפון</string>
+    <string name="medium_email">כתובת דוא\"ל</string>
+    <string name="room_error_access_unauthorized">אינך רשאי להצטרף לחדר זה</string>
+    <string name="room_error_join_failed_empty_room">כרגע לא ניתן להצטרף מחדש לחדר ריק.</string>
+    <string name="matrix_error">שגיאת מטריקס</string>
+    <string name="network_error">שגיאת רשת</string>
+    <string name="message_failed_to_upload">העלאת התמונה נכשלה</string>
+    <string name="unable_to_send_message">לא ניתן לשלוח הודעה</string>
+    <string name="could_not_redact">לא ניתן היה לתקן</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">מכשיר השולח לא שלח לנו את המפתחות להודעה זו.</string>
+    <string name="notice_crypto_unable_to_decrypt">** לא ניתן לפענח: %s **</string>
+    <string name="notice_power_level_diff">%1$s מ-%2$s עד %3$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="power_level_custom_no_value">מותאם אישית</string>
+    <string name="power_level_custom">מותאם אישית (%1$d)</string>
+    <string name="power_level_default">ברירת מחדל</string>
+    <string name="power_level_moderator">מַנחֶה</string>
+    <string name="power_level_admin">מנהל מערכת</string>
+    <string name="notice_widget_jitsi_modified_by_you">שינית ועידת וידאו</string>
+    <string name="notice_widget_jitsi_modified">ועידת וידאו השתנתה ע\"י %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">סיימת ועידת וידאו</string>
+    <string name="notice_widget_jitsi_removed">ועידת וידאו הסתיימה ע\"י %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">התחלת ועידת וידאו</string>
+    <string name="notice_widget_jitsi_added">ועידת וידאו התחילה על ידי %1$s</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_room_third_party_registered_invite">%1$s קיבל את ההזמנה עבור %2$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_room_third_party_revoked_invite">%1$s ביטל/ה את ההזמנה של %2$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_third_party_invite">%1$s שלח הזמנה אל %2$s להצטרף לחדר</string>
+    <string name="notice_profile_change_redacted_by_you">עדכנת את הפרופיל שלך %1$s</string>
+    <string name="notice_profile_change_redacted">%1$s עדכן את הפרופיל שלו %2$s</string>
+    <string name="notice_event_redacted_by_with_reason">הודעה הוסרה על ידי %1$s [סיבה: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">ההודעה הוסרה [סיבה: %1$s]</string>
+    <string name="notice_event_redacted_by">ההודעה הוסרה על ידי %1$s</string>
+    <string name="notice_event_redacted">ההודעה הוסרה</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_topic_removed">%1$s הסיר את נושא החדר</string>
+    <string name="notice_room_name_removed_by_you">הסרת את שם החדר</string>
+    <string name="notice_room_name_removed">%1$s הסיר את שם החדר</string>
+    <string name="notice_avatar_changed_too">(גם האווטאר השתנה)</string>
+    <string name="notice_voip_finished">ועידת VoIP הסתיימה</string>
+    <string name="notice_voip_started">ועידת VoIP החלה</string>
+    <string name="notice_requested_voip_conference_by_you">ביקשת ועידת VoIP</string>
+    <string name="notice_requested_voip_conference">%1$s ביקש ועידת VoIP</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 כל השרתים אסורים להשתתף! לא ניתן עוד להשתמש בחדר זה.</string>
+    <string name="notice_room_server_acl_updated_no_change">ללא שינוי.</string>
+    <string name="notice_room_server_acl_updated_allowed">• שרתים התואמים ל-%s מורשים כעת.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• שרתים התואמים ל-%s הוסרו מרשימת המורשים.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• שרתים התואמים ל-%s הוסרו מרשימת החסומים.</string>
+    <string name="notice_room_server_acl_updated_banned">• שרתים התואמים ל-%s נאסרו כעת.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">שינית את רשימות ה-ACL של השרת עבור החדר הזה.</string>
+    <string name="notice_room_server_acl_updated_title">%s שינה את רשימות ה-ACL של השרת עבור החדר הזה.</string>
+    <string name="notice_room_server_acl_set_allowed">• מותרים שרתים התואמים ל-%s.</string>
+    <string name="notice_room_server_acl_set_banned">• שרתים התואמים %s אסורים.</string>
+    <string name="notice_room_server_acl_set_title_by_you">אתה מגדיר את ה-ACL של השרת עבור החדר הזה.</string>
+    <string name="notice_room_server_acl_set_title">%s הגדר את ה-ACL של השרת עבור החדר הזה.</string>
+    <string name="notice_direct_room_update_by_you">שדרגת כאן.</string>
+    <string name="notice_direct_room_update">%s שודרג כאן.</string>
+    <string name="notice_room_update_by_you">שדרגת את החדר הזה.</string>
+    <string name="notice_room_update">%s שדרג את החדר הזה.</string>
+    <string name="notice_end_to_end_by_you">הפעלת הצפנה מקצה לקצה (%1$s)</string>
+    <string name="notice_end_to_end">%1$s הפעילה הצפנה מקצה לקצה (%2$s)</string>
+    <string name="notice_room_visibility_unknown">לא ידוע (%s).</string>
+    <string name="notice_room_visibility_world_readable">כל אחד.</string>
+    <string name="notice_room_visibility_shared">כל חברי החדר.</string>
+    <string name="notice_room_visibility_joined">כל חברי החדר, מהנקודה בה הצטרפו.</string>
+    <string name="a11y_static_map_image">מפה</string>
+    <string name="a11y_location_share_icon">שתף מיקום</string>
+    <string name="location_activity_title_preview">מיקום</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>
+    <string name="open_poll_option_title">פתח סקר</string>
+    <string name="poll_type_title">סוג סקר</string>
+    <string name="edit_poll_button">ערוך סקר</string>
+    <string name="edit_poll_title">ערוך סקר</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>
+    <string name="tooltip_attachment_location">שתף מיקום</string>
+    <string name="tooltip_attachment_poll">צור סקר</string>
+    <string name="tooltip_attachment_contact">פתח אנשי קשר</string>
+    <string name="tooltip_attachment_sticker">שלח סטיקר</string>
+    <string name="tooltip_attachment_file">העלה קובץ</string>
+    <string name="tooltip_attachment_gallery">שלח תמונות וסרטונים</string>
+    <string name="tooltip_attachment_photo">פתח מצלמה</string>
+    <string name="message_bubbles">הצג בועות הודעה</string>
+    <string name="location_timeline_failed_to_load_map">טעינת המפה נכשלה</string>
+    <string name="labs_render_locations_in_timeline">מיפוי מיקומי משתמשים בציר הזמן</string>
+    <string name="settings_enable_location_sharing_summary">לאחר ההפעלה, תוכל לשלוח את המיקום שלך לכל חדר</string>
+    <string name="settings_enable_location_sharing">אפשר שיתוף מיקום</string>
+    <string name="location_share_external">לפתוח בעזרת</string>
+    <string name="template_location_not_available_dialog_content">${app_name} לא הצליח לגשת למיקום שלך. בבקשה נסה שוב מאוחר יותר.</string>
+    <string name="template_location_not_available_dialog_title">${app_name} לא הצליח לגשת למיקום שלך</string>
+    <string name="location_share">שתף מיקום</string>
+    <string name="settings_notification_emails_enable_for_email">אפשר התראת דוא\"ל עבור %s</string>
+    <string name="settings_notification_keyword_contains_invalid_character">מילות מפתח לא יכולות להכיל \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">מילות מפתח אינן יכולות להתחיל ב-\'.\'</string>
+    <string name="settings_notification_new_keyword">הוסף מילת מפתח חדשה</string>
+    <string name="settings_notification_your_keywords">מילות המפתח שלך</string>
+    <string name="settings_notification_notify_me_for">הודע לי עבור</string>
+    <string name="settings_notification_other">אחר</string>
+    <string name="settings_notification_mentions_and_keywords">אזכורים ומילות מפתח</string>
+    <string name="settings_notification_default">התראת ברירת מחדל</string>
+    <string name="settings_notification_emails_no_emails">כדי לקבל אימייל עם התראה, אנא שיוך דוא\"ל לחשבון Matrix שלך</string>
+    <string name="settings_notification_emails_category">הודעה באימייל</string>
+    <string name="shortcut_disabled_reason_sign_out">הסשן יצא מהחשבון!</string>
+    <string name="shortcut_disabled_reason_room_left">החדר הוצא!</string>
+    <string name="room_settings_none">אף אחד</string>
+    <string name="room_settings_mention_and_keyword_only">אזכורים ומילות מפתח בלבד</string>
+    <string name="search_thread_from_a_thread">מתוך שרשור</string>
+    <string name="thread_list_empty_notice">טיפ: הקש ארוכות על הודעה והשתמש ב-\"%s\".</string>
+    <string name="thread_list_empty_subtitle">שרשורים עוזרים לשמור על השיחות שלך בנושא וקל למעקב.</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">השרשורים שלי</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_list_title">שרשורים</string>
+    <string name="thread_timeline_title">שרשורים</string>
+    <string name="room_threads_filter">סנן שרשורים בחדר</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">בחר את התפקידים הדרושים כדי לשנות חלקים שונים במרחב הזה</string>
+    <string name="space_settings_permissions_title">הרשאות אזור</string>
+    <string name="space_settings_permissions_subtitle">הצג ועדכן את התפקידים הנדרשים לשינוי חלקים שונים של האזור.</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">ההצפנה הוגדרה בצורה שגויה כך שאינך יכול לשלוח הודעות. לחץ כדי לפתוח את ההגדרות.</string>
+    <string name="room_unsupported_e2e_algorithm">ההצפנה הוגדרה בצורה שגויה כך שאינך יכול לשלוח הודעות. אנא צור קשר עם מנהל מערכת כדי לשחזר את ההצפנה למצב חוקי.</string>
+    <string name="space_participants_unban_prompt_msg">ביטול החסימה של המשתמש יאפשר לו להצטרף שוב למרחב.</string>
+    <string name="space_participants_ban_prompt_msg">חסימת משתמש תסיר אותם מהמרחב הזה ותמנע ממנו להצטרף שוב.</string>
+    <string name="space_participants_remove_prompt_msg">המשתמש יוסר מהמרחב הזה.
+\n
+\nכדי למנוע מהם להצטרף שוב, עליך לחסום אותם במקום זאת.</string>
+    <string name="continue_anyway">המשך בכל זאת</string>
+    <string name="call_remove_jitsi_widget_progress">מסיים שיחה…</string>
+    <string name="call_ended_invite_timeout_title">אין מענה</string>
+    <string name="call_ended_user_busy_description">המשתמש אליו התקשרת עסוק.</string>
+    <string name="call_ended_user_busy_title">מנוי תפוס</string>
+    <string name="call_held_by_you">החזקת השיחה</string>
+    <string name="call_held_by_user">%s החזיק את השיחה</string>
+    <string name="call_hold_action">להחזיק</string>
+    <string name="call_resume_action">לְהַמשִׁיך</string>
+    <string name="audio_call_with_participant">שיחת שמע עם %s</string>
+    <string name="video_call_with_participant">שיחת וידאו עם %s</string>
+    <plurals name="missed_video_call">
+        <item quantity="one">שיחת וידאו שלא נענתה</item>
+        <item quantity="two">%d שיחות וידאו שלא נענו</item>
+        <item quantity="many">%d שיחות וידאו שלא נענו</item>
+        <item quantity="other">שיחת וידאו שלא נענתה</item>
+    </plurals>
+    <plurals name="missed_audio_call">
+        <item quantity="one">שיחה שלא נענתה</item>
+        <item quantity="two">"%d שיחות  שלא נענו"</item>
+        <item quantity="many">"%d שיחות  שלא נענו"</item>
+        <item quantity="other">שיחה שלא נענתה</item>
+    </plurals>
+    <string name="call_ringing">צלצול שיחה…</string>
+    <string name="error_unauthorized">לא מורשה, חסרים אישורי אימות חוקיים</string>
+    <string name="login_error_homeserver_from_url_not_found_enter_manual">בחר שרת בית</string>
+    <string name="login_error_homeserver_from_url_not_found">לא ניתן להגיע לשרת ביתי בכתובת ה- %s. אנא בדוק את הקישור שלך או בחר שרת ביתי באופן ידני.</string>
+    <string name="use_as_default_and_do_not_ask_again">השתמש כברירת מחדל ואל תשאל שוב</string>
+    <string name="option_always_ask">תמיד תשאל</string>
+    <string name="hs_client_url">כתובת ה-API של שרת הבית</string>
+    <string name="spaces_header">רווחים</string>
+    <string name="spaces_invited_header">מזמין</string>
+    <string name="settings_room_directory_show_all_rooms_summary">הצג את כל החדרים בספריית החדרים, כולל חדרים עם תוכן מפורש.</string>
+    <string name="settings_room_directory_show_all_rooms">הצג חדרים עם תוכן מפורש</string>
+    <string name="settings_category_room_directory">ספריית חדרים</string>
+    <string name="suggested_header">חדרים מוצעים</string>
+    <string name="dialog_edit_hint">ערך חדש</string>
+    <string name="action_thread_copy_link_to_thread">העתק קישור לשרשור</string>
+    <string name="action_thread_view_in_room">צפיה בחדר</string>
+    <string name="action_not_now">לא כעת</string>
+    <string name="action_enable">אפשר</string>
+    <string name="action_return">חזור</string>
+    <string name="action_switch">החלף</string>
+    <string name="action_view_threads">הצג שרשורים</string>
+    <string name="missing_permissions_title">חסרות הרשאות</string>
+    <string name="denied_permission_voice_message">כדי לשלוח הודעות קוליות, אנא הענק הרשאה למיקרופון.</string>
+    <string name="denied_permission_camera">כדי לבצע פעולה זו, אנא הענק למצלמה הרשאה מהגדרות המערכת.</string>
+    <string name="denied_permission_generic">חסרות חלק מההרשאות לביצוע פעולה זו, אנא הענק את ההרשאות מהגדרות המערכת.</string>
+    <string name="spaces">רווחים</string>
+    <string name="learn_more">למד עוד</string>
+    <string name="notification_listening_for_notifications">מאזין להתראות</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>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• שרתים התואמים את כתובות ה-IP אסורות.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• מותר להשתמש בשרתים התואמים את כתובות ה-IP.</string>
+    <string name="notice_end_to_end_ok_by_you">הפעלת הצפנה מקצה לקצה.</string>
+    <string name="notice_end_to_end_ok">%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_room_guest_access_forbidden_by_you">מנעת מאורחים להצטרף לחדר.</string>
+    <string name="notice_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_room_guest_access_can_join_by_you">אפשרת לאורחים להצטרף לחדר.</string>
+    <string name="notice_room_guest_access_can_join">%1$s אפשר/ה לאורחים להצטרף לחדר.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">שינית את הכתובות של החדר הזה.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s שינה את הכתובות של החדר הזה.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">שינית את הכתובת הראשית והחלופית לחדר הזה.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s שינה את הכתובת הראשית והאלטרנטיבית של החדר הזה.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">שינית את הכתובות החלופיות של החדר הזה.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s שינה את הכתובות החלופיות עבור החדר הזה.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">הסרת את הכתובת החלופית %1$s עבור החדר הזה.</item>
+        <item quantity="two">הסרת את הכתובות החלופיות %1$s עבור החדר הזה.</item>
+        <item quantity="many">הסרת את הכתובות החלופיות %1$s עבור החדר הזה.</item>
+        <item quantity="other">הסרת את הכתובת החלופית %1$s עבור החדר הזה.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s הסיר את הכתובת החלופית %2$s עבור החדר הזה.</item>
+        <item quantity="two">%1$s הסיר את הכתובות החלופיות %2$s עבור החדר הזה.</item>
+        <item quantity="many">%1$s הסיר את הכתובות החלופיות %2$s עבור החדר הזה.</item>
+        <item quantity="other">%1$s הסיר את הכתובת החלופית %2$s עבור החדר הזה.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">הוספת את הכתובת החלופית %1$s לחדר הזה.</item>
+        <item quantity="two">הוספת את הכתובות החלופיות %1$s לחדר הזה.</item>
+        <item quantity="many">הוספת את הכתובות החלופיות %1$s לחדר הזה.</item>
+        <item quantity="other">הוספת את הכתובת החלופית %1$s לחדר הזה.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s הוסיף את הכתובת החלופית %2$s לחדר הזה.</item>
+        <item quantity="two">%1$s הוסיף את הכתובות החלופיות %2$s לחדר הזה.</item>
+        <item quantity="many">%1$s הוסיף את הכתובות החלופיות %2$s לחדר הזה.</item>
+        <item quantity="other">%1$s הוסיף את הכתובת החלופית %2$s לחדר הזה.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset_by_you">הסרת את הכתובת הראשית של החדר הזה.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s הסיר את הכתובת הראשית של החדר הזה.</string>
+    <string name="notice_room_canonical_alias_set_by_you">הגדרת הכתובת הראשית של חדר זה ל-%1$s.</string>
+    <string name="notice_room_canonical_alias_set">%1$s הגדיר את הכתובת הראשית של החדר הזה ל-%2$s.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">הוספת את %1$s והסרת את %2$s ככתובות לחדר הזה.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s הוסיף את %2$s והסיר את %3$s ככתובות לחדר הזה.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">הסרת את %1$s ככתובת לחדר הזה.</item>
+        <item quantity="two">הסרת את %1$s ככתובות לחדר הזה.</item>
+        <item quantity="many">הסרת את %1$s ככתובות לחדר הזה.</item>
+        <item quantity="other">הסרת את %1$s ככתובת לחדר הזה.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s הסיר את %2$s ככתובת לחדר הזה.</item>
+        <item quantity="two">%1$s הסיר את %2$s ככתובות עבור החדר הזה.</item>
+        <item quantity="many">%1$s הסיר את %2$s ככתובות עבור החדר הזה.</item>
+        <item quantity="other">%1$s הסיר את %2$s ככתובת עבור החדר הזה.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">הוספת את %1$s ככתובת לחדר הזה.</item>
+        <item quantity="two">הוספת את %1$s ככתובות לחדר הזה.</item>
+        <item quantity="many">הוספת את %1$s ככתובות לחדר הזה.</item>
+        <item quantity="other">הוספת את %1$s ככתובת לחדר הזה.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s הוסיף את %2$s ככתובת לחדר הזה.</item>
+        <item quantity="two">%1$s הוסיפו את %2$s ככתובות לחדר הזה.</item>
+        <item quantity="many">%1$s הוסיפו את %2$s ככתובות לחדר הזה.</item>
+        <item quantity="other">%1$s הוסיפו את %2$s ככתובות לחדר הזה.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">משכת את ההזמנה של %1$s. סיבה: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s משך את ההזמנה של %2$s. סיבה: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">קיבלת את ההזמנה עבור %1$s. סיבה: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s קיבל את ההזמנה עבור %2$s. סיבה: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">ביטלת את ההזמנה של %1$s להצטרף לחדר. סיבה: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s ביטל את ההזמנה של %2$s להצטרף לחדר. סיבה: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">שלחת הזמנה אל %1$s להצטרף לחדר. סיבה: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s שלח הזמנה אל %2$s להצטרף לחדר. סיבה: %3$s</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index a491d76b86..a110a7f379 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_message">%1$s：%2$s</string>
     <string name="summary_user_sent_image">%1$sが画像を送信しました。</string>
     <string name="summary_user_sent_sticker">%1$sがスタンプを送信しました。</string>
     <string name="notice_room_invite_no_invitee">%sの招待</string>
@@ -8,15 +8,15 @@
     <string name="notice_room_invite_you">%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_reject">%1$sが招待を拒否しました</string>
     <string name="notice_room_remove">%1$sが%2$sを追放しました</string>
-    <string name="notice_room_unban">%1$sが%2$sをブロック解除しました</string>
+    <string name="notice_room_unban">%1$sが%2$sのブロックを解除しました</string>
     <string name="notice_room_ban">%1$sが%2$sをブロックしました</string>
-    <string name="notice_room_withdraw">%1$sが%2$sの招待を撤回しました</string>
+    <string name="notice_room_withdraw">%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_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>
@@ -28,26 +28,26 @@
     <string name="room_displayname_two_members">%1$sと%2$s</string>
     <string name="room_displayname_empty_room">空のルーム</string>
     <plurals name="room_displayname_three_and_more_members">
-        <item quantity="other">%1$sと他%2$d名</item>
+        <item quantity="other">%1$sと他%2$d人</item>
     </plurals>
-    <string name="notice_made_future_room_visibility">%1$sは、今後のルーム履歴を%2$sに表示させました</string>
-    <string name="notice_room_visibility_invited">ルームのメンバー全員、招待された時点から。</string>
-    <string name="notice_room_visibility_joined">ルームのメンバー全員、参加した時点から。</string>
-    <string name="notice_room_visibility_shared">ルームのメンバー全員。</string>
-    <string name="notice_room_visibility_world_readable">誰でも。</string>
-    <string name="notice_room_visibility_unknown">不明 (%s)。</string>
-    <string name="notice_end_to_end">%1$s がエンドツーエンド暗号化を有効にしました (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s がVoIP会議をリクエストしました</string>
-    <string name="notice_voip_started">VoIP会議が開始されました</string>
+    <string name="notice_made_future_room_visibility">%1$sが今後のルーム履歴を%2$sに見えるように設定しました。</string>
+    <string name="notice_room_visibility_invited">ルームのメンバー全員（招待された時点から）</string>
+    <string name="notice_room_visibility_joined">ルームのメンバー全員（参加した時点から）</string>
+    <string name="notice_room_visibility_shared">ルームのメンバー全員</string>
+    <string name="notice_room_visibility_world_readable">全員</string>
+    <string name="notice_room_visibility_unknown">不明（%s）</string>
+    <string name="notice_end_to_end">%1$sがエンドツーエンド暗号化を有効にしました（%2$s）</string>
+    <string name="notice_requested_voip_conference">%1$sがVoIP会議をリクエストしました</string>
+    <string name="notice_voip_started">VoIP会議が開始しました</string>
     <string name="notice_voip_finished">VoIP会議が終了しました</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_profile_change_redacted">%1$s がプロフィール %2$s を更新しました</string>
-    <string name="notice_room_third_party_invite">%1$s は %2$s にルームに参加するよう招待状を送りました</string>
-    <string name="notice_room_third_party_registered_invite">%1$sは%2$sの招待を受け入れました</string>
-    <string name="notice_crypto_unable_to_decrypt">** 解読できません: %s **</string>
-    <string name="notice_crypto_error_unknown_inbound_session_id">送信者の端末からこのメッセージのキーが送信されていません。</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_profile_change_redacted">%1$sがプロフィール %2$s を更新しました</string>
+    <string name="notice_room_third_party_invite">%1$sが%2$sにルームへの招待を送りました</string>
+    <string name="notice_room_third_party_registered_invite">%1$sが%2$sの招待を受け入れました</string>
+    <string name="notice_crypto_unable_to_decrypt">** 復号化できません：%s **</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">送信者の端末からこのメッセージの鍵が送信されていません。</string>
     <string name="could_not_redact">修正できませんでした</string>
     <string name="unable_to_send_message">メッセージを送信できません</string>
     <string name="message_failed_to_upload">画像のアップロードに失敗しました</string>
@@ -59,14 +59,14 @@
     <string name="notice_room_avatar_changed_by_you">ルームのアバターを変更しました</string>
     <string name="notice_room_avatar_changed">%1$sがルームのアバターを変更しました</string>
     <string name="notice_room_topic_changed_by_you">トピックを%1$sに変更しました</string>
-    <string name="notice_display_name_removed_by_you">表示名を削除しました(%1$sでした)</string>
+    <string name="notice_display_name_removed_by_you">表示名を削除しました（%1$sでした）</string>
     <string name="notice_display_name_changed_from_by_you">表示名を%1$sから%2$sに変更しました</string>
     <string name="notice_display_name_set_by_you">表示名を%1$sに設定しました</string>
     <string name="notice_avatar_url_changed_by_you">アバターを変更しました</string>
     <string name="notice_room_withdraw_by_you">%1$sの招待を取り下げました</string>
-    <string name="notice_room_ban_by_you">%1$sをBANしました</string>
-    <string name="notice_room_unban_by_you">%1$sのBANを解除しました</string>
-    <string name="notice_room_remove_by_you">%1$sを退出させました</string>
+    <string name="notice_room_ban_by_you">%1$sをブロックしました</string>
+    <string name="notice_room_unban_by_you">%1$sのブロックを解除しました</string>
+    <string name="notice_room_remove_by_you">%1$sを追放しました</string>
     <string name="notice_room_reject_by_you">招待を拒否しました</string>
     <string name="notice_direct_room_leave_by_you">ルームから退出しました</string>
     <string name="notice_direct_room_leave">%1$sがルームから退出しました</string>
@@ -82,20 +82,20 @@
     <string name="notice_room_invite_no_invitee_by_you">招待</string>
     <string name="summary_you_sent_sticker">ステッカーを送信しました。</string>
     <string name="summary_you_sent_image">画像を送信しました。</string>
-    <string name="title_activity_room">部屋</string>
+    <string name="title_activity_room">ルーム</string>
     <string name="title_activity_settings">設定</string>
     <string name="title_activity_historical">履歴</string>
     <string name="ok">OK</string>
     <string name="action_cancel">キャンセル</string>
     <string name="action_save">保存</string>
-    <string name="action_leave">退室</string>
+    <string name="action_leave">退出</string>
     <string name="action_send">送信</string>
     <string name="action_resend">再送信</string>
     <string name="action_redact">削除</string>
     <string name="action_share">共有</string>
     <string name="action_delete">削除</string>
-    <string name="device_information">端末情報</string>
-    <string name="room_no_conference_call_in_encrypted_rooms">暗号化された部屋での多人数通話はサポートされていません</string>
+    <string name="device_information">セッションの情報</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">暗号化されたルームでのグループ通話はサポートされていません</string>
     <string name="action_invite">招待</string>
     <string name="action_mark_all_as_read">全ての発言を既読にする</string>
     <string name="action_historical">履歴</string>
@@ -105,32 +105,32 @@
     <string name="copied_to_clipboard">クリップボードへコピー</string>
     <string name="dialog_title_warning">警告</string>
     <string name="bottom_action_favourites">お気に入り</string>
-    <string name="bottom_action_people">会話</string>
-    <string name="bottom_action_rooms">部屋</string>
-    <string name="home_filter_placeholder_home">ルーム名で絞り込み</string>
-    <string name="home_filter_placeholder_favorites">お気に入りで絞り込み</string>
-    <string name="home_filter_placeholder_people">会話で絞り込み</string>
-    <string name="home_filter_placeholder_rooms">ルームで絞り込み</string>
+    <string name="bottom_action_people">知人</string>
+    <string name="bottom_action_rooms">ルーム</string>
+    <string name="home_filter_placeholder_home">ルーム名で絞り込む</string>
+    <string name="home_filter_placeholder_favorites">お気に入りで絞り込む</string>
+    <string name="home_filter_placeholder_people">連絡先で絞り込む</string>
+    <string name="home_filter_placeholder_rooms">ルーム名で絞り込む</string>
     <string name="invitations_header">招待中</string>
     <string name="low_priority_header">低優先度</string>
     <string name="direct_chats_header">会話</string>
     <string name="no_public_room_placeholder">公開されたルームがありません</string>
     <plurals name="public_room_nb_users">
-        <item quantity="other">%d名</item>
+        <item quantity="other">%d名のユーザー</item>
     </plurals>
-    <string name="send_bug_report">バグを報告</string>
-    <string name="send_bug_report_description">不具合の内容と状況の説明をお願い致します。あなたは何をしましたか？何が起こると思いますか？実際何が起こったのですか？</string>
-    <string name="send_bug_report_placeholder">ここに不具合内容を説明</string>
-    <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="send_bug_report_logs_description">開発者が問題を診断するために、このクライアントの動作記録がバグの報告と一緒に送信されます。このバグの報告は、ログとスクリーンショットを含め、公開されません。上記文章のみを送信したい場合は以下のチェックを解除してください：</string>
-    <string name="send_bug_report_alert_message">あなたは不満で端末を振っているようです。不具合報告の画面を開きますか？</string>
-    <string name="send_bug_report_app_crashed">前回アプリケーションは正常に停止しませんでした。クラッシュ報告の画面を開きますか？</string>
+    <string name="send_bug_report">不具合を報告</string>
+    <string name="send_bug_report_description">不具合の内容と状況の説明をお願いします。何をしましたか？何が起こるべきでしたか？実際に起こった事象は何でしょうか？</string>
+    <string name="send_bug_report_placeholder">ここに不具合の内容を記述</string>
+    <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="send_bug_report_logs_description">開発者が問題を診断するために、このクライアントのログがバグレポートと一緒に送信されます。バグレポートは、ログとスクリーンショットを含めて、公開されることはありません。上記の説明文だけを送信したい場合は、以下のチェックを解除してください。</string>
+    <string name="send_bug_report_alert_message">あなたは不満で端末を振っているようです。バグレポートの画面を開きますか？</string>
+    <string name="send_bug_report_app_crashed">前回、アプリケーションは正常に停止しませんでした。クラッシュ報告の画面を開きますか？</string>
     <string name="send_bug_report_sent">不具合を報告しました</string>
     <string name="send_bug_report_failed">不具合の報告の送信に失敗しました (%s)</string>
-    <string name="join_room">部屋へ参加</string>
-    <string name="missing_permissions_title_to_start_conf_call">通話が開始できません</string>
+    <string name="join_room">ルームに参加</string>
+    <string name="missing_permissions_title_to_start_conf_call">通話を開始できません</string>
     <string name="action_voice_call">音声通話</string>
     <string name="action_video_call">ビデオ通話</string>
     <string name="action_global_search">全体検索</string>
@@ -140,59 +140,59 @@
     <string name="option_send_files">ファイルを送信</string>
     <string name="auth_return_to_login">ログイン画面へ戻る</string>
     <string name="auth_phone_number_placeholder">電話番号</string>
-    <string name="auth_opt_phone_number_placeholder">電話番号 (任意で)</string>
-    <string name="auth_invalid_login_param">ユーザ名かパスワードが正しくありません</string>
-    <string name="auth_invalid_user_name">ユーザ名は半角英数字、ドット、ハイフン、アンダスコアのみで記して下さい</string>
-    <string name="auth_invalid_password">パスワードが短すぎます(最小6文字)</string>
-    <string name="auth_invalid_email">正しくない電子メールアドレスのようです</string>
-    <string name="auth_invalid_phone">正しくない電話番号のようです</string>
-    <string name="auth_email_already_defined">すでに登録されている電子メールアドレスです。</string>
+    <string name="auth_opt_phone_number_placeholder">電話番号（任意）</string>
+    <string name="auth_invalid_login_param">ユーザー名かパスワードが正しくありません</string>
+    <string name="auth_invalid_user_name">ユーザー名は半角英数字、ドット、ハイフン、アンダースコアのみで記して下さい</string>
+    <string name="auth_invalid_password">パスワードが短すぎます（最小6文字）</string>
+    <string name="auth_invalid_email">メールアドレスの形式が正しくありません</string>
+    <string name="auth_invalid_phone">電話番号の形式が正しくありません</string>
+    <string name="auth_email_already_defined">このメールアドレスは既に登録されています。</string>
     <string name="auth_password_dont_match">パスワードが一致しません</string>
-    <string name="auth_forgot_password">パスワードを忘れた？</string>
-    <string name="auth_email_validation_message">登録を続行するには電子メールを確認して下さい</string>
-    <string name="login_error_must_start_http">URLはhttp://か、https://で始めて下さい</string>
-    <string name="login_error_network_error">ログインできません:通信エラー</string>
+    <string name="auth_forgot_password">パスワードを忘れましたか？</string>
+    <string name="auth_email_validation_message">登録を続行するにはメールボックスを確認して下さい</string>
+    <string name="login_error_must_start_http">URLはhttp://かhttps://で始めて下さい</string>
+    <string name="login_error_network_error">ログインできません：通信エラー</string>
     <string name="login_error_unable_login">ログインできません</string>
-    <string name="login_error_registration_network_error">登録できません:通信エラー</string>
+    <string name="login_error_registration_network_error">登録できません：通信エラー</string>
     <string name="login_error_unable_register">登録できません</string>
     <string name="login_error_invalid_home_server">正しいURLを入力して下さい</string>
-    <string name="login_error_forbidden">ユーザ名かパスワードが正しくありません</string>
+    <string name="login_error_forbidden">ユーザー名かパスワードが正しくありません</string>
     <string name="compression_opt_list_original">原寸</string>
     <string name="compression_opt_list_large">大き目</string>
     <string name="compression_opt_list_medium">中程度</string>
     <string name="compression_opt_list_small">小さ目</string>
-    <string name="attachment_cancel_download">ダウンロードを停止しますか？</string>
-    <string name="attachment_cancel_upload">アップロードを停止しますか？</string>
+    <string name="attachment_cancel_download">ダウンロードをキャンセルしますか？</string>
+    <string name="attachment_cancel_upload">アップロードをキャンセルしますか？</string>
     <string name="attachment_remaining_time_seconds">%d秒</string>
-    <string name="attachment_remaining_time_minutes">%1$d分 %2$d秒</string>
+    <string name="attachment_remaining_time_minutes">%1$d分%2$d秒</string>
     <string name="yesterday">昨日</string>
     <string name="today">今日</string>
-    <string name="room_info_room_name">部屋名</string>
+    <string name="room_info_room_name">ルーム名</string>
     <string name="call_ended">通話終了</string>
     <string name="call_ring">呼び出し中です…</string>
     <string name="yes">はい</string>
     <string name="no">いいえ</string>
-    <string name="_continue">続ける</string>
+    <string name="_continue">続行する</string>
     <string name="room_jump_to_first_unread">最新の未読へ移動</string>
-    <string name="room_participants_leave_prompt_title">部屋を退室</string>
-    <string name="room_participants_leave_prompt_msg">本当にこの部屋を退室しますか？</string>
+    <string name="room_participants_leave_prompt_title">ルームを退出</string>
+    <string name="room_participants_leave_prompt_msg">このルームを退出してよろしいですか？</string>
     <string name="room_participants_create">作成</string>
-    <string name="room_participants_online">接続中</string>
-    <string name="room_participants_offline">切断中</string>
-    <string name="room_participants_idle">待機中</string>
+    <string name="room_participants_online">オンライン</string>
+    <string name="room_participants_offline">オフライン</string>
+    <string name="room_participants_idle">アイドル</string>
     <string name="room_participants_action_invite">招待</string>
-    <string name="room_participants_action_leave">この部屋を退室する</string>
+    <string name="room_participants_action_leave">このルームを退出</string>
     <string name="room_menu_search">検索</string>
-    <string name="room_one_user_is_typing">%sさんが文字入力中…</string>
-    <string name="room_two_users_are_typing">%1$sさんと %2$sさんが文字入力中…</string>
-    <string name="room_many_users_are_typing">%1$sさん、%2$sさん他が文字入力中…</string>
-    <string name="room_message_placeholder_encrypted">暗号文を送信…</string>
+    <string name="room_one_user_is_typing">%sさんが文字を入力しています…</string>
+    <string name="room_two_users_are_typing">%1$sさんと%2$sさんが文字を入力しています…</string>
+    <string name="room_many_users_are_typing">%1$sさん、%2$sさん他が文字を入力しています…</string>
+    <string name="room_message_placeholder_encrypted">暗号化されたメッセージを送信…</string>
     <string name="light_theme">明るいテーマ</string>
     <string name="dark_theme">暗いテーマ</string>
     <string name="black_theme">黒いテーマ</string>
-    <string name="notification_sync_in_progress">同期中…</string>
+    <string name="notification_sync_in_progress">同期しています…</string>
     <string name="title_activity_home">メッセージ</string>
-    <string name="title_activity_member_details">メンバー詳細</string>
+    <string name="title_activity_member_details">メンバーの詳細</string>
     <string name="action_quote">引用</string>
     <string name="later">後で</string>
     <string name="action_forward">転送</string>
@@ -202,84 +202,84 @@
     <string name="dialog_title_confirmation">確認</string>
     <string name="action_disable">無効にする</string>
     <string name="send_bug_report_progress">送信中 (%s%%)</string>
-    <string name="login_error_user_in_use">このユーザ名はすでに使用されています</string>
+    <string name="login_error_user_in_use">このユーザー名は既に使用されています</string>
     <string name="action_remove">削除</string>
     <string name="action_join">参加</string>
-    <string name="room_preview_invitation_format">あなたは %s さんに呼ばれてこの部屋へ参加しました</string>
+    <string name="room_preview_invitation_format">%sさんがこのルームに招待しています</string>
     <string name="room_creation_title">新しい会話</string>
-    <string name="room_creation_add_member">参加者を追加</string>
+    <string name="room_creation_add_member">メンバーを追加</string>
     <string name="room_title_one_member">1名</string>
-    <string name="room_participants_header_devices">端末</string>
-    <string name="room_participants_action_set_default_power_level">権限を一般参加者へ変更</string>
-    <string name="room_participants_action_set_moderator">権限を司会者へ変更</string>
+    <string name="room_participants_header_devices">セッション</string>
+    <string name="room_participants_action_set_default_power_level">権限を一般ユーザーへ戻す</string>
+    <string name="room_participants_action_set_moderator">権限をモデレーターへ変更</string>
     <string name="room_participants_action_set_admin">権限を管理者へ変更</string>
-    <string name="room_message_placeholder_not_encrypted">ここに送信文を入力 (暗号なし)…</string>
-    <string name="room_offline_notification">サーバとの接続が失われました.</string>
+    <string name="room_message_placeholder_not_encrypted">メッセージを送信（暗号化されていません）…</string>
+    <string name="room_offline_notification">サーバーとの接続が失われました。</string>
     <string name="room_prompt_resend">全て再送信</string>
-    <string name="room_resend_unsent_messages">未送信の文を再送信</string>
-    <string name="room_delete_unsent_messages">未送信の文を削除</string>
+    <string name="room_resend_unsent_messages">未送信のメッセージを再送信</string>
+    <string name="room_delete_unsent_messages">未送信のメッセージを削除</string>
     <string name="room_message_file_not_found">ファイルが見つかりません</string>
-    <string name="room_do_not_have_permission_to_post">あなたはこのルームで発言する権限がありません。</string>
-    <string name="room_details_title">部屋の詳細</string>
+    <string name="room_do_not_have_permission_to_post">このルームで発言する権限がありません。</string>
+    <string name="room_details_title">ルームの詳細</string>
     <string name="room_details_people">参加者</string>
     <string name="room_details_files">ファイル</string>
     <string name="room_details_settings">設定</string>
     <string name="room_settings_favourite">お気に入り</string>
     <string name="room_settings_de_prioritize">低優先度</string>
-    <string name="room_settings_direct_chat">会話</string>
-    <string name="room_settings_forget">忘れる</string>
+    <string name="room_settings_direct_chat">対話</string>
+    <string name="room_settings_forget">履歴を消去</string>
     <string name="settings_profile_picture">自分のアイコン画像</string>
     <string name="settings_display_name">表示名</string>
-    <string name="settings_email_address">電子メール</string>
-    <string name="settings_add_email_address">電子メールアドレスを追加</string>
+    <string name="settings_email_address">メールアドレス</string>
+    <string name="settings_add_email_address">メールアドレスを追加</string>
     <string name="settings_phone_number">電話番号</string>
     <string name="settings_add_phone_number">電話番号を追加</string>
     <string name="settings_notification_ringtone">通知音</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>
+    <string name="settings_enable_this_device">このセッションで通知を許可</string>
+    <string name="settings_messages_in_one_to_one">1対1のチャットでのメッセージ</string>
+    <string name="settings_messages_in_group_chat">グループチャットでのメッセージ</string>
+    <string name="settings_invited_to_room">ルームへ招待されたとき</string>
     <string name="settings_call_invitations">通話の呼び出しがあったとき</string>
-    <string name="settings_messages_sent_by_bot">自動発言プログラム(Bot)が発言した時</string>
+    <string name="settings_messages_sent_by_bot">自動発言プログラム（Bot）が発言した時</string>
     <string name="settings_start_on_boot">端末起動時に開始</string>
     <string name="settings_background_sync">アプリを閉じているときの動作</string>
-    <string name="settings_enable_background_sync">アプリを閉じても新着を確認</string>
-    <string name="settings_set_sync_timeout">新着確認を失敗とするまでの時間</string>
-    <string name="settings_set_sync_delay">リクエストの間隔</string>
+    <string name="settings_enable_background_sync">バックグラウンド同期を有効にする</string>
+    <string name="settings_set_sync_timeout">同期のリクエストを失敗とするまでの時間</string>
+    <string name="settings_set_sync_delay">同期の間隔</string>
     <string name="settings_clear_cache">一時保存を消去</string>
-    <string name="settings_clear_media_cache">画像等の一時保存を消去</string>
-    <string name="settings_keep_media">画像等を一時保存する期間</string>
-    <string name="settings_user_settings">利用者設定</string>
+    <string name="settings_clear_media_cache">メディアの一時保存を消去</string>
+    <string name="settings_keep_media">メディアファイルを保存</string>
+    <string name="settings_user_settings">ユーザー設定</string>
     <string name="settings_notifications">通知</string>
-    <string name="settings_ignored_users">無視する相手</string>
+    <string name="settings_ignored_users">無視しているユーザー</string>
     <string name="settings_other">その他</string>
-    <string name="settings_advanced">拡張設定</string>
-    <string name="settings_cryptography">暗号化</string>
+    <string name="settings_advanced">高度な設定</string>
+    <string name="settings_cryptography">暗号</string>
     <string name="settings_notifications_targets">通知対象</string>
     <string name="settings_contact">端末の電話帳</string>
     <string name="settings_contacts_app_permission">端末の電話帳の使用を許可</string>
     <string name="settings_contacts_phonebook_country">電話帳の国番号</string>
-    <string name="settings_devices_list">端末</string>
+    <string name="settings_devices_list">セッション一覧</string>
     <string name="settings_always_show_timestamps">全てのメッセージにタイムスタンプを表示</string>
     <string name="settings_12_24_timestamps">タイムスタンプを12時間形式で表示</string>
-    <string name="devices_details_dialog_title">端末詳細</string>
-    <string name="devices_details_id_title">ID(端末固有番号)</string>
+    <string name="devices_details_dialog_title">セッションの詳細</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_last_seen_title">最終接続日</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>
     <string name="devices_delete_dialog_text">この操作には追加の認証が必要です。
 \n続行するには、パスワードを入力してください。</string>
-    <string name="devices_delete_submit_button_label">受諾</string>
+    <string name="devices_delete_submit_button_label">送信</string>
     <string name="settings_logged_in">ログイン中のアカウント</string>
     <string name="settings_select_language">言語を選択</string>
     <string name="settings_interface_language">言語</string>
-    <string name="settings_user_interface">端末操作表示</string>
+    <string name="settings_user_interface">インターフェース</string>
     <string name="account_email_validation_title">認証を確認中</string>
-    <string name="account_email_validation_message">電子メールを確認して、本文中のURLをクリックしてください。 完了したら「続ける」をクリックしてください。</string>
-    <string name="account_email_already_used_error">この電子メールアドレスは既に使われています。</string>
+    <string name="account_email_validation_message">電子メールを確認して、本文中のURLをクリックしてください。完了したら「続行する」をクリックしてください。</string>
+    <string name="account_email_already_used_error">このメールアドレスは既に使われています。</string>
     <string name="settings_password_updated">あなたのパスワードは更新されました</string>
     <string name="settings_select_country">国を選択</string>
     <string name="settings_phone_number_country_label">国</string>
@@ -287,54 +287,54 @@
     <string name="settings_phone_number_label">電話番号</string>
     <string name="settings_phone_number_error">選択した国では、この電話番号は正しくありません</string>
     <string name="settings_phone_number_verification">電話認証</string>
-    <string name="settings_phone_number_verification_instruction">SMSで認証番号を送りました. 以下にその番号を入力してください.</string>
+    <string name="settings_phone_number_verification_instruction">SMSで認証番号を送りました。以下にその番号を入力してください。</string>
     <string name="settings_phone_number_verification_error_empty_code">認証番号を入力</string>
     <string name="media_saving_period_3_days">3日</string>
     <string name="media_saving_period_1_week">1週間</string>
     <string name="media_saving_period_1_month">1ヵ月</string>
     <string name="media_saving_period_forever">永久に</string>
-    <string name="room_settings_room_photo">部屋の画像アイコン</string>
-    <string name="room_settings_room_name">部屋名</string>
-    <string name="room_settings_topic">部屋の説明</string>
-    <string name="room_settings_room_tag">部屋の属性</string>
-    <string name="room_settings_tag_pref_dialog_title">部屋の属性:</string>
+    <string name="room_settings_room_photo">ルームの画像アイコン</string>
+    <string name="room_settings_room_name">ルーム名</string>
+    <string name="room_settings_topic">ルームの説明</string>
+    <string name="room_settings_room_tag">ルームの属性</string>
+    <string name="room_settings_tag_pref_dialog_title">ルームの属性:</string>
     <string name="room_settings_tag_pref_entry_favourite">お気に入り</string>
     <string name="room_settings_tag_pref_entry_low_priority">低優先度</string>
     <string name="room_settings_tag_pref_entry_none">なし</string>
-    <string name="room_settings_category_access_visibility_title">参加と可視範囲</string>
-    <string name="room_settings_directory_visibility">部屋一覧へ公開する</string>
-    <string name="room_settings_room_access_rules_pref_title">部屋への参加</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_room_access_rules_pref_dialog_title">部屋へ参加できる人は?</string>
+    <string name="room_settings_category_access_visibility_title">アクセスと可視範囲</string>
+    <string name="room_settings_directory_visibility">ルームディレクトリへ公開</string>
+    <string name="room_settings_room_access_rules_pref_title">ルームへのアクセス</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_room_access_rules_pref_dialog_title">誰がルームにアクセスできますか？</string>
     <string name="room_settings_read_history_entry_anyone">誰でも</string>
-    <string name="room_settings_read_history_entry_members_only_option_time_shared">参加者のみ (この設定を選択した時点から)</string>
-    <string name="room_settings_read_history_entry_members_only_invited">参加者のみ (招待を送った時点から)</string>
-    <string name="room_settings_read_history_entry_members_only_joined">参加者のみ (参加した時点から)</string>
-    <string name="room_settings_room_access_entry_only_invited">この部屋に招待された人のみ参加可能</string>
-    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">部屋のリンクを知る人なら誰でも（ゲストユーザを除く）</string>
-    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">部屋のリンクを知る人なら誰でも（ゲストユーザも含む）</string>
-    <string name="room_settings_banned_users_title">再入室禁止された参加者</string>
-    <string name="room_settings_category_advanced_title">拡張設定</string>
-    <string name="room_settings_room_internal_id">この部屋のサーバ内識別ID</string>
-    <string name="room_settings_labs_pref_title">実験的</string>
-    <string name="room_settings_labs_warning_message">これらは予期せぬ不具合が生じるかもしれない実験的機能です. 慎重に使用してください.</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">メンバーのみ（この設定を選択した時点から）</string>
+    <string name="room_settings_read_history_entry_members_only_invited">メンバーのみ（招待を送った時点から）</string>
+    <string name="room_settings_read_history_entry_members_only_joined">メンバーのみ（参加した時点から）</string>
+    <string name="room_settings_room_access_entry_only_invited">招待された人のみ</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">ルームのリンクを知っている人なら誰でも（ゲストユーザーを除く）</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">ルームのリンクを知っている人なら誰でも（ゲストユーザーを含む）</string>
+    <string name="room_settings_banned_users_title">ブロックされたユーザー</string>
+    <string name="room_settings_category_advanced_title">高度な設定</string>
+    <string name="room_settings_room_internal_id">このルームのサーバー内識別ID</string>
+    <string name="room_settings_labs_pref_title">ラボ</string>
+    <string name="room_settings_labs_warning_message">これらは予期しない不具合が生じるかもしれない実験的機能です。慎重に使用してください。</string>
     <string name="room_settings_labs_end_to_end">エンドツーエンド暗号化</string>
     <string name="room_settings_labs_end_to_end_is_active">エンドツーエンド暗号化を使用中</string>
-    <string name="room_settings_labs_end_to_end_warnings">暗号を有効にするためにはログアウトする必要があります.</string>
-    <string name="room_settings_never_send_to_unverified_devices_title">認証された端末のみで暗号化</string>
-    <string name="room_settings_never_send_to_unverified_devices_summary">この部屋では, この端末から認証されていない端末への暗号送信をしません.</string>
+    <string name="room_settings_labs_end_to_end_warnings">暗号化を有効にするためにはログアウトする必要があります.</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">認証済のセッションに対してのみ暗号化</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">このセッションから、このルームの未認証のセッションに対して、暗号化されたメッセージを送信しない。</string>
     <string name="room_settings_addresses_add_new_address">新しいアドレス (記入例 #foo:matrix.org)</string>
-    <string name="room_settings_addresses_no_local_addresses">この部屋はサーバ内住所表記がありません</string>
-    <string name="room_settings_addresses_pref_title">住所表記</string>
-    <string name="room_settings_addresses_invalid_format_dialog_title">住所表記が正しくありません</string>
-    <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' は正しくない形式の住所表記です</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_msg">この部屋の本住所表記が設定されていません.</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_title">本住所表記の警告</string>
+    <string name="room_settings_addresses_no_local_addresses">このルームにはローカルアドレスがありません</string>
+    <string name="room_settings_addresses_pref_title">アドレス</string>
+    <string name="room_settings_addresses_invalid_format_dialog_title">エイリアスのフォーマットが正しくありません</string>
+    <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\'はエイリアスの正しいフォーマットではありません</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">このルームのメインアドレスが設定されていません。</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_title">メインアドレスの警告</string>
     <string name="room_settings_set_main_address">メインアドレスとして設定</string>
-    <string name="room_settings_unset_main_address">メインアドレスとして設定を解除</string>
-    <string name="room_settings_copy_room_id">部屋固有IDをコピー</string>
-    <string name="room_settings_copy_room_address">部屋の住所表記をコピー</string>
+    <string name="room_settings_unset_main_address">メインアドレスとしての設定を解除</string>
+    <string name="room_settings_copy_room_id">ルーム固有IDをコピー</string>
+    <string name="room_settings_copy_room_address">ルームのアドレスをコピー</string>
     <string name="encryption_information_device_id">セッションID</string>
     <string name="font_size">文字の大きさ</string>
     <string name="tiny">とても小さい</string>
@@ -344,154 +344,154 @@
     <string name="larger">より大きい</string>
     <string name="largest">とても大きい</string>
     <string name="huge">巨大</string>
-    <string name="notification_listening_for_events">発言更新を確認</string>
-    <string name="view_decrypted_source">暗号解除されたソースコードを表示</string>
+    <string name="notification_listening_for_events">発言更新を確認しています</string>
+    <string name="view_decrypted_source">復号化されたソースコードを表示</string>
     <string name="action_rename">名前変更</string>
-    <string name="offline">切断中</string>
-    <string name="start_new_chat">会話を開始</string>
+    <string name="offline">オフライン</string>
+    <string name="start_new_chat">チャットを開始</string>
     <string name="start_voice_call">音声通話を開始</string>
     <string name="start_video_call">ビデオ通話を開始</string>
     <string name="option_take_photo_video">写真または動画を撮影</string>
-    <string name="auth_send_reset_email">初期化メール送信</string>
-    <string name="template_permissions_rationale_msg_camera">写真撮影やビデオ通話には, ${app_name}アプリに端末のカメラの使用を許可する必要があります.</string>
-    <string name="cannot_start_call">通話を開始できませんでした。後ほどお試しください</string>
-    <string name="missing_permissions_warning">権限が無いため、一部の機能を利用できない可能性があります…</string>
-    <string name="missing_permissions_to_start_conf_call">この部屋で会議を開始するためには招待権限が必要です</string>
-    <string name="send_anyway">とにかく送る</string>
-    <string name="action_sign_out">ログアウト</string>
+    <string name="auth_send_reset_email">再設定用のメールを送信</string>
+    <string name="template_permissions_rationale_msg_camera">写真撮影やビデオ通話には、${app_name}端末のカメラの使用を許可する必要があります。</string>
+    <string name="cannot_start_call">通話を開始できませんでした。後ほど試してください</string>
+    <string name="missing_permissions_warning">権限がないため、一部の機能を利用できない可能性があります…</string>
+    <string name="missing_permissions_to_start_conf_call">このルームで会議を開始するためには招待の権限が必要です</string>
+    <string name="send_anyway">無視して送る</string>
+    <string name="action_sign_out">サインアウト</string>
     <string name="bottom_action_home">ホーム</string>
     <string name="no_conversation_placeholder">会話なし</string>
     <string name="template_no_contact_access_placeholder">端末の電話帳を${app_name}アプリが読み取ることは許可されていません</string>
-    <string name="no_result_placeholder">結果なし</string>
+    <string name="no_result_placeholder">結果がありません</string>
     <string name="rooms_header">ルーム</string>
-    <string name="rooms_directory_header">ルーム一覧</string>
-    <string name="user_directory_header">利用者一覧</string>
-    <string name="send_files_in">送信する</string>
+    <string name="rooms_directory_header">ルームディレクトリ</string>
+    <string name="user_directory_header">ユーザーディレクトリ</string>
+    <string name="send_files_in">送信</string>
     <string name="logout">サインアウト</string>
     <string name="create_account">アカウントを作成</string>
     <string name="login">ログイン</string>
     <string name="auth_register">アカウントを作成</string>
     <string name="auth_submit">送信</string>
     <string name="auth_skip">飛ばす</string>
-    <string name="auth_user_id_placeholder">ユーザ名または電子メール</string>
+    <string name="auth_user_id_placeholder">ユーザー名またはメールアドレス</string>
     <string name="auth_password_placeholder">パスワード</string>
     <string name="auth_new_password_placeholder">新しいパスワード</string>
-    <string name="auth_user_name_placeholder">ユーザ名</string>
-    <string name="auth_email_placeholder">電子メールアドレス</string>
-    <string name="auth_opt_email_placeholder">電子メールアドレス (任意で)</string>
+    <string name="auth_user_name_placeholder">ユーザー名</string>
+    <string name="auth_email_placeholder">メールアドレス</string>
+    <string name="auth_opt_email_placeholder">メールアドレス（任意）</string>
     <string name="auth_repeat_password_placeholder">パスワード再確認</string>
     <string name="auth_repeat_new_password_placeholder">新しいパスワードを再確認</string>
-    <string name="auth_missing_password">パスワードが違います</string>
-    <string name="auth_missing_email">電子メールアドレスが違います</string>
-    <string name="auth_missing_phone">電話番号が違います</string>
-    <string name="auth_missing_email_or_phone">電子メールアドレスまたは電話番号が違います</string>
-    <string name="auth_use_server_options">接続先サーバを指定する(追加設定)</string>
-    <string name="auth_invalid_token">指定が正しくありません</string>
+    <string name="auth_missing_password">パスワードが入力されていません</string>
+    <string name="auth_missing_email">メールアドレスが入力されていません</string>
+    <string name="auth_missing_phone">電話番号が入力されていません</string>
+    <string name="auth_missing_email_or_phone">メールアドレスまたは電話番号が入力されていません</string>
+    <string name="auth_use_server_options">接続先サーバーを指定（高度）</string>
+    <string name="auth_invalid_token">不正なトークン</string>
     <string name="auth_threepid_warning_message">メールと電話番号の同時登録はまだシステムが対応できませんが、電話番号だけの登録は可能です。
 \n
 \n設定からプロフィールにメールアドレスを追加できます。</string>
-    <string name="auth_recaptcha_message">このホームサーバはあなたがロボットではない認証を求めます</string>
-    <string name="auth_username_in_use">ユーザ名はすでに使用されています</string>
-    <string name="auth_home_server">ホームサーバ：</string>
-    <string name="auth_identity_server">認証サーバー:</string>
-    <string name="auth_reset_password_next_step_button">自分用電子メールアドレスで認証をします</string>
-    <string name="auth_reset_password_message">パスワードを初期化するには, アカウントに登録されている電子メールアドレスを入力してください:</string>
-    <string name="auth_reset_password_missing_email">あなたのアカウントに登録された電子メールアドレスの入力が必要です.</string>
-    <string name="auth_reset_password_missing_password">新しいパスワードの入力が必要です.</string>
-    <string name="auth_reset_password_email_validation_message">%s へ電子メールが送信されました. リンクをたどったら以下をクリックしてください.</string>
-    <string name="auth_reset_password_error_unauthorized">電子メールアドレスの確認に失敗しました: 電子メールのリンクをクリックしたことを確認してください</string>
+    <string name="auth_recaptcha_message">このホームサーバーは、あなたがロボットではないことの確認を求めています</string>
+    <string name="auth_username_in_use">ユーザー名は既に使用されています</string>
+    <string name="auth_home_server">ホームサーバー：</string>
+    <string name="auth_identity_server">IDサーバー：</string>
+    <string name="auth_reset_password_next_step_button">メールアドレスを認証しました</string>
+    <string name="auth_reset_password_message">パスワードを再設定するには、アカウントに登録されているメールアドレスを入力してください：</string>
+    <string name="auth_reset_password_missing_email">アカウントに登録されたメールアドレスの入力が必要です。</string>
+    <string name="auth_reset_password_missing_password">新しいパスワードの入力が必要です。</string>
+    <string name="auth_reset_password_email_validation_message">%sへ電子メールが送信されました。メール内のリンクにアクセスしてから、以下をクリックしてください。</string>
+    <string name="auth_reset_password_error_unauthorized">メールアドレスの確認に失敗しました：電子メールのリンクをクリックしたことを確認してください</string>
     <string name="auth_reset_password_success_message">パスワードがリセットされました。
 \n
-\nすべてのセッションからログアウトしたため、プッシュ通知を受け取れなくなりました。通知を再び有効にするには、各デバイスで再ログインをお願いします。</string>
-    <string name="login_error_unable_register_mail_ownership">登録ができません : 電子メールがあなた個人のものであるか確認できません</string>
+\n全てのセッションがログアウトしたため、プッシュ通知を受け取れなくなりました。通知を再び有効にするには、各端末で再度ログインしてください。</string>
+    <string name="login_error_unable_register_mail_ownership">登録できません：メールアドレスの所有権が確認できません</string>
     <string name="login_error_unknown_token">指定されたアクセストークンが認識されませんでした</string>
     <string name="login_error_bad_json">不正な形式のJSON</string>
     <string name="login_error_not_json">有効なJSONを含んでいませんでした</string>
-    <string name="login_error_limit_exceeded">ログイン要求が多すぎてサーバが対応できません</string>
-    <string name="login_error_login_email_not_yet">まだクリックされていないeメールのリンク</string>
+    <string name="login_error_limit_exceeded">ログイン要求が多すぎます</string>
+    <string name="login_error_login_email_not_yet">まだクリックされていない電子メールのリンク</string>
     <string name="compression_options">以下の容量で画像を送信</string>
-    <string name="room_info_room_topic">部屋の説明</string>
+    <string name="room_info_room_topic">ルームの説明</string>
     <string name="call_connected">通話が接続されました</string>
-    <string name="call_connecting">通話を接続中…</string>
+    <string name="call_connecting">通話を接続しています…</string>
     <string name="incoming_call">通話着信中</string>
     <string name="incoming_video_call">ビデオ通話の着信中</string>
     <string name="incoming_voice_call">音声通話の着信中</string>
-    <string name="call_in_progress">通話中…</string>
+    <string name="call_in_progress">通話しています…</string>
     <string name="call_error_ice_failed">映像の接続に失敗</string>
     <string name="call_error_camera_init_failed">カメラを開始できません</string>
     <string name="call_error_answered_elsewhere">他の端末で通話に応答しました</string>
     <string name="media_picker_both_capture_title">写真または動画の撮影</string>
     <string name="media_picker_cannot_record_video">動画を記録できません</string>
-    <string name="media_slider_saved">保存</string>
-    <string name="action_preview">試写</string>
+    <string name="media_slider_saved">保存済</string>
+    <string name="action_preview">プレビュー</string>
     <string name="action_reject">拒否</string>
     <string name="room_participants_header_admin_tools">管理者権限操作</string>
     <string name="room_participants_header_call">通話</string>
     <string name="room_participants_header_direct_chats">ダイレクトメッセージ</string>
-    <string name="room_participants_action_ban">再入室禁止</string>
-    <string name="room_participants_action_unban">再入室禁止解除</string>
-    <string name="room_participants_action_ignore">この参加者の発言を全て非表示にする</string>
-    <string name="room_participants_action_unignore">この参加者の発言を全て表示する</string>
-    <string name="room_participants_action_mention">指名して呼掛け</string>
-    <string name="room_participants_invite_search_another_user">ユーザID, 表示名, 電子メールアドレス</string>
-    <string name="room_participants_action_devices_list">接続端末一覧を表示</string>
-    <string name="room_participants_invite_prompt_msg">%sさんをこの部屋へ招待して本当によろしいですか？</string>
-    <string name="people_search_invite_by_id"><u>ユーザIDで招待</u></string>
-    <string name="people_search_invite_by_id_dialog_hint">電子メールまたはMatrixユーザID</string>
-    <string name="room_prompt_cancel">全て中止</string>
+    <string name="room_participants_action_ban">ブロック</string>
+    <string name="room_participants_action_unban">ブロックを解除</string>
+    <string name="room_participants_action_ignore">この参加者の発言を全て非表示</string>
+    <string name="room_participants_action_unignore">このメンバーの発言を全て表示</string>
+    <string name="room_participants_action_mention">メンション</string>
+    <string name="room_participants_invite_search_another_user">ユーザーID、名前、メールアドレス</string>
+    <string name="room_participants_action_devices_list">セッション一覧を表示</string>
+    <string name="room_participants_invite_prompt_msg">%sさんをこのルームに招待してよろしいですか？</string>
+    <string name="people_search_invite_by_id"><u>ユーザーIDで招待</u></string>
+    <string name="people_search_invite_by_id_dialog_hint">メールアドレスかMatrix ID</string>
+    <string name="room_prompt_cancel">全てキャンセル</string>
     <string name="ssl_logout_account">ログアウト</string>
     <string name="ssl_remain_offline">無視</string>
     <string name="room_details_people_invited_group_name">招待中</string>
     <string name="room_details_people_present_group_name">参加者</string>
-    <string name="search_members_hint">参加者を検索</string>
-    <string name="search_no_results">結果なし</string>
+    <string name="search_members_hint">ルームのメンバーを絞り込む</string>
+    <string name="search_no_results">結果がありません</string>
     <string name="tab_title_search_people">参加者</string>
     <string name="tab_title_search_files">ファイル</string>
-    <string name="tab_title_search_rooms">部屋</string>
-    <string name="directory_search_results_title">部屋一覧を見る</string>
-    <string name="room_settings_leave_conversation">退室</string>
-    <string name="room_sliding_menu_messages">会話</string>
+    <string name="tab_title_search_rooms">ルーム</string>
+    <string name="directory_search_results_title">ディレクトリを見る</string>
+    <string name="room_settings_leave_conversation">会話から退出</string>
+    <string name="room_sliding_menu_messages">メッセージ</string>
     <string name="room_sliding_menu_settings">設定</string>
-    <string name="room_sliding_menu_version">Version</string>
+    <string name="room_sliding_menu_version">バージョン</string>
     <string name="room_sliding_menu_term_and_conditions">利用規約</string>
     <string name="room_sliding_menu_copyright">著作権</string>
     <string name="room_sliding_menu_privacy_policy">個人情報保護方針</string>
-    <string name="settings_turn_screen_on">3秒間画面を表示する</string>
+    <string name="settings_turn_screen_on">3秒間画面を表示</string>
     <string name="settings_app_term_conditions">利用規約</string>
     <string name="settings_copyright">著作権</string>
     <string name="settings_privacy_policy">個人情報保護方針</string>
     <string name="devices_delete_pswd">パスワード:</string>
-    <string name="settings_home_server">ホームサーバ</string>
-    <string name="settings_identity_server">認証サーバー</string>
+    <string name="settings_home_server">ホームサーバー</string>
+    <string name="settings_identity_server">IDサーバー</string>
     <string name="account_email_not_found_error">メールアドレスが見つかりません。</string>
     <string name="account_phone_number_already_used_error">この電話番号は既に使用されています。</string>
-    <string name="settings_change_password">パスワード変更</string>
+    <string name="settings_change_password">パスワードを変更</string>
     <string name="settings_old_password">現在のパスワード</string>
     <string name="settings_new_password">新しいパスワード</string>
     <string name="settings_confirm_password">新しいパスワードの確認</string>
     <string name="settings_fail_to_update_password">パスワードの更新に失敗しました</string>
-    <string name="settings_unignore_user">%sのすべてのメッセージを表示しますか？
+    <string name="settings_unignore_user">%sの全てのメッセージを表示しますか？
 \n
-\nこの操作はアプリを再起動するため時間がかかる場合があります。</string>
+\nこの操作はアプリを再起動するため、時間がかかる場合があります。</string>
     <string name="settings_phone_number_verification_error">電話番号の認証時にエラーが発生しました</string>
-    <string name="room_settings_room_access_warning">この部屋へのリンクを作成するには、部屋の住所表記が必要です。</string>
-    <string name="room_settings_addresses_e2e_enabled">この部屋は暗号化されています。</string>
-    <string name="room_settings_addresses_e2e_disabled">この部屋は暗号化されていません。</string>
-    <string name="room_settings_addresses_e2e_encryption_warning">暗号化を有効にします
+    <string name="room_settings_room_access_warning">このルームへのリンクを作成するには、アドレスが必要です。</string>
+    <string name="room_settings_addresses_e2e_enabled">このルームは暗号化されています。</string>
+    <string name="room_settings_addresses_e2e_disabled">このルームは暗号化されていません。</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">暗号化を有効にする
 \n（警告: 有効後にこれを無効にすることはできません！)</string>
-    <string name="directory_title">部屋一覧</string>
+    <string name="directory_title">ディレクトリ</string>
     <string name="settings_theme">外観</string>
     <string name="encryption_information_title">エンドツーエンド暗号化についての情報</string>
     <string name="encryption_information_device_name">公開端末名</string>
-    <string name="encryption_export_e2e_room_keys">部屋のEnd-to-end暗号鍵を出力</string>
-    <string name="encryption_information_verified">認証</string>
+    <string name="encryption_export_e2e_room_keys">ルームのエンドツーエンド暗号鍵をエクスポート</string>
+    <string name="encryption_information_verified">認証済</string>
     <string name="historical_placeholder">履歴を検索</string>
-    <string name="widget_integration_must_be_in_room">あなたはこの部屋に参加していません。</string>
-    <string name="widget_integration_no_permission_in_room">あなたはこの部屋で権限がありません。</string>
-    <string name="widget_integration_room_not_visible">部屋 %s は、見ることができません。</string>
-    <string name="username">ユーザ名</string>
-    <string name="hs_url">ホームサーバ URL</string>
-    <string name="identity_url">認証サーバ ーURL</string>
+    <string name="widget_integration_must_be_in_room">このルームに参加していません。</string>
+    <string name="widget_integration_no_permission_in_room">このルームで権限がありません。</string>
+    <string name="widget_integration_room_not_visible">ルーム %s は閲覧できません。</string>
+    <string name="username">ユーザー名</string>
+    <string name="hs_url">ホームサーバーのURL</string>
+    <string name="identity_url">IDサーバーのURL</string>
     <string name="auth_login">ログイン</string>
     <string name="room_add_matrix_apps">Matrixアプリを追加</string>
     <string name="widget_integration_positive_power_level">権限の数値は正の整数で入力してください。</string>
@@ -499,227 +499,225 @@
     <string name="matrix_only_filter">Matrixの連絡先のみ</string>
     <string name="call_error_user_not_responding">通信先が通話の受取に失敗しました。</string>
     <string name="permissions_rationale_popup_title">情報</string>
-    <string name="template_permissions_rationale_msg_storage">${app_name}は添付ファイルを送信および保存するために写真とビデオライブラリにアクセスするための許可が必要です。
+    <string name="template_permissions_rationale_msg_storage">${app_name}は、添付ファイルを送信および保存するために、写真とビデオライブラリにアクセスするための許可を必要としています。
 \n
-\nあなたの端末からファイルを送信できるようにするには、次のポップアップでアクセスを許可してください。</string>
+\n端末からファイルを送信できるようにするには、次のポップアップでアクセスを許可してください。</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
-\n通話をするには、次のポップアップでアクセスできるように設定してください。"</string>
-    <string name="template_permissions_rationale_msg_record_audio">${app_name}アプリは、音声通話を実行するためにマイクへアクセスするための許可が必要です。</string>
+\n通話をするためには、次のポップアップでアクセスを許可してください。"</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name}は、音声通話を実行するためにマイクへアクセスするための許可を必要としています。</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \n通話をするためには、次のポップアップでアクセスを許可してください。"</string>
     <string name="template_permissions_rationale_msg_camera_and_audio">${app_name}はビデオ通話を行うためにカメラとマイクにアクセスする許可を必要としています。
 \n
-\n次のポップアップでアクセスを許可して通話ができるようにしてください。</string>
-    <string name="template_permissions_rationale_msg_contacts">Matrixユーザが電子メールアドレスや電話番号を元に他のユーザを検索するためには、${app_name}アプリがあなたの端末内電話帳へアクセスする許可が必要です。
-
-${app_name}からあなた個人の電話帳への検索要求を許可する場合は、次のポップアップでアクセスを許可してください。</string>
-    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name}はあなたの連絡先のメールアドレスや電話番号をもとに他のユーザーを見つけることができます。
+\n通話をするためには、次のポップアップでアクセスを許可してください。</string>
+    <string name="template_permissions_rationale_msg_contacts">${app_name}では、あなたの端末の電話帳のメールアドレスや電話番号をもとに、他のユーザーを検索することができます。${app_name}による電話帳の検索を許可する場合は、次のポップアップでアクセスを許可してください。</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name}はあなたの電話帳のメールアドレスや電話番号をもとに他のユーザーを見つけることができます。
 \n
-\nこのアプリがあなたの連絡先へアクセスすることを許可しますか？</string>
+\nこのアプリがあなたの電話帳へアクセスすることを許可しますか？</string>
     <string name="permissions_action_not_performed_missing_permissions">申し訳ありません。権限がないために操作が実行されませんでした</string>
-    <string name="report_content">発言を通報する</string>
+    <string name="report_content">発言を通報</string>
     <string name="read_receipt">既読</string>
     <string name="option_take_photo">写真を撮影</string>
     <string name="option_take_video">動画を撮影</string>
-    <string name="ignore_request">要求を無視する</string>
-    <string name="share_without_verifying">検証せずに共有する</string>
-    <string name="start_verification">検証を開始する</string>
-    <string name="widget_integration_missing_user_id">リクエストに user_id がありません。</string>
-    <string name="widget_integration_missing_room_id">リクエストに room_id がありません。</string>
+    <string name="ignore_request">要求を無視</string>
+    <string name="share_without_verifying">検証せずに共有</string>
+    <string name="start_verification">検証を開始</string>
+    <string name="widget_integration_missing_user_id">リクエストにuser_idがありません。</string>
+    <string name="widget_integration_missing_room_id">リクエストにroom_idがありません。</string>
     <string name="widget_integration_failed_to_send_request">リクエストの送信に失敗しました。</string>
     <string name="widget_integration_unable_to_create">ウィジェットを作成できません。</string>
-    <string name="widget_no_power_to_manage">この部屋のウィジェットを管理する権限が必要です</string>
+    <string name="widget_no_power_to_manage">このルームのウィジェットを管理する権限が必要です</string>
     <string name="widget_creation_failure">ウィジェットの作成に失敗しました</string>
-    <string name="widget_delete_message_confirmation">ウィジェットをこの部屋から削除してもよろしいですか？</string>
+    <string name="widget_delete_message_confirmation">ウィジェットをこのルームから削除してもよろしいですか？</string>
     <string name="directory_server_fail_to_retrieve_server">サーバーが利用できないか、オーバーロードしている可能性があります</string>
-    <string name="unknown_devices_alert_message">このルームは検証されていない不明なセッションが含まれています。
-\nこれは、そのセッションが主張するユーザーのものであるという保証がないことを意味します。
-\n続行する前に、各セッションの検証プロセスを進めることをおすすめしますが、検証せずにメッセージを再送信することもできます。
+    <string name="unknown_devices_alert_message">このルームに、検証されていない不明なセッションがあります。
+\nそのセッションが、主張するユーザーのものであるという保証はありません。
+\n続行する前に、各セッションの検証プロセスを進めることを推奨しますが、検証せずにメッセージを再送信することもできます。
 \n
 \n不明なセッション:</string>
-    <string name="unknown_devices_alert_title">部屋に不明なデバイスが含まれています</string>
-    <string name="encryption_information_verify_key_match">キーが一致していることを確認</string>
-    <string name="encryption_information_verify_device_warning2">一致する場合は、下の確認ボタンを押します。そうでない場合は、他の誰かがこのデバイスを盗聴しているので、代わりにブロックボタンを押すことをおすすめします。将来この検証プロセスはより洗練されたものになるでしょう。</string>
-    <string name="encryption_information_verify_device">デバイスの検証</string>
-    <string name="encryption_information_unknown_device">不明なデバイス</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">このデバイスから未認証のデバイスに暗号化されたメッセージを送信しない。</string>
-    <string name="encryption_never_send_to_unverified_devices_title">認証済みデバイスに対してのみ暗号化</string>
+    <string name="unknown_devices_alert_title">ルームに不明なセッションがあります</string>
+    <string name="encryption_information_verify_key_match">鍵が一致していることを確認</string>
+    <string name="encryption_information_verify_device_warning2">一致していない場合は、あなたのコミュニケーションの安全性が損なわれている可能性があります。</string>
+    <string name="encryption_information_verify_device">セッションを認証</string>
+    <string name="encryption_information_unknown_device">不明なセッション</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">このセッションでは、未検証のセッションに対して暗号化されたメッセージを送信しない。</string>
+    <string name="encryption_never_send_to_unverified_devices_title">認証済のセッションに対してのみ暗号化</string>
     <string name="encryption_import_import">インポート</string>
-    <string name="encryption_import_room_keys_summary">ローカルファイルからキーをインポート</string>
-    <string name="encryption_import_room_keys">ルームキーをインポート</string>
-    <string name="encryption_import_e2e_room_keys">部屋のエンドツーエンド暗号鍵をインポート</string>
+    <string name="encryption_import_room_keys_summary">ローカルファイルから鍵をインポート</string>
+    <string name="encryption_import_room_keys">ルームの暗号鍵をインポート</string>
+    <string name="encryption_import_e2e_room_keys">ルームのエンドツーエンド暗号鍵をインポート</string>
     <string name="passphrase_confirm_passphrase">パスフレーズを確認</string>
     <string name="passphrase_enter_passphrase">パスフレーズを入力</string>
     <string name="encryption_export_export">エクスポート</string>
-    <string name="encryption_export_room_keys_summary">暗号鍵をローカルファイルにエクスポートする</string>
-    <string name="encryption_export_room_keys">部屋の暗号鍵をエクスポート</string>
+    <string name="encryption_export_room_keys_summary">鍵をローカルファイルにエクスポート</string>
+    <string name="encryption_export_room_keys">ルームの暗号鍵をエクスポート</string>
     <string name="encryption_information_verification">検証</string>
     <string name="call">通話</string>
-    <string name="notification_noisy_notifications">通知あり(音量大)</string>
-    <string name="notification_silent_notifications">通知あり(音量小)</string>
-    <string name="title_activity_bug_report">不具合報告</string>
+    <string name="notification_noisy_notifications">通知あり（音量大）</string>
+    <string name="notification_silent_notifications">通知あり（サイレント）</string>
+    <string name="title_activity_bug_report">不具合の報告</string>
     <string name="read_receipts_list">開封確認メッセージのリスト</string>
-    <string name="media_slider_saved_message">ダウンロードファイルに保存しますか？</string>
-    <string name="room_preview_unlinked_email_warning">この招待はこのアカウントに関連付けられていない %s に送信されました。
+    <string name="media_slider_saved_message">ダウンロードフォルダーに保存しますか？</string>
+    <string name="room_preview_unlinked_email_warning">この招待は、このアカウントに登録されていない%sに送信されました。
 \n別のアカウントでログインするか、このメールを自分のアカウントに追加してください。</string>
-    <string name="room_preview_try_join_an_unknown_room">あなたは%sにアクセスしようとしています。話し合いに参加しますか？</string>
-    <string name="room_preview_try_join_an_unknown_room_default">部屋</string>
-    <string name="room_preview_room_interactions_disabled">これは部屋のプレビューです。部屋でのやりとりはできません。</string>
-    <string name="room_participants_power_level_prompt">このユーザーにあなたと同じ権限を与えますが、この変更は取り消せません。
-\n本当によろしいですか？</string>
+    <string name="room_preview_try_join_an_unknown_room">%sにアクセスしようとしています。ディスカッションに参加しますか？</string>
+    <string name="room_preview_try_join_an_unknown_room_default">ルーム</string>
+    <string name="room_preview_room_interactions_disabled">これはルームのプレビューです。ルームでのやり取りは無効化されています。</string>
+    <string name="room_participants_power_level_prompt">このユーザーにあなたと同じ権限を与えます。この変更は取り消せません。
+\nよろしいですか？</string>
     <string name="people_search_local_contacts">端末の連絡先 (%d)</string>
-    <string name="people_search_user_directory">ユーザディレクトリ (%s)</string>
-    <string name="people_search_filter_text">Matrixユーザのみ</string>
-    <string name="people_search_invite_by_id_dialog_title">ユーザIDで招待する</string>
-    <string name="people_search_invite_by_id_dialog_description">１つまたは複数のメールアドレスか、Matrix IDを入力してください</string>
+    <string name="people_search_user_directory">ユーザーディレクトリ (%s)</string>
+    <string name="people_search_filter_text">Matrixのユーザーのみ</string>
+    <string name="people_search_invite_by_id_dialog_title">ユーザーIDで招待</string>
+    <string name="people_search_invite_by_id_dialog_description">メールアドレスかMatrix IDを入力してください</string>
     <string name="ssl_trust">信用する</string>
     <string name="ssl_do_not_trust">信用しない</string>
-    <string name="ssl_fingerprint_hash">フィンガープリント (%s):</string>
-    <string name="ssl_could_not_verify">リモートサーバのアイデンティティを確認できませんでした。</string>
-    <string name="ssl_cert_not_trust">誰かが不当にあなたの通信を傍受しているか、リモートサーバの証明書をあなたの電話が信用していない可能性があります。</string>
-    <string name="ssl_cert_new_account_expl">サーバの管理者が、これは想定されていることであると言っているのであれば、以下のフィンガープリントが管理者によるフィンガープリントと一致していることを確認してください。</string>
-    <string name="ssl_unexpected_existing_expl">証明書はあなたの電話に信頼されていたものから変更されています。これはきわめて異常な事態です。この新しい証明書は承認しないことを強く推奨します。</string>
-    <string name="ssl_expected_existing_expl">証明書は以前信頼されていたものから信頼されていないものへと変更されています。サーバがその証明書を更新した可能性があります。予測されるフィンガープリントを取得するために、サーバの管理者に連絡してください。</string>
-    <string name="ssl_only_accept">サーバの管理者が上のフィンガープリントと一致するものを発行した場合に限り、証明書を承認してください。</string>
-    <string name="malformed_id">不正な形式のIDです。メールアドレスまたは\'@localpart:domain\'のようなMatrix IDを入力してください</string>
+    <string name="ssl_fingerprint_hash">フィンガープリント（%s）：</string>
+    <string name="ssl_could_not_verify">リモートサーバーのIDを確認できませんでした。</string>
+    <string name="ssl_cert_not_trust">誰かが不当にあなたの通信を傍受しているか、あなたの電話がリモートサーバーの証明書を信用していない可能性があります。</string>
+    <string name="ssl_cert_new_account_expl">サーバーの管理者が、これは想定されていることであると言っているのであれば、以下のフィンガープリントが、管理者によるフィンガープリントと一致していることを確認してください。</string>
+    <string name="ssl_unexpected_existing_expl">証明書はあなたの電話により信頼されていたものから変更されています。これはきわめて異常な事態です。この新しい証明書を承認しないことを強く推奨します。</string>
+    <string name="ssl_expected_existing_expl">証明書は以前信頼されていたものから信頼されていないものへと変更されています。サーバーがその証明書を更新した可能性があります。サーバーの管理者に連絡して、適切なフィンガープリントを確認してください。</string>
+    <string name="ssl_only_accept">サーバーの管理者が上のフィンガープリントと一致するものを発行した場合に限り、証明書を承認してください。</string>
+    <string name="malformed_id">不正な形式のIDです。メールアドレスまたは\'@localpart:domain\'という形式のMatrix IDを入力してください</string>
     <string name="room_event_action_report_prompt_reason">このコンテンツを報告する理由</string>
-    <string name="room_event_action_report_prompt_ignore_user">このユーザによるすべてのメッセージを非表示にしますか？
+    <string name="room_event_action_report_prompt_ignore_user">このユーザーによる全てのメッセージを非表示にしますか？
 \n
-\nこの操作はアプリを再起動するため時間がかかる場合があります。</string>
-    <string name="room_event_action_cancel_upload">アップロードをキャンセルする</string>
-    <string name="room_event_action_cancel_download">ダウンロードをキャンセルする</string>
+\nこの操作はアプリを再起動するため、時間がかかる場合があります。</string>
+    <string name="room_event_action_cancel_upload">アップロードをキャンセル</string>
+    <string name="room_event_action_cancel_download">ダウンロードをキャンセル</string>
     <string name="search_hint">検索</string>
     <string name="tab_title_search_messages">メッセージ</string>
-    <string name="directory_searching_title">ディレクトリを検索中…</string>
-    <string name="room_sliding_menu_third_party_notices">サードパーティの通知</string>
-    <string name="settings_app_info_link_summary">このアプリのシステムの情報を見る。</string>
+    <string name="directory_searching_title">ディレクトリを検索しています…</string>
+    <string name="room_sliding_menu_third_party_notices">サードパーティーの使用に関する掲示</string>
+    <string name="settings_app_info_link_summary">このアプリの情報をシステム設定で表示。</string>
     <string name="settings_app_info_link_title">アプリの情報</string>
     <string name="settings_containing_my_display_name">自分の表示名を含むメッセージ</string>
-    <string name="settings_containing_my_user_name">自分のユーザネームを含むメッセージ</string>
+    <string name="settings_containing_my_user_name">自分のユーザー名を含むメッセージ</string>
     <string name="settings_version">バージョン</string>
     <string name="settings_olm_version">olmのバージョン</string>
-    <string name="settings_third_party_notices">サードパーティの通知</string>
+    <string name="settings_third_party_notices">サードパーティーの使用に関する掲示</string>
     <string name="settings_home_display">ホーム画面</string>
-    <string name="settings_pin_missed_notifications">逃した通知がある部屋を固定する</string>
-    <string name="settings_pin_unread_messages">未読のメッセージがある部屋を固定する</string>
+    <string name="settings_pin_missed_notifications">逃した通知があるルームを固定</string>
+    <string name="settings_pin_unread_messages">未読のあるルームを固定</string>
     <string name="settings_analytics">分析</string>
     <string name="settings_data_save_mode">データ節約モード</string>
-    <string name="account_email_validation_error">メールアドレスを認証できません。メールを確認して、そこに記載してあるリンクをクリックしてください。その後、「続ける」をクリックしてください。</string>
+    <string name="account_email_validation_error">メールアドレスを認証できません。メールを確認して、記載されているリンクをクリックしてください。その後、「続行する」をクリックしてください。</string>
     <string name="settings_delete_notification_targets_confirmation">この通知の対象を削除してよろしいですか？</string>
     <string name="settings_delete_threepid_confirmation">%1$s %2$sを削除してよろしいですか？</string>
     <string name="settings_phone_number_code">コード</string>
-    <string name="failed_to_load_timeline_position">%s はこの部屋のタイムラインのある箇所を読み込もうとしましたが、見つかりませんでした。</string>
+    <string name="failed_to_load_timeline_position">%sはこのルームのタイムライン上の特定の箇所を読み込もうとしましたが、見つかりませんでした。</string>
     <string name="encryption_information_device_info">イベント情報</string>
-    <string name="encryption_information_user_id">ユーザID</string>
+    <string name="encryption_information_user_id">ユーザーID</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519 固有鍵</string>
     <string name="encryption_information_algorithm">アルゴリズム</string>
     <string name="encryption_information_session_id">セッションID</string>
     <string name="encryption_information_decryption_error">復号エラー</string>
-    <string name="encryption_information_sender_device_information">発信者装置の情報</string>
+    <string name="encryption_information_sender_device_information">発信者のセッションの情報</string>
     <string name="encryption_information_name">公開端末名</string>
-    <string name="encryption_information_device_key">デバイスキー</string>
+    <string name="encryption_information_device_key">セッションキー</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 フィンガープリント</string>
     <string name="encryption_information_not_verified">未認証</string>
     <string name="encryption_information_blocked">ブラックリスト</string>
     <string name="encryption_information_none">なし</string>
     <string name="encryption_information_verify">認証する</string>
     <string name="encryption_information_unverify">認証を取り消す</string>
-    <string name="encryption_information_block">ブラックリスト</string>
-    <string name="encryption_information_unblock">ブラックリストから除外する</string>
-    <string name="encryption_information_verify_device_warning">このデバイスが信頼できることを確認するために、その所有者に何らかの他の方法（直接会って、または、電話で）連絡し、以下のキーが、そのデバイスの「設定」で確認できるキーと一致するかお尋ねください:</string>
-    <string name="select_room_directory">部屋のディレクトリを選択</string>
-    <string name="directory_server_type_homeserver">公開の部屋を表示するホームサーバを入力してください</string>
+    <string name="encryption_information_block">ブラックリストに追加</string>
+    <string name="encryption_information_unblock">ブラックリストから除外</string>
+    <string name="encryption_information_verify_device_warning">他のセッションのユーザー設定で、以下を比較して確認してください：</string>
+    <string name="select_room_directory">ルームのディレクトリを選択</string>
+    <string name="directory_server_type_homeserver">公開のルームを表示するホームサーバーを入力してください</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="room_unsent_messages_notification">メッセージが未送信です。今 %1$s または %2$s しますか？</string>
-    <string name="room_unknown_devices_messages_notification">不明なデバイスが存在しているため、メッセージを送ることができませんでした。今 %1$s または %2$s しますか？</string>
+    <string name="directory_server_all_rooms_on_server">%sサーバー上の全てのルーム</string>
+    <string name="directory_server_native_rooms">全てのローカルの%sルーム</string>
+    <string name="room_unsent_messages_notification">メッセージが未送信です。今%1$sまたは%2$sしますか？</string>
+    <string name="room_unknown_devices_messages_notification">不明なセッションが存在しているため、メッセージを送ることができませんでした。今%1$sまたは%2$sしますか？</string>
     <string name="encryption_information_claimed_ed25519_fingerprint_key">要求されたフィンガープリントキー Ed25519</string>
-    <string name="settings_labs_create_conference_with_jitsi">jitsiを用いて会議通話を始める</string>
-    <string name="settings_labs_native_camera">端末のカメラを使う</string>
+    <string name="settings_labs_create_conference_with_jitsi">Jitsiを用いて会議通話を始める</string>
+    <string name="settings_labs_native_camera">端末のカメラを使用</string>
     <string name="conference_call_warning_title">警告！</string>
-    <string name="conference_call_warning_message">ビデオ会議は開発中であり、確実でない可能性があります。</string>
+    <string name="conference_call_warning_message">ビデオ会議は開発中であり、安定して動作しない可能性があります。</string>
     <string name="command_error">コマンドエラー</string>
-    <string name="unrecognized_command">認識されないコマンド: %s</string>
+    <string name="unrecognized_command">認識されないコマンド：%s</string>
     <string name="notification_off">切</string>
     <string name="notification_noisy">音量大</string>
     <string name="encrypted_message">暗号化されたメッセージ</string>
     <string name="action_exit">退出</string>
-    <string name="title_activity_group_details">コミュニティの詳細</string>
-    <string name="loading">読み込み中…</string>
-    <string name="bottom_action_groups">コミュニティ</string>
-    <string name="home_filter_placeholder_groups">コミュニティで絞り込み</string>
+    <string name="title_activity_group_details">コミュニティーの詳細</string>
+    <string name="loading">読み込んでいます…</string>
+    <string name="bottom_action_groups">コミュニティー</string>
+    <string name="home_filter_placeholder_groups">コミュニティー名で絞り込む</string>
     <string name="groups_invite_header">招待</string>
-    <string name="groups_header">コミュニティ</string>
+    <string name="groups_header">コミュニティー</string>
     <string name="no_group_placeholder">グループがありません</string>
-    <string name="start_new_chat_prompt_msg">%sと新しい会話を開始して本当によろしいですか？</string>
-    <string name="start_voice_call_prompt_msg">音声通話を開始して本当によろしいですか？</string>
-    <string name="start_video_call_prompt_msg">本当にビデオ通話を開始しますか？</string>
+    <string name="start_new_chat_prompt_msg">%sと新しい会話を開始してよろしいですか？</string>
+    <string name="start_voice_call_prompt_msg">音声通話を開始してよろしいですか？</string>
+    <string name="start_video_call_prompt_msg">ビデオ通話を開始してよろしいですか？</string>
     <string name="groups_list">グループリスト</string>
-    <string name="room_participants_ban_prompt_msg">ユーザーを禁止するとこの部屋から追い出され、二度と参加できなくなります。</string>
-    <string name="room_settings_all_messages_noisy">すべてのメッセージ (大音量)</string>
-    <string name="room_settings_all_messages">すべてのメッセージ</string>
+    <string name="room_participants_ban_prompt_msg">ユーザーをブロックすると、ユーザーはこのルームから追放され、二度と参加できなくなります。</string>
+    <string name="room_settings_all_messages_noisy">全てのメッセージ（音量大）</string>
+    <string name="room_settings_all_messages">全てのメッセージ</string>
     <string name="room_settings_mute">ミュート</string>
     <string name="room_settings_add_homescreen_shortcut">ホーム画面にショートカットを作成</string>
     <string name="settings_inline_url_preview">インラインURLプレビュー</string>
     <string name="room_settings_room_notifications_title">通知</string>
-    <string name="room_settings_no_flair">この部屋はコミュニティの特色を表示していません</string>
-    <string name="settings_flair">所属するコミュニティ</string>
-    <string name="room_settings_add_new_group">新しいコミュニティID (記入例 +foo:matrix.org)</string>
-    <string name="room_settings_invalid_group_format_dialog_title">無効なコミュニティID</string>
-    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' は有効なコミュニティIDではありません</string>
+    <string name="room_settings_no_flair">このルームはコミュニティーのアバターを表示していません</string>
+    <string name="settings_flair">コミュニティーのアバター</string>
+    <string name="room_settings_add_new_group">新しいコミュニティーID（記入例 +foo:matrix.org）</string>
+    <string name="room_settings_invalid_group_format_dialog_title">無効なコミュニティーID</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' は有効なコミュニティーIDではありません</string>
     <string name="encryption_export_saved_as">ルームのエンドツーエンド暗号鍵は \'%s\' に保存されました。
 \n 
 \n警告: このファイルは、アプリケーションをアンインストールすると削除されることがあります。</string>
-    <string name="you_added_a_new_device">暗号鍵を要求している新しい端末 \'%s\' を追加しました。</string>
-    <string name="your_unverified_device_requesting">未認証の端末 \'%s\' が暗号鍵を要求しています。</string>
+    <string name="you_added_a_new_device">暗号鍵を要求している新しいセッション \'%s\' を追加しました。</string>
+    <string name="your_unverified_device_requesting">未認証のセッション \'%s\' が暗号鍵を要求しています。</string>
     <string name="create">作成</string>
-    <string name="create_community">コミュニティを作成</string>
-    <string name="community_name">コミュニティの名前</string>
+    <string name="create_community">コミュニティーを作成</string>
+    <string name="community_name">コミュニティーの名前</string>
     <string name="community_name_hint">例</string>
-    <string name="community_id">コミュニティID</string>
+    <string name="community_id">コミュニティーID</string>
     <string name="community_id_hint">例</string>
     <string name="group_details_home">ホーム</string>
     <string name="group_details_people">参加者</string>
-    <string name="group_details_rooms">部屋</string>
-    <string name="no_users_placeholder">ユーザがいません</string>
-    <string name="rooms">部屋</string>
+    <string name="group_details_rooms">ルーム</string>
+    <string name="no_users_placeholder">ユーザーがいません</string>
+    <string name="rooms">ルーム</string>
     <string name="joined">参加済</string>
     <string name="invited">招待済</string>
-    <string name="filter_group_members">グループのメンバーをフィルタリングする</string>
-    <string name="filter_group_rooms">グループの部屋を絞り込み</string>
-    <string name="group_no_long_description">管理者はこのコミュニティの詳細を規定していません。</string>
-    <string name="has_been_removed">あなたは%2$sによって%1$sから除外されました</string>
-    <string name="has_been_banned">あなたは%2$sによって%1$sへの参加を禁止されました</string>
-    <string name="reason_colon">理由: %1$s</string>
+    <string name="filter_group_members">グループのメンバーを絞り込む</string>
+    <string name="filter_group_rooms">グループのルームを絞り込む</string>
+    <string name="group_no_long_description">管理者はこのコミュニティーの詳細を規定していません。</string>
+    <string name="has_been_removed">%2$sによって%1$sから追放されました</string>
+    <string name="has_been_banned">%2$sによって%1$sからブロックされました</string>
+    <string name="reason_colon">理由：%1$s</string>
     <string name="rejoin">再参加</string>
-    <string name="send_bug_report_rage_shake">バグを報告するには端末を降ってください</string>
+    <string name="send_bug_report_rage_shake">端末を振って不具合を報告</string>
     <plurals name="membership_changes">
-        <item quantity="other">%dメンバーシップの変更</item>
+        <item quantity="other">%d個のメンバーシップの変更</item>
     </plurals>
-    <string name="list_members">参加者を表示</string>
+    <string name="list_members">メンバーを表示</string>
     <string name="open_chat_header">見出しを開く</string>
-    <string name="room_sync_in_progress">同期中…</string>
+    <string name="room_sync_in_progress">同期しています…</string>
     <plurals name="room_header_active_members_count">
-        <item quantity="other">%d名の参加者</item>
+        <item quantity="other">%d名のアクティブなメンバー</item>
     </plurals>
     <plurals name="room_title_members">
-        <item quantity="other">%d名</item>
+        <item quantity="other">%d名のメンバー</item>
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="other">%d件の新しいメッセージ</item>
     </plurals>
     <plurals name="directory_search_rooms">
-        <item quantity="other">%d部屋</item>
+        <item quantity="other">%d個のルーム</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
-        <item quantity="other">%2$s に %1$s 部屋見つかりました</item>
+        <item quantity="other">%2$sに%1$s個のルームが見つかりました</item>
     </plurals>
-    <string name="forget_room">部屋の履歴を消す</string>
+    <string name="forget_room">ルームの履歴を消去</string>
     <string name="avatar">アバター</string>
-    <string name="room_settings_mention_only">名前があがったときのみ</string>
+    <string name="room_settings_mention_only">メンションのみ</string>
     <string name="settings_notification_privacy">通知のプライバシー</string>
     <string name="settings_notification_privacy_normal">標準</string>
     <string name="settings_notification_privacy_need_permission">このアプリはバックグラウンド動作の権限が必要です</string>
@@ -733,18 +731,18 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="missing_permissions_error">許可がないため、この操作を実行できません。</string>
     <string name="actions">実行</string>
     <string name="system_alerts_header">システムアラート</string>
-    <string name="send_bug_report_description_in_english">可能であれば、英語で説明を書いてください。</string>
+    <string name="send_bug_report_description_in_english">可能であれば、英語で説明文を記述してください。</string>
     <string name="option_send_voice">音声を送信</string>
     <string name="option_send_sticker">スタンプを送信</string>
-    <string name="no_sticker_application_dialog_content">使用可能なスタンプパックがありません。 
+    <string name="no_sticker_application_dialog_content">現在、有効なステッカーパックがありません。
 \n
-\n追加しますか？</string>
+\nいくつか追加しますか？</string>
     <string name="go_on_with">続行する…</string>
     <string name="error_no_external_application_found">申し訳ありません、この操作を完了するための外部アプリが見つかりません。</string>
-    <string name="e2e_re_request_encryption_key">他のデバイスから <u>暗号鍵を再度要求</u> します。</string>
+    <string name="e2e_re_request_encryption_key">あなたの他のセッションに暗号鍵を再要求する。</string>
     <string name="e2e_re_request_encryption_key_sent">鍵のリクエストが送信されました。</string>
-    <string name="e2e_re_request_encryption_key_dialog_title">リクエスト送信済</string>
-    <string name="template_e2e_re_request_encryption_key_dialog_content">鍵をこのデバイスに送信できるように、メッセージを復号化できる他のデバイスで${app_name}を起動してください。</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">要求が送信されました</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">鍵をこのセッションに送信できるように、メッセージを復号化できる他の端末で${app_name}を起動してください。</string>
     <plurals name="format_time_s">
         <item quantity="other">%d秒</item>
     </plurals>
@@ -757,32 +755,32 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <plurals name="format_time_d">
         <item quantity="other">%d日</item>
     </plurals>
-    <string name="room_participants_now">現在 %1$s</string>
-    <string name="room_participants_ago">%2$s 前 %1$s</string>
+    <string name="room_participants_now">現在%1$s</string>
+    <string name="room_participants_ago">%2$sより%1$s</string>
     <string name="room_participants_invite_join_names">"%1$s、 "</string>
-    <string name="room_participants_invite_join_names_and">%1$s と %2$s</string>
+    <string name="room_participants_invite_join_names_and">%1$sと%2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-    <string name="room_message_placeholder_reply_to_encrypted">暗号化された返信を送信…</string>
-    <string name="room_message_placeholder_reply_to_not_encrypted">返信を送信 (未暗号化)…</string>
+    <string name="room_message_placeholder_reply_to_encrypted">暗号化された返信を送る…</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">返信を送る（暗号化されていません）…</string>
     <plurals name="room_details_selected">
         <item quantity="other">%d個選択済</item>
     </plurals>
     <string name="settings_notification_privacy_reduced">低プライバシー</string>
-    <string name="settings_notification_privacy_secure_message_content">• 通知中のメッセージの内容は <b>Matrixのホームサーバから直接安全に入手しています</b></string>
-    <string name="settings_notification_privacy_nosecure_message_content">・通知は <b>メタデータとメッセージのデータ</b> を含みます</string>
-    <string name="settings_notification_privacy_message_content_not_shown">• 通知は <b>メッセージの内容を表示しません</b></string>
-    <string name="settings_vibrate_on_mention">ユーザの名前をあげるときバイブレーションで通知</string>
+    <string name="settings_notification_privacy_secure_message_content">• 通知中のメッセージの内容は<b>Matrixのホームサーバーから直接安全に入手しています</b></string>
+    <string name="settings_notification_privacy_nosecure_message_content">・通知は<b>メタデータとメッセージのデータ</b>を含みます</string>
+    <string name="settings_notification_privacy_message_content_not_shown">• 通知は<b>メッセージの内容を表示しません</b></string>
+    <string name="settings_vibrate_on_mention">ユーザーをメンションするとき、バイブレーションで通知</string>
     <string name="settings_preview_media_before_sending">送信の前にメディアをプレビュー</string>
     <string name="settings_deactivate_account_section">アカウントを停止</string>
     <string name="settings_deactivate_my_account">自分のアカウントを停止</string>
     <string name="startup_notification_privacy_title">通知のプライバシー</string>
-    <string name="template_startup_notification_privacy_message">${app_name}は通知を安全で内密に扱うため、バックグラウンドで動作できます。これによりバッテリー使用に影響が出ることがあります。</string>
+    <string name="template_startup_notification_privacy_message">${app_name}はバックグラウンドで動作し、通知を安全で内密に扱います。これによりバッテリー使用に影響が出ることがあります。</string>
     <string name="startup_notification_privacy_button_grant">許可を与える</string>
     <string name="startup_notification_privacy_button_other">他のオプションを選択</string>
-    <string name="settings_opt_in_of_analytics">解析データを送信</string>
-    <string name="template_settings_opt_in_of_analytics_summary">${app_name}はアプリを改善するため、匿名の解析データを収集します。</string>
-    <string name="template_settings_opt_in_of_analytics_prompt">${app_name}を改善するのを助けるため、解析を許可してください。</string>
-    <string name="settings_opt_in_of_analytics_ok">はい、助けたいです！</string>
+    <string name="settings_opt_in_of_analytics">分析データを送信</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name}はアプリを改善するため、匿名の分析データを収集します。</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">分析を有効にして、${app_name}の改善を手伝ってくれませんか？</string>
+    <string name="settings_opt_in_of_analytics_ok">はい、手伝いたいです！</string>
     <string name="settings_without_flair">あなたは現在どのコミュニティーのメンバーでもありません。</string>
     <string name="lock_screen_hint">ここに入力…</string>
     <plurals name="notification_unread_notified_messages">
@@ -792,97 +790,97 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
         <item quantity="other">%d件の通知された未読メッセージ</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
-        <item quantity="other">%d部屋</item>
+        <item quantity="other">%d個のルーム</item>
     </plurals>
-    <string name="notification_unread_notified_messages_in_room">%2$s件 中 %1$s件</string>
+    <string name="notification_unread_notified_messages_in_room">%2$s件中%1$s件</string>
     <plurals name="active_widgets">
         <item quantity="other">%d個のウィジェットが使用中</item>
     </plurals>
     <string name="widget_integration_missing_parameter">必要な変数が見つかりません。</string>
     <string name="widget_integration_invalid_parameter">変数が無効です。</string>
-    <string name="settings_labs_keyboard_options_to_send_message">メッセージを送信するには、キーボードのエンターキーを使用してください</string>
-    <string name="settings_labs_enable_send_voice">ボイスメッセージを送信</string>
+    <string name="settings_labs_keyboard_options_to_send_message">メッセージを送信するには、キーボードのEnterキーを押してください</string>
+    <string name="settings_labs_enable_send_voice">音声メッセージを送信</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_deop_user">指定したIDのユーザの管理者権限を取り消す</string>
-    <string name="command_description_invite_user">指定したユーザを現在の部屋に招待</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_ban_user">指定したIDのユーザーをブロック</string>
+    <string name="command_description_unban_user">指定したIDのユーザーのブロックを解除</string>
+    <string name="command_description_op_user">ユーザーの権限レベルを規定</string>
+    <string name="command_description_deop_user">指定したIDのユーザーの管理者権限を取り消す</string>
+    <string name="command_description_invite_user">指定したユーザーを現在のルームに招待</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_nick">表示するニックネームを変更</string>
     <string name="command_description_markdown">Markdown書式の入/切</string>
     <string name="command_description_clear_scalar_token">Matrixアプリの管理を修正するには</string>
     <plurals name="group_members">
-        <item quantity="other">%d名の参加者</item>
+        <item quantity="other">%d名のメンバー</item>
     </plurals>
     <plurals name="group_rooms">
-        <item quantity="other">%d部屋</item>
+        <item quantity="other">%d個のルーム</item>
     </plurals>
-    <string name="receipt_avatar">アバターを読み込み</string>
-    <string name="dialog_user_consent_content">%1$s ホームサーバを使用し続けるには、利用規約を読み、同意する必要があります。</string>
+    <string name="receipt_avatar">開封確認用のアバター</string>
+    <string name="dialog_user_consent_content">%1$sのホームサーバーの使用を継続するには、利用規約を確認し、同意する必要があります。</string>
     <string name="dialog_title_error">エラー</string>
-    <string name="notice_avatar">アバターに通知を表示</string>
-    <string name="dialog_user_consent_submit">今すぐ見る</string>
+    <string name="notice_avatar">通知用のアバター</string>
+    <string name="dialog_user_consent_submit">今すぐ確認</string>
     <string name="deactivate_account_title">アカウントを停止</string>
-    <string name="deactivate_account_content">この操作によりあなたのアカウントは永久に使えなくなります。あなたはログインできなくなり、誰も同じユーザIDを再登録できなくなります。アカウントが参加しているすべてのルームを退出し、IDサーバからアカウントの詳細を削除することになります。 <b>この操作は取り消しできません</b> 
+    <string name="deactivate_account_content">この操作により、あなたのアカウントは永久に使えなくなります。あなたはログインできなくなり、誰も同じユーザーIDを再登録できなくなります。アカウントが参加している全てのルームを退出し、IDサーバーからアカウントの詳細は削除されます。 <b>この操作は取り消せません。</b>
 \n
-\nあなたのアカウントを停止することによって <b>デフォルトではあなたが送信したメッセージの削除はされません</b>。メッセージを削除を望む場合は、以下のボックスにチェックを入れてください。 
+\nアカウントを停止しても、 <b>デフォルトではあなたが送信したメッセージの履歴は消去されません</b>。メッセージの履歴の消去を望む場合は、以下のボックスにチェックを入れてください。
 \n
-\nMatrixでのメッセージの可視性は電子メールと同様のものです。メッセージを削除すると、あなたが送信したメッセージが新規または未登録のユーザーと共有されないことを意味しますが、すでにこれらのメッセージにアクセスをしている登録ユーザーはそのコピーにアクセスできます。</string>
-    <string name="deactivate_account_delete_checkbox">アカウントを停止したとき自分の送信した全てのメッセージを削除 (警告: この操作により、将来的なユーザが会話を不完全な形で見ることになります）</string>
-    <string name="deactivate_account_prompt_password">続けるには、パスワードを入力してください:</string>
+\nMatrixのメッセージの見え方は、電子メールと同様のものです。メッセージの履歴を消去すると、あなたが送信したメッセージは、新規または未登録のユーザーに共有されることはありませんが、既にメッセージを取得している登録ユーザーは、今後もそのコピーにアクセスできます。</string>
+    <string name="deactivate_account_delete_checkbox">アカウントを停止するときに、自分の送信した全てのメッセージの履歴を消去してください（警告: この操作により、今後のユーザーは会話を不完全な形で見ることになります）</string>
+    <string name="deactivate_account_prompt_password">続行するには、パスワードを入力してください：</string>
     <string name="deactivate_account_submit">アカウントを停止</string>
     <string name="error_empty_field_your_password">パスワードを入力してください。</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>
-    <string name="resource_limit_exceeded_title">リソース制限の超過</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>
+    <string name="resource_limit_exceeded_title">リソース制限を超えました</string>
     <string name="resource_limit_contact_action">管理者に連絡</string>
-    <string name="resource_limit_contact_admin">あなたのサービス管理者に連絡</string>
-    <string name="resource_limit_soft_default">このホームサーバはリソース制限の1つを超過しているため、 <b>ユーザがログインできなくなることがあります</b>。</string>
-    <string name="resource_limit_hard_default">このホームサーバはリソース制限の1つを超過しています。</string>
-    <string name="resource_limit_soft_mau"> このホームサーバは月間アクティブユーザ上限に達しているため、 <b>ユーザがログインできなくなることがあります</b>。</string>
-    <string name="resource_limit_hard_mau">このホームサーバは月間アクティブユーザ上限に達しています。</string>
-    <string name="resource_limit_soft_contact">この上限を上げるには %s してください。</string>
-    <string name="resource_limit_hard_contact">このサービスを使い続けるには %s してください。</string>
-    <string name="settings_lazy_loading_description">最初に部屋のメンバーのみを読み込むことによりパフォーマンスを向上。</string>
-    <string name="error_lazy_loading_not_supported_by_home_server">あなたのホームサーバは部屋のメンバーの簡易読み込みをサポートしていません。後で試してください。</string>
-    <string name="settings_lazy_loading_title">部屋のメンバーの簡易読み込み</string>
+    <string name="resource_limit_contact_admin">サービス管理者に連絡してください</string>
+    <string name="resource_limit_soft_default">このホームサーバーはリソース制限の1つを超過しているため、 <b>ユーザーがログインできなくなることがあります</b>。</string>
+    <string name="resource_limit_hard_default">このホームサーバーはリソース制限の1つを超過しています。</string>
+    <string name="resource_limit_soft_mau"> このホームサーバーは月間アクティブユーザーの上限に達しているため、 <b>ユーザーがログインできなくなることがあります</b>。</string>
+    <string name="resource_limit_hard_mau">このホームサーバーは月間アクティブユーザーの上限に達しています。</string>
+    <string name="resource_limit_soft_contact">この制限を上げるには、%sしてください。</string>
+    <string name="resource_limit_hard_contact">このサービスを使い続けるには、%sしてください。</string>
+    <string name="settings_lazy_loading_description">最初に表示されるルームのメンバーのみを読み込むことでパフォーマンスを向上。</string>
+    <string name="error_lazy_loading_not_supported_by_home_server">あなたのホームサーバーは、ルームのメンバーの遅延読み込みをサポートしていません。後で試してください。</string>
+    <string name="settings_lazy_loading_title">ルームのメンバーの遅延読み込み</string>
     <string name="unknown_error">申し訳ありません、エラーが発生しました</string>
-    <string name="room_sliding_menu_version_x">Version %s</string>
-    <string name="encryption_export_notice">エクスポートされた鍵を暗号化するパスフレーズを作成してください。 キーをインポートするには、同じパスフレーズを入力する必要があります。</string>
+    <string name="room_sliding_menu_version_x">バージョン %s</string>
+    <string name="encryption_export_notice">エクスポートされた鍵を暗号化するパスフレーズを作成してください。 鍵をインポートするには、同一のパスフレーズを入力する必要があります。</string>
     <string name="passphrase_create_passphrase">パスフレーズの作成</string>
-    <string name="passphrase_passphrase_does_not_match">パスフレーズは一致する必要があります</string>
+    <string name="passphrase_passphrase_does_not_match">パスフレーズが一致していません</string>
     <string name="settings_info_area_show">情報領域を表示</string>
     <string name="show_info_area_always">常に</string>
     <string name="show_info_area_only_errors">エラーの場合のみ</string>
     <string name="generic_label">%1$s:</string>
-    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="generic_label_and_value">%1$s：%2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
     <string name="merged_events_expand">展開</string>
     <string name="merged_events_collapse">畳む</string>
     <string name="show_info_area_messages_and_errors">メッセージとエラーの場合</string>
-    <string name="call_anyway">とにかく通話する</string>
-    <string name="action_accept">了承</string>
-    <string name="auth_accept_policies">このホームサーバーの方針を閲覧し承認してください:</string>
+    <string name="call_anyway">無視して通話</string>
+    <string name="action_accept">承諾</string>
+    <string name="auth_accept_policies">このホームサーバーの方針を確認し承諾してください：</string>
     <string name="settings_call_category">通話設定画面</string>
-    <string name="template_settings_call_ringtone_use_app_ringtone">着信に${app_name}の既定の着信音を使う</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">着信に${app_name}の既定の着信音を使用</string>
     <string name="settings_call_ringtone_title">着信音</string>
     <string name="settings_call_ringtone_dialog_title">着信音を選んでください:</string>
-    <string name="room_participants_action_remove">追い出す</string>
+    <string name="room_participants_action_remove">会話から追放</string>
     <string name="reason_hint">理由</string>
-    <string name="notification_sync_init">サービスを初期化</string>
+    <string name="notification_sync_init">サービスを初期化しています</string>
     <string name="title_activity_keys_backup_setup">鍵のバックアップ</string>
     <string name="title_activity_keys_backup_restore">鍵のバックアップを使用</string>
-    <string name="title_activity_verify_device">デバイスを認証</string>
+    <string name="title_activity_verify_device">セッションを認証</string>
     <string name="keys_backup_is_not_finished_please_wait">鍵のバックアップが終了していません。しばらくお待ちください…</string>
     <string name="ongoing_conference_call">会議通話中。
-\n%1$s または %2$s として参加</string>
+\n%1$sまたは%2$sとして参加</string>
     <string name="ongoing_conference_call_voice">音声</string>
     <string name="ongoing_conference_call_video">ビデオ</string>
     <string name="settings_notification_advanced">詳細な通知設定</string>
@@ -892,28 +890,28 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="settings_background_fdroid_sync_mode_disabled">バックグラウンド同期を行わない</string>
     <string name="settings_set_workmanager_delay">優先同期間隔</string>
     <string name="settings_set_workmanager_delay_summary">%s
-\n同期は、デバイスのリソース (バッテリ残量) または状態 (スリープ) に応じて延期される場合があります。</string>
-    <string name="settings_send_typing_notifs">文字入力中通知を送信</string>
-    <string name="settings_send_typing_notifs_summary">文字入力中であることを他の参加者に伝えます。</string>
+\n同期は、端末のリソース （バッテリーの残量）または状態（スリープ）に応じて延期される場合があります。</string>
+    <string name="settings_send_typing_notifs">入力中通知を送信</string>
+    <string name="settings_send_typing_notifs_summary">文字入力中であることを他のメンバーに伝えます。</string>
     <string name="settings_show_read_receipts">開封確認メッセージを表示</string>
-    <string name="settings_show_read_receipts_summary">開封確認メッセージをクリックすると詳細なリストを確認できます。</string>
-    <string name="settings_send_message_with_enter">エンター入力でメッセージを送信</string>
-    <string name="settings_send_message_with_enter_summary">ソフトウェアキーボードのEnterボタンを押した際に改行せずにメッセージを送信します</string>
+    <string name="settings_show_read_receipts_summary">開封確認メッセージをクリックすると、詳細な一覧を確認できます。</string>
+    <string name="settings_send_message_with_enter">Enterキーでメッセージを送信</string>
+    <string name="settings_send_message_with_enter_summary">ソフトウェアキーボードのEnterボタンを押すと、改行の代わりにメッセージを送信</string>
     <string name="settings_password">パスワード</string>
     <string name="settings_change_password_submit">パスワードを更新</string>
     <string name="settings_fail_to_update_password_invalid_current_password">パスワードが無効です</string>
     <string name="settings_media">メディア</string>
     <string name="settings_play_shutter_sound">シャッター音を再生</string>
-    <string name="encryption_information_device_name_with_warning">公開端末名 (会話を行うユーザーに表示されます)</string>
-    <string name="notification_silent">音なし</string>
+    <string name="encryption_information_device_name_with_warning">公開セッション名（あなたとやり取りする人々に対して表示されます）</string>
+    <string name="notification_silent">サイレント</string>
     <string name="a11y_show_password">パスワードを表示</string>
     <string name="a11y_hide_password">パスワードを隠す</string>
     <string name="login_reset_password_password_hint">新しいパスワード</string>
     <string name="login_signup_password_hint">パスワード</string>
     <string name="soft_logout_signin_password_hint">パスワード</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_backing_up">鍵のバックアップは現在処理中です。処理中にサインアウトすると、暗号化されたメッセージにアクセスできなくなります。</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="keys_backup_activate">鍵のバックアップを使用</string>
@@ -924,10 +922,10 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="start_verification_short_label">検証</string>
     <string name="keys_backup_settings_restore_backup_button">バックアップから復元</string>
     <string name="keys_backup_settings_delete_backup_button">バックアップを削除</string>
-    <string name="keys_backup_banner_in_progress">鍵をバックアップ中…</string>
-    <string name="keys_backup_info_keys_all_backup_up">全ての鍵をバックアップしました</string>
+    <string name="keys_backup_banner_in_progress">鍵をバックアップしています。これには数分かかる可能性があります…</string>
+    <string name="keys_backup_info_keys_all_backup_up">全ての鍵がバックアップされています</string>
     <plurals name="keys_backup_info_keys_backing_up">
-        <item quantity="other">%d 件の鍵をバックアップ中…</item>
+        <item quantity="other">%d個の鍵をバックアップしています…</item>
     </plurals>
     <string name="keys_backup_info_title_version">バージョン</string>
     <string name="keys_backup_info_title_algorithm">アルゴリズム</string>
@@ -936,72 +934,72 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="settings_troubleshoot_test_system_settings_title">システム設定。</string>
     <string name="settings_troubleshoot_test_account_settings_title">アカウント設定。</string>
     <string name="settings_troubleshoot_test_bing_settings_title">カスタム設定。</string>
-    <string name="settings_troubleshoot_test_service_boot_title">起動時の実行</string>
+    <string name="settings_troubleshoot_test_service_boot_title">起動時に実行</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">バックグラウンド制限の確認</string>
     <string name="action_stay">とどまる</string>
     <string name="edit">編集</string>
     <string name="reply">返信</string>
-    <string name="event_redacted">削除済みのメッセージ</string>
-    <string name="settings_show_redacted">削除済みのメッセージを表示</string>
-    <string name="settings_show_redacted_summary">削除されたメッセージの代わりに削除されたという通知を表示します。</string>
+    <string name="event_redacted">メッセージが削除されました</string>
+    <string name="settings_show_redacted">削除済のメッセージを表示</string>
+    <string name="settings_show_redacted_summary">削除されたメッセージに関する通知を表示</string>
     <string name="event_redacted_by_user_reason">ユーザーによって削除されたイベント</string>
-    <string name="create_new_room">新しい部屋を作成</string>
+    <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="group_all_communities">全てのコミュニティー</string>
+    <string name="fab_menu_create_room">ルーム</string>
     <string name="fab_menu_create_chat">ダイレクトメッセージ</string>
-    <string name="create_room_title">新しい部屋</string>
+    <string name="create_room_title">新しいルーム</string>
     <string name="create_room_action_create">作成</string>
     <string name="create_room_name_hint">名前</string>
-    <string name="create_room_public_title">公開する</string>
-    <string name="create_room_public_description">部屋が公開され、誰でもこの部屋に参加できるようになります</string>
-    <string name="create_room_directory_title">部屋一覧</string>
-    <string name="create_room_directory_description">部屋一覧にこの部屋が公開されます</string>
+    <string name="create_room_public_title">公開</string>
+    <string name="create_room_public_description">誰でもこのルームに参加できるようになります</string>
+    <string name="create_room_directory_title">ルームディレクトリ</string>
+    <string name="create_room_directory_description">ルームディレクトリへ公開</string>
     <string name="settings_general_title">一般</string>
-    <string name="settings_security_and_privacy">セキュリティとプライバシー</string>
+    <string name="settings_security_and_privacy">セキュリティーとプライバシー</string>
     <string name="preference_root_help_about">ヘルプと概要</string>
     <string name="bottom_action_people_x">ダイレクトメッセージ</string>
-    <string name="edited_suffix">(編集済み)</string>
+    <string name="edited_suffix">（編集済）</string>
     <string name="room_filtering_filter_hint">会話を検索…</string>
-    <string name="add_by_matrix_id">Matrix ID から追加</string>
-    <string name="direct_room_filter_hint">ユーザー名または ID で検索…</string>
-    <string name="room_list_quick_actions_notifications_all_noisy">全てのメッセージ (大音量)</string>
+    <string name="add_by_matrix_id">Matrix IDから追加</string>
+    <string name="direct_room_filter_hint">ユーザー名またはIDで検索…</string>
+    <string name="room_list_quick_actions_notifications_all_noisy">全てのメッセージ (音量大)</string>
     <string name="room_list_quick_actions_notifications_all">全てのメッセージ</string>
     <string name="room_list_quick_actions_notifications_mentions">メンションのみ</string>
     <string name="room_list_quick_actions_notifications_mute">ミュート</string>
     <string name="room_list_quick_actions_settings">設定</string>
     <string name="room_list_quick_actions_favorite_add">お気に入りに追加</string>
     <string name="room_list_quick_actions_favorite_remove">お気に入りから削除</string>
-    <string name="room_list_quick_actions_leave">部屋から退出</string>
+    <string name="room_list_quick_actions_leave">ルームから退出</string>
     <string name="help_long_click_on_room_for_more_options">長押しすると、追加のオプションが表示されます</string>
     <string name="settings_developer_mode">開発者モード</string>
     <string name="settings">設定</string>
     <string name="devices_current_device">現在のセッション</string>
     <string name="devices_other_devices">その他のセッション</string>
     <string name="create_room_encryption_title">暗号化を有効にする</string>
-    <string name="create_room_encryption_description">暗号化設定は有効化後変更できません。</string>
-    <string name="room_profile_section_security">セキュリティ</string>
-    <string name="room_profile_section_security_learn_more">詳細</string>
+    <string name="create_room_encryption_description">いったん有効にすると、暗号化を無効にすることはできません。</string>
+    <string name="room_profile_section_security">セキュリティー</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>
+    <string name="room_profile_section_more_settings">ルームの設定</string>
     <string name="room_profile_section_more_notifications">通知</string>
     <plurals name="room_profile_section_more_member_list">
-        <item quantity="other">%1$d 人の参加者</item>
+        <item quantity="other">%1$d人の参加者</item>
     </plurals>
     <string name="room_profile_section_more_uploads">アップロード</string>
-    <string name="room_profile_section_more_leave">部屋を退室</string>
-    <string name="room_profile_leaving_room">部屋から退室中…</string>
+    <string name="room_profile_section_more_leave">ルームを退出</string>
+    <string name="room_profile_leaving_room">ルームから退室しています…</string>
     <string name="room_member_power_level_admins">管理者</string>
     <string name="room_member_power_level_moderators">モデレーター</string>
     <string name="room_member_power_level_custom">カスタム</string>
     <string name="room_member_power_level_invites">招待者</string>
     <string name="room_member_power_level_users">ユーザー</string>
-    <string name="room_member_power_level_admin_in">%1$s の管理者</string>
-    <string name="room_member_power_level_moderator_in">%1$s のモデレーター</string>
-    <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="room_member_power_level_admin_in">%1$sの管理者</string>
+    <string name="room_member_power_level_moderator_in">%1$sのモデレーター</string>
+    <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="settings_category_timeline">タイムライン</string>
     <string name="room_settings_enable_encryption">エンドツーエンド暗号化を有効にする…</string>
     <string name="room_settings_enable_encryption_dialog_submit">暗号化を有効にする</string>
@@ -1019,10 +1017,10 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="settings_active_sessions_manage">セッションの管理</string>
     <string name="settings_active_sessions_signout_device">このセッションからログアウト</string>
     <plurals name="settings_active_sessions_count">
-        <item quantity="other">%d 件の有効なセッション</item>
+        <item quantity="other">%d件のアクティブなセッション</item>
     </plurals>
     <string name="crosssigning_verify_this_session">このログインを検証</string>
-    <string name="a11y_qr_code_for_verification">QR コード</string>
+    <string name="a11y_qr_code_for_verification">QRコード</string>
     <string name="qr_code_scanned_by_other_yes">はい</string>
     <string name="qr_code_scanned_by_other_no">いいえ</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">機内モードが有効です</string>
@@ -1030,13 +1028,13 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="settings_account_data">アカウントデータ</string>
     <string name="message_action_item_redact">削除…</string>
     <string name="delete_event_dialog_title">削除の確認</string>
-    <string name="delete_event_dialog_content">このイベントを削除してよろしいですか？部屋名やトピックの変更を削除すると、変更が元に戻る点にご注意ください。</string>
+    <string name="delete_event_dialog_content">このイベントを削除してよろしいですか？ルーム名や説明の変更を削除すると、変更が取り消されますのでご注意ください。</string>
     <string name="encryption_enabled">暗号化は有効です</string>
-    <string name="encryption_enabled_tile_description">この部屋内でのメッセージはエンドツーエンド暗号化されます。詳細の確認や検証はユーザーのプロフィールをご確認ください。</string>
-    <string name="encryption_not_enabled">暗号化が有効化されていません</string>
+    <string name="encryption_enabled_tile_description">このルーム内でのメッセージはエンドツーエンド暗号化されます。詳細の確認や検証はユーザーのプロフィールをご確認ください。</string>
+    <string name="encryption_not_enabled">暗号化が有効になっていません</string>
     <string name="settings_notification_configuration">通知設定</string>
     <string name="action_disconnect">切断</string>
-    <string name="action_sign_out_confirmation_simple">ログアウトしますか？</string>
+    <string name="action_sign_out_confirmation_simple">サインアウトしてよろしいですか？</string>
     <string name="action_mark_room_read">既読にする</string>
     <string name="action_copy">コピー</string>
     <string name="dialog_title_success">成功</string>
@@ -1045,17 +1043,17 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="action_revoke">破棄</string>
     <string name="action_play">再生</string>
     <string name="action_pause">一時停止</string>
-    <string name="action_dismiss">消去</string>
+    <string name="action_dismiss">閉じる</string>
     <string name="action_skip">スキップ</string>
     <string name="done">完了</string>
     <string name="action_ignore">無視</string>
     <string name="action_review">レビュー</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>
-    <string name="send_file_step_sending_file">ファイル送信中 (%1$s / %2$s)</string>
-    <string name="downloading_file">ファイルをダウンロード中 %1$s…</string>
+    <string name="send_file_step_idle">待機しています…</string>
+    <string name="send_file_step_encrypting_thumbnail">サムネイルを暗号化しています…</string>
+    <string name="send_file_step_sending_thumbnail">サムネイルを送信しています（%2$s個のうち%1$s個）</string>
+    <string name="send_file_step_encrypting_file">ファイルを暗号化しています…</string>
+    <string name="send_file_step_sending_file">ファイルを送信しています（%2$s個のうち%1$s個）</string>
+    <string name="downloading_file">ファイル %1$s をダウンロードしています…</string>
     <string name="attachment_type_file">ファイル</string>
     <string name="attachment_type_contact">連絡先</string>
     <string name="attachment_type_camera">カメラ</string>
@@ -1065,16 +1063,16 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="report_content_spam">スパムメッセージです</string>
     <string name="report_content_inappropriate">不適切なメッセージです</string>
     <string name="report_content_custom">その他の報告…</string>
-    <string name="report_content_custom_title">コンテンツの報告</string>
+    <string name="report_content_custom_title">コンテンツを報告</string>
     <string name="report_content_custom_hint">このコンテンツを報告する理由</string>
-    <string name="report_content_custom_submit">報告する</string>
-    <string name="block_user">ユーザーを無視する</string>
-    <string name="message_ignore_user">ユーザーを無視する</string>
+    <string name="report_content_custom_submit">報告</string>
+    <string name="block_user">ユーザーを無視</string>
+    <string name="message_ignore_user">ユーザーを無視</string>
     <string name="enter_secret_storage_passphrase_warning">警告:</string>
     <plurals name="send_images_with_original_size">
-        <item quantity="other">元の大きさのまま画像を送信する</item>
+        <item quantity="other">元の大きさのまま画像を送信</item>
     </plurals>
-    <string name="cannot_call_yourself">自分自身には通話できません</string>
+    <string name="cannot_call_yourself">自分に電話をかけることはできません</string>
     <string name="settings_send_markdown">マークダウン書式</string>
     <string name="settings_send_markdown_summary">メッセージ送信前にマークダウン書式を適用します。これにより、アスタリスクを使用して斜体のテキストを表示するなどの高度な書式設定が利用できます。</string>
     <string name="preference_voice_and_video">音声とビデオ</string>
@@ -1083,13 +1081,13 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="settings_emails_empty">あなたのアカウントに追加されたメールアドレスはありません</string>
     <string name="settings_phone_number_empty">あなたのアカウントに追加された電話番号はありません</string>
     <string name="settings_phone_numbers">電話番号</string>
-    <string name="settings_emails_and_phone_numbers_summary">あなたの Matrix アカウントに関連付けられたメールアドレスと電話番号を管理</string>
+    <string name="settings_emails_and_phone_numbers_summary">あなたのMatrixアカウントに登録されたメールアドレスと電話番号を管理</string>
     <string name="settings_emails_and_phone_numbers_title">メールアドレスと電話番号</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">有効化</string>
     <string name="template_settings_troubleshoot_test_device_settings_failed">このセッションで通知が無効化されています。
 \n${app_name} の設定をご確認ください。</string>
     <string name="settings_troubleshoot_test_device_settings_success">このセッションで通知は有効化されています。</string>
-    <string name="settings_troubleshoot_test_device_settings_title">セッション設定</string>
+    <string name="settings_troubleshoot_test_device_settings_title">セッションの設定。</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">有効化</string>
     <string name="settings_troubleshoot_test_account_settings_failed">あなたのアカウントで通知が無効化されています。
 \nアカウント設定をご確認ください。</string>
@@ -1100,39 +1098,39 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="settings_troubleshoot_test_system_settings_success">システム設定で通知は有効化されています。</string>
     <string name="settings_troubleshoot_test_battery_title">バッテリー最適化</string>
     <plurals name="seconds">
-        <item quantity="other">%d 秒</item>
+        <item quantity="other">%d秒</item>
     </plurals>
     <string name="settings_advanced_settings">拡張設定</string>
     <string name="choose_locale_current_locale_title">現在の言語</string>
     <string name="choose_locale_other_locales_title">他の利用可能な言語</string>
     <string name="settings_category_composer">メッセージエディタ</string>
     <string name="settings_preferences">環境設定</string>
-    <string name="settings_secure_backup_enter_to_setup">このデバイスを設定</string>
-    <string name="settings_secure_backup_reset">セキュアバックアップをリセット</string>
+    <string name="settings_secure_backup_enter_to_setup">この端末で設定</string>
+    <string name="settings_secure_backup_reset">セキュアバックアップを再設定</string>
     <string name="settings_secure_backup_setup">セキュアバックアップを設定</string>
     <string name="settings_secure_backup_manage">管理</string>
     <string name="settings_secure_backup_section_title">セキュアバックアップ</string>
-    <string name="creating_direct_room">部屋を作成中…</string>
+    <string name="creating_direct_room">ルームを作成しています…</string>
     <string name="send_you_invite">招待されています</string>
-    <string name="invited_by">%s からの招待</string>
+    <string name="invited_by">%sからの招待</string>
     <string name="sas_verified_successful">このセッションは正常に検証されました。</string>
-    <string name="qr_code_scanned_by_other_notice">概ね完了しました。%s の画面にも同じシールドアイコンが表示されていますか？</string>
-    <string name="verification_scan_notice">相手ユーザーのデバイスのコードをスキャンし、相互に安全性を検証します</string>
+    <string name="qr_code_scanned_by_other_notice">概ね完了しました。%sの画面にも同じシールドアイコンが表示されていますか？</string>
+    <string name="verification_scan_notice">相手ユーザーの端末のコードをスキャンし、相互に安全性を検証</string>
     <string name="verification_scan_their_code">相手のコードをスキャン</string>
     <string name="verification_scan_emoji_title">スキャンできません</string>
-    <string name="action_decline">断る</string>
-    <string name="sas_incoming_request_notif_title">検証リクエスト</string>
-    <string name="settings_call_show_confirmation_dialog_summary">通話の開始前に確認する</string>
-    <string name="settings_call_show_confirmation_dialog_title">意図しない通話を阻止する</string>
-    <string name="login_error_ssl_handshake">お使いの端末は脆弱性のある古いTLSセキュリティプロトコルを使用しています、このセキュリティでは接続できません</string>
+    <string name="action_decline">拒否</string>
+    <string name="sas_incoming_request_notif_title">認証の要求</string>
+    <string name="settings_call_show_confirmation_dialog_summary">通話の開始前に確認</string>
+    <string name="settings_call_show_confirmation_dialog_title">意図しない通話を防止</string>
+    <string name="login_error_ssl_handshake">お使いの端末は、脆弱性のある古いTLSセキュリティープロトコルを使用しています。セキュリティーの観点から、接続することはできません</string>
     <string name="login_error_ssl_other">SSLエラー。</string>
-    <string name="login_error_ssl_peer_unverified">SSLエラー:相手のアイデンティティが認証されていません。</string>
+    <string name="login_error_ssl_peer_unverified">SSLエラー：相手のIDが認証されていません。</string>
     <string name="login_error_homeserver_not_found">このURLからホームサーバーに接続できませんでした、ご確認ください</string>
-    <string name="login_error_no_homeserver_found">有効なMatrixサーバーアドレスではありません</string>
+    <string name="login_error_no_homeserver_found">有効なMatrixサーバーのアドレスではありません</string>
     <string name="login_error_unknown_host">このURLは検索結果に表示できません、ご確認ください</string>
-    <string name="auth_msisdn_already_defined">この電話番号はすでに使用されています。</string>
-    <string name="auth_add_email_and_phone_message_2">復旧用のメールアドレスを設定します。後からオプションでメールアドレスや電話番号を使用して知人に見つけてもらえるようにできます。</string>
-    <string name="auth_login_sso">シングルサインオンを使用してサインインする</string>
+    <string name="auth_msisdn_already_defined">この電話番号は既に登録されています。</string>
+    <string name="auth_add_email_and_phone_message_2">アカウント復旧用のメールアドレスを設定します。後からオプションでメールアドレスや電話番号を使用して知人に見つけてもらえるようにできます。</string>
+    <string name="auth_login_sso">シングルサインオンを使用してサインイン</string>
     <string name="call_format_turn_hd_on">HDを使用する</string>
     <string name="call_format_turn_hd_off">HDを使用しない</string>
     <string name="call_camera_back">背面</string>
@@ -1146,7 +1144,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="call_failed_no_connection_description">リアルタイム接続を確立できませんでした。
 \nホームサーバーの管理者に、通話が正常に動作するためにTURNを設定するようご連絡ください。</string>
     <string name="call_failed_dont_ask_again">再び表示しない</string>
-    <string name="people_no_identity_server">アイデンティティサーバーが設定されていません。</string>
+    <string name="people_no_identity_server">IDサーバーが設定されていません。</string>
     <string name="call_notification_hangup">終了</string>
     <string name="call_notification_reject">拒否</string>
     <string name="call_notification_answer">承諾</string>
@@ -1162,341 +1160,338 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="none">なし</string>
     <string name="room_settings_topic_hint">トピック</string>
     <string name="room_settings_name_hint">ルーム名</string>
-    <string name="room_profile_not_encrypted_subtitle">この部屋内のメッセージはエンドツーエンド暗号化されていません。</string>
+    <string name="room_profile_not_encrypted_subtitle">このルーム内のメッセージはエンドツーエンド暗号化されていません。</string>
     <string name="direct_room_profile_not_encrypted_subtitle">ここでのメッセージはエンドツーエンド暗号化されていません。</string>
     <string name="direct_room_profile_section_more_settings">設定</string>
-    <string name="room_settings_enable_encryption_no_permission">あなたにはこの部屋の暗号化を有効にする権限がありません。</string>
+    <string name="room_settings_enable_encryption_no_permission">あなたにはこのルームの暗号化を有効にする権限がありません。</string>
     <string name="timeline_unread_messages">未読メッセージ</string>
-    <string name="labs_swipe_to_reply_in_timeline">タイムラインでスワイプして返信を有効にする</string>
-    <string name="settings_labs_show_hidden_events_in_timeline">タイムラインで非表示のイベントを表示する</string>
-    <string name="user_code_scan">QR コードをスキャン</string>
-    <string name="a13n_qr_code_description">QR コード画像</string>
-    <string name="qr_code">QR コード</string>
-    <string name="add_by_qr_code">QR コードによる追加</string>
+    <string name="labs_swipe_to_reply_in_timeline">タイムラインでのスワイプによる返信を有効にする</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">タイムラインで非表示のイベントを表示</string>
+    <string name="user_code_scan">QRコードをスキャン</string>
+    <string name="a13n_qr_code_description">QRコード画像</string>
+    <string name="qr_code">QRコード</string>
+    <string name="add_by_qr_code">QRコードによる追加</string>
     <string name="user_code_share">コードを共有</string>
-    <string name="template_invite_friends_text">${app_name} で会話しましょう: %s</string>
-    <string name="invite_friends">フレンドを招待</string>
+    <string name="template_invite_friends_text">${app_name} で会話しましょう：%s</string>
+    <string name="invite_friends">友達を招待</string>
     <string name="direct_room_user_list_known_title">既知のユーザー</string>
-    <string name="invalid_qr_code_uri">無効なQRコード (無効な URI)！</string>
+    <string name="invalid_qr_code_uri">無効なQRコード（無効なURI）！</string>
     <string name="passwords_do_not_match">パスワードが一致しません</string>
     <string name="account_email_error">メールアドレスの確認中にエラーが発生しました。</string>
-    <string name="disabled_integration_dialog_content">これを行うには設定からインテグレーションを許可を有効にしてください。</string>
+    <string name="disabled_integration_dialog_content">これを行うには設定から「インテグレーションを許可」を有効にしてください。</string>
     <string name="disabled_integration_dialog_title">インテグレーションが無効になっています</string>
     <string name="settings_integration_manager">インテグレーションマネージャー</string>
-    <string name="settings_integration_allow">インテグレーションを許可</string>
-    <string name="settings_data_save_mode_summary">データセーブモードでは、特定のフィルターを適用することで、プレゼンスの更新やタイピングの通知がフィルタリングされます。</string>
+    <string name="settings_integration_allow">インテグレーション（統合）を許可</string>
+    <string name="settings_data_save_mode_summary">データ節約モードでは、特定のフィルターを適用することで、プレゼンスの更新やタイピングの通知がフィルタリングされます。</string>
     <string name="settings_troubleshoot_test_fcm_success">FCMトークンが正常に取得されました:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebaseトークン</string>
-    <string name="settings_troubleshoot_test_play_services_quickfix">Playサービスを修正する</string>
-    <string name="settings_troubleshoot_test_play_services_success">GooglePlayサービスAPKは利用可能で最新の状態になっています。</string>
-    <string name="settings_troubleshoot_test_play_services_title">Playサービスチェック</string>
-    <string name="settings_troubleshoot_test_bing_settings_quickfix">設定を確認する</string>
+    <string name="settings_troubleshoot_test_play_services_quickfix">Playサービスを修正</string>
+    <string name="settings_troubleshoot_test_play_services_success">Google PlayサービスのAPKは利用可能で最新の状態になっています。</string>
+    <string name="settings_troubleshoot_test_play_services_title">Playサービスのチェック</string>
+    <string name="settings_troubleshoot_test_bing_settings_quickfix">設定を確認</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">カスタムルールの読み込みに失敗しました。再試行してください。</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">一部の通知はカスタム設定で無効になっています。</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">一部のメッセージがサイレントに設定されていることに注意してください（音を出さずに通知します）。</string>
-    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">1つ以上のテストが失敗しました。調査に役立つバグレポートを送信してください。</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">1つ以上のテストが失敗しました。調査用のバグレポートを送信してください。</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">1つ以上のテストが失敗しました。提案された修正を試してください。</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">基本的な診断はOKです。 それでも通知が届かない場合は、調査に役立つバグレポートを送信してください。</string>
-    <string name="settings_troubleshoot_diagnostic_running_status">実行中… (%1$dの %2$d)</string>
-    <string name="settings_troubleshoot_diagnostic_run_button_title">テストを実行する</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">基本的な診断はOKです。 それでも通知が届かない場合は、調査用のバグレポートを送信してください。</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">実行しています…（%1$dの%2$d）</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">テストを実行</string>
     <string name="settings_troubleshoot_diagnostic">診断トラブルシューティング</string>
     <string name="settings_notification_by_event">イベントごとの通知の優先順位</string>
     <string name="error_threepid_auth_failed">メールであなたに送ったリンクをクリックして確認してください。</string>
     <string name="settings_remove_three_pid_confirmation_content">%sを削除しますか？</string>
     <string name="settings_add_3pid_authentication_needed">認証が必要です</string>
-    <string name="settings_add_3pid_confirm_password_title">あなたのパスワードを確認する</string>
-    <string name="search_is_not_supported_in_e2e_room">暗号化された部屋での検索はまだサポートされていません。</string>
-    <string name="search_banned_user_hint">禁止されたユーザーをフィルタリングする</string>
-    <string name="room_permissions_change_topic">トピックを変更する</string>
+    <string name="settings_add_3pid_confirm_password_title">パスワードを確認</string>
+    <string name="search_banned_user_hint">ブロックされたユーザーを絞り込む</string>
+    <string name="room_permissions_change_topic">トピックを変更</string>
     <string name="room_permissions_upgrade_the_room">ルームをアップグレード</string>
-    <string name="room_permissions_send_m_room_server_acl_events">m.room.server_acl eventsを送信します</string>
-    <string name="room_permissions_change_permissions">権限を変更する</string>
-    <string name="room_permissions_change_room_name">部屋名を変更する</string>
-    <string name="room_permissions_change_history_visibility">履歴を見えるように変更する</string>
-    <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_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_change_settings">設定を変更する</string>
-    <string name="room_permissions_invite_users">招待されたユーザー</string>
-    <string name="room_permissions_send_messages">メッセージを送る</string>
-    <string name="room_permissions_default_role">デフォルトルール</string>
-    <string name="room_permissions_notice_read_only">部屋のさまざまな部分を変更するための必要な役割を更新する権限がありません</string>
-    <string name="room_permissions_notice">部屋のさまざまな部分を変更するために必要な役割を選択します</string>
-    <string name="room_settings_permissions_title">部屋の権限</string>
+    <string name="room_permissions_send_m_room_server_acl_events">m.room.server_acl eventsを送信</string>
+    <string name="room_permissions_change_permissions">権限を変更</string>
+    <string name="room_permissions_change_room_name">ルーム名の変更</string>
+    <string name="room_permissions_change_history_visibility">履歴の見え方の変更</string>
+    <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_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_change_settings">設定の変更</string>
+    <string name="room_permissions_invite_users">ユーザーの招待</string>
+    <string name="room_permissions_send_messages">メッセージの送信</string>
+    <string name="room_permissions_default_role">既定の役割</string>
+    <string name="room_permissions_notice_read_only">ルームに関する変更を行うために必要な役割を更新する権限がありません</string>
+    <string name="room_permissions_notice">ルームに関する変更を行うために必要な役割を選択</string>
+    <string name="room_settings_permissions_title">ルームの権限</string>
     <string name="room_permissions_title">権限</string>
-    <string name="room_settings_permissions_subtitle">部屋のさまざまな部分を変更するために必要な役割を表示し更新します。</string>
-    <string name="room_participants_unban_prompt_msg">ユーザーの禁止を解除すると、ユーザーは再び部屋に参加できるようになります。</string>
-    <string name="room_participants_ban_title">禁止されたユーザー</string>
-    <string name="room_participants_ban_reason">禁止の理由</string>
-    <string name="room_participants_unban_title">ユーザーの禁止を解除する</string>
-    <string name="room_participants_remove_prompt_msg">キックするユーザーは、この部屋から削除されます。
+    <string name="room_settings_permissions_subtitle">ルームに関する変更を行うために必要な役割を表示し更新します。</string>
+    <string name="room_participants_unban_prompt_msg">ブロックを解除すると、ユーザーはルームに再び参加できるようになります。</string>
+    <string name="room_participants_ban_title">ユーザーをブロック</string>
+    <string name="room_participants_ban_reason">ブロックする理由</string>
+    <string name="room_participants_unban_title">ユーザーのブロックを解除</string>
+    <string name="room_participants_remove_prompt_msg">このユーザーはルームから追放されます。
 \n
-\n再び参加するのを防ぐためには永久追放する必要があります。</string>
-    <string name="room_participants_remove_reason">キックする理由</string>
-    <string name="room_participants_remove_title">ユーザーをキックする</string>
+\n再参加を防ぐためには、追放する代わりにブロックする必要があります。</string>
+    <string name="room_participants_remove_reason">追放する理由</string>
+    <string name="room_participants_remove_title">ユーザーを追放</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">このユーザーの招待をキャンセルしてよろしいですか？</string>
     <string name="room_participants_action_cancel_invite_title">招待をキャンセル</string>
-    <string name="room_participants_action_unignore_prompt_msg">このユーザーを解除すると、そのユーザーからのすべてのメッセージが再び表示されます。</string>
+    <string name="room_participants_action_unignore_prompt_msg">このユーザーを解除すると、そのユーザーからの全てのメッセージが再び表示されます。</string>
     <string name="room_participants_action_unignore_title">ユーザーを無視しない</string>
-    <string name="room_participants_action_ignore_prompt_msg">このユーザーを無視すると、あなたが共有している部屋からそのユーザーのメッセージが削除されます。
+    <string name="room_participants_action_ignore_prompt_msg">このユーザーを無視すると、あなたが共有しているルームからそのユーザーのメッセージが削除されます。
 \n
-\nこの動作は設定からいつでも元に戻すことができます。</string>
-    <string name="room_participants_action_ignore_title">ユーザーを無視する</string>
-    <string name="room_participants_power_level_demote">広角</string>
-    <string name="room_participants_power_level_demote_warning_prompt">あなたは自分自身を降格させているので、この変更を元に戻すことはできません。あなたが部屋の中で最後の特権ユーザーである場合、特権を取り戻すことはできません。</string>
+\nこの操作は、設定からいつでも元に戻すことができます。</string>
+    <string name="room_participants_action_ignore_title">ユーザーを無視</string>
+    <string name="room_participants_power_level_demote">降格</string>
+    <string name="room_participants_power_level_demote_warning_prompt">あなたは自分自身を降格させようとしています。この変更は取り消せません。あなたがルームの中で最後の特権ユーザーである場合、特権を再取得することはできません。</string>
     <string name="room_participants_power_level_demote_warning_title">降格しますか？</string>
     <string name="room_participants_action_cancel_invite">招待をキャンセル</string>
-    <string name="room_participants_leave_private_warning">この部屋は公開されていません。 招待なしで再参加することはできません。</string>
-    <string name="invite_no_identity_server_error">このアクションを実行するには、設定にIDサーバーを追加します。</string>
+    <string name="room_participants_leave_private_warning">このルームは公開されていません。 招待がなければ再び参加することはできません。</string>
+    <string name="invite_no_identity_server_error">この操作を実行するには、設定にIDサーバーを追加してください。</string>
     <string name="permissions_denied_add_contact">連絡先へのアクセスを許可します。</string>
     <string name="permissions_denied_qr_code">QRコードをスキャンするには、カメラへのアクセスを許可する必要があります。</string>
     <string name="call_held_by_you">通話をかけました</string>
     <string name="call_held_by_user">%sが通話をかけました</string>
-    <string name="call_hold_action">かける</string>
-    <string name="return_to_call">コールし直す</string>
+    <string name="call_hold_action">保留</string>
+    <string name="return_to_call">通話に戻る</string>
     <string name="call_resume_action">通話をやり直す</string>
     <string name="active_call_with_duration">アクティブな通話（%s）</string>
-    <string name="settings_call_ringtone_use_default_stun_sum">あなたのホームサーバがアシスト機能を提供しない場合、代わりに%sを使用します（IPアドレスは通話中に共有されます）</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">あなたのホームサーバーがアシスト機能を提供しない場合、代わりに%sを使用します（IPアドレスが通話中に共有されます）</string>
     <string name="video_call_in_progress">ビデオ通話が行われています…</string>
-    <string name="settings_call_ringtone_use_default_stun">フォールバックコールアシストサーバーを許可する</string>
-    <string name="error_unauthorized">有効な認証情報ではありません</string>
+    <string name="settings_call_ringtone_use_default_stun">フォールバックコールアシストサーバーを許可</string>
+    <string name="error_unauthorized">有効な認証情報がないため、権限がありません</string>
     <string name="template_call_failed_no_connection">${app_name} 呼び出し失敗</string>
-    <string name="call_failed_no_ice_description">通話が確実に機能させるためには、ホームサーバー(%1$s)の管理者にTURNサーバーの設定を依頼してください。
+    <string name="call_failed_no_ice_description">確実に通話できるようにするためには、ホームサーバー（%1$s）の管理者にTURNサーバーの設定を依頼してください。
 \n
 \n代わりに、%2$sのパブリックサーバーを使用することもできますが、信頼性は低く、あなたのIPアドレスがそのサーバーと共有されてしまいます。これは設定から管理することができます。</string>
-    <string name="settings_room_directory_show_all_rooms_summary">ルームディレクトリのすべての部屋を詳しい説明を含めて表示します。</string>
-    <string name="settings_room_directory_show_all_rooms">部屋の詳しい説明を表示する</string>
+    <string name="settings_room_directory_show_all_rooms_summary">ルームディレクトリの全てのルームを表示（露骨なコンテンツのあるルームを含む）する。</string>
+    <string name="settings_room_directory_show_all_rooms">露骨なコンテンツのあるルームを表示</string>
     <string name="settings_category_room_directory">ルームディレクトリ</string>
     <string name="dialog_edit_hint">新着情報</string>
     <string name="action_return">戻る</string>
     <string name="action_unpublish">非公開</string>
     <string name="action_switch">切り替える</string>
-    <string name="action_add">加える</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$sはエンドツーエンド暗号化 (認識されていないアルゴリズム%2$s) をオンにしました。</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">エンドツーエンド暗号化 (認識されていないアルゴリズム%1$s) をオンにしました。</string>
+    <string name="action_add">追加</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$sがエンドツーエンド暗号化（認識されていないアルゴリズム %2$s）をオンにしました。</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">エンドツーエンド暗号化（認識されていないアルゴリズム %1$s）をオンにしました。</string>
     <string name="start_chatting">会話を始める</string>
     <string name="notice_end_to_end_ok">%1$sがエンドツーエンド暗号化をオンにしました。</string>
     <string name="notice_end_to_end_ok_by_you">エンドツーエンド暗号化をオンにしました。</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_room_guest_access_forbidden_by_you">ゲストが部屋に参加するのを妨ぎました。</string>
-    <string name="notice_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_forbidden_by_you">ゲストがルームに参加するのを拒否しました。</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$sはゲストがルームに参加するのを拒否しました。</string>
+    <string name="notice_room_guest_access_forbidden_by_you">ゲストがルームに参加するのを拒否しました。</string>
+    <string name="notice_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_room_guest_access_can_join_by_you">この部屋へのゲストの入室を許可しました。</string>
-    <string name="notice_room_guest_access_can_join">%1$s がゲストの部屋への参加を許可しました。</string>
+    <string name="notice_room_guest_access_can_join_by_you">ゲストがルームに参加するのを許可しました。</string>
+    <string name="notice_room_guest_access_can_join">%1$sはゲストがルームに参加するのを許可しました。</string>
     <string name="system_theme">システムデフォルト</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">この部屋のメインおよび代替のアドレスを変更しました。</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">この部屋の代替アドレスを変更しました。</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">このルームのメインおよび代替のアドレスを変更しました。</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">このルームの代替アドレスを変更しました。</string>
     <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="other">この部屋の代替アドレス%1$sを削除しました。</item>
+        <item quantity="other">このルームの代替アドレス %1$s を削除しました。</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="other">この部屋の代替アドレス%1$sを追加しました。</item>
+        <item quantity="other">このルームの代替アドレス %1$s を追加しました。</item>
     </plurals>
-    <string name="notice_room_canonical_alias_unset_by_you">この部屋のメインアドレスを削除しました。</string>
-    <string name="notice_room_canonical_alias_set_by_you">この部屋のメイン・アドレスを%1$sに設定しました。</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">この部屋のアドレスとして、%1$sを追加し%2$sを削除しました。</string>
+    <string name="notice_room_canonical_alias_unset_by_you">このルームのメインアドレスを削除しました。</string>
+    <string name="notice_room_canonical_alias_set_by_you">このルームのメインアドレスを%1$sに設定しました。</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">このルームのアドレスに%1$sを追加し%2$sを削除しました。</string>
     <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="other">この部屋のアドレスの%1$sを削除しました。</item>
+        <item quantity="other">このルームのアドレスの%1$sを削除しました。</item>
     </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">%1$sの招待を取り消しました。理由:%2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">%1$sの招待を受諾しました%2$。理由:%2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">%1$sの部屋への招待を取り消しました。理由:%2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">%1$sにルームへの招待状を送りました。理由:%2$s</string>
-    <string name="notice_requested_voip_conference_by_you">VoIPカンファレンスをリクエストしました</string>
-    <string name="notice_room_server_acl_updated_title_by_you">このルームのサーバのACLを変更しました。</string>
-    <string name="notice_room_server_acl_set_title_by_you">このルームのサーバACLを設定しました。</string>
+    <string name="notice_room_withdraw_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>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">%1$sのルームへの招待を取り消しました。理由：%2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">%1$sにルームへの招待状を送りました。理由：%2$s</string>
+    <string name="notice_requested_voip_conference_by_you">VoIP会議をリクエストしました</string>
+    <string name="notice_room_server_acl_updated_title_by_you">このルームのサーバーのアクセス制御リストを変更しました。</string>
+    <string name="notice_room_server_acl_set_title_by_you">このルームのサーバーアクセス制御リストを設定しました。</string>
     <string name="notice_direct_room_update_by_you">ここをアップグレードしました。</string>
-    <string name="notice_room_update_by_you">あなたはこのルームをアップグレードしました。</string>
-    <string name="notice_ended_call_by_you">通話を終えました。</string>
-    <string name="notice_answered_call_by_you">通話に応えました。</string>
-    <string name="notice_call_candidates_by_you">通話を設定するためのデータを送信しました。</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">この部屋のアドレスを変更しました。</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s はこの部屋のメインおよび代替アドレスを変更しました。</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s がこの部屋のアドレスを変更しました。</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$sはこの部屋の代替アドレスを変更しました。</string>
+    <string name="notice_room_update_by_you">このルームをアップグレードしました。</string>
+    <string name="notice_ended_call_by_you">通話を終了しました。</string>
+    <string name="notice_answered_call_by_you">電話に出ました。</string>
+    <string name="notice_call_candidates_by_you">通話を設定するためにデータを送信しました。</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">このルームのアドレスを変更しました。</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$sがこのルームのメインおよび代替アドレスを変更しました。</string>
+    <string name="notice_room_canonical_alias_no_change">%1$sがこのルームのアドレスを変更しました。</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$sがこのルームの代替アドレスを変更しました。</string>
     <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="other">%1$s がこの部屋の代替アドレス%2$sを削除しました。</item>
+        <item quantity="other">%1$sがこのルームの代替アドレス %2$s を削除しました。</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="other">%1$s はこの部屋の代替アドレス%2$sを追加しました。</item>
+        <item quantity="other">%1$sがこのルームの代替アドレス %2$s を追加しました。</item>
     </plurals>
-    <string name="notice_room_canonical_alias_unset">%1$sがこの部屋のメインアドレスを削除しました。</string>
-    <string name="notice_room_canonical_alias_set">%1$sがこの部屋のメインアドレスを%2$sに設定しました。</string>
-    <string name="notice_room_aliases_added_and_removed">%1$sはこの部屋のアドレスとして %2$sを追加し%3$sを削除しました。</string>
+    <string name="notice_room_canonical_alias_unset">%1$sがこのルームのメインアドレスを削除しました。</string>
+    <string name="notice_room_canonical_alias_set">%1$sがこのルームのメインアドレスを%2$sに設定しました。</string>
+    <string name="notice_room_aliases_added_and_removed">%1$sがこのルームのアドレスに%2$sを追加し%3$sを削除しました。</string>
     <plurals name="notice_room_aliases_removed">
-        <item quantity="other">%1$s はこの部屋のアドレスの%2$sを削除しました。</item>
+        <item quantity="other">%1$sがこのルームのアドレスの%2$sを削除しました。</item>
     </plurals>
     <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="other">この部屋のアドレスとして%1$sが追加されました。</item>
+        <item quantity="other">このルームのアドレスに%1$sを追加しました。</item>
     </plurals>
-    <string name="notice_room_third_party_invite_with_reason">%1$sが%2$s にルームへの招待を送りました。理由:%3$s</string>
-    <string name="notice_room_third_party_revoked_invite_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>
-    <string name="notice_room_withdraw_with_reason">%1$sは%2$sの招待を取り下げました。理由:%3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$sが%2$sにルームへの招待を送りました。理由：%3$s</string>
+    <string name="notice_room_third_party_revoked_invite_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>
+    <string name="notice_room_withdraw_with_reason">%1$sが%2$sの招待を取り下げました。理由：%3$s</string>
     <plurals name="notice_room_aliases_added">
-        <item quantity="other">%1$sはこの部屋のアドレスとして%2$sを追加しました。</item>
+        <item quantity="other">%1$sがこのルームのアドレスに%2$sを追加しました。</item>
     </plurals>
-    <string name="notice_profile_change_redacted_by_you">あなたのプロフィールが更新されました %1$s</string>
-    <string name="notice_room_server_acl_updated_title">%sがこのルームのサーバのACLを変更しました。</string>
+    <string name="notice_profile_change_redacted_by_you">プロフィール %1$s を更新しました</string>
+    <string name="notice_room_server_acl_updated_title">%sがこのルームのサーバーのアクセス制御リストを変更しました。</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">IPリテラルに一致するサーバーは禁止されています。</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">・IPリテラルに一致するサーバーを許可します。</string>
     <string name="notice_room_server_acl_set_allowed">・%sに一致するサーバーは許可されています。</string>
     <string name="notice_room_server_acl_set_banned">・%sに一致するサーバーは禁止されています。</string>
-    <string name="notice_room_server_acl_set_title">%sがこのルームのサーバACLを設定しました。</string>
+    <string name="notice_room_server_acl_set_title">%sがこのルームのサーバーアクセス制御リストを設定しました。</string>
     <string name="notice_direct_room_update">%sがここをアップグレードしました。</string>
-    <string name="notice_room_update">%s がこのルームをアップグレードしました。</string>
-    <string name="notice_end_to_end_by_you">エンドツーエンド暗号化をオンにしました (%1$s)</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">あなたは今後のメッセージを%1$sに見えるようにしました</string>
-    <string name="notice_made_future_room_visibility_by_you">今後のルーム履歴を%1$sに表示させました</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s は将来のメッセージを %2$sに見えるようにしました</string>
-    <string name="notice_call_candidates">%sが通話を設定するためのデータを送信しました。</string>
-    <string name="notice_placed_voice_call_by_you">通話をしました。</string>
-    <string name="notice_placed_video_call_by_you">ビデオ通話をしました。</string>
-    <string name="notice_room_ban_with_reason_by_you">あなたが%1$sを永久追放しました。理由: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$sが%2$sを永久追放しました。理由: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">あなたが%1$sの禁止を解除しました。理由: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$sが%2$sの禁止を解除しました。理由: %3$s</string>
-    <string name="notice_room_remove_with_reason_by_you">あなたは%1$sをキックしました。理由: %2$s</string>
-    <string name="notice_room_remove_with_reason">%1$sが%2$sをキックしました。理由: %3$s</string>
-    <string name="notice_room_reject_with_reason_by_you">あなたは招待を拒否しました。理由: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s は招待を拒否しました。理由: %2$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_room_leave_with_reason_by_you">あなたがこのルームを退出しました。理由: %1$s</string>
-    <string name="initial_sync_start_importing_account_left_rooms">初期同期:
+    <string name="notice_room_update">%sがこのルームをアップグレードしました。</string>
+    <string name="notice_end_to_end_by_you">エンドツーエンド暗号化を有効にしました（%1$s）</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">今後のメッセージを%1$sに見えるように設定しました。</string>
+    <string name="notice_made_future_room_visibility_by_you">今後のルーム履歴を%1$sに見えるように設定しました。</string>
+    <string name="notice_made_future_direct_room_visibility">%1$sが今後のメッセージを%2$sに見えるように設定しました。</string>
+    <string name="notice_call_candidates">%sが通話を設定するためにデータを送信しました。</string>
+    <string name="notice_placed_voice_call_by_you">通話を開始しました。</string>
+    <string name="notice_placed_video_call_by_you">ビデオ通話を開始しました。</string>
+    <string name="notice_room_ban_with_reason_by_you">%1$sをブロックしました。理由：%2$s</string>
+    <string name="notice_room_ban_with_reason">%1$sが%2$sをブロックしました。理由：%3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">%1$sのブロックを解除しました。理由：%2$s</string>
+    <string name="notice_room_unban_with_reason">%1$sが%2$sのブロックを解除しました。理由：%3$s</string>
+    <string name="notice_room_remove_with_reason_by_you">%1$sを追放しました。理由：%2$s</string>
+    <string name="notice_room_remove_with_reason">%1$sが%2$sを追放しました。理由：%3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">招待を拒否しました。理由：%1$s</string>
+    <string name="notice_room_reject_with_reason">%1$sが招待を拒否しました。理由：%2$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_room_leave_with_reason_by_you">このルームを退出しました。理由：%1$s</string>
+    <string name="initial_sync_start_importing_account_left_rooms">初期同期：
 \n退出したルームをインポートしています</string>
     <string name="initial_sync_start_importing_account_invited_rooms">初期同期：
 \n招待されたルームをインポートしています</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">初期同期:
+    <string name="initial_sync_start_importing_account_joined_rooms">初期同期：
 \n会話を読み込んでいます
 \n多くのルームに参加している場合、読み込みに時間がかかるかもしれません</string>
-    <string name="notice_room_leave_with_reason">%1$sがこのルームを退出しました。理由: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">あなたがこのルームに参加しました。理由: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$sがこのルームに参加しました。理由: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">あなたがこのルームに参加しました。理由: %1$s</string>
-    <string name="notice_room_join_with_reason">%1$sがこのルームに参加しました。理由: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$sがあなたを招待しました。 理由: %2$s</string>
-    <string name="notice_room_invite_with_reason_by_you">あなたが%1$sを招待しました。 理由: %2$s</string>
-    <string name="notice_room_invite_with_reason">%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_no_invitee_with_reason">%1$sの招待です。理由: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$sがこのルームを退出しました。理由：%2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">このルームに参加しました。理由：%1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$sがこのルームに参加しました。理由：%2$s</string>
+    <string name="notice_room_join_with_reason_by_you">このルームに参加しました。理由：%1$s</string>
+    <string name="notice_room_join_with_reason">%1$sがこのルームに参加しました。理由：%2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$sがあなたを招待しました。 理由：%2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">%1$sを招待しました。 理由：%2$s</string>
+    <string name="notice_room_invite_with_reason">%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_no_invitee_with_reason">%1$sの招待です。理由：%2$s</string>
     <string name="clear_timeline_send_queue">送信キューのクリア</string>
     <string name="event_status_sending_message">メッセージを送っています…</string>
     <string name="event_status_sent_message">メッセージを送りました</string>
-    <string name="initial_sync_start_importing_account_data">初期同期:
+    <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">初期同期:
+    <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">初期同期:
+    <string name="initial_sync_start_importing_account_crypto">初期同期：
 \n暗号をインポートしています</string>
-    <string name="initial_sync_start_importing_account">初期同期:
+    <string name="initial_sync_start_importing_account">初期同期：
 \nアカウントをインポートしています…</string>
-    <string name="initial_sync_start_downloading">初期同期:
+    <string name="initial_sync_start_downloading">初期同期：
 \nデータをダウンロードしています…</string>
-    <string name="initial_sync_start_server_computing">初期同期:
+    <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>
+        <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="notice_power_level_diff">%1$sを%2$sから%3$sへ</string>
-    <string name="notice_power_level_changed">%2$sが%1$sの権限を変更しました。</string>
-    <string name="notice_power_level_changed_by_you">%1$sの権限を変更しました。</string>
+    <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="notice_power_level_diff">%1$sの権限レベルを%2$sから%3$sへ変更しました。</string>
     <string name="power_level_custom_no_value">カスタム</string>
     <string name="power_level_custom">カスタム (%1$d)</string>
     <string name="power_level_default">デフォルト</string>
     <string name="power_level_moderator">モデレーター</string>
     <string name="power_level_admin">管理者</string>
-    <string name="notice_widget_jitsi_modified_by_you">あなたががビデオ会議を変更しました</string>
+    <string name="notice_widget_jitsi_modified_by_you">ビデオ会議を変更しました</string>
     <string name="notice_widget_jitsi_modified">%1$sがビデオ会議を変更しました</string>
     <string name="notice_widget_jitsi_added_by_you">ビデオ会議を開始しました</string>
     <string name="notice_widget_jitsi_removed_by_you">ビデオ会議を終了しました</string>
     <string name="notice_widget_jitsi_removed">%1$sがビデオ会議を開始しました</string>
     <string name="notice_widget_jitsi_added">%1$sがビデオ会議を開始しました</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_room_third_party_registered_invite_by_you">あなたは %1$sの招待を受けました</string>
-    <string name="notice_widget_added">%1$sが %2$sウィジェットを追加しました</string>
-    <string name="notice_room_name_changed_by_you">ルーム名を変更しました: %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">あなたは%1$sの招待を取り消しました</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_room_third_party_registered_invite_by_you">%1$sの招待を受け入れました</string>
+    <string name="notice_widget_added">%1$sが%2$sウィジェットを追加しました</string>
+    <string name="notice_room_name_changed_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_direct_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_direct_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_revoked_invite">%1$sが%2$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_event_redacted_by_with_reason">メッセージが%1$sによって削除されました [理由: %2$s]</string>
-    <string name="notice_event_redacted_with_reason">メッセージが削除されました [理由: %1$s]</string>
-    <string name="notice_event_redacted_by">%1$sがメッセージを削除しました</string>
-    <string name="notice_event_redacted">メッセージを削除</string>
+    <string name="notice_room_third_party_invite_by_you">%1$sにルームへの招待を送りました</string>
+    <string name="notice_event_redacted_by_with_reason">メッセージが%1$sにより削除されました［理由：%2$s］</string>
+    <string name="notice_event_redacted_with_reason">メッセージが削除されました［理由：%1$s］</string>
+    <string name="notice_event_redacted_by">メッセージが%1$sにより削除されました</string>
+    <string name="notice_event_redacted">メッセージが削除されました</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_avatar_removed">%1$sがルームのアバターを削除しました</string>
+    <string name="notice_room_topic_removed_by_you">ルームの説明を削除しました</string>
     <string name="notice_room_name_removed_by_you">ルーム名を削除しました</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">許可を与える</string>
-    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name}は、信頼できる通知を受け取るために、影響の少ないバックグラウンド接続を維持する必要があります。
-\n次の画面で、${app_name}を常にバックグラウンドで実行することを許可するように求められます。同意してください。</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name}は、確実に通知を受け取るために、影響の少ないバックグラウンド接続を維持する必要があります。
+\n次の画面で、${app_name}を常にバックグラウンドで実行することを許可するように求められますので、承認してください。</string>
     <string name="startup_notification_fdroid_battery_optim_title">バックグラウンド接続</string>
     <string name="settings_discovery_manage">ディスカバリー設定を管理します。</string>
     <string name="settings_discovery_category">ディスカバリー（発見）</string>
     <string name="reset_secure_backup_warning">これにより、現在のキーまたはフレーズが置き換えられます。</string>
-    <string name="reset_secure_backup_title">新しいセキュリティキーを生成するか、既存のバックアップに新しいセキュリティフレーズを設定します。</string>
-    <string name="settings_secure_backup_section_info">サーバー上の暗号化キーをバックアップすることにより、暗号化されたメッセージとデータへのアクセスが失われるのを防ぎます。</string>
-    <string name="settings_show_emoji_keyboard_summary">メッセージ作成画面に絵文字キーボードを開くボタンを追加する</string>
-    <string name="settings_show_emoji_keyboard">絵文字キーボードを表示する</string>
-    <string name="settings_show_avatar_display_name_changes_messages_summary">アバターと表示名の変更が含まれます。</string>
-    <string name="settings_show_avatar_display_name_changes_messages">アカウントイベントを表示する</string>
-    <string name="settings_show_join_leave_messages_summary">招待、キック、禁止は影響を受けません。</string>
-    <string name="settings_show_room_member_state_events_summary">招待/入室/退室/キック/禁止イベントや、アバター/表示名の変更など。</string>
-    <string name="settings_show_join_leave_messages">入室と退室イベントの表示</string>
-    <string name="settings_chat_effects_description">Use /confettiコマンドを使用するか、❄️または🎉を含むメッセージを送信します</string>
-    <string name="settings_chat_effects_title">チャットでエフェクトを表示する</string>
-    <string name="settings_show_room_member_state_events">部屋のメンバーのイベントを表示する</string>
+    <string name="reset_secure_backup_title">新しいセキュリティーキーを生成するか、既存のバックアップに新しいセキュリティーフレーズを設定します。</string>
+    <string name="settings_secure_backup_section_info">サーバー上の暗号鍵をバックアップして、暗号化されたメッセージとデータへのアクセスが失われるのを防ぎましょう。</string>
+    <string name="settings_show_emoji_keyboard_summary">メッセージ作成画面に絵文字キーボードを開くためのボタンを追加</string>
+    <string name="settings_show_emoji_keyboard">絵文字キーボードを表示</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">アバターと表示名の変更を含む。</string>
+    <string name="settings_show_avatar_display_name_changes_messages">アカウントのイベントを表示</string>
+    <string name="settings_show_join_leave_messages_summary">招待、追放、ブロックは影響を受けません。</string>
+    <string name="settings_show_room_member_state_events_summary">招待/参加/退出/追放/ブロックに関するイベントや、アバター/表示名の変更などを含む。</string>
+    <string name="settings_show_join_leave_messages">参加・退出イベントを表示</string>
+    <string name="settings_chat_effects_description">/confettiコマンドを使用するか、❄️または🎉を含むメッセージを送信</string>
+    <string name="settings_chat_effects_title">チャットでエフェクトを表示</string>
+    <string name="settings_show_room_member_state_events">ルームのメンバーのイベントを表示</string>
     <string name="settings_inline_url_preview_summary">ホームサーバーがこの機能をサポートしている場合は、チャット内のリンクをプレビューします。</string>
     <string name="settings_integrations_summary">ボット、ブリッジ、ウィジェット、ステッカーパックの管理をします。
-\nユーザーに代わり、構成データを受信しウィジェットを変更、ルーム招待の送信、権限の設定などができます。</string>
+\nインテグレーションマネージャーは、構成データを受信し、ユーザーに代わってウィジェットの変更、ルーム招待の送信、権限の設定などを行うことができます。</string>
     <string name="settings_background_sync_update_error">設定の更新に失敗しました。</string>
     <string name="settings_integrations">インテグレーション（統合）</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">アプリがバックグラウンドにある場合、着信メッセージは通知されません。</string>
     <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name}は正確な時間に定期的にバックグラウンドで同期します（構成可能）。
-\nこれはラジオとバッテリーの使用量に影響し$ {app_name}がイベントをリッスンしていることを示す永続的な通知が表示されます。</string>
-    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name}は、デバイスの限られたリソース（バッテリー）を維持する方法でバックグラウンド同期をします。
-\nデバイスの状態によっては、OSによって同期が延期される場合があります。</string>
+\nこれは無線とバッテリーの使用量に影響し、$ {app_name}がイベントを待機していることを示す永続的な通知が表示されます。</string>
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name}は、端末の限られたリソース（バッテリーの残量）を維持する方法でバックグラウンド同期をします。
+\n端末の状態によっては、OSによって同期が延期される場合があります。</string>
     <string name="settings_system_preferences_summary">LEDの色、振動、音を選択してください…</string>
-    <string name="settings_silent_notifications_preferences">サイレント通知を構成する</string>
-    <string name="settings_call_notifications_preferences">通話の通知を設定する</string>
-    <string name="settings_noisy_notifications_preferences">うるさい通知を設定する</string>
+    <string name="settings_silent_notifications_preferences">通知（サイレント）を設定</string>
+    <string name="settings_call_notifications_preferences">通話の通知を設定</string>
+    <string name="settings_noisy_notifications_preferences">通知（音量大）を設定</string>
     <string name="settings_notification_privacy_no_background_sync">アプリはバックグラウンドでホームサーバーに接続する<b>必要がない</b>ためバッテリー使用量を減らすことができます</string>
-    <string name="settings_troubleshoot_test_battery_quickfix">最適化を無視する</string>
-    <string name="settings_troubleshoot_test_battery_failed">画面をオフにした状態でデバイスのプラグを抜いて一定時間静止したままにすると、デバイスは機内モードになります。 これにより、アプリがネットワークにアクセスできなくなり、ジョブ、同期、および標準のアラームが防止されます。</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_failed">${app_name}に対してバックグラウンド制限が有効になっています。
-\nアプリがバックグラウンドで実行しようとすると積極的に制限され、通知に影響を与える可能性があります。
+    <string name="settings_troubleshoot_test_battery_quickfix">最適化を無視</string>
+    <string name="settings_troubleshoot_test_battery_failed">画面をオフにした状態で端末のプラグを抜いて一定時間静止したままにすると、端末は機内モードになります。 これにより、アプリがネットワークにアクセスできなくなり、ジョブ、同期、および標準のアラームが防止されます。</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">${app_name}のバックグラウンド制限が有効になっています。
+\nアプリがバックグラウンドで実行しようとする作業が積極的に制限されるため、通知に影響を与える可能性があります。
 \n%1$s</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_success">${app_name}のバックグラウンド制限は無効になっています。 このテストは、モバイル（WIFIでない）を使用して実行する必要があります。
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">${app_name}のバックグラウンド制限が無効になっています。 このテストは、モバイル（WIFIでない）を使用して実行する必要があります。
 \n%1$s</string>
-    <string name="template_settings_troubleshoot_test_service_boot_failed">デバイスを再起動してもサービスは開始されません。${app_name}が一度開かれるまで通知は届きません。</string>
-    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">%1$s
-\nこのエラーは${app_name}の管理外です。 これはいくつかの理由で発生する可能性があります。 後で再試行すればうまくいくかもしれません。システム設定でGoogle Play Serviceのデータ使用量が制限されていないか、デバイスの時刻が正しいかどうか、もしくはカスタムROMで起こることがあります。</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">端末を再起動してもサービスは開始しません。${app_name}を一度開くまで通知は届きません。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">［%1$s］
+\nこのエラーは${app_name}の管理外です。 これはいくつかの理由で発生する可能性があります。 後で再試行すればうまくいくかもしれません。システム設定でGoogle Playサービスのデータ使用量が制限されていないか、端末の時刻が正しいかどうかを確認してください。カスタムROMで生じることもあります。</string>
     <string name="template_settings_add_3pid_flow_not_supported">${app_name}モバイルからこれを行うことはできません</string>
     <string name="template_settings_troubleshoot_test_battery_success">${app_name}はバッテリー最適化の影響を受けません。</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">制限を無効にする</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">起動時の開始を有効にする</string>
-    <string name="settings_troubleshoot_test_service_boot_success">デバイスを再起動するとサービスが開始されます。</string>
+    <string name="settings_troubleshoot_test_service_boot_success">端末を再起動するとサービスが開始します。</string>
     <string name="settings_troubleshoot_test_service_restart_failed">サービスの再起動に失敗しました</string>
     <string name="settings_troubleshoot_test_service_restart_success">サービスが強制終了され、自動的に再起動されました。</string>
     <string name="settings_troubleshoot_test_service_restart_title">通知サービスの自動再起動</string>
@@ -1504,25 +1499,25 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="settings_troubleshoot_test_notification_notice">通知をクリックしてください。 通知が表示されない場合は、システム設定を確認してください。</string>
     <string name="settings_troubleshoot_test_notification_title">通知を表示</string>
     <string name="settings_troubleshoot_test_push_notification_content">通知を表示しています。 クリックしてください！</string>
-    <string name="settings_troubleshoot_test_push_loop_failed">プッシュの受信に失敗しました。 解決策は、アプリケーションを再インストールすることです。</string>
-    <string name="settings_troubleshoot_test_push_loop_success">アプリケーションはプッシュを受信しています</string>
-    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">アプリケーションはプッシュを待っています</string>
-    <string name="settings_troubleshoot_test_push_loop_title">テストプッシュ</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">FCMトークンのホームサーバーへの登録に失敗しました。:
+    <string name="settings_troubleshoot_test_push_loop_failed">プッシュ通知の受信に失敗しました。 アプリケーションを再インストールすれば解決するかもしれません。</string>
+    <string name="settings_troubleshoot_test_push_loop_success">アプリケーションはプッシュ通知を受信しています</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">アプリケーションはプッシュ通知を待っています</string>
+    <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_title">トークンの登録</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">アカウントを追加する</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">アカウントを追加</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nこのエラーは、${app_name}の管理外です。スマホにはGoogleアカウントがありません。アカウントマネージャーを開いて、Googleアカウントを追加してください。</string>
-    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">%1$s
-\nこのエラーは${app_name}の管理外であり、Googleによると、このエラーは、デバイスにFCMに登録されているアプリが多すぎることを示しています。 このエラーは、アプリの数が極端に多い場合にのみ発生するため、平均的なユーザーには影響しません。</string>
+\nこのエラーは${app_name}の管理外です。このスマートフォンにはGoogleアカウントが登録されていません。アカウントマネージャーを開いて、Googleアカウントを追加してください。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">［%1$s］
+\nこのエラーは${app_name}の管理外です。Googleによると、このエラーは、FCMに登録されている端末上のアプリの数が多すぎることを示唆しています。 このエラーは、アプリの数が極端に多い場合にのみ発生するため、平均的なユーザーには影響しません。</string>
     <string name="template_settings_troubleshoot_test_play_services_failed">${app_name}はGoogle Playサービスを使用してプッシュメッセージを配信していますが、正しく設定されていないようです:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCMトークンの取得に失敗しました:
 \n%1$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉すべてのサーバの参加を禁止されています！このルームは使用できなくなりました。</string>
-    <string name="notice_room_server_acl_updated_no_change">変化がありません。</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉全てのサーバーの参加がブロックされています！このルームは使用できなくなりました。</string>
+    <string name="notice_room_server_acl_updated_no_change">変更はありません。</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>
     <string name="notice_room_server_acl_updated_was_allowed">• %sに一致するサーバーが許可リストから削除されました。</string>
@@ -1530,91 +1525,91 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="notice_room_server_acl_updated_was_banned">• %sに一致するサーバーが禁止リストから削除されました。</string>
     <string name="notice_room_server_acl_updated_banned">• %sに一致するサーバーは禁止されています。</string>
     <plurals name="two_and_some_others_read">
-        <item quantity="other">%1$sや %2$sそれに%3$dに他の人も読みました</item>
+        <item quantity="other">%1$s、%2$s、他%3$d人のユーザーが読みました</item>
     </plurals>
-    <string name="three_users_read">%1$sや %2$sそれに%3$sが読みました</string>
-    <string name="command_description_plain">メッセージをマークダウンとして解釈せずにプレーンテキストとして送信する</string>
+    <string name="three_users_read">%1$s、%2$s、%3$sが読みました</string>
+    <string name="command_description_plain">メッセージをマークダウンとして解釈せずにプレーンテキストとして送信</string>
     <string name="keys_backup_setup_step3_save_button_title">ファイルとして保存</string>
     <string name="keys_backup_setup_step3_share_recovery_file">共有</string>
     <string name="keys_backup_setup_step3_button_title">完了</string>
     <string name="keys_backup_setup_step3_success_title">成功！</string>
-    <string name="keys_backup_setup_creating_backup">バックアップを作成中</string>
+    <string name="keys_backup_setup_creating_backup">バックアップを作成しています</string>
     <string name="keys_backup_setup_step2_button_title">パスフレーズを設定</string>
-    <string name="keys_backup_setup_step1_manual_export">手動でキーをエクスポート</string>
-    <string name="keys_backup_setup">キーバックアップを使って開始する</string>
+    <string name="keys_backup_setup_step1_manual_export">手動で鍵をエクスポート</string>
+    <string name="keys_backup_setup">鍵のバックアップを使用開始</string>
     <string name="passphrase_passphrase_too_weak">パスフレーズが弱すぎます</string>
     <string name="passphrase_empty_error_message">パスフレーズを入力してください</string>
-    <string name="no_valid_google_play_services_apk">Google PlayサービスのAPKが見つかりませんでした。通知がうまく機能しない場合があります。</string>
+    <string name="no_valid_google_play_services_apk">Google PlayサービスのAPKが見つかりませんでした。通知が適切に機能しない場合があります。</string>
     <string name="error_empty_field_enter_user_name">ユーザー名を入力してください。</string>
     <string name="ignore_request_short_label">無視</string>
     <string name="share_without_verifying_short_label">共有</string>
-    <string name="widget_integration_review_terms">続けるには利用規約に同意する必要があります。</string>
+    <string name="widget_integration_review_terms">続行するには利用規約を承認する必要があります。</string>
     <string name="room_widget_resource_decline_permission">全てブロック</string>
     <string name="room_widget_resource_grant_permission">許可</string>
-    <string name="room_widget_permission_room_id">部屋ID</string>
+    <string name="room_widget_permission_room_id">ルームID</string>
     <string name="room_widget_permission_widget_id">ウィジェットID</string>
     <string name="room_widget_permission_theme">あなたのテーマ</string>
     <string name="room_widget_permission_user_id">あなたのユーザーID</string>
-    <string name="room_widget_permission_avatar_url">あなたのアバターURL</string>
-    <string name="room_widget_open_in_browser">ブラウザで開く</string>
-    <string name="room_widget_permission_title">ウィジェットをロードする</string>
+    <string name="room_widget_permission_avatar_url">あなたのアバターのURL</string>
+    <string name="room_widget_open_in_browser">ブラウザーで開く</string>
+    <string name="room_widget_permission_title">ウィジェットを読み込む</string>
     <string name="room_widget_activity_title">ウィジェット</string>
-    <string name="active_widgets_title">アクティブなウィジェット</string>
+    <string name="active_widgets_title">使用中のウィジェット</string>
     <string name="notification_sender_me">自分</string>
     <string name="notification_new_messages">新しいメッセージ</string>
-    <string name="notification_unknown_room_name">部屋</string>
+    <string name="notification_unknown_room_name">ルーム</string>
     <string name="notification_unknown_new_event">新しいイベント</string>
     <string name="encryption_information_unknown_ip">不明なIP</string>
     <plurals name="encryption_import_room_keys_success">
-        <item quantity="other">キー %1$dと%2$dのインポートに成功。</item>
+        <item quantity="other">%2$d個の鍵のうち%1$d個のインポートに成功。</item>
     </plurals>
-    <string name="encryption_settings_manage_message_recovery_summary">キーバックアップを管理</string>
-    <string name="encryption_exported_successfully">キーのエクスポートに成功しました</string>
+    <string name="encryption_settings_manage_message_recovery_summary">鍵のバックアップを管理</string>
+    <string name="encryption_exported_successfully">鍵のエクスポートに成功しました</string>
     <string name="media_source_choose">選択</string>
     <string name="compression_opt_list_choose">選択</string>
-    <string name="account_additional_info">詳細情報: %s</string>
-    <string name="room_alias_local_address_add">ローカルアドレスを追加する</string>
-    <string name="room_alias_local_address_empty">この部屋はローカルアドレスがありません</string>
-    <string name="room_alias_delete_confirmation">アドレス \"%1$s\" を削除しますか？</string>
+    <string name="account_additional_info">詳細情報：%s</string>
+    <string name="room_alias_local_address_add">ローカルアドレスを追加</string>
+    <string name="room_alias_local_address_empty">このルームにはローカルアドレスがありません</string>
+    <string name="room_alias_delete_confirmation">アドレス\"%1$s\"を削除しますか？</string>
     <string name="room_alias_main_address_hint">メインアドレス</string>
     <string name="room_alias_published_alias_main">これがメインアドレスです</string>
     <string name="account_phone_number_error">電話番号の認証中にエラーが発生しました。</string>
     <string name="invite_by_link">リンクを共有</string>
-    <string name="invite_to_space_with_name">%s に招待する</string>
-    <string name="invite_by_email">Eメールで招待</string>
+    <string name="invite_to_space_with_name">%sに招待</string>
+    <string name="invite_by_email">電子メールで招待</string>
     <string name="create_space_topic_hint">詳細</string>
-    <string name="invite_people_menu">人を招待する</string>
-    <string name="join_anyway">とにかく参加する</string>
-    <string name="space_add_child_title">部屋を追加する</string>
-    <string name="user_invites_you">%s はあなたを招待しています</string>
-    <string name="no_permissions_to_start_conf_call">この部屋で電話会議をする権利がありません</string>
-    <string name="audio_meeting">オーディオミーティングを開始する</string>
+    <string name="invite_people_menu">連絡先を招待</string>
+    <string name="join_anyway">無視して参加</string>
+    <string name="space_add_child_title">ルームを追加</string>
+    <string name="user_invites_you">%sはあなたを招待しています</string>
+    <string name="no_permissions_to_start_conf_call">このルームでグループ通話を開始する権限がありません</string>
+    <string name="audio_meeting">オーディオミーティングを開始</string>
     <string name="secure_backup_setup">安全バックアップを設定</string>
-    <string name="keys_backup_banner_update_line2">暗号鍵バックアップで管理</string>
-    <string name="keys_backup_banner_recover_line2">暗号鍵バックアップを使用</string>
-    <string name="secure_backup_banner_setup_line2">暗号化されたメッセージ及びデータへのアクセスを喪失しないための安全措置</string>
-    <string name="keys_backup_banner_setup_line2">暗号鍵のバックアップを開始</string>
+    <string name="keys_backup_banner_update_line2">鍵のバックアップで管理</string>
+    <string name="keys_backup_banner_recover_line2">鍵のバックアップを使用</string>
+    <string name="secure_backup_banner_setup_line2">暗号化されたメッセージとデータへのアクセスが失われるのを防ぎましょう</string>
+    <string name="keys_backup_banner_setup_line2">鍵のバックアップを使用開始</string>
     <string name="new_recovery_method_popup_was_me">自分でした</string>
-    <string name="new_recovery_method_popup_description">新しい暗号化されたメッセージの暗号鍵バックアップが検出されました。
+    <string name="new_recovery_method_popup_description">メッセージの鍵の新しい安全なバックアップが検出されました。
 \n
-\n新しい復元方法を設定しなかった場合、攻撃者がアカウントへアクセスしようとしている可能性があります。アカウントを守るために、設定ですぐにアカウントのパスワードを変更し新しい復元方法を設定してください。</string>
-    <string name="new_recovery_method_popup_title">新しい暗号鍵バックアップ</string>
-    <string name="keys_backup_settings_delete_confirm_message">バックアップされた暗号鍵をサーバーから削除しますか？　現在のリカバリーキーを使って、暗号化されたメッセージの履歴を読むことができなくなります。</string>
+\n新しい復元方法を設定しなかった場合、攻撃者がアカウントへアクセスしようとしている可能性があります。アカウントを守るために、設定ですぐにアカウントのパスワードを変更し、新しい復元方法を設定してください。</string>
+    <string name="new_recovery_method_popup_title">鍵の新しいバックアップ</string>
+    <string name="keys_backup_settings_delete_confirm_message">バックアップされた暗号鍵をサーバーから削除しますか？今後、現在のリカバリーキーを使って、暗号化されたメッセージの履歴を読むことができなくなります。</string>
     <string name="keys_backup_settings_delete_confirm_title">バックアップを削除</string>
-    <string name="keys_backup_settings_checking_backup_state">バックアップの状態を確認中</string>
+    <string name="keys_backup_settings_checking_backup_state">バックアップの状態を確認しています</string>
     <string name="keys_backup_settings_delete_backup_error">バックアップの削除に失敗しました（%s）</string>
-    <string name="keys_backup_settings_deleting_backup">バックアップを削除中…</string>
-    <string name="keys_backup_settings_untrusted_backup">このセッションで暗号鍵のバックアップを使用するには、パスフレーズまたはリカバリーキーでバックアップを復元してください。</string>
-    <string name="keys_backup_settings_invalid_signature_from_unverified_device">バックアップは%sという未検証セッションによる不正なしょめいがあります</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_deleting_backup">バックアップを削除しています…</string>
+    <string name="keys_backup_settings_untrusted_backup">このセッションで鍵のバックアップを使用するには、パスフレーズまたはリカバリーキーでバックアップを復元してください。</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">バックアップには未認証のセッション %s による不正な署名があります</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というIDの不明のセッションによる署名があります。</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_get_version_error">最新の復号キーのバージョンを取得するのに失敗しました（%s）。</string>
+    <string name="keys_backup_settings_signature_from_unknown_device">バックアップには%sというIDの不明のセッションによる署名があります。</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_get_version_error">最新の復号化キーのバージョンを取得するのに失敗しました（%s）。</string>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="other">%d個の新しい鍵がこのセッションに追加されました。</item>
     </plurals>
@@ -1622,57 +1617,57 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
         <item quantity="other">%d個のキーが含まれたバックアップを復元しました。</item>
     </plurals>
     <string name="keys_backup_restore_success_title">バックアップが復元されました %s！</string>
-    <string name="keys_backup_recovery_code_error_decrypt">このリカバリーキーではバックアップを復号できませんでした。正しいリカバリーキーを入力したことを確認してください。</string>
+    <string name="keys_backup_recovery_code_error_decrypt">このリカバリーキーではバックアップを復号化できませんでした。正しいリカバリーキーを入力したことを確認してください。</string>
     <string name="keys_backup_recovery_code_empty_error_message">リカバリーキーを入力してください</string>
-    <string name="keys_backup_unlock_button">履歴をアンロック</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_unlock_button">履歴のロックを解除</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_waiting_message">バックアップを復元:</string>
-    <string name="network_error_please_check_and_retry">ネットワークエラー: 接続を確認して再試行してください。</string>
-    <string name="keys_backup_passphrase_error_decrypt">このパスフレーズではバックアップを復号できませんでした。正しい復元パスフレーズを入力したことを確認してください。</string>
+    <string name="keys_backup_restoring_waiting_message">バックアップを復元しています：</string>
+    <string name="network_error_please_check_and_retry">ネットワークエラー：接続を確認して再試行してください。</string>
+    <string name="keys_backup_passphrase_error_decrypt">このパスフレーズではバックアップを復号化できませんでした。正しいリカバリーパスフレーズを入力したことを確認してください。</string>
     <string name="keys_backup_restore_with_key_helper">リカバリーキーを喪失しましたか？　設定で新しいリカバリーキーを設定できます。</string>
-    <string name="keys_backup_restore_setup_recovery_key">メッセージの復元</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_helper_with_link">復元パスフレーズをご存知でなければ、%sができます。</string>
-    <string name="keys_backup_restore_with_recovery_key">リカバリーキーを使用して暗号化されたメッセージ履歴をアンロックします</string>
+    <string name="keys_backup_restore_setup_recovery_key">メッセージの復旧</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_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_use_recovery_key">リカバリーキーを使用</string>
-    <string name="keys_backup_setup_skip_msg">ログアウトしたりこの端末を失くしたりすればメッセージへのアクセスを失う可能性があります。</string>
-    <string name="keys_backup_setup_skip_title">本当によろしいですか？</string>
-    <string name="keys_backup_setup_backup_started_message">暗号鍵が現在バックグラウンドでホームサーバーへバックアップされています。初期バックアップは数分かかることがあります。</string>
-    <string name="keys_backup_setup_backup_started_title">バックアップが開始されました</string>
-    <string name="unexpected_error">予期せぬエラー</string>
+    <string name="keys_backup_setup_skip_msg">ログアウトしたりこの端末を失くしたりすると、メッセージにアクセスできなくなる可能性があります。</string>
+    <string name="keys_backup_setup_skip_title">続行しますか？</string>
+    <string name="keys_backup_setup_backup_started_message">暗号鍵を現在バックグラウンドでホームサーバーにバックアップしています。最初のバックアップには数分かかることがあります。</string>
+    <string name="keys_backup_setup_backup_started_title">バックアップが開始しました</string>
+    <string name="unexpected_error">予期しないエラー</string>
     <string name="recovery_key">リカバリーキー</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_please_make_copy">コピーをしてください</string>
     <string name="keys_backup_setup_override_stop">中止</string>
     <string name="keys_backup_setup_override_replace">上書き</string>
-    <string name="keys_backup_setup_override_backup_prompt_description">違うセッションにより設定されたキーのバックアップが存在してます。上書きしますか？</string>
-    <string name="keys_backup_setup_override_backup_prompt_tile">ホームサーバにバックアップが存在しています</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">別のセッションで鍵のバックアップを既に設定しているようです。上書きしますか？</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">ホームサーバーにバックアップが存在しています</string>
     <string name="recovery_key_export_saved">リカバリーキーが保存されました。</string>
     <string name="recovery_key_export_saved_as_warning">リカバリーキーが%sに保存されました。
 \n
-\n注意: アプリケーションを削除した場合、ファイルは削除される可能性があります。</string>
+\n注意: アプリケーションを削除した場合、リカバリーキーが削除される可能性があります。</string>
     <string name="keys_backup_setup_step3_copy_button_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_step3_text_line2">リカバリーキーはセーフティーネットとなります。パスフレーズを忘れた場合でも、リカバリーキーを使えば、暗号化されたメッセージにアクセスすることができます。
 \nリカバリーキーは、パスワードマネージャー（もしくは金庫）のような、非常に安全な場所で保管してください。</string>
-    <string name="keys_backup_setup_step3_text_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_step2_text_description">暗号鍵のコピーを暗号化してホームサーバに保存します。バックアップを保護するためにパスフレーズを設定してください。
+    <string name="keys_backup_setup_step2_text_description">鍵のコピーを暗号化してホームサーバーに保存します。バックアップを保護するためにパスフレーズを設定してください。
 \n
-\n最高度のセキュリティのために、アカウントのパスワードと異なることが大切です。</string>
+\n最大限のセキュリティーを確保するために、アカウントのパスワードと異なるものに設定することが大切です。</string>
     <string name="keys_backup_setup_step2_text_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_step1_advanced">（高度）</string>
-    <string name="keys_backup_setup_step1_title">暗号されたメッセージを絶対に失わないために</string>
+    <string name="keys_backup_setup_step1_title">暗号化されたメッセージを決して失わないために</string>
     <string name="keys_backup_no_session_error">利用可能なMatrixセッションがありません</string>
     <string name="template_keys_backup_passphrase_not_empty_error_message">${app_name}によるリカバリーキーの生成を望む場合、パスフレーズを削除してください。</string>
     <string name="markdown_has_been_disabled">マークダウンが無効です。</string>
@@ -1680,109 +1675,109 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="command_problem_with_parameters">”%s”とのコマンドはいくつかのパラメータが欠けているか不正です。</string>
     <string name="settings_labs_enable_send_voice_summary">この機能はメッセージを録音するために第三者のアプリを必要とします。</string>
     <string name="you_added_a_new_device_with_info">新しいセッションが暗号鍵を要請しています。
-\nセッション名: %1$s
-\n最後のオンライン時刻: %2$s
+\nセッション名：%1$s
+\n最後のオンライン日時：%2$s
 \n新たにログインして新しいセッションを開始しなかった場合、この要求を無視してください。</string>
-    <string name="your_unverified_device_requesting_with_info">未検証のセッションが暗号鍵を要請しています。
-\nセッション名: %1$s
-\n最後のオンライン時刻: %2$s
+    <string name="your_unverified_device_requesting_with_info">未認証のセッションが暗号鍵を要請しています。
+\nセッション名：%1$s
+\n最後のオンライン日時：%2$s
 \n新たにログインして新しいセッションを開始しなかった場合、この要求を無視してください。</string>
-    <string name="key_share_request">暗号鍵共有要請</string>
+    <string name="key_share_request">鍵の共有リクエスト</string>
     <string name="settings_labs_native_camera_summary">カスタムカメラ画面の代わりにシステムカメラを使用します。</string>
     <string name="room_no_active_widgets">使用中のウィジェットがありません</string>
     <string name="room_manage_integrations">インテグレーションを管理</string>
-    <string name="integration_manager_not_configured">インテグレーション管理者が設定されていません。</string>
-    <string name="room_widget_webview_read_protected_media">DRM保護されているメディアの読込</string>
+    <string name="integration_manager_not_configured">インテグレーションマネージャーが設定されていません。</string>
+    <string name="room_widget_webview_read_protected_media">DRM保護されているメディアを読み込む</string>
     <string name="room_widget_webview_access_microphone">マイクの使用</string>
     <string name="room_widget_webview_access_camera">カメラの使用</string>
     <string name="room_widget_resource_permission_title">このウィジェットは次のリソースの使用を要求します:</string>
-    <string name="jitsi_leave_conf_to_join_another_one_content">現在の会議から退出しもう一つの会議に参加しますか？</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">現在の会議から退出し、もう一つの会議に参加しますか？</string>
     <string name="error_jitsi_join_conf">申し訳ありませんが、ビデオ会議に参加する途中で問題が発生しました</string>
-    <string name="error_jitsi_not_supported_on_old_device">申し訳ありませんが、古い端末（Android OS 6.0以前）はJitsiを使用したビデオ会議がサポートされていません</string>
+    <string name="error_jitsi_not_supported_on_old_device">申し訳ありませんが、古い端末（Android OS 6.0以前）はJitsiを使用したビデオ会議をサポートしていません</string>
     <string name="room_widget_permission_display_name">あなたの表示名</string>
-    <string name="room_widget_failed_to_load">ウィジェットの読込に失敗しました。
+    <string name="room_widget_failed_to_load">ウィジェットの読み込みに失敗しました。
 \n%s</string>
-    <string name="room_widget_reload">ウィジェットを再読込</string>
-    <string name="room_widget_permission_webview_shared_info_title">クッキーを設定し%sとデータを交換する可能性があります：</string>
+    <string name="room_widget_reload">ウィジェットを再読み込み</string>
+    <string name="room_widget_permission_webview_shared_info_title">これを使用すると、クッキーが設定され、データが%sと共有される可能性があります：</string>
     <string name="room_widget_permission_added_by">ウィジェットの追加者:</string>
-    <string name="notification_inline_reply_failed">**送信に失敗 - 部屋を開いてください</string>
+    <string name="notification_inline_reply_failed">**送信に失敗 - ルームを開いてください</string>
     <string name="notification_new_invitation">新しい招待</string>
     <string name="notification_unread_notified_messages_and_invitation">%1$sと%2$s</string>
-    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s に %2$s と %3$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$sに%2$sと%3$s</string>
     <plurals name="notification_compat_summary_title">
         <item quantity="other">%d件の通知</item>
     </plurals>
     <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="other">%1$s: %2$d件のメッセージ</item>
+        <item quantity="other">%1$s：%2$d件のメッセージ</item>
     </plurals>
     <plurals name="notification_invitations">
         <item quantity="other">%d件の招待</item>
     </plurals>
-    <string name="directory_add_a_new_server_error_already_added">既にリストに載っているサーバーです</string>
-    <string name="directory_add_a_new_server_error">サーバーまたはその部屋一覧が見つかりません</string>
-    <string name="directory_add_a_new_server_prompt">検索される新しいサーバーの名前を入力します。</string>
+    <string name="directory_add_a_new_server_error_already_added">既に一覧に載っているサーバーです</string>
+    <string name="directory_add_a_new_server_error">サーバーまたはそのルーム一覧が見つかりません</string>
+    <string name="directory_add_a_new_server_prompt">探索したい新しいサーバーの名前を入力してください。</string>
     <string name="directory_add_a_new_server">新しいサーバーを追加</string>
-    <string name="directory_your_server">あなたのサーバ</string>
+    <string name="directory_your_server">あなたのサーバー</string>
     <string name="encryption_message_recovery">暗号化されたメッセージの復元</string>
-    <string name="device_name_warning">セッションの公開名は会話中の相手に閲覧できます</string>
-    <string name="room_settings_room_version_title">部屋のバージョン</string>
+    <string name="device_name_warning">セッションの公開名は、あなたとやり取りする人々に対して表示されます</string>
+    <string name="room_settings_room_version_title">ルームのバージョン</string>
     <plurals name="room_settings_banned_users_count">
-        <item quantity="other">banされたユーザー%d人</item>
+        <item quantity="other">ブロックされたユーザー%d人</item>
     </plurals>
-    <string name="room_settings_room_access_restricted_description">この部屋が含まれているスペースの参加者誰でも発見し参加できます。部屋をスペースに追加できるのは部屋の管理者だけです。</string>
+    <string name="room_settings_room_access_restricted_description">このルームのあるスペースのメンバーは、誰でもこのルームを発見し参加できます。ルームをスペースに追加できるのは、ルームの管理者だけです。</string>
     <string name="room_settings_room_access_restricted_title">スペースのメンバーのみ</string>
-    <string name="room_settings_room_access_public_description">誰でも部屋を発見し参加できます</string>
+    <string name="room_settings_room_access_public_description">誰でもルームを発見し参加できます</string>
     <string name="room_settings_room_access_public_title">公開</string>
-    <string name="room_settings_room_access_private_description">参加された人のみが部屋を発見し参加できます</string>
-    <string name="room_settings_room_access_private_title">プライベート</string>
+    <string name="room_settings_room_access_private_description">招待された人だけが発見し参加できます</string>
+    <string name="room_settings_room_access_private_title">非公開</string>
     <string name="room_settings_room_access_entry_unknown">不明のアクセス設定（%s）</string>
-    <string name="room_settings_room_access_entry_knock">誰でもノックができ、メンバーがその参加を承認または拒否できます</string>
-    <string name="room_alias_publish_to_directory_error">現在の部屋一覧可視性状態を取得できません（%1$s）。</string>
-    <string name="room_alias_publish_to_directory">この部屋を%1$sの部屋一覧に公開しますか？</string>
-    <string name="room_alias_action_unpublish">アドレスを非公開にする</string>
-    <string name="room_alias_action_publish">アドレスを公開</string>
-    <string name="room_alias_local_address_subtitle">同じホームサーバー（%1$s）の他のユーザーがこの部屋を見つけられるようにアドレスを設定できます。</string>
+    <string name="room_settings_room_access_entry_knock">誰でもルームにノックができ、メンバーがその参加を承認または拒否できます</string>
+    <string name="room_alias_publish_to_directory_error">現在のルームディレクトリの見え方を取得できません（%1$s）。</string>
+    <string name="room_alias_publish_to_directory">このルームを%1$sのルームディレクトリに公開しますか？</string>
+    <string name="room_alias_action_unpublish">このアドレスを非公開にする</string>
+    <string name="room_alias_action_publish">このアドレスを公開</string>
+    <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_can_add">他の公開アドレスはまだありません。以下から追加できます。</string>
     <string name="room_alias_address_empty">他の公開アドレスはまだありません。</string>
-    <string name="room_alias_publish">部屋を%1$sの部屋一覧に公開しますか？</string>
+    <string name="room_alias_publish">このルームを%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_subtitle">公開されたアドレスを通して、どのサーバーのどのユーザーでもこの部屋に参加できます。アドレスを公開するには、まずローカルアドレスとして設定する必要があります。</string>
+    <string name="room_alias_published_alias_subtitle">公開アドレスを通して、どのサーバーのどのユーザーでも、このルームに参加できます。アドレスを公開するには、まずローカルアドレスとして設定する必要があります。</string>
     <string name="room_alias_published_alias_title">公開アドレス</string>
-    <string name="room_alias_title">部屋のアドレス</string>
-    <string name="room_settings_alias_subtitle">部屋のアドレス及び部屋一覧における可視性を管理できます。</string>
+    <string name="room_alias_title">ルームのアドレス</string>
+    <string name="room_settings_alias_subtitle">このルームのアドレスと、ルームディレクトリにおける見え方を管理できます。</string>
     <string name="space_settings_alias_subtitle">スペースのアドレスを管理できます。</string>
     <string name="space_settings_alias_title">スペースのアドレス</string>
     <string name="room_settings_alias_title">ルームのアドレス</string>
     <string name="room_settings_guest_access_title">ゲストの参加を許可</string>
     <string name="room_settings_room_access_title">ルームへのアクセス</string>
-    <string name="room_settings_room_read_history_dialog_subtitle">発信履歴閲覧権限の変更は今後送信されるメッセージにのみ適用されます。既存履歴の表示は影響されません。</string>
+    <string name="room_settings_room_read_history_dialog_subtitle">履歴の閲覧権限に関する変更は、今後、このルームで表示されるメッセージにのみ適用されます。既存の履歴の見え方には影響しません。</string>
     <string name="continue_anyway">無視して続行</string>
-    <string name="option_always_ask">毎回確認する</string>
+    <string name="option_always_ask">毎回確認</string>
     <string name="spaces_invited_header">招待</string>
     <string name="suggested_header">おすすめのルーム</string>
     <string name="spaces_header">スペース</string>
-    <string name="hs_client_url">ホームサーバAPIのURL</string>
-    <string name="auth_add_email_phone_message_2">復旧用のメールアドレスを設定します。後からオプションでメールアドレスや電話番号を使用して知人に見つけてもらえるようにできます。</string>
-    <string name="auth_add_phone_message_2">電話番号を設定して、後からオプションで知人に見つけてもらえるようにできます。</string>
-    <string name="call_failed_no_ice_use_alt">%s を使用してみてください</string>
+    <string name="hs_client_url">ホームサーバーAPIのURL</string>
+    <string name="auth_add_email_phone_message_2">アカウント復旧用のメールアドレスを設定します。後からオプションでメールアドレスや電話番号を使用して知人に見つけてもらえるようにできます。</string>
+    <string name="auth_add_phone_message_2">電話番号を設定します。後からオプションで知人に見つけてもらえるようにできます。</string>
+    <string name="call_failed_no_ice_use_alt">%sを使用してみてください</string>
     <string name="room_widget_revoke_access">アクセスを取り消す</string>
     <string name="active_widget_view_action">表示</string>
     <string name="direct_room_encryption_enabled_tile_description">このルーム内のメッセージはエンドツーエンド暗号化されています。</string>
     <string name="room_member_open_or_create_dm">ダイレクトメッセージ</string>
-    <string name="room_filtering_footer_create_new_direct_message">新しいダイレクトメッセージを送信する</string>
+    <string name="room_filtering_footer_create_new_direct_message">新しいダイレクトメッセージを送信</string>
     <string name="login_set_email_optional_hint">メールアドレス（任意）</string>
     <string name="login_set_email_mandatory_hint">メールアドレス</string>
-    <string name="login_set_email_notice">アカウントを回復するためのメールを設定します。 後で、オプションで、あなたが知人にあなたのメールに見つけてもらえるようにできます。</string>
-    <string name="login_set_email_title">メールアドレスを設定する</string>
+    <string name="login_set_email_notice">アカウント復旧用のメールアドレスを設定します。後からオプションで知人に見つけてもらえるようにできます。</string>
+    <string name="login_set_email_title">メールアドレスを設定</string>
     <string name="login_reset_password_mail_confirmation_submit">メールアドレスを確認しました</string>
-    <string name="settings_discovery_emails_title">検出可能なメールアドレス</string>
-    <string name="login_terms_title">続行するには条件に同意してください</string>
-    <string name="error_terms_not_accepted">ホームサーバーの利用規約に同意したら、再試行してください。</string>
+    <string name="settings_discovery_emails_title">発見可能なメールアドレス</string>
+    <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_set_msisdn_submit">次に</string>
@@ -1790,48 +1785,48 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="login_reset_password_submit">次に</string>
     <string name="invite_by_username">ユーザー名で招待</string>
     <string name="error_empty_field_choose_user_name">ユーザー名を選択してください。</string>
-    <string name="auth_invalid_login_param_space_in_password">ユーザー名やパスワードが正しくありません。 入力したパスワードは、スペースで開始または終了しますので、ご確認ください。</string>
+    <string name="auth_invalid_login_param_space_in_password">ユーザー名やパスワードが正しくありません。 入力したパスワードは、スペースで開始または終了していますので、ご確認ください。</string>
     <string name="login_signup_error_user_in_use">そのユーザー名は既に使用されています</string>
     <string name="login_signup_username_hint">ユーザー名</string>
-    <string name="login_signin_username_hint">ユーザー名または電子メール</string>
+    <string name="login_signin_username_hint">ユーザー名またはメールアドレス</string>
     <string name="login_social_signin_with">%sでサインイン</string>
     <string name="login_social_signup_with">%sでサインアップ</string>
-    <string name="login_social_continue_with">%sで続ける</string>
+    <string name="login_social_continue_with">%sで続行</string>
     <string name="login_social_continue">または</string>
-    <string name="login_signin_sso">SSOを続行します</string>
+    <string name="login_signin_sso">シングルサインオンで続行</string>
     <string name="login_signin">サインイン</string>
     <string name="login_signup">サインアップ</string>
-    <string name="login_connect_to_modular">Element Matrix Servicesに接続する</string>
+    <string name="login_connect_to_modular">Element Matrix Servicesに接続</string>
     <string name="login_signin_matrix_id_title">Matrix IDでサインイン</string>
     <string name="login_connect_using_matrix_id_submit">Matrix IDでサインイン</string>
-    <string name="login_server_modular_learn_more">もっと詳しく知る</string>
+    <string name="login_server_modular_learn_more">詳しく知る</string>
     <string name="login_server_other_title">その他</string>
     <string name="login_server_other_text">カスタムと高度な設定</string>
     <string name="login_server_url_form_modular_text">組織向けのプレミアムホスティング</string>
     <string name="login_server_modular_text">組織向けのプレミアムホスティング</string>
-    <string name="login_server_matrix_org_text">最大のパブリックサーバーで数百万人に無料で参加</string>
+    <string name="login_server_matrix_org_text">最大のパブリックサーバーで、数百万人に無料で参加</string>
     <string name="login_server_text">メールと同じように、アカウントには1つのホームがありますが、誰とでも話すことができます</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>
-    <string name="auth_add_email_message_2">アカウントの復旧用のメールアドレスを設定して、後からオプションで知人に見つけてもらえるようにできます。</string>
+    <string name="login_splash_text1">直接またはグループで連絡先とチャット</string>
+    <string name="login_splash_title">自分の会話は、自分のものに。</string>
+    <string name="auth_add_email_message_2">アカウント復旧用のメールアドレスを設定します。後からオプションで知人に見つけてもらえるようにできます。</string>
     <string name="this_is_the_beginning_of_dm">ここが%sとのダイレクトメッセージのスタート地点です。</string>
-    <string name="no_message_edits_found">編集が見つかりません</string>
-    <string name="message_edits">メッセージを編集する</string>
-    <string name="downloaded_file">ファイル %1$s はダウンロードされました!</string>
-    <string name="send_file_step_compressing_video">ビデオの圧縮%d%%</string>
+    <string name="no_message_edits_found">変更履歴はありません</string>
+    <string name="message_edits">メッセージの変更履歴</string>
+    <string name="downloaded_file">ファイル %1$s をダウンロードしました!</string>
+    <string name="send_file_step_compressing_video">ビデオを%d%%圧縮しています</string>
     <string name="send_file_step_compressing_image">画像を圧縮しています…</string>
-    <string name="settings_labs_show_complete_history_in_encrypted_room">暗号化されたルームで完全な履歴を表示する</string>
-    <string name="give_feedback">フィードバックを与える</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">暗号化されたルームで完全な履歴を表示</string>
+    <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="feedback">フィードバック</string>
-    <string name="send_feedback_space_info">現在、spaceのベータ版を使用しています。お客様のフィードバックは次のバージョンに反映されます。ご意見を参考にさせていただくため、お客様のプラットフォームとユーザー名を記載させていただきます。</string>
-    <string name="send_feedback_space_title">スペースについてフィードバック</string>
+    <string name="send_feedback_space_info">現在「スペース」のベータ版を使用しています。あなたのフィードバックは今後のバージョンに反映されます。ご意見を最大限に参考にさせていただくため、あなたのプラットフォームとユーザー名を記録させていただきます。</string>
+    <string name="send_feedback_space_title">スペースについてのフィードバック</string>
     <string name="send_suggestion_failed">提案の送信に失敗しました(%s)</string>
     <string name="send_suggestion_sent">ありがとうございます、提案は正常に送信されました</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">トークンの登録</string>
@@ -1839,37 +1834,36 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <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>
+    <string name="settings_push_rules_no_rules">プッシュ通知に関するルールが定義されていません</string>
+    <string name="settings_push_rules">プッシュ通知に関するルール</string>
     <string name="settings_expert">エキスパート</string>
     <string name="quick_reactions">クイックリアクション</string>
-    <string name="navigate_to_room_when_already_in_the_room">あなたはすでにこの部屋を見ています!</string>
-    <string name="settings_other_third_party_notices">その他のサードパーティーの通知</string>
-    <string name="settings_sdk_version">Matrix SDK バージョン</string>
-    <string name="import_e2e_keys_from_file">ファイル\"%1$s\"からe2eキーをインポートします。</string>
-    <string name="keys_backup_unable_to_get_keys_backup_data">キーのバックアップデータの取得中にエラーが発生しました</string>
+    <string name="navigate_to_room_when_already_in_the_room">あなたは既にこのルームを見ています！</string>
+    <string name="settings_other_third_party_notices">その他のサードパーティーの使用に関する掲示</string>
+    <string name="settings_sdk_version">Matrix SDKバージョン</string>
+    <string name="import_e2e_keys_from_file">ファイル\"%1$s\"からエンドツーエンド暗号鍵をインポートします。</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">鍵のバックアップデータの取得中にエラーが発生しました</string>
     <string name="keys_backup_unable_to_get_trust_info">信頼情報の取得中にエラーが発生しました</string>
-    <string name="create_room_federation_error">ルーム作成されましたが、一部の招待が送信されていません
-\n理由:
+    <string name="create_room_federation_error">ルームが作成されましたが、一部の招待が送信されていません。理由：
 \n
 \n%s</string>
-    <string name="create_room_settings_section">ルーム設定</string>
+    <string name="create_room_settings_section">ルームの設定</string>
     <string name="create_room_topic_hint">トピック</string>
-    <string name="create_room_topic_section">ルームトピック(オプション)</string>
+    <string name="create_room_topic_section">ルームの説明（任意）</string>
     <string name="create_room_name_section">ルーム名</string>
-    <string name="room_preview_no_preview_join">この部屋はプレビューできません。参加しますか？</string>
-    <string name="room_preview_not_found">現在、この部屋にはアクセスできません。
+    <string name="room_preview_no_preview_join">このルームはプレビューできません。参加しますか？</string>
+    <string name="room_preview_not_found">現在、このルームにはアクセスできません。
 \n後でもう一度やり直すか、ルームの管理者にアクセス権があるかどうかを確認するよう依頼してください。</string>
     <string name="template_room_preview_world_readable_room_not_supported_yet">${app_name}では、誰でも読めるルームのプレビューがまだサポートされていません</string>
-    <string name="room_preview_no_preview">この部屋はプレビューできません</string>
+    <string name="room_preview_no_preview">このルームはプレビューできません</string>
     <string name="please_wait">お待ち下さい…</string>
     <string name="error_no_network">ネットワークがありません。インターネット接続を確認してください。</string>
-    <string name="malformed_message">不正な形式のイベント、表示できません</string>
+    <string name="malformed_message">不正な形式のイベントです。表示できません</string>
     <string name="last_edited_info_message">%2$sに%1$sによって最後に編集されました</string>
     <string name="event_redacted_by_admin_reason">ルーム管理者によってモデレートされたイベント</string>
     <string name="reactions">リアクション</string>
     <string name="message_view_reaction">リアクションを見る</string>
-    <string name="message_add_reaction">リアクションを追加する</string>
+    <string name="message_add_reaction">リアクションを追加</string>
     <string name="action_like">いいね</string>
     <string name="action_agree">同意</string>
     <string name="title_activity_emoji_reaction_picker">リアクション</string>
@@ -1878,149 +1872,149 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="room_list_rooms_empty_title">ルーム</string>
     <string name="room_list_people_empty_title">会話</string>
     <string name="room_list_catchup_welcome_body">ここで未読メッセージに追いつく</string>
-    <string name="room_list_catchup_welcome_title">ホームへようこそ!</string>
-    <string name="room_list_catchup_empty_body">未読メッセージはもうありません</string>
-    <string name="room_list_catchup_empty_title">追いついてきました!</string>
-    <string name="sas_incoming_request_notif_content">%sがセッションを検証を要求しています</string>
+    <string name="room_list_catchup_welcome_title">ホームにようこそ！</string>
+    <string name="room_list_catchup_empty_body">未読メッセージはありません</string>
+    <string name="room_list_catchup_empty_title">未読はありません！</string>
+    <string name="sas_incoming_request_notif_content">%sがセッションの検証を要求しています</string>
     <string name="sas_verification_request_notification_channel">インタラクティブセッション検証</string>
     <string name="room_list_empty">ルームに参加してアプリの使用を開始します。</string>
     <string name="global_retry">リトライ</string>
     <string name="error_user_already_logged_in">他のホームサーバーに接続しようとしているようですね。サインアウトしますか？</string>
-    <string name="identity_server_not_defined_for_password_reset">IDサーバーが設定されていない場合は、パスワードの再設定が必要となります。</string>
+    <string name="identity_server_not_defined_for_password_reset">IDサーバーが設定されていない場合は、パスワードを再設定する必要があります。</string>
     <string name="identity_server_not_defined">IDサーバーを使用していません</string>
     <string name="sas_error_unknown">不明なエラー</string>
     <string name="sas_error_m_user_error">ユーザーの不一致</string>
-    <string name="sas_error_m_key_mismatch">キーの不一致</string>
-    <string name="sas_error_m_invalid_message">無効なメッセージを受信しました</string>
+    <string name="sas_error_m_key_mismatch">鍵の不一致</string>
+    <string name="sas_error_m_invalid_message">不正なメッセージを受信しました</string>
     <string name="sas_error_m_unexpected_message">セッションに予期しないメッセージが表示されました</string>
     <string name="sas_error_m_mismatched_sas">SASが一致しませんでした</string>
     <string name="sas_error_m_mismatched_commitment">ハッシュコミットメントが一致しませんでした</string>
-    <string name="sas_error_m_unknown_method">セッションは、キー共有、ハッシュ、MAC、SASメソッドについて合意できません</string>
+    <string name="sas_error_m_unknown_method">セッションは、鍵の共有、ハッシュ、MAC、SASメソッドについて合意できません</string>
     <string name="sas_error_m_unknown_transaction">セッションはそのトランザクションについて知りません</string>
     <string name="sas_error_m_timeout">検証プロセスがタイムアウトしました</string>
     <string name="sas_error_m_user">ユーザーが検証をキャンセルしました</string>
-    <string name="space_you_know_that_contains_this_room">このルームを含むスペースを知る</string>
-    <string name="decide_which_spaces_can_access">このルームにアクセスできるスペースを決定します。スペースが選択されるとそのメンバーはルーム名を見つけて参加できます。</string>
+    <string name="space_you_know_that_contains_this_room">このルームを含む参加済のスペース</string>
+    <string name="decide_which_spaces_can_access">このルームにアクセスできるスペースを決定します。スペースが選択されると、そのメンバーはルーム名を見つけて参加できます。</string>
     <string name="sas_cancelled_by_me">検証がキャンセルされました。
-\n理由:%s</string>
+\n理由：%s</string>
     <string name="sas_cancelled_by_other">相手が検証をキャンセルしました。
 \n%s</string>
     <string name="sas_cancelled_dialog_title">リクエストはキャンセルされました</string>
-    <string name="sas_verification_request_notification_channel_title">キーの検証</string>
-    <string name="sas_legacy_verification_button_title">レガシー検証を使います。</string>
-    <string name="sas_verifying_keys">何も表示されませんか？すべてのクライアントがインタラクティブ検証をまだサポートしているわけではありません。その場合はレガシー検証を使用してください。</string>
-    <string name="sas_got_it">取得</string>
-    <string name="sas_verified_successful_description">このユーザーとのメッセージはエンドツーエンドで暗号化され第三者が読むことはできません。</string>
+    <string name="sas_verification_request_notification_channel_title">鍵の検証</string>
+    <string name="sas_legacy_verification_button_title">レガシー検証を使用する。</string>
+    <string name="sas_verifying_keys">何も表示されませんか？インタラクティブな検証をサポートしてないクライアントを使っているかもしれません。その場合は、レガシー検証を使用してください。</string>
+    <string name="sas_got_it">了解</string>
+    <string name="sas_verified_successful_description">このユーザーとのメッセージはエンドツーエンドで暗号化され、第三者が読むことはできません。</string>
     <string name="sas_verified">完了しました!</string>
     <string name="sas_waiting_for_partner">相手が確認するのを待っています…</string>
     <string name="sas_view_request_action">リクエストを見る</string>
     <string name="sas_incoming_verification_request_dialog">検証リクエストを受信しました。</string>
-    <string name="sas_decimal_description">相手の画面に次の番号が表示されていることを確認して、このセッションを確認します</string>
-    <string name="sas_emoji_description">相手の画面に次の絵文字が表示されることを確認して、このセッションを確認します</string>
-    <string name="sas_incoming_request_description_2">このセッションを検証すると、信頼済みとしてマークされ、自分も相手に信頼済みとしてマークされます。</string>
-    <string name="sas_incoming_request_description">このセッションを検証して、信頼済みとしてマークします。やり取りの前に検証することで、より安全にメッセージすることができます。</string>
-    <string name="sas_incoming_request_title">入力された検証要求</string>
-    <string name="sas_verify_start_button_title">検証を開始します</string>
-    <string name="sas_security_advise">最大限のセキュリティを確保するために、これを行うか、別の信頼できる通信手段を用いることをお勧めします。</string>
+    <string name="sas_decimal_description">相手の画面に次の番号が表示されていることを確認して、このセッションを検証</string>
+    <string name="sas_emoji_description">相手の画面に次の絵文字が表示されることを確認して、このセッションを検証</string>
+    <string name="sas_incoming_request_description_2">このセッションを検証すると、信頼済としてマークされ、自分も相手に信頼済としてマークされます。</string>
+    <string name="sas_incoming_request_description">このセッションを検証して、信頼済としてマークします。相手のセッションを信頼すると、より一層安心してエンドツーエンド暗号化を使用することができます。</string>
+    <string name="sas_incoming_request_title">検証リクエストがあります</string>
+    <string name="sas_verify_start_button_title">検証を開始</string>
+    <string name="sas_security_advise">セキュリティを最大限に高めるために、これを対面で行うか、他の信頼できる通信手段を使用することを推奨します。</string>
     <string name="sas_verify_title">短い文字列を比較して検証します。</string>
-    <string name="invalid_or_expired_credentials">認証が無効または期限切れのため、ログアウトされました。</string>
-    <string name="autodiscover_well_known_autofill_confirm">構成を使用する</string>
-    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name}がuserIdドメイン\"%1$s \"のカスタムサーバ構成を検出しました。
+    <string name="invalid_or_expired_credentials">認証情報が不正または期限切れのため、ログアウトしました。</string>
+    <string name="autodiscover_well_known_autofill_confirm">構成を使用</string>
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name}がuserIdドメイン\"%1$s\"のカスタムサーバー構成を検出しました。
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_dialog_title">サーバーオプションをおまかせする</string>
     <string name="autodiscover_invalid_response">無効なホームサーバーディスカバリーレスポンス</string>
-    <string name="keys_backup_banner_update_line1">新しいメッセージの暗号キー</string>
-    <string name="keys_backup_banner_recover_line1">暗号化されたメッセージを失うことはありません</string>
+    <string name="keys_backup_banner_update_line1">メッセージの新しい鍵</string>
+    <string name="keys_backup_banner_recover_line1">暗号化されたメッセージを決して失わないために</string>
     <string name="secure_backup_banner_setup_line1">セキュアバックアップ</string>
-    <string name="keys_backup_banner_setup_line1">暗号化されたメッセージを失いません</string>
+    <string name="keys_backup_banner_setup_line1">暗号化されたメッセージを決して失わないために</string>
     <string name="keys_backup_get_trust_error">バックアップ (%s) のtrust infoの取得に失敗しました。</string>
     <string name="keys_backup_no_keysbackup_sdk_error">セッションの暗号化が有効になっていません</string>
-    <string name="room_widget_permission_shared_info_title">これを使用するとデータを %sと共有します。</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="room_widget_permission_shared_info_title">これを使用するとデータが%sと共有される可能性があります：</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="other_spaces_or_rooms_you_might_not_know">あなたが知らないかもしれない他のスペースやルーム</string>
-    <string name="decide_who_can_find_and_join">このルームを見つけて参加できるか決める。</string>
-    <string name="tap_to_edit_spaces">タップしスペースを編集する</string>
-    <string name="select_spaces">スペースを選択する</string>
+    <string name="decide_who_can_find_and_join">誰がこのルームを検索し、参加できるか決める。</string>
+    <string name="tap_to_edit_spaces">タップしスペースを編集</string>
+    <string name="select_spaces">スペースを選択</string>
     <string name="spaces_which_can_access">アクセス可能なスペース</string>
-    <string name="allow_space_member_to_find_and_access">スペースメンバーが検索してアクセスすることを許可します。</string>
-    <string name="room_create_member_of_space_name_can_join">スペースメンバー %sは検索、プレビュー、参加することができます。</string>
-    <string name="room_settings_room_access_private_invite_only_title">プライベート(招待のみ)</string>
-    <string name="settings_default_media_source">デフォルトのメディアソース</string>
-    <string name="settings_default_compression">デフォルトの圧縮</string>
-    <string name="settings_room_upgrades">ルームアップグレード</string>
-    <string name="settings_messages_by_bot">botによるメッセージ</string>
-    <string name="settings_room_invitations">ルーム招待</string>
+    <string name="allow_space_member_to_find_and_access">スペースのメンバーに発見とアクセスを許可します。</string>
+    <string name="room_create_member_of_space_name_can_join">スペース %s のメンバーが検索、プレビュー、参加できます。</string>
+    <string name="room_settings_room_access_private_invite_only_title">非公開（招待のみ）</string>
+    <string name="settings_default_media_source">既定のメディアソース</string>
+    <string name="settings_default_compression">既定の圧縮率</string>
+    <string name="settings_room_upgrades">ルームのアップグレード</string>
+    <string name="settings_messages_by_bot">ボットによるメッセージ</string>
+    <string name="settings_room_invitations">ルームへの招待</string>
     <string name="settings_messages_at_room">\@roomを含むメッセージ</string>
     <string name="settings_when_rooms_are_upgraded">ルームがアップグレードされたとき</string>
     <string name="settings_encrypted_group_messages">暗号化されたグループメッセージ</string>
     <string name="settings_group_messages">グループメッセージ</string>
     <string name="settings_encrypted_direct_messages">暗号化されたダイレクトメッセージ</string>
     <string name="settings_messages_direct_messages">ダイレクトメッセージ</string>
-    <string name="settings_messages_containing_username">私のユーザーネームを含むメッセージ</string>
-    <string name="settings_messages_containing_display_name">自分のディスプレーネームを含むメッセージ</string>
+    <string name="settings_messages_containing_username">自分のユーザー名</string>
+    <string name="settings_messages_containing_display_name">自分の表示名</string>
     <string name="settings_messages_in_e2e_group_chat">グループチャットでのメッセージの暗号化</string>
     <string name="settings_messages_in_e2e_one_to_one">個別チャットでのメッセージの暗号化</string>
-    <string name="settings_notification_notify_me_for">通知してください</string>
+    <string name="settings_notification_notify_me_for">以下がメッセージに含まれる場合に通知</string>
     <string name="settings_notification_other">その他</string>
     <string name="settings_notification_mentions_and_keywords">メンションとキーワード</string>
     <string name="settings_notification_default">通知のデフォルト</string>
     <plurals name="missed_video_call">
-        <item quantity="other">%d ビデオ通話できません</item>
+        <item quantity="other">%d個の不在着信（ビデオ）</item>
     </plurals>
     <plurals name="missed_audio_call">
-        <item quantity="other">%d 通話できません</item>
+        <item quantity="other">%d個の不在着信（音声）</item>
     </plurals>
     <string name="use_as_default_and_do_not_ask_again">デフォルトで使いもう尋ねない</string>
-    <string name="send_bug_report_include_key_share_history">キー共有リクエストの送信履歴</string>
+    <string name="send_bug_report_include_key_share_history">鍵の共有リクエストの履歴を送信</string>
     <string name="no_more_results">結果がありません</string>
-    <string name="cannot_call_yourself_with_invite">自分で電話をかけることはできません。参加者が招待を受け入れるのを待ちます</string>
-    <string name="audio_video_meeting_description">ミーティングはJitsiのセキュリティとパーミッションポリシーを使用します。会議中は、現在ルームにいるすべての人に招待状が表示されます。</string>
+    <string name="cannot_call_yourself_with_invite">自分に電話をかけることはできません。参加者が招待を受け入れるまでお待ちください</string>
+    <string name="audio_video_meeting_description">ミーティングはJitsiのセキュリティーとパーミッションポリシーを使用します。会議中は、現在ルームにいる全ての人に招待状が表示されます。</string>
     <string name="missing_permissions_title">権限がありません</string>
     <string name="denied_permission_voice_message">音声メッセージを送信するには、マイクの権限を許可してください。</string>
-    <string name="denied_permission_camera">この動作を行うには、システム設定からカメラの権限を許可してください。</string>
-    <string name="denied_permission_generic">このアクションを実行するには、いくつかの権限が不足しています。システム設定から権限を付与してください。</string>
+    <string name="denied_permission_camera">この操作を実行するには、システム設定からカメラの権限を許可してください。</string>
+    <string name="denied_permission_generic">この操作を実行するための権限がありません。システム設定から権限を付与してください。</string>
     <string name="settings_discovery_bad_identity_server">IDサーバーに接続できませんでした</string>
-    <string name="settings_discovery_enter_identity_server">IDサーバーのURLを入力する</string>
-    <string name="identity_server_consent_dialog_content">あなた既存の連絡先を発見するために、あなたの連絡先データ（電話番号や電子メール）を設定されたIDサーバー（%1$s）に送信することに同意しますか？
+    <string name="settings_discovery_enter_identity_server">IDサーバーのURLを入力</string>
+    <string name="identity_server_consent_dialog_content">連絡先を発見するために、あなたの連絡先のデータ（電話番号やメールアドレス）を、設定されたIDサーバー（%1$s）に送信することを承認しますか？
 \n
-\nプライバシー保護のため、送信データは送信前に必ずハッシュ化されます。</string>
-    <string name="identity_server_consent_dialog_title">メールや電話番号の送信</string>
+\nプライバシーの保護のため、データは送信前にハッシュ化されます。</string>
+    <string name="identity_server_consent_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_off">あなたの連絡先から他のユーザーを発見するために、電子メールや電話番号をこのIDサーバーに送信することに同意していません。</string>
-    <string name="settings_discovery_consent_notice_on">あなたの連絡先から他のユーザーを発見するために、このIDサーバーにメールや電話番号を送信することに同意しています。</string>
-    <string name="settings_discovery_consent_title">メールや電話番号の送信</string>
+    <string name="settings_discovery_consent_action_revoke">同意を撤回</string>
+    <string name="settings_discovery_consent_notice_off">あなたの連絡先から他のユーザーを発見するために、メールアドレスや電話番号をこのIDサーバーに送信することに同意していません。</string>
+    <string name="settings_discovery_consent_notice_on">あなたの連絡先から他のユーザーを発見するために、メールアドレスや電話番号をこのIDサーバーに送信することに同意しています。</string>
+    <string name="settings_discovery_consent_title">メールと電話番号を送信</string>
     <string name="settings_discovery_mail_pending">未確認</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">%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>
-    <string name="settings_discovery_no_mails">メールを追加すると、ディスカバリーオプションが表示されます。</string>
-    <string name="settings_discovery_identity_server_info_none">現在、IDサーバーを使用していません。既存の連絡先を発見したり、その連絡先から発見できるようにするには、以下のように設定します。</string>
-    <string name="settings_discovery_identity_server_info">%1$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>
+    <string name="settings_discovery_no_mails">メールアドレスを追加すると、発見可能に設定するメールアドレスを選択できるようになります。</string>
+    <string name="settings_discovery_identity_server_info_none">現在、IDサーバーを使用していません。あなたの知っている連絡先を発見したり、その連絡先から発見されるようにするには、以下でIDサーバーを設定してください。</string>
+    <string name="settings_discovery_identity_server_info">あなたは現在%1$sを使って連絡先を見つけたり、連絡先から見つけられるようにしています。</string>
     <string name="change_identity_server">IDサーバーを変更</string>
     <string name="add_identity_server">IDサーバーの設定</string>
     <string name="disconnect_identity_server">IDサーバーの切断</string>
     <string name="identity_server">IDサーバー</string>
-    <string name="terms_description_for_integration_manager">ボット、ブリッジ、ウィジェット、ステッカーパックを使う</string>
+    <string name="terms_description_for_integration_manager">ボット、ブリッジ、ウィジェット、ステッカーパックを使用</string>
     <string name="terms_description_for_identity_server">他の人が見つけられるように</string>
-    <string name="review_terms">規約を見直す</string>
+    <string name="review_terms">規約を確認</string>
     <string name="terms_of_service">利用規約</string>
     <string name="message_view_edit_history">編集履歴を表示</string>
-    <string name="joining_room">部屋に参加しています…</string>
+    <string name="joining_room">ルームに参加しています…</string>
     <string name="direct_room_user_list_suggestions_title">提案</string>
     <string name="direct_room_user_list_contacts_title">連絡先</string>
     <string name="direct_room_user_list_recent_title">最近の</string>
-    <string name="direct_room_start_search">検索結果を得るために入力を始める</string>
-    <string name="direct_room_no_known_users">結果が見つかりません、matrix IDを使ってサーバー上で検索してください。</string>
+    <string name="direct_room_start_search">入力すると検索結果が表示されます</string>
+    <string name="direct_room_no_known_users">結果が見つかりません。Matrix IDを使ってサーバー上で検索してください。</string>
     <string name="link_copied_to_clipboard">クリップボードにコピーされたリンク</string>
-    <string name="labs_show_unread_notifications_as_tab">メイン画面に未読通知専用のタブを追加しました。</string>
-    <string name="search_hint_room_name">ルーム名を検索する</string>
+    <string name="labs_show_unread_notifications_as_tab">メイン画面に未読通知専用のタブを追加する。</string>
+    <string name="search_hint_room_name">ルーム名を検索</string>
     <string name="room_directory_search_hint">名前もしくはID (#例えば:matrix.org)</string>
     <string name="room_filtering_footer_open_room_directory">ルームディレクトリを見る</string>
-    <string name="room_filtering_footer_create_new_room">新しいルームをつくる</string>
+    <string name="room_filtering_footer_create_new_room">新しいルームを作成</string>
     <string name="room_filtering_footer_title">お探しのものが見つかりませんか？</string>
     <string name="send_suggestion_report_placeholder">あなたの提案をここに書いてください</string>
     <string name="send_suggestion_content">ご意見・ご感想をお聞かせください。</string>
@@ -2036,13 +2030,13 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
 \n- あなたの端末が使用しているインターネット接続
 \n
 \n設定画面からパスワードとリカバリーキーを早急に変更することを推奨します。</string>
-    <string name="login_reset_password_email_hint">Eメール</string>
+    <string name="login_reset_password_email_hint">電子メール</string>
     <string name="login_server_url_form_other_hint">アドレス</string>
-    <string name="login_continue">継続する</string>
+    <string name="login_continue">続行する</string>
     <string name="uploads_files_title">ファイル</string>
-    <string name="space_participants_remove_prompt_msg">ユーザーをキックすると、このスペースから削除されます。
+    <string name="space_participants_remove_prompt_msg">このユーザーはスペースから追放されます。
 \n
-\n再参加を防ぐには、代わりにブロックしてください。</string>
+\n再参加を防ぐためには、追放する代わりにブロックする必要があります。</string>
     <string name="call_remove_jitsi_widget_progress">通話を終了しています…</string>
     <string name="notification_listening_for_notifications">通知を待機しています</string>
     <string name="settings_mentions_at_room">\@room</string>
@@ -2059,7 +2053,809 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="video_call_with_participant">%sとのビデオ通話</string>
     <string name="call_ringing">呼び出しています…</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">ホームサーバーを選択</string>
-    <string name="login_error_homeserver_from_url_not_found">%s のURLにあるホームサーバーに接続できません。リンクをチェックするか、手動でホームサーバーを選択してください。</string>
+    <string name="login_error_homeserver_from_url_not_found">%sのURLにあるホームサーバーに接続できません。リンクを確認するか、手動でホームサーバーを選択してください。</string>
     <string name="action_not_now">後で</string>
     <string name="spaces">スペース</string>
+    <string name="search_thread_from_a_thread">スレッドから</string>
+    <string name="thread_list_modal_my_threads_subtitle">参加している全スレッドを表示</string>
+    <string name="thread_list_modal_all_threads_subtitle">現在のルームのスレッドを全て表示</string>
+    <string name="space_participants_ban_prompt_msg">ユーザーをブロックすると、ユーザーはこのスペースから追放され、二度と参加できなくなります。</string>
+    <string name="settings_security_pin_code_title">PINコードを有効にする</string>
+    <string name="direct_room_join_rules_invite_by_you">これを「招待者のみ参加可能」に設定しました。</string>
+    <string name="room_list_quick_actions_room_settings">ルームの設定</string>
+    <string name="content_reported_title">コンテンツが報告されました</string>
+    <string name="preference_help_title">ヘルプとサポート</string>
+    <string name="preference_help">ヘルプ</string>
+    <string name="template_legals_application_title">${app_name}のポリシー</string>
+    <string name="analytics_opt_in_content_link">ここ</string>
+    <string name="settings_notification_new_keyword">キーワードを追加</string>
+    <string name="thread_list_modal_my_threads_title">自分のスレッド</string>
+    <string name="thread_list_modal_all_threads_title">全てのスレッド</string>
+    <string name="upgrade_room_auto_invite">ユーザーを自動的に招待</string>
+    <string name="call_transfer_users_tab_title">ユーザー</string>
+    <string name="space_participants_unban_prompt_msg">ブロックを解除すると、ユーザーはスペースに再び参加できるようになります。</string>
+    <string name="room_join_rules_invite_by_you">このルームを「招待者のみ参加可能」に設定しました。</string>
+    <string name="room_list_quick_actions_low_priority_remove">低優先度から削除</string>
+    <string name="room_list_quick_actions_low_priority_add">低優先度に追加</string>
+    <string name="content_reported_as_spam_title">スパムとして報告済</string>
+    <string name="uploads_files_no_result">このルームにファイルはありません</string>
+    <string name="uploads_media_no_result">このルームにメディアはありません</string>
+    <string name="upgrade_public_room">公開されたルームをアップグレード</string>
+    <string name="private_space">非公開スペース</string>
+    <string name="public_space">公開スペース</string>
+    <string name="event_status_a11y_sent">送信済</string>
+    <string name="event_status_a11y_sending">送信中</string>
+    <string name="dev_tools_form_hint_type">種類</string>
+    <string name="a11y_checked">確認済</string>
+    <string name="a11y_selected">選択済</string>
+    <string name="a11y_video">ビデオ</string>
+    <string name="a11y_image">画像</string>
+    <string name="a11y_screenshot">スクリーンショット</string>
+    <string name="call_transfer_connect_action">接続</string>
+    <string name="attachment_type_poll">投票</string>
+    <string name="sent_a_poll">投票</string>
+    <string name="settings_text_message_sent_hint">コード</string>
+    <string name="power_level_title">役割</string>
+    <string name="identity_server_set_alternative_submit">送信</string>
+    <string name="invite_users_to_room_action_invite">招待</string>
+    <string name="unencrypted">暗号化されていません</string>
+    <string name="finish">終了</string>
+    <string name="refresh">再読み込み</string>
+    <string name="room_member_profile_sessions_section_title">セッション一覧</string>
+    <string name="verification_profile_warning">警告</string>
+    <string name="unignore">無視を解除</string>
+    <string name="you">あなた</string>
+    <string name="sent_a_video">動画。</string>
+    <string name="verify_by_emoji_title">絵文字で検証</string>
+    <string name="verification_request_waiting">待機しています…</string>
+    <string name="send_a_sticker">ステッカー</string>
+    <string name="sent_a_file">ファイル</string>
+    <string name="sent_an_audio_file">音声</string>
+    <string name="sent_an_image">画像。</string>
+    <string name="settings_rageshake">イライラシェイク</string>
+    <string name="login_signup_cancel_confirmation_title">警告</string>
+    <string name="login_reset_password_cancel_confirmation_title">警告</string>
+    <string name="login_reset_password_success_title">成功しました！</string>
+    <string name="login_reset_password_warning_submit">続行する</string>
+    <string name="login_reset_password_warning_title">警告！</string>
+    <string name="attachment_type_location">位置情報</string>
+    <string name="uploads_media_title">メディア</string>
+    <string name="poll_end_room_list_preview">投票終了</string>
+    <string name="end_poll_confirmation_title">投票を終了しますか？</string>
+    <string name="delete_poll_dialog_title">投票を削除</string>
+    <string name="create_space">スペースを作成</string>
+    <string name="join_space">スペースに参加</string>
+    <string name="leave_space">スペースを退出</string>
+    <string name="spaces_beta_welcome_to_spaces">スペースにようこそ！</string>
+    <string name="space_settings_manage_rooms">ルームを管理</string>
+    <string name="this_space_has_no_rooms">このスペースにはルームがありません</string>
+    <string name="error_voice_message_unable_to_play">音声メッセージを再生できません</string>
+    <string name="error_voice_message_unable_to_record">音声メッセージを録音できません</string>
+    <string name="call_jitsi_started">グループ通話が開始しました</string>
+    <string name="upgrade_room_no_power_to_manage">ルームのアップグレードには権限が必要です</string>
+    <string name="upgrade">アップグレード</string>
+    <string name="upgrade_required">アップグレードが必要です</string>
+    <string name="upgrade_private_room">非公開のルームをアップグレード</string>
+    <string name="a11y_pause_voice_message">音声メッセージを一時停止</string>
+    <string name="labs_use_voice_message">音声メッセージを有効にする</string>
+    <string name="link_this_email_settings_link">このメールアドレスをアカウントにリンク</string>
+    <string name="edit_poll_button">投票を編集</string>
+    <string name="edit_poll_title">投票を編集</string>
+    <string name="a11y_static_map_image">地図</string>
+    <string name="end_poll_confirmation_approve_button">投票を終了</string>
+    <string name="poll_end_action">投票を終了</string>
+    <string name="create_poll_options_hint">選択肢%1$d</string>
+    <string name="create_poll_options_title">選択肢を作成</string>
+    <string name="location_activity_title_preview">位置情報</string>
+    <string name="a11y_location_share_icon">位置情報を共有</string>
+    <string name="settings_enable_location_sharing">位置情報の共有を有効にする</string>
+    <string name="location_timeline_failed_to_load_map">地図を読み込めませんでした</string>
+    <string name="reply_in_thread">スレッドで返信</string>
+    <string name="location_activity_title_static_sharing">位置情報を共有</string>
+    <string name="location_share">位置情報を共有</string>
+    <string name="tooltip_attachment_photo">カメラを開く</string>
+    <string name="tooltip_attachment_gallery">画像と動画を送信</string>
+    <string name="tooltip_attachment_file">ファイルをアップロード</string>
+    <string name="tooltip_attachment_contact">連絡先を開く</string>
+    <string name="tooltip_attachment_sticker">ステッカーを送信</string>
+    <string name="tooltip_attachment_poll">投票を作成</string>
+    <string name="tooltip_attachment_location">位置情報を共有</string>
+    <string name="space_permissions_notice_read_only">スペースに関する変更を行うために必要な役割を更新する権限がありません</string>
+    <string name="space_permissions_notice">スペースに関する変更を行うために必要な役割を選択</string>
+    <string name="space_settings_permissions_subtitle">スペースに関する変更を行うために必要な役割を表示し更新します。</string>
+    <string name="thread_list_modal_title">フィルター</string>
+    <string name="thread_list_title">スレッド</string>
+    <string name="thread_timeline_title">スレッド</string>
+    <string name="room_permissions_upgrade_the_space">スペースをアップグレード</string>
+    <string name="room_permissions_change_space_name">スペース名の変更</string>
+    <string name="space_settings_permissions_title">スペースの権限</string>
+    <string name="call_tile_no_answer">応答がありません</string>
+    <string name="call_ended_invite_timeout_title">応答がありません</string>
+    <string name="action_thread_copy_link_to_thread">スレッドへのリンクをコピー</string>
+    <string name="action_enable">有効にする</string>
+    <string name="learn_more">詳しく知る</string>
+    <string name="legals_identity_server_title">あなたのIDサーバーのポリシー</string>
+    <string name="a11y_create_room">新しいルームを作成</string>
+    <string name="settings_text_message_sent_wrong_code">認証コードが正しくありません。</string>
+    <string name="settings_discovery_please_enter_server">IDサーバーのURLを入力してください</string>
+    <string name="user_directory_search_hint_2">名前、ID、メールアドレスで検索</string>
+    <string name="preference_system_settings">システムの設定</string>
+    <string name="preference_versions">バージョン</string>
+    <string name="command_description_room_avatar">現在のルームのアバターを変更</string>
+    <string name="command_description_room_name">ルーム名を設定</string>
+    <string name="room_settings_room_notifications_account_settings">アカウントの設定</string>
+    <string name="settings_notification_your_keywords">キーワード</string>
+    <string name="shortcut_disabled_reason_room_left">ルームから退出しました！</string>
+    <string name="message_bubbles">吹き出しでメッセージを表示</string>
+    <string name="settings_notification_emails_category">電子メールによる通知</string>
+    <string name="shortcut_disabled_reason_sign_out">セッションからサインアウトしました！</string>
+    <string name="room_settings_none">なし</string>
+    <string name="room_settings_mention_and_keyword_only">メンションとキーワードのみ</string>
+    <string name="room_threads_filter">ルームのスレッドを絞り込む</string>
+    <string name="direct_room_profile_section_more_leave">退出</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">携帯端末では、暗号化されたルームでのメンションとキーワードの通知は受信できません。</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="create_poll_title">投票を作成</string>
+    <string name="create_poll_button">投票を作成</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">暗号化が正しく設定されていないため、メッセージを送ることができません。クリックして設定を開いてください。</string>
+    <string name="room_unsupported_e2e_algorithm">暗号化が正しく設定されていないため、メッセージを送ることができません。管理者に連絡して、暗号化を正しい状態に復元してください。</string>
+    <string name="attachment_viewer_item_x_of_y">%2$dの%1$d</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">あなたは既にこのスレッドを見ています！</string>
+    <string name="view_in_room">ルームに表示</string>
+    <string name="action_thread_view_in_room">ルームに表示</string>
+    <string name="action_view_threads">スレッドを表示</string>
+    <string name="identity_server_consent_dialog_neutral_policy">ポリシー</string>
+    <string name="room_error_access_unauthorized">このルームへの参加は許可されていません</string>
+    <string name="topic_prefix">"トピック: "</string>
+    <string name="settings_troubleshoot_title">トラブルシューティング</string>
+    <string name="error_attachment">添付ファイルの取得中にエラーが発生しました。</string>
+    <string name="a11y_close_keys_backup_banner">鍵のバックアップのバナーを閉じる</string>
+    <string name="settings_notification_keyword_contains_invalid_character">キーワードに「%s」を含めることはできません</string>
+    <string name="settings_notification_emails_enable_for_email">%s へのメール通知を有効にする</string>
+    <string name="thread_list_empty_notice">ヒント：メッセージを長押しして「%s」を選択。</string>
+    <string name="thread_list_empty_subtitle">スレッドを用いると、会話のテーマを保ったり、会話を追跡したりするのが容易になります。</string>
+    <string name="your_private_space">あなたの非公開スペース</string>
+    <string name="your_public_space">あなたの公開スペース</string>
+    <string name="create_spaces_just_me">自分のみ</string>
+    <string name="thread_list_empty_title">スレッドでディスカッションを整理して管理</string>
+    <string name="verification_request_waiting_for">%sを待機しています…</string>
+    <string name="verification_scan_with_this_device">この端末でスキャン</string>
+    <string name="verification_sent">認証を送信済</string>
+    <string name="verification_verify_device_manually">手動で認証</string>
+    <string name="verification_verify_device">このセッションを認証</string>
+    <string name="sent_a_voice_message">音声</string>
+    <string name="create_room_alias_empty">ルームのアドレスを入力してください</string>
+    <string name="create_room_alias_already_in_use">このアドレスは既に使用されています</string>
+    <string name="create_space_alias_hint">スペースのアドレス</string>
+    <string name="create_room_alias_hint">ルームのアドレス</string>
+    <string name="verification_sas_do_not_match">一致しません</string>
+    <string name="verification_sas_match">一致しています</string>
+    <string name="settings_show_devices_list">自分のセッション一覧を表示</string>
+    <string name="soft_logout_signin_title">サインイン</string>
+    <string name="soft_logout_title">サインアウトしました</string>
+    <string name="soft_logout_clear_data_dialog_submit">データを消去</string>
+    <string name="soft_logout_clear_data_dialog_title">データを消去</string>
+    <string name="soft_logout_clear_data_submit">全てのデータを消去</string>
+    <string name="login_signin_matrix_id_hint">Matrix ID</string>
+    <string name="signed_out_title">サインアウトしました</string>
+    <string name="soft_logout_signin_submit">サインイン</string>
+    <string name="soft_logout_clear_data_title">個人データを消去</string>
+    <string name="login_clear_homeserver_history">履歴を消去</string>
+    <string name="login_connect_to">%1$sに接続</string>
+    <string name="login_social_sso">シングルサインオン</string>
+    <string name="login_splash_create_account">アカウントを作成</string>
+    <string name="ftue_auth_use_case_connect_to_server">サーバーに接続</string>
+    <string name="ftue_auth_use_case_option_three">コミュニティー</string>
+    <string name="ftue_auth_use_case_option_two">チーム</string>
+    <string name="a11y_beta">この機能はベータ版です</string>
+    <string name="create_new_space">新しいスペースを作成</string>
+    <string name="settings_notification_keyword_contains_dot">キーワードは「.」から始めることができません</string>
+    <string name="settings_notification_emails_no_emails">電子メールによる通知を受け取るには、メールアドレスをMatrixのアカウントと連携してください</string>
+    <string name="content_reported_as_inappropriate_title">不適切として報告済</string>
+    <string name="no_network_indicator">ネットワークの接続がありません</string>
+    <string name="send_attachment">添付ファイルを送信</string>
+    <string name="labs_allow_extended_logging">詳細なログを有効にする。</string>
+    <string name="settings_agree_to_terms">メールアドレスか電話番号でアカウントを見つけてもらえるようにするには、IDサーバー（%s）の利用規約への同意が必要です。</string>
+    <string name="template_location_not_available_dialog_title">${app_name}は位置情報にアクセスできませんでした</string>
+    <string name="template_location_not_available_dialog_content">${app_name}は位置情報にアクセスできませんでした。後でもう一度やり直してください。</string>
+    <string name="voice_message_reply_content">音声メッセージ（%1$s）</string>
+    <string name="room_upgrade_to_recommended_version">推奨のルームバージョンへとアップグレード</string>
+    <string name="a11y_start_voice_message">音声メッセージを録音</string>
+    <string name="legals_home_server_title">あなたのホームサーバーのポリシー</string>
+    <string name="a11y_jump_to_bottom">一番下に移動</string>
+    <string name="enter_backup_passphrase">%sを入力</string>
+    <string name="one_user_read">%sが読みました</string>
+    <string name="two_users_read">%1$sと%2$sが読みました</string>
+    <string name="use_file">ファイルを使用</string>
+    <string name="account_password">アカウントのパスワード</string>
+    <string name="room_settings_enable_encryption_dialog_title">暗号化を有効にしますか？</string>
+    <string name="room_list_sharing_header_other_rooms">他のルーム</string>
+    <string name="verification_request_you_cancelled">キャンセルしました</string>
+    <string name="login_a11y_choose_matrix_org">matrix.orgを選択</string>
+    <string name="make_this_space_public">このスペースを公開</string>
+    <string name="space_add_rooms">ルームを追加</string>
+    <string name="space_add_existing_spaces">既存のスペースを追加</string>
+    <string name="space_add_existing_rooms_only">既存のルームを追加</string>
+    <string name="leave_all_rooms_and_spaces">全てのルームとスペースから退出</string>
+    <string name="finish_setup">セットアップを終了</string>
+    <string name="create_spaces_default_public_random_room_name">ランダム</string>
+    <string name="create_spaces_loading_message">スペースを作成しています…</string>
+    <string name="space_type_private">非公開</string>
+    <string name="space_type_public">公開</string>
+    <string name="command_description_upgrade_room">ルームを新しいバージョンにアップグレード</string>
+    <string name="command_description_create_space">スペースを作成</string>
+    <string name="dev_tools_success_event">イベントを送信しました！</string>
+    <string name="event_status_a11y_delete_all">送信に失敗した全てのメッセージを削除</string>
+    <string name="event_status_a11y_failed">失敗しました</string>
+    <string name="a11y_public_space">公開されたスペース</string>
+    <string name="a11y_public_room">公開されたルーム</string>
+    <string name="a11y_delete_avatar">アバターを削除</string>
+    <string name="a11y_change_avatar">アバターを変更</string>
+    <string name="call_tile_call_back">かけ直す</string>
+    <string name="call_dial_pad_title">ダイヤルパッド</string>
+    <string name="matrix_to_card_title">Matrixのリンク</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="settings_security_application_protection_summary">PINコードと生体認証でアクセスを保護できます。</string>
+    <string name="settings_security_application_protection_title">アクセスを保護</string>
+    <string name="auth_pin_reset_content">PINコードを再設定するには、再ログインして新しいコードを作成してください。</string>
+    <string name="auth_pin_new_pin_action">新しいPINコード</string>
+    <string name="auth_pin_reset_title">PINコードを再設定</string>
+    <string name="auth_pin_forgot">PINコードを忘れましたか？</string>
+    <string name="auth_pin_title">PINコードを入力</string>
+    <string name="create_pin_confirm_title">PINコードを確認</string>
+    <string name="labs_render_locations_in_timeline">ユーザーの位置情報をタイムラインに表示</string>
+    <string name="settings_enable_location_sharing_summary">一度有効にすると、位置情報はどのルームにも送れるようになります</string>
+    <string name="legals_third_party_notices">サードパーティー製ライブラリー</string>
+    <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_list_item_1">私たちは、アカウントのデータを記録したり分析したりすることは<b>ありません</b></string>
+    <string name="template_analytics_opt_in_title">${app_name}の改善を手伝う</string>
+    <string name="room_join_rules_public_by_you">このルームを「リンクを知っている人が参加可能」に設定しました。</string>
+    <string name="no_ignored_users">どのユーザーも無視していません</string>
+    <string name="reaction_search_type_hint">キーワードを入力するとリアクションを検索できます。</string>
+    <string name="notice_member_no_changes_by_you">変更を加えませんでした</string>
+    <string name="notice_member_no_changes">%1$sは変更を加えませんでした</string>
+    <string name="error_file_too_big">ファイル「%1$s」（%2$s）は大きすぎてアップロードできません。制限は%3$sです。</string>
+    <plurals name="fallback_users_read">
+        <item quantity="other">%d人のユーザーが読みました</item>
+    </plurals>
+    <string name="room_settings_space_access_title">スペースへのアクセス</string>
+    <string name="legals_no_policy_provided">このサーバーはポリシーを提供していません。</string>
+    <string name="bootstrap_loading_text">数秒かかるかもしれません。少々お待ちください。</string>
+    <string name="choose_locale_loading_locales">利用可能な言語を読み込んでいます…</string>
+    <string name="invite_users_to_room_title">ユーザーを招待</string>
+    <string name="inviting_users_to_room">ユーザーを招待しています…</string>
+    <string name="error_empty_field_choose_password">パスワードを選択してください。</string>
+    <string name="add_members_to_room">メンバーを追加</string>
+    <string name="crosssigning_verify_session">ログインを検証</string>
+    <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_2">連絡先を発見するには、連絡先のデータをあなたのIDサーバーに送信する必要があります。
+\n
+\nプライバシーの保護のため、データは送信前にハッシュ化されます。この情報を送信することに同意しますか？</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>
+    <string name="settings_discovery_show_identity_server_policy_title">IDサーバーのポリシーを表示</string>
+    <string name="change_password_summary">アカウントの新しいパスワードを設定…</string>
+    <string name="rageshake_detected">シェイクを検出しました！</string>
+    <string name="settings_rageshake_detection_threshold_summary">電話を振って、しきい値を試してください</string>
+    <string name="settings_rageshake_detection_threshold">検出のしきい値</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">予期しないエラーが生じた際に、${app_name}はより頻繁にクラッシュする可能性があります</string>
+    <string name="settings_developer_mode_fail_fast_title">素早くクラッシュ</string>
+    <string name="settings_developer_mode_summary">開発者モードは隠された機能を有効にするため、アプリケーションが不安定になる恐れがあります。開発者向けです！</string>
+    <string name="labs_auto_report_uisi_desc">復号エラーが生じた際に、自動的にログを送信</string>
+    <string name="labs_auto_report_uisi">復号エラーを自動的に報告する。</string>
+    <string name="restart_the_application_to_apply_changes">変更を有効にするにはアプリケーションの再起動が必要です。</string>
+    <string name="labs_enable_latex_maths">LaTeXによる数学表記を有効にする</string>
+    <string name="room_settings_room_notifications_notify_me">以下が含まれる場合に通知</string>
+    <string name="upgrade_room_for_restricted_note">アップグレードすると、このルームの新しいバージョンが作成されます。今ある全てのメッセージは、アーカイブしたルームに残ります。</string>
+    <string name="room_settings_access_rules_pref_dialog_title">誰がアクセスできますか？</string>
+    <string name="room_settings_room_notifications_manage_notifications">通知は%1$sで管理できます。</string>
+    <string name="room_settings_room_notifications_encryption_notice">暗号化されたルームでのメンションとキーワードによる通知は、携帯端末では利用できません。</string>
+    <string name="command_description_ignore_user">ユーザーを無視し、そのメッセージを非表示に設定</string>
+    <string name="command_not_supported_in_threads">%sとのコマンドは認識されていますが、スレッドではサポートされていません。</string>
+    <string name="room_settings_space_access_public_description">誰でもスペースを発見し参加できます</string>
+    <string name="preference_root_legals">法的情報</string>
+    <string name="command_description_whois">ユーザーに関する情報を表示</string>
+    <string name="command_description_avatar_for_room">このルームにおいてのみアバターを変更</string>
+    <string name="command_description_nick_for_room">このルームにおいてのみ表示名を変更</string>
+    <string name="command_description_unignore_user">ユーザーの無視を解除し、以後のメッセージを表示</string>
+    <string name="bootstrap_enter_recovery">続行するには%sを入力してください</string>
+    <string name="backup_recovery_passphrase">復旧用のパスフレーズ</string>
+    <string name="bootstrap_invalid_recovery_key">有効なリカバリーキーではありません</string>
+    <string name="recovery_key_empty_error_message">リカバリーキーを入力してください</string>
+    <string name="poll_type_title">投票の種類</string>
+    <string name="open_poll_option_title">実施中の投票</string>
+    <string name="poll_response_room_list_preview">投票する</string>
+    <string name="open_poll_option_description">投票した人には、投票の際に即座に結果が表示されます</string>
+    <string name="closed_poll_option_title">終了した投票</string>
+    <string name="closed_poll_option_description">結果は投票を終了した後でのみ明らかにされます</string>
+    <string name="location_share_external">以下で開く</string>
+    <string name="upgrade_security">暗号化のアップグレードが利用可能です</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">SSSSキーをリカバリーキーから生成しています</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
+    <string name="template_app_desktop_web">${app_name}ウェブ版
+\n${app_name}デスクトップ版</string>
+    <string name="enter_secret_storage_input_key">リカバリーキーを選択、直接入力、あるいはクリップボードからペースト</string>
+    <string name="use_recovery_key">リカバリーキーを使用</string>
+    <string name="command_description_discard_session_not_handled">暗号化されたルームでのみサポート</string>
+    <string name="error_saving_media_file">メディアファイルを保存できませんでした</string>
+    <string name="error_adding_media_file_to_gallery">メディアファイルをギャラリーに追加できませんでした</string>
+    <string name="this_invite_to_this_space_was_sent">このスペースへの招待が、アカウントに関連付けられていないメールアドレス %s に送られました</string>
+    <plurals name="poll_option_vote_count">
+        <item quantity="other">%1$d個の投票</item>
+    </plurals>
+    <string name="end_poll_confirmation_description">投票を締め切り、投票の最終結果を表示します。</string>
+    <string name="space_type_private_desc">招待者のみ参加可能。個人やチームに最適</string>
+    <string name="activity_create_space_title">スペースを作成</string>
+    <string name="invite_people_to_your_space">連絡先をスペースに招待</string>
+    <string name="settings_discovery_no_terms_title">IDサーバーには利用規約がありません</string>
+    <string name="settings_discovery_consent_notice_off_2">あなたの連絡先は非公開です。端末の連絡先からユーザーを発見するためには、連絡先の情報をIDサーバーに送信する許可が必要です。</string>
+    <string name="open_discovery_settings">ディスカバリー設定を開く</string>
+    <string name="read_at">既読時間</string>
+    <string name="setup_cross_signing">クロス証明を有効にする</string>
+    <string name="add_a_topic_link_text">トピックを追加</string>
+    <string name="room_created_summary_item">%sはルームを作成し設定しました。</string>
+    <string name="direct_room_created_summary_item_by_you">参加しました。</string>
+    <string name="direct_room_created_summary_item">%sが参加しました。</string>
+    <string name="encryption_unknown_algorithm_tile_description">このルームで使用されている暗号化はサポートされていません</string>
+    <string name="encryption_misconfigured">暗号化が正しく設定されていません</string>
+    <string name="settings_text_message_sent">%sにテキストメッセージを送信しました。メッセージ内の確認コードを入力してください。</string>
+    <string name="settings_discovery_no_terms">選択したIDサーバーには利用規約がありません。サービス提供者を信頼している場合にのみ続行してください</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">現在IDサーバー %1$s でメールアドレスや電話番号を共有しています。共有を停止するには%2$sに再接続する必要があります。</string>
+    <string name="room_created_summary_item_by_you">ルームを作成し設定しました。</string>
+    <string name="a11y_create_direct_message_by_qr_code">QRコードを読み取り、新しいダイレクトメッセージを作成</string>
+    <string name="error_failed_to_import_keys">鍵のインポートに失敗しました</string>
+    <string name="a11y_create_direct_message_by_mxid">Matrix IDで新しいダイレクトメッセージを作成</string>
+    <string name="a11y_create_direct_message">新しいダイレクトメッセージを作成</string>
+    <string name="a11y_create_menu_close">ルーム作成メニューを閉じる…</string>
+    <string name="a11y_create_menu_open">ルーム作成メニューを開く</string>
+    <string name="error_network_timeout">サーバーの応答に時間がかかりすぎています。おそらく接続が遅すぎるからか、サーバー側でエラーが発生しているからです。後で再試行してください。</string>
+    <string name="upgrade_public_room_from_to">このルームを%1$sから%2$sにアップグレードします。</string>
+    <string name="voice_message_slide_to_cancel">スライドしてキャンセル</string>
+    <string name="a11y_recording_voice_message">音声メッセージを録音しています</string>
+    <string name="a11y_delete_recorded_voice_message">録音を削除</string>
+    <string name="error_voice_message_cannot_reply_or_edit">音声メッセージがアクティブの間は返信や編集はできません</string>
+    <string name="delete_poll_dialog_content">この投票を削除してよろしいですか？一度削除すると復元することはできません。</string>
+    <string name="error_handling_incoming_share">共有データの取り扱いに失敗しました</string>
+    <string name="rotate_and_crop_screen_title">回転とクロップ</string>
+    <string name="space_explore_activity_title">ルームを探索</string>
+    <string name="space_add_existing_rooms">既存のルームとスペースを追加</string>
+    <string name="labs_enable_thread_messages">スレッドのメッセージを有効にする</string>
+    <string name="space_mark_as_suggested">おすすめに追加</string>
+    <string name="space_mark_as_not_suggested">おすすめから除外</string>
+    <string name="space_manage_rooms_and_spaces">ルームとスペースを管理</string>
+    <string name="preference_show_all_rooms_in_home">ホームに全てのルームを表示</string>
+    <string name="space_suggested">おすすめ</string>
+    <string name="spaces_feeling_experimental_subspace">実験したい気分ですか？
+\n既存のスペースを別のスペースに追加できます。</string>
+    <string name="spaces_no_server_support_title">あなたのホームサーバーはまだスペースをサポートしていないようです</string>
+    <string name="attachment_type_dialog_title">画像を追加</string>
+    <string name="content_reported_as_inappropriate_content">このコンテンツは不適切な投稿として報告されています。
+\n
+\nこのユーザーのコンテンツをこれ以上見たくなければ、ユーザーを無視してそのメッセージを非表示にできます。</string>
+    <string name="content_reported_as_spam_content">このコンテンツはスパムとして報告されています。
+\n
+\nこのユーザーのコンテンツをこれ以上見たくなければ、ユーザーを無視してそのメッセージを非表示にできます。</string>
+    <string name="content_reported_content">このコンテンツが報告されています。
+\n
+\nこのユーザーのコンテンツをこれ以上見たくなければ、ユーザーを無視してそのメッセージを非表示にできます。</string>
+    <string name="uploads_files_subtitle">%1$sにより%2$sに</string>
+    <string name="create_poll_question_hint">質問あるいはトピック</string>
+    <string name="create_poll_question_title">投票の質問あるいはトピック</string>
+    <string name="it_may_take_some_time">少々お待ちください。少し時間がかかるかもしれません。</string>
+    <string name="settings_server_room_versions">ルームのバージョン 👓</string>
+    <string name="settings_server_room_version_unstable">不安定</string>
+    <string name="settings_server_room_version_stable">安定</string>
+    <string name="spoiler">ネタバレ</string>
+    <string name="settings_security_pin_code_use_biometrics_title">生体認証を有効にする</string>
+    <string name="member_banned_by">%1$sによりブロック</string>
+    <string name="three_pid_revoke_invite_dialog_title">招待を取り消す</string>
+    <string name="settings_server_version">サーバーのバージョン</string>
+    <string name="settings_server_name">サーバー名</string>
+    <string name="login_msisdn_error_other">電話番号が正しくないようです。確認してください</string>
+    <string name="login_a11y_choose_other">カスタムホームサーバーを選択</string>
+    <string name="login_a11y_choose_modular">Element Matrix Servicesを選択</string>
+    <string name="login_msisdn_confirm_send_again">再送信</string>
+    <string name="login_msisdn_confirm_hint">コードを入力</string>
+    <string name="login_set_msisdn_mandatory_hint">電話番号</string>
+    <string name="a11y_presence_unavailable">退席中</string>
+    <string name="a11y_presence_offline">オフライン</string>
+    <string name="a11y_presence_online">オンライン</string>
+    <string name="create_spaces_default_public_room_name">一般</string>
+    <string name="call_transfer_title">転送</string>
+    <string name="trusted">信頼済</string>
+    <string name="verification_profile_verified">検証済</string>
+    <string name="event_status_delete_all_failed_dialog_title">未送信のメッセージを削除</string>
+    <string name="dev_tools_send_custom_event">カスタムイベントを送信</string>
+    <string name="dev_tools_explore_room_state">ルームの状態を探索</string>
+    <string name="a11y_view_read_receipts">開封確認メッセージを表示</string>
+    <string name="a11y_rule_notify_off">通知しない</string>
+    <string name="a11y_import_key_from_file">ファイルから鍵をインポート</string>
+    <string name="a11y_unchecked">未確認</string>
+    <string name="settings_server_upload_size_unknown">制限は不明です。</string>
+    <string name="settings_server_upload_size_title">サーバーのファイルアップロードの制限</string>
+    <string name="ftue_auth_carousel_secure_title">自分の会話は、自分のもの。</string>
+    <string name="room_join_rules_invite">%1$sがこのルームを「招待者のみ参加可能」に設定しました。</string>
+    <string name="command_description_spoiler">選択したメッセージをネタバレとして送信</string>
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} がエンドツーエンド暗号鍵をディスクに保存する許可を要求しています。
+\n
+\n鍵を手動でエクスポートできるように、次のポップアップでアクセスを許可してください。</string>
+    <string name="room_join_rules_public">%1$sはこのルームを「リンクを知っている人が参加可能」に設定しました。</string>
+    <string name="identity_server_error_terms_not_signed">初めに設定画面でIDサーバーの利用規約を承認してください。</string>
+    <string name="identity_server_error_no_identity_server_configured">初めにIDサーバーを設定してください。</string>
+    <plurals name="poll_total_vote_count_before_ended_and_not_voted">
+        <item quantity="other">%1$d個の投票があります。結果を見るには投票してください</item>
+    </plurals>
+    <string name="mark_as_verified">信頼済としてマーク</string>
+    <string name="encrypted_unverified">未検証の端末で暗号化</string>
+    <string name="command_confetti">メッセージを紙吹雪と共に送る</string>
+    <string name="command_snow">メッセージを降雪と共に送る</string>
+    <string name="default_message_emote_confetti">紙吹雪🎉を送る</string>
+    <string name="default_message_emote_snow">降雪❄️を送る</string>
+    <string name="ftue_auth_carousel_workplace_title">あなたのチームのメッセージングに。</string>
+    <string name="ftue_auth_carousel_encrypted_body">エンドツーエンドで暗号化され、電話番号不要。広告やデータマイニング無し。</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="ftue_auth_carousel_control_title">管理権を握るのは、あなたです。</string>
+    <string name="template_preference_help_summary">${app_name}の使用に関するヘルプ</string>
+    <string name="labs_allow_extended_logging_summary">詳細なログは、イライラシェイクでログを送信する際に、より多くのログを提供することで、開発者にとっての助けになります。有効にした場合でも、メッセージの内容やその他のプライベートな情報は記録されません。</string>
+    <string name="upgrade_room_warning">ルームのアップグレードは高度な作業であり、不具合や欠けている機能、セキュリティー上の脆弱性がある場合に推奨されます。
+\nアップグレードは通常、ルームがサーバー上で処理される仕方にだけ影響します。</string>
+    <string name="room_settings_enable_encryption_dialog_content">一度有効にしたルームの暗号化は無効にすることはできません。暗号化されたルームで送信されたメッセージは、サーバーからは見ることができず、そのルームのメンバーだけが見ることができます。暗号化を有効にすると、多くのボットやブリッジが正常に動作しなくなる場合があります。</string>
+    <string name="room_created_summary_no_topic_creation_text">%sして、このルームを皆に紹介しましょう。</string>
+    <string name="user_code_info_text">このコードを皆と共有し、スキャンして追加してもらい、会話を始めましょう。</string>
+    <string name="create_spaces_make_sure_access">正当な参加者が%sにアクセスできることを確認してください。これは後から変更できます。</string>
+    <string name="add_people">参加者を追加</string>
+    <plurals name="space_people_you_know">
+        <item quantity="other">%d人の知り合いがすでに参加しています</item>
+    </plurals>
+    <string name="invite_to_space">%sに招待</string>
+    <string name="invite_by_username_or_mail">ユーザー名かメールアドレスで招待</string>
+    <string name="dont_leave_any">どのルームやスペースからも退出しない</string>
+    <string name="pick_tings_to_leave">退出するルームとスペースを選択</string>
+    <string name="you_will_leave_all_in">%sにある全てのルームとスペースから退出しようとしています。</string>
+    <string name="suggested_rooms_pills_on_empty_header">%1$sにようこそ、%2$sさん。</string>
+    <string name="space_leave_prompt_msg_with_name">%sを退出してよろしいですか？</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">スペースは、ルームや連絡先をグループ化する新しい方法です。</string>
+    <string name="you_are_invited">招待されています</string>
+    <string name="space_add_space_to_any_space_you_manage">新しいスペースを、あなたが管理するスペースに追加。</string>
+    <string name="labs_enable_thread_messages_desc">注意：アプリケーションは再起動します</string>
+    <string name="spaces_no_server_support_description">ホームサーバーの管理者にお問い合わせください</string>
+    <string name="all_rooms_youre_in_will_be_shown_in_home">あなたが参加している全てのルームがホームに表示されます。</string>
+    <string name="upgrade_room_update_parent_space">親のスペースを自動的に更新</string>
+    <string name="voice_message_n_seconds_warning_toast">残り%1$d秒</string>
+    <string name="upgrade_room_for_restricted">%sに属する人は、誰でもこのルームを検索し、参加することができます。手動で全員を招待する必要はありません。これはルームの設定からいつでも変更できます。</string>
+    <string name="upgrade_room_for_restricted_no_param">親のスペースに属する人は、誰でもこのルームを検索し、参加することができます。手動で全員を招待する必要はありません。これはルームの設定からいつでも変更できます。</string>
+    <plurals name="poll_total_vote_count_before_ended_and_voted">
+        <item quantity="other">%1$d個の投票に基づく</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_after_ended">
+        <item quantity="other">%1$d個の投票に基づく最終結果</item>
+    </plurals>
+    <string name="room_list_sharing_header_recent_rooms">最近のルーム</string>
+    <string name="verification_conclusion_ok_self_notice">新しいセッションが認証されました。セッションは暗号化されたメッセージにアクセスでき、他のユーザーには信頼済として表示されます。</string>
+    <string name="room_settings_enable_encryption_warning">いったん有効にすると、暗号化を無効にすることはできません。</string>
+    <string name="create_room_disable_federation_description">このルームを同じホームサーバー上で組織内のチームとのコラボレーションにのみ使用するなら、このオプションを有効にするといいかもしれません。これは後から変更できません。</string>
+    <string name="create_room_disable_federation_title">%sに属していないユーザーによるこのルームへの参加を、今後永久に拒否</string>
+    <string name="command_description_lenny">プレーンテキストメッセージの前に ( ͡° ͜ʖ ͡°) を付ける</string>
+    <string name="login_error_threepid_denied">このメールアドレスのドメインの登録は許可されていません</string>
+    <string name="create_space_in_progress">スペースを作成しています…</string>
+    <string name="create_room_in_progress">ルームを作成しています…</string>
+    <string name="hide_advanced">高度な設定を非表示にする</string>
+    <string name="show_advanced">高度な設定を表示</string>
+    <string name="command_description_shrug">プレーンテキストメッセージの前に ¯\\_(ツ)_/¯ を付ける</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="notification_initial_sync">初期同期中…</string>
+    <string name="bug_report_error_too_short">説明文が短すぎます</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">サインインして暗号鍵を取り戻さなければ、暗号化されたメッセージにアクセスできなくなります。</string>
+    <string name="signed_out_submit">再サインイン</string>
+    <string name="autodiscover_well_known_error">有効なホームサーバーを発見できません。識別子を確認してください</string>
+    <string name="login_signin_matrix_id_notice">どこかのホームサーバーで既にアカウントを登録している場合、以下でMatrix ID（例：@user:domain.com）とパスワードを使用してください。</string>
+    <string name="login_validation_code_is_not_correct">入力したコードが正しくありません。確認してください。</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">これは正しいユーザー識別子ではありません。正しいフォーマットは「@user:homeserver.org」です。</string>
+    <string name="login_signin_matrix_id_password_notice">パスワードをお忘れの場合、戻ってパスワードを再設定してください。</string>
+    <string name="login_wait_for_email_title">メールボックスを確認してください</string>
+    <string name="login_connect_to_a_custom_server">カスタムサーバーに接続</string>
+    <string name="login_splash_already_have_account">既にアカウントを持っています</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="direct_room_join_rules_invite">%1$sがこれを「招待者のみ参加可能」に設定しました。</string>
+    <string name="event_status_failed_messages_warning">メッセージを送信できませんでした</string>
+    <string name="a11y_open_widget">ウィジェットを開く</string>
+    <string name="call_transfer_transfer_to_title">%1$sに転送</string>
+    <string name="call_tile_ended">通話は終了しました</string>
+    <string name="cannot_dm_self">自分自身にダイレクトメッセージを送信することはできません！</string>
+    <string name="call_tile_other_started_call">%1$sが通話を開始しました</string>
+    <string name="call_tile_you_started_call">通話を開始しました</string>
+    <string name="login_set_msisdn_optional_hint">電話番号（任意）</string>
+    <string name="login_msisdn_confirm_title">電話番号を確認</string>
+    <string name="login_set_msisdn_title">電話番号を設定</string>
+    <string name="login_reset_password_success_notice">パスワードを再設定しました。</string>
+    <string name="login_reset_password_on">%1$sでパスワードを再設定</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Servicesのアドレス</string>
+    <string name="login_signin_to">%1$sにサインイン</string>
+    <string name="ftue_auth_use_case_title">誰と最もよく会話しますか？</string>
+    <string name="leave_specific_ones">特定のルームとスペースから退出…</string>
+    <string name="this_space_has_no_rooms_not_admin">非公開で招待が必要なルームは表示されていません。
+\nルームを追加する権限はありません。</string>
+    <string name="this_space_has_no_rooms_admin">非公開で招待が必要なルームは表示されていません。</string>
+    <string name="a11y_poll_winner_option">勝者</string>
+    <string name="login_set_msisdn_notice">知人に見つけてもらえるように電話番号を設定できます。任意です。</string>
+    <string name="message_key">メッセージキー</string>
+    <string name="recovery_passphrase">復旧用のパスフレーズ</string>
+    <string name="room_member_override_nick_color">ニックネームの色を変更</string>
+    <string name="verify_by_emoji_description">上記のコードをスキャンできなければ、絵文字の並び方を比較して検証してください。</string>
+    <string name="login_reset_password_cancel_confirmation_content">パスワードはまだ変更されていません。
+\n
+\n変更作業を中止しますか？</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_success_submit">サインインに戻る</string>
+    <string name="send_images_and_video_with_original_size">元の大きさのままメディアファイルを送信</string>
+    <plurals name="send_videos_with_original_size">
+        <item quantity="other">元の大きさのまま動画を送信</item>
+    </plurals>
+    <string name="no_connectivity_to_the_server_indicator">サーバーとの接続が失われました</string>
+    <string name="verification_cannot_access_other_session">復旧用のパスフレーズか、リカバリーキーを使用</string>
+    <string name="new_signin">新しいサインイン</string>
+    <string name="initialize_cross_signing">クロス署名を開始</string>
+    <string name="not_trusted">信頼されていません</string>
+    <string name="complete_security">セキュリティーを確認</string>
+    <string name="verification_request">認証の要求</string>
+    <string name="verification_request_other_cancelled">%sがキャンセルしました</string>
+    <string name="seen_by">既読</string>
+    <string name="verification_profile_verify">検証</string>
+    <string name="does_not_look_like_valid_email">メールアドレスが正しくないようです</string>
+    <string name="login_set_msisdn_notice2">国際電話番号の形式を使用してください。</string>
+    <string name="login_msisdn_error_not_international">国際電話番号は「+」から始まる必要があります</string>
+    <string name="login_msisdn_confirm_notice">コードを%1$sに送信しました。以下に入力して認証してください。</string>
+    <string name="login_reset_password_error_not_found">このメールアドレスはどのアカウントにも登録されていません</string>
+    <string name="login_reset_password_warning_content">パスワードを変更すると、すべてのセッションでのエンドツーエンド暗号鍵がリセットされ、暗号化されたメッセージ履歴が読めなくなります。パスワードを再設定する前に、鍵のバックアップを設定するか、他のセッションから鍵をエクスポートしておいてください。</string>
+    <string name="login_reset_password_notice">パスワードの再設定を確認するために認証メールを送信します。</string>
+    <string name="login_login_with_email_error">このメールアドレスはどのアカウントにも属していません。</string>
+    <string name="login_registration_not_supported">このアプリではこのホームサーバーにアカウントを作成できません。
+\n
+\nウェブクライエントを使用してアカウント登録しますか？</string>
+    <string name="login_registration_disabled">申し訳ありませんが、このサーバーはアカウントの新規登録を受け入れていません。</string>
+    <string name="login_mode_not_supported">このアプリではこのホームサーバーにサインインできません。このホームサーバーは次のサインインの方法に対応しています：%1$s
+\n
+\nウェブクライエントを使用してサインインしますか？</string>
+    <string name="login_sso_error_message">%1$sを読み込み中にエラーが発生しました（%2$d）</string>
+    <string name="login_server_url_form_common_notice">利用したいサーバーのアドレスを入力してください</string>
+    <string name="login_server_url_form_modular_notice">利用したいModular Elementまたはサーバーのアドレスを入力してください</string>
+    <string name="ftue_auth_use_case_skip">迷っていますか？%sしてもいいです</string>
+    <string name="ftue_auth_use_case_subtitle">みんなと繋がる手助けをいたします。</string>
+    <string name="user_code_my_code">自分のコード</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="other">招待を%1$sと他%2$d人に送信しました</item>
+    </plurals>
+    <string name="invitation_sent_to_one_user">招待を%1$sに送信しました</string>
+    <string name="invitations_sent_to_two_users">招待を%1$sと%2$sに送信しました</string>
+    <string name="not_a_valid_qr_code">正しいMatrixのQRコードではありません</string>
+    <string name="add_space">スペースを追加</string>
+    <string name="event_status_delete_all_failed_dialog_message">このルームの全ての未送信のメッセージを削除してよろしいですか？</string>
+    <string name="event_status_cancel_sending_dialog_message">メッセージの送信をキャンセルしますか？</string>
+    <string name="command_description_leave_room">IDを指定してルームから退出（指定しない場合は現在のルームから退出）</string>
+    <string name="command_description_join_space">IDを指定してスペースに参加</string>
+    <string name="dev_tools_menu_name">開発者ツール</string>
+    <string name="a11y_rule_notify_silent">音を出さずに通知</string>
+    <string name="a11y_rule_notify_noisy">音を出して通知</string>
+    <string name="a11y_trust_level_default">既定の信頼レベル</string>
+    <string name="a11y_error_some_message_not_sent">いくつかのメッセージは送信されませんでした</string>
+    <string name="warning_unsaved_change">保存されていない変更があります。変更を破棄しますか？</string>
+    <string name="warning_room_not_created_yet">このルームはまだ作成されていません。キャンセルしますか？</string>
+    <string name="share_by_text">テキストメッセージで共有</string>
+    <string name="settings_security_application_protection_screen_title">保護を設定</string>
+    <string name="invite_just_to_this_room">このルームのみ</string>
+    <string name="space_type_public_desc">誰でも参加可能。コミュニティーに最適</string>
+    <string name="create_spaces_join_info_help">既存のスペースに参加するには、招待が必要です。</string>
+    <string name="create_spaces_you_can_change_later">これは後から変更できます</string>
+    <string name="call_tile_connection_failed">接続できませんでした</string>
+    <string name="warning_unsaved_change_discard">変更を破棄</string>
+    <string name="universal_link_malformed">このリンクは不正な形式です</string>
+    <string name="qr_code_not_scanned">QRコードがスキャンされていません！</string>
+    <string name="settings_security_pin_code_notifications_title">内容を通知に表示</string>
+    <string name="alert_push_are_disabled_title">プッシュ通知は無効になっています</string>
+    <string name="failed_to_unban">ユーザーのブロックを解除できませんでした</string>
+    <string name="three_pid_revoke_invite_dialog_content">%1$sへの招待を取り消しますか？</string>
+    <string name="loading_contact_book">連絡先を取得しています…</string>
+    <string name="search_in_my_contacts">連絡先を検索</string>
+    <string name="phone_book_title">電話帳</string>
+    <string name="disclaimer_title">RiotはElementになりました！</string>
+    <string name="notice_crypto_unable_to_decrypt_final">このメッセージにアクセスできません</string>
+    <string name="room_settings_set_avatar">アバターを設定</string>
+    <string name="identity_server_set_alternative_notice_no_default">IDサーバーのURLを入力</string>
+    <string name="a11y_unmute_microphone">マイクのミュートを解除</string>
+    <string name="a11y_mute_microphone">マイクをミュート</string>
+    <string name="identity_server_set_default_submit">%1$sを使用</string>
+    <string name="power_level_edit_title">役割を設定</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">設定</string>
+    <string name="save_your_security_key_title">セキュリティーキーを保存</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">セキュリティーキーを使用</string>
+    <string name="a11y_start_camera">カメラを開始</string>
+    <string name="a11y_stop_camera">カメラを停止</string>
+    <string name="bottom_sheet_save_your_recovery_key_title">セキュリティーキーを保存</string>
+    <string name="your_recovery_key">リカバリーキー</string>
+    <string name="sent_location">位置情報を共有しました</string>
+    <string name="sent_a_reaction">%sでリアクションしました</string>
+    <string name="sent_verification_conclusion">検証終了</string>
+    <string name="verification_conclusion_compromised">次のいずれかのセキュリティが破られている可能性があります。
+\n
+\n - あなたのホームサーバー
+\n - 検証している相手のホームサーバー
+\n - あなたか相手のインターネット接続
+\n - あなたか相手の端末</string>
+    <string name="verification_conclusion_not_secure">セキュアではない</string>
+    <string name="verification_green_shield">信頼済のユーザーには、この緑の盾のシンボルが表示されます。全てのユーザーについて信頼の設定作業を行うと、ルームの安全性を確保することができます。</string>
+    <string name="verify_user_sas_emoji_security_tip">セキュリティを最大限に高めるには、対面で行うか、他の信頼できる通信手段を使用してください。</string>
+    <string name="verify_user_sas_emoji_help_text">次の絵文字が相手の画面にも同じ順番で現れるのを確認し、このユーザーを検証してください。</string>
+    <string name="verification_conclusion_warning">信頼できないサインイン</string>
+    <string name="create_room_alias_invalid">使用できない文字が含まれています</string>
+    <string name="template_analytics_opt_in_content">${app_name}の改善と課題抽出のために、匿名の使用状況データの送信をお願いします。複数の端末での使用を分析するために、あなたの全端末共通のランダムな識別子を生成します。
+\n
+\n%sで利用規約を閲覧できます。</string>
+    <string name="autocomplete_limited_results">最初の検索結果のみ表示しています。文字をもっと入力してください…</string>
+    <string name="permalink_malformed">matrix.toリンクのフォーマットが正しくありませんでした</string>
+    <string name="soft_logout_clear_data_notice">注意！この端末には暗号鍵を含む個人情報が保存されています。
+\n
+\nこの端末での使用を終了、または他のアカウントにサインインしたい場合、このデータをクリアしてください。</string>
+    <string name="soft_logout_clear_data_dialog_content">この端末に現在保存されている全てのデータをクリアしますか？
+\nアカウントデータとメッセージにアクセスするにはもう一度サインインしてください。</string>
+    <string name="template_soft_logout_sso_not_same_user_error">現在のセッションはユーザー %1$s のものですが、あなたが提供している認証情報はユーザー %2$s のものです。この操作は${app_name}ではサポートされていません。
+\nまずデータをクリアし、その後、別のアカウントにサインインしてください。</string>
+    <string name="soft_logout_signin_e2e_warning_notice">暗号化されたメッセージがどの端末でも読めるように、サインインしてこの端末にのみ保存されている暗号鍵を取り戻してください。</string>
+    <string name="soft_logout_signin_notice">あなたのホームサーバー（%1$s）の管理者があなたを%2$sのアカウントからサインアウトしました（%3$s）。</string>
+    <string name="signed_out_notice">いくつかの原因が考えられます：
+\n
+\n• 他のセッションでパスワードを変更している。
+\n
+\n• 他のセッションでこのセッションを削除している。
+\n
+\n• サーバーの管理者がセキュリティ上の理由であなたのアクセスを取り消している。</string>
+    <string name="login_connect_using_matrix_id_notice">代わりに、既にアカウントをお持ちでMatrix IDとパスワードをご存知なら、この方法が使用できます。</string>
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="other">リクエストが多すぎます。%1$d秒後に再試行できます…</item>
+    </plurals>
+    <string name="login_error_outdated_homeserver_warning_content">このホームサーバーは古いバージョンです。管理者にアップグレードを要請してください。続行できますが、いくつかの機能が正しく作動しない可能性があります。</string>
+    <string name="login_error_outdated_homeserver_content">このホームサーバーのバージョンは古すぎるため、接続できません。管理者にアップグレードを要請してください。</string>
+    <string name="login_error_outdated_homeserver_title">ホームサーバーのバージョンが古すぎます</string>
+    <string name="login_wait_for_email_notice">ただいま%1$sにメールを送信しました。
+\nアカウント登録を続行するにはメール内のリンクをクリックしてください。</string>
+    <string name="login_a11y_captcha_container">CAPTCHA認証を行ってください</string>
+    <string name="login_signup_cancel_confirmation_content">アカウントがまだ登録されていません。
+\n
+\n登録を中止しますか？</string>
+    <string name="login_signup_to">%1$sにアカウント登録</string>
+    <string name="login_reset_password_success_notice_2">あなたはすべてのセッションからログアウトしており、これ以上プッシュ通知を受け取れません。通知を再び有効にするには、各端末でサインインしてください。</string>
+    <string name="set_a_security_phrase_title">セキュリティーフレーズを設定</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">セキュリティーフレーズを使用</string>
+    <string name="save_your_security_key_notice">セキュリティーキーは、パスワードマネージャーもしくは金庫のような安全な場所で保管してください。</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">セキュリティーキーは、パスワードマネージャーもしくは金庫のような安全な場所で保管してください。</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">セキュリティーキーを生成します。パスワードマネージャーもしくは金庫のような安全な場所で保管してください。</string>
+    <string name="bottom_sheet_setup_secure_backup_title">セキュアバックアップ</string>
+    <string name="settings_setup_secure_backup">セキュアバックアップを設定</string>
+    <string name="a11y_open_chat">会話を開く</string>
+    <string name="template_identity_server_error_outdated_identity_server">このIDサーバーは最新のバージョンではありません。${app_name}はAPIのバージョン2のみをサポートしています。</string>
+    <string name="invite_users_to_room_failure">ユーザーを招待できませんでした。招待したいユーザーを確認して、もう一度試してください。</string>
+    <string name="open_terms_of">%sの利用規約を開く</string>
+    <string name="identity_server_user_consent_not_provided">ユーザーによる同意は与えられていません。</string>
+    <string name="identity_server_set_alternative_notice">代わりに、他のIDサーバーのURLを入力できます</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">サーバー上の暗号鍵をバックアップして、暗号化されたメッセージとデータへのアクセスが失われるのを防ぎましょう。</string>
+    <string name="bootstrap_cancel_text">いまキャンセルすると、ログインできなくなった際に、暗号化されたメッセージとデータを失ってしまう可能性があります。
+\n
+\nまた、設定から、安全なバックアップの設定や鍵の管理を行うことができます。</string>
+    <string name="bootstrap_crosssigning_save_usb">USBメモリーもしくはバックアップドライブに保存</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">鍵のバックアップの設定</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">自己署名キーを同期しています</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">ユーザーキーを同期しています</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">マスターキーを同期しています</string>
+    <string name="bootstrap_crosssigning_progress_default_key">SSSSデフォルトキーを規定しています</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">安全な鍵をパスフレーズから生成しています</string>
+    <string name="generate_message_key">メッセージキーを生成</string>
+    <string name="e2e_use_keybackup">暗号化されたメッセージのロックを解除</string>
+    <string name="settings_key_requests">鍵の要求</string>
+    <string name="keys_backup_restore_success_title_already_up_to_date">鍵は既に最新です！</string>
+    <string name="reset_cross_signing">鍵をリセット</string>
+    <string name="create_poll_empty_question_error">質問は空にできません</string>
+    <string name="direct_room_profile_encrypted_subtitle">ここで送受信されるメッセージはエンドツーエンド暗号化されています。
+\n
+\nメッセージは安全に保護されており、メッセージのロックを解除できる固有の鍵を持っているのはあなたと受信者だけです。</string>
+    <string name="room_profile_encrypted_subtitle">この部屋のメッセージはエンドツーエンド暗号化されています。
+\n
+\nメッセージは安全に保護されており、メッセージのロックを解除できる固有の鍵を持っているのはあなたと受信者だけです。</string>
+    <string name="dev_tools_form_hint_state_key">ステートキー</string>
+    <string name="save_recovery_key_chooser_hint">リカバリーキーを以下に保存</string>
+    <string name="crypto_error_withheld_generic">送信者が意図的に鍵を送信しなかったため、このメッセージにアクセスすることができません</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">暗号鍵が適切に送信されませんでした。エンドツーエンド暗号化の性質上、相手のメッセージが届くまで待機する必要があるかもしれません。</string>
+    <string name="bootstrap_migration_backup_recovery_key">鍵のバックアップのリカバリーキー</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">鍵のバックアップのパスフレーズが分からなければ、%sできます。</string>
+    <string name="bootstrap_migration_use_recovery_key">鍵のバックアップのリカバリーキーを使用</string>
+    <string name="bootstrap_migration_enter_backup_password">続行するには鍵のバックアップのパスフレーズを入力してください。</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">SSSS鍵をパスフレーズから生成しています（%s）</string>
+    <string name="bootstrap_progress_generating_ssss">SSSS鍵をパスフレーズから生成しています</string>
+    <string name="bootstrap_progress_compute_curve_key">Curveキーを取得しています</string>
+    <string name="bootstrap_progress_checking_backup_with_info">バックアップキーを確認しています（%s）</string>
+    <string name="bootstrap_progress_checking_backup">バックアップキーを確認しています</string>
+    <string name="a11y_open_drawer">ナビゲーションのメニューを開く</string>
+    <string name="verification_request_you_accepted">承諾しました</string>
+    <string name="verification_request_other_accepted">%sが承諾しました</string>
+    <string name="verification_verified_user">%sが検証済み</string>
+    <string name="verification_verify_user">%sを検証する</string>
+    <string name="verification_no_scan_emoji_title">絵文字を比較して検証</string>
+    <string name="verification_scan_self_emoji_subtitle">絵文字を比較して検証</string>
+    <string name="verification_scan_emoji_subtitle">対面でない場合は、代わりに絵文字を比較してください</string>
+    <string name="settings_server_upload_size_content">あなたのホームサーバーで許容されている添付ファイルの最大サイズは%sです。</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">新しいパスワードを確認するには下記のリンクを開いてください。リンクにアクセスしてから、以下をクリックしてください。</string>
+    <string name="settings_security_pin_code_summary">PINコードを再設定するには「PINコードを忘れた」をタップしてログアウトし、その後再設定してください。</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="other">いま検証できる%d個の端末を表示</item>
+    </plurals>
+    <string name="template_re_authentication_default_confirm_text">この操作を実行するには ${app_name}に認証情報を入力する必要があります。</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">あなただけが知っている秘密のパスワードを入力してください。バックアップ用にセキュリティーキーを生成します。</string>
+    <string name="confirm_your_identity_quad_s">暗号化されたメッセージにアクセスするには、ログインを検証し、本人確認を行う必要があります。</string>
+    <string name="confirm_your_identity">暗号化されたメッセージにアクセスするには、あなたの他のセッションからログインを検証し、本人確認を行う必要があります。</string>
+    <string name="disclaimer_positive_button">詳しく知る</string>
+    <string name="verification_request_notice">セキュリティーを高めるために、使い捨てコードが一致しているのを確認して、%sを検証しましょう。</string>
+    <string name="verification_request_alert_description">セキュリティーを高めるために、自分と相手の端末でコードが一致していることを確認して、%sを検証しましょう。
+\n
+\n対面で行うのが最もセキュアです。</string>
+    <string name="encryption_has_been_misconfigured">暗号化の設定が正しくありません。</string>
+    <string name="room_profile_section_restore_security">暗号化を復元</string>
+    <string name="contact_admin_to_restore_encryption">暗号化を有効な状態に取り戻すために、管理者に連絡してください。</string>
+    <string name="verification_conclusion_ok_notice">このユーザーとのメッセージはエンドツーエンド暗号化されており、第三者には読めません。</string>
+    <string name="verification_code_notice">このコードを相手の画面に現れているコードと比較してください。</string>
+    <string name="verification_emoji_notice">絵文字を比較して、同じ順番に現れているのを確認してください。</string>
+    <string name="verification_request_start_notice">セキュリティーを高めるために、対面で行うか、他の信頼できる通信手段を利用しましょう。</string>
+    <string name="command_description_rainbow_emote">選択されたエモートを虹色にして送信します</string>
+    <string name="command_description_rainbow">選択されたテキストを虹色にして送信します</string>
+    <string name="template_rendering_event_error_exception">${app_name}がID%1$sのイベントを処理中にエラーが発生しました</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name}は%1$sという種類のメッセージに対応していません</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name}は%1$sという種類のイベントに対応していません</string>
+    <string name="room_member_jump_to_read_receipt">既読通知へ移動</string>
+    <string name="keep_it_safe">大切に保護しましょう</string>
+    <string name="bootstrap_finish_title">完了！</string>
+    <string name="bootstrap_dont_reuse_pwd">アカウントパスワードと違うものにしてください。</string>
+    <string name="bootstrap_info_confirm_text">確認のため、%sをもう一度入力してください。</string>
+    <string name="enter_account_password">続行するには%sを入力してください。</string>
+    <string name="confirm_recovery_passphrase">%sを確認</string>
+    <string name="set_recovery_passphrase">%sを設定</string>
+    <string name="verification_cancelled">検証を中止しました</string>
+    <string name="verify_cancel_other">今中止すれば、%1$s（%2$s）の検証をしません。検証は相手のユーザープロフィールからもう一度開始できます。</string>
+    <string name="verify_cancel_self_verification_from_trusted">中止すれば、新しい端末では暗号化されたメッセージが読めないし他のユーザーに信頼されません</string>
+    <string name="verify_cancel_self_verification_from_untrusted">中止すれば、この端末では暗号化されたメッセージが読めないし他のユーザーに信頼されません</string>
+    <string name="verify_new_session_was_not_me">自分ではない</string>
+    <string name="verify_new_session_notice">新しいセッションを検証して、暗号化されたメッセージにアクセスできるようにしましょう。</string>
+    <string name="new_session_review">タップして確認及び検証</string>
+    <string name="new_session">新しいログイン。あなたですか？</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
+    <string name="event_redacted_by_admin_reason_with_reason">部屋の管理者によって削除されています、理由：%1$s</string>
+    <string name="event_redacted_by_user_reason_with_reason">ユーザーによって削除されています、理由：%1$s</string>
+    <string name="delete_event_dialog_reason_hint">削除した理由</string>
+    <string name="share_confirm_room">この添付ファイルを%1$sに送信しますか？</string>
+    <string name="enter_secret_storage_passphrase_warning_text">秘密ストレージは信頼されている端末でのみアクセスしましょう</string>
+    <string name="enter_secret_storage_passphrase">秘密ストレージのパスフレーズを入力してください</string>
+    <string name="verification_use_passphrase">既存のセッションにアクセスできない場合</string>
+    <string name="command_description_poll">シンプルなアンケートを作ります</string>
+    <string name="delete_account_data_warning">%1$sというタイプのアカウントデータを削除しますか？
+\n
+\n予期せぬトラブルを起こす可能性があるので注意してください。</string>
+    <string name="verification_profile_device_new_signing">%1$s（%2$s）が新しいセッションでサインインしました：</string>
+    <string name="verification_profile_device_verified_because">このセッションは%1$s（%2$s）によって検証されているので、メッセージのセキュリティは信頼できます。</string>
+    <string name="verification_open_other_to_verify">既存のセッションでこのセッションを検証して、暗号化されたメッセージへアクセスできるようにしましょう。</string>
+    <string name="crosssigning_other_user_not_trust">他のユーザーに信頼されない可能性があります</string>
+    <string name="settings_active_sessions_verified_device_desc">あなたはこのセッションを検証しているので、メッセージのセキュリティは信頼できます。</string>
+    <string name="settings_failed_to_get_crypto_device_info">利用可能な暗号情報がありません</string>
+    <string name="settings_server_default_room_version">既定のバージョン</string>
+    <string name="settings_hs_admin_e2e_disabled">非公開部屋とダイレクトメッセージにおけるエンドツーエンド暗号化はあなたのサーバーの管理者によって既定として無効にされています。</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 0f22997e23..08bf1f913f 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -2273,7 +2273,6 @@
     <string name="no_permissions_to_start_webrtc_call">Ur tesɛiḍ ara tasiregt ad tebduḍ asiwel deg texxamt-a</string>
     <string name="sent_a_reaction">Issedmer s: %s</string>
     <string name="settings_troubleshoot_test_push_loop_title">Sekyed Push</string>
-    <string name="search_is_not_supported_in_e2e_room">Anadi deg texxamin yettwawgelhen ur yettusefrak ara akka tura.</string>
     <string name="search_banned_user_hint">Sizdeg iseqdacen yettwagedlen</string>
     <string name="permissions_denied_add_contact">Mudd tisirag i unekcum ɣer yinermisen-inek;inem.</string>
     <string name="permissions_denied_qr_code">I usmiḍen n tengalt QR, tesriḍ ad tsirgeḍ anekcum ɣer tkamiṛat.</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 05524c4f8f..630e830748 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -1502,4 +1502,22 @@
     <string name="notice_direct_room_created">%1$s가 새로운 토론을 생성함</string>
     <string name="notice_direct_room_created_by_you">새로운 토론을 생성함</string>
     <string name="notice_room_created_by_you">새로운 방을 생성함</string>
+    <string name="notice_display_name_set_by_you">표시 이름을 %1$s(으)로 변경했습니다</string>
+    <string name="notice_avatar_url_changed_by_you">아바타를 변경했습니다</string>
+    <string name="notice_room_withdraw_by_you">%1$s님의 초대를 취소했습니다</string>
+    <string name="notice_room_ban_by_you">%1$s을 출입 금지했습니다</string>
+    <string name="notice_room_unban_by_you">%1$s님의 출입 금지를 풀었습니다</string>
+    <string name="notice_room_remove_by_you">%1$s님을 추방했습니다</string>
+    <string name="notice_room_reject_by_you">초대를 거부했습니다</string>
+    <string name="notice_direct_room_leave_by_you">방을 떠났습니다</string>
+    <string name="notice_direct_room_leave">%1$s님이 방을 떠났습니다</string>
+    <string name="notice_room_leave_by_you">방을 떠났습니다</string>
+    <string name="notice_direct_room_join_by_you">참가했습니다</string>
+    <string name="notice_direct_room_join">%1$s님이 참가했습니다</string>
+    <string name="notice_room_join_by_you">방에 참가했습니다</string>
+    <string name="notice_room_invite_by_you">%1$s님을 초대했습니다</string>
+    <string name="notice_room_created">%1$s님이 새로운 방을 생성함</string>
+    <string name="notice_room_invite_no_invitee_by_you">내가 보낸 초대</string>
+    <string name="summary_you_sent_sticker">스티커를 보냈습니다.</string>
+    <string name="summary_you_sent_image">사진을 보냈습니다.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 703ec4f229..41fcd1e1fa 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -1144,7 +1144,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="settings_add_3pid_confirm_password_title">Apstipriniet paroli</string>
     <string name="settings_phone_number_empty">Jūsu kontam nav pievienots neviens tālruņa numurs</string>
     <string name="room_sliding_menu_version_x">Versija %s</string>
-    <string name="search_is_not_supported_in_e2e_room">Meklēšana šifrētās istabās pagaidām netiek atbalstīta.</string>
     <string name="room_permissions_change_topic">Mainīt tematu</string>
     <string name="room_permissions_change_permissions">Mainīt atļaujas</string>
     <string name="room_permissions_change_room_name">Nomainīt istabas nosaukumu</string>
@@ -2358,7 +2357,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="create_spaces_join_info_help">Lai pievienotos esošai Telpai, ir nepieciešams ielūgums.</string>
     <string name="create_spaces_you_can_change_later">To var mainīt vēlāk</string>
     <string name="create_spaces_choose_type_label">Kādu Telpu vēlaties izveidot\?</string>
-    <string name="create_spaces_type_header">Telpas ir jauns veids, kā grupēt istabas un cilvēkus</string>
     <string name="your_private_space">Jūsu privātā Telpa</string>
     <string name="your_public_space">Jūsu publiskā Telpa</string>
     <string name="add_space">Pievienot Telpu</string>
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index fa564a83c7..fcfba6f93c 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1018,7 +1018,6 @@
         <item quantity="other">%1$s rom funnet for %2$s</item>
     </plurals>
     <string name="directory_search_results_title">Bla gjennom katalogen</string>
-    <string name="search_is_not_supported_in_e2e_room">Søking i krypterte rom støttes ikke ennå.</string>
     <string name="tab_title_search_people">FOLK</string>
     <string name="room_event_action_report_prompt_reason">Årsak til å rapportere dette innholdet</string>
     <string name="malformed_id">Misdannet ID. Bør være en e-postadresse eller en Matrix ID som \'@localpart: domain\'</string>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 506ef2ba96..7f586c1cb6 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -2126,7 +2126,7 @@
     <string name="send_suggestion">Doe een suggestie</string>
     <string name="preference_system_settings">Systeem instellingen</string>
     <string name="preference_versions">Versies</string>
-    <string name="preference_help_summary">Hulp bij het gebruik van Element</string>
+    <string name="template_preference_help_summary">Hulp bij het gebruik van ${app_name}</string>
     <string name="preference_help_title">Hulp en ondersteuning</string>
     <string name="preference_help">Hulp</string>
     <string name="preference_root_legals">Juridisch</string>
@@ -2236,10 +2236,10 @@
     <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 Element 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="template_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.
 \n
 \nU kunt al onze voorwaarden %s lezen.</string>
-    <string name="analytics_opt_in_title">Help Element verbeteren</string>
+    <string name="template_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>
@@ -2248,7 +2248,7 @@
     <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_show_room_member_state_events_summary">Inclusief uitnodiging/deelnemen/links/kick/ban gebeurtenissen en wijzigingen van avatar/weergavenaam.</string>
+    <string name="settings_show_room_member_state_events_summary">Inclusief uitnodiging/deelnemen/links/verwijder/ban gebeurtenissen en wijzigingen van avatar/weergavenaam.</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_show_room_member_state_events">Toon kamer deelnemers event status</string>
@@ -2286,7 +2286,6 @@
     <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>
-    <string name="search_is_not_supported_in_e2e_room">Zoeken in versleutelde kamers wordt nog niet ondersteund.</string>
     <string name="search_banned_user_hint">Filter verbannen gebruikers</string>
     <string name="room_permissions_change_topic">Verander onderwerp</string>
     <string name="room_permissions_upgrade_the_space">Space upgraden</string>
@@ -2869,17 +2868,11 @@
     <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_4_title">Geef je teams meer ruimte.</string>
-    <string name="ftue_auth_carousel_1_title">Word eigenaar van uw gesprekken.</string>
+    <string name="ftue_auth_carousel_secure_title">Word eigenaar van uw 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="dev_tools_event_content_hint">Gebeurtenis inhoud</string>
-    <string name="to_help_space_members_find_and_join">Om leden van een kamer te helpen een privékamer te vinden en eraan deel te nemen, gat u naar de instellingen van die kamer door op de avatar te tikken.</string>
-    <string name="help_space_members">Help leden van een space privékamers te vinden</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Dit maakt het gemakkelijk voor kamers om privé te blijven voor een ruimte, terwijl mensen in de kamer ze kunnen vinden en erbij kunnen voegen. Alle nieuwe kamers in een kamer hebben deze optie beschikbaar.</string>
-    <string name="help_people_in_spaces_find_and_join">Help mensen in kamers om zelf privékamers te vinden en eraan deel te nemen, het is niet nodig om iedereen handmatig uit te nodigen.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Nieuw: laat mensen in kamers, privékamers zoeken en er lid van worden</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="allow_anyone_in_room_to_access">Sta iedereen in %s toe om te zoeken en toegang te krijgen. U kunt ook andere kamers selecteren.</string>
@@ -2916,7 +2909,7 @@
         <item quantity="other">Eindresultaat gebaseerd op %1$d stemmen</item>
     </plurals>
     <plurals name="poll_total_vote_count_before_ended_and_not_voted">
-        <item quantity="one">Geen stemmen uitgebracht</item>
+        <item quantity="one">%1$d uitgebrachte stem. Stem om de resultaten te zien</item>
         <item quantity="other">%1$d stemmen uitgebracht. Stem om de resultaten te zien</item>
     </plurals>
     <plurals name="poll_total_vote_count_before_ended_and_voted">
@@ -2941,7 +2934,7 @@
     <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="labs_enable_latex_maths">LaTeX wiskunde inschakelen</string>
-    <string name="link_this_email_with_your_account">%s in Instellingen om uitnodigingen rechtstreeks in Element te ontvangen.</string>
+    <string name="template_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>
@@ -3045,7 +3038,6 @@
     <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 creëren\?</string>
-    <string name="create_spaces_type_header">Spaces zijn een nieuwe manier om kamers en mensen te groeperen</string>
     <string name="your_private_space">Uw privé space</string>
     <string name="your_public_space">Uw openbare space</string>
     <string name="add_space">Space toevoegen</string>
@@ -3062,6 +3054,72 @@
     <string name="command_description_create_space">Maak een Space</string>
     <string name="room_member_override_nick_color">Bijnaam kleur overschrijven</string>
     <string name="login_splash_already_have_account">Ik heb al een account</string>
-    <string name="ftue_auth_carousel_3_title">Maak contact met iedereen.</string>
-    <string name="ftue_auth_carousel_2_title">U heeft de controle.</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="tooltip_attachment_location">Deel locatie</string>
+    <string name="labs_render_locations_in_timeline">Gebruikerslocaties in de tijdlijn weergeven</string>
+    <string name="settings_enable_location_sharing_summary">Eenmaal ingeschakeld, kun je je locatie naar elke kamer sturen</string>
+    <string name="settings_enable_location_sharing">Locatie delen inschakelen</string>
+    <string name="location_share_external">Open met</string>
+    <string name="template_location_not_available_dialog_content">${app_name} kan geen toegang krijgen tot uw locatie. Probeer het later opnieuw.</string>
+    <string name="template_location_not_available_dialog_title">${app_name} heeft geen toegang tot uw locatie</string>
+    <string name="location_share">Deel locatie</string>
+    <string name="a11y_location_share_icon">Deel 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>
+    <string name="closed_poll_option_title">Gesloten poll</string>
+    <string name="open_poll_option_description">Kiezers zien resultaten zodra ze hebben gestemd</string>
+    <string name="open_poll_option_title">Poll openen</string>
+    <string name="poll_type_title">Poll type</string>
+    <string name="edit_poll_button">POLL BEWERKEN</string>
+    <string name="edit_poll_title">Poll bewerken</string>
+    <string name="poll_no_votes_cast">Geen stemmen uitgebracht</string>
+    <string name="a11y_trust_level_misconfigured">Verkeerd geconfigureerd vertrouwensniveau</string>
+    <string name="encryption_misconfigured">Versleuteling is verkeerd geconfigureerd</string>
+    <string name="room_profile_section_restore_security">Versleuteling herstellen</string>
+    <string name="contact_admin_to_restore_encryption">Neem contact op met een beheerder om de versleuteling in een geldige staat te herstellen.</string>
+    <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="attachment_type_location">Locatie</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt verzenden. Klik om instellingen te openen.</string>
+    <string name="room_unsupported_e2e_algorithm">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt verzenden. 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="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_skip_partial">sla deze vraag over</string>
+    <string name="ftue_auth_use_case_skip">Nog niet zeker\? U kunt %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="view_in_room">Bekijk in kamer</string>
+    <string name="reply_in_thread">Reageren in discussie</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="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_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>
+    <string name="thread_list_modal_title">Filter</string>
+    <string name="thread_list_title">Discussies</string>
+    <string name="thread_timeline_title">Discussie</string>
+    <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>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index f25ad75c73..2925d00a35 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -2187,7 +2187,6 @@
     <string name="settings_emails_empty">Żaden adres e-mail nie został dodany do Twojego konta</string>
     <string name="settings_emails">Adres e-mail</string>
     <string name="settings_phone_number_empty">Nie dodano żadnego numeru telefonu do Twojego konta</string>
-    <string name="search_is_not_supported_in_e2e_room">Wyszukiwanie w pokojach stosujących szyfrowanie nie jest obecnie wspierane.</string>
     <string name="search_banned_user_hint">Filtruj zbanowanych użytkowników</string>
     <string name="room_participants_unban_prompt_msg">Odbanowanie użytkownika pozwoli mu na ponowne dołączenie do pokoju.</string>
     <string name="room_participants_ban_title">Zbanuj użytkownika</string>
@@ -2425,7 +2424,7 @@
     <string name="room_settings_access_rules_pref_dialog_title">Kto powinien mieć dostęp \?</string>
     <string name="room_settings_room_notifications_account_settings">Ustawienia konta</string>
     <string name="room_settings_room_notifications_manage_notifications">Możesz zarządzać notyfikacjami w %1$s.</string>
-    <string name="room_settings_room_notifications_encryption_notice">Proszę zwrócić uwagę, że notyfikacje o wzmiankach i słowach kluczowych nie są dostępne w zaszyfrowanych pokojach na urządzeniach mobilnych.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Proszę zwrócić uwagę, że powiadomienia o wzmiankach i słowach kluczowych nie są dostępne w zaszyfrowanych pokojach na urządzeniach mobilnych.</string>
     <string name="room_settings_room_notifications_notify_me">Powiadamiaj mnie o</string>
     <string name="settings_secure_backup_reset">Zresetuj bezpieczną kopię zapasową</string>
     <string name="settings_secure_backup_setup">Skonfiguruj bezpieczną kopię zapasową</string>
@@ -2440,7 +2439,7 @@
     <string name="settings_notification_emails_category">Powiadomienie email</string>
     <string name="room_settings_none">Żadne</string>
     <string name="room_settings_mention_and_keyword_only">Tylko wzmianki i słowa kluczowe</string>
-    <string name="notification_listening_for_notifications">Oczekiwanie na notyfikacje</string>
+    <string name="notification_listening_for_notifications">Oczekiwanie na powiadomienia</string>
     <string name="notice_room_canonical_alias_no_change">%1$s zmienił(a) adresy tego pokoju.</string>
     <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Zmieniłeś(aś) głowny i alternatywny adres tego pokoju.</string>
     <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s zmienił(a) główny i alternatywny adres tego pokoju.</string>
@@ -2478,7 +2477,7 @@
     <string name="notice_room_server_acl_updated_was_banned">• Serwery pasujące do %s zostały usunięte z listy zablokowanych.</string>
     <string name="notice_room_server_acl_updated_banned">• Serwery pasujące do %s są teraz zablokowane.</string>
     <string name="room_displayname_3_members">%1$s, %2$s i %3$s</string>
-    <string name="link_this_email_with_your_account">%s w Ustawieniach, aby otrzymywać zaproszenia bezpośrednio w Elememencie.</string>
+    <string name="template_link_this_email_with_your_account">%s w Ustawieniach, aby otrzymywać zaproszenia bezpośrednio w ${app_name}.</string>
     <string name="room_permissions_change_topic">Zmiana tematu</string>
     <string name="room_permissions_upgrade_the_space">Aktualizacja Przestrzeni</string>
     <string name="room_permissions_upgrade_the_room">Aktualizacja pokoju</string>
@@ -2725,7 +2724,6 @@
     <string name="create_spaces_join_info_help">Aby dołączyć do istniejącej przestrzeni, potrzebujesz zaproszenia.</string>
     <string name="create_spaces_you_can_change_later">Możesz zmienić to później</string>
     <string name="create_spaces_choose_type_label">Jaki rodzaj przestrzeni chcesz stworzyć\?</string>
-    <string name="create_spaces_type_header">Przestrzenie są nowym sposobem na organizację pokojów i osób</string>
     <string name="event_status_sent_message">Wiadomość wysłana</string>
     <string name="initial_sync_start_downloading">Wstępna synchronizacja:
 \nPobieranie danych…</string>
@@ -3045,10 +3043,10 @@
     <string name="analytics_opt_in_list_item_2"><b>Nie udostępniamy</b> informacji podmiotom trzecim</string>
     <string name="analytics_opt_in_list_item_1"><b> Nie zbieramy i nie profilujemy </b> danych użytkownika</string>
     <string name="analytics_opt_in_content_link">tutaj</string>
-    <string name="analytics_opt_in_content">Pomóż nam znaleźć błędy i ulepszyć Element poprzez udostępnianie anonimowych danych użytkowania. Aby lepiej zrozumieć jak użytkownicy wykorzystują wiele urządzeń wygenerujemy losowy identyfikator dzielony pomiędzy Twoimi urządzeniami.
+    <string name="template_analytics_opt_in_content">Pomóż nam znaleźć błędy i ulepszyć ${app_name} poprzez udostępnianie anonimowych danych użytkowania. Aby lepiej zrozumieć jak użytkownicy wykorzystują wiele urządzeń wygenerujemy losowy identyfikator dzielony pomiędzy Twoimi urządzeniami.
 \n
 \nWięcej informacji %s.</string>
-    <string name="analytics_opt_in_title">Pomóż usprawnić Element</string>
+    <string name="template_analytics_opt_in_title">Pomóż usprawnić ${app_name}</string>
     <string name="action_not_now">Nie teraz</string>
     <string name="action_enable">Włącz</string>
     <plurals name="notice_room_aliases_removed_by_you">
@@ -3059,11 +3057,11 @@
     </plurals>
     <string name="room_member_override_nick_color">Nadpisz kolor nicku</string>
     <string name="login_splash_already_have_account">Posiadam już konto</string>
-    <string name="ftue_auth_carousel_3_title">Połącz się z każdym.</string>
-    <string name="ftue_auth_carousel_2_title">Ty jesteś w kontroli.</string>
-    <string name="ftue_auth_carousel_1_title">Przejmij swoje konwersacje.</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_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 Element</string>
+    <string name="template_preference_help_summary">Uzyskaj pomoc w korzystaniu z ${app_name}</string>
     <string name="room_error_access_unauthorized">Nie masz uprawnień by dołączyć do tego pokoju</string>
     <string name="dev_tools_form_hint_type">Typ</string>
     <string name="a11y_presence_offline">Niedostępny</string>
@@ -3072,8 +3070,8 @@
     <plurals name="call_one_active_and_other_paused">
         <item quantity="one">Jedno aktywne połączenie (%1$s) - Jedno wstrzymane połączenie</item>
         <item quantity="few">Jedno aktywne połączenie (%1$s) - Kilka wstrzymanych połączeń</item>
-        <item quantity="many"></item>
-        <item quantity="other"></item>
+        <item quantity="many"/>
+        <item quantity="other"/>
     </plurals>
     <string name="discovery_section">Odkrywanie (%s)</string>
     <string name="finish_setting_up_discovery">Dokończ konfigurację odkrywania.</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 228b61cb6f..ee332d3aa8 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -324,7 +324,7 @@
     <string name="home_filter_placeholder_people">Filtrar pessoas</string>
     <string name="home_filter_placeholder_rooms">Filtrar nomes de salas</string>
     <string name="invitations_header">Convites</string>
-    <string name="low_priority_header">Baixa prioridade</string>
+    <string name="low_priority_header">Prioridade baixa</string>
     <string name="direct_chats_header">Conversas</string>
     <string name="local_address_book_header">Agenda de endereços local</string>
     <string name="matrix_only_filter">Contatos de Matrix somente</string>
@@ -405,7 +405,7 @@
     <string name="auth_home_server">Servidorcasa:</string>
     <string name="auth_identity_server">Servidor de identidade:</string>
     <string name="auth_reset_password_next_step_button">Eu tenho verificado meu endereço de email</string>
-    <string name="auth_reset_password_message">Para resettar sua senha, entre o endereço de email linkado a sua conta:</string>
+    <string name="auth_reset_password_message">Para resetar sua senha, digite o endereço de email vinculado a sua conta:</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_missing_password">Uma nova senha deve ser entrada.</string>
     <string name="auth_reset_password_email_validation_message">Um email tem sido enviado para %s. Uma vez que tenha seguido o link que ele contém, clique abaixo.</string>
@@ -508,7 +508,7 @@
     <string name="room_participants_action_leave">Sair desta sala</string>
     <string name="room_participants_action_ban">Banir</string>
     <string name="room_participants_action_unban">Desbanir</string>
-    <string name="room_participants_action_set_default_power_level">Resettar a usuária(o) normal</string>
+    <string name="room_participants_action_set_default_power_level">Resetar a usuária(o) normal</string>
     <string name="room_participants_action_set_moderator">Fazer moderador(a)</string>
     <string name="room_participants_action_set_admin">Fazer admin</string>
     <string name="room_participants_action_ignore">Ignorar</string>
@@ -673,12 +673,12 @@
     <string name="room_settings_room_tag">Etiqueta da Sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetada como:</string>
     <string name="room_settings_tag_pref_entry_favourite">Favoritar</string>
-    <string name="room_settings_tag_pref_entry_low_priority">Baixa prioridade</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Prioridade baixa</string>
     <string name="room_settings_tag_pref_entry_none">Nenhuma</string>
     <string name="room_settings_category_access_visibility_title">Acesso e visibilidade</string>
     <string name="room_settings_directory_visibility">Listar esta sala em diretório de salas</string>
     <string name="room_settings_room_access_rules_pref_title">Acesso a Sala</string>
-    <string name="room_settings_room_read_history_rules_pref_title">Legibilidade de Histórico de Sala</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Legibilidade do Histórico da Sala</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Quem pode ler o histórico\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Quem pode acessar esta sala?</string>
     <string name="room_settings_read_history_entry_anyone">Qualquer pessoa</string>
@@ -828,7 +828,7 @@
     <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">Pré-visualização de URL em linha</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>
@@ -1294,7 +1294,7 @@
     <string name="settings_secure_backup_section_title">Backup Seguro</string>
     <string name="settings_secure_backup_manage">Gerenciar</string>
     <string name="settings_secure_backup_setup">Configurar Backup Seguro</string>
-    <string name="settings_secure_backup_reset">Resettar Backup Seguro</string>
+    <string name="settings_secure_backup_reset">Resetar Backup Seguro</string>
     <string name="settings_secure_backup_enter_to_setup">Configurar neste dispositivo</string>
     <string name="settings_secure_backup_section_info">Salvaguardar-se contra perda de acesso a mensagens &amp; dados encriptados ao fazer backup de chaves de encriptação em seu servidor.</string>
     <string name="reset_secure_backup_title">Gere uma nova Chave de Segurança ou defina uma nova Frase de Segurança para seu backup existente.</string>
@@ -1540,7 +1540,7 @@
     <string name="sas_error_m_user_error">Correspondência errada de usuária(o)</string>
     <string name="sas_error_unknown">Erro Desconhecido</string>
     <string name="identity_server_not_defined">Você não está usando nenhum servidor de identidade</string>
-    <string name="identity_server_not_defined_for_password_reset">Nenhum servidor de identidade está configurado, ele é requerido para resettar sua senha.</string>
+    <string name="identity_server_not_defined_for_password_reset">Nenhum servidor de identidade está configurado, ele é requerido para resetar sua senha.</string>
     <string name="error_user_already_logged_in">Parece que você está tentando se conectar a um outro servidorcasa. Você quer fazer signout\?</string>
     <string name="edit">Editar</string>
     <string name="reply">Responder</string>
@@ -1783,13 +1783,13 @@
 \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_reset_password_on">Resettar senha em %1$s</string>
+    <string name="login_reset_password_on">Resetar 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>
     <string name="login_reset_password_email_hint">Email</string>
     <string name="login_reset_password_password_hint">Nova senha</string>
     <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_content">Mudar sua senha vai resetar quaisquer chaves de encriptação ponta-a-ponta em todas as suas sessões, tornando histórico de chat encriptado ilegível. Configure Backup de Chave ou exporte suas chaves de sala de uma outra sessão antes de resetar 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_mail_confirmation_title">Cheque sua inbox</string>
@@ -2032,7 +2032,7 @@
     <string name="verification_profile_device_new_signing">%1$s (%2$s) fez signin usando uma nova sessão:</string>
     <string name="verification_profile_device_untrust_info">Até que esta(e) usuária(o) confie nesta sessão, mensagens enviadas para e desde ela são etiquetadas com avisos. Alternativamente, você pode verificá-la manualmente.</string>
     <string name="initialize_cross_signing">Inicializar AssinaturaCruzada</string>
-    <string name="reset_cross_signing">Resettar Chaves</string>
+    <string name="reset_cross_signing">Resetar Chaves</string>
     <string name="a11y_qr_code_for_verification">QR code</string>
     <string name="qr_code_scanned_by_other_notice">Quase lá! %s está mostrando um tick (✓)\?</string>
     <string name="qr_code_scanned_by_other_yes">Sim</string>
@@ -2287,11 +2287,11 @@
     <string name="create_pin_confirm_failure">Falha para validar PIN, por favor toque um novo.</string>
     <string name="auth_pin_title">Entre seu PIN</string>
     <string name="auth_pin_forgot">Esqueceu PIN\?</string>
-    <string name="auth_pin_reset_title">Resettar PIN</string>
+    <string name="auth_pin_reset_title">Resetar PIN</string>
     <string name="auth_pin_new_pin_action">Novo PIN</string>
-    <string name="auth_pin_reset_content">Para resettar seu PIN, você vai precisar refazer login e criar um novo.</string>
+    <string name="auth_pin_reset_content">Para resetar seu PIN, você vai precisar refazer login e criar um novo.</string>
     <string name="settings_security_pin_code_title">Habilitar PIN</string>
-    <string name="settings_security_pin_code_summary">Se você quer resettar seu PIN, toque em Esqueceu PIN para fazer logout e resettá-lo.</string>
+    <string name="settings_security_pin_code_summary">Se você quer resetar seu PIN, toque em Esqueceu PIN para fazer logout e resetá-lo.</string>
     <string name="auth_pin_confirm_to_disable_title">Confirmar PIN para desabilitar PIN</string>
     <string name="settings_call_show_confirmation_dialog_title">Prevenir chamada acidental</string>
     <string name="settings_call_show_confirmation_dialog_summary">Pedir por confirmação antes de começar uma chamada</string>
@@ -2368,9 +2368,9 @@
         <item quantity="other">Mostrar %d dispositivos com os quais você pode verificar agora</item>
     </plurals>
     <string name="secure_backup_reset_no_history">Você vai recomeçar com nada de histórico, mensagens, dispositivos confiados ou usuárias(os) confiadas(os)</string>
-    <string name="secure_backup_reset_if_you_reset_all">Se você resettar tudo</string>
+    <string name="secure_backup_reset_if_you_reset_all">Se você resetar tudo</string>
     <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="secure_backup_reset_all">Resetar 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_encryption_enabled_tile_description">Mensagens nesta sala são encriptadas ponta-a-ponta.</string>
@@ -2391,10 +2391,9 @@
     <string name="settings_troubleshoot_test_push_loop_failed">Falha para receber push. Solução podia ser reinstalar o aplicativo.</string>
     <string name="settings_troubleshoot_test_push_loop_success">O aplicativo está recebendo PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">O aplicativo está esperando pelo PUSH</string>
-    <string name="search_is_not_supported_in_e2e_room">Pesquisar em salas encriptadas não é suportado ainda.</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Você não tem permissão para começar uma chamada</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Você não tem permissão para começar uma chamada de conferência</string>
-    <string name="action_reset">Resettar</string>
+    <string name="action_reset">Resetar</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>
@@ -2404,8 +2403,8 @@
         <item quantity="one">%d convite</item>
         <item quantity="other">%d convites</item>
     </plurals>
-    <string name="room_list_quick_actions_low_priority_remove">Remover de baixa prioridade</string>
-    <string name="room_list_quick_actions_low_priority_add">Adicionar a baixa prioridade</string>
+    <string name="room_list_quick_actions_low_priority_remove">Remover de prioridade baixa</string>
+    <string name="room_list_quick_actions_low_priority_add">Adicionar a prioridade baixa</string>
     <string name="attachment_type_dialog_title">Adicionar imagem de</string>
     <string name="warning_unsaved_change_discard">Descartar mudanças</string>
     <string name="warning_unsaved_change">Existem mudanças não-salvas. Descartar as mudanças\?</string>
@@ -2755,7 +2754,6 @@
     <string name="create_spaces_join_info_help">Para se juntar a um espaço existente, você precisa de um convite.</string>
     <string name="create_spaces_you_can_change_later">Você pode mudar isto mais tarde</string>
     <string name="create_spaces_choose_type_label">Que tipo de espaço você quer criar\?</string>
-    <string name="create_spaces_type_header">Espaços são uma nova forma de agrupar salas e pessoas</string>
     <string name="your_private_space">Seu espaço privado</string>
     <string name="your_public_space">Seu espaço público</string>
     <string name="add_space">Adicionar Espaço</string>
@@ -2861,15 +2859,10 @@
     <string name="settings_notification_other">Outras</string>
     <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 Element.</string>
+    <string name="template_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="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="to_help_space_members_find_and_join">Para ajudar membros de espaço encontrarem e se juntarem uma sala privada, vá para as configurações dessa sala ao tocar no avatar.</string>
-    <string name="help_space_members">Ajude membros de espaço encontrarem salas privadas</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Isto facilita salas ficarem privadas a um espaço, enquanto deixa pessoas no espaço encontrarem e se juntarem a elas. Todas as salas novas em um espaço vão ter esta opção disponível.</string>
-    <string name="help_people_in_spaces_find_and_join">Ajude pessoas em espaços a elas mesmas encontrarem e se juntarem a salas privadas, sem necessidade de manualmente convidar todo mundo.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Novo: Deixe pessoas em espaços encontrarem e se juntarem a salas privadas</string>
     <string name="call_jitsi_started">Chamada de grupo começada</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>
     <string name="preference_show_all_rooms_in_home">Mostrar todas as salas em Home</string>
@@ -2896,7 +2889,7 @@
     <string name="room_settings_room_notifications_account_settings">Configurações de conta</string>
     <string name="room_settings_room_notifications_manage_notifications">Você pode gerenciar notificações em %1$s.</string>
     <string name="room_settings_room_notifications_encryption_notice">Por favor note que notificações de menções &amp; palavrachave não estão disponíveis em salas encriptadas no celular.</string>
-    <string name="room_settings_room_notifications_notify_me">Notifique-me por</string>
+    <string name="room_settings_room_notifications_notify_me">Notifique-me para</string>
     <string name="settings_mentions_and_keywords_encryption_notice">Você não vai ter notificações para menções &amp; palavrachaves em salas encriptadas no celular.</string>
     <string name="settings_messages_containing_keywords">Palavrachaves</string>
     <string name="settings_mentions_at_room">\@room</string>
@@ -3028,7 +3021,7 @@
         <item quantity="other">%1$d votos</item>
     </plurals>
     <string name="preference_versions">Versões</string>
-    <string name="preference_help_summary">Conseguir ajuda com uso de Element</string>
+    <string name="template_preference_help_summary">Conseguir ajuda com uso de ${app_name}</string>
     <string name="preference_root_legals">Jurídicos</string>
     <string name="legals_no_policy_provided">Este servidor não provê nenhuma política.</string>
     <string name="legals_third_party_notices">Bibliotecas de terceiros</string>
@@ -3036,10 +3029,10 @@
     <string name="legals_home_server_title">A política de seu servidorcasa</string>
     <string name="template_legals_application_title">Política de ${app_name}</string>
     <string name="analytics_opt_in_list_item_1">Nós <b>não</b> gravamos ou perfilamos quaisquer dados de conta</string>
-    <string name="analytics_opt_in_content">Ajude-nos a identificar problemas e melhorar Element ao compartilhar dados de uso anônimos. Para entender como pessoas usam seus múltiplos dispositivos, nós vamos gerar um identificador aleatório, compartilhado por seus dispositivos.
+    <string name="template_analytics_opt_in_content">Ajude-nos a identificar problemas e melhorar ${app_name} ao compartilhar dados de uso anônimos. Para entender como pessoas usam seus múltiplos dispositivos, nós vamos gerar um identificador aleatório, compartilhado por seus dispositivos.
 \n
 \nVocê pode ler todos os nossos termos %s.</string>
-    <string name="analytics_opt_in_title">Ajude a melhorar Element</string>
+    <string name="template_analytics_opt_in_title">Ajude a melhorar ${app_name}</string>
     <string name="preference_system_settings">Configurações de sistema</string>
     <string name="preference_help_title">Ajuda e suporte</string>
     <string name="preference_help">Ajuda</string>
@@ -3050,7 +3043,7 @@
     <string name="restart_the_application_to_apply_changes">Recomece o aplicativo para a mudançar tomar efeito.</string>
     <string name="labs_enable_latex_maths">Habilitar matemática LaTeX</string>
     <string name="room_error_access_unauthorized">Você não é permitida(o) a juntar-se a esta sala</string>
-    <string name="tooltip_attachment_poll">Criar sondagem</string>
+    <string name="tooltip_attachment_poll">Criar enquete</string>
     <string name="tooltip_attachment_contact">Abrir contatos</string>
     <string name="tooltip_attachment_sticker">Enviar sticker</string>
     <string name="tooltip_attachment_file">Fazer upload de arquivo</string>
@@ -3060,10 +3053,9 @@
     <string name="labs_auto_report_uisi">Auro Reportar Erros de Decriptação.</string>
     <string name="room_member_override_nick_color">Sobrepor cor de nick</string>
     <string name="login_splash_already_have_account">Eu já tenho uma conta</string>
-    <string name="ftue_auth_carousel_4_title">Dê liberdade a times.</string>
-    <string name="ftue_auth_carousel_3_title">Mensageria segura.</string>
-    <string name="ftue_auth_carousel_2_title">Você está em controle.</string>
-    <string name="ftue_auth_carousel_1_title">Tenha posse de suas conversas.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Mensageria segura.</string>
+    <string name="ftue_auth_carousel_control_title">Você está em controle.</string>
+    <string name="ftue_auth_carousel_secure_title">Tenha posse de suas conversas.</string>
     <string name="tooltip_attachment_location">Compartilhar localização</string>
     <string name="labs_render_locations_in_timeline">Render localizações de usuária(o) na timeline</string>
     <string name="settings_enable_location_sharing_summary">Uma vez habilitada você vai ser capaz de enviar sua localização a qualquer sala</string>
@@ -3091,10 +3083,43 @@
     <string name="attachment_type_location">Localização</string>
     <string name="encryption_has_been_misconfigured">Encriptação tem sido malconfigurada.</string>
     <string name="login_splash_create_account">Criar conta</string>
-    <string name="ftue_auth_carousel_title_messaging">Mensageria para seu time.</string>
-    <string name="ftue_auth_carousel_body_encrypted">Encriptado ponta-a-ponta e nenhum número de telefone requerido. Sem publicidade ou datamining.</string>
-    <string name="ftue_auth_carousel_body_control">Escolha onde suas conversas são mantidas, dando-lhe controle e independência. Conectado via Matrix.</string>
-    <string name="ftue_auth_carousel_body_secure">Comunicação segura e independente que lhe dá o mesmo nível de privacidade que conversa face-a-face em sua própria casa.</string>
+    <string name="ftue_auth_carousel_workplace_title">Mensageria para seu time.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Encriptado ponta-a-ponta e nenhum número de telefone requerido. Sem publicidade ou datamining.</string>
+    <string name="ftue_auth_carousel_control_body">Escolha onde suas conversas são mantidas, dando-lhe controle e independência. Conectado via Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Comunicação segura e independente que lhe dá o mesmo nível de privacidade que conversa face-a-face em sua própria casa.</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">Encriptação tem sido malconfigurada então você não pode enviar mensagens. Clique para abrir configurações.</string>
     <string name="room_unsupported_e2e_algorithm">Encriptação tem sido malconfigurada então você não pode enviar mensagens. Por favor contacte um(a) admin para restaurar encriptação a um estado válido.</string>
+    <string name="message_bubbles">Mostrar Bolhas de mensagem</string>
+    <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="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>
+    <string name="ftue_auth_use_case_skip">Não tem certeza ainda\? Você pode %s</string>
+    <string name="ftue_auth_use_case_option_three">Comunidades</string>
+    <string name="ftue_auth_use_case_option_two">Times</string>
+    <string name="ftue_auth_use_case_option_one">Amigas(os) e família</string>
+    <string name="ftue_auth_use_case_subtitle">Nós vamos ajudá-la(o) a ficar conectada(o).</string>
+    <string name="ftue_auth_use_case_title">Com quem você vai fazer chat mais\?</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Você já está visualizando esta thread!</string>
+    <string name="view_in_room">Visualizar Em Sala</string>
+    <string name="reply_in_thread">Responder Em Thread</string>
+    <string name="command_not_supported_in_threads">O comando \"%s\" é reconhecido mas não suportado em threads.</string>
+    <string name="search_thread_from_a_thread">De uma Thread</string>
+    <string name="thread_list_empty_notice">Dica: Toque longo numa mensagem e use “%s”.</string>
+    <string name="thread_list_empty_subtitle">Threads ajudam a manter suas conversas em-tópico e fáceis de rastrear.</string>
+    <string name="thread_list_empty_title">Mantenha discussões organizadas com threads</string>
+    <string name="thread_list_modal_my_threads_subtitle">Mostra todas as threads nas quais você tem participado</string>
+    <string name="thread_list_modal_my_threads_title">Minhas Threads</string>
+    <string name="thread_list_modal_all_threads_subtitle">Mostra todas as threads de sala atual</string>
+    <string name="thread_list_modal_all_threads_title">Todas as Threads</string>
+    <string name="thread_list_modal_title">Filtrar</string>
+    <string name="thread_list_title">Threads</string>
+    <string name="thread_timeline_title">Thread</string>
+    <string name="room_threads_filter">Filtrar Threads em sala</string>
+    <string name="action_thread_copy_link_to_thread">Copiar link para thread</string>
+    <string name="action_thread_view_in_room">Visualizar em sala</string>
+    <string name="action_view_threads">Visualizar Threads</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 31491dca18..d71debde63 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -69,9 +69,10 @@
 \nИмпорт криптографии</string>
     <string name="initial_sync_start_importing_account_rooms">Начальная синхронизация:
 \nИмпорт комнат</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Синхронизация начата:
-\nИмпорт присоединенных комнат</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Синхронизация начата:
+    <string name="initial_sync_start_importing_account_joined_rooms">Начальная синхронизация:
+\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>
@@ -297,14 +298,14 @@
     <string name="action_share">Поделиться</string>
     <string name="later">Позже</string>
     <string name="action_forward">Переслать</string>
-    <string name="permalink">Копировать ссылку</string>
+    <string name="permalink">Постоянная ссылка</string>
     <string name="view_source">Просмотр исходного кода</string>
     <string name="view_decrypted_source">Просмотр расшифрованного исходного кода</string>
     <string name="action_delete">Удалить</string>
     <string name="action_rename">Переименовать</string>
     <string name="report_content">Пожаловаться на содержимое</string>
     <string name="active_call">Активный вызов</string>
-    <string name="ongoing_conference_call">Ongoing conference call.
+    <string name="ongoing_conference_call">Текущая конференц-звонок.
 \nПрисоединиться как %1$s или %2$s</string>
     <string name="ongoing_conference_call_voice">Голос</string>
     <string name="ongoing_conference_call_video">Видео</string>
@@ -334,10 +335,10 @@
     <string name="bottom_action_favourites">Избранные</string>
     <string name="bottom_action_people">Люди</string>
     <string name="bottom_action_rooms">Комнаты</string>
-    <string name="home_filter_placeholder_home">Фильтр названия комнаты</string>
+    <string name="home_filter_placeholder_home">Фильтр названий комнат</string>
     <string name="home_filter_placeholder_favorites">Фильтр избранного</string>
     <string name="home_filter_placeholder_people">Фильтр людей</string>
-    <string name="home_filter_placeholder_rooms">Фильтр названия комнаты</string>
+    <string name="home_filter_placeholder_rooms">Фильтр названий комнат</string>
     <string name="invitations_header">Приглашения</string>
     <string name="low_priority_header">Маловажные</string>
     <string name="direct_chats_header">Беседы</string>
@@ -347,7 +348,7 @@
     <string name="template_no_contact_access_placeholder">Вы не дали доступ ${app_name} к внутренним контактам</string>
     <string name="no_result_placeholder">Нет результатов</string>
     <string name="rooms_header">Комнаты</string>
-    <string name="rooms_directory_header">Список комнат</string>
+    <string name="rooms_directory_header">Каталог комнат</string>
     <string name="no_room_placeholder">Нет комнат</string>
     <string name="no_public_room_placeholder">Публичные комнаты недоступны</string>
     <plurals name="public_room_nb_users">
@@ -358,12 +359,12 @@
     </plurals>
     <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>
+    <string name="send_bug_report_include_screenshot">Отправить снимок экрана</string>
     <string name="send_bug_report">Сообщить об ошибке</string>
-    <string name="send_bug_report_description">Пожалуйста опишите ошибку. Что вы делали? Что вы ожидали получить? Что произошло?</string>
+    <string name="send_bug_report_description">Пожалуйста опишите ошибку. Что вы делали\? Что вы хотели получить\? Что на самом деле произошло\?</string>
     <string name="send_bug_report_placeholder">Опишите проблему здесь</string>
     <string name="send_bug_report_logs_description">Для диагностики проблемы журналы работы приложения будут приложены к отчету об ошибке. Этот отчет, включая журналы и скриншот, не будет доступен публично. Если вы предпочитаете отправить только текст, то снимите отметку:</string>
-    <string name="send_bug_report_alert_message">Похоже вы разочарованы, раз трясёте телефоном. Хотите сообщить об ошибке?</string>
+    <string name="send_bug_report_alert_message">Вы, наверное, трясете телефон в отчаянии. Хотите открыть экран отчета об ошибке\?</string>
     <string name="send_bug_report_sent">Отчет об ошибке успешно отправлен</string>
     <string name="send_bug_report_failed">Сбой отправки отчета об ошибке (%s)</string>
     <string name="send_bug_report_progress">Прогресс (%s%%)</string>
@@ -385,65 +386,65 @@
     <string name="option_take_photo_video">Камера</string>
     <string name="auth_login">Вход</string>
     <string name="auth_register">Создать аккаунт</string>
-    <string name="auth_submit">Отправить</string>
+    <string name="auth_submit">Подать</string>
     <string name="auth_skip">Пропустить</string>
     <string name="auth_send_reset_email">Выслать письмо для сброса</string>
     <string name="auth_return_to_login">Вернуться на экран входа</string>
-    <string name="auth_user_id_placeholder">Электронная почта или логин</string>
+    <string name="auth_user_id_placeholder">Электронная почта или имя пользователя</string>
     <string name="auth_password_placeholder">Пароль</string>
     <string name="auth_new_password_placeholder">Новый пароль</string>
-    <string name="auth_user_name_placeholder">Логин</string>
+    <string name="auth_user_name_placeholder">Имя пользователя</string>
     <string name="auth_email_placeholder">Адрес электронной почты</string>
     <string name="auth_opt_email_placeholder">Адрес электронной почты (не обязательно)</string>
     <string name="auth_phone_number_placeholder">Номер телефона</string>
-    <string name="auth_opt_phone_number_placeholder">Номер телефона (по желанию)</string>
+    <string name="auth_opt_phone_number_placeholder">Номер телефона (необязательно)</string>
     <string name="auth_repeat_password_placeholder">Повтор пароля</string>
     <string name="auth_repeat_new_password_placeholder">Подтвердите ваш новый пароль</string>
-    <string name="auth_invalid_login_param">Неверный логин и/или пароль</string>
+    <string name="auth_invalid_login_param">Неправильный логин и/или пароль</string>
     <string name="auth_invalid_user_name">Логин может содержать только буквы, цифры, точки, дефис и подчеркивание</string>
     <string name="auth_invalid_password">Короткий пароль (минимум 6 символов)</string>
     <string name="auth_missing_password">Отсутствует пароль</string>
-    <string name="auth_invalid_email">Это не похоже на адрес электронной почты</string>
-    <string name="auth_invalid_phone">Введен некорректный номер телефона</string>
+    <string name="auth_invalid_email">Это не похоже на действительный адрес электронной почты</string>
+    <string name="auth_invalid_phone">Это не похоже на действительный номер телефона</string>
     <string name="auth_email_already_defined">Этот адрес электронной почты уже используется.</string>
-    <string name="auth_missing_email">Отсутствует email</string>
+    <string name="auth_missing_email">Отсутствует адрес электронной почты</string>
     <string name="auth_missing_phone">Отсутствует номер телефона</string>
-    <string name="auth_missing_email_or_phone">Отсутствует номер телефона или email</string>
+    <string name="auth_missing_email_or_phone">Отсутствует номер телефона или электронной почты</string>
     <string name="auth_invalid_token">Токен не действителен</string>
     <string name="auth_password_dont_match">Пароли не совпадают</string>
     <string name="auth_forgot_password">Забыли пароль?</string>
-    <string name="auth_use_server_options">Использовать особые параметры сервера</string>
-    <string name="auth_email_validation_message">Проверьте email для продолжения регистрации</string>
-    <string name="auth_threepid_warning_message">Регистрация одновременно по email и номеру телефона пока не поддерживается. Только номер телефона будет связан с аккаунтом. 
+    <string name="auth_use_server_options">Использовать пользовательские параметры сервера(расширенный)</string>
+    <string name="auth_email_validation_message">Проверьте адрес электронной почты для продолжения регистрации</string>
+    <string name="auth_threepid_warning_message">Регистрация одновременно по электронной почте и номеру телефона пока не поддерживается. Только номер телефона будет связан с аккаунтом.
 \n
-\nВы можете добавить свой email в настройках профиля.</string>
+\nВы можете добавить свой электронный адрес в настройках профиля.</string>
     <string name="auth_recaptcha_message">Этот домашний сервер хочет убедиться, что вы не робот</string>
     <string name="auth_username_in_use">Логин уже используется</string>
     <string name="auth_home_server">Домашний сервер:</string>
-    <string name="auth_identity_server">Сервер идентификации:</string>
-    <string name="auth_reset_password_next_step_button">Я проверил мой email адрес</string>
-    <string name="auth_reset_password_message">Для сброса пароля введите email привязанный к учетной записи:</string>
-    <string name="auth_reset_password_missing_email">Должен быть введен email привязанный к учетной записи.</string>
+    <string name="auth_identity_server">Сервер опознавания:</string>
+    <string name="auth_reset_password_next_step_button">Я проверил мой адрес электронной почты</string>
+    <string name="auth_reset_password_message">Для сброса пароля введите адрес электронной почты привязанный к учетной записи:</string>
+    <string name="auth_reset_password_missing_email">Должен быть введен адрес электронной почты привязанный к учетной записи.</string>
     <string name="auth_reset_password_missing_password">Должен быть введен новый пароль.</string>
     <string name="auth_reset_password_email_validation_message">На адрес %s было отправлено письмо. После перехода по ссылке в письме, нажмите ниже.</string>
-    <string name="auth_reset_password_error_unauthorized">Не удалось проверить email: убедитесь, что вы перешли по присланной ссылке</string>
-    <string name="auth_reset_password_success_message">Ваш пароль сброшен. 
+    <string name="auth_reset_password_error_unauthorized">Не удалось проверить адрес электронной почты: убедитесь, что вы перешли по ссылке из сообщения</string>
+    <string name="auth_reset_password_success_message">Ваш пароль сброшен.
 \n
-\nОсуществлен выход на всех сессиях - вы не будете получать push уведомления. Для включения push уведомлений заново войдите на каждом из ваших устройств.</string>
+\nОсуществлен выход на всех сессиях - вы не будете получать всплывающие уведомления. Для включения всплывающие уведомлений заново войдите на каждом из ваших устройств.</string>
     <string name="login_error_must_start_http">URL должен начинаться с http[s]://</string>
     <string name="login_error_network_error">Сбой входа: сетевая ошибка</string>
     <string name="login_error_unable_login">Сбой входа</string>
     <string name="login_error_registration_network_error">Сбой регистрации: сетевая ошибка</string>
     <string name="login_error_unable_register">Сбой регистрации</string>
-    <string name="login_error_unable_register_mail_ownership">Сбой регистрации: ошибка проверки email</string>
+    <string name="login_error_unable_register_mail_ownership">Сбой регистрации: ошибка проверки электронного ящика</string>
     <string name="login_error_invalid_home_server">Пожалуйста, введите корректный URL</string>
     <string name="login_error_forbidden">Неверное имя пользователя или пароль</string>
-    <string name="login_error_unknown_token">Указанный токен доступа не распознан</string>
-    <string name="login_error_bad_json">Поврежденный JSON</string>
-    <string name="login_error_not_json">Не JSON</string>
+    <string name="login_error_unknown_token">Указанный токен доступа не был распознан</string>
+    <string name="login_error_bad_json">Неверный формат JSON</string>
+    <string name="login_error_not_json">Не содержит допустимого JSON</string>
     <string name="login_error_limit_exceeded">Отправлено слишком много запросов</string>
     <string name="login_error_user_in_use">Логин уже используется</string>
-    <string name="login_error_login_email_not_yet">Вы не перешли по высланной в email ссылке</string>
+    <string name="login_error_login_email_not_yet">Вы еще не перешли по высланной ссылке</string>
     <string name="read_receipts_list">Чтение списка вступивших</string>
     <string name="compression_options">Отправить как</string>
     <string name="compression_opt_list_original">Оригинал</string>
@@ -458,21 +459,21 @@
     <string name="today">Сегодня</string>
     <string name="room_info_room_name">Название комнаты</string>
     <string name="room_info_room_topic">Тема комнаты</string>
-    <string name="call_connected">Вызов соединён</string>
+    <string name="call_connected">Вызов установлен</string>
     <string name="call_connecting">Устанавливается соединение…</string>
-    <string name="call_ended">Вызов закончен</string>
-    <string name="call_ring">Звонок…</string>
+    <string name="call_ended">Вызов завершен</string>
+    <string name="call_ring">Звоним…</string>
     <string name="incoming_call">Входящий вызов</string>
     <string name="incoming_video_call">Входящий видеовызов</string>
     <string name="incoming_voice_call">Входящий голосовой вызов</string>
     <string name="call_in_progress">Идёт разговор…</string>
-    <string name="call_error_user_not_responding">Вызываемый абонент не отвечает.</string>
+    <string name="call_error_user_not_responding">Вызываемый абонент не смог ответить.</string>
     <string name="call_error_ice_failed">Медиавызов не удался</string>
     <string name="call_error_camera_init_failed">Невозможно инициализировать камеру</string>
     <string name="call_error_answered_elsewhere">Звонок принят на другом устройстве</string>
     <string name="media_picker_both_capture_title">Снять фото или видео"</string>
     <string name="media_picker_cannot_record_video">Не удалось записать видео"</string>
-    <string name="permissions_rationale_popup_title">Element Информация</string>
+    <string name="permissions_rationale_popup_title">Информация</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} нуждается в разрешении на доступ к вашей фото-и видеотеке для отправки и сохранения вложений.
 \n
 \nПожалуйста, разрешите доступ в следующем всплывающем окне, чтобы иметь возможность отправлять файлы с вашего устройства.</string>
@@ -487,7 +488,7 @@
     <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} может проверить Вашу адресную книгу, чтобы найти других пользователей сети по email или телефонному номеру.
 \n
 \nСогласны ли вы поделиться своей адресной книгой для этой цели\?</string>
-    <string name="permissions_action_not_performed_missing_permissions">Извините. Действие не выполнено из-за недостаточных разрешений</string>
+    <string name="permissions_action_not_performed_missing_permissions">Извините. Действие не выполнено из-за отсутствия на него разрешений</string>
     <string name="media_slider_saved">Сохранено</string>
     <string name="media_slider_saved_message">Сохранить в загрузки?</string>
     <string name="yes">ДА</string>
@@ -500,10 +501,10 @@
     <string name="room_jump_to_first_unread">Перейти к непрочитанному</string>
     <string name="room_preview_invitation_format">%s пригласил вас присоединиться к этой комнате</string>
     <string name="room_preview_unlinked_email_warning">Приглашение пришло на адрес %s, который не связан с этим аккаунтом.
-\nВозможно, вы захотите войти в систему с другим аккаунтом или добавить этот email в свою учетную запись.</string>
+\nВозможно, вы захотите войти в систему с другим аккаунтом или добавить этот электронный ящик в свою учетную запись.</string>
     <string name="room_preview_try_join_an_unknown_room">Вы пытаетесь получить доступ к %s. Хотите присоединиться к обсуждению?</string>
     <string name="room_preview_try_join_an_unknown_room_default">комната</string>
-    <string name="room_preview_room_interactions_disabled">Это пред. просмотр комнаты. Вы в режиме только чтения.</string>
+    <string name="room_preview_room_interactions_disabled">Это предпросмотр комнаты. Вы в режиме только чтения.</string>
     <string name="room_creation_title">Новый чат</string>
     <string name="room_creation_add_member">Добавить участника</string>
     <string name="room_title_one_member">1 пользователь</string>
@@ -515,7 +516,7 @@
     <string name="room_participants_idle">Покой</string>
     <string name="room_participants_header_admin_tools">АДМИНИСТРИРОВАНИЕ</string>
     <string name="room_participants_header_call">ВЫЗОВ</string>
-    <string name="room_participants_header_direct_chats">ПРЯМЫЕ ЧАТЫ</string>
+    <string name="room_participants_header_direct_chats">ПРЯМЫЕ СООБЩЕНИЯ</string>
     <string name="room_participants_header_devices">СЕССИИ</string>
     <string name="room_participants_action_invite">Пригласить</string>
     <string name="room_participants_action_leave">Покинуть этот чат</string>
@@ -526,25 +527,25 @@
     <string name="room_participants_action_set_admin">Сделать администратором</string>
     <string name="room_participants_action_ignore">Скрыть все сообщения этого пользователя</string>
     <string name="room_participants_action_unignore">Отобразить все сообщения этого пользователя</string>
-    <string name="room_participants_invite_search_another_user">ID пользователя, имя или email</string>
+    <string name="room_participants_invite_search_another_user">ID пользователя, имя или электронный адрес</string>
     <string name="room_participants_action_mention">Упомянуть</string>
     <string name="room_participants_action_devices_list">Отобразить список сессий</string>
     <string name="room_participants_power_level_prompt">Вы не сможете отменить это действие, поскольку пользователь получит такой же уровень доступа, как и у вас. 
 \nВы уверены\?</string>
     <string name="room_participants_invite_prompt_msg">"Вы уверены что хотите пригласить %s в этот чат?"</string>
     <string name="people_search_invite_by_id"><u>Пригласить по ID</u></string>
-    <string name="people_search_local_contacts">Локальные Контакты (%d)</string>
-    <string name="people_search_filter_text">Только зарегистрированные</string>
+    <string name="people_search_local_contacts">ЛОКАЛЬНЫЕ КОНТАКТЫ (%d)</string>
+    <string name="people_search_filter_text">Только пользователи Matrix</string>
     <string name="people_search_invite_by_id_dialog_title">Пригласить пользователя по ID</string>
-    <string name="people_search_invite_by_id_dialog_description">Пожалуйста, введите один или несколько адресов email или Matrix ID</string>
-    <string name="people_search_invite_by_id_dialog_hint">Email или Matrix ID</string>
+    <string name="people_search_invite_by_id_dialog_description">Пожалуйста, введите один или несколько электронных адресов или Matrix ID</string>
+    <string name="people_search_invite_by_id_dialog_hint">Электронный почтовый ящик или Matrix ID</string>
     <string name="room_menu_search">Поиск</string>
     <string name="room_one_user_is_typing">%s печатает…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s печатают…</string>
     <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; и другие печатают…</string>
     <string name="room_message_placeholder_encrypted">Отправить зашифрованное сообщение…</string>
-    <string name="room_message_placeholder_not_encrypted">Отправить сообщение…</string>
-    <string name="room_offline_notification">Соединение с сервером потеряно.</string>
+    <string name="room_message_placeholder_not_encrypted">Отправить сообщение(не зашифрованное)…</string>
+    <string name="room_offline_notification">Связь с сервером утеряна.</string>
     <string name="room_unsent_messages_notification">Сообщения не отправлены. %1$s или %2$s сейчас?</string>
     <string name="room_unknown_devices_messages_notification">Сообщения, не отправлены из-за присутствия неизвестных сессий. %1$s или %2$s сейчас\?</string>
     <string name="room_prompt_resend">Повторить отправку</string>
@@ -552,7 +553,7 @@
     <string name="room_resend_unsent_messages">Отправить неотправленные сообщения</string>
     <string name="room_delete_unsent_messages">Удалить неотправленные сообщения</string>
     <string name="room_message_file_not_found">Файл не найден</string>
-    <string name="room_do_not_have_permission_to_post">У вас нет прав писать сообщения в этом чате.</string>
+    <string name="room_do_not_have_permission_to_post">У вас нет разрешения писать сообщения в этой комнате.</string>
     <string name="ssl_trust">Доверять</string>
     <string name="ssl_do_not_trust">Не доверять</string>
     <string name="ssl_logout_account">Выйти</string>
@@ -560,8 +561,8 @@
     <string name="ssl_fingerprint_hash">Отпечаток (%s):</string>
     <string name="ssl_could_not_verify">Не удалось проверить сертификат удаленного сервера.</string>
     <string name="ssl_cert_not_trust">Это может означать, что кто-то злонамеренно перехватывает ваш трафик или что ваш телефон не доверяет сертификату, предоставленному удаленным сервером.</string>
-    <string name="ssl_cert_new_account_expl">Если администратор сервера сказал, что это ожидается, убедитесь, что отпечаток сертификата ниже соответствует отпечатку сертификата, предоставленному администратором.</string>
-    <string name="ssl_unexpected_existing_expl">Сертификат сервера изменился и ваш телефон теперь ему не доверяет. Это ОЧЕНЬ ПОДОЗРИТЕЛЬНО. Рекомендуется, НЕ ДОВЕРЯТЬ этому новому сертификату.</string>
+    <string name="ssl_cert_new_account_expl">Если администратор сервера сказал, что это ожидалось, убедитесь, что отпечаток сертификата ниже совпадает с отпечатком сертификата предоставленным администратором.</string>
+    <string name="ssl_unexpected_existing_expl">Сертификат был изменен с того, которому доверял ваш телефон. Это ОЧЕНЬ НЕОБЫЧНО. Рекомендуется НЕ ПРИНИМАТЬ этот новый сертификат.</string>
     <string name="ssl_expected_existing_expl">Сертификат изменился с ранее доверенного на недействительный. Возможно, сервер обновил свой сертификат. Свяжитесь с администратором сервера для получения ожидаемого отпечатка сертификата.</string>
     <string name="ssl_only_accept">Примите сертификат только если администратор сервера опубликовал отпечаток сертификата, который соответствует указанному выше.</string>
     <string name="room_details_title">Подробности комнаты</string>
@@ -571,7 +572,7 @@
     <string name="malformed_id">Некорректный ID. Используйте email или Matrix ID вида \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">ПРИГЛАШЕНЫ</string>
     <string name="room_details_people_present_group_name">ПРИСОЕДИНИЛИСЬ</string>
-    <string name="room_event_action_report_prompt_reason">Причина отчета о контенте</string>
+    <string name="room_event_action_report_prompt_reason">Причина жалобы об этом содержимом</string>
     <string name="room_event_action_report_prompt_ignore_user">Вы хотите скрыть все сообщения этого пользователя\? 
 \n
 \nУчтите, что это действие перезапустит приложение и может занять некоторое время.</string>
@@ -600,8 +601,8 @@
     <string name="room_sliding_menu_privacy_policy">Политика конфиденциальности</string>
     <string name="settings_profile_picture">Аватар</string>
     <string name="settings_display_name">Отображаемое имя</string>
-    <string name="settings_email_address">Email</string>
-    <string name="settings_add_email_address">Добавить email</string>
+    <string name="settings_email_address">Электронный ящик</string>
+    <string name="settings_add_email_address">Добавить электронный адрес</string>
     <string name="settings_phone_number">Телефон</string>
     <string name="settings_add_phone_number">Добавить телефон</string>
     <string name="settings_app_info_link_summary">Системные настройки приложения.</string>
@@ -614,7 +615,7 @@
     <string name="settings_invited_to_room">Когда меня приглашают в комнату</string>
     <string name="settings_call_invitations">Вызовы</string>
     <string name="settings_messages_sent_by_bot">Сообщения от бота</string>
-    <string name="settings_background_sync">Синхронизация</string>
+    <string name="settings_background_sync">Фоновая синхронизация</string>
     <string name="settings_enable_background_sync">Включить фоновую синхронизацию</string>
     <string name="settings_set_sync_timeout">Таймаут синхронизации</string>
     <string name="settings_set_sync_delay">Задержка между каждой синхронизацией</string>
@@ -634,7 +635,7 @@
     <string name="settings_notifications_targets">Устройства для уведомлений</string>
     <string name="settings_contact">Локальные контакты</string>
     <string name="settings_contacts_app_permission">Доступ к контактам</string>
-    <string name="settings_contacts_phonebook_country">Страна для контактов</string>
+    <string name="settings_contacts_phonebook_country">Страна контактов</string>
     <string name="settings_home_display">Домашний экран</string>
     <string name="settings_pin_missed_notifications">Прикрепить комнаты с отключенными уведомлениями</string>
     <string name="settings_pin_unread_messages">Прикрепить комнаты с непрочитанными сообщениями</string>
@@ -643,16 +644,16 @@
     <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_last_seen_title">Последнее подключение</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_text">Для этой операции требуется дополнительная проверка подлинности. 
 \nЧтобы продолжить, введите пароль.</string>
     <string name="devices_delete_dialog_title">Аутентификация</string>
     <string name="devices_delete_pswd">Пароль:</string>
-    <string name="devices_delete_submit_button_label">Отправить</string>
+    <string name="devices_delete_submit_button_label">Подать</string>
     <string name="settings_logged_in">Авторизован как</string>
     <string name="settings_home_server">Домашний сервер</string>
-    <string name="settings_identity_server">Сервер идентификации</string>
+    <string name="settings_identity_server">Сервер опознавания</string>
     <string name="account_email_validation_title">Ожидается подтверждение</string>
     <string name="account_email_validation_message">Проверьте электронную почту и перейдите по высланной ссылке. Затем нажмите продолжить.</string>
     <string name="account_email_validation_error">Не удалось подтвердить адрес электронной почты. Проверьте электронную почту и нажмите на содержащуюся ссылку. После этого нажмите продолжить.</string>
@@ -698,11 +699,11 @@
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Только участники (с момента выбора этой опции)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Только участники (с момента приглашения)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Только участники (с момента присоединения)</string>
-    <string name="room_settings_room_access_warning">Для генерации ссылки команда должна иметь адрес.</string>
-    <string name="room_settings_room_access_entry_only_invited">Только приглашенные</string>
+    <string name="room_settings_room_access_warning">Чтобы подключиться к комнате, у нее должен быть адрес.</string>
+    <string name="room_settings_room_access_entry_only_invited">Только те, кого пригласили</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Все у кого есть ссылка на комнату, кроме гостей</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Все у кого есть ссылка на комнату, включая гостей</string>
-    <string name="room_settings_banned_users_title">Забаненные пользователи</string>
+    <string name="room_settings_banned_users_title">Заблокированные пользователи</string>
     <string name="room_settings_category_advanced_title">Дополнительно</string>
     <string name="room_settings_room_internal_id">Внутренний ID комнаты</string>
     <string name="room_settings_addresses_pref_title">Адреса</string>
@@ -769,8 +770,8 @@
     <string name="encryption_information_block">Блокировать</string>
     <string name="encryption_information_unblock">Разрешить</string>
     <string name="encryption_information_verify_device">Проверить сессию</string>
-    <string name="encryption_information_verify_device_warning">Чтобы убедиться, что этой сессии можно доверять, обратитесь к его владельцу, используя другие способы (например, лично или по телефону), и спросите, соответствует ли ключ, который он видит в настройках для этой сессии:</string>
-    <string name="encryption_information_verify_device_warning2">Если совпадает, то нажмите кнопку подтвердить ниже. Если не совпадает, возможно кто-то пытается перехватить сессию и вы захотите добавить его в черный список. В будущем данный процесс будет улучшен.</string>
+    <string name="encryption_information_verify_device_warning">Чтобы убедиться, что этой сессии можно доверять, обратитесь к ее владельцу, используя другие способы (например, лично или по телефону), и спросите, соответствует ли ключ, который он видит в настройках для этой сессии:</string>
+    <string name="encryption_information_verify_device_warning2">Если они не совпадают, безопасность вашего общения может быть поставлена под угрозу.</string>
     <string name="encryption_information_verify_key_match">Я проверил, что ключи совпадают</string>
     <string name="unknown_devices_alert_title">Комната содержит неизвестные сессии</string>
     <string name="unknown_devices_alert_message">Эта комната содержит неизвестные сессии, которые не были подтверждены. 
@@ -778,7 +779,7 @@
 \nПеред продолжением рекомендуем вам пройти процесс проверки для каждой сессии, но вы можете отправить сообщение повторно, не проверяя.
 \n
 \nНеизвестные сессии:</string>
-    <string name="select_room_directory">Выбор списка комнат</string>
+    <string name="select_room_directory">Выбор каталога комнат</string>
     <string name="directory_server_fail_to_retrieve_server">Сервер возможно недоступен или перегружен</string>
     <string name="directory_server_type_homeserver">Введите домашний сервер для отображения списка публичных комнат</string>
     <string name="directory_server_placeholder">Имя сервера</string>
@@ -793,7 +794,7 @@
     <string name="media_saving_period_3_days">3 дня</string>
     <string name="media_saving_period_1_week">1 неделя</string>
     <string name="media_saving_period_1_month">1 месяц</string>
-    <string name="media_saving_period_forever">Постоянно</string>
+    <string name="media_saving_period_forever">Навсегда</string>
     <string name="settings_clear_media_cache">Очистить медиа кэш</string>
     <string name="offline">Недоступен</string>
     <string name="user_directory_header">Каталог пользователей</string>
@@ -831,7 +832,7 @@
     <string name="notification_listening_for_events">Мониторинг событий</string>
     <string name="call">Вызов</string>
     <string name="settings_containing_my_user_name">Сообщения, содержащие мое имя пользователя</string>
-    <string name="you_added_a_new_device">Вы добавили новою сессию \'%s\', запрашивающая ключи шифрования.</string>
+    <string name="you_added_a_new_device">Вы добавили новою сессию \'%s\', запрашивающую ключи шифрования.</string>
     <string name="your_unverified_device_requesting">Ваше непроверенная сессия \'%s\' запрашивает ключи шифрования.</string>
     <string name="settings_containing_my_display_name">Сообщения, содержащие мое отображаемое имя</string>
     <string name="start_verification">Начать проверку</string>
@@ -844,7 +845,7 @@
     <string name="settings_analytics">Аналитика</string>
     <string name="settings_labs_native_camera">Использовать встроенную камеру</string>
     <string name="title_activity_bug_report">Сообщить об ошибке</string>
-    <string name="conference_call_warning_title">Внимание!</string>
+    <string name="conference_call_warning_title">Предупреждение!</string>
     <string name="conference_call_warning_message">Конференц-связь находится в разработке и может быть ненадежной.</string>
     <string name="command_error">Ошибка команды</string>
     <string name="unrecognized_command">Нераспознанная команда: %s</string>
@@ -855,7 +856,7 @@
     <string name="loading">Загрузка…</string>
     <string name="action_exit">Закрыть приложение</string>
     <string name="bottom_action_groups">Сообщества</string>
-    <string name="home_filter_placeholder_groups">Поиск сообществ</string>
+    <string name="home_filter_placeholder_groups">Фильтр сообществ</string>
     <string name="groups_invite_header">Пригласить</string>
     <string name="groups_header">Сообщества</string>
     <string name="no_group_placeholder">Нет групп</string>
@@ -863,13 +864,13 @@
     <string name="start_voice_call_prompt_msg">Вы уверены, что хотите начать голосовой вызов?</string>
     <string name="start_video_call_prompt_msg">Вы уверены, что хотите начать видеовызов?</string>
     <string name="groups_list">Список групп</string>
-    <string name="room_participants_ban_prompt_msg">Блокирующий пользователь выгонит их из этой комнаты и не позволит им снова присоединиться.</string>
+    <string name="room_participants_ban_prompt_msg">Блокировка пользователя удалит его из этой комнаты и не позволит ему присоединиться вновь.</string>
     <string name="room_settings_all_messages_noisy">Все сообщения (громко)</string>
     <string name="room_settings_all_messages">Все сообщения</string>
     <string name="room_settings_mention_only">Только упоминания</string>
     <string name="room_settings_mute">Без звука</string>
     <string name="room_settings_add_homescreen_shortcut">Добавить на главный экран</string>
-    <string name="settings_inline_url_preview">Предпросмотр URL-адресов</string>
+    <string name="settings_inline_url_preview">Предпросмотр встроенных URL-адресов</string>
     <string name="settings_vibrate_on_mention">Вибрация при упоминании пользователя</string>
     <string name="room_settings_room_notifications_title">Уведомления</string>
     <string name="room_settings_add_new_group">Новый ID сообщества (например +foo:matrix.org)</string>
@@ -877,22 +878,22 @@
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' недействительный ID сообщества</string>
     <string name="create">Создать</string>
     <string name="create_community">Создать сообщество</string>
-    <string name="community_name">Имя сообщества</string>
+    <string name="community_name">Название сообщества</string>
     <string name="community_name_hint">Пример</string>
     <string name="community_id">ID сообщества</string>
     <string name="community_id_hint">пример</string>
     <string name="group_details_home">Начало</string>
     <string name="group_details_people">Люди</string>
     <string name="group_details_rooms">Комнаты</string>
-    <string name="no_users_placeholder">Нет пользователей</string>
+    <string name="no_users_placeholder">Пользователей нет</string>
     <string name="rooms">Комнаты</string>
     <string name="joined">Присоединился</string>
     <string name="invited">Приглашен</string>
     <string name="filter_group_members">Фильтр участников группы</string>
     <string name="filter_group_rooms">Фильтр комнат группы</string>
-    <string name="group_no_long_description">Администратор сообщества не предоставил подробного описания этого сообщества.</string>
+    <string name="group_no_long_description">Администратор сообщества не предоставил подробного описания для этого сообщества.</string>
     <string name="has_been_removed">Вас выгнал %2$s из %1$s</string>
-    <string name="has_been_banned">Вас забанил %2$s в %1$s</string>
+    <string name="has_been_banned">Вас заблокировал %2$s в %1$s</string>
     <string name="reason_colon">Причина: %1$s</string>
     <string name="rejoin">Присоединиться снова</string>
     <string name="forget_room">Забыть комнату</string>
@@ -965,7 +966,7 @@
     </plurals>
     <string name="receipt_avatar">Получить аватар</string>
     <string name="notice_avatar">Заметка аватара</string>
-    <string name="settings_flair">Сообщества</string>
+    <string name="settings_flair">Чутье</string>
     <string name="room_settings_no_flair">Эта комната не показывает любые сообщества</string>
     <string name="settings_notification_privacy">Конфиденциальность уведомлений</string>
     <string name="settings_notification_privacy_normal">Нормальный</string>
@@ -993,17 +994,17 @@
     <string name="settings_opt_in_of_analytics_ok">Да, я хочу помочь!</string>
     <string name="widget_integration_missing_parameter">Обязательный параметр отсутствует.</string>
     <string name="widget_integration_invalid_parameter">Параметр недействителен.</string>
-    <string name="dialog_user_consent_content">Для продолжения использования этого сервера %1$s вы должны ознакомиться и принять Условия использования.</string>
-    <string name="dialog_user_consent_submit">Ознакомиться сейчас</string>
+    <string name="dialog_user_consent_content">Для продолжения использования %1$s вы должны ознакомиться и согласиться с условиями и правилами использования этого домашнего сервера.</string>
+    <string name="dialog_user_consent_submit">Посмотреть сейчас</string>
     <string name="deactivate_account_title">Деактивировать аккаунт</string>
-    <string name="deactivate_account_delete_checkbox">Пожалуйста, удалите все сообщения, которые я отправил, после деактивации моего аккаунта (предупреждение: будущие участники увидят неполную историю разговоров)</string>
+    <string name="deactivate_account_delete_checkbox">Пожалуйста, удалите все сообщения, которые я отправил, после деактивации моего аккаунта (Предупреждение: будущие участники увидят неполную историю разговоров)</string>
     <string name="deactivate_account_prompt_password">Чтобы продолжить, введите пароль:</string>
     <string name="deactivate_account_submit">Деактивировать аккаунт</string>
-    <string name="deactivate_account_content">Это действие сделает вашу учетную запись непригодной для дальнейшего использования. Вы не сможете войти в систему и никто другой не сможет заново зарегистрировать учетную запись с вашим идентификатором. Также, это приведет к тому, что вы покинете все комнаты, в которых участвовали и данные о вашей учетной записи будут удалены с сервера идентификации. <b>Это действие необратимо</b>. 
+    <string name="deactivate_account_content">Это действие сделает вашу учетную запись навсегда непригодной для дальнейшего использования. Вы не сможете войти в систему и никто другой не сможет заново зарегистрировать учетную запись с вашим идентификатором. Также, это приведет к тому, что вы покинете все комнаты, в которых участвовали и данные о вашей учетной записи будут удалены с сервера идентификации. <b>Это действие необратимо</b>.
 \n
-\nПо умолчанию, деактивация вашей учетной записи <b>не удаляет отправленные вами сообщения</b>. Если вы хотите, чтобы мы удалили все ваши сообщения - поставьте отметку в поле ниже. 
+\nПо умолчанию, деактивация вашей учетной записи <b>не удаляет отправленные вами сообщения</b>. Если вы хотите, чтобы мы удалили все ваши сообщения - поставьте отметку в поле ниже.
 \n
-\nВидимость сообщений в Matrix похожа на электронную почту. Удаление ваших сообщений означает, что отправленные вами сообщения не будут показаны новым или не зарегистрированным пользователям, но те пользователи, которые уже получили эти сообщения - по прежнему будут их видеть.</string>
+\nВидимость сообщений в Matrix похожа на электронную почту. Удаление ваших сообщений означает, что отправленные вами сообщения не будут показаны новым или не зарегистрированным пользователям, но те пользователи, которые уже получили эти сообщения - по прежнему будут видеть их копии.</string>
     <string name="dialog_title_third_party_licences">Лицензии сторонних производителей</string>
     <string name="action_download">Скачать</string>
     <string name="action_speak">Говорить</string>
@@ -1015,7 +1016,7 @@
     <string name="lock_screen_hint">Введите здесь…</string>
     <string name="option_send_voice">Отправить голосовое сообщение</string>
     <string name="go_on_with">продолжить с…</string>
-    <string name="error_no_external_application_found">К сожалению, для выполнения этого действия не найдено внешнее приложение.</string>
+    <string name="error_no_external_application_found">К сожалению, внешнее приложение для выполнения этого действия не найдено.</string>
     <string name="settings_labs_enable_send_voice">Отправлять голосовые сообщения</string>
     <string name="error_empty_field_your_password">Пожалуйста, введите ваш пароль.</string>
     <string name="send_bug_report_description_in_english">Если возможно, добавьте описание на английском языке.</string>
@@ -1023,17 +1024,17 @@
     <string name="room_message_placeholder_reply_to_not_encrypted">Отправить ответ (незашифрованный)…</string>
     <string name="settings_preview_media_before_sending">Предварительный просмотр медиа перед отправкой</string>
     <string name="settings_without_flair">В настоящее время вы не являетесь участником каких-либо сообществ.</string>
-    <string name="settings_labs_keyboard_options_to_send_message">Использовать клавишу Enter для отправки сообщения</string>
+    <string name="settings_labs_keyboard_options_to_send_message">Использовать клавишу ввода для отправки сообщения</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_ban_user">Блокирует пользователя с данным ID</string>
+    <string name="command_description_unban_user">Разблокирует пользователя с данным ID</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_part_room">Покинуть комнату</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_remove_user">Выгнать пользователя с заданным ID из этой комнаты</string>
+    <string name="command_description_nick">Изменить ваше отображаемое имя</string>
     <string name="command_description_markdown">Вкл/выкл markdown</string>
     <string name="room_tombstone_versioned_description">Эта комната была заменена и больше не активна.</string>
     <string name="room_tombstone_continuation_link">Этот разговор продолжается здесь</string>
@@ -1112,13 +1113,13 @@
     <string name="merged_events_collapse">свернуть</string>
     <string name="call_anyway">Всё равно позвонить</string>
     <string name="settings_password">Пароль</string>
-    <string name="auth_accept_policies">Пожалуйста ознакомьтесь и подтвердите согласие с политикой этого сервера:</string>
+    <string name="auth_accept_policies">Пожалуйста, ознакомьтесь и примите правила этого домашнего сервера:</string>
     <string name="settings_call_category">Вызовы</string>
     <string name="template_settings_call_ringtone_use_app_ringtone">Использовать стандартную мелодию ${app_name} для входящих звонков</string>
-    <string name="settings_call_ringtone_title">Мелодия звонка</string>
+    <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="reason_hint">Причина</string>
     <string name="settings_notification_troubleshoot">Поиск проблем с уведомлениями</string>
     <string name="settings_send_typing_notifs">Оправлять уведомления о наборе текста</string>
@@ -1129,7 +1130,7 @@
     <string name="account_phone_number_error">Произошла ошибка при подтверждении вашего номера телефона.</string>
     <string name="account_additional_info">Дополнительная информация: %s</string>
     <string name="settings_labs_enable_send_voice_summary">Эта опция требует стороннего приложения для записи сообщений.</string>
-    <string name="command_problem_with_parameters">Команде \"%s\" нужно больше параметров, или некоторые параметры неверны.</string>
+    <string name="command_problem_with_parameters">Команде \"%s\" нужно либо больше параметров, либо некоторые из них неверны.</string>
     <string name="markdown_has_been_enabled">Markdown включен.</string>
     <string name="markdown_has_been_disabled">Markdown выключен.</string>
     <string name="show_info_area_always">Всегда</string>
@@ -1198,7 +1199,7 @@
     <string name="settings_show_avatar_display_name_changes_messages">Показывать события аккаунта</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Включает изменения аватара и отображаемого имени.</string>
     <string name="template_startup_notification_fdroid_battery_optim_message">Необходимо минимизировать влияние на фоновое соединение для надёжности уведомлений.
-\nНа следующем экране вам будет предложено разрешить ${app_name} всегда работать в фоновом режиме, пожалуйста, примите.</string>
+\nНа следующем экране вам будет предложено разрешить ${app_name} всегда работать в фоновом режиме, пожалуйста, согласитесь.</string>
     <string name="settings_labs_native_camera_summary">Использовать системную камеру вместо камеры Element.</string>
     <string name="settings_info_area_show">Показать информацию</string>
     <string name="generic_label">%1$s:</string>
@@ -1206,7 +1207,7 @@
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Не найден APK сервисов Google Play. Уведомления могут работать неправильно.</string>
-    <string name="settings_show_join_leave_messages_summary">Не влияет на приглашения, исключения и запреты.</string>
+    <string name="settings_show_join_leave_messages_summary">Не влияет на приглашения, изгнания и блокировки.</string>
     <string name="title_activity_keys_backup_setup">Резервное копирование ключей</string>
     <string name="title_activity_keys_backup_restore">Используйте резервную копию ключа</string>
     <string name="keys_backup_is_not_finished_please_wait">Резервное копирование ключей не завершено, пожалуйста, подождите…</string>
@@ -1252,7 +1253,7 @@
     <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_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>
@@ -1260,7 +1261,7 @@
     <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_no_keysbackup_sdk_error">Сессионное шифрование не активировано</string>
+    <string name="keys_backup_no_keysbackup_sdk_error">Шифрование сессии не активировано</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>
@@ -1270,7 +1271,7 @@
     <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_is_getting_backup_version">Получение версии резервной копии…</string>
     <string name="keys_backup_restore_with_passphrase">Используйте парольную фразу для разблокировки истории зашифрованных сообщений</string>
     <string name="keys_backup_restore_with_key_helper">Потеряли ключ восстановления? В настройках вы можете создать новый.</string>
     <string name="network_error_please_check_and_retry">Ошибка сети: проверьте соединение и повторите попытку.</string>
@@ -1280,9 +1281,9 @@
     <string name="keys_backup_get_version_error">Не удалось получить последнюю версию ключей восстановления (%s).</string>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d новый ключ был добавлен к этому устройству.</item>
-        <item quantity="few">%d новых ключа были добавлены к этому устройству.</item>
-        <item quantity="many">%d новых ключей были добавлены к этому устройству.</item>
-        <item quantity="other"/>
+        <item quantity="few">%d новых ключа были добавлены к этим устройствам.</item>
+        <item quantity="many">%d новых ключей были добавлены к этим устройствам.</item>
+        <item quantity="other">%d новых ключей были добавлены к этим устройствам.</item>
     </plurals>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Восстановлена резервная копия с %d ключом.</item>
@@ -1290,7 +1291,7 @@
         <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_passphrase_error_decrypt">Невозможно расшифровать резервную копию с помощью этого пароля: убедитесь, что вы ввели правильный пароль.</string>
     <string name="keys_backup_setup_backup_started_message">Ключи шифрования копируются на сервер в фоновом режиме. Первое копирование может занять несколько минут.</string>
     <string name="keys_backup_setup_step3_generating_key_status">Генерация ключей восстановления с использованием парольной фразы может занять несколько секунд.</string>
     <string name="recovery_key_export_saved_as_warning">Ключ восстановления был сохранен в \'%s\'. 
@@ -1391,7 +1392,7 @@
     <string name="notification_sender_me">Мне</string>
     <string name="autodiscover_well_known_autofill_confirm">Использовать настройку</string>
     <string name="title_activity_verify_device">Проверить сессию</string>
-    <string name="login_error_ssl_handshake">Ваше устройство использует устаревший TLS протокол, уязвимый для атак, для вашей же безопасности вам отказано в подключении</string>
+    <string name="login_error_ssl_handshake">Ваше устройство использует устаревший протокол безопасности TLS, уязвимый для атак, в целях безопасности вы не сможете подключиться</string>
     <string name="settings_notification_privacy_no_background_sync">Приложениям <b>не</b> нужно подключаться к домашнему серверу в фоновом режиме, это должно снизить расход заряда батареи</string>
     <string name="settings_send_message_with_enter_summary">Клавиша Ввод отправит сообщение вместо переноса строки</string>
     <string name="settings_play_shutter_sound">Воспроизвести звук затвора</string>
@@ -1427,7 +1428,7 @@
     <string name="sas_waiting_for_partner">В ожидании партнера, чтобы подтвердить …</string>
     <string name="sas_verified">Проверено!</string>
     <string name="sas_verified_successful">Вы успешно подтвердили эту сессию.</string>
-    <string name="sas_verified_successful_description">Защищенные сообщения от этого пользователя шифруются end-to-end и не могут быть прочитаны третьими лицами.</string>
+    <string name="sas_verified_successful_description">Сообщения от этого пользователя защищены сквозным шифрованием и не могут быть прочитаны третьими лицами.</string>
     <string name="sas_got_it">Понял</string>
     <string name="sas_verifying_keys">Ничего не появляется\? Не все клиенты пока поддерживают интерактивную проверку. Используйте устаревшую проверку.</string>
     <string name="sas_legacy_verification_button_title">Используйте устаревшую проверку.</string>
@@ -1439,11 +1440,11 @@
 \nПричина: %s</string>
     <string name="sas_verification_request_notification_channel">Интерактивное подтверждение сессии</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_m_user">Пользователь отменил проверку</string>
     <string name="sas_error_m_timeout">Время проверки истекло</string>
-    <string name="sas_error_m_unknown_transaction">Сессия не знает об этой транзакции</string>
-    <string name="sas_error_m_unknown_method">Сессия не может договориться о выработке общего ключе, хэше, MAC или методе SAS</string>
+    <string name="sas_error_m_unknown_transaction">Сессия не знает об этой сделке</string>
+    <string name="sas_error_m_unknown_method">Сессия не может договориться о выработке общего ключа, хэша, MAC или метод SAS</string>
     <string name="sas_error_m_mismatched_commitment">Полученный хеш не соответствует</string>
     <string name="sas_error_m_mismatched_sas">SAS не соответствует</string>
     <string name="sas_error_m_unexpected_message">Сессия получила неожиданное сообщение</string>
@@ -1457,18 +1458,18 @@
     <string name="keys_backup_setup_override_stop">Стоп</string>
     <string name="keys_backup_settings_checking_backup_state">Проверка состояния резервного копирования</string>
     <string name="invalid_or_expired_credentials">Вы вышли из системы из-за недействительных или истекших учетных данных.</string>
-    <string name="edit">Редактировать</string>
+    <string name="edit">Изменить</string>
     <string name="reply">Ответить</string>
     <string name="global_retry">Повторить</string>
-    <string name="room_list_empty">Присоединитесь к комнате, чтобы начать использовать приложение.</string>
+    <string name="room_list_empty">Присоединитесь к комнате, чтобы начать пользоваться приложением.</string>
     <string name="send_you_invite">Отправил вам приглашение</string>
     <string name="invited_by">Приглашен %s</string>
-    <string name="room_list_catchup_empty_title">Вы в курсе!</string>
+    <string name="room_list_catchup_empty_title">Вы в теме!</string>
     <string name="room_list_catchup_empty_body">У вас больше нет непрочитанных сообщений</string>
     <string name="room_list_catchup_welcome_title">Добро пожаловать домой!</string>
-    <string name="room_list_catchup_welcome_body">Узнайте больше о непрочитанных сообщениях здесь</string>
-    <string name="room_list_people_empty_title">Беседа</string>
-    <string name="room_list_people_empty_body">Здесь будут отображаться ваши диалоги. Нажмите + внизу справа, чтобы начать.</string>
+    <string name="room_list_catchup_welcome_body">Следите за непрочитанными сообщениями здесь</string>
+    <string name="room_list_people_empty_title">Беседы</string>
+    <string name="room_list_people_empty_body">Здесь будут отображаться ваши диалоги. Нажмите + внизу справа, чтобы начать что-то.</string>
     <string name="room_list_rooms_empty_title">Комнаты</string>
     <string name="room_list_rooms_empty_body">Здесь будут отображаться ваши комнаты. Коснитесь + внизу справа, чтобы найти существующие или создать свои.</string>
     <string name="title_activity_emoji_reaction_picker">Реакции</string>
@@ -1480,11 +1481,11 @@
     <string name="integration_manager_not_configured">Менеджер интеграции не настроен.</string>
     <string name="reactions">Реакции</string>
     <string name="event_redacted_by_user_reason">Событие удалено пользователем</string>
-    <string name="event_redacted_by_admin_reason">Мероприятие, модерируемое администратором помещения</string>
+    <string name="event_redacted_by_admin_reason">Событие модерируется администратором комнаты</string>
     <string name="last_edited_info_message">Последнее изменение %1$s %2$s</string>
-    <string name="malformed_message">Некорректное событие, не может быть отображено</string>
+    <string name="malformed_message">Некорректное событие, не могу отобразить</string>
     <string name="create_new_room">Создать новую комнату</string>
-    <string name="error_no_network">Сети нет. Пожалуйста, проверьте подключение к Интернету.</string>
+    <string name="error_no_network">Нет сети. Пожалуйста, проверьте подключение к Интернету.</string>
     <string name="action_change">Изменить</string>
     <string name="change_room_directory_network">Изменить сеть</string>
     <string name="please_wait">Пожалуйста, подождите…</string>
@@ -1496,18 +1497,18 @@
     <string name="create_room_action_create">СОЗДАТЬ</string>
     <string name="create_room_name_hint">Имя</string>
     <string name="create_room_public_title">Публичная</string>
-    <string name="create_room_public_description">Любой сможет присоединиться к этой комнате</string>
-    <string name="create_room_directory_title">Каталог номеров</string>
-    <string name="create_room_directory_description">Опубликовать эту комнату в каталоге номеров</string>
+    <string name="create_room_public_description">Каждый сможет присоединиться к этой комнате</string>
+    <string name="create_room_directory_title">Каталог комнат</string>
+    <string name="create_room_directory_description">Опубликовать эту комнату в каталоге комнат</string>
     <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">Импорт ключей e2e из файла \"%1$s\".</string>
+    <string name="import_e2e_keys_from_file">Импорт ключей сквозного шифрования из файла \"%1$s\".</string>
     <string name="settings_sdk_version">Версия Matrix SDK</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="quick_reactions">Быстрое реагирование</string>
+    <string name="quick_reactions">Быстрые Реакции</string>
     <string name="settings_general_title">Общее</string>
-    <string name="settings_preferences">Параметры</string>
+    <string name="settings_preferences">Предпочтения</string>
     <string name="settings_security_and_privacy">Безопасность и конфиденциальность</string>
     <string name="settings_expert">Профессионал</string>
     <string name="settings_push_rules">Правила push-уведомлений</string>
@@ -1524,7 +1525,7 @@
     <string name="send_suggestion_content">Пожалуйста, напишите ваше предложение ниже.</string>
     <string name="send_suggestion_report_placeholder">Опишите ваше предложение здесь</string>
     <string name="send_suggestion_sent">Спасибо, предложение было успешно отправлено</string>
-    <string name="send_suggestion_failed">Предложение не было отправлено (%s)</string>
+    <string name="send_suggestion_failed">Не удалось отправить предложение (%s)</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Показать скрытые события в ленте сообщений</string>
     <string name="template_room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в ${app_name} пока не поддерживается</string>
     <string name="bottom_action_people_x">Диалоги</string>
@@ -1536,18 +1537,18 @@
     <string name="downloading_file">Файл %1$s загружается…</string>
     <string name="downloaded_file">Файл %1$s был загружен!</string>
     <string name="edited_suffix">(изменено)</string>
-    <string name="message_edits">Редактирование сообщений</string>
+    <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_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="add_by_matrix_id">Добавить по Matrix ID</string>
-    <string name="creating_direct_room">Создание комнаты…</string>
+    <string name="creating_direct_room">Создаем комнату…</string>
     <string name="direct_room_no_known_users">Результатов не найдено, используйте \"Добавить по matrix ID\" для поиска на сервере.</string>
     <string name="direct_room_start_search">Начните печатать, чтобы получить результат</string>
     <string name="direct_room_filter_hint">Фильтр по имени пользователя или ID…</string>
@@ -1555,13 +1556,13 @@
     <string name="message_view_edit_history">История изменений</string>
     <string name="action_review">Обзор</string>
     <string name="action_decline">Отклонить</string>
-    <string name="widget_integration_review_terms">Для продолжения Вам необходимо принять Условия данного сервиса.</string>
+    <string name="widget_integration_review_terms">Для продолжения Вам необходимо принять Условия этого сервиса.</string>
     <string name="settings_push_rules_no_rules">Правила push-уведомлений не определены</string>
     <string name="settings_push_gateway_no_pushers">Нет зарегистрированных push-шлюзов</string>
-    <string name="terms_of_service">Условия предоставления услуг</string>
-    <string name="review_terms">Условия просмотра</string>
-    <string name="terms_description_for_identity_server">Быть доступным для других</string>
-    <string name="terms_description_for_integration_manager">Используйте ботов, мосты, виджеты и стикеры</string>
+    <string name="terms_of_service">Условия использования</string>
+    <string name="review_terms">Условия отзыва</string>
+    <string name="terms_description_for_identity_server">Быть видимым для других</string>
+    <string name="terms_description_for_integration_manager">Используйте ботов, мосты, виджеты и наборы стикеров</string>
     <string name="read_at">Читать в</string>
     <string name="none">Никто</string>
     <string name="action_revoke">Отмена</string>
@@ -1586,7 +1587,7 @@
     <string name="settings_set_workmanager_delay">Предпочтительный интервал синхронизации</string>
     <string name="settings_discovery_category">Обнаружение</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Будет использовать %s в качестве помощника, если ваш домашний сервер не предлагает его (ваш IP-адрес будет доступен во время разговора)</string>
-    <string name="invite_no_identity_server_error">Добавьте идентификационный сервер в свои настройки, чтобы выполнить это действие.</string>
+    <string name="invite_no_identity_server_error">Добавьте сервер обнаружения в свои настройки, чтобы выполнить это действие.</string>
     <string name="settings_background_fdroid_sync_mode">Режим фоновой синхронизации</string>
     <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} будет синхронизироваться в фоновом режиме таким образом, чтобы сохранить ограниченные ресурсы устройства (батарея).
 \nВ зависимости от состояния ресурса вашего устройства, синхронизация может быть отложена операционной системой.</string>
@@ -1598,35 +1599,35 @@
     <string name="settings_discovery_manage">Изменить настройки обнаружения.</string>
     <string name="encryption_information_device_name_with_warning">Публичное имя (видимое для людей, с которыми вы общаетесь)</string>
     <string name="device_name_warning">Публичное имя сессии видны людям, с которыми вы общаетесь</string>
-    <string name="identity_server_not_defined">Вы не используете какой-либо сервер идентификации</string>
-    <string name="identity_server_not_defined_for_password_reset">Идентификационный сервер не настроен, требуется сброс пароля.</string>
+    <string name="identity_server_not_defined">Вы не используете какой-либо сервер обнаружения</string>
+    <string name="identity_server_not_defined_for_password_reset">Сервер обнаружения не настроен, требуется сброс пароля.</string>
     <string name="error_user_already_logged_in">Похоже, вы пытаетесь подключиться к другому домашнему серверу. Вы хотите выйти\?</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="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_msisdn_title">Доступные номера телефонов</string>
+    <string name="settings_discovery_msisdn_title">Видимые номера телефонов</string>
     <string name="settings_discovery_mail_pending">В ожидании</string>
-    <string name="settings_discovery_enter_identity_server">Введите адрес сервера идентификации</string>
-    <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_enter_identity_server">Введите адрес сервера обнаружения</string>
+    <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_msisdn">Параметры поиска появятся после добавления номера телефона.</string>
-    <string name="settings_discovery_disconnect_identity_server_info">Отключение от сервера идентификации будет означать, что другие пользователи не смогут обнаружить вас, и вы не сможете приглашать других по электронной почте или по телефону.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Отключение от сервера обнаружения будет означать, что другие пользователи не смогут обнаружить вас, и вы не сможете приглашать других по электронной почте или по телефону.</string>
     <string name="settings_discovery_confirm_mail">Мы отправили вам электронное письмо с подтверждением на %s, проверьте вашу электронную почту и нажмите на ссылку для подтверждения</string>
-    <string name="settings_discovery_no_terms">Выбранный сервер идентификации не имеет условий обслуживания. Продолжить, только если вы доверяете владельцу службы</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>
-    <string name="settings_agree_to_terms">Примите Условия обслуживания сервера идентификации (%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="send_attachment">Отправить вложение</string>
-    <string name="a11y_open_drawer">Откройте навигационный ящик</string>
-    <string name="a11y_create_menu_open">Открыть меню создания комнаты</string>
-    <string name="login_error_no_homeserver_found">Неверный адрес сервера Matrix</string>
+    <string name="a11y_open_drawer">Откройте панель навигации</string>
+    <string name="a11y_create_menu_open">Откройте меню создания комнаты</string>
+    <string name="login_error_no_homeserver_found">Это недействительный адрес сервера Matrix</string>
     <string name="settings_add_3pid_confirm_password_title">Подтвердите пароль</string>
     <string name="settings_add_3pid_authentication_needed">Требуется аутентификация</string>
     <string name="settings_integrations">Интеграции</string>
@@ -1636,10 +1637,10 @@
     <string name="room_widget_reload">Перезагрузить виджет</string>
     <string name="room_widget_open_in_browser">Открыть в браузере</string>
     <string name="room_widget_permission_widget_id">ID виджета</string>
-    <string name="room_widget_resource_grant_permission">Принять</string>
+    <string name="room_widget_resource_grant_permission">Позволить</string>
     <string name="template_settings_add_3pid_flow_not_supported">Вы это не можете делать на мобильном ${app_name}</string>
     <string name="room_widget_permission_added_by">Этот виджет был добавлен:</string>
-    <string name="room_widget_permission_theme">Ваши тема</string>
+    <string name="room_widget_permission_theme">Ваша тема</string>
     <string name="room_widget_permission_room_id">ID комнаты</string>
     <string name="settings_integrations_summary">Используйте менеджер интеграций чтобы управлять ботами, мостами, виджетами и наборами стикеров.
 \nМенеджеры интеграций получают данные о конфигурации, могут изменять виджеты, отправлять приглашения в комнаты и устанавливать права от вашего имени.</string>
@@ -1666,21 +1667,21 @@
     <string name="report_content_spam">Это спам</string>
     <string name="message_ignore_user">Игнорировать пользователя</string>
     <string name="room_list_quick_actions_notifications_all">Все сообщения</string>
-    <string name="room_list_quick_actions_notifications_mentions">Только при упоминаниях</string>
+    <string name="room_list_quick_actions_notifications_mentions">Только упоминания</string>
     <string name="room_list_quick_actions_settings">Настройки</string>
     <string name="room_list_quick_actions_leave">Покинуть комнату</string>
     <string name="room_join_rules_public">%1$s сделал(а) комнату доступной для всех, у кого есть ссылка.</string>
     <string name="room_join_rules_invite">%1$s сделал(а) комнату доступной только по приглашению.</string>
-    <string name="labs_allow_extended_logging_summary">Подробные логи помогут разработчикам, предоставив больше информации, когда вы отправляете RageShake. Даже когда они разрешены, приложение не логирует ваши сообщения и другие приватные данные.</string>
-    <string name="a11y_create_menu_close">Отменить создание комнаты…</string>
+    <string name="labs_allow_extended_logging_summary">Подробные логи помогут разработчикам, предоставив больше информации, когда вы отправляете ВзмахЯрости. Даже когда они разрешены, приложение не записывает ваши сообщения и другие приватные данные.</string>
+    <string name="a11y_create_menu_close">Закройте меню создание комнаты…</string>
     <string name="a11y_jump_to_bottom">Вниз</string>
     <string name="attachment_type_contact">Контакт</string>
     <string name="attachment_type_sticker">Стикер</string>
-    <string name="report_content_custom_hint">Причина жалобы на контент</string>
-    <string name="report_content_custom_submit">Пожаловаться</string>
+    <string name="report_content_custom_hint">Причина жалобы на это содержимое</string>
+    <string name="report_content_custom_submit">ЖАЛОБА</string>
     <string name="block_user">ИГНОРИРОВАТЬ ПОЛЬЗОВАТЕЛЯ</string>
     <string name="room_list_quick_actions_notifications_all_noisy">Все сообщения (громко)</string>
-    <string name="room_list_quick_actions_notifications_mute">Без звука</string>
+    <string name="room_list_quick_actions_notifications_mute">Заглушить</string>
     <string name="command_description_spoiler">Отправить данное сообщение под спойлером</string>
     <string name="spoiler">Спойлер</string>
     <string name="reaction_search_type_hint">Введите ключевые слова, чтобы найти реакцию.</string>
@@ -1688,9 +1689,9 @@
     <string name="timeline_unread_messages">Непрочитанные сообщения</string>
     <string name="login_splash_title">Это ваш разговор. Владейте им.</string>
     <string name="login_splash_text1">Общайтесь с людьми напрямую или в группах</string>
-    <string name="login_splash_submit">Начать</string>
+    <string name="login_splash_submit">Начнем</string>
     <string name="login_server_title">Выберите сервер</string>
-    <string name="login_server_text">Как и у электронной почты, у учётных записей один дом, хотя вы можете общаться с кем угодно</string>
+    <string name="login_server_text">Как и у электронной почты, у учётных записей один дом, не смотря на это вы можете общаться с кем угодно</string>
     <string name="login_server_modular_text">Премиум-хостинг для организаций</string>
     <string name="login_server_modular_learn_more">Узнать больше</string>
     <string name="login_server_other_title">Другой</string>
@@ -1702,12 +1703,12 @@
     <string name="login_signup">Зарегистрироваться</string>
     <string name="login_signin">Войти в систему</string>
     <string name="login_signin_sso">Продолжить с SSO</string>
-    <string name="login_server_url_form_modular_hint">Модульный адрес</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services Адрес</string>
     <string name="login_server_url_form_other_hint">Адрес</string>
     <string name="login_server_url_form_modular_text">Премиум-хостинг для организаций</string>
-    <string name="login_server_url_form_modular_notice">Введите адрес Modular Element или сервера, который вы хотите использовать</string>
+    <string name="login_server_url_form_modular_notice">Введите адрес Modular Element или Сервер, который вы хотите использовать</string>
     <string name="login_sso_error_message">Произошла ошибка при загрузке страницы: %1$s (%2$d)</string>
-    <string name="login_mode_not_supported">Приложение не может войти на этот сервер, так как он поддерживает следующие типы входа: %1$s.
+    <string name="login_mode_not_supported">Приложение не может войти на этот домашний сервер. Домашний сервер поддерживает следующие типы входа: %1$s.
 \n
 \nВы хотите войти с помощью веб-клиента\?</string>
     <string name="login_registration_disabled">Извините, этот сервер не принимает новые учётные записи.</string>
@@ -1717,15 +1718,15 @@
     <string name="login_login_with_email_error">Этот адрес электронной почты не связан ни с одной учетной записью.</string>
     <string name="login_reset_password_on">Сбросить пароль на %1$s</string>
     <string name="login_reset_password_submit">Далее</string>
-    <string name="login_reset_password_email_hint">Email</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_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">Данный email не связан ни с одним аккаунтом</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>
+    <string name="login_reset_password_mail_confirmation_notice_2">Нажмите на ссылку, чтобы подтвердить свой новый пароль. Как только вы перейдете по ссылке нажмите ниже.</string>
     <string name="login_reset_password_success_title">Успешно!</string>
     <string name="login_reset_password_success_notice">Ваш пароль был сброшен.</string>
     <string name="login_reset_password_success_notice_2">Вы вышли из всех сессий и больше не будете получать push-уведомления. Чтобы возобновить уведомления, войдите снова на каждом устройстве.</string>
@@ -1736,10 +1737,10 @@
 \nОстановить процесс смены пароля\?</string>
     <string name="login_set_email_title">Задать адрес электронной почты</string>
     <string name="login_set_email_mandatory_hint">Электронная почта</string>
-    <string name="login_set_email_optional_hint">Электронная почта (по желанию)</string>
+    <string name="login_set_email_optional_hint">Электронная почта (необязательно)</string>
     <string name="login_set_email_submit">Далее</string>
     <string name="login_set_msisdn_title">Установить номер телефона</string>
-    <string name="login_set_msisdn_notice">Укажите номер своего телефона, чтобы разрешить знакомым найти вас.</string>
+    <string name="login_set_msisdn_notice">Укажите номер своего телефона, чтобы разрешить людям найти вас.</string>
     <string name="login_set_msisdn_notice2">Пожалуйста, используйте международный формат.</string>
     <string name="login_set_msisdn_mandatory_hint">Номер телефона</string>
     <string name="login_set_msisdn_optional_hint">Номер телефона (необязательно)</string>
@@ -1750,9 +1751,9 @@
     <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_other">Номер телефона кажется недействительным. Пожалуйста, проверьте его</string>
+    <string name="login_msisdn_error_other">Номер телефона выглядит недействительным. Пожалуйста, проверьте его</string>
     <string name="login_signup_to">Зарегистрироваться в %1$s</string>
-    <string name="login_signin_username_hint">Имя пользователя или email</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>
@@ -1763,11 +1764,11 @@
 \nОстановить процесс регистрации\?</string>
     <string name="login_a11y_choose_matrix_org">Выбрать matrix.org</string>
     <string name="login_a11y_choose_modular">Выбрать Element Matrix Services</string>
-    <string name="login_a11y_choose_other">Выбрать другой сервер</string>
+    <string name="login_a11y_choose_other">Выбрать пользовательский домашний сервер</string>
     <string name="login_a11y_captcha_container">Пожалуйста, пройдите проверку капчей</string>
     <string name="login_terms_title">Примите условия для продолжения</string>
-    <string name="login_wait_for_email_title">Пожалуйста, проверьте ваш email</string>
-    <string name="login_wait_for_email_notice">Мы только что отправили email на %1$s.
+    <string name="login_wait_for_email_title">Пожалуйста, проверьте ваш электронный почтовый ящик</string>
+    <string name="login_wait_for_email_notice">Мы только что отправили письмо на %1$s.
 \nПожалуйста, нажмите на содержащуюся в нём ссылку, чтобы продолжить создание аккаунта.</string>
     <string name="login_error_outdated_homeserver_title">Домашний сервер устарел</string>
     <string name="login_error_outdated_homeserver_content">Этот домашний сервер использует слишком старую версию для подключения. Попросите администратора обновить домашний сервер.</string>
@@ -1803,7 +1804,7 @@
     <string name="soft_logout_clear_data_dialog_submit">Очистить данные</string>
     <string name="template_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="settings_show_devices_list">Посмотреть все мои сессии</string>
     <string name="settings_advanced_settings">Дополнительные настройки</string>
@@ -1837,9 +1838,9 @@
     <string name="uploads_media_no_result">В этой комнате нет медиафайлов</string>
     <string name="uploads_files_title">ФАЙЛЫ</string>
     <string name="uploads_files_no_result">В этой комнате нет файлов</string>
-    <string name="report_content_inappropriate">Это недопустимо</string>
+    <string name="report_content_inappropriate">Это неуместно</string>
     <string name="report_content_custom">Другая причина…</string>
-    <string name="report_content_custom_title">Пожаловаться на контент</string>
+    <string name="report_content_custom_title">Пожаловаться на это содержимое</string>
     <string name="room_profile_section_security">Безопасность</string>
     <string name="room_profile_section_more">Ещё</string>
     <string name="a11y_qr_code_for_verification">QR-код</string>
@@ -1890,30 +1891,30 @@
     <string name="error_attachment">Произошла ошибка при загрузке вложения.</string>
     <string name="uploads_files_subtitle">%1$s %2$s</string>
     <string name="content_reported_title">Жалоба отправлена</string>
-    <string name="content_reported_content">Жалоба на контент отправлена. 
-\n 
-\nЕсли вы не хотите видеть контент этого пользователя, вы можете его игнорировать, чтобы скрыть его сообщения.</string>
+    <string name="content_reported_content">Жалоба на контент отправлена.
+\n
+\nЕсли вы больше не хотите видеть от этого пользователя любого содержимого, вы можете его игнорировать, чтобы скрыть его сообщения.</string>
     <string name="content_reported_as_spam_title">Отмечено как спам</string>
-    <string name="content_reported_as_spam_content">Этот контент был отмечен как спам. 
-\n 
-\nЕсли вы не хотите видеть контент этого пользователя, вы можете его игнорировать, чтобы скрыть его сообщения.</string>
-    <string name="content_reported_as_inappropriate_title">Жалоба на неприемлемое содержание отправлена</string>
-    <string name="content_reported_as_inappropriate_content">Этот контент был отмечен как неприемлемый. 
-\n 
-\nЕсли вы не хотите видеть контент этого пользователя, вы можете его игнорировать, чтобы скрыть его сообщения.</string>
+    <string name="content_reported_as_spam_content">Это содержимое было отмечен как спам.
+\n
+\nЕсли вы больше не хотите видеть любое содержимое этого пользователя, вы можете его игнорировать, чтобы скрыть его сообщения.</string>
+    <string name="content_reported_as_inappropriate_title">Жалоба на неуместное содержание отправлена</string>
+    <string name="content_reported_as_inappropriate_content">Этот контент был отмечен как неприемлемый.
+\n
+\nЕсли вы больше не хотите видеть от этого пользователя любого содержимого, вы можете его игнорировать, чтобы скрыть его сообщения.</string>
     <string name="verification_sas_match">Они совпадают</string>
     <string name="verification_sas_do_not_match">Они не совпадают</string>
-    <string name="a11y_close_keys_backup_banner">Закрыть окно бэкапа ключей</string>
+    <string name="a11y_close_keys_backup_banner">Закрыть окно резервного копирования ключей</string>
     <string name="one_user_read">%s прочитано</string>
     <string name="error_handling_incoming_share">Не удалось обработать данные</string>
-    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} требуются права для сохранения ваших ключей шифрования на диск.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} требуются права для сохранения ваших ключей сквозного шифрования на диск.
 \n
 \nПожалуйста, разрешите доступ в следующем всплывающем окне, чтобы экспортировать ключи вручную.</string>
-    <string name="no_network_indicator">Нет подключения к сети</string>
+    <string name="no_network_indicator">Сейчас нет подключения к сети</string>
     <string name="action_play">Воспроизвести</string>
     <string name="action_pause">Приостановить</string>
     <string name="action_copy">Копировать</string>
-    <string name="dialog_title_success">Выполнено</string>
+    <string name="dialog_title_success">Удачно</string>
     <string name="bottom_action_notification">Уведомления</string>
     <string name="template_call_failed_no_connection">Звонок не состоялся</string>
     <string name="call_failed_no_connection_description">Не удалось установить соединение реального времени.
@@ -1935,7 +1936,7 @@
     <string name="room_participants_action_cancel_invite">Отменить приглашение</string>
     <string name="room_participants_power_level_demote_warning_title">Снизить собственные полномочия\?</string>
     <string name="action_dismiss">Отклонить</string>
-    <string name="room_participants_power_level_demote_warning_prompt">Вы не сможете отменить это изменение, поскольку вы понижаете себя в должности, а если вы последний привилегированный пользователь в комнате, то восстановить привилегии будет невозможно.</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Вы не сможете отменить это изменение, поскольку вы понижаете собственный полномочия, а если вы последний привилегированный пользователь в комнате, то восстановить привилегии будет невозможно.</string>
     <string name="room_participants_power_level_demote">Понизить</string>
     <string name="room_participants_action_ignore_title">Игнорировать пользователя</string>
     <string name="room_participants_action_ignore_prompt_msg">Игнорирование этого пользователя приведет к удалению его сообщений из общих комнат.
@@ -1947,13 +1948,13 @@
     <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_prompt_msg">Выгнанный пользователь будет удалён из этой комнаты.
+    <string name="room_participants_remove_prompt_msg">Пользователь будет выгнан из этой комнаты.
 \n
-\nЧтобы предотвратить его повторное присоединение, вы должны забанить его.</string>
+\nЧтобы предотвратить его повторное присоединение, вы должны заблокировать его.</string>
     <string name="room_participants_ban_title">Заблокировать пользователя</string>
     <string name="room_participants_ban_reason">Причина блокировки</string>
     <string name="room_participants_unban_title">Разблокировать пользователя</string>
-    <string name="room_participants_unban_prompt_msg">Разблокирование пользователя позволит ему снова присоединиться к комнате.</string>
+    <string name="room_participants_unban_prompt_msg">Разблокирование пользователя позволит ему присоединиться к комнате опять.</string>
     <string name="settings_secure_backup_section_title">Безопасное резервное копирование</string>
     <string name="settings_secure_backup_manage">Управление</string>
     <string name="settings_secure_backup_setup">Настройка безопасного резервного копирования</string>
@@ -1976,7 +1977,7 @@
     <string name="secure_backup_banner_setup_line1">Безопасное резервное копирование</string>
     <string name="secure_backup_banner_setup_line2">Защита от потери доступа к зашифрованным сообщениям и данным</string>
     <string name="secure_backup_setup">Настроить безопасное резервное копирование</string>
-    <string name="labs_show_unread_notifications_as_tab">Добавьте специальную вкладку для непрочитанных уведомлений на главном экране.</string>
+    <string name="labs_show_unread_notifications_as_tab">Добавьте отдельную вкладку для непрочитанных уведомлений на главном экране.</string>
     <plurals name="fallback_users_read">
         <item quantity="one">Прочитал %d пользователь</item>
         <item quantity="few">Прочитано %d пользователями</item>
@@ -1990,35 +1991,35 @@
     <string name="no_ignored_users">Вы не игнорируете никаких пользователей</string>
     <string name="room_join_rules_public_by_you">Вы сделали комнату доступной для всех, у кого есть ссылка.</string>
     <string name="room_join_rules_invite_by_you">Вы сделали комнату только по приглашению.</string>
-    <string name="login_splash_text2">Сохраняйте приватность ваших переписок с помощью шифрования</string>
+    <string name="login_splash_text2">Сохраняйте конфиденциальность разговоров с помощью шифрования</string>
     <string name="login_splash_text3">Расширьте и персонализируйте свой опыт использования</string>
     <string name="login_server_matrix_org_text">Присоединяйтесь к миллионам бесплатно на крупнейшем публичном сервере</string>
     <string name="login_signin_to">Войти в %1$s</string>
     <string name="login_server_url_form_common_notice">Введите адрес сервера, который вы хотите использовать</string>
-    <string name="login_reset_password_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_validation_code_is_not_correct">Введенный код неверен. Пожалуйста, проверьте.</string>
     <string name="login_connect_using_matrix_id_notice">Кроме того, если у вас уже есть учетная запись и вы знаете свой идентификатор Matrix и пароль, вы можете использовать этот метод:</string>
-    <string name="login_connect_using_matrix_id_submit">Войти с помощью Matrix ID</string>
-    <string name="login_signin_matrix_id_title">Войти с помощью Matrix ID</string>
+    <string name="login_connect_using_matrix_id_submit">Войти с Matrix ID</string>
+    <string name="login_signin_matrix_id_title">Войти с Matrix ID</string>
     <string name="login_signin_matrix_id_notice">Если вы создаете учетную запись на домашнем сервере, используйте свой матричный идентификатор (например, @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="autodiscover_well_known_error">Не удалось найти действительный домашний сервер. Пожалуйста, проверьте свой идентификатор</string>
-    <string name="notification_initial_sync">Первичная синхронизация…</string>
-    <string name="settings_rageshake">Rageshake</string>
+    <string name="notification_initial_sync">Начальная синхронизация…</string>
+    <string name="settings_rageshake">СотрясениеЯрости</string>
     <string name="settings_rageshake_detection_threshold">Порог обнаружения</string>
     <string name="settings_rageshake_detection_threshold_summary">Встряхните телефон, чтобы проверить порог обнаружения</string>
-    <string name="rageshake_detected">Тряска зафиксирована!</string>
+    <string name="rageshake_detected">Обнаружено потрясение!</string>
     <string name="autocomplete_limited_results">Показываем только первые результаты, наберите больше букв…</string>
     <string name="settings_developer_mode_fail_fast_title">Раннее падение</string>
     <string name="template_settings_developer_mode_fail_fast_summary">${app_name} может падать чаще, когда происходит непредвиденная ошибка</string>
     <string name="command_description_shrug">Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения</string>
-    <string name="create_room_encryption_description">После включения шифрования оно не может быть отключено.</string>
+    <string name="create_room_encryption_description">После включения шифрования его нельзя отключить.</string>
     <string name="login_error_threepid_denied">Ваш почтовый домен не имеет права регистрироваться на этом сервере</string>
-    <string name="verify_user_sas_emoji_help_text">Проверьте этого пользователя, подтвердив, что следующие уникальные смайлики появляются на его экране в том же порядке.</string>
+    <string name="verify_user_sas_emoji_help_text">Проверьте этого пользователя, подтвердив, что следующие уникальные эмодзи появляются на его экране в том же порядке.</string>
     <string name="verify_user_sas_emoji_security_tip">Для максимальной безопасности используйте другое надежное средство связи или сделайте это лично.</string>
     <string name="verification_green_shield">Ищите зеленый щит, чтобы убедиться, что пользователь доверенный. Доверяйте всем пользователям в комнате, чтобы обеспечить безопасность комнаты.</string>
     <string name="verification_conclusion_not_secure">Не безопасно</string>
@@ -2026,8 +2027,8 @@
 \n
 \n— Ваш домашний сервер
 \n— Домашний сервер, к которому подключен пользователь, которого вы проверяете
-\n— Ваше или подключение к интернету других пользователей
-\n— Ваше или устройство других пользователей</string>
+\n— Ваше подключение к интернету или других пользователей
+\n— Ваше устройство или других пользователей</string>
     <string name="sent_a_video">Видео.</string>
     <string name="sent_an_image">Изображение.</string>
     <string name="sent_an_audio_file">Аудио</string>
@@ -2043,26 +2044,26 @@
     <string name="verification_verify_device">Подтвердите эту сессию</string>
     <string name="verification_verify_device_manually">Подтверждение вручную</string>
     <string name="you">Вы</string>
-    <string name="verification_scan_notice">Сканируйте код с помощью устройства другого пользователя, чтобы надежно проверить друг друга</string>
+    <string name="verification_scan_notice">Сканируйте код с помощью устройства другого пользователя, чтобы безопасно проверить друг друга</string>
     <string name="verification_scan_their_code">Сканировать их код</string>
     <string name="verification_scan_emoji_title">Невозможно сканировать</string>
-    <string name="verification_scan_emoji_subtitle">Если вы не можете лично, сравните эмодзи в таком случае</string>
+    <string name="verification_scan_emoji_subtitle">Если вы не можете лично, сравните вместо этого эмодзи</string>
     <string name="verification_no_scan_emoji_title">Подтвердить при помощи сравнения эмодзи</string>
     <string name="verify_by_emoji_title">Подтверждение с помощью эмодзи</string>
-    <string name="verify_by_emoji_description">Если вы не можете отсканировать приведенный выше код, проверьте это, сравнив короткий уникальный набор эмодзи.</string>
+    <string name="verify_by_emoji_description">Если вы не можете отсканировать приведенный выше код, проверьте сравнивая короткий уникальный набор эмодзи.</string>
     <string name="a13n_qr_code_description">Изображение QR-кода</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="verification_request_alert_description">Для дополнительной безопасности проверьте %s, проверив одноразовый код на обоих ваших устройствах.
+    <string name="verification_request_waiting_for">Ожидаем %s…</string>
+    <string name="verification_request_alert_description">Для особой безопасности проверьте %s, проверив одноразовый код на обоих ваших устройствах.
 \n
 \nДля максимальной безопасности сделайте это лично.</string>
-    <string name="room_profile_not_encrypted_subtitle">Сообщения в этой комнате не шифруются сквозным шифрованием.</string>
-    <string name="room_profile_encrypted_subtitle">Сообщения в этой комнате шифруются сквозным шифрованием.
+    <string name="room_profile_not_encrypted_subtitle">Сообщения в этой комнате не защищены сквозным шифрованием.</string>
+    <string name="room_profile_encrypted_subtitle">Сообщения в этой комнате защищены сквозным шифрованием.
 \n
-\nВаши сообщения защищены замками, и только у вас и получателя есть уникальные ключи, чтобы разблокировать их.</string>
+\nВаши сообщения защищены замками и только вы и получатель имеете уникальные ключи для их разблокировки.</string>
     <string name="room_profile_section_admin">Действия Администратора</string>
-    <string name="room_profile_leaving_room">Покинуть комнату…</string>
+    <string name="room_profile_leaving_room">Покидаем комнату…</string>
     <string name="room_member_power_level_custom">Пользовательский</string>
     <string name="room_member_power_level_invites">Приглашения</string>
     <string name="room_member_power_level_admin_in">Администратор в %1$s</string>
@@ -2079,32 +2080,32 @@
     <string name="command_description_rainbow">Посылает сообщение, окрашенное в цвет радуги</string>
     <string name="command_description_rainbow_emote">Посылает данную эмоцию, окрашенную в цвет радуги</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_warning">После включения шифрования оно не может быть отключено.</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="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_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">Кросс-подпись включена
-\nПриватные ключи хранятся на устройстве.</string>
-    <string name="encryption_information_dg_xsigning_trusted">Кросс-подпись включена
-\nКлючи являются надёжными.
-\nПриватные ключи неизвестны</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">Кросс-подпись включена.
-\nКлючи являются ненадёжными</string>
-    <string name="encryption_information_dg_xsigning_disabled">Кросс-подпись выключена</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">Перекрестная подпись включена
+\nЛичные ключи хранятся на устройстве.</string>
+    <string name="encryption_information_dg_xsigning_trusted">Перекрестная подпись включена
+\nКлючи являются доверенными.
+\nЛичные ключи неизвестны</string>
+    <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="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_failed_to_get_crypto_device_info">Нет доступной криптографической информации</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d сессия активна</item>
         <item quantity="few">%d сессии активны</item>
@@ -2128,19 +2129,19 @@
     <string name="settings_messages_at_room">Сообщения, содержащие @room</string>
     <string name="settings_troubleshoot_title">Отладка</string>
     <string name="settings_notification_advanced_summary">Настройки важности уведомлений для событий</string>
-    <string name="template_use_other_session_content_description">Используйте последнюю версию ${app_name} на других ваших устройствах, веб-клиент ${app_name}, ${app_name} для ПК, ${app_name} для iOS, ${app_name} для Android или другой клиент Matrix, поддерживающий кросс-подпись</string>
+    <string name="template_use_other_session_content_description">Используйте последнюю версию ${app_name} на других ваших устройствах, веб-клиент ${app_name}, ${app_name} для ПК, ${app_name} для iOS, ${app_name} для Android или другой клиент Matrix, поддерживающий перекрестную подпись</string>
     <string name="template_use_latest_app">Используйте последнюю версию ${app_name} на других ваших устройствах:</string>
     <string name="verify_this_session">Подтвердите новую сессию вашей учетной записи: %1$s</string>
     <string name="settings_setup_secure_backup">Настроить безопасное резервное копирование</string>
     <string name="bottom_sheet_setup_secure_backup_title">Безопасное резервное копирование</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>
     <string name="crosssigning_other_user_not_trust">Другие пользователи могут не доверять ему</string>
     <string name="complete_security">Завершите настройку безопасности</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="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>
@@ -2149,16 +2150,16 @@
     <string name="command_description_poll">Создать простой опрос</string>
     <string name="new_signin">Новый вход</string>
     <string name="verification_profile_device_untrust_info">Пока этот пользователь не доверяет этой сессии, сообщения, отправленные в обе стороны, помечаются предупреждениями. Кроме того, вы можете подтвердить сессию вручную.</string>
-    <string name="initialize_cross_signing">Инициализировать кросс-подпись</string>
+    <string name="initialize_cross_signing">Начать перекрестную подпись</string>
     <string name="reset_cross_signing">Сбросить ключи</string>
-    <string name="qr_code_scanned_by_other_notice">Почти готово! Отображает ли %s такой же щит\?</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>
     <string name="no_connectivity_to_the_server_indicator_airplane">Активирован режим \"В самолёте\"</string>
     <string name="enter_secret_storage_invalid">Не удалось найти данные в хранилище</string>
     <string name="enter_secret_storage_passphrase">Введите парольную фразу для секретного хранилища</string>
     <string name="enter_secret_storage_passphrase_warning">Предупреждение:</string>
-    <string name="enter_secret_storage_passphrase_warning_text">Вы должны получать доступ к секретному хранилищу только с доверенного устройства</string>
+    <string name="enter_secret_storage_passphrase_warning_text">Вам следует получать доступ к секретному хранилищу только с доверенного устройства</string>
     <string name="share_confirm_room">Вы хотите отправить это вложение в %1$s\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Отправить изображение в оригинальном размере</item>
@@ -2167,7 +2168,7 @@
     </plurals>
     <string name="delete_event_dialog_title">Подтвердите удаление</string>
     <string name="delete_event_dialog_content">Вы уверены, что хотите скрыть (удалить) это событие\? Обратите внимание, что если вы удалите название комнаты или измените тему, это может отменить изменение.</string>
-    <string name="delete_event_dialog_reason_checkbox">Указать причину</string>
+    <string name="delete_event_dialog_reason_checkbox">Укажите причину</string>
     <string name="delete_event_dialog_reason_hint">Причина редактирования</string>
     <string name="event_redacted_by_user_reason_with_reason">Событие удалено пользователем, Причина: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Событие модерируется администратором комнаты, Причина: %1$s</string>
@@ -2178,10 +2179,10 @@
     <string name="new_session_review">Нажмите, чтобы просмотреть и проверить</string>
     <string name="verify_new_session_was_not_me">Это был не я</string>
     <string name="verify_new_session_compromized">Ваш аккаунт может оказаться под угрозой</string>
-    <string name="verify_cancel_self_verification_from_untrusted">Если вы прервёте процедуру, то не сможете читать зашифрованные сообщения на этом устройстве, а другие пользователи не будут доверять ему</string>
-    <string name="verify_cancel_self_verification_from_trusted">Если вы прервёте процедуру, то не сможете читать зашифрованные сообщения на своем новом устройстве, а другие пользователи не будут доверять ему</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Если вы прервёте процедуру, то не сможете читать зашифрованные сообщения на этом устройстве, а другие пользователи не захотят доверять ему</string>
+    <string name="verify_cancel_self_verification_from_trusted">Если вы прервёте процедуру, то не сможете читать зашифрованные сообщения на своем новом устройстве, а другие пользователи не захотят доверять ему</string>
     <string name="verify_cancel_other">Если вы прервёте процедуру, пользователь %1$s (%2$s) не будет подтверждён. Начните заново в профиле этого пользователя.</string>
-    <string name="verify_not_me_self_verification">Что-то из этого может быть скомпрометировано:
+    <string name="verify_not_me_self_verification">Что-то из этого может быть поставлено под угрозу:
 \n
 \n- Ваш пароль
 \n- Ваш домашний сервер
@@ -2211,12 +2212,12 @@
     <string name="bootstrap_crosssigning_progress_save_usk">Синхронизация ключа пользователя</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Синхронизация ключа самоподписи</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Настройка резервного копирования ключей</string>
-    <string name="bootstrap_crosssigning_save_usb">Сохраните на USB-флешку или резервный диск</string>
+    <string name="bootstrap_crosssigning_save_usb">Сохраните на USB-ключ или резервное хранилище</string>
     <string name="bootstrap_crosssigning_save_cloud">Скопируйте в персональное облачное хранилище</string>
     <string name="auth_flow_not_supported">Вы не можете сделать это с телефона</string>
     <string name="encryption_unknown_algorithm_tile_description">Шифрование этой комнаты не поддерживается</string>
     <string name="room_created_summary_item_by_you">Вы создали и настроили комнату.</string>
-    <string name="qr_code_scanned_self_verif_notice">Почти готово! Отображается ли такой же щит в другой вашей сессии\?</string>
+    <string name="qr_code_scanned_self_verif_notice">Почти готово! Показывает ли другое устройство галочку\?</string>
     <string name="qr_code_scanned_verif_waiting_notice">Почти готово! Ожидание подтверждения…</string>
     <string name="qr_code_scanned_verif_waiting">Ожидание для %s…</string>
     <string name="error_failed_to_import_keys">Не удалось импортировать ключи</string>
@@ -2226,7 +2227,7 @@
     <string name="command_description_plain">Посылает сообщение в виде простого текста, не интерпретируя его как разметку</string>
     <string name="auth_invalid_login_param_space_in_password">Неверное имя пользователя и/или пароль. Введенный пароль начинается или заканчивается пробелами, пожалуйста, проверьте.</string>
     <string name="auth_invalid_login_deactivated_account">Эта учётная запись была деактивирована.</string>
-    <string name="setup_cross_signing">Активировать кросс-подпись</string>
+    <string name="setup_cross_signing">Включить перекрестную подпись</string>
     <string name="bootstrap_enter_recovery">Введите %s, чтобы продолжить</string>
     <string name="use_file">Использовать файл</string>
     <string name="enter_backup_passphrase">Введите %s</string>
@@ -2249,7 +2250,7 @@
 \n${app_name} для ПК</string>
     <string name="template_app_ios_android">${app_name} для iOS
 \n${app_name} для Android</string>
-    <string name="or_other_mx_capable_client">или другой, поддерживаемый кросс-подпись Matrix клиент</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>
@@ -2258,7 +2259,7 @@
     <string name="failed_to_access_secure_storage">Не удалось получить доступ к защищенному хранилищу данных</string>
     <string name="unencrypted">Не зашифровано</string>
     <string name="encrypted_unverified">Зашифровано неподтверждённой сессией</string>
-    <string name="review_logins">Проверьте, где вы вошли</string>
+    <string name="review_logins">Посмотрите, где вы вошли</string>
     <string name="verify_other_sessions">Подтвердите все свои сессии, чтобы убедиться в безопасности вашей учетной записи и сообщений</string>
     <string name="cross_signing_verify_by_text">Ручная проверка с помощью текста</string>
     <string name="mark_as_verified">Пометить как надежный</string>
@@ -2291,7 +2292,7 @@
     <string name="template_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_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_no_default">Введите URL-адрес сервера идентификации</string>
@@ -2321,7 +2322,7 @@
     <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>
-    <string name="crypto_utd">Не удалось расшифровать</string>
+    <string name="crypto_utd">Не могу расшифровать</string>
     <string name="notice_crypto_unable_to_decrypt_friendly_desc">Из-за сквозного шифрования вам, возможно, придется ждать прибытие чьего-либо сообщения, потому что ключи шифрования не были отправлены вам должным образом.</string>
     <string name="crypto_error_withheld_blacklisted">Вы не можете получить доступ к этому сообщению, потому что вы были заблокированы отправителем</string>
     <string name="crypto_error_withheld_unverified">Нет доступа к этому сообщению, так как отправитель не доверяет вашей сессии</string>
@@ -2357,7 +2358,7 @@
     <string name="settings_security_pin_code_summary">Для сброса PIN-кода нажмите Забыл(а) PIN-код, чтобы выйти из сессии и сбросить его.</string>
     <string name="auth_pin_confirm_to_disable_title">Подтвердите 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="conference_call_in_progress">Конференция уже идет!</string>
     <string name="video_meeting">Начать видеовстречу</string>
@@ -2389,7 +2390,7 @@
     </plurals>
     <string name="wrong_pin_message_last_remaining_attempt">Предупреждение! Последняя оставшаяся попытка перед выходом из системы!</string>
     <string name="too_many_pin_failures">Слишком много ошибок, вы вышли из системы</string>
-    <string name="auth_msisdn_already_defined">Этот номер телефона уже определён.</string>
+    <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>
@@ -2409,8 +2410,8 @@
         <item quantity="many">%d секунд</item>
     </plurals>
     <string name="settings_show_room_member_state_events">Показать события статуса участников комнаты</string>
-    <string name="settings_show_room_member_state_events_summary">Включает в себя события приглашения/ присоединения/выхода/исключения/бана и изменение аватара/отображаемого имени.</string>
-    <string name="sent_a_poll">Голосование</string>
+    <string name="settings_show_room_member_state_events_summary">Включает в себя события приглашения/присоединения/выхода/удаления/события блокировки и изменение аватара/изменения отображаемого имени.</string>
+    <string name="sent_a_poll">Опрос</string>
     <string name="sent_a_reaction">Отреагировал: %s</string>
     <string name="sent_verification_conclusion">Результат проверки</string>
     <string name="universal_link_malformed">Ссылка была искажена</string>
@@ -2440,10 +2441,10 @@
     <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="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>
@@ -2456,7 +2457,6 @@
         <item quantity="many">%d приглашений</item>
         <item quantity="other">%d приглашений</item>
     </plurals>
-    <string name="search_is_not_supported_in_e2e_room">Поиск в зашифрованных комнатах пока не поддерживается.</string>
     <string name="search_banned_user_hint">Фильтр заблокированных пользователей</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">У вас нет разрешения на запуск звонка</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">У вас нет разрешения на запуск конференции</string>
@@ -2476,17 +2476,17 @@
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Приложение ожидает push-уведомление</string>
     <string name="settings_troubleshoot_test_push_loop_title">Тестирование push-уведомлений</string>
     <string name="warning_unsaved_change">Есть несохраненные изменения. Отменить изменения\?</string>
-    <string name="room_list_quick_actions_low_priority_remove">Удалить из низкого приоритета</string>
+    <string name="room_list_quick_actions_low_priority_remove">Удалить из маловажного</string>
     <string name="rotate_and_crop_screen_title">Повернуть и обрезать</string>
     <string name="create_room_settings_section">Настройки комнаты</string>
-    <string name="create_room_topic_section">Тема комнаты (опционально)</string>
+    <string name="create_room_topic_section">Тема комнаты (необязательно)</string>
     <string name="warning_unsaved_change_discard">Отменить изменения</string>
     <string name="warning_room_not_created_yet">Комната ещё не создана. Отменить создание комнаты\?</string>
-    <string name="room_list_quick_actions_low_priority_add">Добавить к низкому приоритету</string>
+    <string name="room_list_quick_actions_low_priority_add">Добавить к маловажному</string>
     <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>
@@ -2522,12 +2522,12 @@
     <string name="hide_advanced">Скрыть дополнительные настройки</string>
     <string name="show_advanced">Показать дополнительные настройки</string>
     <string name="attachment_viewer_item_x_of_y">%1$d из %2$d</string>
-    <string name="identity_server_consent_dialog_content">Согласны ли вы на отправку своих контактных данных (номера телефонов и/или электронную почту) на настроенный сервер идентификации (%1$s) для обнаружения контактов\?
+    <string name="identity_server_consent_dialog_content">Согласны ли вы на отправку своих контактных данных (номера телефонов и/или электронной почты) на настроенный сервер идентификации (%1$s) для обнаружения контактов\?
 \n
 \nДля большей конфиденциальности отправленные данные перед отправкой будут хешированы.</string>
     <string name="settings_discovery_consent_action_give_consent">Дать согласие</string>
     <string name="settings_discovery_consent_action_revoke">Отозвать моё согласие</string>
-    <string name="settings_discovery_consent_notice_off">Вы не дали свое согласие на отправку электронной почты и номеров телефонов на этот сервер идентификации для обнаружения других пользователей из ваших контактов.</string>
+    <string name="settings_discovery_consent_notice_off">Вы не дали свое согласие на отправку электронной почты и номеров телефонов на этот сервер обнаружения для обнаружения других пользователей из ваших контактов.</string>
     <string name="no_more_results">Больше никаких результатов</string>
     <string name="direct_room_user_list_suggestions_title">Предложения</string>
     <string name="direct_room_user_list_contacts_title">Контакты</string>
@@ -2612,8 +2612,8 @@
     <string name="room_permissions_notice_read_only">У вас нет права доступа на обновление ролей, необходимых для изменения различных параметров комнаты</string>
     <string name="room_permissions_notice">Выберите роли, которые смогут менять различные параметры комнаты</string>
     <string name="room_settings_permissions_subtitle">Просматривайте и обновляйте роли, необходимые для изменения различных параметров комнаты.</string>
-    <string name="room_permissions_title">Права доступа</string>
-    <string name="room_settings_permissions_title">Права доступа комнаты</string>
+    <string name="room_permissions_title">Разрешения</string>
+    <string name="room_settings_permissions_title">Разрешения комнаты</string>
     <string name="room_participants_leave_private_warning">Эта комната не публичная. Вы не сможете повторно присоединиться без приглашения.</string>
     <string name="system_theme">Системная тема</string>
     <string name="authentication_error">Не удалось пройти аутентификацию</string>
@@ -2697,14 +2697,14 @@
     <string name="a11y_image">Изображение</string>
     <string name="a11y_import_key_from_file">Импорт ключа из файла</string>
     <string name="a11y_open_widget">Открытые виджеты</string>
-    <string name="a11y_screenshot">Скриншот</string>
+    <string name="a11y_screenshot">Снимок экрана</string>
     <plurals name="entries">
         <item quantity="one">%d запись</item>
         <item quantity="few">%d записи</item>
         <item quantity="many">%d записей</item>
         <item quantity="other">%d записей</item>
     </plurals>
-    <string name="settings_server_upload_size_unknown">Лимит неизвестен.</string>
+    <string name="settings_server_upload_size_unknown">Предел неизвестен.</string>
     <string name="settings_server_upload_size_content">Ваш домашний сервер принимает вложения (файлы, медиа и т.д.) размером до %s.</string>
     <string name="settings_server_upload_size_title">Лимит загрузки файла сервера</string>
     <string name="settings_server_version">Версия сервера</string>
@@ -2712,9 +2712,9 @@
     <string name="room_list_quick_actions_room_settings">Настройки комнаты</string>
     <string name="jitsi_leave_conf_to_join_another_one_content">Покинуть текущую конференцию и перейти к другой\?</string>
     <string name="room_settings_room_version_title">Версия комнаты</string>
-    <string name="settings_room_directory_show_all_rooms_summary">Показать все комнаты в списке комнат, в том числе с чувствительным содержанием.</string>
-    <string name="settings_room_directory_show_all_rooms">Показать комнаты с деликатным содержанием</string>
-    <string name="settings_category_room_directory">Список комнат</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Показать все комнаты в списке комнат, в том числе с откровенным содержанием.</string>
+    <string name="settings_room_directory_show_all_rooms">Показать комнаты с откровенным содержанием</string>
+    <string name="settings_category_room_directory">Каталог комнат</string>
     <string name="dialog_edit_hint">Новое значение</string>
     <string name="action_switch">Сменить</string>
     <string name="initial_sync_start_downloading">Начальная синхронизация:
@@ -2737,18 +2737,18 @@
     <string name="upgrade_public_room">Модернизировать публичную комнату</string>
     <string name="upgrade">Обновление</string>
     <string name="it_may_take_some_time">Пожалуйста, будьте терпеливы, это может занять некоторое время.</string>
-    <string name="joining_replacement_room">Присоединиться к изменённой комнате</string>
+    <string name="joining_replacement_room">Присоединиться к замещенной комнате</string>
     <string name="teammate_spaces_might_not_join">В настоящее время люди не могут присоединиться к созданным вами приватным комнатам.
 \n
 \nМы улучшим это в рамках бета-версии, но мы просто хотели сообщить вам об этом.</string>
     <string name="teammate_spaces_arent_quite_ready">Пространства для членов команды еще не совсем готовы, но вы все еще можете их попробовать</string>
-    <string name="unnamed_room">Комната без названия</string>
+    <string name="unnamed_room">Безымянная Комната</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">В этом пространстве нет комнат</string>
-    <string name="spaces_no_server_support_description">Для получения дополнительной информации обратитесь к администратору домашнего сервера</string>
-    <string name="spaces_no_server_support_title">Похоже, что ваш домашний сервер пока не поддерживает пространства</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="space_manage_rooms_and_spaces">Управление комнатами и пространствами</string>
@@ -2769,12 +2769,12 @@
     <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>
-        <item quantity="many">%d человек, которых вы знаете, уже присоединились</item>
-        <item quantity="other">%d человек, которых вы знаете, уже присоединились</item>
+        <item quantity="few">%d людей, которых вы знаете, уже присоединились</item>
+        <item quantity="many">%d людей, которых вы знаете, уже присоединились</item>
+        <item quantity="other">%d людей, которых вы знаете, уже присоединились</item>
     </plurals>
     <string name="suggested_rooms_pills_on_empty_header">Добро пожаловать в %1$s, %2$s.</string>
     <string name="suggested_rooms_pills_on_empty_text">Вы ещё не находитесь ни в одной комнате. Ниже приведены некоторые предлагаемые комнаты, но вы можете посмотреть другие с помощью зелёной кнопки внизу справа.</string>
@@ -2805,7 +2805,7 @@
     <string name="create_spaces_room_public_header_desc">Мы создадим для них комнаты. Позже вы сможете добавить и другие.</string>
     <string name="create_spaces_room_public_header">Какие обсуждения вы хотите провести в %s\?</string>
     <string name="create_space_error_empty_field_space_name">Дайте ему название, чтобы продолжить.</string>
-    <string name="create_spaces_details_private_header">Добавьте некоторые детали, чтобы помочь людям идентифицировать его. Вы сможете изменить их в любой момент.</string>
+    <string name="create_spaces_details_private_header">Добавьте некоторые детали, чтобы помочь людям распознать его. Вы сможете изменить их в любой момент.</string>
     <string name="create_spaces_details_public_header">Добавьте некоторые детали, чтобы помочь ему выделиться. Вы сможете изменить их в любой момент.</string>
     <string name="activity_create_space_title">Создание пространства</string>
     <string name="space_type_private_desc">Только по приглашениям, лучше для себя или команды</string>
@@ -2821,7 +2821,6 @@
     <string name="create_spaces_join_info_help">Чтобы присоединиться к существующему пространству, вам необходимо получить приглашение.</string>
     <string name="create_spaces_you_can_change_later">Вы сможете изменить это позже</string>
     <string name="create_spaces_choose_type_label">Какой тип пространства вы хотите создать\?</string>
-    <string name="create_spaces_type_header">Пространства - это новый способ группировки комнат и людей</string>
     <string name="your_private_space">Ваше приватное пространство</string>
     <string name="your_public_space">Ваше публичное пространство</string>
     <string name="add_space">Добавить пространство</string>
@@ -2858,9 +2857,9 @@
     <string name="send_file_step_compressing_video">Сжатие видео %d%%</string>
     <string name="send_file_step_compressing_image">Сжатие изображения…</string>
     <string name="give_feedback">Дать отзыв</string>
-    <string name="feedback_failed">Отзыв не отправлен (%s)</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="error_jitsi_join_conf">Извините, при попытке присоединиться к конференции произошла ошибка</string>
@@ -2871,12 +2870,12 @@
     <string name="directory_your_server">Ваш сервер</string>
     <string name="room_settings_room_access_restricted_description">Любой человек в пространстве с этой комнатой может найти её и присоединиться к ней. Только администраторы этой комнаты могут добавить её в пространство.</string>
     <string name="room_settings_room_access_restricted_title">Только участники пространства</string>
-    <string name="room_settings_room_access_public_description">Любой желающий может найти комнату и присоединиться</string>
+    <string name="room_settings_room_access_public_description">Каждый может найти комнату и присоединиться</string>
     <string name="room_settings_room_access_public_title">Публичный</string>
     <string name="room_settings_room_access_private_description">Только приглашенные люди могут найти и присоединиться</string>
     <string name="room_settings_room_access_private_title">Приватный</string>
     <string name="room_settings_room_access_entry_unknown">Неизвестная настройка доступа (%s)</string>
-    <string name="room_settings_room_access_entry_knock">Любой может постучаться в комнату, участники могут принять или отклонить его</string>
+    <string name="room_settings_room_access_entry_knock">Любой может постучаться в комнату, а участники могут принять или отклонить его</string>
     <string name="space_settings_alias_subtitle">Просмотреть и управлять адресами этого пространства.</string>
     <string name="room_settings_guest_access_title">Разрешить гостям присоединяться</string>
     <string name="continue_anyway">Продолжить в любом случае</string>
@@ -2946,15 +2945,10 @@
     <string name="settings_notification_mentions_and_keywords">Упоминания и ключевые слова</string>
     <string name="settings_notification_default">Уведомления по умолчанию</string>
     <string name="denied_permission_voice_message">Чтобы отправлять голосовые сообщения, предоставьте разрешение на Микрофон.</string>
-    <string name="link_this_email_with_your_account">%s в настройках, чтобы получать приглашения непосредственно в Element.</string>
+    <string name="template_link_this_email_with_your_account">%s в настройках, чтобы получать приглашения непосредственно в ${app_name}.</string>
     <string name="link_this_email_settings_link">Свяжите этот адрес электронной почты с вашей учетной записью</string>
     <string name="this_invite_to_this_room_was_sent">Приглашение в эту комнату было отправлено на %s, который не связан с вашей учетной записью</string>
     <string name="this_invite_to_this_space_was_sent">Приглашение в это пространство было отправлено на %s, который не связан с вашей учетной записью</string>
-    <string name="to_help_space_members_find_and_join">Чтобы помочь участникам пространства найти и присоединиться к приватной комнате, перейдите в настройки этой комнаты, нажав на аватар.</string>
-    <string name="help_space_members">Помогите участникам пространства в поиске приватных комнат</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Это позволяет комнатам оставаться приватными для пространства, в то же время позволяя людям в пространстве находить их и присоединяться к ним. Все новые комнаты в пространстве будут иметь эту опцию.</string>
-    <string name="help_people_in_spaces_find_and_join">Помогите людям в пространствах самим находить и присоединяться к приватным комнатам, без необходимости вручную приглашать всех.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Новое: Позволяет людям в пространствах находить и присоединяться к приватным комнатам</string>
     <string name="call_jitsi_started">Начался групповой вызов</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Все комнаты, в которых вы находитесь, будут отображаться в Начале.</string>
     <string name="preference_show_all_rooms_in_home">Показать все комнаты в Начале</string>
@@ -2962,7 +2956,7 @@
     <string name="call_tap_to_return">%1$s Нажмите, чтобы вернуться</string>
     <string name="call_one_active">Активный вызов (%1$s) ·</string>
     <plurals name="call_active_status">
-        <item quantity="one">Активный вызов ·</item>
+        <item quantity="one">%1$d Активный вызов ·</item>
         <item quantity="few">%1$d активных вызова ·</item>
         <item quantity="many">%1$d активных вызовов ·</item>
         <item quantity="other">%1$d активных вызовов ·</item>
@@ -3015,7 +3009,7 @@
     <string name="finish_setup">Завершение настройки</string>
     <string name="discovery_invite">Приглашение по электронной почте, поиск контактов и многое другое…</string>
     <string name="finish_setting_up_discovery">Завершите настройку обнаружения.</string>
-    <string name="create_space_identity_server_info_none">В настоящее время вы не используете сервер идентификации. Чтобы приглашать членов команды и быть доступным для них, настройте один из них ниже.</string>
+    <string name="create_space_identity_server_info_none">В настоящее время вы не используете сервер обнаружения. Чтобы приглашать членов команды и быть доступным для них, настройте один из них ниже.</string>
     <string name="invite_by_username_or_mail">Приглашение по имени пользователя или по почте</string>
     <string name="create_spaces_invite_public_header_desc">Убедитесь, что нужные люди имеют доступ к %s. Вы можете пригласить больше людей позже.</string>
     <string name="create_spaces_invite_public_header">Кто ваши члены команды\?</string>
@@ -3027,40 +3021,203 @@
     <string name="open_discovery_settings">Открыть настройки обнаружения</string>
     <string name="user_directory_search_hint_2">Поиск по имени, ID или почте</string>
     <string name="create_new_space">Создать новое пространство</string>
-    <string name="room_settings_space_access_public_description">Любой желающий может найти это пространство и присоединиться</string>
+    <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_category">Уведомление по эл. почте</string>
-    <string name="room_permissions_upgrade_the_space">Обновление пространства</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">Выберите роли, необходимые для изменения различных частей этого пространства</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>
-    <string name="space_participants_unban_prompt_msg">Разблокирование пользователя позволит ему снова присоединиться к пространству.</string>
-    <string name="space_participants_ban_prompt_msg">Блокировка пользователя исключит его из этого пространства и не позволит ему присоединиться снова.</string>
-    <string name="space_participants_remove_prompt_msg">Выгнанный пользователь будет удалён из этого пространства.
-\n 
+    <string name="space_participants_unban_prompt_msg">Разблокирование пользователя позволит ему присоединиться к пространству опять.</string>
+    <string name="space_participants_ban_prompt_msg">Блокировка пользователя удалит его из этого пространства и не позволит ему присоединиться вновь.</string>
+    <string name="space_participants_remove_prompt_msg">Пользователь будет выгнан из этого пространства.
+\n
 \nЧтобы предотвратить его повторное присоединение, вы должны заблокировать его.</string>
     <string name="a11y_stop_voice_message">Остановить запись</string>
-    <string name="command_description_lenny">Добавляет ( ͡° ͜ʖ ͡°) к текстовому сообщению</string>
+    <string name="command_description_lenny">Добавляет ( ͡° ͜ʖ ͡°) в начало сообщения</string>
     <string name="identity_server_consent_dialog_neutral_policy">Правила</string>
-    <string name="settings_discovery_no_policy_provided">Нет правил, предоставляемых сервером идентификации</string>
-    <string name="settings_discovery_hide_identity_server_policy_title">Скрыть правила сервера идентификации</string>
-    <string name="settings_discovery_show_identity_server_policy_title">Показать правила сервера идентификации</string>
+    <string name="settings_discovery_no_policy_provided">Нет правил, предоставляемых сервером обнаружения</string>
+    <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_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>
     <string name="a11y_presence_unavailable">Недоступен</string>
     <string name="a11y_presence_offline">Не в сети</string>
     <string name="a11y_presence_online">В сети</string>
+    <string name="tooltip_attachment_location">Поделиться местоположением</string>
+    <string name="tooltip_attachment_poll">Создать опрос</string>
+    <string name="tooltip_attachment_contact">Открыть контакты</string>
+    <string name="tooltip_attachment_sticker">Отправить стикер</string>
+    <string name="tooltip_attachment_file">Загрузить файл</string>
+    <string name="tooltip_attachment_gallery">Отправить изображения и видео</string>
+    <string name="tooltip_attachment_photo">Открыть камеру</string>
+    <string name="labs_render_locations_in_timeline">Показывать местоположения пользователя в ленте сообщений</string>
+    <string name="settings_enable_location_sharing_summary">После включения вы сможете отправить свое местоположение в любую комнату</string>
+    <string name="settings_enable_location_sharing">Включить отправку местоположения</string>
+    <string name="location_share_external">Открыть с помощью</string>
+    <string name="template_location_not_available_dialog_content">${app_name} не смог получить доступ к вашему местоположению. Пожалуйста, повторите попытку позже.</string>
+    <string name="template_location_not_available_dialog_title">${app_name} не смог получить доступ к вашему местоположению</string>
+    <string name="location_share">Поделиться местоположением</string>
+    <string name="a11y_location_share_icon">Поделиться местоположением</string>
+    <string name="location_activity_title_preview">Местоположение</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_title">Открытый опрос</string>
+    <string name="open_poll_option_description">Проголосовавшие увидят результаты сразу после голосования</string>
+    <string name="poll_type_title">Тип опроса</string>
+    <string name="edit_poll_button">РЕДАКТИРОВАТЬ ОПРОС</string>
+    <string name="edit_poll_title">Редактировать опрос</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>
+    <string name="end_poll_confirmation_approve_button">Завершить опрос</string>
+    <string name="end_poll_confirmation_description">Это лишит людей возможности голосовать и отобразит окончательные результаты опроса.</string>
+    <string name="end_poll_confirmation_title">Завершить этот опрос\?</string>
+    <string name="a11y_poll_winner_option">вариант-победитель</string>
+    <string name="poll_end_action">Завершить опрос</string>
+    <plurals name="poll_total_vote_count_after_ended">
+        <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>
+    <plurals name="poll_total_vote_count_before_ended_and_not_voted">
+        <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_no_votes_cast">Голосов нет</string>
+    <plurals name="poll_total_vote_count_before_ended_and_voted">
+        <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>
+    <plurals name="poll_option_vote_count">
+        <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>
+    <plurals name="create_poll_not_enough_options_error">
+        <item quantity="one">Требуется минимум %1$s вариант</item>
+        <item quantity="few">Требуется минимум %1$s варианта</item>
+        <item quantity="many">Требуется минимум %1$s вариантов</item>
+        <item quantity="other">Требуется минимум %1$s вариантов</item>
+    </plurals>
+    <string name="create_poll_empty_question_error">Вопрос не может быть пустым</string>
+    <string name="create_poll_button">СОЗДАТЬ ОПРОС</string>
+    <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="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_auto_report_uisi_desc">Ваша система будет автоматически отправлять журналы при возникновении ошибки невозможности расшифровки</string>
+    <string name="labs_auto_report_uisi">Автоматически сообщать об ошибках расшифровки.</string>
+    <string name="a11y_trust_level_misconfigured">Неправильно настроенный уровень доверия</string>
+    <string name="encryption_misconfigured">Шифрование неправильно настроено</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>
+    <string name="sent_location">Поделились своим местоположением</string>
+    <string name="login_splash_already_have_account">У меня уже есть учетная запись</string>
+    <string name="login_splash_create_account">Создать учетную запись</string>
+    <string name="ftue_auth_carousel_workplace_title">Обмен сообщениями для вашей команды.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Сквозное шифрование не требующее номера телефона. Нет рекламы или сбора данных.</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="ftue_auth_carousel_control_title">Ваше управление.</string>
+    <string name="ftue_auth_carousel_secure_title">Ваши собственные разговоры.</string>
+    <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_content_2">Чтобы обнаружить существующие контакты, необходимо отправить контактную информацию на сервер обнаружения.
+\n
+\nМы хешируем ваши данные перед отправкой для обеспечения конфиденциальности. Вы согласны отправить эту информацию\?</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>
+    <string name="template_preference_help_summary">Получите помощь в использовании ${app_name}</string>
+    <string name="preference_help_title">Помощь и поддержка</string>
+    <string name="preference_help">Помощь</string>
+    <string name="preference_root_legals">Правовые положения</string>
+    <string name="legals_no_policy_provided">Этот сервер не предоставляет никакой политики.</string>
+    <string name="legals_third_party_notices">Сторонние библиотеки</string>
+    <string name="legals_identity_server_title">Политика вашего сервера опознавания</string>
+    <string name="legals_home_server_title">Политика вашего домашнего сервера</string>
+    <string name="template_legals_application_title">Политика ${app_name}</string>
+    <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_list_item_1">Мы <b>не</b> записываем и <b>не</b> профилируем любые данные учетной записи</string>
+    <string name="analytics_opt_in_content_link">тут</string>
+    <string name="template_analytics_opt_in_content">Помогите нам выявить проблемы и улучшить ${app_name}, поделившись анонимными данными об использовании. Чтобы понять, как люди используют несколько устройств, мы сгенерируем случайный идентификатор, общий для всех ваших устройств.
+\n
+\nВы можете ознакомиться со всеми нашими условиями %s.</string>
+    <string name="template_analytics_opt_in_title">Помогите улучшить ${app_name}</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>
+    <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="action_not_now">Не сейчас</string>
+    <string name="action_enable">Включить</string>
+    <string name="notification_listening_for_notifications">Слежка за уведомлениями</string>
+    <string name="room_error_access_unauthorized">Вам не разрешено подключаться к этой комнате</string>
+    <string name="thread_list_empty_title">Организуйте обсуждение в потоках</string>
+    <string name="thread_list_modal_my_threads_subtitle">Показать все потоки в которых вы участвуете</string>
+    <string name="thread_list_modal_all_threads_title">Все Потоки</string>
+    <string name="action_view_threads">Просмотр Потоков</string>
+    <string name="action_thread_view_in_room">Посмотреть в комнате</string>
+    <string name="message_bubbles">Показать всплывающие сообщения</string>
+    <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="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_skip">Пока не уверенны\? Вы можете %s</string>
+    <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_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>
+    <string name="command_not_supported_in_threads">Команда «%s» распознается, но не поддерживается в потоках.</string>
+    <string name="search_thread_from_a_thread">Из Потока</string>
+    <string name="thread_list_empty_notice">Совет: нажмите и удерживайте сообщение и используйте «%s».</string>
+    <string name="thread_list_empty_subtitle">Потоки помогают хранить ваши разговоры по темам и легко отслеживать их.</string>
+    <string name="thread_list_modal_my_threads_title">Мои Потоки</string>
+    <string name="thread_list_modal_all_threads_subtitle">Показать все потоки в текущей комнате</string>
+    <string name="thread_list_modal_title">Фильтр</string>
+    <string name="thread_list_title">Потоки</string>
+    <string name="thread_timeline_title">Поток</string>
+    <string name="room_threads_filter">Фильтровать Потоки в комнате</string>
+    <string name="action_thread_copy_link_to_thread">Скопировать ссылку в поток</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 5377dfe99f..4d253b61e2 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -11,7 +11,7 @@
     <string name="notice_room_remove">%1$s vykázal/a %2$s</string>
     <string name="notice_room_unban">%1$s povolil/a vstupovať %2$s</string>
     <string name="notice_room_ban">%1$s zakázal/a vstupovať %2$s</string>
-    <string name="notice_room_withdraw">%1$s vzal/a späť pozvanie %2$s</string>
+    <string name="notice_room_withdraw">%1$s odvolal/a pozvanie od %2$s</string>
     <string name="notice_avatar_url_changed">%1$s si zmenil/a obrázok v profile</string>
     <string name="notice_display_name_set">%1$s si nastavil/a zobrazované meno %2$s</string>
     <string name="notice_display_name_changed_from">%1$s si zmenil/a zobrazované meno %2$s na %3$s</string>
@@ -28,7 +28,7 @@
     <string name="notice_room_visibility_shared">pre všetkých členov.</string>
     <string name="notice_room_visibility_world_readable">pre každého.</string>
     <string name="notice_room_visibility_unknown">neznámym (%s).</string>
-    <string name="notice_end_to_end">%1$s povolil/a E2E šifrovanie (%2$s)</string>
+    <string name="notice_end_to_end">%1$s povolil/a end-to-end šifrovanie (%2$s)</string>
     <string name="notice_requested_voip_conference">%1$s požiadal/a o VoIP konferenciu</string>
     <string name="notice_voip_started">Začala sa VoIP konferencia</string>
     <string name="notice_voip_finished">Skončila sa VoIP konferencia</string>
@@ -39,7 +39,7 @@
     <string name="notice_room_third_party_invite">%1$s pozval/a %2$s vstúpiť do miestnosti</string>
     <string name="notice_room_third_party_registered_invite">%1$s prijal/a pozvanie pre %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Nie je možné dešifrovať: %s **</string>
-    <string name="notice_crypto_error_unknown_inbound_session_id">Zo zariadenia odosieľateľa nebolo možné získať kľúče potrebné na dešifrovanie tejto správy.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Zariadenie odosielateľa nám neposlalo kľúče pre túto správu.</string>
     <string name="could_not_redact">Nie je možné vymazať</string>
     <string name="unable_to_send_message">Nie je možné odoslať správu</string>
     <string name="message_failed_to_upload">Nepodarilo sa nahrať obrázok</string>
@@ -122,7 +122,7 @@
     <string name="notice_room_remove_by_you">Vykázali ste %1$s</string>
     <string name="notice_room_unban_by_you">Povolili ste vstupovať %1$s</string>
     <string name="notice_room_ban_by_you">Zakázali ste vstupovať %1$s</string>
-    <string name="notice_room_withdraw_by_you">Vzali ste späť pozvanie %1$s</string>
+    <string name="notice_room_withdraw_by_you">Odvolali ste pozvanie %1$s</string>
     <string name="notice_avatar_url_changed_by_you">Zmenili ste si obrázok v profile</string>
     <string name="notice_display_name_set_by_you">Nastavili ste si zobrazované meno %1$s</string>
     <string name="notice_display_name_changed_from_by_you">Zmenili ste si zobrazované meno %1$s na %2$s</string>
@@ -138,7 +138,7 @@
     <string name="notice_answered_call_by_you">Prijali ste hovor.</string>
     <string name="notice_ended_call_by_you">Ukončili ste hovor.</string>
     <string name="notice_made_future_room_visibility_by_you">Sprístupnili ste budúcu históriu miestnosti %1$s</string>
-    <string name="notice_end_to_end_by_you">Povolili ste E2E šifrovanie (%1$s)</string>
+    <string name="notice_end_to_end_by_you">Povolili ste end-to-end šifrovanie (%1$s)</string>
     <string name="notice_room_update_by_you">Aktualizovali ste túto miestnosť.</string>
     <string name="notice_requested_voip_conference_by_you">Požiadali ste o VoIP konferenciu</string>
     <string name="notice_room_name_removed_by_you">Odstránili ste názov miestnosti</string>
@@ -191,12 +191,12 @@
     <string name="notice_room_guest_access_can_join_by_you">Povolili ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
     <string name="notice_room_guest_access_forbidden">%1$s zakázal/a hosťom///návštevníkom prístup do tejto miestnosti.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Zakázali ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
-    <string name="notice_end_to_end_ok">%1$s povolil/a E2E šifrovanie.</string>
-    <string name="notice_end_to_end_ok_by_you">Povolili ste E2E šifrovanie.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s povolil/a E2E šifrovanie (Nerozpoznaný algorytmus %2$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Povolili ste E2E šifrovanie (Nerozpoznaný algorytmus %1$s).</string>
-    <string name="notice_room_server_acl_set_title_by_you">nastavili ste na servery pravidlá ACL tejto miestnosti.</string>
-    <string name="notice_room_server_acl_set_title">%s nastavil(a) na servery pravidlá ACL tejto miestnosti.</string>
+    <string name="notice_end_to_end_ok">%1$s povolil/a end-to-end šifrovanie.</string>
+    <string name="notice_end_to_end_ok_by_you">Zapli ste end-to-end šifrovanie.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s zapol end-to-end šifrovanie (nerozpoznaný algoritmus %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Zapli ste end-to-end šifrovanie (nerozpoznaný algoritmus %1$s).</string>
+    <string name="notice_room_server_acl_set_title_by_you">Nastavili ste ACL servera pre túto miestnosť.</string>
+    <string name="notice_room_server_acl_set_title">%s nastavil/a na serveri pravidlá ACL pre túto miestnosť.</string>
     <string name="notice_direct_room_update_by_you">Aktualizovali ste sem.</string>
     <string name="notice_direct_room_update">%s aktualizoval(a) sem.</string>
     <string name="notice_made_future_direct_room_visibility">%1$s sprístupnil(a) budúce správy %2$s</string>
@@ -250,7 +250,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferenčné hovory nie sú podporované v šifrovaných miestnostiach</string>
     <string name="send_anyway">Napriek tomu odoslať</string>
     <string name="or">alebo</string>
-    <string name="action_invite">Pozvanie</string>
+    <string name="action_invite">Pozvať</string>
     <string name="offline">Nedostupný</string>
     <string name="action_sign_out">Odhlásiť sa</string>
     <string name="action_voice_call">Audio hovor</string>
@@ -297,7 +297,7 @@
     <string name="send_bug_report">Nahlásiť chybu</string>
     <string name="send_bug_report_description">Prosím, Napíšte text hlásenia. Čo ste práve robili? Čo ste očakávali? Čo sa v skutočnosti udialo?</string>
     <string name="send_bug_report_placeholder">Tu popíšte váš problém</string>
-    <string name="send_bug_report_logs_description">S cieľom lepšej diagnostiky problému sa spolu s vašim hlásením odošlú záznami o činnosti programu Element. Toto hlásenie vrátane priložených záznamov a snímky obrazovky nebude verejne dostupné. Ak si želáte odoslať len text hlásenia, odškrtnite niektoré z nasledujúcich polí:</string>
+    <string name="send_bug_report_logs_description">Za účelom diagnostiky problémov budú spolu s týmto hlásením o chybe odoslané záznamy z tohto klienta. Toto hlásenie o chybe, vrátane záznamov a snímku obrazovky, nebude verejne viditeľné. Ak chcete radšej odoslať len vyššie uvedený text, zrušte označenie:</string>
     <string name="send_bug_report_alert_message">Zdá sa, že v zlosti trasiete zariadením. Chceli by ste odoslať hlásenie o chybe?</string>
     <string name="send_bug_report_app_crashed">Posledné spustenie aplikácie skončilo pádom. Chceli by ste odoslať hlásenie o chybe?</string>
     <string name="send_bug_report_sent">Hlásenie o chybe bolo úspešne odoslané</string>
@@ -364,7 +364,7 @@
     <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="auth_reset_password_success_message">Vaše heslo bolo obnovené.
 \n
-\nBoli ste odhlásení na všetkých reláciach a nebudete viac dostávať okamžité oznámenia. Oznámenia znovu povolíte tak, že sa opätovne prihlásite na každom zariadení.</string>
+\nBoli ste odhlásení zo všetkých relácií a už nebudete dostávať okamžité oznámenia. Ak chcete opätovne povoliť oznámenia, znovu sa prihláste na každom zariadení.</string>
     <string name="login_error_must_start_http">URL adresa musí začínať http[s]://</string>
     <string name="login_error_network_error">Nie je možné sa prihlásiť: Chyba siete</string>
     <string name="login_error_unable_login">Nie je možné sa prihlásiť</string>
@@ -400,7 +400,7 @@
     <string name="call_ring">Vytáčanie…</string>
     <string name="incoming_call">Prichádzajúci hovor</string>
     <string name="incoming_video_call">Prichádzajúci video hovor</string>
-    <string name="incoming_voice_call">Prichádzajúci audio hovor</string>
+    <string name="incoming_voice_call">Prichádzajúci hlasový hovor</string>
     <string name="call_in_progress">Prebiehajúci hovor…</string>
     <string name="call_error_user_not_responding">Vzdialenej strane sa nepodarilo prijať hovor.</string>
     <string name="call_error_ice_failed">Zlyhalo spojenie médií</string>
@@ -472,7 +472,7 @@
     <string name="room_participants_power_level_prompt">Túto zmenu nebudete môcť vrátiť späť, pretože tomuto používateľovi udeľujete rovnakú úroveň moci, akú máte vy. 
 \nSte si istí\?</string>
     <string name="room_participants_invite_prompt_msg">Ste si istí, že chcete pozvať používateľa %s do tejto miestnosti?</string>
-    <string name="people_search_invite_by_id"><u>Pozvať zadaním používateľského ID</u></string>
+    <string name="people_search_invite_by_id"><u>Pozvať pomocou ID</u></string>
     <string name="people_search_local_contacts">LOKÁLNE KONTAKTY (%d)</string>
     <string name="people_search_user_directory">ADRESÁR POUŽÍVATEĽOV (%s)</string>
     <string name="people_search_filter_text">Len Matrix používatelia</string>
@@ -501,15 +501,15 @@
     <string name="ssl_fingerprint_hash">Odtlačok (%s):</string>
     <string name="ssl_could_not_verify">Nie je možné overiť totožnosť servera.</string>
     <string name="ssl_cert_not_trust">Vaše zariadenie nedôveruje certifikátu poskytnutému serverom alebo sa niekto môže pokúšať odpočúvať vašu komunikáciu.</string>
-    <string name="ssl_cert_new_account_expl">Ak vám aj správca servera môže potvrdiť, že certifikát nie je dôverihodný, uistite sa, že odtlačok zobrazený nižšie sa zhoduje s odtlačkom získaným od správcu.</string>
-    <string name="ssl_unexpected_existing_expl">Certifikát sa zmenil na taký, ktorý nie je viac dôverovaný vašim zariadením. Takáto zmena je veľmi nezvičajná. Navrhujeme, aby ste NEDÔVEROVALI tomuto novému certifikátu.</string>
-    <string name="ssl_expected_existing_expl">Vami overený certifikát sa zmenil na taký, ktorý nie je viac dôverovaný vašim zariadením. Je pravdepodobné, že správca servera obnovil certifikát. Na účel ručného overenia si prosím vyžiadajte nový odtlačok.</string>
+    <string name="ssl_cert_new_account_expl">Ak správca servera uviedol, že sa to očakáva, skontrolujte, či sa odtlačok uvedený nižšie zhoduje s odtlačkom, ktorý poskytol.</string>
+    <string name="ssl_unexpected_existing_expl">Certifikát sa zmenil na iný, ktorému tento telefón dôveroval. Toto je VEĽMI NEZVYČAJNÉ. Odporúča sa, aby ste tento nový certifikát NEPRIJALI.</string>
+    <string name="ssl_expected_existing_expl">Certifikát sa zmenil z predtým dôveryhodného na nedôveryhodný. Server mohol obnoviť svoj certifikát. Obráťte sa na správcu servera, aby vám poskytol očakávaný odtlačok.</string>
     <string name="ssl_only_accept">Dôverujte certifikátu len v prípade, že správca servera zverejnil odtlačok zhodný s odtlačkom zobrazeným vyššie.</string>
     <string name="room_details_title">Podrobnosti o miestnosti</string>
     <string name="room_details_people">Ľudia</string>
     <string name="room_details_files">Súbory</string>
     <string name="room_details_settings">Nastavenia</string>
-    <string name="malformed_id">Nesprávny formát ID. Mali by ste zadať emailovú adresu alebo Matrix ID ako napríklad \'@lokálnaČasť:doména\'</string>
+    <string name="malformed_id">Chybné ID. Mala by to byť emailová adresa alebo Matrix ID ako napríklad \"@lokalnacast:domena\"</string>
     <string name="room_details_people_invited_group_name">POZVANÍ</string>
     <string name="room_details_people_present_group_name">VSTÚPILI</string>
     <string name="room_event_action_report_prompt_reason">Dôvod, prečo chcete ohlásiť tento obsah</string>
@@ -555,7 +555,7 @@
     <string name="settings_containing_my_user_name">Správy obsahujúce moje používateľské meno</string>
     <string name="settings_messages_in_one_to_one">Správy v priamych konverzáciách</string>
     <string name="settings_messages_in_group_chat">Správy v skupinových konverzáciách</string>
-    <string name="settings_invited_to_room">Pozvania vstúpiť do miestnosti</string>
+    <string name="settings_invited_to_room">Keď ma pozvú do miestnosti</string>
     <string name="settings_call_invitations">Audio / Video hovory</string>
     <string name="settings_messages_sent_by_bot">Správy odosielané robotmi</string>
     <string name="settings_start_on_boot">Spustiť po reštarte zariadenia</string>
@@ -581,7 +581,7 @@
     <string name="settings_notifications_targets">Ciele oznámení</string>
     <string name="settings_contact">Lokálne kontakty</string>
     <string name="settings_contacts_app_permission">Právo pristupovať ku kontaktom</string>
-    <string name="settings_contacts_phonebook_country">Krajna pre čísla zo zoznamu kontaktov</string>
+    <string name="settings_contacts_phonebook_country">Krajina telefónneho zoznamu</string>
     <string name="settings_home_display">Úvodná obrazovka</string>
     <string name="settings_pin_missed_notifications">Pripnúť miestnosti so zmeškanými oznámeniami</string>
     <string name="settings_pin_unread_messages">Pripnúť miestnosti s neprečítanými správami</string>
@@ -617,17 +617,17 @@
     <string name="settings_new_password">Nové heslo</string>
     <string name="settings_confirm_password">Potvrdiť nové heslo</string>
     <string name="settings_fail_to_update_password">Nepodarilo sa zmeniť heslo</string>
-    <string name="settings_password_updated">Úspešne ste si zmenili heslo</string>
+    <string name="settings_password_updated">Vaše heslo bolo aktualizované</string>
     <string name="settings_unignore_user">Zobraziť všetky správy od %s\?
 \n
 \nUpozorňujeme, že táto akcia spôsobí reštart aplikácie a môže chvíľu trvať.</string>
     <string name="settings_delete_notification_targets_confirmation">Ste si istí, že chcete odstrániť tento cieľ oznámení?</string>
     <string name="settings_delete_threepid_confirmation">Ste si istí, že chcete odstrániť %1$s %2$s?</string>
-    <string name="settings_select_country">Vyberte krajnu</string>
-    <string name="settings_phone_number_country_label">Krajnu</string>
-    <string name="settings_phone_number_country_error">Prosím, vyberte krajnu</string>
+    <string name="settings_select_country">Vyberte si krajinu</string>
+    <string name="settings_phone_number_country_label">Krajina</string>
+    <string name="settings_phone_number_country_error">Prosím, vyberte si krajinu</string>
     <string name="settings_phone_number_label">Telefónne číslo</string>
-    <string name="settings_phone_number_error">Zadané číslo nie je správne pre vybratú krajnu</string>
+    <string name="settings_phone_number_error">Neplatné telefónne číslo pre vybranú krajinu</string>
     <string name="settings_phone_number_verification">Overenie telefónneho čísla</string>
     <string name="settings_phone_number_verification_instruction">Odoslali sme vám SMS správu, ktorá obsahuje overovací kód. Prosím zadajte ho nižšie.</string>
     <string name="settings_phone_number_verification_error_empty_code">Zadajte aktivačný kód</string>
@@ -665,11 +665,11 @@
     <string name="room_settings_addresses_pref_title">Adresy</string>
     <string name="room_settings_labs_pref_title">Experimenty</string>
     <string name="room_settings_labs_warning_message">Tieto funkcie sú experimentálne a môžu sa nečakane pokaziť. Pri používaní buďte opatrní.</string>
-    <string name="room_settings_labs_end_to_end">E2E šifrovanie</string>
-    <string name="room_settings_labs_end_to_end_is_active">E2E šifrovanie je povolené</string>
+    <string name="room_settings_labs_end_to_end">End-to-end šifrovanie</string>
+    <string name="room_settings_labs_end_to_end_is_active">End-to-end šifrovanie je povolené</string>
     <string name="room_settings_labs_end_to_end_warnings">Ak si želáte povoliť šifrovanie, musíte sa odhlásiť a následne prihlásiť znovu.</string>
-    <string name="room_settings_never_send_to_unverified_devices_title">Šifrovať len známym reláciam</string>
-    <string name="room_settings_never_send_to_unverified_devices_summary">Nikdy neposielajte šifrované správy neovereným reláciam v tejto miestnosti z tejto relácie.</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Šifrovať len pre overené relácie</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">Z tejto relácie nikdy neposielať šifrované správy neovereným reláciám v tejto miestnosti.</string>
     <string name="room_settings_addresses_no_local_addresses">Pre túto miestnosť nie sú žiadne lokálne adresy</string>
     <string name="room_settings_addresses_add_new_address">Nová adresa (napr. #foo:matrix.org)</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Nesprávny formát aliasu</string>
@@ -680,18 +680,18 @@
     <string name="room_settings_unset_main_address">Zrušiť nastavenie ako hlavnej adresy</string>
     <string name="room_settings_copy_room_id">Kopírovať ID miestnosti</string>
     <string name="room_settings_copy_room_address">Kopírovať adresu miestnosti</string>
-    <string name="room_settings_addresses_e2e_enabled">V tejto miestnosti je povolené šifrovanie.</string>
-    <string name="room_settings_addresses_e2e_disabled">V tejto miestnosti nie je povolené šifrovanie.</string>
+    <string name="room_settings_addresses_e2e_enabled">V tejto miestnosti je zapnuté šifrovanie.</string>
+    <string name="room_settings_addresses_e2e_disabled">V tejto miestnosti vypnuté šifrovanie.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Povoliť šifrovanie 
 \n(Pozor: nie je možné ho znova vypnúť!)</string>
     <string name="directory_title">Adresár</string>
     <string name="settings_theme">Vzhľad</string>
     <string name="failed_to_load_timeline_position">%s sa pokúšal zobraziť konkrétny bod v histórii tejto miestnosti, no zodpovedajúcu udalosť sa nepodarilo nájsť.</string>
-    <string name="encryption_information_title">Informácie o E2E šifrovaní</string>
+    <string name="encryption_information_title">Informácie o end-to-end šifrovaní</string>
     <string name="encryption_information_device_info">Informácie o udalosti</string>
-    <string name="encryption_information_user_id">Používateľské id</string>
+    <string name="encryption_information_user_id">ID používateľa</string>
     <string name="encryption_information_curve25519_identity_key">Kľúč totožnosti curve25519</string>
-    <string name="encryption_information_claimed_ed25519_fingerprint_key">Údajne kľúč s odtlačkom prsta Ed25519</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">Deklarovaný kľúč odtlačku Ed25519</string>
     <string name="encryption_information_algorithm">Algoritmus</string>
     <string name="encryption_information_session_id">ID relácie</string>
     <string name="encryption_information_decryption_error">Chyba dešifrovania</string>
@@ -701,22 +701,22 @@
     <string name="encryption_information_device_id">ID relácie</string>
     <string name="encryption_information_device_key">Kľúč relácie</string>
     <string name="encryption_information_verification">Overenie</string>
-    <string name="encryption_information_ed25519_fingerprint">Odtlačok prsta Ed25519</string>
-    <string name="encryption_export_e2e_room_keys">Exportovať E2E kľúče miestností</string>
-    <string name="encryption_export_room_keys">Exportovať kľúče miestností</string>
-    <string name="encryption_export_room_keys_summary">Exportovať kľúče miestností do lokálneho súboru</string>
+    <string name="encryption_information_ed25519_fingerprint">Odtlačok Ed25519</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>
+    <string name="encryption_export_room_keys_summary">Exportovať kľúče do lokálneho súboru</string>
     <string name="encryption_export_export">Exportovať</string>
-    <string name="passphrase_enter_passphrase">Zadajte heslo</string>
-    <string name="passphrase_confirm_passphrase">Potvrďte heslo</string>
-    <string name="encryption_export_saved_as">Kľúče od miestnosti E2E boli uložené do \'%s\'.
+    <string name="passphrase_enter_passphrase">Zadajte prístupovú frázu</string>
+    <string name="passphrase_confirm_passphrase">Potvrďte prístupovú frázu</string>
+    <string name="encryption_export_saved_as">Šifrovacie kľúče od miestnosti boli uložené do \'%s\'.
 \n
-\nUpozornenie: Tento súbor sa môže vymazať, ak sa aplikácia odinštaluje.</string>
-    <string name="encryption_import_e2e_room_keys">Importovať E2E kľúče miestností</string>
-    <string name="encryption_import_room_keys">Importovať kľúče miestností</string>
+\nUpozornenie: Tento súbor sa môže vymazaný, ak sa aplikácia odinštaluje.</string>
+    <string name="encryption_import_e2e_room_keys">Importovať šifrovacie kľúče miestnosti</string>
+    <string name="encryption_import_room_keys">Importovať kľúče miestnosti</string>
     <string name="encryption_import_room_keys_summary">Importovať kľúče z lokálneho súboru</string>
     <string name="encryption_import_import">Importovať</string>
-    <string name="encryption_never_send_to_unverified_devices_title">Šifrovať len známym reláciam</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Nikdy neposielať šifrované správy neovereným reláciam z tejto relácie.</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Šifrovať len pre overené relácie</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Nikdy neposielať šifrované správy neovereným reláciám z tejto relácie.</string>
     <string name="encryption_information_not_verified">Neoverené</string>
     <string name="encryption_information_verified">Overené</string>
     <string name="encryption_information_blocked">Na čiernej listine</string>
@@ -729,7 +729,7 @@
     <string name="encryption_information_verify_device">Overiť reláciu</string>
     <string name="encryption_information_verify_device_warning">Ak chcete overiť, či táto relácia je skutočne dôveryhodná, kontaktujte jeho vlastníka iným spôsobom (napr. osobne alebo cez telefón) a opýtajte sa ho, či kľúč, ktorý má zobrazený v Nastaveniach, sa zhoduje s kľúčom zobrazeným nižšie:</string>
     <string name="encryption_information_verify_device_warning2">Ak sa kľúče zhodujú, stlačte tlačidlo Overiť nižšie. Ak sa nezhodujú, niekto ďalší odpočúva toto zariadenie a mali by ste ho pridať na čiernu listinu.</string>
-    <string name="encryption_information_verify_key_match">Overil som, kľúče sa zhodujú</string>
+    <string name="encryption_information_verify_key_match">Overím, či sa kľúče zhodujú</string>
     <string name="unknown_devices_alert_title">V miestnosti sú neznáme relácie</string>
     <string name="unknown_devices_alert_message">V tejto miestnosti sa nachádzajú neznáme relácie, ktoré neboli overené.
 \nZnamená to, že príslušnosť týchto relácií k ich údajným používateľom nemôže byť garantovaná.
@@ -788,7 +788,7 @@
     <string name="action_exit">Ukončiť</string>
     <string name="bottom_action_groups">Komunity</string>
     <string name="home_filter_placeholder_groups">Filtrovať názvy komunít</string>
-    <string name="groups_invite_header">Pozvanie</string>
+    <string name="groups_invite_header">Pozvať</string>
     <string name="groups_header">Komunity</string>
     <string name="no_group_placeholder">Žiadne komunity</string>
     <string name="start_new_chat_prompt_msg">Ste si istí, že chcete začať novú konverzáciu s %s?</string>
@@ -915,7 +915,7 @@
     <string name="settings_opt_in_of_analytics_ok">Áno, chcem pomôcť!</string>
     <string name="widget_integration_missing_parameter">Chýba zadanie povinného argumentu.</string>
     <string name="widget_integration_invalid_parameter">Argument nie je správny.</string>
-    <string name="dialog_user_consent_content">Ak chcete aj naďalej používať domovský server %1$s , mali by ste si prečítať a odsúhlasiť naše zmluvné podmienky.</string>
+    <string name="dialog_user_consent_content">Ak chcete aj naďalej používať domovský server %1$s , mali by ste si prečítať a odsúhlasiť zmluvné podmienky.</string>
     <string name="dialog_user_consent_submit">Prečítať teraz</string>
     <string name="deactivate_account_title">Deaktivovať účet</string>
     <string name="deactivate_account_content">Tým sa vaše konto stane trvalo nepoužiteľným. Nebudete sa môcť prihlásiť a nikto nebude môcť opätovne zaregistrovať rovnaké ID používateľa. To spôsobí, že váš účet opustí všetky miestnosti, ktorých sa zúčastňuje, a odstráni údaje o vašom účte zo servera identity. <b>Táto akcia je nezvratná</b>.
@@ -933,8 +933,8 @@
     <string name="e2e_re_request_encryption_key_sent">Žiadosť o šifrovacie kľúče bola odoslaná.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Žiadosť odoslaná</string>
     <string name="lock_screen_hint">Píšte sem…</string>
-    <string name="e2e_re_request_encryption_key">Znovu požiadať o šifrovacie kľúče z vašich ostatných relácií.<u>Znovu požiadať o šifrovacie kľúče</u> z vašich ostatných zariadení.</string>
-    <string name="template_e2e_re_request_encryption_key_dialog_content">Prosím spustite ${app_name} na inom zariadení, ktoré je schopné dešifrovať túto správu, čím sa automaticky spustí prenos chýbajúcich kľúčov na túto reláciu.</string>
+    <string name="e2e_re_request_encryption_key">Znovu požiadať o šifrovacie kľúče z vašich ostatných relácií.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Spustite prosím ${názov_aplikácie} na inom zariadení, ktoré dokáže dešifrovať správu, aby mohlo poslať kľúče do tejto relácie.</string>
     <string name="option_send_voice">Odoslať hlasovú správu</string>
     <string name="go_on_with">Pokračovať v aplikácii…</string>
     <string name="error_no_external_application_found">Nebola nájdená žiadna vhodná aplikácia na dokončenie tejto akcie.</string>
@@ -948,17 +948,17 @@
         <item quantity="other">%ds</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">1 minúta</item>
-        <item quantity="few">%d minúty</item>
-        <item quantity="other">%d minút</item>
+        <item quantity="one">%d m</item>
+        <item quantity="few">%d m</item>
+        <item quantity="other">%d m</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="one">1 hodina</item>
-        <item quantity="few">%d hodiny</item>
-        <item quantity="other">%d hodín</item>
+        <item quantity="one">%dh</item>
+        <item quantity="few">%d h</item>
+        <item quantity="other">%d h</item>
     </plurals>
     <plurals name="format_time_d">
-        <item quantity="one">1 deň</item>
+        <item quantity="one">%d deň</item>
         <item quantity="few">%d dni</item>
         <item quantity="other">%d dní</item>
     </plurals>
@@ -983,13 +983,13 @@
     <string name="command_description_op_user">Určuje úroveň moci pre zadaného používateľa</string>
     <string name="command_description_deop_user">Znižuje úroveň moci pre zadaného používateľa</string>
     <string name="command_description_invite_user">Pozve zadaného používateľa do aktuálnej miestnosti</string>
-    <string name="command_description_join_room">Vstúpi do miestnosti podľa zadaného aliasu</string>
+    <string name="command_description_join_room">Pripojí sa do miestnosti s danou adresou</string>
     <string name="command_description_part_room">Opustí aktuálnu miestnosť</string>
     <string name="command_description_topic">Nastaví tému aktuálnej miestnosti</string>
     <string name="command_description_remove_user">Vykáže zadaného používateľa z miestnosti</string>
     <string name="command_description_nick">Mení vaše zobrazované meno / prezývku</string>
-    <string name="command_description_markdown">Zapína alebo vypína formátovanie textu pomocou markdown</string>
-    <string name="command_description_clear_scalar_token">Užitočné na opravu spravovania aplikácií matrix</string>
+    <string name="command_description_markdown">Zapnutie/vypnutie formátovanie textu markdown</string>
+    <string name="command_description_clear_scalar_token">Užitočné na opravu spravovania Matrix aplikácií</string>
     <plurals name="group_members">
         <item quantity="one">1 člen</item>
         <item quantity="few">%d členovia</item>
@@ -1020,9 +1020,9 @@
     <string name="error_lazy_loading_not_supported_by_home_server">Váš domovský server zatiaľ nepodporuje oneskorené načítanie členov v miestnosti. Skúste prosím neskôr.</string>
     <string name="unknown_error">Prepáčte, vyskytla sa chyba</string>
     <string name="room_sliding_menu_version_x">Verzia %s</string>
-    <string name="encryption_export_notice">Prosím vytvorte si heslo, ktorým zašifrujete exportované kľúče. Toto isté heslo budete musieť zadať aj pri importe kľúčov z uloženého súboru.</string>
-    <string name="passphrase_create_passphrase">Vytvoriť heslo</string>
-    <string name="passphrase_passphrase_does_not_match">Heslá sa musia zhodovať</string>
+    <string name="encryption_export_notice">Prosím, vytvorte si prístupovú frázu na zašifrovanie exportovaných kľúčov. Aby ste mohli kľúče importovať, budete musieť zadať rovnakú prístupovú frázu.</string>
+    <string name="passphrase_create_passphrase">Vytvoriť prístupovú frázu</string>
+    <string name="passphrase_passphrase_does_not_match">Prístupová fráza sa nezhoduje</string>
     <string name="merged_events_expand">Rozbaliť</string>
     <string name="merged_events_collapse">Zbaliť</string>
     <string name="settings_info_area_show">Zobrazovať oblasť s informáciami</string>
@@ -1066,7 +1066,7 @@
 \nProsím, skontrolujte nastavenia ${app_name}u.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Povoliť</string>
     <string name="settings_troubleshoot_test_play_services_title">Kontrola aplikácii Služby Google Play</string>
-    <string name="settings_troubleshoot_test_play_services_success">Aplikácia Služby Google Playje k dispozícii a aktualizovaná.</string>
+    <string name="settings_troubleshoot_test_play_services_success">Aplikácia Služby Google Play je k dispozícii a aktualizovaná.</string>
     <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} používa aplikáciu Služby Google Play na doručovanie oznámení. No zdá sa, že táto nie je správne nakonfigurovaná:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Opraviť Služby Play</string>
@@ -1095,17 +1095,17 @@
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Deaktivovať obmedzenia</string>
     <string name="settings_troubleshoot_test_battery_title">Optimalizácia batérie</string>
     <string name="template_settings_troubleshoot_test_battery_success">Chod ${app_name} nie je ovplyvnený nastavením optimalizácie batérie.</string>
-    <string name="settings_troubleshoot_test_battery_failed">Ak používateľ na nejaký čas ponechá zariadenie s vypnutou obrazovkou odložené odpojené od napájania, na zariadení sa použije režim Doze. Toto aplikáciám zabráni pristupovať k sieti, pozastaví ich naplánované úlohy, synchronizáciu aj bežné signály.</string>
+    <string name="settings_troubleshoot_test_battery_failed">Ak používateľ nechá zariadenie na určitý čas odpojené od siete a nehybné s vypnutou obrazovkou, zariadenie prejde do režimu Doze. Tým sa aplikáciám zabráni v prístupe k sieti a oddialia sa ich úlohy, synchronizácia a štandardné alarmy.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorovať optimalizáciu</string>
     <string name="settings_inline_url_preview_summary">Zobraziť náhľady odkazov v konverzáciách (ak sú podporované domovským serverom).</string>
-    <string name="settings_send_typing_notifs">Odosielať oznámenie keď píšete</string>
+    <string name="settings_send_typing_notifs">Odosielať oznámenia pri písaní</string>
     <string name="settings_send_typing_notifs_summary">Umožniť ostatným používateľom vidieť, kedy píšete.</string>
     <string name="settings_send_markdown">Formátovanie pomocou Markdown</string>
-    <string name="settings_send_markdown_summary">Formátovať správy použitím jazyka markdown. Umožňuje pokročilé formátovanie ako napríklad kurzívu hviezdičkami.</string>
+    <string name="settings_send_markdown_summary">Formátovať správy pomocou syntaxe markdown pred ich odoslaním. To umožňuje pokročilé formátovanie, napríklad použitie hviezdičiek na zobrazenie textu kurzívou.</string>
     <string name="settings_show_read_receipts">Zobrazovať potvrdenia o prečítaní</string>
     <string name="settings_show_read_receipts_summary">Klepnutím na potvrdenie o prečítaní zobrazíte podrobný zoznam.</string>
-    <string name="settings_show_join_leave_messages">Zobrazovať vstup do a opustenie miestnosti</string>
-    <string name="settings_show_join_leave_messages_summary">Nemá vplyv na pozvania, vykázania a zákazy vstupu.</string>
+    <string name="settings_show_join_leave_messages">Zobraziť udalosti vstupu a odchodu</string>
+    <string name="settings_show_join_leave_messages_summary">Pozvania, odstránenia a zákazy nie sú ovplyvnené.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Zobrazovať udalosti účtu</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Zahŕňa zmeny zobrazovaného mena a obrázka v profile.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Pripojenie na pozadí</string>
@@ -1148,7 +1148,7 @@
     <string name="settings_notification_advanced">Pokročilé nastavenia oznámení</string>
     <string name="settings_notification_by_event">Dôležitosť oznámení pre udalosti</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Vlastné nastavenia.</string>
-    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Pozor, Pre typi udalostí, ktoré majú dôležitosť nastavenú na Tiché, sa zobrazí oznámenie bez zvukového upozornenia.</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Všimnite si, že niektoré typy správ sú nastavené ako tiché ( vyvolajú oznámenie bez zvuku).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Niektoré oznámenia máte zakázané v rozšírených nastaveniach.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Nepodarilo sa načítať pravidlá oznámení. Prosím, skúste znovu.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Skontrolovať nastavenia</string>
@@ -1165,11 +1165,11 @@
     <string name="settings_silent_notifications_preferences">Nastaviť tiché oznámenia</string>
     <string name="settings_system_preferences_summary">Vybrať farbu upozornení LED, vibrácie, zvuky…</string>
     <string name="settings_cryptography_manage_keys">Správa šifrovacích kľúčov</string>
-    <string name="settings_send_message_with_enter">Odosielať správy enterom</string>
-    <string name="settings_send_message_with_enter_summary">Stlačením klávesu enter na dotykovej klávesnici odošlete správu namiesto odriadkovania</string>
+    <string name="settings_send_message_with_enter">Odoslanie správy pomocou enter</string>
+    <string name="settings_send_message_with_enter_summary">Tlačidlo Enter na softvérovej klávesnici odošle správu namiesto pridania zalomenia riadku</string>
     <string name="settings_data_save_mode_summary">Režim šetrenia údajov aplikuje filter, ktorý potlačí aktualizácie prítomnosti a oznámenia pri písaní.</string>
     <string name="settings_change_password_submit">Aktualizovať heslo</string>
-    <string name="settings_fail_to_update_password_invalid_current_password">Heslo nie je správne</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">Heslo nie je platné</string>
     <string name="passwords_do_not_match">Heslá sa nezhodujú</string>
     <string name="settings_media">Médiá</string>
     <string name="settings_default_compression">Predvolená kompresia</string>
@@ -1201,10 +1201,10 @@
     <string name="none">Žiadny</string>
     <string name="action_revoke">Zrušiť</string>
     <string name="action_disconnect">Odpojiť sa</string>
-    <string name="action_review">Náhlad</string>
+    <string name="action_review">Skontrolovať</string>
     <string name="action_decline">Odmietnuť</string>
     <string name="people_no_identity_server">Nebol nakonfigurovaný server totožnosti.</string>
-    <string name="call_failed_no_ice_title">Hovor zlyhal kvôli zle nakonfigurovanému serveru</string>
+    <string name="call_failed_no_ice_title">Hovor zlyhal z dôvodu nesprávne nastaveného servera</string>
     <string name="call_failed_no_ice_description">Prosím, požiadajte administrátora vášho domovského serveru (%1$s) o konfiguráciu TURN serveru, aby hovory fungovali spoľahlivo. 
 \n 
 \nPrípadne môžete skúsiť použiť verejný server %2$s, ale nebude tak spoľahlivý a bude zdieľať vašu IP adresu s daným serverom. Môžete si to taktiež upraviť v Nastaveniach.</string>
@@ -1283,14 +1283,14 @@
     <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} sa bude synchronizovať na pozadí s cieľom ušetriť limitované zdroje (batériu).
 \nV závislosti od kapacity prostriedkov zariadenia môže byť synchronizácia odložená operačným systémom na neskôr.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimalizovaný na používanie v reálnom čase</string>
-    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} sa bude pravideľne synchronizovať na pozadí v presne stanovenom čase (nastaviteľné).
-\nToto ovplyvní využívanie batérie a prenos údajov, v oznamovacej oblasti sa bude neustále zobrazovať upozornenie, že ${app_name} spracúva udalosti.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} sa bude pravidelne synchronizovať na pozadí v presne stanovenom čase (nastaviteľné).
+\nBude to mať vplyv na používanie rádia a batérie, bude sa zobrazovať trvalé oznámenie, že ${app_name} počúva udalosti.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Žiadna synchronizácia na pozadí</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Nebudete dostávať oznámenia o prichádzajúcich správach, keď aplikácia pracuje na pozadí.</string>
     <string name="settings_background_sync_update_error">Nepodarilo sa aktualizovať nastavenia.</string>
     <string name="settings_set_workmanager_delay">Uprednostňovaný interval synchronizácie</string>
     <string name="settings_set_workmanager_delay_summary">%s
-\nSynchronizácia môže byť odložená vzávislosti od kapacity zariadenia (batéria a režim spánku).</string>
+\nSynchronizácia môže byť odložená v závislosti od zdrojov (batéria) alebo stavu zariadenia (režim spánok).</string>
     <string name="settings_integrations">Integrácie</string>
     <string name="settings_integrations_summary">Použite správcu integrácií na nastavenie botov, premostení, widgetov a balíčkov s nálepkami.
 \nSprávcovia integrácie dostávajú konfiguračné údaje a môžu vo vašom mene upravovať widgety, posielať pozvánky do miestnosti a nastavovať úrovne oprávnení.</string>
@@ -1299,15 +1299,15 @@
     <string name="settings_secure_backup_setup">Nastaviť bezpečné zálohovanie</string>
     <string name="settings_secure_backup_reset">Znovu nastaviť bezpečné zálohovanie</string>
     <string name="settings_secure_backup_enter_to_setup">Nastaviť na tomto zariadení</string>
-    <string name="settings_secure_backup_section_info">Zabezpečte sa pred stratou šifrovaných správ a údajov zálohovaním šifrovacích kľúčov na domovskom servery.</string>
-    <string name="reset_secure_backup_title">Vygenerovať nový kľúč zabezpečenia alebo opätovne nastaviť dlhé heslo pre existujúce zálohovanie.</string>
-    <string name="reset_secure_backup_warning">Týmto nahradíte váš aktuálny kľúč alebo dlhé heslo.</string>
-    <string name="settings_discovery_category">Zisťovanie</string>
-    <string name="settings_discovery_manage">Spravovať nastavenia zisťovania.</string>
+    <string name="settings_secure_backup_section_info">Zabezpečte sa pred stratou šifrovaných správ a údajov zálohovaním šifrovacích kľúčov na vašom serveri.</string>
+    <string name="reset_secure_backup_title">Vygenerujte nový bezpečnostný kľúč alebo nastavte novú bezpečnostnú frázu pre existujúcu zálohu.</string>
+    <string name="reset_secure_backup_warning">Toto nahradí váš aktuálny kľúč alebo frázu.</string>
+    <string name="settings_discovery_category">Objavovanie</string>
+    <string name="settings_discovery_manage">Spravovať nastavenia objavovania.</string>
     <string name="settings_integration_allow">Povoliť integrácie</string>
     <string name="settings_integration_manager">Správca integrácií</string>
     <string name="disabled_integration_dialog_title">Integrácie sú zakázané</string>
-    <string name="disabled_integration_dialog_content">Na vykonanie tejto akcie zaškrtnite \'Povoliť integrácie\' v nastaveniach zisťovania.</string>
+    <string name="disabled_integration_dialog_content">Ak to chcete urobiť, zapnite \"Povoliť integrácie\" v nastaveniach.</string>
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">Zakázať vstupovať %d používateľ</item>
         <item quantity="few">Zakázať vstupovať %d používatelia</item>
@@ -1315,11 +1315,11 @@
     </plurals>
     <string name="encryption_information_device_name_with_warning">Verejný názov (viditeľný pre ľudí, s ktorými komunikujete)</string>
     <string name="device_name_warning">Verejný názov relácie je viditeľný všetkým používateľom, s ktorými komunikujete</string>
-    <string name="encryption_exported_successfully">Kľúče exportované úspešne</string>
+    <string name="encryption_exported_successfully">Kľúče boli úspešne exportované</string>
     <plurals name="encryption_import_room_keys_success">
-        <item quantity="one">%1$d z %2$d kľúč úspešne importovaný.</item>
-        <item quantity="few">%1$d z %2$d kľúčov úspešne importovaných.</item>
-        <item quantity="other">%1$d z %2$d kľúčov úspešne importovaných.</item>
+        <item quantity="one">%1$d z %2$d kľúč bol úspešne importovaný.</item>
+        <item quantity="few">%1$d z %2$d kľúče boli úspešne importované.</item>
+        <item quantity="other">%1$d z %2$d kľúčov bolo úspešne importovaných.</item>
     </plurals>
     <string name="encryption_information_unknown_ip">neznáma ip</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
@@ -1352,7 +1352,7 @@
     <string name="integration_manager_not_configured">Nie je nastavený žiadny správca integrácií.</string>
     <string name="room_manage_integrations">Spravovať integrácie</string>
     <string name="room_no_active_widgets">Žiadne aktívne widgety</string>
-    <string name="widget_integration_review_terms">Skôr než budete pokračovať, mali by ste prijať podmienky poskytovania tejto služby.</string>
+    <string name="widget_integration_review_terms">Ak chcete pokračovať, musíte prijať podmienky tejto služby.</string>
     <string name="you_added_a_new_device_with_info">Nová relácia žiada o šifrovacie kľúče.
 \nNázov relácie: %1$s
 \nPosledné prihlásenie: %2$s
@@ -1365,29 +1365,29 @@
     <string name="share_without_verifying_short_label">Zdieľať</string>
     <string name="key_share_request">Žiadosť o zdieľanie kľúčov</string>
     <string name="ignore_request_short_label">Ignorovať</string>
-    <string name="passphrase_empty_error_message">Prosím, zadajte dlhé heslo</string>
-    <string name="passphrase_passphrase_too_weak">Dlhé heslo je príliš slabé</string>
-    <string name="template_keys_backup_passphrase_not_empty_error_message">Prosím, zmažte dlhé heslo, ak si želáte vygenerovať kľúč obnovenia.</string>
-    <string name="keys_backup_no_session_error">Nie je dostupná žiadna relácia matrix</string>
+    <string name="passphrase_empty_error_message">Zadajte prosím prístupovú frázu</string>
+    <string name="passphrase_passphrase_too_weak">Prístupová fráza je príliš slabá</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Ak chcete, aby ${app_name} vygeneroval kľúč na obnovenie, odstráňte prístupovú frázu.</string>
+    <string name="keys_backup_no_session_error">Nie je dostupná žiadna relácia Matrix</string>
     <string name="keys_backup_setup_step1_title">Nikdy nepríďte o šifrované správy</string>
-    <string name="keys_backup_setup_step1_description">Správy v šifrovaných miestnostiach sú zabezpečené E2E šifrov. Ku kľúčom potrebných na ich čítanie máte prístup len vy a ich adresáti.
+    <string name="keys_backup_setup_step1_description">Správy v šifrovaných miestnostiach sú zabezpečené end-to-end šifrovaním. Kľúče na čítanie týchto správ máte len vy a príjemca (príjemcovia).
 \n
-\nBezpečne si zálohujte šifrovacie kľúče, aby ste o tieto správy neprišli.</string>
+\nKľúče si bezpečne zálohujte, aby ste ich nestratili.</string>
     <string name="keys_backup_setup">Začať používať zálohovanie kľúčov</string>
     <string name="keys_backup_setup_step1_advanced">(Pokročilé)</string>
     <string name="keys_backup_setup_step1_manual_export">Exportovať kľúče ručne</string>
-    <string name="keys_backup_setup_step2_text_title">Zabezpečte si zálohu dlhým heslom.</string>
-    <string name="keys_backup_setup_step2_text_description">Zašifrovaná kópia vašich kľúčov bude uložená na domovskom servery. Ochránte si túto zálohu dlhým heslom pre zachovanie maximálnej bezpečnosti.
+    <string name="keys_backup_setup_step2_text_title">Zabezpečte vašu zálohu pomocou prístupovej frázy.</string>
+    <string name="keys_backup_setup_step2_text_description">Šifrovanú kópiu vašich kľúčov uložíme na váš domovský server. Zálohu chráňte prístupovou frázou, aby bola bezpečná.
 \n
-\nPozor! Dlhé heslo by sa nemalo zhodovať s heslom k vášmu matrix účtu.</string>
-    <string name="keys_backup_setup_step2_button_title">Nastaviť dlhé heslo</string>
+\nV záujme maximálneho zabezpečenia by sa mala líšiť od hesla vášho účtu.</string>
+    <string name="keys_backup_setup_step2_button_title">Nastaviť prístupovú frázu</string>
     <string name="keys_backup_setup_creating_backup">Vytváranie zálohy</string>
     <string name="keys_backup_setup_step1_recovery_key_alternative">Alebo, Zabezpečte si zálohu kľúčom obnovenia, ktorý si niekde naozaj bezpečne uložíte.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Pre pokročilých) Nastaviť kľúč obnovenia</string>
     <string name="keys_backup_setup_step3_success_title">Úspešne nastavené!</string>
     <string name="keys_backup_setup_step3_text_line1">Vaše kľúče sú zálohované.</string>
-    <string name="keys_backup_setup_step3_text_line2">Váš kľúč obnovenia je ako ochranná sieť - Môžete ho použiť na obnovenie prístupu k vašim zašifrovaným správam aj keď zabudnete dlhé heslo.
-\nKľúč obnovenia si uchovajte na veľmi bezpečnom mieste napr. v správcovi hesiel (alebo v trezore)</string>
+    <string name="keys_backup_setup_step3_text_line2">Kľúč na obnovenie je bezpečnostná sieť - môžete ho použiť na obnovenie prístupu k zašifrovaným správam, ak zabudnete svoju prístupovú frázu.
+\nKľúč na obnovenie uchovávajte na veľmi bezpečnom mieste, napríklad v správcovi hesiel (alebo v trezore)</string>
     <string name="keys_backup_setup_step3_text_line2_no_passphrase">Kľúč obnovenia si uchovajte na veľmi bezpečnom mieste napr. v správcovi hesiel (alebo v trezore)</string>
     <string name="keys_backup_setup_step3_button_title">Hotovo</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">Urobil(a) som si kópiu</string>
@@ -1404,22 +1404,22 @@
     <string name="keys_backup_setup_override_stop">Zastaviť</string>
     <string name="keys_backup_setup_step3_please_make_copy">Prosím, urobte si kópiu</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Zdieľať kľúč obnovenia…</string>
-    <string name="keys_backup_setup_step3_generating_key_status">Generovanie kľúča obnovenia podľa dlhého hesla, môže to trvať niekoľko sekúnd.</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Generuje sa kľúč na obnovenie pomocou prístupovej frázy, tento proces môže trvať niekoľko sekúnd.</string>
     <string name="recovery_key">Kľúč obnovenia</string>
     <string name="unexpected_error">Neočakávaná chyba</string>
     <string name="keys_backup_setup_backup_started_title">Zálohovanie spustené</string>
-    <string name="keys_backup_setup_backup_started_message">Vaše šifrovacie kľúče sú na pozadí zálohované na domovskom servery. Úvodné zálohovanie môže trvať niekoľko minút.</string>
+    <string name="keys_backup_setup_backup_started_message">Vaše šifrovacie kľúče sa teraz zálohujú na pozadí na váš domovský server. Počiatočné zálohovanie môže trvať niekoľko minút.</string>
     <string name="keys_backup_setup_skip_title">Ste si istí\?</string>
     <string name="keys_backup_setup_skip_msg">Môžete prísť o šifrované správy, ak sa odhlásite, odinštalujete aplikáciu, alebo stratíte toto zariadenie.</string>
     <string name="keys_backup_restore_is_getting_backup_version">Získavanie verzie zálohy…</string>
-    <string name="keys_backup_restore_with_passphrase">Použiť dlhé heslo obnovenia a získať tak prístup k histórii šifrovaných správ</string>
+    <string name="keys_backup_restore_with_passphrase">Na odomknutie histórie zašifrovaných správ použite svoju prístupovú frázu pre obnovenie</string>
     <string name="keys_backup_restore_use_recovery_key">Použiť kľúč obnovenia</string>
-    <string name="keys_backup_restore_with_passphrase_helper_with_link">Neviete svoje dlhé heslo obnovenia, môžete %s.</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Nepoznáte svoju prístupovú frázu pre obnovenie, môžete %s.</string>
     <string name="keys_backup_restore_with_recovery_key">Použiť kľúč obnovenia a získať tak prístup k histórii šifrovaných správ</string>
     <string name="keys_backup_restore_key_enter_hint">Vložte kľúč obnovenia</string>
     <string name="keys_backup_restore_setup_recovery_key">Obnovenie správ</string>
     <string name="keys_backup_restore_with_key_helper">Stratili ste kľúč obnovenia, v nastaveniach získate nový.</string>
-    <string name="keys_backup_passphrase_error_decrypt">Zálohu nie je možné dešifrovať týmto dlhým heslom: prosím uistite sa, že ste zadali správne dlhé heslo obnovenia.</string>
+    <string name="keys_backup_passphrase_error_decrypt">Zálohu sa nepodarilo dešifrovať pomocou tejto prístupovej frázy: overte, či ste zadali správnu prístupovú frázu pre obnovenie.</string>
     <string name="network_error_please_check_and_retry">Chyba siete: Prosím skontrolujte vaše pripojenie a skúste znovu.</string>
     <string name="keys_backup_restoring_waiting_message">Obnova zo zálohy:</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Výpočet kľúča obnovenia…</string>
@@ -1447,22 +1447,22 @@
     <string name="keys_backup_settings_status_ko">Zálohovanie kľúčov nie je aktívne v tejto relácii.</string>
     <string name="keys_backup_settings_status_not_setup">Kľúče z tejto relácie nie sú zálohované.</string>
     <string name="keys_backup_settings_signature_from_unknown_device">Záloha je podpísaná kľúčom z neznámej relácie, ID %s.</string>
-    <string name="keys_backup_settings_valid_signature_from_this_device">Záloha je podpísana platným kľúčom z tejto relácie.</string>
-    <string name="keys_backup_settings_valid_signature_from_verified_device">Záloha je podpísana platným kľúčom z overenej relácie %s.</string>
-    <string name="keys_backup_settings_valid_signature_from_unverified_device">Záloha je podpísana platným kľúčom z neoverenej relácie %s</string>
-    <string name="keys_backup_settings_invalid_signature_from_verified_device">Záloha je podpísana neplatným kľúčom z overenej relácie %s</string>
-    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Záloha je podpísana neplatným kľúčom z neoverenej relácie %s</string>
-    <string name="keys_backup_get_trust_error">Nepodarilo sa zistiť stav dôverihodnosti zálohy (%s).</string>
-    <string name="keys_backup_settings_untrusted_backup">Ak chcete v tejto relácii používať zálohovanie kľúčov, zadajte teraz dlhé heslo alebo kľúč obnovenia.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Záloha má platný podpis z tejto relácie.</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Záloha má platný podpis z overenej relácie %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Záloha má platný podpis z neoverenej relácie %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Záloha má neplatný podpis z overenej relácie %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Záloha má neplatný podpis z neoverenej relácie %s</string>
+    <string name="keys_backup_get_trust_error">Nepodarilo sa získať informácie o dôveryhodnosti pre zálohu (%s).</string>
+    <string name="keys_backup_settings_untrusted_backup">Ak chcete použiť zálohovanie kľúčov v tejto relácii, obnovte ju teraz pomocou svojej prístupovej frázy alebo pomocou kľúča na obnovenie.</string>
     <string name="keys_backup_settings_deleting_backup">Mazanie zálohy…</string>
     <string name="keys_backup_settings_delete_backup_error">Nepodarilo sa vymazať zálohu (%s)</string>
     <string name="keys_backup_settings_checking_backup_state">Zisťovanie stavu zálohovania</string>
     <string name="keys_backup_settings_delete_confirm_title">Vymazať zálohu</string>
-    <string name="keys_backup_settings_delete_confirm_message">Vymazať zálohované šifrovacie kľúče z domovského servera\? Nebudete môcť viac čítať históriu šifrovaných správ zadaním kľúča obnovenia.</string>
+    <string name="keys_backup_settings_delete_confirm_message">Vymazať vaše zálohované šifrovacie kľúče z domovského servera\? Na čítanie histórie zašifrovaných správ už nebudete môcť použiť kľúč na obnovenie.</string>
     <string name="new_recovery_method_popup_title">Nová záloha kľúčov</string>
-    <string name="new_recovery_method_popup_description">Bola zistená nová bezpečná záloha šifrovacích kľúčov.
+    <string name="new_recovery_method_popup_description">Bola zistená nová záloha kľúča zabezpečenej správy.
 \n
-\nAk ste si nenastavili nový spôsob obnovenia kľúčov, útočník sa môže pokúšať pristupovať k vášmu účtu. V nastaveniach si prosím hneď zmente prihlasovacie heslo účtu a nastavte zálohovanie kľúčov.</string>
+\nAk ste nenastavili nový spôsob obnovy, útočník sa môže pokúsiť získať prístup k vášmu účtu. Okamžite zmeňte vaše heslo k účtu a nastavte novú metódu obnovy v Nastaveniach.</string>
     <string name="new_recovery_method_popup_was_me">Bol(a) som to ja</string>
     <string name="keys_backup_banner_setup_line1">Nikdy neprídete o šifrované správy</string>
     <string name="keys_backup_banner_setup_line2">Začnite používať zálohovanie kľúčov</string>
@@ -1493,7 +1493,7 @@
     <string name="sas_security_advise">Z dôvodu dodržania maximálnej bezpečnosti odporúčame, aby ste toto urobili osobne alebo použili iný dôveryhodný komunikačný kanál.</string>
     <string name="sas_verify_start_button_title">Spustiť overenie</string>
     <string name="sas_incoming_request_title">Prichádzajúca žiadosť o overenie</string>
-    <string name="sas_incoming_request_description">Overte túto reláciu, aby ste ju mohli označiť za dôveryhodnú. Dôverovanie reláciám vašich komunikačných partnerov vám pridáva pokoj na duši pri používaní E2E šifrovaných správ.</string>
+    <string name="sas_incoming_request_description">Overte túto reláciu a označte ju ako dôveryhodnú. Dôveryhodnosť relácií partnerov vám poskytuje pokoj na duši pri používaní end-to-end šifrovaných správ.</string>
     <string name="sas_incoming_request_description_2">Overením tejto relácie si ju označíte ako dôveryhodnú a tiež označíte vašu reláciu ako dôveryhodnú pre protistranu.</string>
     <string name="sas_emoji_description">Overte túto reláciu potvrdením, že na obrazovke protistrany sa zobrazia nasledujúce emoji</string>
     <string name="sas_decimal_description">Overte túto reláciu potvrdením, že na obrazovke protistrany sa zobrazia nasledujúce čísla</string>
@@ -1502,10 +1502,10 @@
     <string name="sas_waiting_for_partner">Čakanie na potvrdenie protistrany…</string>
     <string name="sas_verified">Overené!</string>
     <string name="sas_verified_successful">Úspešne ste overili túto reláciu.</string>
-    <string name="sas_verified_successful_description">Šifrované správy s týmto používateľom sú zabezpečené E2E šifrou a nik okrem vás ich nemôže čítať.</string>
+    <string name="sas_verified_successful_description">Zabezpečené správy s týmto používateľom sú end-to-end šifrované a tretie strany ich nemôžu čítať.</string>
     <string name="sas_got_it">Rozumiem</string>
     <string name="sas_verifying_keys">Nič sa neobjavuje\? Ešte nie všetci klienti podporujú interaktívne overenie. Použite pôvodný spôsob overenia.</string>
-    <string name="sas_legacy_verification_button_title">Použiť pôvodný spôsob overenia.</string>
+    <string name="sas_legacy_verification_button_title">Použiť starší spôsob overenia.</string>
     <string name="sas_verification_request_notification_channel_title">Overenie kľúčov</string>
     <string name="sas_cancelled_dialog_title">Žiadosť zrušená</string>
     <string name="sas_cancelled_by_other">Protistrana prerušila overenie.
@@ -1578,7 +1578,7 @@
 \n%s</string>
     <string name="keys_backup_unable_to_get_trust_info">Pri získavaní stavu dôveryhodnosti nastala chyba</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Pri získavaní údajov o zálohe kľúčov nastala chyba</string>
-    <string name="import_e2e_keys_from_file">Importovať E2E kľúče zo súboru \"%1$s\".</string>
+    <string name="import_e2e_keys_from_file">Importovať šifrovacie kľúče zo súboru \"%1$s\".</string>
     <string name="settings_sdk_version">Verzia Matrix SDK</string>
     <string name="settings_other_third_party_notices">Ďalšie poznámky tretích strán</string>
     <string name="navigate_to_room_when_already_in_the_room">Už máte túto miestnosť zobrazenú!</string>
@@ -1596,8 +1596,8 @@
     <string name="push_gateway_item_device_name">Názov relácie:</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">Pomoc a o aplikácii</string>
+    <string name="preference_voice_and_video">Zvuk a video</string>
+    <string name="preference_root_help_about">Pomoc a O aplikácii</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Zaregistrovať token</string>
     <string name="send_suggestion">Poslať návrh</string>
     <string name="send_suggestion_content">Nižšie napíšte obsah návrhu.</string>
@@ -1621,21 +1621,21 @@
     <string name="room_filtering_footer_create_new_room">Vytvoriť novú miestnosť</string>
     <string name="room_filtering_footer_create_new_direct_message">Poslať priamu správu</string>
     <string name="room_filtering_footer_open_room_directory">Zobraziť adresár miestností</string>
-    <string name="room_directory_search_hint">Názov alebo ID (#priklad:matrix.org)</string>
-    <string name="labs_swipe_to_reply_in_timeline">Povoliť odpovedať švihnutím na časovej osy</string>
+    <string name="room_directory_search_hint">Názov alebo ID (#napriklad:matrix.org)</string>
+    <string name="labs_swipe_to_reply_in_timeline">Povoliť posunutím odpovedať na časovej osi</string>
     <string name="labs_show_unread_notifications_as_tab">Zobrazovať záložku oznámenia na hlavnej obrazovke.</string>
     <string name="link_copied_to_clipboard">Odkaz skopírovaný do schránky</string>
-    <string name="add_by_matrix_id">Pridať matrix ID</string>
+    <string name="add_by_matrix_id">Pridať pomocou Matrix ID</string>
     <string name="creating_direct_room">Vytváranie miestnosti…</string>
-    <string name="direct_room_no_known_users">Nenájdený žiadny výsledok, ak chcete hľadať na servery, klepnite na pridať Matrix ID.</string>
-    <string name="direct_room_start_search">Výsledky uvidíte hneď, čo začnete písať</string>
-    <string name="direct_room_filter_hint">Filtrovať zadaním používateľskeho mena alebo ID…</string>
+    <string name="direct_room_no_known_users">Nenašiel sa žiadny výsledok, na vyhľadávanie na serveri použite Pridať pomocou Matrix ID.</string>
+    <string name="direct_room_start_search">Začnite písať a uvidíte výsledky hneď</string>
+    <string name="direct_room_filter_hint">Filtrovať pomocou používateľského mena alebo ID…</string>
     <string name="joining_room">Vstupovanie do miestnosti…</string>
     <string name="message_view_edit_history">Zobraziť históriu úprav</string>
     <string name="terms_of_service">Podmienky poskytovania služby</string>
     <string name="review_terms">Prečítať podmienky</string>
     <string name="terms_description_for_identity_server">Umožnite ostatným vás nájsť</string>
-    <string name="terms_description_for_integration_manager">Používajte botov, mosty, widgety a balíčky s nálepkami</string>
+    <string name="terms_description_for_integration_manager">Použiť boty, premostenia, widgety a balíčky s nálepkami</string>
     <string name="read_at">Prečítajte si na adrese</string>
     <string name="identity_server">Server totožností</string>
     <string name="disconnect_identity_server">Odpojiť server totožností</string>
@@ -1644,18 +1644,18 @@
     <string name="settings_discovery_identity_server_info">Používate server totožností %1$s, aby vás ľudia, ktorých poznáte mohli nájsť a aby ste vy mohli vyhľadávať kontakty.</string>
     <string name="settings_discovery_identity_server_info_none">Momentálne nepoužívate server totožností. Nižšie si ho môžete nastaviť, ak chcete vašim známym umožniť, aby vás mohli nájsť a ak aj vy chcete vyhľadávať kontakty.</string>
     <string name="settings_discovery_emails_title">Emailové adresy, podľa ktorých je vás možné nájsť</string>
-    <string name="settings_discovery_no_mails">Možnosti zisťovania sa zobrazia, až keď pridáte emailovú adresu.</string>
-    <string name="settings_discovery_no_msisdn">Možnosti zisťovania sa zobrazia, až keď pridáte telefónne číslo.</string>
+    <string name="settings_discovery_no_mails">Možnosti objavovania sa zobrazia, až keď pridáte emailovú adresu.</string>
+    <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">Poslali sme vám potvrdzujúcu správu na adresu %s, skontrolujte si email a overte vašu emailovú adresu klepnutím na odkaz, ktorý obsahuje</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Na adresu %s sme vám odoslali potvrdzujúcu správu, aby ste mohli pokračovať, skontrolujte si email a klepnite na odkaz, ktorý sme vám poslali</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_mail_pending">Očakáva sa</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>
-    <string name="settings_discovery_no_terms_title">Server totožností nezverejnil podmienky poskytovania služieb</string>
-    <string name="settings_discovery_no_terms">Vami vybratý server totožností nezverejňuje podmienky používania služieb. Pokračujte len v prípade, že dôverujete vlastníkovi servera</string>
+    <string name="settings_discovery_no_terms_title">Server totožností nemá podmienky poskytovania služieb</string>
+    <string name="settings_discovery_no_terms">Vami vybratý server totožností nemá žiadne podmienky používania služieb. Pokračujte len v prípade, že dôverujete vlastníkovi servera</string>
     <string name="settings_text_message_sent">Na číslo %s bola odoslaná textová správa. Prosím zadajte overovací kód, ktorý obsahuje.</string>
     <string name="settings_text_message_sent_wrong_code">Overovací kód nie je správny.</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Emailové adresy a telefónne čísla zdieľate cez server totožností %1$s. Ak chcete toto zdieľanie zastaviť, mali by ste sa znovu pripojiť k serveru %2$s.</string>
@@ -1835,7 +1835,7 @@
     <string name="room_alias_action_publish">Zverejniť túto adresu</string>
     <string name="room_alias_published_other">Ďalšie zverejnené adresy:</string>
     <string name="cannot_dm_self">Nemôžete napísať priamu správu sebe!</string>
-    <string name="add_a_topic_link_text">Pridať tému</string>
+    <string name="add_a_topic_link_text">Pridajte tému</string>
     <string name="attachment_viewer_item_x_of_y">%1$d z %2$d</string>
     <string name="no_more_results">Žiadne ďalšie výsledky</string>
     <string name="create_room_topic_section">Téma miestnosti (voliteľné)</string>
@@ -2083,7 +2083,7 @@
     <string name="login_wait_for_email_title">Skontrolujte prosím svoj e-mail</string>
     <string name="poll_end_room_list_preview">Anketa skončila</string>
     <string name="invite_by_username">Pozvať podľa používateľského mena</string>
-    <string name="ftue_auth_carousel_1_title">Vlastnite svoje konverzácie.</string>
+    <string name="ftue_auth_carousel_secure_title">Vlastnite svoje konverzácie.</string>
     <string name="login_splash_already_have_account">Už mám účet</string>
     <string name="tooltip_attachment_file">Nahrať súbor</string>
     <string name="video_call_with_participant">Videohovor s %s</string>
@@ -2104,12 +2104,12 @@
     <string name="send_bug_report_include_key_share_history">Odoslať históriu žiadostí o šifrovacie kľúče</string>
     <string name="settings_room_directory_show_all_rooms_summary">V adresári zobrazí všetky miestnosti, aj tie s explicitným obsahom.</string>
     <string name="settings_room_directory_show_all_rooms">Zobrazovať miestnosti s explicitným obsahom</string>
-    <string name="action_return">Vrátiť</string>
+    <string name="action_return">Späť</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Nemáte oprávnenie na začatie hovoru</string>
     <string name="no_permissions_to_start_webrtc_call">Nemáte oprávnenie na začatie hovoru v tejto miestnosti</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Nemáte oprávnenie na začatie konferenčného hovoru</string>
     <string name="missing_permissions_title">Chýbajúce oprávnenia</string>
-    <string name="denied_permission_voice_message">Abyste mohli posielať hlasové správy, udeľte prosím oprávnenie používať mikrofón.</string>
+    <string name="denied_permission_voice_message">Aby ste mohli posielať hlasové správy, udeľte prosím oprávnenie používať mikrofón.</string>
     <string name="denied_permission_camera">Na vykonanie tejto akcie, prosím udeľte oprávnenie na používanie fotoaparátu cez systémové nastavenia.</string>
     <string name="denied_permission_generic">Chýbajú niektoré oprávnenia potrebné na vykonanie tejto akcie, prosím udeľte ich cez systémové nastavenia.</string>
     <string name="notification_listening_for_notifications">Čakanie na upozornenia</string>
@@ -2159,7 +2159,7 @@
     <string name="notice_widget_jitsi_removed">%1$s ukončil(a) video konferenciu</string>
     <string name="notice_widget_jitsi_added_by_you">Začali ste video konferenciu</string>
     <string name="notice_widget_jitsi_added">%1$s začal(a) video konferenciu</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Odmietli ste pozvanie pre %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Odvolali ste pozvanie pre %1$s</string>
     <string name="notice_direct_room_third_party_revoked_invite">%1$s odmietol pozvanie pre %2$s</string>
     <string name="notice_direct_room_third_party_invite_by_you">Pozvali ste %1$s</string>
     <string name="notice_direct_room_third_party_invite">%1$s pozval(a) %2$s</string>
@@ -2177,7 +2177,7 @@
     <string name="notice_room_server_acl_set_allowed">• Servery, ktorých názov sa zhoduje s %s sú povolené.</string>
     <string name="notice_room_server_acl_set_banned">• Servery, ktorých názov sa zhoduje s %s sú zakázané.</string>
     <string name="power_level_edit_title">Nastaviť rolu</string>
-    <string name="recovery_passphrase">Fráza pre obnovenie</string>
+    <string name="recovery_passphrase">Prístupová fráza pre obnovenie</string>
     <string name="settings_category_composer">Editor správ</string>
     <string name="verification_scan_emoji_title">Nedá sa skenovať</string>
     <string name="devices_other_devices">Iné relácie</string>
@@ -2189,8 +2189,8 @@
     <string name="invite_by_username_or_mail">Pozvať pomocou používateľského mena alebo e-mailu</string>
     <string name="labs_enable_latex_maths">Povoliť matematiku LaTeX</string>
     <string name="restart_the_application_to_apply_changes">Reštartujte aplikáciu, aby sa zmena prejavila.</string>
-    <string name="ftue_auth_carousel_2_title">Vy máte všetko pod kontrolou.</string>
-    <string name="ftue_auth_carousel_3_title">Bezpečné zasielanie správ.</string>
+    <string name="ftue_auth_carousel_control_title">Vy máte všetko pod kontrolou.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Bezpečné zasielanie správ.</string>
     <string name="labs_auto_report_uisi">Automatické hlásenie chýb dešifrovania.</string>
     <string name="labs_auto_report_uisi_desc">Váš systém bude automaticky odosielať záznamy, keď sa vyskytne chyba dešifrovania</string>
     <string name="tooltip_attachment_photo">Otvoriť kameru</string>
@@ -2198,10 +2198,10 @@
     <string name="tooltip_attachment_sticker">Odoslať nálepku</string>
     <string name="tooltip_attachment_contact">Otvoriť kontakty</string>
     <string name="tooltip_attachment_poll">Vytvoriť anketu</string>
-    <string name="ftue_auth_carousel_body_secure">Bezpečná a nezávislá komunikácia, ktorá vám poskytuje rovnakú úroveň súkromia ako rozhovor zoči-voči vo vašom vlastnom dome.</string>
-    <string name="ftue_auth_carousel_body_control">Vyberte si, kde budú vaše rozhovory uložené, a získajte tak kontrolu a nezávislosť. Pripojené cez Matrix.</string>
-    <string name="ftue_auth_carousel_body_encrypted">End-to-end šifrovanie a bez potreby telefónneho čísla. Žiadne reklamy ani zneužívanie údajov.</string>
-    <string name="ftue_auth_carousel_title_messaging">Zasielanie správ pre váš tím.</string>
+    <string name="ftue_auth_carousel_secure_body">Bezpečná a nezávislá komunikácia, ktorá vám poskytuje rovnakú úroveň súkromia ako rozhovor zoči-voči vo vašom vlastnom dome.</string>
+    <string name="ftue_auth_carousel_control_body">Vyberte si, kde budú vaše rozhovory uložené, a získajte tak kontrolu a nezávislosť. Pripojené cez Matrix.</string>
+    <string name="ftue_auth_carousel_encrypted_body">End-to-end šifrovanie a bez potreby telefónneho čísla. Žiadne reklamy ani zneužívanie údajov.</string>
+    <string name="ftue_auth_carousel_workplace_title">Zasielanie správ pre váš tím.</string>
     <string name="login_splash_create_account">Vytvoriť účet</string>
     <string name="encryption_has_been_misconfigured">Šifrovanie je nesprávne nastavené.</string>
     <string name="contact_admin_to_restore_encryption">Obráťte sa na správcu, aby obnovil platný stav šifrovania.</string>
@@ -2236,8 +2236,8 @@
     <string name="login_splash_text2">Udržujte konverzácie súkromné pomocou šifrovania</string>
     <string name="login_splash_text1">Komunikujte s ľuďmi priamo alebo v skupinách</string>
     <string name="login_splash_title">Je to vaša konverzácia. Vlastnite ju.</string>
-    <string name="room_join_rules_invite_by_you">Vytvorili ste miestnosť len pre pozvaných.</string>
-    <string name="room_join_rules_invite">%1$s vytvoril miestnosť len na pozvanie.</string>
+    <string name="room_join_rules_invite_by_you">Nastavili ste miestnosť len pre pozvaných.</string>
+    <string name="room_join_rules_invite">%1$s nastavil miestnosť len na pozvanie.</string>
     <string name="room_join_rules_public_by_you">Miestnosť ste zverejnili pre každého, kto pozná odkaz.</string>
     <string name="room_join_rules_public">%1$s zverejnil miestnosť pre každého, kto pozná odkaz.</string>
     <string name="help_long_click_on_room_for_more_options">Dlhým kliknutím na miestnosť zobrazíte ďalšie možnosti</string>
@@ -2278,4 +2278,846 @@
     <string name="call_ended_user_busy_title">Používateľ je obsadený</string>
     <string name="call_held_by_user">%s podržal hovor</string>
     <string name="audio_call_with_participant">Hlasový hovor s %s</string>
+    <string name="login_reset_password_mail_confirmation_title">Skontrolujte si doručenú poštu</string>
+    <string name="login_reset_password_notice">Na emailovú adresu vám odošleme overovaciu správu, aby bolo možné potvrdiť nastavenie vašeho nového hesla.</string>
+    <string name="login_login_with_email_error">Tento e-mail nie je prepojený so žiadnym účtom.</string>
+    <string name="login_registration_disabled">Je nám ľúto, ale tento server neprijíma nové účty.</string>
+    <string name="login_social_signin_with">Prihlásiť sa cez %s</string>
+    <string name="login_social_signup_with">Prihlásiť sa cez %s</string>
+    <string name="direct_room_join_rules_invite_by_you">Ste ju nastavili len na pozvanie.</string>
+    <string name="direct_room_join_rules_invite">%1$s ju nastavil/a len na pozvanie.</string>
+    <string name="rotate_and_crop_screen_title">Otočiť a orezať</string>
+    <string name="attachment_type_dialog_title">Pridať obrázok z</string>
+    <string name="error_file_too_big_simple">Súbor je príliš veľký na odoslanie.</string>
+    <string name="a11y_beta">Táto funkcia je vo fáze beta</string>
+    <string name="a11y_create_direct_message_by_mxid">Vytvorenie novej priamej konverzácie pomocou Matrix ID</string>
+    <string name="a11y_create_menu_close">Zatvoriť ponuku vytvorenia miestnosti…</string>
+    <string name="a11y_create_menu_open">Otvoriť ponuku vytvorenia miestnosti</string>
+    <string name="error_network_timeout">Zdá sa, že serveru trvá príliš dlho, kým odpovie, čo môže byť spôsobené buď zlým pripojením, alebo chybou servera. Skúste to o chvíľu znova.</string>
+    <string name="identity_server_consent_dialog_content_question">Súhlasíte so zaslaním týchto informácií\?</string>
+    <string name="identity_server_consent_dialog_content_2">Ak chcete zistiť existujúce kontakty, musíte odoslať kontaktné informácie na server totožností.
+\n
+\nPred odoslaním vaše údaje zahašujeme kvôli ochrane osobných údajov. Súhlasíte so zaslaním týchto informácií\?</string>
+    <string name="room_member_jump_to_read_receipt">Preskočiť na potvrdenie o prečítaní</string>
+    <string name="room_member_power_level_custom_in">Vlastné (%1$d) v %2$s</string>
+    <string name="room_member_power_level_default_in">Predvolené v %1$s</string>
+    <string name="verify_by_emoji_description">Ak sa vám nepodarí naskenovať uvedený kód, overte si ho porovnaním krátkeho jedinečného výberu emoji.</string>
+    <string name="verification_no_scan_emoji_title">Overiť porovnaním emotikonov</string>
+    <string name="verification_scan_self_emoji_subtitle">Namiesto toho overte porovnaním emoji</string>
+    <string name="verification_scan_emoji_subtitle">Ak nie ste osobne, porovnajte namiesto toho emoji</string>
+    <string name="verification_scan_with_this_device">Skenovať pomocou tohto zariadenia</string>
+    <string name="verification_scan_self_notice">Naskenujte kód pomocou iného zariadenia alebo prepnite a skenujte pomocou tohto zariadenia</string>
+    <string name="verification_scan_notice">Naskenujte kód pomocou zariadenia druhého používateľa, aby ste sa navzájom bezpečne overili</string>
+    <string name="sent_verification_conclusion">Záver overovania</string>
+    <string name="verification_conclusion_compromised">Môže byť narušená jedna z nasledujúcich vecí:
+\n
+\n - váš domovský server
+\n - domovský server, ku ktorému je pripojený overovaný používateľ
+\n - vaše internetové pripojenie alebo internetové pripojenie iných používateľov
+\n - vaše zariadenie alebo zariadenie iných používateľov</string>
+    <string name="verification_green_shield">Skontrolujte zelený štít, aby ste sa uistili, že používateľ je dôveryhodný. Dôverujte všetkým používateľom v miestnosti, aby ste sa uistili, že je miestnosť zabezpečená.</string>
+    <string name="verify_user_sas_emoji_security_tip">V záujme maximálnej bezpečnosti použite iný dôveryhodný komunikačný prostriedok alebo to urobte osobne.</string>
+    <string name="login_error_threepid_denied">Vaša e-mailová doména nie je oprávnená na registráciu na tomto serveri</string>
+    <string name="create_room_alias_invalid">Niektoré znaky nie sú povolené</string>
+    <string name="create_room_alias_empty">Uveďte prosím adresu miestnosti</string>
+    <string name="create_room_alias_already_in_use">Táto adresa sa už používa</string>
+    <string name="create_room_disable_federation_description">Túto funkciu môžete povoliť, ak sa miestnosť bude používať len na spoluprácu s internými tímami na vašom domovskom serveri. Neskôr sa to nedá zmeniť.</string>
+    <string name="create_room_disable_federation_title">Navždy zablokovať vstup do tejto miestnosti každému, kto nie je súčasťou %s</string>
+    <string name="create_room_encryption_description">Po zapnutí šifrovania ho nie je možné vypnúť.</string>
+    <string name="command_description_lenny">Pridá znaky ( ͡° ͜ʖ ͡°) pred správy vo formáte obyčajného textu</string>
+    <string name="command_description_shrug">Pridá znaky ¯\\_(ツ)_/¯ pred správy vo formáte obyčajného textu</string>
+    <string name="settings_developer_mode_summary">Vývojársky režim aktivuje skryté funkcie a môže tiež spôsobiť, že aplikácia bude menej stabilná. Len pre vývojárov!</string>
+    <string name="settings_show_devices_list">Zobraziť všetky moje relácie</string>
+    <string name="bug_report_error_too_short">Popis je príliš krátky</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Prístup k zabezpečeným správam stratíte, ak sa neprihlásite a neobnovíte svoje šifrovacie kľúče.</string>
+    <string name="soft_logout_clear_data_dialog_content">Vymazať všetky údaje aktuálne uložené v tomto zariadení\?
+\nZnovu sa prihláste, aby ste získali prístup k údajom a správam svojho konta.</string>
+    <string name="soft_logout_clear_data_notice">Varovanie: Vaše osobné údaje (vrátane šifrovacích kľúčov) sú stále uložené v tomto zariadení.
+\n
+\nVymažte ich, ak ste skončili s používaním tohto zariadenia alebo sa chcete prihlásiť do iného účtu.</string>
+    <string name="soft_logout_signin_e2e_warning_notice">Prihláste sa, aby ste obnovili šifrovacie kľúče uložené výlučne v tomto zariadení. Potrebujete ich na čítanie všetkých svojich zabezpečených správ na akomkoľvek zariadení.</string>
+    <string name="soft_logout_signin_notice">Váš správca domovského servera (%1$s) vás odhlásil z vášho účtu %2$s (%3$s).</string>
+    <string name="signed_out_notice">Môže to byť spôsobené rôznymi príčinami:
+\n
+\n- Zmenili ste heslo v inej relácii.
+\n
+\n- Odstránili ste túto reláciu z inej relácie.
+\n
+\n- Správca servera vám z bezpečnostných dôvodov zrušil prístup.</string>
+    <string name="autodiscover_well_known_error">Nie je možné nájsť platný domovský server. Skontrolujte prosím svoj identifikátor</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Toto nie je platný identifikátor používateľa. Očakávaný formát je: \'@pouzivatel:domovskyserver.sk\'</string>
+    <string name="login_signin_matrix_id_password_notice">Ak svoje heslo nepoznáte, vráťte sa späť a obnovte ho.</string>
+    <string name="login_signin_matrix_id_title">Prihláste sa pomocou Matrix ID</string>
+    <string name="login_connect_using_matrix_id_submit">Prihláste sa pomocou Matrix ID</string>
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="one">Bolo odoslaných príliš veľa žiadostí. Pokus môžete zopakovať za %1$d sekundu…</item>
+        <item quantity="few">Bolo odoslaných príliš veľa žiadostí. Pokus môžete zopakovať za %1$d sekundy…</item>
+        <item quantity="other">Bolo odoslaných príliš veľa žiadostí. Pokus môžete zopakovať za %1$d sekúnd…</item>
+    </plurals>
+    <string name="login_error_outdated_homeserver_warning_content">Tento domovský server má starú verziu. Požiadajte správcu domovského servera o aktualizáciu. Môžete pokračovať, ale niektoré funkcie nemusia fungovať správne.</string>
+    <string name="login_error_outdated_homeserver_content">Tento domovský server má príliš starú verziu, aby sa k nemu dalo pripojiť. Požiadajte správcu domovského servera o aktualizáciu.</string>
+    <string name="login_validation_code_is_not_correct">Zadaný kód nie je správny. Skontrolujte ho, prosím.</string>
+    <string name="login_wait_for_email_notice">Práve sme odoslali e-mail na adresu %1$s.
+\nKliknutím na odkaz, ktorý obsahuje, pokračujte vo vytváraní účtu.</string>
+    <string name="login_terms_title">Prijmite podmienky pre pokračovanie</string>
+    <string name="login_a11y_captcha_container">Vykonajte prosím výzvu captcha</string>
+    <string name="login_a11y_choose_other">Vybrať vlastný domovský server</string>
+    <string name="login_a11y_choose_modular">Vybrať službu Element Matrix Services</string>
+    <string name="login_signup_error_user_in_use">Toto používateľské meno je obsadené</string>
+    <string name="login_signup_to">Prihlásiť sa do %1$s</string>
+    <string name="login_msisdn_error_other">Telefónne číslo sa zdá byť neplatné. Prosím, skontrolujte ho</string>
+    <string name="login_msisdn_notice">Prosím, použite medzinárodný formát (telefónne číslo musí začínať znakom \"+\")</string>
+    <string name="login_msisdn_confirm_notice">Práve sme poslali kód na %1$s. Zadajte ho nižšie a overte, že ste to vy.</string>
+    <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_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>
+    <string name="login_reset_password_mail_confirmation_submit">Overil som svoju emailovú adresu</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Ťuknutím na odkaz potvrďte nové heslo. Po navštívení odkazu, ktorý obsahuje, kliknite nižšie.</string>
+    <string name="login_reset_password_mail_confirmation_notice">Overovací e-mail bol odoslaný na adresu %1$s.</string>
+    <string name="settings_messages_in_e2e_one_to_one">Šifrované správy v priamych konverzáciách</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">Nepodarilo sa prijať push. Riešením môže byť preinštalovanie aplikácie.</string>
+    <string name="settings_troubleshoot_test_push_loop_success">Aplikácia prijíma PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_title">Otestovať Push</string>
+    <string name="shortcut_disabled_reason_room_left">Miestnosť bola opustená!</string>
+    <string name="search_banned_user_hint">Filtrovať zakázaných používateľov</string>
+    <string name="error_unauthorized">Neautorizované, chýbajúce platné poverenia na overenie</string>
+    <string name="legals_identity_server_title">Pravidlá a zásady vášho servera totožností</string>
+    <string name="legals_home_server_title">Pravidlá a zásady vášho domovského servera</string>
+    <string name="template_legals_application_title">${app_name} pravidlá</string>
+    <string name="settings_messages_by_bot">Správy od bota</string>
+    <string name="settings_encrypted_group_messages">Šifrované skupinové správy</string>
+    <string name="settings_encrypted_direct_messages">Šifrované priame správy</string>
+    <string name="settings_messages_containing_display_name">Moje zobrazované meno</string>
+    <string name="settings_when_rooms_are_upgraded">Keď sú miestnosti aktualizované</string>
+    <string name="settings_messages_in_e2e_group_chat">Šifrované správy v skupinových konverzáciách</string>
+    <string name="error_threepid_auth_failed">Uistite sa, že ste klikli na odkaz v e-maile, ktorý sme vám poslali.</string>
+    <string name="settings_emails_empty">Do vášho účtu nebol pridaný žiadny e-mail</string>
+    <string name="settings_phone_number_empty">Do vášho účtu nebolo pridané žiadne telefónne číslo</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Poslať udalosti m.room.server_acl</string>
+    <string name="room_permissions_change_main_address_for_the_room">Zmeniť hlavnú adresu miestnosti</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Odstrániť správy odoslané inými osobami</string>
+    <string name="room_permissions_notice_read_only">Nemáte oprávnenie aktualizovať role potrebné na zmenu rôznych častí tejto miestnosti</string>
+    <string name="room_permissions_notice">Vyberte role potrebné na zmenu rôznych častí miestnosti</string>
+    <string name="call_ended_invite_timeout_title">Žiadna odpoveď</string>
+    <string name="call_held_by_you">Podržali ste hovor</string>
+    <string name="allow_anyone_in_room_to_access">Umožniť komukoľvek v %s nájsť a získať prístup. Môžete vybrať aj iné priestory.</string>
+    <string name="upgrade_room_update_parent_space">Automaticky aktualizovať nadradený priestor</string>
+    <string name="teammate_spaces_might_not_join">Momentálne sa ľudia nemusia môcť pripojiť k súkromným miestnostiam, ktoré ste vytvorili.
+\n
+\nV rámci beta verzie to zlepšíme, ale chceli sme vás len informovať.</string>
+    <string name="teammate_spaces_arent_quite_ready">Priestory pre spolupracovníkov ešte nie sú úplne pripravené, ale môžete ich vyskúšať</string>
+    <string name="this_space_has_no_rooms_admin">Niektoré miestnosti môžu byť skryté, pretože sú súkromné a potrebujete pozvánku.</string>
+    <string name="this_space_has_no_rooms">Tento priestor nemá žiadne miestnosti</string>
+    <string name="spaces_no_server_support_description">Pre viac informácií sa obráťte na správcu domovského servera</string>
+    <string name="space_mark_as_not_suggested">Označiť ako neodporúčaný</string>
+    <string name="space_mark_as_suggested">Označiť ako odporúčaný</string>
+    <string name="make_this_space_public">Zverejniť tento priestor</string>
+    <string name="looking_for_someone_not_in_space">Hľadáte niekoho, kto nie je v %s\?</string>
+    <string name="space_add_space_to_any_space_you_manage">Pridať priestor do priestoru, ktorý spravujete.</string>
+    <string name="space_add_existing_rooms_only">Pridať existujúce miestnosti</string>
+    <string name="space_add_existing_rooms">Pridať existujúce miestnosti a priestor</string>
+    <string name="dont_leave_any">Neopustiť žiadne miestnosti ani priestory</string>
+    <string name="space_leave_prompt_msg_as_admin">Ste jediným správcom tohto priestoru. Jeho opustenie bude znamenať, že nad ním nikto nebude mať kontrolu.</string>
+    <string name="space_leave_prompt_msg_only_you">Ste tu jediný človek. Ak odídete, nikto sa už v budúcnosti nebude môcť pripojiť do tejto miestnosti, vrátane vás.</string>
+    <string name="space_leave_prompt_msg_with_name">Ste si istí, že chcete opustiť %s\?</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d osoba, ktorú poznáte, sa už pripojila</item>
+        <item quantity="few">%d osoby, ktorú poznáte, sa už pripojili</item>
+        <item quantity="other">%d osôb, ktorú poznáte, sa už pripojilo</item>
+    </plurals>
+    <string name="share_space_link_message">Pripojte sa k môjmu priestoru %1$s %2$s</string>
+    <string name="space_type_private_desc">Len pre pozvaných, najlepšie pre seba alebo tímy</string>
+    <string name="space_type_public_desc">Otvorený priestor pre každého, najlepšie pre komunity</string>
+    <string name="your_private_space">Váš súkromný priestor</string>
+    <string name="your_public_space">Váš verejný priestor</string>
+    <string name="command_description_join_space">Pripojiť sa do priestoru s daným ID</string>
+    <string name="command_description_add_to_space">Pridať do daného priestoru</string>
+    <string name="space_you_know_that_contains_this_room">Priestor, o ktorom viete, že obsahuje túto miestnosť</string>
+    <string name="allow_space_member_to_find_and_access">Umožniť členom priestoru, aby ho našli a mali k nemu prístup.</string>
+    <string name="room_settings_room_access_restricted_description">Každý, kto sa nachádza v priestore s touto miestnosťou, ju môže nájsť a pripojiť sa k nej. Iba administrátori tejto miestnosti ju môžu pridať do priestoru.</string>
+    <string name="room_settings_room_access_restricted_title">Iba členovia priestoru</string>
+    <string name="room_settings_space_access_public_description">Ktokoľvek môže nájsť priestor a pripojiť sa</string>
+    <string name="space_settings_alias_subtitle">Zobraziť a spravovať adresy tohto priestoru.</string>
+    <string name="room_permissions_upgrade_the_space">Aktualizovať priestor</string>
+    <string name="room_permissions_change_space_name">Zmeniť názov priestoru</string>
+    <string name="room_permissions_enable_space_encryption">Zapnúť šifrovanie priestoru</string>
+    <string name="room_permissions_change_main_address_for_the_space">Zmeniť hlavnú adresu priestoru</string>
+    <string name="room_permissions_change_space_avatar">Zmeniť obrázok priestoru</string>
+    <string name="space_permissions_notice_read_only">Nemáte oprávnenie aktualizovať role potrebné na zmenu rôznych častí tohto priestoru</string>
+    <string name="space_permissions_notice">Vyberte role potrebné na zmenu rôznych častí tohto priestoru</string>
+    <string name="create_space_error_empty_field_space_name">Dajte mu názov, aby ste mohli pokračovať.</string>
+    <string name="activity_create_space_title">Vytvoriť priestor</string>
+    <string name="command_description_create_space">Vytvoriť priestor</string>
+    <string name="create_new_space">Vytvoriť nový priestor</string>
+    <string name="room_create_member_of_space_name_can_join">Členovia priestoru %s môžu nájsť, zobraziť náhľad a pripojiť sa.</string>
+    <string name="qr_code_not_scanned">QR kód nebol naskenovaný!</string>
+    <string name="invalid_qr_code_uri">Neplatný QR kód (Neplatná URI)!</string>
+    <string name="user_code_scan">Skenovať QR kód</string>
+    <string name="not_a_valid_qr_code">Toto nie je platný matrix QR kód</string>
+    <string name="qr_code_scanned_self_verif_notice">Už je to takmer hotové! Zobrazuje druhé zariadenie fajku\?</string>
+    <string name="qr_code_scanned_by_other_notice">Už je to takmer hotové! Zobrazuje %s fajku\?</string>
+    <string name="a13n_qr_code_description">Obrázok QR kódu</string>
+    <string name="a11y_create_direct_message_by_qr_code">Vytvorte novú priamu konverzáciu naskenovaním QR kódu</string>
+    <string name="add_by_qr_code">Pridať pomocou QR kódu</string>
+    <string name="template_link_this_email_with_your_account">%s v Nastaveniach na prijímanie pozvánok priamo v ${app_name}e.</string>
+    <string name="this_invite_to_this_space_was_sent">Táto pozvánka do tohto priestoru bola odoslaná na adresu %s, ktorá nie je spojená s vaším účtom</string>
+    <string name="this_invite_to_this_room_was_sent">Táto pozvánka do tejto miestnosti bola odoslaná na adresu %s, ktorá nie je spojená s vaším účtom</string>
+    <string name="upgrade_room_for_restricted_no_param">Každý, kto sa nachádza v nadradenom priestore, bude môcť túto miestnosť nájsť a pripojiť sa k nej - nie je potrebné každého ručne pozývať. V nastaveniach miestnosti to budete môcť kedykoľvek zmeniť.</string>
+    <string name="upgrade_room_for_restricted">Každý v %s bude môcť nájsť túto miestnosť a pripojiť sa k nej - nie je potrebné každého ručne pozývať. V nastaveniach miestnosti to budete môcť kedykoľvek zmeniť.</string>
+    <string name="upgrade_room_auto_invite">Automaticky pozývať používateľov</string>
+    <string name="this_space_has_no_rooms_not_admin">Niektoré miestnosti môžu byť skryté, pretože sú súkromné a potrebujete pozvánku.
+\nNa pridávanie miestností nemáte povolenie.</string>
+    <string name="space_leave_prompt_msg_private">Nebudete sa môcť znova pripojiť, kým nebudete opätovne pozvaní.</string>
+    <string name="create_space_identity_server_info_none">V súčasnosti nepoužívate server totožností. Ak chcete pozvať spolupracovníkov a byť pre nich vyhľadateľný, nastavte ho nižšie.</string>
+    <string name="invite_just_to_this_room_desc">Nebudú súčasťou %s</string>
+    <string name="invite_just_to_this_room">Iba do tejto miestnosti</string>
+    <string name="invite_to_space_with_name_desc">Budú môcť preskúmať %s</string>
+    <string name="invite_to_space_with_name">Pozvať do %s</string>
+    <string name="invite_people_to_your_space_desc">Momentálne ste to len vy. %s s ostatnými bude ešte lepšie.</string>
+    <string name="invite_to_space">Pozvať do %s</string>
+    <string name="invite_people_to_your_space">Pozvite ľudí do svojho priestoru</string>
+    <string name="three_pid_revoke_invite_dialog_content">Odvolať pozvánku do %1$s\?</string>
+    <string name="invite_users_to_room_failure">Používateľov sme nemohli pozvať. Skontrolujte používateľov, ktorých chcete pozvať, a skúste to znova.</string>
+    <string name="template_invite_friends_text">Ahoj, ozvi sa mi na ${app_name}: %s</string>
+    <string name="create_room_dm_failure">Nemohli sme vytvoriť vašu priamu správu. Skontrolujte používateľov, ktorých chcete pozvať, a skúste to znova.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Kvôli end-to-end šifrovaniu sa môže stať, že budete musieť chvíľu počkať, kým vám od niekoho príde správa, pretože vám neboli správne odoslané šifrovacie kľúče.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Správy v tejto miestnosti sú šifrované od vás až k príjemcovi.</string>
+    <string name="encryption_enabled_tile_description">Správy v tejto miestnosti sú end-to-end šifrované. Zistite viac a overte používateľov v ich profile.</string>
+    <string name="settings_hs_admin_e2e_disabled">Správca vášho servera predvolene vypol end-to-end šifrovanie v súkromných miestnostiach a v priamych správach.</string>
+    <string name="verification_conclusion_ok_notice">Správy s týmto používateľom sú end-to-end šifrované a tretie strany ich nemôžu čítať.</string>
+    <string name="direct_room_profile_encrypted_subtitle">Správy sú tu end-to-end šifrované .
+\n
+\nVaše správy sú zabezpečené zámkami a jedinečné kľúče na ich odomknutie máte len vy a príjemca.</string>
+    <string name="room_profile_encrypted_subtitle">Správy v tejto miestnosti sú end-to-end šifrované.
+\n
+\nVaše správy sú zabezpečené zámkami a jedinečné kľúče na ich odomknutie máte len vy a príjemca.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Správy tu nie sú end-to-end (od vás až k príjemcovi) šifrované.</string>
+    <string name="room_profile_not_encrypted_subtitle">Správy v tejto miestnosti nie sú end-to-end šifrované.</string>
+    <string name="login_reset_password_warning_content">Zmena hesla vynuluje všetky end-to-end šifrovacie kľúče vo všetkých vašich reláciách, čím sa história zašifrovanej konverzácie stane nečitateľnou. Pred resetovaním hesla si nastavte zálohovanie kľúčov alebo exportujte kľúče miestnosti z inej relácie.</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Čakanie na históriu šifrovania</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Čaká sa na túto správu, môže to chvíľu trvať</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Už je to takmer hotové! Čaká sa na potvrdenie…</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Aplikácia čaká na príkaz PUSH</string>
+    <string name="this_is_the_beginning_of_dm">Toto je začiatok histórie vašich priamych správ s %s.</string>
+    <string name="this_is_the_beginning_of_room_no_name">Toto je začiatok tejto konverzácie.</string>
+    <string name="this_is_the_beginning_of_room">Toto je začiatok miestnosti %s.</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Nepoznáte svoju prístupovú frázu pre zálohovanie kľúčov, môžete %s.</string>
+    <string name="verify_user_sas_emoji_help_text">Overte tohto používateľa potvrdením, že sa na jeho obrazovke zobrazujú nasledujúce jedinečné emotikony v rovnakom poradí.</string>
+    <string name="settings_developer_mode_show_info_on_screen_summary">Zobrazenie niektorých užitočných informácií na pomoc pri ladení aplikácie</string>
+    <string name="template_preference_help_summary">Získajte pomoc s používaním aplikácie ${app_name}</string>
+    <string name="all_rooms_youre_in_will_be_shown_in_home">Všetky miestnosti, v ktorých sa nachádzate, sa zobrazia v časti Domov.</string>
+    <string name="preference_show_all_rooms_in_home">Zobraziť všetky miestnosti v časti Domov</string>
+    <string name="settings_troubleshoot_title">Riešenie problémov</string>
+    <string name="settings_security_pin_code_notifications_summary_off">Zobraziť iba počet neprečítaných správ v jednoduchom oznámení.</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Zobraziť podrobnosti, ako sú názvy miestností a obsah správ.</string>
+    <string name="settings_security_pin_code_notifications_title">Zobraziť obsah v oznámeniach</string>
+    <string name="alert_push_are_disabled_description">Skontrolujte svoje nastavenia a povoľte okamžité oznámenia</string>
+    <string name="alert_push_are_disabled_title">Okamžité oznámenia sú vypnuté</string>
+    <string name="settings_notification_advanced_summary">Nastaviť dôležitosť oznámenia podľa udalosti</string>
+    <string name="login_reset_password_success_notice_2">Boli ste odhlásení zo všetkých zariadení a nebudú sa vám viac zobrazovať okamžité oznámenia. Ak chcete zobrazovať oznámenia, musíte sa na každom zariadení znovu prihlásiť.</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s v %2$s a %3$s</string>
+    <string name="room_settings_room_notifications_manage_notifications">Oznámenia môžete spravovať v %1$s.</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">Na oznámenie bolo kliknuté!</string>
+    <string name="settings_troubleshoot_test_notification_notice">Kliknite na oznámenie. Ak sa oznámenie nezobrazí, skontrolujte systémové nastavenia.</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Zobrazujete oznámenie! Kliknite na mňa!</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Kľúčové slová nemôžu obsahovať \'%s\'</string>
+    <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_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>
+    <string name="room_settings_room_notifications_encryption_notice">Upozorňujeme, že oznámenia o zmienkach a kľúčových slovách nie sú v mobilných zariadeniach k dispozícii v zašifrovaných miestnostiach.</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">V mobilných zariadeniach nebudete dostávať upozornenia na zmienky a kľúčové slová v zašifrovaných miestnostiach.</string>
+    <string name="settings_notification_mentions_and_keywords">Zmienky a kľúčové slová</string>
+    <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">Súhlasíte s odoslaním kontaktných údajov (telefónnych čísel a/alebo e-mailov) na nastavený server totožností (%1$s), aby ste zistili existujúce kontakty, ktoré poznáte\?
+\n
+\nKvôli väčšej ochrane osobných údajov budú odoslané údaje pred odoslaním zahašované.</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">Odoslať e-maily a telefónne čísla</string>
+    <string name="settings_discovery_consent_notice_off">Nedali 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_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_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>
+    <string name="enter_account_password">Zadajte svoje %s pre pokračovanie.</string>
+    <string name="login_signin_matrix_id_notice">Ak ste si vytvorili účet na domovskom serveri, použite svoje Matrix ID (napr. @pouzivatel:domena.sk) a heslo.</string>
+    <string name="login_connect_using_matrix_id_notice">Ak už máte účet a poznáte svoj identifikátor Matrix a heslo, môžete použiť aj túto metódu:</string>
+    <string name="login_reset_password_error_not_found">Tento e-mail nie je prepojený so žiadnym účtom</string>
+    <string name="spaces_no_server_support_title">Vyzerá to, že váš domovský server zatiaľ nepodporuje Priestory</string>
+    <string name="spaces_feeling_experimental_subspace">Chcete experimentovať\?
+\nDo priestoru môžete pridať existujúce priestory.</string>
+    <string name="space_manage_rooms_and_spaces">Spravovať miestnosti a priestory</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Priestory sú novým spôsobom spájania miestností a ľudí.</string>
+    <string name="spaces_beta_welcome_to_spaces">Vitajte v Priestoroch!</string>
+    <string name="space_add_existing_spaces">Pridať existujúce priestory</string>
+    <string name="leave_specific_ones">Opustiť konkrétne miestnosti a priestory…</string>
+    <string name="you_will_leave_all_in">Opustíte všetky miestnosti a priestory v %s.</string>
+    <string name="leave_all_rooms_and_spaces">Opustiť všetky miestnosti a priestory</string>
+    <string name="create_spaces_room_private_header_desc">Vytvorme pre každého z nich miestnosť. Neskôr môžete pridať aj ďalšie, vrátane už existujúcich.</string>
+    <string name="create_spaces_room_private_header">Na akých veciach pracujete\?</string>
+    <string name="create_spaces_invite_public_header_desc">Zabezpečte, aby mali k spoločnosti %s prístup správni ľudia. Neskôr môžete pozvať ďalších.</string>
+    <string name="create_spaces_invite_public_header">Kto sú vaši kolegovia\?</string>
+    <string name="create_spaces_room_public_header_desc">Vytvoríme pre nich miestnosti. Neskôr môžete pridať aj ďalšie.</string>
+    <string name="create_spaces_room_public_header">O čom chcete diskutovať v %s\?</string>
+    <string name="create_spaces_details_private_header">Pridajte niekoľko podrobností, ktoré pomôžu ľuďom identifikovať priestor. Tie môžete kedykoľvek zmeniť.</string>
+    <string name="create_spaces_details_public_header">Pridajte niekoľko detailov, ktoré pomôžu vyniknúť. Tie môžete kedykoľvek zmeniť.</string>
+    <string name="create_spaces_private_teammates">Súkromný priestor pre vás a vašich spolupracovníkov</string>
+    <string name="create_spaces_me_and_teammates">Ja a moji kolegovia z tímu</string>
+    <string name="create_spaces_organise_rooms">Súkromný priestor na usporiadanie vašich miestností</string>
+    <string name="create_spaces_make_sure_access">Uistite sa, že k %s majú prístup správni ľudia. Neskôr to môžete zmeniť.</string>
+    <string name="create_spaces_who_are_you_working_with">S kým spolupracujete\?</string>
+    <string name="create_spaces_join_info_help">Ak sa chcete pripojiť k existujúcemu priestoru, potrebujete pozvánku.</string>
+    <string name="create_spaces_you_can_change_later">Neskôr to môžete zmeniť</string>
+    <string name="create_spaces_choose_type_label">Aký typ priestoru chcete vytvoriť\?</string>
+    <string name="auth_invalid_login_param_space_in_password">Nesprávne používateľské meno a/alebo heslo. Zadané heslo začína alebo končí medzerami, skontrolujte ho.</string>
+    <string name="send_feedback_space_info">Používate beta verziu Priestorov. Vaša spätná väzba pomôže pri tvorbe ďalších verzií. Vaša platforma a používateľské meno budú zaznamenané, aby sme mohli čo najlepšie využiť vašu spätnú väzbu.</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Ďalšie priestory alebo miestnosti, o ktorých možno neviete</string>
+    <string name="tap_to_edit_spaces">Ťuknutím upravíte priestory</string>
+    <string name="decide_which_spaces_can_access">Určite, ktoré priestory budú mať prístup do tejto miestnosti. Ak je vybraný priestor, jeho členovia môžu nájsť a pripojiť sa k <RoomName/>.</string>
+    <string name="spaces_which_can_access">Priestory, ktoré majú prístup</string>
+    <string name="voice_message_slide_to_cancel">Posunutím zrušte</string>
+    <string name="event_status_cancel_sending_dialog_message">Chcete zrušiť odosielanie správy\?</string>
+    <string name="warning_room_not_created_yet">Miestnosť ešte nie je vytvorená. Zrušiť vytvorenie miestnosti\?</string>
+    <string name="bootstrap_cancel_text">Ak to teraz zrušíte, môžete prísť o zašifrované správy a údaje, ak stratíte prístup k svojim prihlasovacím údajom.
+\n
+\nBezpečné zálohovanie a správu kľúčov môžete nastaviť aj v Nastaveniach.</string>
+    <string name="verify_cancelled_notice">Overovanie bolo zrušené. Overovanie môžete spustiť znova.</string>
+    <string name="verify_cancel_other">Ak to teraz zrušíte, neoveríte %1$s (%2$s). Začnite znova v ich používateľskom profile.</string>
+    <string name="verify_cancel_self_verification_from_trusted">Ak to zrušíte, nebudete môcť čítať zašifrované správy v novom zariadení a ostatní používatelia mu nebudú dôverovať</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Ak to zrušíte, nebudete môcť čítať zašifrované správy v tomto zariadení a ostatní používatelia mu nebudú dôverovať</string>
+    <string name="login_signup_cancel_confirmation_content">Váš účet ešte nie je vytvorený.
+\n
+\nZastaviť proces registrácie\?</string>
+    <string name="login_reset_password_cancel_confirmation_content">Vaše heslo ešte nebolo zmenené.
+\n
+\nZastaviť proces zmeny hesla\?</string>
+    <string name="bad_passphrase_key_reset_all_action">Zabudli ste alebo ste stratili všetky možnosti obnovy\? Obnovte všetko</string>
+    <string name="bootstrap_skip_text_no_gen_key">Nastavenie prístupovej frázy pre obnovenie vám umožní zabezpečiť a odomknúť zašifrované správy a dôveryhodnosť.</string>
+    <string name="bootstrap_skip_text">Nastavenie prístupovej frázy pre obnovenie vám umožní zabezpečiť a odomknúť zašifrované správy a dôveryhodnosť.
+\n
+\nAk nechcete nastaviť Heslo správy, vygenerujte namiesto toho Kľúč správy.</string>
+    <string name="set_recovery_passphrase">Nastaviť %s</string>
+    <string name="verification_cannot_access_other_session">Použite prístupovú frázu na obnovenie alebo kľúč</string>
+    <string name="template_use_latest_app">Použite najnovšiu aplikáciu ${app_name} na svojich ostatných zariadeniach:</string>
+    <string name="template_use_other_session_content_description">Použite najnovšiu aplikáciu ${app_name} na svojich ostatných zariadeniach, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} pre Android alebo iného klienta Matrix podporujúceho krížové podpisovanie</string>
+    <string name="verification_use_passphrase">Ak nemáte prístup k existujúcej relácii</string>
+    <string name="verification_open_other_to_verify">Použite existujúcu reláciu na overenie tejto relácie, čím jej udelíte prístup k zašifrovaným správam.</string>
+    <string name="analytics_opt_in_list_item_3">Túto funkciu môžete kedykoľvek vypnúť v nastaveniach</string>
+    <string name="analytics_opt_in_list_item_2"><b>Nezdieľame</b> informácie s tretími stranami</string>
+    <string name="error_voice_message_unable_to_record">Nemožno nahrať hlasovú správu</string>
+    <string name="voice_message_tap_to_stop_toast">Ťuknutím na nahrávku ju zastavíte alebo si ju vypočujete</string>
+    <string name="voice_message_release_to_send_toast">Podržaním nahrajte, uvoľnením odošlite</string>
+    <string name="a11y_delete_recorded_voice_message">Vymazať nahrávku</string>
+    <string name="a11y_recording_voice_message">Nahrávanie hlasovej správy</string>
+    <string name="a11y_stop_voice_message">Zastaviť nahrávanie</string>
+    <string name="a11y_start_voice_message">Nahrať hlasovú správu</string>
+    <string name="analytics_opt_in_list_item_1"><b>Nezaznamenávame ani neprofilujeme</b> žiadne údaje o účte</string>
+    <string name="confirm_your_identity_quad_s">Potvrďte svoju totožnosť overením tohto prihlasovacieho mena, čím mu udelíte prístup k zašifrovaným správam.</string>
+    <string name="confirm_your_identity">Potvrďte svoju totožnosť overením tohto prihlásenia z jednej z vašich ďalších relácií, čím jej udelíte prístup k zašifrovaným správam.</string>
+    <string name="template_analytics_opt_in_content">Pomôžte nám identifikovať problémy a zlepšiť ${app_name} zdieľaním anonymných údajov o používaní. Aby sme pochopili, ako ľudia používajú viacero zariadení, vygenerujeme náhodný identifikátor, ktorý zdieľajú vaše zariadenia.
+\n
+\nMôžete si prečítať všetky naše podmienky %s.</string>
+    <string name="template_analytics_opt_in_title">Pomôžte zlepšiť ${app_name}</string>
+    <string name="call_tap_to_return">%1$s Ťuknite pre návrat</string>
+    <string name="call_one_active">Aktívny hovor (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">Aktívny hovor ·</item>
+        <item quantity="few">%1$d aktívne hovory ·</item>
+        <item quantity="other">%1$d aktívnych hovorov ·</item>
+    </plurals>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">1 aktívny hovor (%1$s) · 1 pozastavený hovor</item>
+        <item quantity="few">1 aktívny hovor (%1$s) · %2$d pozastavené hovory</item>
+        <item quantity="other">1 aktívny hovor (%1$s) · %2$d pozastavených hovorov</item>
+    </plurals>
+    <string name="call_only_active">Prebiehajúci hovor (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">Pri vyhľadávaní telefónneho čísla došlo k chybe</string>
+    <string name="call_tile_no_answer">Žiadna odpoveď</string>
+    <string name="call_tile_video_missed">Zmeškaný video hovor</string>
+    <string name="call_tile_voice_missed">Zmeškaný hlasový hovor</string>
+    <string name="call_tile_video_declined">Video hovor odmietnutý</string>
+    <string name="call_tile_voice_declined">Hlasový hovor odmietnutý</string>
+    <string name="call_tile_video_call_has_ended">Video hovor skončil • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">Hlasový hovor skončil • %1$s</string>
+    <string name="call_tile_video_active">Aktívny video hovor</string>
+    <string name="call_tile_voice_active">Aktívny hovor</string>
+    <string name="call_tile_video_incoming">Prichádzajúci video hovor</string>
+    <string name="call_tile_voice_incoming">Prichádzajúci hlasový hovor</string>
+    <string name="call_tile_ended">Tento hovor bol ukončený</string>
+    <string name="call_tile_other_declined">%1$s odmietol tento hovor</string>
+    <string name="call_tile_you_declined_this_call">Tento hovor ste odmietli</string>
+    <string name="create_pin_confirm_failure">Nepodarilo sa overiť kód PIN, zadajte nový kód.</string>
+    <string name="create_pin_title">Vyberte si bezpečnostný PIN kód</string>
+    <string name="too_many_pin_failures">Príliš veľa chýb, boli ste odhlásení</string>
+    <string name="failed_to_unban">Nepodarilo sa zrušiť zákaz používateľovi</string>
+    <string name="member_banned_by">Zakázaný používateľom %1$s</string>
+    <string name="phone_book_perform_lookup">Vyhľadávanie kontaktov v službe Matrix</string>
+    <string name="empty_contact_book">Váš telefónny zoznam je prázdny</string>
+    <string name="loading_contact_book">Získanie vašich kontaktov…</string>
+    <string name="search_in_my_contacts">Hľadať v mojich kontaktoch</string>
+    <string name="empty_phone_book">Váš telefónny zoznam je prázdny</string>
+    <string name="add_from_phone_book">Pridať z môjho telefónneho zoznamu</string>
+    <string name="save_recovery_key_chooser_hint">Uložiť kľúč na obnovu do</string>
+    <string name="disclaimer_content">S radosťou oznamujeme, že sme zmenili názov! Vaša aplikácia je aktualizovaná a ste prihlásení do svojho účtu.</string>
+    <string name="crypto_error_withheld_generic">K tejto správe nemáte prístup, pretože odosielateľ zámerne neposlal kľúče</string>
+    <string name="crypto_error_withheld_unverified">Nemôžete získať prístup k tejto správe, pretože odosielateľ vašej relácii nedôveruje</string>
+    <string name="crypto_error_withheld_blacklisted">K tejto správe nemáte prístup, pretože vás odosielateľ zablokoval</string>
+    <string name="notice_crypto_unable_to_decrypt_final">K tejto správe nemáte prístup</string>
+    <string name="room_settings_set_avatar">Nastaviť obrázok</string>
+    <string name="room_settings_save_success">Úspešne ste zmenili nastavenia miestnosti</string>
+    <string name="settings_setup_secure_backup">Nastaviť bezpečné zálohovanie</string>
+    <string name="a11y_start_camera">Spustiť kameru</string>
+    <string name="a11y_stop_camera">Zastaviť kameru</string>
+    <string name="identity_server_set_alternative_notice_no_default">Zadajte adresu URL servera totožností</string>
+    <string name="identity_server_set_alternative_notice">Prípadne môžete zadať akúkoľvek inú adresu URL servera totožností</string>
+    <string name="identity_server_set_default_notice">Váš domovský server (%1$s) navrhuje použiť %2$s pre váš server totožností</string>
+    <string name="identity_server_user_consent_not_provided">Súhlas používateľa nebol poskytnutý.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Pre vaše súkromie ${app_name} podporuje iba odosielanie zahašovaných e-mailov a telefónnych čísel používateľov.</string>
+    <string name="identity_server_error_terms_not_signed">Najprv prosím prijmite podmienky servera totožností v nastaveniach.</string>
+    <string name="identity_server_error_no_identity_server_configured">Najprv prosím nastavte server totožností.</string>
+    <string name="identity_server_error_outdated_home_server">Táto operácia nie je možná. Domovský server je zastaraný.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Tento server identity je zastaraný. ${app_name} podporuje iba API V2.</string>
+    <string name="disconnect_identity_server_dialog_content">Odpojiť sa od servera totožností %s\?</string>
+    <string name="user_code_info_text">Zdieľajte tento kód s ľuďmi, aby si vás mohli naskenovať, pridať a začať konverzovať.</string>
+    <string name="user_code_my_code">Môj kód</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="one">Pozvánky odoslané %1$s a ešte jednému</item>
+        <item quantity="few">Pozvánky odoslané %1$s a %2$d ďalším</item>
+        <item quantity="other">Pozvánky odoslané %1$s a %2$d ďalším</item>
+    </plurals>
+    <string name="invitations_sent_to_two_users">Pozvánky odoslané používateľovi %1$s a %2$s</string>
+    <string name="invitation_sent_to_one_user">Pozvánka odoslaná používateľovi %1$s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Pridajte sa ku mne na ${app_name}</string>
+    <string name="external_link_confirmation_message">Odkaz %1$s vás presmeruje na inú stránku: %2$s.
+\n
+\nSte si istí, že chcete pokračovať\?</string>
+    <string name="external_link_confirmation_title">Prekontrolujte tento odkaz</string>
+    <string name="error_empty_field_choose_password">Vyberte si prosím heslo.</string>
+    <string name="error_empty_field_choose_user_name">Vyberte si prosím používateľské meno.</string>
+    <string name="failed_to_initialize_cross_signing">Nepodarilo sa nastaviť krížové podpisovanie</string>
+    <string name="cross_signing_verify_by_emoji">Interaktívne overte pomocou emoji</string>
+    <string name="cross_signing_verify_by_text">Manuálne overte pomocou textu</string>
+    <string name="verify_this_session">Overte nové prihlásenie s prístupom k vášmu účtu: %1$s</string>
+    <string name="verify_other_sessions">Overte všetky vaše relácie, aby ste si boli istý, že sú vaše správy a účet bezpečné</string>
+    <string name="review_logins">Skontrolujte, kde ste prihlásení</string>
+    <string name="encrypted_unverified">Šifrované neovereným zariadením</string>
+    <string name="default_message_emote_snow">pošle sneženie ❄️</string>
+    <string name="default_message_emote_confetti">pošle konfety 🎉</string>
+    <string name="command_snow">Odošle danú správu so snežením</string>
+    <string name="command_confetti">Odošle danú správu s konfetami</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="one">Zobraziť zariadenie, pomocou ktorého môžete teraz overiť</item>
+        <item quantity="few">Zobraziť %d zariadenia, pomocou ktorých môžete teraz overiť</item>
+        <item quantity="other">Zobraziť %d zariadení, pomocou ktorých môžete teraz overiť</item>
+    </plurals>
+    <string name="secure_backup_reset_no_history">Reštartujete bez histórie, bez správ, dôveryhodných zariadení a dôveryhodných používateľov</string>
+    <string name="secure_backup_reset_if_you_reset_all">Ak všetko obnovíte do pôvodného stavu</string>
+    <string name="secure_backup_reset_all_no_other_devices">Urobte to len vtedy, ak nemáte žiadne iné zariadenie, pomocou ktorého by ste mohli toto zariadenie overiť.</string>
+    <string name="failed_to_access_secure_storage">Nepodarilo sa získať prístup k zabezpečenému úložisku</string>
+    <string name="keys_backup_recovery_key_error_decrypt">Zálohu sa nepodarilo dešifrovať pomocou tohto kľúča na obnovenie: overte, či ste zadali správny kľúč na obnovenie.</string>
+    <string name="enter_secret_storage_input_key">Vyberte svoj kľúč na obnovenie alebo ho zadajte ručne zadaním alebo vložením zo schránky</string>
+    <string name="use_recovery_key">Použite kľúč na obnovu</string>
+    <string name="command_description_discard_session_not_handled">Podporované len v zašifrovaných miestnostiach</string>
+    <string name="command_description_discard_session">Vynúti zrušenie aktuálnej relácie odchádzajúcej skupiny v zašifrovanej miestnosti</string>
+    <string name="or_other_mx_capable_client">alebo iného klienta Matrix, ktorý dokáže krížovo podpisovať</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="error_saving_media_file">Nepodarilo sa uložiť mediálny súbor</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Kontrola kľúča na zálohovanie (%s)</string>
+    <string name="bootstrap_progress_checking_backup">Kontrola kľúča na zálohovanie</string>
+    <string name="recovery_key_empty_error_message">Prosím, vložte kľúč obnovenia</string>
+    <string name="bootstrap_invalid_recovery_key">Nie je to platný kľúč na obnovenie</string>
+    <string name="bootstrap_enter_recovery">Zadajte svoje %s pre pokračovanie</string>
+    <string name="security_prompt_text">Overte seba a ostatných, aby boli vaše konverzácie bezpečné</string>
+    <string name="auth_invalid_login_deactivated_account">Tento účet bol deaktivovaný.</string>
+    <string name="command_description_plain">Odošle správu ako obyčajný text bez interpretácie ako markdown</string>
+    <string name="error_failed_to_import_keys">Nepodarilo sa importovať kľúče</string>
+    <string name="room_created_summary_no_topic_creation_text">%s aby ľudia vedeli, o čom je táto miestnosť.</string>
+    <string name="room_created_summary_item_by_you">Vytvorili ste a nastavili ste miestnosť.</string>
+    <string name="room_created_summary_item">%s vytvoril a nastavil miestnosť.</string>
+    <string name="encryption_unknown_algorithm_tile_description">Šifrovanie používané v tejto miestnosti nie je podporované</string>
+    <string name="auth_flow_not_supported">Toto nemôžete urobiť z mobilného telefónu</string>
+    <string name="bootstrap_crosssigning_save_cloud">Skopírujte si ho na osobné úložisko v cloude</string>
+    <string name="bootstrap_crosssigning_save_usb">Uložte si ho na USB kľúč alebo iné zálohovacie médium</string>
+    <string name="bootstrap_crosssigning_print_it">Vytlačte si to a uložte na bezpečné miesto</string>
+    <string name="bootstrap_cross_signing_success">Vaše %2$s a %1$s sú teraz nastavené.
+\n
+\nUdržujte ich v bezpečí! Budete ich potrebovať na odomknutie zašifrovaných správ a zabezpečených informácií, ak stratíte všetky svoje aktívne relácie.</string>
+    <string name="bootstrap_save_key_description">Použite tento %1$s ako záchrannú sieť pre prípad, že zabudnete vašu %2$s.</string>
+    <string name="your_recovery_key">Váš kľúč na obnovenie</string>
+    <string name="bootstrap_loading_title">Nastavovanie obnovenia.</string>
+    <string name="bootstrap_loading_text">Môže to trvať niekoľko sekúnd, buďte prosím trpezliví.</string>
+    <string name="bootstrap_info_confirm_text">Opätovne zadajte %s a potvrďte ho.</string>
+    <string name="generate_message_key">Generovať kľúč správy</string>
+    <string name="verify_not_me_self_verification">Môže byť narušená jedna z nasledujúcich vecí:
+\n
+\n- vaše heslo
+\n- váš domovský server
+\n- toto zariadenie alebo iné zariadenie
+\n- internetové pripojenie, ktoré používa jedno zo zariadení
+\n
+\nOdporúčame vám okamžite zmeniť heslo a kľúč na obnovenie v Nastaveniach.</string>
+    <string name="verify_new_session_compromized">Váš účet môže byť ohrozený</string>
+    <string name="verify_new_session_notice">Túto reláciu použite na overenie novej relácie, čím jej udelíte prístup k zašifrovaným správam.</string>
+    <string name="new_session_review">Ťuknutím skontrolujte a overte</string>
+    <string name="new_session">Nové prihlásenie. Boli ste to vy\?</string>
+    <string name="e2e_use_keybackup">Odomknúť históriu zašifrovaných správ</string>
+    <string name="keys_backup_restore_success_title_already_up_to_date">Kľúče sú už aktualizované!</string>
+    <string name="delete_event_dialog_reason_checkbox">Uviesť dôvod</string>
+    <string name="delete_event_dialog_content">Ste si istí, že chcete odstrániť (vymazať) túto udalosť\? Všimnite si: ak vymažete zmenu názvu miestnosti alebo zmenu témy, môžete tak vrátiť zodpovedajúcu zmenu.</string>
+    <string name="send_images_and_video_with_original_size">Odoslať médiá s pôvodnou veľkosťou</string>
+    <plurals name="send_videos_with_original_size">
+        <item quantity="one">Odoslať video s pôvodnou veľkosťou</item>
+        <item quantity="few">Odoslať videá s pôvodnou veľkosťou</item>
+        <item quantity="other">Odoslať videá s pôvodnou veľkosťou</item>
+    </plurals>
+    <plurals name="send_images_with_original_size">
+        <item quantity="one">Odoslať obrázok s pôvodnou veľkosťou</item>
+        <item quantity="few">Odoslať obrázky s pôvodnou veľkosťou</item>
+        <item quantity="other">Odoslať obrázky s pôvodnou veľkosťou</item>
+    </plurals>
+    <string name="share_confirm_room">Chcete poslať túto prílohu do %1$s\?</string>
+    <string name="command_description_poll">Vytvorí jednoduchú anketu</string>
+    <string name="delete_account_data_warning">Odstrániť údaje účtu typu %1$s\?
+\n
+\nPoužívajte opatrne, môže to viesť k neočakávanému správaniu.</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">Režim lietadla je zapnutý</string>
+    <string name="no_connectivity_to_the_server_indicator">Spojenie so serverom bolo prerušené</string>
+    <string name="reset_cross_signing">Obnoviť kľúče</string>
+    <string name="verification_profile_device_untrust_info">Pokiaľ tento používateľ nezačne tejto relácii dôverovať, správy odoslané do nej a z nej sú označené varovaním. Môžete ju tiež overiť ručne.</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) sa prihlásil pomocou novej relácie:</string>
+    <string name="verification_profile_device_verified_because">Táto relácia je dôveryhodná pre bezpečné zasielanie správ, pretože ju overil %1$s (%2$s):</string>
+    <string name="room_member_profile_failed_to_get_devices">Nepodarilo sa získať relácie</string>
+    <string name="crosssigning_other_user_not_trust">Ostatní používatelia jej nemusia dôverovať</string>
+    <string name="settings_active_sessions_unverified_device_desc">Overte túto reláciu, aby ste ju označili za dôveryhodnú a udelili jej prístup k šifrovaným správam. Ak ste sa do tejto relácie neprihlásili, vaše konto môže byť ohrozené:</string>
+    <string name="settings_active_sessions_verified_device_desc">Táto relácia je dôveryhodná pre bezpečné zasielanie správ, pretože ste ju overili:</string>
+    <string name="settings_failed_to_get_crypto_device_info">Nie sú k dispozícii žiadne kryptografické informácie</string>
+    <string name="settings_server_room_versions">Verzie miestnosti 👓</string>
+    <string name="settings_server_upload_size_unknown">Limit nie je známy.</string>
+    <string name="settings_server_upload_size_content">Váš domovský server prijíma prílohy (súbory, médiá atď.) s veľkosťou do %s.</string>
+    <string name="settings_server_upload_size_title">Limit nahrávania súborov na server</string>
+    <string name="settings_active_sessions_signout_device">Odhlásiť sa z tejto relácie</string>
+    <string name="encryption_information_dg_xsigning_disabled">Krížové podpisovanie nie je povolené</string>
+    <string name="verification_conclusion_ok_self_notice">Vaša nová relácia je teraz overená. Má prístup k vašim šifrovaným správam a ostatní používatelia ju uvidia ako dôveryhodnú.</string>
+    <string name="verification_code_notice">Porovnajte kód s kódom zobrazeným na obrazovke druhého používateľa.</string>
+    <string name="verification_emoji_notice">Porovnajte jedinečné emoji a uistite sa, že sú zobrazené v rovnakom poradí.</string>
+    <string name="verification_request_start_notice">Aby ste si boli istý, urobte to osobne alebo použite iný dôveryhodný spôsob komunikácie.</string>
+    <string name="verification_request_notice">Ak chcete byť v bezpečí, overte %s pomocou jednorazového kódu.</string>
+    <string name="room_settings_enable_encryption_dialog_content">Po zapnutí šifrovania pre miestnosť ho už nemožno vypnúť. Správy odoslané v zašifrovanej miestnosti nemôže vidieť server, iba účastníci miestnosti. Zapnutie šifrovania môže zabrániť správnemu fungovaniu mnohých botov a premostení.</string>
+    <string name="room_settings_enable_encryption_warning">Po zapnutí šifrovania ho nie je možné vypnúť.</string>
+    <string name="room_settings_enable_encryption_no_permission">Nemáte oprávnenie povoliť šifrovanie v tejto miestnosti.</string>
+    <string name="command_description_rainbow_emote">Odošle daný emotív sfarbený ako dúha</string>
+    <string name="command_description_rainbow">Odošle danú správu vo farbe dúhy</string>
+    <string name="verify_cannot_cross_sign">Táto relácia nemôže zdieľať toto overenie s vašimi ostatnými reláciami.
+\nOverenie bude uložené lokálne a zdieľané v budúcej verzii aplikácie.</string>
+    <string name="room_profile_section_admin">Akcie správcu</string>
+    <string name="verification_request_alert_description">V záujme zvýšenia bezpečnosti overte %s kontrolou jednorazového kódu na oboch zariadeniach.
+\n
+\nPre maximálnu bezpečnosť to urobte osobne.</string>
+    <string name="autocomplete_limited_results">Zobrazujú sa len prvé výsledky, zadajte ďalšie písmená…</string>
+    <string name="settings_rageshake_detection_threshold_summary">Zatraste telefónom a otestujte prah detekcie</string>
+    <string name="settings_rageshake_detection_threshold">Prahová hodnota detekcie</string>
+    <string name="permalink_malformed">Váš odkaz matrix.to bol nesprávne vytvorený</string>
+    <string name="template_soft_logout_sso_not_same_user_error">Aktuálna relácia je pre používateľa %1$s a vy ste zadali poverenia pre používateľa %2$s. Toto nie je podporované aplikáciou ${app_name}.
+\nNajprv vymažte údaje a potom sa znovu prihláste na inom účte.</string>
+    <string name="login_reset_password_on">Obnoviť heslo na %1$s</string>
+    <string name="login_registration_not_supported">Aplikácia nie je schopná vytvoriť konto na tomto domovskom serveri.
+\n
+\nChcete sa zaregistrovať pomocou webového klienta\?</string>
+    <string name="login_mode_not_supported">Aplikácia sa nemôže prihlásiť na tento domovský server. Tento domovský server podporuje nasledujúce typy prihlasovania: %1$s.
+\n
+\nChcete sa prihlásiť pomocou webového klienta\?</string>
+    <string name="login_sso_error_message">Pri načítaní stránky došlo k chybe: %1$s (%2$d)</string>
+    <string name="login_server_other_text">Vlastné a pokročilé nastavenia</string>
+    <string name="no_ignored_users">Neignorujete žiadnych používateľov</string>
+    <string name="reaction_search_type_hint">Zadajte kľúčové slová pre vyhľadanie reakcie.</string>
+    <string name="room_list_quick_actions_low_priority_remove">Odobrať z nízkej priority</string>
+    <string name="room_list_quick_actions_low_priority_add">Pridať k nízkej priorite</string>
+    <string name="no_network_indicator">Momentálne nie je k dispozícii žiadne sieťové pripojenie</string>
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} potrebuje povolenie na uloženie vašich šifrovacích kľúčov na disk.
+\n
+\nPovoľte prístup v ďalšom kontextovom okne, aby ste mohli svoje kľúče exportovať ručne.</string>
+    <string name="enter_secret_storage_passphrase_or_key">Na pokračovanie použite %1$s alebo %2$s.</string>
+    <string name="bootstrap_migration_enter_backup_password">Ak chcete pokračovať, zadajte prístupovú frázu pre zálohovanie kľúčov.</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Generovanie kľúča SSSS z prístupovej frázy %s</string>
+    <string name="bootstrap_progress_generating_ssss">Generovanie kľúča SSSS z prístupovej frázy</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Generuje sa bezpečný kľúč z prístupovej frázy</string>
+    <string name="enter_secret_storage_passphrase_warning_text">K tajnému úložisku by ste mali pristupovať len z dôveryhodného zariadenia</string>
+    <string name="enter_secret_storage_passphrase">Zadajte tajnú prístupovú frázu úložiska</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Zabezpečte sa pred stratou šifrovaných správ a údajov zálohovaním šifrovacích kľúčov na vašom serveri.</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">Krížové podpisovanie je povolené.
+\nKľúče nie sú dôveryhodné</string>
+    <string name="encryption_information_dg_xsigning_trusted">Krížové podpisovanie je povolené
+\nKľúče sú dôveryhodné.
+\nSúkromné kľúče nie sú známe</string>
+    <string name="encryption_information_dg_xsigning_complete">Krížové podpisovanie je povolené
+\nSúkromné kľúče v zariadení.</string>
+    <string name="set_a_security_phrase_again_notice">Zadajte svoju bezpečnostnú frázu znova, aby ste ju potvrdili.</string>
+    <string name="set_a_security_phrase_notice">Zadajte bezpečnostnú frázu, ktorú poznáte len vy a ktorá sa používa na zabezpečenie tajomstiev na vašom serveri.</string>
+    <string name="set_a_security_phrase_title">Nastaviť bezpečnostnú frázu</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Použiť bezpečnostnú frázu</string>
+    <string name="bootstrap_info_text_2">Zadajte bezpečnostnú frázu, ktorú poznáte len vy a ktorá sa používa na zabezpečenie tajomstiev na vašom serveri.</string>
+    <string name="save_your_security_key_notice">Bezpečnostný kľúč uložte na bezpečnom mieste, napríklad v správcovi hesiel alebo v trezore.</string>
+    <string name="save_your_security_key_title">Uložte svoj bezpečnostný kľúč</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Bezpečnostný kľúč uložte na bezpečnom mieste, napríklad v správcovi hesiel alebo v trezore.</string>
+    <string name="bottom_sheet_save_your_recovery_key_title">Uložte svoj bezpečnostný kľúč</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Zadajte tajnú frázu, ktorú poznáte len vy, a vygenerujte kľúč na zálohovanie.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Vygenerujte bezpečnostný kľúč a uložte ho na bezpečné miesto, napríklad do správcu hesiel alebo trezora.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Použiť bezpečnostný kľúč</string>
+    <string name="user_code_share">Zdieľať môj kód</string>
+    <string name="dev_tools_error_malformed_event">Chybne vytvorená udalosť</string>
+    <string name="universal_link_malformed">Odkaz bol nesprávne vytvorený</string>
+    <string name="open_terms_of">Otvoriť podmienky %s</string>
+    <string name="settings_key_requests">Žiadosti o kľúče</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Zobraziť celú históriu v zašifrovaných miestnostiach</string>
+    <string name="settings_security_prevent_screenshots_summary">Povolením tohto nastavenia sa pridá FLAG_SECURE ku všetkým činnostiam. Reštartujte aplikáciu, aby sa zmena prejavila.</string>
+    <string name="settings_security_prevent_screenshots_title">Zabrániť snímkam obrazovky aplikácie</string>
+    <string name="auth_pin_confirm_to_disable_title">Potvrďte kód PIN, ak chcete deaktivovať kód PIN</string>
+    <string name="settings_security_pin_code_change_pin_summary">Zmeňte svoj aktuálny kód PIN</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">PIN kód sa vyžaduje pri každom otvorení aplikácie ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">PIN kód sa vyžaduje po 2 minútach nepoužívania ${app_name}.</string>
+    <string name="settings_security_pin_code_grace_period_title">Vyžadovať PIN po 2 minútach</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN kód je jediný spôsob, ako odomknúť ${app_name}.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Povoliť biometriu špecifickú pre zariadenie, ako sú odtlačky prstov a rozpoznávanie tváre.</string>
+    <string name="settings_security_pin_code_summary">Ak chcete vynulovať kód PIN, ťuknite na položku Zabudnutý kód PIN, čím sa odhlásite a vynulujete ho.</string>
+    <string name="auth_pin_reset_content">Ak chcete obnoviť kód PIN, musíte sa znovu prihlásiť a vytvoriť nový.</string>
+    <string name="wrong_pin_message_last_remaining_attempt">Varovanie! Posledný pokus pred odhlásením!</string>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Nesprávny kód, zostáva %d pokus</item>
+        <item quantity="few">Nesprávny kód, zostávajú %d pokusy</item>
+        <item quantity="other">Nesprávny kód, zostáva %d pokusov</item>
+    </plurals>
+    <string name="settings_security_application_protection_summary">Ochrana prístupu pomocou kódu PIN a biometrických údajov.</string>
+    <string name="settings_security_application_protection_title">Ochrana prístupu</string>
+    <string name="settings_troubleshoot_test_notification_title">Zobrazenie oznámení</string>
+    <string name="discovery_section">Objavovanie (%s)</string>
+    <string name="finish_setting_up_discovery">Dokončiť nastavenie objavovania.</string>
+    <string name="settings_discovery_consent_action_give_consent">Udeliť súhlas</string>
+    <string name="settings_discovery_consent_action_revoke">Odvolať môj súhlas</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} vyžaduje, aby ste na vykonanie tejto akcie zadali svoje poverenia.</string>
+    <string name="event_status_a11y_delete_all">Odstrániť všetky neúspešné správy</string>
+    <string name="event_status_failed_messages_warning">Správy sa nepodarilo odoslať</string>
+    <string name="event_status_delete_all_failed_dialog_title">Vymazať neodoslané správy</string>
+    <string name="event_status_delete_all_failed_dialog_message">Určite chcete vymazať všetky neodoslané správy v tejto miestnosti\?</string>
+    <string name="invite_by_email">Pozvať pomocou e-mailu</string>
+    <string name="skip_for_now">Zatiaľ preskočiť</string>
+    <string name="join_anyway">Pripojiť sa aj tak</string>
+    <string name="room_alias_preview_not_found">Tento alias nie je v súčasnosti dostupný.
+\nSkúste to neskôr alebo požiadajte správcu miestnosti, aby skontroloval, či máte prístup.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Zatiaľ nie ste v žiadnej miestnosti. Nižšie sú uvedené niektoré navrhované miestnosti, ale ďalšie si môžete pozrieť pomocou zeleného tlačidla vpravo dole.</string>
+    <string name="suggested_rooms_pills_on_empty_header">Vitajte v %1$s, %2$s.</string>
+    <string name="send_file_step_compressing_video">Kompresia videa %d%%</string>
+    <string name="user_invites_you">%s vás pozval</string>
+    <string name="you_may_contact_me">V prípade ďalších otázok ma môžete kontaktovať</string>
+    <string name="feedback_sent">Ďakujeme, vaša spätná väzba bola úspešne odoslaná</string>
+    <string name="error_failed_to_join_room">Ospravedlňujeme sa, pri pokuse o pripojenie došlo k chybe: %s</string>
+    <string name="command_description_upgrade_room">Aktualizuje miestnosť na novšiu verziu</string>
+    <string name="it_may_take_some_time">Buďte prosím trpezliví, môže to chvíľu trvať.</string>
+    <string name="upgrade_public_room">Aktualizovať verejnú miestnosť</string>
+    <string name="upgrade_private_room">Aktualizovať súkromnú miestnosť</string>
+    <string name="upgrade_room_warning">Aktualizácia miestnosti je pokročilá akcia a zvyčajne sa odporúča, keď je miestnosť nestabilná kvôli chybám, chýbajúcim funkciám alebo bezpečnostným zraniteľnostiam.
+\nZvyčajne to má vplyv len na spôsob spracovania miestnosti na serveri.</string>
+    <string name="upgrade_public_room_from_to">Túto miestnosť aktualizujete z %1$s na %2$s.</string>
+    <string name="upgrade_room_no_power_to_manage">Na aktualizáciu miestnosti potrebujete povolenie</string>
+    <string name="room_using_unstable_room_version">Táto miestnosť používa verziu miestnosti %s, ktorú tento domovský server označil ako nestabilnú.</string>
+    <string name="room_upgrade_to_recommended_version">Aktualizovať na odporúčanú verziu miestnosti</string>
+    <string name="a11y_play_voice_message">Prehrať hlasovú správu</string>
+    <string name="a11y_pause_voice_message">Pozastaviť hlasovú správu</string>
+    <string name="labs_use_voice_message">Povoliť hlasovú správu</string>
+    <string name="error_voice_message_unable_to_play">Nie je možné prehrať túto hlasovú správu</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Nemôžete odpovedať ani upravovať, kým je hlasová správa aktívna</string>
+    <string name="voice_message_reply_content">Hlasová správa (%1$s)</string>
+    <string name="upgrade_room_for_restricted_note">Vezmite prosím na vedomie, že aktualizácia vytvorí novú verziu miestnosti. Všetky aktuálne správy zostanú v tejto archivovanej miestnosti.</string>
+    <string name="call_slide_to_end_conference">Posunutím ukončíte hovor</string>
+    <string name="call_jitsi_started">Začal sa skupinový hovor</string>
+    <string name="link_this_email_settings_link">Prepojte tento e-mail so svojím účtom</string>
+    <string name="user_directory_search_hint_2">Vyhľadávať podľa mena, ID alebo e-mailu</string>
+    <string name="open_discovery_settings">Otvoriť nastavenia objavovania</string>
+    <string name="discovery_invite">Pozvať e-mailom, nájsť kontakty a ďalšie…</string>
+    <string name="finish_setup">Dokončiť nastavenie</string>
+    <string name="command_description_ignore_user">Ignoruje používateľa a skryje pred vami jeho správy</string>
+    <string name="command_description_unignore_user">Prestane ignorovať používateľa a začne zobrazovať jeho správy</string>
+    <string name="command_description_room_name">Nastaví názov miestnosti</string>
+    <string name="command_description_nick_for_room">Zmení vaše zobrazované meno len v aktuálnej miestnosti</string>
+    <string name="command_description_room_avatar">Zmení obrázok aktuálnej miestnosti</string>
+    <string name="command_description_avatar_for_room">Zmení váš obrázok len pre túto miestnosť</string>
+    <string name="command_description_whois">Zobrazuje informácie o používateľovi</string>
+    <string name="settings_discovery_show_identity_server_policy_title">Zobraziť pravidlá a zásady servera totožností</string>
+    <string name="settings_discovery_hide_identity_server_policy_title">Skryť pravidlá a zásady servera totožností</string>
+    <string name="settings_discovery_no_policy_provided">Server totožností neposkytuje žiadne pravidlá a zásady</string>
+    <string name="settings_discovery_consent_notice_off_2">Vaše kontakty sú súkromné. Aby sme mohli zistiť používateľov z vašich kontaktov, potrebujeme vaše povolenie na odoslanie kontaktných informácií na váš server totožností.</string>
+    <string name="create_poll_question_title">Otázka alebo téma ankety</string>
+    <string name="create_poll_question_hint">Otázka alebo téma</string>
+    <string name="create_poll_options_hint">Možnosť %1$d</string>
+    <string name="create_poll_add_option">PRIDAŤ MOŽNOSŤ</string>
+    <string name="create_poll_button">VYTVORIŤ ANKETU</string>
+    <string name="create_poll_empty_question_error">Otázka nemôže byť prázdna</string>
+    <plurals name="create_poll_not_enough_options_error">
+        <item quantity="one">Vyžaduje sa aspoň %1$s možnosť</item>
+        <item quantity="few">Vyžadujú sa aspoň %1$s možnosti</item>
+        <item quantity="other">Vyžaduje sa aspoň %1$s možností</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_before_ended_and_voted">
+        <item quantity="one">Na základe %1$d hlasu</item>
+        <item quantity="few">Na základe %1$d hlasov</item>
+        <item quantity="other">Na základe %1$d hlasov</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_before_ended_and_not_voted">
+        <item quantity="one">%1$d odovzdaný hlas. Hlasujte a pozrite si výsledky</item>
+        <item quantity="few">%1$d odovzdané hlasy. Hlasujte a pozrite si výsledky</item>
+        <item quantity="other">%1$d odovzdaných hlasov. Hlasujte a pozrite si výsledky</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_after_ended">
+        <item quantity="one">Konečný výsledok na základe %1$d hlasu</item>
+        <item quantity="few">Konečný výsledok na základe %1$d hlasov</item>
+        <item quantity="other">Konečný výsledok na základe %1$d hlasov</item>
+    </plurals>
+    <string name="end_poll_confirmation_title">Ukončiť túto anketu\?</string>
+    <string name="end_poll_confirmation_description">Týmto sa zastaví možnosť hlasovania a zobrazia sa konečné výsledky ankety.</string>
+    <string name="delete_poll_dialog_content">Určite chcete túto anketu odstrániť\? Po odstránení ju už nebudete môcť obnoviť.</string>
+    <string name="a11y_trust_level_misconfigured">Nesprávne nastavená úroveň dôveryhodnosti</string>
+    <string name="edit_poll_button">UPRAVIŤ ANKETU</string>
+    <string name="poll_type_title">Typ ankety</string>
+    <string name="open_poll_option_title">Otvoriť anketu</string>
+    <string name="open_poll_option_description">Hlasujúci uvidia výsledky hneď po hlasovaní</string>
+    <string name="closed_poll_option_title">Uzavretá anketa</string>
+    <string name="action_view_threads">Zobraziť vlákna</string>
+    <string name="command_not_supported_in_threads">Príkaz \"%s\" bol rozpoznaný, ale nie je podporovaný vo vláknach.</string>
+    <string name="reply_in_thread">Odpovedať vo vlákne</string>
+    <string name="view_in_room">Zobraziť v miestnosti</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Toto vlákno si už prezeráte!</string>
+    <string name="ftue_auth_use_case_title">S kým budete komunikovať najčastejšie\?</string>
+    <string name="ftue_auth_use_case_subtitle">Pomôžeme vám pripojiť sa.</string>
+    <string name="ftue_auth_use_case_option_one">Priatelia a rodina</string>
+    <string name="ftue_auth_use_case_option_two">Tímy</string>
+    <string name="ftue_auth_use_case_option_three">Komunity</string>
+    <string name="ftue_auth_use_case_skip">Ešte si nie ste istí\? Môžete %s</string>
+    <string name="ftue_auth_use_case_skip_partial">preskočiť túto otázku</string>
+    <string name="ftue_auth_use_case_connect_to_server">Pripojiť sa k serveru</string>
+    <string name="labs_enable_thread_messages">Povoliť správy vo vláknach</string>
+    <string name="labs_enable_thread_messages_desc">Poznámka: aplikácia sa reštartuje</string>
+    <string name="a11y_static_map_image">Mapa</string>
+    <string name="location_timeline_failed_to_load_map">Nepodarilo sa načítať mapu</string>
+    <string name="message_bubbles">Zobraziť správy v bublinách</string>
+    <string name="error_jitsi_join_conf">Ospravedlňujeme sa, pri pokuse o pripojenie ku konferencii došlo k chybe</string>
+    <string name="directory_add_a_new_server_error_already_added">Tento server sa už nachádza v zozname</string>
+    <string name="directory_add_a_new_server_error">Nemôžeme nájsť tento server alebo jeho zoznam miestností</string>
+    <string name="directory_add_a_new_server_prompt">Zadajte názov nového servera, ktorý chcete preskúmať.</string>
+    <string name="directory_add_a_new_server">Pridať nový server</string>
+    <string name="decide_who_can_find_and_join">Rozhodnite, kto môže túto miestnosť nájsť a pripojiť sa k nej.</string>
+    <string name="room_settings_room_access_public_description">Ktokoľvek môže nájsť miestnosť a pripojiť sa</string>
+    <string name="room_settings_room_access_private_description">Nájsť a pripojiť sa môžu len pozvaní ľudia</string>
+    <string name="room_settings_room_access_private_invite_only_title">Súkromné (len pre pozvaných)</string>
+    <string name="room_settings_room_access_entry_unknown">Neznáme nastavenie prístupu (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Ktokoľvek môže zaklopať na miestnosť, členovia ho potom môžu prijať alebo odmietnuť</string>
+    <string name="room_alias_publish_to_directory_error">Nie je možné načítať viditeľnosť aktuálneho adresára miestnosti (%1$s).</string>
+    <string name="room_alias_publish_to_directory">Zverejniť túto miestnosť verejnosti v adresári miestností %1$s\?</string>
+    <string name="room_alias_local_address_empty">Pre túto miestnosť nie sú žiadne miestne adresy</string>
+    <string name="room_alias_local_address_add">Pridať miestnu adresu</string>
+    <string name="room_alias_local_address_subtitle">Nastavte adresy pre túto miestnosť, aby ju používatelia mohli nájsť prostredníctvom vášho domovského servera (%1$s)</string>
+    <string name="room_alias_address_hint">Nová zverejnená adresa (napr. #alias:server)</string>
+    <string name="room_alias_address_empty">Zatiaľ neboli zverejnené žiadne ďalšie adresy.</string>
+    <string name="room_alias_address_empty_can_add">Zatiaľ neboli zverejnené žiadne ďalšie adresy, pridajte jednu nižšie.</string>
+    <string name="room_alias_publish">Zverejniť túto miestnosť v adresári miestností %1$s\?</string>
+    <string name="room_alias_delete_confirmation">Vymazať adresu \"%1$s\"\?</string>
+    <string name="room_alias_unpublish_confirmation">Zrušiť zverejnenie adresy \"%1$s\"\?</string>
+    <string name="room_alias_published_alias_add_manually">Zverejnite novú adresu ručne</string>
+    <string name="room_alias_published_alias_main">Toto je hlavná adresa</string>
+    <string name="room_alias_published_alias_subtitle">Zverejnené adresy môže použiť ktokoľvek na akomkoľvek serveri, aby sa pripojil k vašej miestnosti. Ak chcete zverejniť adresu, musíte ju najprv nastaviť ako miestnu adresu.</string>
+    <string name="room_settings_alias_subtitle">Zobraziť a spravovať adresy tejto miestnosti a jej viditeľnosť v adresári miestností.</string>
+    <string name="room_settings_guest_access_title">Umožniť hosťom pripojiť sa</string>
+    <string name="room_settings_access_rules_pref_dialog_title">Kto má prístup\?</string>
+    <string name="room_settings_room_read_history_dialog_subtitle">Zmeny týkajúce sa toho, kto môže čítať históriu, sa budú vzťahovať len na budúce správy v tejto miestnosti. Viditeľnosť existujúcej histórie zostane nezmenená.</string>
+    <string name="legals_no_policy_provided">Tento server neposkytuje žiadne zásady a pravidlá.</string>
+    <string name="settings_show_emoji_keyboard_summary">Pridať tlačidlo do editora správ na otvorenie klávesnice emodži</string>
+    <string name="settings_show_emoji_keyboard">Zobraziť klávesnicu emodži</string>
+    <string name="settings_chat_effects_description">Použite príkaz /confetti alebo pošlite správu obsahujúcu ❄️ alebo 🎉</string>
+    <string name="settings_chat_effects_title">Zobraziť efekty konverzácie</string>
+    <string name="shortcut_disabled_reason_sign_out">Relácia bola odhlásená!</string>
+    <string name="search_thread_from_a_thread">Z vlákna</string>
+    <string name="thread_list_empty_notice">Tip: Dlho ťuknite na správu a použite \"%s\".</string>
+    <string name="thread_list_empty_subtitle">Vlákna pomáhajú udržiavať konverzácie v téme a ľahké sledovanie.</string>
+    <string name="thread_list_empty_title">Udržujte diskusie organizované pomocou vlákien</string>
+    <string name="thread_list_modal_my_threads_subtitle">Zobrazí všetky vlákna, v ktorých ste sa zúčastnili</string>
+    <string name="thread_list_modal_my_threads_title">Moje vlákna</string>
+    <string name="thread_list_modal_all_threads_subtitle">Zobrazí všetky vlákna z aktuálnej miestnosti</string>
+    <string name="thread_list_modal_all_threads_title">Všetky vlákna</string>
+    <string name="thread_list_modal_title">Filter</string>
+    <string name="thread_list_title">Vlákna</string>
+    <string name="thread_timeline_title">Vlákno</string>
+    <string name="room_threads_filter">Filtrovať vlákna v miestnosti</string>
+    <string name="call_remove_jitsi_widget_progress">Ukončenie hovoru…</string>
+    <string name="call_ringing">Vyzváňanie hovoru…</string>
+    <string name="action_thread_copy_link_to_thread">Kopírovať odkaz na vlákno</string>
+    <string name="action_thread_view_in_room">Zobraziť v miestnosti</string>
+    <string name="a11y_view_read_receipts">Zobraziť potvrdenia o prečítaní</string>
+    <string name="a11y_import_key_from_file">Importovať kľúč zo súboru</string>
+    <string name="call_tile_you_declined">Odmietli ste tento hovor %s</string>
+    <string name="error_adding_media_file_to_gallery">Do galérie sa nepodarilo pridať mediálny súbor</string>
+    <string name="bootstrap_migration_backup_recovery_key">Kľúč obnovy zálohy kľúča</string>
+    <string name="bootstrap_progress_compute_curve_key">Získavanie kľúča krivky</string>
+    <string name="login_server_url_form_modular_hint">Adresa služby Element Matrix Services</string>
+    <string name="spoiler">Spojler</string>
+    <string name="command_description_spoiler">Odošle danú správu ako spojler</string>
+    <string name="content_reported_as_inappropriate_title">Nahlásené ako nevhodné</string>
+    <plurals name="fallback_users_read">
+        <item quantity="one">%d používateľ prečítal</item>
+        <item quantity="few">%d používatelia prečítali</item>
+        <item quantity="other">%d používatelia prečítali</item>
+    </plurals>
+    <string name="two_users_read">%1$s a %2$s prečítali</string>
+    <string name="three_users_read">%1$s, %2$s a %3$s prečítali</string>
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s a %3$d ďalší prečítal</item>
+        <item quantity="few">%1$s, %2$s a %3$d ďalší prečítali</item>
+        <item quantity="other">%1$s, %2$s a %3$d ďalší prečítali</item>
+    </plurals>
+    <string name="you_are_invited">Ste pozvaní</string>
+    <string name="a11y_trust_level_trusted">Dôveryhodná úroveň</string>
+    <string name="a11y_trust_level_default">Predvolená úroveň dôveryhodnosti</string>
+    <string name="a11y_error_some_message_not_sent">Niektoré správy neboli odoslané</string>
+    <string name="warning_unsaved_change">Existujú neuložené zmeny. Chcete zrušiť tieto zmeny\?</string>
+    <string name="matrix_to_card_title">Odkaz na Matrix</string>
+    <string name="room_error_not_found">Túto miestnosť nie je možné nájsť. Uistite sa, že existuje.</string>
+    <string name="error_opening_banned_room">Nemôžete otvoriť miestnosť, do ktorej máte zákaz vstupu.</string>
+    <string name="enter_secret_storage_invalid">Nie je možné nájsť tajné údaje v úložisku</string>
+    <string name="content_reported_as_inappropriate_content">Tento obsah bol nahlásený ako nevhodný.
+\n
+\nAk nechcete vidieť ďalší obsah od tohto používateľa, môžete ho ignorovať a skryť jeho správy.</string>
+    <string name="direct_room_user_list_known_title">Známi používatelia</string>
+    <string name="room_preview_no_preview_join">Túto miestnosť nie je možné zobraziť v náhľade. Chcete sa k nej pripojiť\?</string>
+    <string name="a11y_open_emoji_picker">Otvoriť výber emotikonov</string>
+    <string name="a11y_close_emoji_picker">Zatvoriť výber emotikonov</string>
+    <string name="a11y_error_message_not_sent">Správa nebola odoslaná kvôli chybe</string>
+    <string name="a11y_rule_notify_silent">Oznámiť bez zvuku</string>
+    <string name="a11y_rule_notify_off">Neoznamovať</string>
+    <string name="dev_tools_form_hint_event_content">Obsah udalosti</string>
+    <string name="dev_tools_error_no_content">Žiadny obsah</string>
+    <string name="dev_tools_success_event">Udalosť odoslaná!</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} nespracováva správy typu \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} nespracováva udalosti typu \'%1$s\'</string>
+    <string name="search_hint_room_name">Hľadať názov</string>
+    <string name="feedback_failed">Spätnú väzbu sa nepodarilo odoslať (%s)</string>
+    <string name="settings_developer_mode_show_info_on_screen_title">Zobraziť informácie o ladení chýb na obrazovke</string>
+    <string name="room_member_override_nick_color">Nahradiť farbu prezývky</string>
+    <string name="ftue_auth_use_case_join_existing_server">Chcete sa pripojiť k existujúcemu serveru\?</string>
+    <string name="event_redacted_by_admin_reason_with_reason">Udalosť bola upravená administrátorom miestnosti, dôvod: %1$s</string>
+    <string name="room_preview_not_found">Táto miestnosť je momentálne neprístupná.
+\nSkúste to neskôr alebo požiadajte správcu miestnosti, aby skontroloval, či máte prístup.</string>
+    <string name="call_transfer_transfer_to_title">Presmerovať na používateľa %1$s</string>
+    <string name="call_transfer_failure">Počas presmerovania hovoru došlo k chybe</string>
+    <string name="call_transfer_title">Presmerovať</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index d93331777f..f86b0515c7 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2387,7 +2387,6 @@
     <string name="settings_troubleshoot_test_push_loop_failed">S’u arrit të merrej push. Zgjidhje mund të jetë riinstalimi i aplikacionit.</string>
     <string name="settings_troubleshoot_test_push_loop_success">Aplikacioni po merr PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Aplikacioni po pret për PUSH-in</string>
-    <string name="search_is_not_supported_in_e2e_room">Kërkimi në dhoma të fshehtëzuara nuk mbulohet ende.</string>
     <string name="search_banned_user_hint">Filtro përdorues të dëbuar</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">S’keni leje të nisni një thirrje</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">S’keni leje të nisni një thirrje konferencë</string>
@@ -2689,7 +2688,6 @@
     <string name="create_spaces_join_info_help">Që të hyni në një hapësirë ekzistuese, ju duhet një ftesë.</string>
     <string name="create_spaces_you_can_change_later">Këtë mund ta ndryshoni më vonë</string>
     <string name="create_spaces_choose_type_label">Ç’lloj hapësire doni të krijoni\?</string>
-    <string name="create_spaces_type_header">Hapësirat janë një mënyrë e re për të grupuar dhoma dhe persona</string>
     <string name="your_private_space">Hapësira juaj private</string>
     <string name="your_public_space">Hapësira juaj publike</string>
     <string name="add_space">Shtoni Hapësirë</string>
@@ -2851,15 +2849,10 @@
     <string name="settings_notification_other">Tjetër</string>
     <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ë Element.</string>
+    <string name="template_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="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="to_help_space_members_find_and_join">Për t’i ndihmuar anëtarët të gjejnë dhe hyjnë në një dhomë private, kaloni te rregullimet e asaj dhome duke prekur mbi avatarin.</string>
-    <string name="help_space_members">Ndihmoni anëtarë hapësirash të gjejnë dhoma private</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Kjo e bën të lehtë mbajtjen private të dhomave në një hapësirë, ndërkohë që u lejon njerëzve në hapësirë të gjejnë dhe hyjnë në të tilla. Krejt dhomat e reja në një hapësirë do ta ofrojnë këtë mundësi.</string>
-    <string name="help_people_in_spaces_find_and_join">Ndihmojini njerëzit në hapësira të gjejnë dhe hyjnë vetë në dhoma private, pa pasur nevojë për ftesë dorazi të gjithkujt.</string>
-    <string name="new_let_people_in_spaces_find_and_join">E re: Lejoni persona në hapësira të gjejnë dhe hyjnë në dhoma private</string>
     <string name="call_jitsi_started">U fillua thirrje grupi</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Krejt dhomat ku gjendeni do të shfaqen te Home.</string>
     <string name="preference_show_all_rooms_in_home">Shfaq krejt dhomat te Home</string>
@@ -3013,7 +3006,7 @@
     <string name="attachment_type_poll">Pyetësor</string>
     <string name="preference_system_settings">Rregullime sistemi</string>
     <string name="preference_versions">Versione</string>
-    <string name="preference_help_summary">Merrni ndihmë për përdorimin e Element-it</string>
+    <string name="template_preference_help_summary">Merrni ndihmë për përdorimin e ${app_name}-it</string>
     <string name="preference_help_title">Ndihmë dhe asistencë</string>
     <string name="preference_help">Ndihmë</string>
     <string name="preference_root_legals">Ligjore</string>
@@ -3026,10 +3019,10 @@
     <string name="analytics_opt_in_list_item_2"><b>Nuk</b> u japin hollësi palëve të treta</string>
     <string name="analytics_opt_in_list_item_1"><b>Nuk</b> regjistrojmë ose profilizojmë ndonjë të dhënë llogarie</string>
     <string name="analytics_opt_in_content_link">këtu</string>
-    <string name="analytics_opt_in_content">Ndihmonani të identifikojmë probleme dhe të përmirësojmë Element-in, duke ndarë me ne të dhëna anonime përdorimi. Për të kuptuar se si i përdorin njerëzit disa pajisje njëherësh, do të prodhojmë një identifikues kuturu, të përbashkët për pajisjet tuaja.
+    <string name="template_analytics_opt_in_content">Ndihmonani të identifikojmë probleme dhe të përmirësojmë ${app_name}-in, duke ndarë me ne të dhëna anonime përdorimi. Për të kuptuar se si i përdorin njerëzit disa pajisje njëherësh, do të prodhojmë një identifikues kuturu, të përbashkët për pajisjet tuaja.
 \n
 \nMund të lexoni krejt kushtet tona %s.</string>
-    <string name="analytics_opt_in_title">Ndihmoni të përmirësohet Element-in</string>
+    <string name="template_analytics_opt_in_title">Ndihmoni të përmirësohet ${app_name}-in</string>
     <string name="action_enable">Aktivizoje</string>
     <plurals name="poll_total_vote_count_before_ended_and_not_voted">
         <item quantity="one">%1$d votë e hedhur. Votoni, që të shihni përfundimet</item>
@@ -3048,9 +3041,9 @@
     <string name="labs_auto_report_uisi">Raporto Vetvetiu Gabime Shfshehtëzimi.</string>
     <string name="room_member_override_nick_color">Anashkalo ngjyrë nofke</string>
     <string name="login_splash_already_have_account">Kam tashmë një llogari</string>
-    <string name="ftue_auth_carousel_3_title">Shkëmbim i siguruar mesazhesh.</string>
-    <string name="ftue_auth_carousel_2_title">Kontrollin e keni ju.</string>
-    <string name="ftue_auth_carousel_1_title">Jini zot i bisedave tuaja.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Shkëmbim i siguruar mesazhesh.</string>
+    <string name="ftue_auth_carousel_control_title">Kontrollin e keni ju.</string>
+    <string name="ftue_auth_carousel_secure_title">Jini zot i bisedave tuaja.</string>
     <string name="tooltip_attachment_location">Jepe vendndodhjen</string>
     <string name="settings_enable_location_sharing">Aktivizoni dhënie vendndodhjeje</string>
     <string name="location_share">Jepe vendndodhjen</string>
@@ -3063,10 +3056,10 @@
     <string name="open_poll_option_title">Anketim i hapur</string>
     <string name="poll_type_title">Lloj anketimi</string>
     <string name="login_splash_create_account">Krijoni llogari</string>
-    <string name="ftue_auth_carousel_title_messaging">Shkëmbim mesazhesh për ekipin tuaj.</string>
-    <string name="ftue_auth_carousel_body_encrypted">I fshehtëzuar skaj më skaj dhe pa u dashur numër telefoni. Pa reklama, apo shfrytëzim të dhënash.</string>
-    <string name="ftue_auth_carousel_body_control">Zgjidhni ku mbahen bisedat tuaja, duke ju dhënë kontroll dhe pavarësi. Të lidhur përmes Matrix-i.</string>
-    <string name="ftue_auth_carousel_body_secure">Komunikim i sigurt dhe i pavarur, që ju jep të njëjtën shkallë privatësie si biseda kokë më kokë, në shtëpinë tuaj.</string>
+    <string name="ftue_auth_carousel_workplace_title">Shkëmbim mesazhesh për ekipin tuaj.</string>
+    <string name="ftue_auth_carousel_encrypted_body">I fshehtëzuar skaj më skaj dhe pa u dashur numër telefoni. Pa reklama, apo shfrytëzim të dhënash.</string>
+    <string name="ftue_auth_carousel_control_body">Zgjidhni ku mbahen bisedat tuaja, duke ju dhënë kontroll dhe pavarësi. Të lidhur përmes Matrix-i.</string>
+    <string name="ftue_auth_carousel_secure_body">Komunikim i sigurt dhe i pavarur, që ju jep të njëjtën shkallë privatësie si biseda kokë më kokë, në shtëpinë tuaj.</string>
     <string name="labs_render_locations_in_timeline">Trego vendndodhje përdoruesi në rrjedhën kohore</string>
     <string name="settings_enable_location_sharing_summary">Pasi të aktivizohet, do të jeni në gjendje të dërgoni vendndodhjen tuaj në çfarëdo dhome</string>
     <string name="location_share_external">Hape me</string>
@@ -3084,4 +3077,38 @@
     <string name="attachment_type_location">Vendndodhje</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">Fshehtëzimi është formësuar keq, që të mos dërgoni mesazhe. Klikoni që të hapni rregullimet.</string>
     <string name="room_unsupported_e2e_algorithm">Fshehtëzimi është formësuar keq, që të mos dërgoni mesazhe. Ju lutemi, lidhuni me një nga përgjegjësit që ta ktheni fshehtëzimin në një gjendje të vlefshme.</string>
+    <string name="message_bubbles">Shfaq Flluska mesazhesh</string>
+    <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="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>
+    <string name="ftue_auth_use_case_skip">Ende i pasigurt\? Mundeni %s</string>
+    <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_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>
+    <string name="reply_in_thread">Përgjigjuni Te Rrjedha</string>
+    <string name="command_not_supported_in_threads">Urdhri “%s” njihet, por nuk mbulohet në rrjedha.</string>
+    <string name="search_thread_from_a_thread">Nga një Rrjedhë</string>
+    <string name="thread_list_empty_notice">Ndihmëz: Prekni pakëz gjatë një mesazh dhe përdorni “%s”.</string>
+    <string name="thread_list_empty_subtitle">Rrjedhat ndihmojnë që të mbahet biseda juaj brenda temës dhe të ndiqet kollaj.</string>
+    <string name="thread_list_empty_title">Mbajini diskutimet të sistemuara në rrjedha</string>
+    <string name="thread_list_modal_my_threads_subtitle">Shfaq krejt rrjedhat ku keni marrë pjesë</string>
+    <string name="thread_list_modal_my_threads_title">Rrjedhat e Mia</string>
+    <string name="thread_list_modal_all_threads_subtitle">Shfaq krejt rrjedhat në dhomën e tanishme</string>
+    <string name="thread_list_modal_all_threads_title">Krejt Rrjedhat</string>
+    <string name="thread_list_modal_title">Filtrojeni</string>
+    <string name="thread_list_title">Rrjedha</string>
+    <string name="thread_timeline_title">Rrjedhë</string>
+    <string name="room_threads_filter">Filtroni Rrjedha në dhomë</string>
+    <string name="send_bug_report_rage_shake">“Rage shake” që të njoftoni një të metë</string>
+    <string name="action_thread_copy_link_to_thread">Kopjoje lidhjen te rrjedha</string>
+    <string name="action_thread_view_in_room">Shiheni në dhomë</string>
+    <string name="action_view_threads">Shihni Rrjedha</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 6095f9f7bc..b5f0313e36 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -76,7 +76,7 @@
     <string name="notice_event_redacted_by">Meddelande borttaget av %1$s</string>
     <string name="notice_event_redacted_with_reason">Meddelande borttaget [anledning: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Meddelande borttaget av %1$s [anledning: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s uppdaterade sim profil %2$s</string>
+    <string name="notice_profile_change_redacted">%1$s uppdaterade sin profil %2$s</string>
     <string name="notice_profile_change_redacted_by_you">Du uppdaterade din profil %1$s</string>
     <string name="notice_room_third_party_invite">%1$s bjöd in %2$s att gå med i rummet</string>
     <string name="notice_room_third_party_invite_by_you">Du bjöd in %1$s att gå med i rummet</string>
@@ -582,7 +582,7 @@
     <string name="_continue">Fortsätt</string>
     <string name="action_remove">Ta bort</string>
     <string name="action_join">Gå med</string>
-    <string name="action_preview">Förhandsvisning</string>
+    <string name="action_preview">Förhandsgranskning</string>
     <string name="action_reject">Avslå</string>
     <string name="list_members">Lista medlemmar</string>
     <string name="open_chat_header">Öppna rubrik</string>
@@ -593,7 +593,7 @@
 \nDu kanske vill logga in på ett annat konto eller lägga till den här e-postadressen till det här kontot.</string>
     <string name="room_preview_try_join_an_unknown_room">Du försöker komma åt %s. Skulle du vilja gå med för att delta i diskussionen\?</string>
     <string name="room_preview_try_join_an_unknown_room_default">ett rum</string>
-    <string name="room_preview_room_interactions_disabled">Det här är en förhandsvisning av det här rummet. Rumsinteraktioner har blivit inaktiverade.</string>
+    <string name="room_preview_room_interactions_disabled">Det här är en förhandsgranskning av det här rummet. Rumsinteraktioner har blivit inaktiverade.</string>
     <string name="invite_no_identity_server_error">Lägg till en identitetsserver i dina inställningar för att utföra den här handlingen.</string>
     <string name="room_creation_title">Ny chatt</string>
     <string name="room_creation_add_member">Lägg till medlem</string>
@@ -660,7 +660,7 @@
     <string name="failed_to_load_timeline_position">%s försökte ladda en specifik punkt i det här rummets tidslinje, men kunde inte hitta den.</string>
     <string name="directory_server_type_homeserver">Skriv en hemserver att visa listan över offentliga rum från</string>
     <string name="directory_server_all_rooms_on_server">Alla rum på %s-servern</string>
-    <string name="directory_server_native_rooms">Alla nativa %srum</string>
+    <string name="directory_server_native_rooms">Alla nativa rum på %s</string>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d rum</item>
         <item quantity="other">%d rum</item>
@@ -740,7 +740,7 @@
     <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="new_recovery_method_popup_description">En ny säker säkerhetskopia för meddelandenycklar har hittats.
 \n
-\nOm det inte var du som satte upp den nya återställningsmetoden så kan det vara en angripare som försöker komma åt ditt konto. Ändra ditt kontolösenord och sätt en ny återställningsmetod omedelbart i inställningarna.</string>
+\nOm det inte var du som satte upp den nya återställningsmetoden så kan det vara en angripare som försöker komma åt ditt konto. Byt ditt kontolösenord och sätt en ny återställningsmetod omedelbart i inställningarna.</string>
     <string name="identity_server_not_defined_for_password_reset">Ingen identitetsserver är konfigurerad, vilket krävs för att återställa ditt lösenord.</string>
     <string name="change_room_directory_network">Byt nätverk</string>
     <string name="group_all_communities">Alla gemenskaper</string>
@@ -1193,7 +1193,7 @@
     <string name="crypto_error_withheld_generic">Du kan inte komma åt det här meddelandet för att avsändaren avsiktligt inte skickade nycklarna</string>
     <string name="search_in_my_contacts">Sök i mina kontakter</string>
     <string name="empty_contact_book">Din kontaktbok är tom</string>
-    <string name="no_permissions_to_start_conf_call">Du har inte behörighet att starta ett gruppsamtal i det här rummet</string>
+    <string name="no_permissions_to_start_conf_call">Du är inte behörig att starta ett gruppsamtal i det här rummet</string>
     <string name="conference_call_in_progress">Ett gruppsamtal pågår redan!</string>
     <string name="video_meeting">Starta videomöte</string>
     <string name="audio_meeting">Starta ljudmöte</string>
@@ -1241,7 +1241,7 @@
     <string name="room_participants_ban_title">Banna användaren</string>
     <string name="room_participants_ban_reason">Anledning för bann</string>
     <string name="room_participants_unban_title">Avbanna användaren</string>
-    <string name="room_participants_ban_prompt_msg">Att banna användaren kommer att kicka hen från det här rummet och hindra hen från att gå med igen.</string>
+    <string name="room_participants_ban_prompt_msg">Att banna användaren kommer att ta bort denne från det här rummet och hindra denne från att gå med igen.</string>
     <string name="room_participants_unban_prompt_msg">Att avbanna användaren kommer att låta hen gå med i rummet igen.</string>
     <string name="reason_hint">Anledning</string>
     <string name="room_participants_invite_join_names">"%1$s, "</string>
@@ -1263,7 +1263,7 @@
     <string name="room_prompt_cancel">Avbryt alla</string>
     <string name="room_resend_unsent_messages">Skicka oskickade meddelanden igen</string>
     <string name="room_delete_unsent_messages">Radera oskickade meddelanden</string>
-    <string name="room_do_not_have_permission_to_post">Du har inte behörighet att skriva i det här rummet.</string>
+    <string name="room_do_not_have_permission_to_post">Du är inte behörig att skriva i det här rummet.</string>
     <string name="ssl_trust">Betro</string>
     <string name="ssl_do_not_trust">Betro inte</string>
     <string name="ssl_logout_account">Logga ut</string>
@@ -1469,7 +1469,7 @@
     <string name="login_signin_matrix_id_notice">Om du har skapat ett konto på en hemserver så kan du använda ditt Matrix-ID (t.ex. @användare:domän.com) och lösenord nedan.</string>
     <string name="signed_out_notice">Detta kan bero på flera orsaker:
 \n
-\n• Du har ändrat ditt lösenord från en annan session.
+\n• Du har bytt ditt lösenord från en annan session.
 \n
 \n• Du har tagit bort den här sessionen från en annan session.
 \n
@@ -1533,7 +1533,7 @@
 \n- Den här enheten, eller den andra enheten
 \n- Internetuppkopplingen en av enheterna använder
 \n
-\nVi rekommenderar att du ändrar ditt lösenord och återställningsnyckel i inställningarna omedelbart.</string>
+\nVi rekommenderar att du byter ditt lösenord och återställningsnyckel i inställningarna omedelbart.</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Sätter upp nyckelsäkerhetskopiering</string>
     <string name="bootstrap_crosssigning_save_usb">Spara den på ett USB-minne eller en säkerhetskopieringsenhet</string>
     <string name="qr_code_scanned_self_verif_notice">Nästan färdigt! Visar den andra enheten en bock\?</string>
@@ -1576,7 +1576,7 @@
     <string name="settings_inline_url_preview">Inbäddade URL-förhandsgranskningar</string>
     <string name="settings_inline_url_preview_summary">Förhandsgranska länkar i chatten om din hemserver stöder den här funktionen.</string>
     <string name="settings_12_24_timestamps">Visa tidsstämplar i 12-timmarsformat</string>
-    <string name="settings_show_join_leave_messages_summary">Inbjudningar, utsparkningar och bann påverkas inte.</string>
+    <string name="settings_show_join_leave_messages_summary">Inbjudningar, borttagningar och bann påverkas inte.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Visa kontohändelser</string>
     <string name="settings_vibrate_on_mention">Vibrera när en användare nämns</string>
     <string name="settings_secure_backup_manage">Hantera</string>
@@ -1740,7 +1740,7 @@
     <string name="widget_integration_failed_to_send_request">Misslyckades att skicka begäran.</string>
     <string name="widget_integration_positive_power_level">Behörighetsnivå måste vara ett positivt heltal.</string>
     <string name="widget_integration_must_be_in_room">Du är inte i det här rummet.</string>
-    <string name="widget_integration_no_permission_in_room">Du har inte behörighet att göra det i det här rummet.</string>
+    <string name="widget_integration_no_permission_in_room">Du är inte behörig att göra det i det här rummet.</string>
     <string name="widget_integration_missing_room_id">Saknar room_id i begäran.</string>
     <string name="widget_integration_missing_user_id">Saknar user_id i begäran.</string>
     <string name="widget_integration_room_not_visible">Rummet %s är inte synligt.</string>
@@ -1771,7 +1771,7 @@
     <string name="command_description_join_room">Går med i rummet med den angivna adressen</string>
     <string name="command_description_topic">Sätt ett rumsämne</string>
     <string name="command_description_remove_user">Sparkar ut användaren med det angivna ID:t</string>
-    <string name="command_description_nick">Ändrar ditt visningsnamn</string>
+    <string name="command_description_nick">Byter ditt visningsnamn</string>
     <string name="command_description_clear_scalar_token">För att fixa Matrixapphantering</string>
     <string name="create">Skapa</string>
     <string name="create_community">Skapa gemenskap</string>
@@ -2034,9 +2034,9 @@
     <string name="login_reset_password_success_notice">Ditt lösenord har återställts.</string>
     <string name="login_reset_password_success_submit">Tillbaka till inloggning</string>
     <string name="login_reset_password_cancel_confirmation_title">Varning</string>
-    <string name="login_reset_password_cancel_confirmation_content">Ditt lösenord har inte ändrats än.
+    <string name="login_reset_password_cancel_confirmation_content">Ditt lösenord har inte bytts än.
 \n
-\nVill du avbryta återställningsprocessen\?</string>
+\nStoppa lösenordsbytesprocessen\?</string>
     <string name="login_set_email_submit">Nästa</string>
     <string name="login_set_msisdn_title">Sätt telefonnummer</string>
     <string name="login_set_msisdn_notice2">Vänligen använd internationellt format.</string>
@@ -2179,7 +2179,7 @@
         <item quantity="other">Skicka bilder i originalstorlek</item>
     </plurals>
     <string name="delete_event_dialog_title">Bekräfta borttagning</string>
-    <string name="delete_event_dialog_content">Är du säker på att du vill ta bort (radera) den här händelsen\? Observera att om du raderar ett rumsnamn eller ämnesändring så kan det upphäva ändringen.</string>
+    <string name="delete_event_dialog_content">Är du säker på att du vill ta bort (radera) den här händelsen\? Observera att om du raderar ett rumsnamns- eller ämnesbyte så kan det upphäva ändringen.</string>
     <string name="delete_event_dialog_reason_checkbox">Inkludera en anledning</string>
     <string name="delete_event_dialog_reason_hint">Anledning för borttagning</string>
     <string name="event_redacted_by_user_reason_with_reason">Händelsen raderades av användaren, anledning: %1$s</string>
@@ -2342,12 +2342,12 @@
         <item quantity="other">%d sekunder</item>
     </plurals>
     <string name="settings_show_room_member_state_events">Visa statushändelser angående rumsmedlemmar</string>
-    <string name="settings_show_room_member_state_events_summary">Inkluderar när personer bjuds in, går med, lämnar, kickas, bannas eller byter sin avatar eller sitt namn.</string>
+    <string name="settings_show_room_member_state_events_summary">Inkluderar när personer bjuds in, går med, lämnar, tas bort, bannas eller byter sin avatar eller sitt namn.</string>
     <string name="sent_a_poll">Omröstning</string>
     <string name="sent_a_reaction">Reagerade med: %s</string>
     <string name="sent_verification_conclusion">Verifieringsavslutning</string>
     <string name="universal_link_malformed">Länken var felformaterad</string>
-    <string name="no_permissions_to_start_webrtc_call">Du har inte behörighet att starta ett samtal i det här rummet</string>
+    <string name="no_permissions_to_start_webrtc_call">Du är inte behörig att starta ett samtal i det här rummet</string>
     <string name="delete_account_data_warning">Radera kontodata av typen %1$s\?
 \n
 \nAnvänd varsamt, det kan leda till oväntat beteende.</string>
@@ -2399,10 +2399,9 @@
     <string name="settings_troubleshoot_test_push_loop_success">Appen tar emot PUSH:en</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Appen väntar på PUSH:en</string>
     <string name="settings_troubleshoot_test_push_loop_title">Testa push</string>
-    <string name="search_is_not_supported_in_e2e_room">Sökning i krypterade rum stöds inte än.</string>
     <string name="search_banned_user_hint">Filtrera bannade användare</string>
-    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du har inte behörighet att starta ett samtal</string>
-    <string name="no_permissions_to_start_conf_call_in_direct_room">Du har inte behörighet att starta ett gruppsamtal</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du är inte behörig att starta ett samtal</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Du är inte behörig att starta ett gruppsamtal</string>
     <string name="action_reset">Återställ</string>
     <string name="create_room_topic_hint">Ämne</string>
     <string name="warning_unsaved_change_discard">Förkasta ändringar</string>
@@ -2429,7 +2428,7 @@
     <string name="invalid_qr_code_uri">Ogiltig QR-kod (ogiltig URI)!</string>
     <string name="cannot_dm_self">Kan inte DMa dig själv!</string>
     <string name="share_by_text">Dela med text</string>
-    <string name="settings_security_pin_code_change_pin_summary">Ändra din nuvarande PIN-kod</string>
+    <string name="settings_security_pin_code_change_pin_summary">Byt din nuvarande PIN-kod</string>
     <string name="settings_security_pin_code_change_pin_title">Ändra PIN-kod</string>
     <string name="phone_book_perform_lookup">Sök efter kontakter på Matrix</string>
     <string name="room_settings_set_avatar">Sätt avatar</string>
@@ -2449,7 +2448,7 @@
     <string name="this_is_the_beginning_of_dm">Det här är början av din direktmeddelandehistorik med %s.</string>
     <string name="this_is_the_beginning_of_room_no_name">Det här är början av konversationen.</string>
     <string name="this_is_the_beginning_of_room">Det här är början av %s.</string>
-    <string name="room_settings_enable_encryption_no_permission">Du har inte behörighet att aktivera kryptering i det här rummet.</string>
+    <string name="room_settings_enable_encryption_no_permission">Du är inte behörig att aktivera kryptering i det här rummet.</string>
     <string name="create_room_in_progress">Skapar rum…</string>
     <string name="create_room_alias_invalid">Vissa tecken tillåts inte</string>
     <string name="create_room_alias_empty">Vänligen ange en rumsadress</string>
@@ -2520,7 +2519,7 @@
     <string name="settings_show_emoji_keyboard">Visa emojitangentbord</string>
     <string name="settings_chat_effects_description">Använda /confetti för att skicka meddelanden som innehåller ❄️ eller 🎉</string>
     <string name="settings_chat_effects_title">Visa chatteffekter</string>
-    <string name="room_permissions_change_topic">Ändra ämnet</string>
+    <string name="room_permissions_change_topic">Byta ämnet</string>
     <string name="room_permissions_upgrade_the_room">Uppgradera rummet</string>
     <string name="room_permissions_send_m_room_server_acl_events">Skicka m.room.server_acl-händelser</string>
     <string name="room_permissions_change_permissions">Ändra behörigheter</string>
@@ -2538,7 +2537,7 @@
     <string name="room_permissions_invite_users">Bjuda in användare</string>
     <string name="room_permissions_send_messages">Skicka meddelanden</string>
     <string name="room_permissions_default_role">Förvald roll</string>
-    <string name="room_permissions_notice_read_only">Du har inte behörighet att uppdatera rollerna som krävs för att ändra olika delar av rummet</string>
+    <string name="room_permissions_notice_read_only">Du är inte behörig att uppdatera rollerna som krävs för att ändra olika delar av rummet</string>
     <string name="room_permissions_notice">Välj de roller som krävs för att ändra olika delar av rummet</string>
     <string name="room_permissions_title">Behörigheter</string>
     <string name="room_settings_permissions_subtitle">Se och uppdatera rollerna som krävs för att ändra olika delar av rummet.</string>
@@ -2645,7 +2644,7 @@
     <string name="event_status_a11y_sending">Skickar</string>
     <string name="settings_category_room_directory">Rumskatalog</string>
     <string name="event_status_sent_message">Meddelande skickat</string>
-    <string name="create_spaces_details_public_header">Lägg till några detaljer för att hjälpa det satt sticka ut. Du kan ändra dessa när som helst.</string>
+    <string name="create_spaces_details_public_header">Lägg till några detaljer för att hjälpa det att sticka ut. Du kan ändra dessa när som helst.</string>
     <string name="activity_create_space_title">Skapa ett utrymme</string>
     <string name="space_type_private_desc">Endast inbjudan, bäst för dig själv eller grupper</string>
     <string name="space_type_private">Privat</string>
@@ -2660,7 +2659,6 @@
     <string name="create_spaces_join_info_help">För att gå med i ett existerande utrymme så behöver du en inbjudan.</string>
     <string name="create_spaces_you_can_change_later">Detta kan ändras senare</string>
     <string name="create_spaces_choose_type_label">Vilket sorts utrymme vill du skapa\?</string>
-    <string name="create_spaces_type_header">Utrymmen är ett nytt sätt att gruppera rum och personer</string>
     <string name="your_private_space">Ditt privata utrymme</string>
     <string name="your_public_space">Ditt offentliga utrymme</string>
     <string name="add_space">Lägg till utrymme</string>
@@ -2742,7 +2740,7 @@
     <string name="option_always_ask">Fråga alltid</string>
     <string name="this_space_has_no_rooms_admin">Vissa rum kan vara dolda för att de är privata och du behöver en inbjudan.</string>
     <string name="this_space_has_no_rooms_not_admin">Vissa rum kan vara dolda för att de är privata och du behöver en inbjudan.
-\nDu har inte behörighet att lägga till rum.</string>
+\nDu är inte behörig att lägga till rum.</string>
     <string name="this_space_has_no_rooms">Det här utrymmet har inga rum</string>
     <string name="spaces_no_server_support_description">Vänligen kontakta din hemserveradmin för vidare information</string>
     <string name="spaces_no_server_support_title">Det verkar som att din hemserver inte stöder utrymmen än</string>
@@ -2782,7 +2780,7 @@
     <string name="denied_permission_camera">För att utföra detta, vänligen ge kameraåtkomst från systeminställningarna.</string>
     <string name="denied_permission_generic">Vissa behörigheter saknas för att utföra detta, vänligen ge behörighet från systeminställningarna.</string>
     <string name="upgrade_room_for_restricted_note">Observera att uppgradering kommer att göra en ny version av rummet. Alla nuvarande meddelanden kommer att vara kvar i det här arkiverade rummet.</string>
-    <string name="upgrade_room_for_restricted_no_param">em som helst i föräldrautrymmet kommer kunna hitta och gå med i det här rummen - du behöver inte bjuda in alla. Du kommer kunna ändra detta i rumsinställningarna när som helst.</string>
+    <string name="upgrade_room_for_restricted_no_param">Vem som helst i föräldrautrymmet kommer kunna hitta och gå med i det här rummen - du behöver inte bjuda in alla. Du kommer kunna ändra detta i rumsinställningarna när som helst.</string>
     <string name="upgrade_room_for_restricted">Vem som helst i %s kommer kunna hitta och gå med i det här rummen - du behöver inte bjuda in alla. Du kommer kunna ändra detta i rumsinställningarna när som helst.</string>
     <string name="voice_message_reply_content">Röstmeddelande (%1$s)</string>
     <string name="error_voice_message_cannot_reply_or_edit">Kan inte svara eller redigera när röstmeddelande är aktivt</string>
@@ -2861,15 +2859,10 @@
     <string name="hs_client_url">Hemserver-API-URL</string>
     <string name="missing_permissions_title">Saknar behörighet</string>
     <string name="denied_permission_voice_message">För att skicka röstmeddelanden, vänligen ge mikrofonåtkomst.</string>
-    <string name="link_this_email_with_your_account">%s i inställningar för att ta emot inbjudningar direkt i Element.</string>
+    <string name="template_link_this_email_with_your_account">%s i inställningar för att ta emot inbjudningar direkt i ${app_name}.</string>
     <string name="link_this_email_settings_link">Länka den här e-postadressen med ditt konto</string>
     <string name="this_invite_to_this_space_was_sent">Denna inbjudan till det här utrymmet skickades till %s, vilket inte är associerat med ditt konto</string>
     <string name="this_invite_to_this_room_was_sent">Denna inbjudan till det här rummet skickades till %s, vilket inte är associerat med ditt konto</string>
-    <string name="to_help_space_members_find_and_join">För att hjälpa utrymmesmedlemmar att hitta och gå med i ett privat rum, gå till rummets inställningar genom att trycka på avataren.</string>
-    <string name="help_space_members">Hjälp utrymmesmedlemmar att hitta privata rum</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Detta gör det enklare för rum att hållas privata till ett utrymme, medans personer i utrymmet kan hitta och gå med i dem. Alla nya rum i ett utrymme kommer ha det här alternativet tillgängligt.</string>
-    <string name="help_people_in_spaces_find_and_join">Hjälp personer i utrymmen att hitta och gå med i privata rum själva, utan behov av att manuellt bjuda in alla.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Nytt: Låt personer i utrymmen hitta och gå med i privata rum</string>
     <string name="call_jitsi_started">Gruppsamtal påbörjat</string>
     <string name="preference_show_all_rooms_in_home">Visa alla rum i Hem</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Alla rum du är i kommer att visas i Hem.</string>
@@ -2917,7 +2910,7 @@
     <string name="learn_more">Lär dig mer</string>
     <string name="space_settings_permissions_title">Utrymmesbehörigheter</string>
     <string name="space_participants_unban_prompt_msg">Om användaren avbannas kommer denna att få gå med i utrymmet igen.</string>
-    <string name="space_participants_ban_prompt_msg">Att banna användaren kommer att kicka denne från det här utrymmet och hindra hen från att gå med igen.</string>
+    <string name="space_participants_ban_prompt_msg">Att banna användaren kommer att ta bort denne från det här utrymmet och hindra denne från att gå med igen.</string>
     <string name="space_participants_remove_prompt_msg">att kicka användaren kommer att ta bort den från det här utrymmet.
 \n
 \nFör att hindra hen från att gå med igen så bör de banna hen istället.</string>
@@ -2947,11 +2940,11 @@
     <string name="settings_notification_emails_no_emails">För att få e-post med aviseringar, vänligen associera en e-postadress med ditt Matrixkonto</string>
     <string name="settings_notification_emails_category">E-postavisering</string>
     <string name="room_permissions_upgrade_the_space">Uppgradera utrymmet</string>
-    <string name="room_permissions_change_space_name">Byt utrymmets namn</string>
+    <string name="room_permissions_change_space_name">Byta utrymmets namn</string>
     <string name="room_permissions_enable_space_encryption">Aktivera utrymmeskryptering</string>
-    <string name="room_permissions_change_main_address_for_the_space">Byt huvudadress för det här utrymmet</string>
-    <string name="room_permissions_change_space_avatar">Byt utrymmets avatar</string>
-    <string name="space_permissions_notice_read_only">Du har inte behörighet att uppdatera rollerna som krävs för att ändra diverse delar av det här utrmmet</string>
+    <string name="room_permissions_change_main_address_for_the_space">Byta huvudadress för det här utrymmet</string>
+    <string name="room_permissions_change_space_avatar">Byta utrymmets avatar</string>
+    <string name="space_permissions_notice_read_only">Du är inte behörig att uppdatera rollerna som krävs för att ändra diverse delar av det här utrymmet</string>
     <string name="space_permissions_notice">Välj de roller som krävs för att ändra diverse delar av det här utrymmet</string>
     <string name="space_settings_permissions_subtitle">Se och uppdatera rollerna som krävs för att ändra diverse delar av utrymmet.</string>
     <string name="create_spaces_invite_public_header">Vilka är dina lagkamrater\?</string>
@@ -3006,10 +2999,10 @@
     <string name="analytics_opt_in_list_item_2">Vi delar <b>inte</b> information med tredje parter</string>
     <string name="analytics_opt_in_list_item_1">Vi spelar <b>inte</b> in eller profilerar någon kontodata</string>
     <string name="analytics_opt_in_content_link">här</string>
-    <string name="analytics_opt_in_content">Hjälp oss att identifiera problem och förbättra Element genom att dela anonym användningsdata. För att förstå hur personer använder multipla enheter så generar vi en slumpmässig identifierare som delas mellan dina enheter.
+    <string name="template_analytics_opt_in_content">Hjälp oss att identifiera problem och förbättra ${app_name} genom att dela anonym användningsdata. För att förstå hur personer använder multipla enheter så generar vi en slumpmässig identifierare som delas mellan dina enheter.
 \n
 \nDu kan läsa alla våra villkor %s.</string>
-    <string name="analytics_opt_in_title">Hjälp att förbättra Element</string>
+    <string name="template_analytics_opt_in_title">Hjälp att förbättra ${app_name}</string>
     <string name="action_enable">Aktivera</string>
     <string name="delete_poll_dialog_content">Är du säker på att du vill ta bort den här omröstningen\? Du kommer inte kunna få tillbaka den när den har tagits bort.</string>
     <string name="delete_poll_dialog_title">Ta bort omröstning</string>
@@ -3034,7 +3027,7 @@
     </plurals>
     <string name="preference_system_settings">Systeminställningar</string>
     <string name="preference_versions">Versioner</string>
-    <string name="preference_help_summary">Få hjälp med att använda Element</string>
+    <string name="template_preference_help_summary">Få hjälp med att använda ${app_name}</string>
     <string name="preference_help_title">Hjälp och support</string>
     <string name="preference_help">Hjälp</string>
     <string name="preference_root_legals">Legalt</string>
@@ -3059,8 +3052,74 @@
     <string name="labs_auto_report_uisi">Rapportera avkrypteringsfel automatiskt.</string>
     <string name="room_member_override_nick_color">Åsidosätt visningsnamnsfärg</string>
     <string name="login_splash_already_have_account">Jag har redan ett konto</string>
-    <string name="ftue_auth_carousel_3_title">Kontakta vem som helst.</string>
-    <string name="ftue_auth_carousel_2_title">Du har kontroll.</string>
-    <string name="ftue_auth_carousel_1_title">Äg dina konversationer.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Säkra meddelanden.</string>
+    <string name="ftue_auth_carousel_control_title">Du har kontroll.</string>
+    <string name="ftue_auth_carousel_secure_title">Äg dina konversationer.</string>
     <string name="room_error_access_unauthorized">Du får inte gå med i det här rummet</string>
+    <string name="tooltip_attachment_location">Dela plats</string>
+    <string name="labs_render_locations_in_timeline">Visa användarplatser i tidslinjen</string>
+    <string name="settings_enable_location_sharing_summary">När det har aktiverats så kan du skicka din plats till vilket rum som helst</string>
+    <string name="settings_enable_location_sharing">Aktivera platsdelning</string>
+    <string name="location_share_external">Öppna med</string>
+    <string name="template_location_not_available_dialog_content">${app_name} kunde inte komma åt din plats. Försök igen senare.</string>
+    <string name="template_location_not_available_dialog_title">${app_name} kunde inte komma åt din plats</string>
+    <string name="location_share">Dela plats</string>
+    <string name="a11y_location_share_icon">Dela plats</string>
+    <string name="location_activity_title_preview">Plats</string>
+    <string name="location_activity_title_static_sharing">Dela plats</string>
+    <string name="open_poll_option_description">Väljare kan se resultatet så fort de har röstat</string>
+    <string name="closed_poll_option_description">Resultatet avslöjas inte förrän du avslutar omröstningen</string>
+    <string name="closed_poll_option_title">Sluten omröstning</string>
+    <string name="open_poll_option_title">Öppen omröstning</string>
+    <string name="poll_type_title">Omröstningstyp</string>
+    <string name="edit_poll_button">REDIGERA OMRÖSTNING</string>
+    <string name="edit_poll_title">Redigera omröstning</string>
+    <string name="poll_no_votes_cast">Inga röster avgivna</string>
+    <string name="a11y_trust_level_misconfigured">Felkonfigurerad förtroendenivå</string>
+    <string name="encryption_misconfigured">Kryptering är felkonfigurerad</string>
+    <string name="room_profile_section_restore_security">Återställ kryptering</string>
+    <string name="contact_admin_to_restore_encryption">Vänligen kontakta en admin för att återställa kryptering till ett giltigt konto.</string>
+    <string name="encryption_has_been_misconfigured">Kryptering har felkonfigurerats.</string>
+    <string name="sent_location">Delade sin plats</string>
+    <string name="login_splash_create_account">Skapa konto</string>
+    <string name="ftue_auth_carousel_workplace_title">Meddelanden för ditt team.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Totalsträckskrypterad och inget telefonnummer krävs. Ingen reklam eller datainsamling.</string>
+    <string name="ftue_auth_carousel_control_body">Välj var dina konversationer lagras, vilket ger dig kontroll och självständighet. Ansluts via Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Säker och oberoende kommunikation som ger dig samma sekretessnivå som en personlig konversation i ditt eget hem.</string>
+    <string name="attachment_type_location">Plats</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">Kryptering har felkonfigurerats så du kan inte skicka meddelanden. Klicka för att öppna inställningar.</string>
+    <string name="room_unsupported_e2e_algorithm">Kryptering har felkonfigurerats så du kan inte skicka meddelanden. Vänligen kontakta en admin för att återställa kryptering till ett giltigt tillstånd.</string>
+    <string name="message_bubbles">Visa meddelandebubblor</string>
+    <string name="location_timeline_failed_to_load_map">Misslyckades att ladda karta</string>
+    <string name="a11y_static_map_image">Karta</string>
+    <string name="labs_enable_thread_messages_desc">Obs: appen kommer att startas om</string>
+    <string name="labs_enable_thread_messages">Aktivera trådade meddelanden</string>
+    <string name="ftue_auth_use_case_connect_to_server">Anslut till server</string>
+    <string name="ftue_auth_use_case_join_existing_server">Vill du gå med i en existerande server\?</string>
+    <string name="ftue_auth_use_case_skip_partial">hoppa över frågan</string>
+    <string name="ftue_auth_use_case_skip">Inte säker än\? Du kan %s</string>
+    <string name="ftue_auth_use_case_option_three">Gemenskaper</string>
+    <string name="ftue_auth_use_case_option_two">Team</string>
+    <string name="ftue_auth_use_case_option_one">Vänner och familj</string>
+    <string name="ftue_auth_use_case_subtitle">Vi kommer att hjälpa dig att få kontakt.</string>
+    <string name="ftue_auth_use_case_title">Vem kommer du chatta med mest\?</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Du visar redan den här tråden!</string>
+    <string name="view_in_room">Visa i rum</string>
+    <string name="reply_in_thread">Svara i tråd</string>
+    <string name="command_not_supported_in_threads">Kommandot \"%s\" kändes igen men stöds inte i trådar.</string>
+    <string name="search_thread_from_a_thread">Från en tråd</string>
+    <string name="thread_list_empty_notice">Tips: Tryck länge på ett meddelande och använd \"%s\".</string>
+    <string name="thread_list_empty_subtitle">Trådar hjälper till att hålla dina konversationer till ämnet och lätta att följa.</string>
+    <string name="thread_list_empty_title">Håll diskussioner organiserade med trådar</string>
+    <string name="thread_list_modal_my_threads_subtitle">Visar alla trådar du har deltagit i</string>
+    <string name="thread_list_modal_my_threads_title">Mina trådar</string>
+    <string name="thread_list_modal_all_threads_subtitle">Visar alla trådar från det nuvarande rummet</string>
+    <string name="thread_list_modal_all_threads_title">Alla trådar</string>
+    <string name="thread_list_modal_title">Filtrera</string>
+    <string name="thread_list_title">Trådar</string>
+    <string name="thread_timeline_title">Tråd</string>
+    <string name="room_threads_filter">Filtrera trådar i rum</string>
+    <string name="action_thread_copy_link_to_thread">Kopiera länk till tråd</string>
+    <string name="action_thread_view_in_room">Visa i rum</string>
+    <string name="action_view_threads">Visa trådar</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml
index c0a5da1604..0304a52a21 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@@ -173,7 +173,6 @@
     <plurals name="directory_search_rooms">
         <item quantity="other">%d ห้อง</item>
     </plurals>
-    <string name="search_is_not_supported_in_e2e_room">ยังไม่รองรับการค้นหาในห้องที่เข้ารหัส</string>
     <string name="tab_title_search_files">ไฟล์</string>
     <string name="tab_title_search_people">ผู้คน</string>
     <string name="tab_title_search_messages">ข้อความ</string>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 50af4a203c..e27861035a 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -55,7 +55,7 @@
     <string name="offline">Çevrimdışı</string>
     <string name="action_exit">Çık</string>
     <string name="actions">Aksiyonlar</string>
-    <string name="action_sign_out">Hesaptan çık</string>
+    <string name="action_sign_out">Oturumu kapat</string>
     <string name="action_voice_call">Sesli Arama</string>
     <string name="action_video_call">Görüntülü Arama</string>
     <string name="action_global_search">Global arama</string>
@@ -86,7 +86,7 @@
     <string name="matrix_only_filter">Sadece Matrix kullanıcıları</string>
     <string name="no_conversation_placeholder">Konuşma yok</string>
     <string name="template_no_contact_access_placeholder">${app_name}\'in yerel rehbere erişmesine izin vermediniz</string>
-    <string name="no_result_placeholder">Sonuç yok</string>
+    <string name="no_result_placeholder">Sonuç bulunamadı</string>
     <string name="rooms_header">Odalar</string>
     <string name="rooms_directory_header">Odalar dizini</string>
     <string name="no_room_placeholder">Oda yok</string>
@@ -104,14 +104,14 @@
     <string name="send_bug_report">Hata Bildir</string>
     <string name="send_bug_report_description">Lütfen hatayı tanımlayın. Ne yaptınız? Ne olmasını beklediniz? Ne oldu?</string>
     <string name="send_bug_report_description_in_english">Mümkünse, lütfen yapacağınız açıklamayı İngilizce yazın.</string>
-    <string name="send_bug_report_placeholder">Sorununu buraya yaz</string>
+    <string name="send_bug_report_placeholder">Sorunu açıklayın</string>
     <string name="send_bug_report_logs_description">Sorunları teşhis etmek için bu istemciden gelen sistem günlüğü (log) hata raporu ile gönderilecek. Bu hata raporu -sistem günlüğü ve ekran görüntülere dahil- halka açık bir şekilde görünür olmayacaktır. Eğer sadece alttaki yazıları göndermek istiyorsanız, lütfen şunun işaretini kaldırın:</string>
     <string name="send_bug_report_alert_message">Telefonunu yılgınlıkla sallıyor gibi görünüyorsun. Hata raporu göndermek ister misin\?</string>
     <string name="send_bug_report_app_crashed">Uygulama en son çökmüştü, hata raporu göndermek ister misiniz\?</string>
-    <string name="send_bug_report_rage_shake">Hata bildirmek için öfkeyle salla</string>
+    <string name="send_bug_report_rage_shake">Hata bildirmek için telefonu sallayın</string>
     <string name="send_bug_report_sent">Hata raporu başarılı bir şekilde gönderildi</string>
     <string name="send_bug_report_failed">Hata raporu gönderilemedi (%s)</string>
-    <string name="send_bug_report_progress">Süreç (%%%s)</string>
+    <string name="send_bug_report_progress">İlerleme (%%%s)</string>
     <string name="read_receipt">Oku</string>
     <string name="join_room">Odaya Katıl</string>
     <string name="username">Kullanıcı adı</string>
@@ -136,7 +136,7 @@
 \n
 \nBirkaç tane eklemek ister misin\?</string>
     <string name="go_on_with">İle devam et…</string>
-    <string name="error_no_external_application_found">Üzgünüm, bu eylemi gerçekleştirebilecek hiçbir harici uygulama bulunamadı.</string>
+    <string name="error_no_external_application_found">Üzgünüm, bu eylemi gerçekleştirebilecek harici bir uygulama bulunamadı.</string>
     <string name="auth_login">Giriş yap</string>
     <string name="auth_register">Kayıt ol</string>
     <string name="auth_submit">Tamam</string>
@@ -195,44 +195,44 @@
     <string name="auth_opt_phone_number_placeholder">Telefon numarası (isteğe bağlı)</string>
     <string name="auth_repeat_password_placeholder">Şifreyi tekrar girin</string>
     <string name="auth_repeat_new_password_placeholder">Yeni şifrenizi doğrulayın</string>
-    <string name="auth_invalid_login_param">Hatalı kullanıcı adı ve/veya şifre</string>
+    <string name="auth_invalid_login_param">Hatalı kullanıcı adı veya şifre</string>
     <string name="auth_invalid_user_name">Kullanıcı adları yalnızca harfler, sayılar, noktalar, kısa çizgiler ve alt çizgiler içerebilir</string>
     <string name="auth_invalid_password">Şifre çok kısa (min 6)</string>
     <string name="auth_missing_password">Eksik şifre</string>
     <string name="auth_invalid_email">Bu, geçerli bir e-posta adresi gibi gözükmüyor</string>
     <string name="auth_invalid_phone">Bu, geçerli bir telefon numarası gibi gözükmüyor</string>
     <string name="auth_email_already_defined">Bu e-posta adresi zaten tanımlanmış.</string>
-    <string name="auth_missing_email">Eposta adresi eksik</string>
+    <string name="auth_missing_email">E-posta adresi eksik</string>
     <string name="auth_missing_phone">Telefon numarası eksik</string>
-    <string name="auth_missing_email_or_phone">Eposta ya da telefon numarası eksik</string>
+    <string name="auth_missing_email_or_phone">E-posta ya da telefon numarası eksik</string>
     <string name="auth_invalid_token">Geçersiz belirteç</string>
     <string name="auth_password_dont_match">Şifreler uyuşmuyor</string>
     <string name="auth_forgot_password">Şifreni mi unuttun\?</string>
     <string name="auth_use_server_options">Özel sunucu ayarları kullan (gelişmiş)</string>
-    <string name="auth_email_validation_message">Lütfen kayıda devam etmek için epostanı kontrol et</string>
-    <string name="auth_threepid_warning_message">Eposta ve telefon numarası ile aynı anda kayıt yaptırmak şimdilik API yüzüden desteklenmiyor. Sadece telefon numarası hesaba eklenecektir.
+    <string name="auth_email_validation_message">Lütfen kayıda devam etmek için e-postanı kontrol et</string>
+    <string name="auth_threepid_warning_message">E-posta ve telefon numarası ile aynı anda kayıt yaptırmak şimdilik API yüzüden desteklenmiyor. Sadece telefon numarası hesaba eklenecektir.
 \n
-\nEpostanı daha sonra profil ayarlarından ekleyebilirsin.</string>
+\nE-postanı daha sonra profil ayarlarından ekleyebilirsin.</string>
     <string name="auth_recaptcha_message">Bu ana sunucu bir robot olmadığından emin olmak istiyor</string>
     <string name="auth_username_in_use">Kullandığın kullanıcı adı</string>
     <string name="auth_home_server">Ana sunucu:</string>
     <string name="auth_identity_server">Kimlik sunucusu:</string>
-    <string name="auth_reset_password_next_step_button">Eposta adresimi doğruladım</string>
-    <string name="auth_reset_password_message">Şifrenizi sıfırlamak için, hesabınıza bağlı eposta adresini girin:</string>
-    <string name="auth_reset_password_missing_email">Hesaba bağlı eposta adresi mutlaka girilmeli.</string>
+    <string name="auth_reset_password_next_step_button">E-posta adresimi doğruladım</string>
+    <string name="auth_reset_password_message">Şifrenizi sıfırlamak için, hesabınıza bağlı e-posta adresini girin:</string>
+    <string name="auth_reset_password_missing_email">Hesaba bağlı e-posta adresi mutlaka girilmeli.</string>
     <string name="auth_reset_password_missing_password">Yeni şifre mutlaka girilmeli.</string>
-    <string name="auth_reset_password_email_validation_message">Eposta %s adresine gönderildi. Epostadaki yönergeleri takip ettikten sonra, aşağıdaki tuşa tıklayın.</string>
-    <string name="auth_reset_password_error_unauthorized">Eposta doğrulaması başarısız: epostanızdaki bağlantıya tıkladığınızdan emin olun</string>
+    <string name="auth_reset_password_email_validation_message">E-posta %s adresine gönderildi. E-postadaki yönergeleri takip ettikten sonra, aşağıdaki tuşa tıklayın.</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_reset_password_success_message">Şifreniz sıfırlandı. 
 \n 
 \nTüm oturumlardan çıkış yaptınız ve mesaj bildirimleri almayacaksınız. Tekrar bildirimleri alabilmek için her cihazda tekrar giriş yapmalısınız.</string>
-    <string name="auth_accept_policies">Lütfen anamakinenin ilkelerini gözden geçirin ve kabul edin:</string>
+    <string name="auth_accept_policies">Lütfen ana sunucunun ilkelerini gözden geçirin ve kabul edin:</string>
     <string name="login_error_must_start_http">URL http[s]:// ile başlamalıdır</string>
     <string name="login_error_network_error">Giriş yapılamadı: Ağ hatası</string>
     <string name="login_error_unable_login">Giriş yapılamadı</string>
     <string name="login_error_registration_network_error">Kayıt olunamadı: Ağ hatası</string>
     <string name="login_error_unable_register">Kayıt olunamadı</string>
-    <string name="login_error_unable_register_mail_ownership">Kayıt olunamadı: eposta sahiplik hatası</string>
+    <string name="login_error_unable_register_mail_ownership">Kayıt olunamadı: e-posta sahiplik hatası</string>
     <string name="login_error_invalid_home_server">Lütfen geçerli bir URL girin</string>
     <string name="login_error_forbidden">Geçersiz kullanıcıadı/şifre</string>
     <string name="login_error_unknown_token">Erişim belirteci belirtildi ancak tanımlanamadı</string>
@@ -240,7 +240,7 @@
     <string name="login_error_not_json">Geçerli JSON içermiyor</string>
     <string name="login_error_limit_exceeded">Çok fazla istek gönderildi</string>
     <string name="login_error_user_in_use">Kullanıcı adı zaten kullanımda</string>
-    <string name="login_error_login_email_not_yet">Eposta bağlantısına hala tıklanmadı</string>
+    <string name="login_error_login_email_not_yet">E-posta bağlantısına hala tıklanmadı</string>
     <string name="e2e_re_request_encryption_key">Diğer oturumlardan <u>şifreleme anahtarlarını tekrar iste</u>.</string>
     <string name="e2e_re_request_encryption_key_sent">Anahtar isteği gönderildi.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">İstek gönderildi</string>
@@ -249,7 +249,7 @@
     <string name="groups_list">Grup Listesi</string>
     <plurals name="membership_changes">
         <item quantity="one">%d üyelik değişikliği</item>
-        <item quantity="other">%d üyelik değişiklikleri</item>
+        <item quantity="other">%d adet üyelik değişikliği</item>
     </plurals>
     <string name="compression_options">Farklı gönder</string>
     <string name="compression_opt_list_original">Orijinal</string>
@@ -282,25 +282,25 @@
     <string name="call_error_ice_failed">Medya Bağlantı Hatası</string>
     <string name="call_error_camera_init_failed">Kamera algılanamadı</string>
     <string name="call_error_answered_elsewhere">arama başka yerde cevaplandı</string>
-    <string name="media_picker_both_capture_title">Resim ya da video çek</string>
+    <string name="media_picker_both_capture_title">Fotoğraf ya da video çek</string>
     <string name="media_picker_cannot_record_video">Video kaydedilemiyor</string>
     <string name="permissions_rationale_popup_title">Bilgilendirme</string>
     <string name="template_permissions_rationale_msg_storage">${app_name}\'in ekleri göndermek ya da kaydetmek için galeriye erişmeye ihtiyacı var.
 \n
 \nLütfen çıkacak ekranda telefonunuzdan dosya gönderebilmesine izin verin.</string>
-    <string name="template_permissions_rationale_msg_camera">${app_name}\'in resim ya da video çekmek için kameraya erişmeye ihtiyacı var.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name}\'in fotoğraf ya da video çekmek için kameraya erişmeye ihtiyacı var.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
-\nLütfen çıkacak ekranda kameraya erişebilmesine izin verin."</string>
+\nLütfen çıkacak ekranda kamera erişimine izin verin."</string>
     <string name="template_permissions_rationale_msg_record_audio">${app_name}\'in sesli arama yapması için mikrofonunuza erişmeye ihtiyacı var.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
-\nLütfen çıkacak ekranda mikrofona erişebilmesine izin verin."</string>
+\nLütfen çıkacak ekranda mikrofon erişimine izin verin."</string>
     <string name="template_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 mikrofona erişebilmesine izin verin.</string>
-    <string name="template_permissions_rationale_msg_contacts">${app_name} eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir. Eğer bu nedenle rehberinizi paylaşmak istiyorsanız, lütfen açılan ekranda erişime izin verin.</string>
-    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name}\'in eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir.
+\nLütfen çıkacak ekranda kamera ve mikrofon erişimine izin verin.</string>
+    <string name="template_permissions_rationale_msg_contacts">${app_name} e-posta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir. Eğer bu nedenle rehberinizi paylaşmak istiyorsanız, lütfen açılan ekranda erişime izin verin.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name}\'in e-posta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir.
 \n 
 \nRehberinizi bu sebeple paylaşmayı kabul ediyor musunuz\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Üzgünüz. İsteğiniz, yetersiz izinlerden dolayı gerçekleştirilemedi</string>
@@ -311,14 +311,14 @@
     <string name="_continue">Devam et</string>
     <string name="action_remove">Sil</string>
     <string name="action_join">Katıl</string>
-    <string name="action_preview">Önizleme</string>
+    <string name="action_preview">Ön izleme</string>
     <string name="action_reject">Reddet</string>
     <string name="list_members">Üyeleri Listele</string>
     <string name="open_chat_header">Başlık Aç</string>
-    <string name="room_sync_in_progress">Eşzamanlanıyor…</string>
+    <string name="room_sync_in_progress">Senkronize ediliyor…</string>
     <string name="room_preview_invitation_format">Bu odaya %s tarafından davet edildiniz</string>
-    <string name="room_preview_unlinked_email_warning">Davet %s e/a gönderildi ancak eposta hala ilişkilendirilmemiş.
-\nFarklı bir hesaba giriş yapın, ya da epostayı hesabınıza ekleyin.</string>
+    <string name="room_preview_unlinked_email_warning">Davet %s e/a gönderildi ancak e-posta hala ilişkilendirilmemiş.
+\nFarklı bir hesaba giriş yapın, ya da e-postayı hesabınıza ekleyin.</string>
     <string name="room_preview_try_join_an_unknown_room">%s e/a erişmeye çalışıyorsun. Katılıp sohbete dahil olmak ister misin\?</string>
     <string name="room_preview_try_join_an_unknown_room_default">oda</string>
     <string name="room_preview_room_interactions_disabled">Bu odanın önizlemesi. Oda etkileşimleri devre dışı bırakıldı.</string>
@@ -330,7 +330,7 @@
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d üye</item>
-        <item quantity="other">%d üyeler</item>
+        <item quantity="other">%d adet üye</item>
     </plurals>
     <string name="room_title_one_member">1 üye</string>
     <plurals name="format_time_s">
@@ -361,7 +361,7 @@
     <string name="room_participants_header_call">ARAMA</string>
     <string name="room_participants_header_direct_chats">DİREKT SOHBETLER</string>
     <string name="room_participants_header_devices">OTURUMLAR</string>
-    <string name="room_participants_action_invite">Davet</string>
+    <string name="room_participants_action_invite">Davet et</string>
     <string name="room_participants_action_leave">Odadan ayrıl</string>
     <string name="room_participants_action_ban">Engelle</string>
     <string name="room_participants_action_unban">Engeli kaldır</string>
@@ -371,13 +371,13 @@
     <string name="room_participants_action_set_admin">Yönetici yap</string>
     <string name="room_participants_action_ignore">Bu kullanıcının tüm mesajlarını gizle</string>
     <string name="room_participants_action_unignore">Bu kullanıcının tüm mesajlarını göster</string>
-    <string name="room_participants_invite_search_another_user">Kullanıcı ID, Ad ya da eposta</string>
+    <string name="room_participants_invite_search_another_user">Kullanıcı ID, Ad ya da e-posta</string>
     <string name="room_participants_action_mention">Bahset</string>
     <string name="room_participants_action_devices_list">Oturum Listesini Göster</string>
-    <string name="room_participants_power_level_prompt">Bu işlemin geri dönüşü yok kullanıcıyı sen ile aynı erişim seviyesine getiriyorsun.
+    <string name="room_participants_power_level_prompt">Bu işlemin geri dönüşü yok kullanıcıyı kendin ile aynı erişim seviyesine getiriyorsun.
 \nEmin misin\?</string>
-    <string name="room_participants_ban_prompt_msg">Kullanıcıyı yasaklamak onları bu odadan çıkaracak ve tekrar katılmalarını engelleyecektir.</string>
-    <string name="reason_hint">Neden</string>
+    <string name="room_participants_ban_prompt_msg">Kullanıcıyı engellemek onları bu odadan çıkaracak ve tekrar katılmalarını engelleyecektir.</string>
+    <string name="reason_hint">Sebep</string>
     <string name="room_participants_invite_prompt_msg">%s adlı kullanıcılar(ı) bu sohbete davet etmek istediğinden emin misin\?</string>
     <string name="room_participants_invite_join_names">"%1$s, "</string>
     <string name="room_participants_invite_join_names_and">%1$s ve %2$s</string>
@@ -387,8 +387,8 @@
     <string name="people_search_user_directory">KULLANICI DİZİNİ (%s)</string>
     <string name="people_search_filter_text">Sadece Matrix kullanıcıları</string>
     <string name="people_search_invite_by_id_dialog_title">Kullanıcıyı ID ile Davet et</string>
-    <string name="people_search_invite_by_id_dialog_description">Lütfen bir veya daha fazla eposta adresi ya da Matrix ID girin</string>
-    <string name="people_search_invite_by_id_dialog_hint">Eposta ya da Matrix ID</string>
+    <string name="people_search_invite_by_id_dialog_description">Lütfen bir veya daha fazla e-posta adresi ya da Matrix ID girin</string>
+    <string name="people_search_invite_by_id_dialog_hint">E-posta ya da Matrix ID</string>
     <string name="room_menu_search">Bul</string>
     <string name="room_one_user_is_typing">%s yazıyor…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s yazıyor…</string>
@@ -408,17 +408,17 @@
     <string name="room_do_not_have_permission_to_post">Bu odaya mesaj gönderme izniniz yok.</string>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d yeni mesaj</item>
-        <item quantity="other">%d yeni mesajlar</item>
+        <item quantity="other">%d yeni mesaj</item>
     </plurals>
     <string name="ssl_trust">Güven</string>
     <string name="ssl_do_not_trust">Güvenme</string>
     <string name="ssl_logout_account">Çıkış yap</string>
     <string name="ssl_remain_offline">Göz ardı et</string>
-    <string name="ssl_fingerprint_hash">Parmakizi (%s):</string>
+    <string name="ssl_fingerprint_hash">Parmak izi (%s):</string>
     <string name="ssl_could_not_verify">Uzak sunucunun kimliğini doğrulayamadı.</string>
     <string name="ssl_cert_not_trust">Bu ağ trafiğinizin izlendiğinden, ya da telefonunuzun uzak sunucudaki sertifikaya güvenmediğinden dolayı olabilir.</string>
     <string name="ssl_cert_new_account_expl">Eğer sunucu yöneticisi bunun beklendiğini söylediyse aşağıdaki parmak izi ile sağlanılan parmak izinin uyuştuğunu dogrulayın.</string>
-    <string name="ssl_unexpected_existing_expl">Sertifika telefonunuzun güvendi sertifika ile değiştirildi. Bu çok OLAĞANDIŞI. Bu yeni sertifikayı KABUL ETMEMENİZ tavsiye edilir.</string>
+    <string name="ssl_unexpected_existing_expl">Sertifika telefonunuzun güvendi sertifika ile değiştirildi. Bu çok OLAĞAN DIŞI. Bu yeni sertifikayı KABUL ETMEMENİZ tavsiye edilir.</string>
     <string name="ssl_expected_existing_expl">Bu sertifika önceki güvenilen sertifikadan güvenilmez sertifikaya değiştirildi. Sunucu bu sertifikayı yenileyecek. Farklı bir parmak izi için sunucu yöneticisiyle iletişime geçin.</string>
     <string name="ssl_only_accept">Sadece sunucu yöneticisinin yukarıdaki yayınladığı parmak izleri ile uyuşan sertifikaları onaylayın.</string>
     <string name="room_details_title">Oda Detayları</string>
@@ -426,10 +426,10 @@
     <string name="room_details_files">Dosyalar</string>
     <string name="room_details_settings">Ayarlar</string>
     <plurals name="room_details_selected">
-        <item quantity="one">%d tane seçili</item>
-        <item quantity="other">%d tane seçili</item>
+        <item quantity="one">%d adet seçili</item>
+        <item quantity="other">%d adet seçili</item>
     </plurals>
-    <string name="malformed_id">Hatalı ID. Eposta adresi ya da Matrix ID\'si olmalıdır \'@localpart:domain\'</string>
+    <string name="malformed_id">Hatalı ID. E-posta adresi ya da Matrix ID\'si olmalıdır \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">DAVET EDİLDİ</string>
     <string name="room_details_people_present_group_name">KATILDI</string>
     <string name="room_event_action_report_prompt_reason">İçeriği bildirme nedeni</string>
@@ -440,7 +440,7 @@
     <string name="room_event_action_cancel_download">İndirmeyi iptal et</string>
     <string name="search_hint">Bul</string>
     <string name="search_members_hint">Oda üyelerini filtrele</string>
-    <string name="search_no_results">Sonuç yok</string>
+    <string name="search_no_results">Sonuç bulunamadı</string>
     <string name="tab_title_search_rooms">ODALAR</string>
     <string name="tab_title_search_messages">MESAJLAR</string>
     <string name="tab_title_search_people">KİŞİLER</string>
@@ -448,7 +448,7 @@
     <string name="directory_search_results_title">Dizinlere gözat</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d oda</item>
-        <item quantity="other">%d odalar</item>
+        <item quantity="other">%d adet oda</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%2$s adında %1$s oda bulundu</item>
@@ -464,7 +464,7 @@
     <string name="room_settings_direct_chat">Direkt Mesaj</string>
     <string name="room_settings_leave_conversation">Tartışmadan Ayrıl</string>
     <string name="room_settings_forget">Unut</string>
-    <string name="room_settings_add_homescreen_shortcut">Ana Ekran Kısayolu Ekle</string>
+    <string name="room_settings_add_homescreen_shortcut">Ana ekrana ekle</string>
     <string name="room_sliding_menu_messages">Mesajlar</string>
     <string name="room_sliding_menu_settings">Ayarlar</string>
     <string name="room_sliding_menu_version">Sürüm</string>
@@ -475,8 +475,8 @@
     <string name="room_sliding_menu_privacy_policy">Gizlilik Politikası</string>
     <string name="settings_profile_picture">Profil Resmi</string>
     <string name="settings_display_name">Görünür Ad</string>
-    <string name="settings_email_address">Eposta</string>
-    <string name="settings_add_email_address">Eposta ekle</string>
+    <string name="settings_email_address">E-posta</string>
+    <string name="settings_add_email_address">E-posta ekle</string>
     <string name="settings_phone_number">Telefon</string>
     <string name="settings_add_phone_number">Telefon numarası ekle</string>
     <string name="settings_app_info_link_title">Uygulama bilgisi</string>
@@ -501,12 +501,12 @@
     <string name="settings_troubleshoot_test_account_settings_failed">Bildirimler hesabın için etkin durumda değil.
 \nLütfen hesap ayarlarınızı gözden geçirin.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Etkinleştir</string>
-    <string name="settings_troubleshoot_test_device_settings_title">Oturum Ayarları.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">Oturum Ayarları</string>
     <string name="settings_troubleshoot_test_device_settings_success">Bildirimler bu oturum için etkinleştirilmiş.</string>
     <string name="template_settings_troubleshoot_test_device_settings_failed">Bildirimler bu oturum için etkin değil.
 \nLütfen ${app_name} ayarlarını gözden geçirin.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Etkinleştir</string>
-    <string name="settings_troubleshoot_test_bing_settings_title">Özel Ayarlar.</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">Özel Ayarlar</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Bazı mesajların türü sessize ayarlanmıştır (sessiz bir bildirim gönderecektir).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Bazı bildirimler özel ayarlarınızda devre dışı durumda.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Özel kuralları yüklerken hata oluştu, lütfen tekrar deneyin.</string>
@@ -529,8 +529,8 @@
 \nBu hata ${app_name}\'in kontrolü dışında. Telefonda hiç Google hesabı yok. Lütfen hesap yöneticisini açın ve bir tane Google hesabı ekleyin.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Hesap ekle</string>
     <string name="settings_troubleshoot_test_token_registration_title">Belirteç Kayıtı</string>
-    <string name="settings_troubleshoot_test_token_registration_success">FCM belirteci başarı ile AnaMakineye kaydedildi.</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">FCM belirteci AnaMakineye kaydedilirken hata:
+    <string name="settings_troubleshoot_test_token_registration_success">FCM belirteci başarı ile Ana Sunucuya kaydedildi.</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">FCM belirteci Ana Sunucuya kaydedilirken hata:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_service_restart_title">Bildirim Hizmetleri Otomatik-Yeniden-Başlatma</string>
     <string name="settings_troubleshoot_test_service_restart_success">Hizmet otomatik olarak sonlandırılıp yeniden başlatıldı.</string>
@@ -539,11 +539,11 @@
     <string name="settings_troubleshoot_test_service_boot_success">Hizmet cihaz yeniden başlatıldığında çalıştırılacak.</string>
     <string name="template_settings_troubleshoot_test_service_boot_failed">Hizmet cihaz yeniden başlatılınca çalıştırılmayacak, ${app_name}\'i açana kadar bildirimleri almakyacaksın.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Açılışta başlatı etkinleştir</string>
-    <string name="settings_troubleshoot_test_bg_restricted_title">Arkaplan kısıtlamalarını gözden geçir</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_success">Arkaplan kısıtlamaları ${app_name} için devre dışı. Bu test mobil veri kullanacak (WIFI değil).
+    <string name="settings_troubleshoot_test_bg_restricted_title">Arka plan kısıtlamalarını gözden geçir</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Arka plan kısıtlamaları ${app_name} için devre dışı. Bu test mobil veri kullanacak (WIFI değil).
 \n%1$s</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Arkaplan kısıtlamaları ${app_name} için etkinleştirilmiş.
-\nUygulamanın arkaplanda iken yapmaya çalıştığı şeyler agresif bir biçimde kısıtlanacak ve bu bildirimleri de etkileyebilir.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Arka plan kısıtlamaları ${app_name} için etkinleştirilmiş.
+\nUygulamanın arka planda iken yapmaya çalıştığı şeyler agresif bir biçimde kısıtlanacak ve bu bildirimleri de etkileyebilir.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Kısıtlamaları devre dışı bırak</string>
     <string name="settings_troubleshoot_test_battery_title">Pil Optimizasyonu</string>
@@ -552,10 +552,10 @@
     <string name="settings_troubleshoot_test_battery_quickfix">Optimizasyonu Göz ardı et</string>
     <string name="settings_notification_privacy_normal">Normal</string>
     <string name="settings_notification_privacy_reduced">Azaltılmış gizlilik</string>
-    <string name="settings_notification_privacy_need_permission">Uygulamanın arkaplanda çalışması için izne ihtiyacı var</string>
+    <string name="settings_notification_privacy_need_permission">Uygulamanın arka planda çalışması için izne ihtiyacı var</string>
     <string name="settings_notification_privacy_fcm">• Bildirimler Firebase Bulut Mesajlaşma ile gönderildi</string>
     <string name="settings_notification_privacy_metadata">• Bildirimler sadece meta verileri içeriyor</string>
-    <string name="settings_notification_privacy_secure_message_content">• Bildirimin mesaj içeriği <b>direkt Matrix anamakinesinden güvenli bir şekilde bulundu</b></string>
+    <string name="settings_notification_privacy_secure_message_content">• Bildirimin mesaj içeriği <b>direkt Matrix ana sunucudan güvenli bir şekilde bulundu</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• Bildirimler <b>meta ve mesaj verileri</b> içeriyor</string>
     <string name="settings_notification_privacy_message_content_not_shown">• Bildirimler <b>mesaj içeriğini göstermeyecek</b></string>
     <string name="settings_notification_ringtone">Bildirim sesi</string>
@@ -573,10 +573,10 @@
     <string name="settings_invited_to_room">Odaya davet edildiğimde</string>
     <string name="settings_call_invitations">Arama davetleri</string>
     <string name="settings_messages_sent_by_bot">Mesajlar bot tarafından gönderildi</string>
-    <string name="settings_background_sync">Arkaplanda Eşzamanlama</string>
+    <string name="settings_background_sync">Arka planda Senkronizasyon</string>
     <string name="settings_start_on_boot">Açılışta başlat</string>
-    <string name="settings_enable_background_sync">Arkaplanda eşzamanlamayı etkinleştir</string>
-    <string name="settings_set_sync_timeout">Eşzamanlama talep süresi doldu</string>
+    <string name="settings_enable_background_sync">Arka planda senkronizasyonu etkinleştir</string>
+    <string name="settings_set_sync_timeout">Senkronizasyon talep süresi doldu</string>
     <string name="settings_set_sync_delay">Her senkronizasyon arası gecikme</string>
     <string name="settings_version">Sürüm</string>
     <string name="settings_olm_version">olm sürümü</string>
@@ -584,7 +584,7 @@
     <string name="settings_third_party_notices">Üçüncü parti uyarıları</string>
     <string name="settings_copyright">Telif hakkı</string>
     <string name="settings_privacy_policy">Gizlilik politikası</string>
-    <string name="settings_keep_media">Medyayı tut</string>
+    <string name="settings_keep_media">Medyayı sakla</string>
     <string name="settings_clear_cache">Ön belleği temizle</string>
     <string name="settings_clear_media_cache">Medya ön belleğini temizle</string>
     <string name="settings_user_settings">Kullanıcı ayarları</string>
@@ -603,38 +603,38 @@
     <string name="settings_pin_unread_messages">Okunmamış mesajlı odaları öne çıkar</string>
     <string name="settings_devices_list">Oturumlar</string>
     <string name="settings_inline_url_preview">Satır içi URL önizlemesi</string>
-    <string name="settings_inline_url_preview_summary">Bağlantıları anamakine destekliyorsa sohbette önizle.</string>
+    <string name="settings_inline_url_preview_summary">Bağlantıları ana sunucu destekliyorsa sohbette önizle.</string>
     <string name="settings_send_typing_notifs">Yazıyor bildirimleri gönder</string>
     <string name="settings_send_typing_notifs_summary">Diğer kullanıcıların senin ne yazdığını bilmelerine izin ver.</string>
     <string name="settings_send_markdown">Markdown biçimlendirmesi</string>
     <string name="settings_send_markdown_summary">Mesajları gönderilmeden önce markdown ile biçimlendir. Bu gelişmiş biçimlendirmeye izin verir örneğin asteriks ile italik yazı yazmak gibi.</string>
     <string name="settings_always_show_timestamps">Tüm mesajların zaman damgasını göster</string>
     <string name="settings_12_24_timestamps">Zaman damgasını 12-saat biçiminde göster</string>
-    <string name="settings_show_read_receipts">Makbuz okumayı göster</string>
-    <string name="settings_show_read_receipts_summary">Detaylı liste için makbuz okumaya tıkla.</string>
+    <string name="settings_show_read_receipts">Okundu ibaresini göster</string>
+    <string name="settings_show_read_receipts_summary">Detaylı liste için okundu ibaresine tıkla.</string>
     <string name="settings_show_join_leave_messages">Katılma ve ayrılma durumlarını göster</string>
-    <string name="settings_show_join_leave_messages_summary">Davetler, atılanlar ve engellenenler etkilenmemiştir.</string>
+    <string name="settings_show_join_leave_messages_summary">Davetler, kaldırmalar ve yasaklar etkilenmez.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Hesap olaylarını göster</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Avatar ve görünür adı değişimlerde içer.</string>
     <string name="settings_vibrate_on_mention">Bir kullanıcıdan söz ederken titreşim ver</string>
-    <string name="settings_preview_media_before_sending">Medyayı göndermeden önce önizle</string>
+    <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="startup_notification_privacy_title">Bildirim Gizliliği</string>
-    <string name="template_startup_notification_privacy_message">${app_name} bildirimlerinizi güvenli ve gizli bir şekilde yönetmek için arkaplanda çalışır. Bu pil kullanımını etkileyebilir.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} bildirimlerinizi güvenli ve gizli bir şekilde yönetmek için arka planda çalışır. Bu pil kullanımını etkileyebilir.</string>
     <string name="startup_notification_privacy_button_grant">İzin ver</string>
     <string name="startup_notification_privacy_button_other">Farklı bir seçenek seç</string>
-    <string name="startup_notification_fdroid_battery_optim_title">Arkaplan Bağlantısı</string>
-    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} güvenilir bildirimlere sahip olmak için düşük arkaplan bağlatısı yapmaya ihtiyaç duyar.
-\nÇıkacak ekranda ${app_name}\'in arkaplanda sürekli çalışması için izin istenecek, lütfen kabul edin.</string>
+    <string name="startup_notification_fdroid_battery_optim_title">Arka plan Bağlantısı</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} güvenilir bildirimlere sahip olmak için düşük arka plan bağlatısı yapmaya ihtiyaç duyar.
+\nÇıkacak ekranda ${app_name}\'in arka planda sürekli çalışması için izin istenecek, lütfen kabul edin.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">İzin ver</string>
-    <string name="settings_analytics">Analiz</string>
-    <string name="settings_opt_in_of_analytics">Analiz verilerini gönder</string>
+    <string name="settings_analytics">Analitik</string>
+    <string name="settings_opt_in_of_analytics">Analitik verilerini gönder</string>
     <string name="template_settings_opt_in_of_analytics_summary">${app_name} uygulamayı geliştirmemiz için anonim analitik veriler toplar.</string>
-    <string name="template_settings_opt_in_of_analytics_prompt">Lütfen ${app_name}\'i geliştirebilmemiz için analizleri etkinleştirin.</string>
-    <string name="settings_opt_in_of_analytics_ok">Evet, Yardım etmek istiyorum!</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Lütfen ${app_name}\'i geliştirebilmemiz için analitikleri etkinleştirin.</string>
+    <string name="settings_opt_in_of_analytics_ok">Evet, yardım etmek istiyorum!</string>
     <string name="settings_data_save_mode">Veri kaydetme modu</string>
-    <string name="settings_data_save_mode_summary">Veri kaydetme modu belirli filtreler uygular bu sayede ilerki güncellemeler ve yazıyor bildirimleri filtrelenir.</string>
+    <string name="settings_data_save_mode_summary">Veri kaydetme modu belirli filtreler uygular bu sayede ilerideki güncellemeler ve yazıyor bildirimleri filtrelenir.</string>
     <string name="devices_details_dialog_title">Oturum bilgileri</string>
     <string name="devices_details_id_title">ID</string>
     <string name="devices_details_name_title">Görünür Ad</string>
@@ -647,18 +647,18 @@
     <string name="devices_delete_pswd">Şifre:</string>
     <string name="devices_delete_submit_button_label">Gönder</string>
     <string name="settings_logged_in">Olarak giriş yaptın</string>
-    <string name="settings_home_server">Ana Makine</string>
+    <string name="settings_home_server">Ana Sunucu</string>
     <string name="settings_identity_server">Kimlik Sunucusu</string>
     <string name="settings_user_interface">Kullanıcı arayüzü</string>
     <string name="settings_interface_language">Dil</string>
     <string name="settings_select_language">Dili seç</string>
     <string name="account_email_validation_title">Doğrulama Bekleniyor</string>
-    <string name="account_email_validation_message">Lütfen epostanı kontrol et ve içerdiği bağlantıya tıkla. Bu tamamlandığında, tamama tıkla.</string>
-    <string name="account_email_validation_error">Eposta adresi doğrulanamadı. Lütfen epostanı kontrol et ve içerdiği bağlantıya tıkla. Bu tamamlandığında, tamama tıkla.</string>
-    <string name="account_email_already_used_error">Bu eposta adresi zaten kullanımda.</string>
-    <string name="account_email_not_found_error">Bu eposta adresi bulunamadı.</string>
+    <string name="account_email_validation_message">Lütfen e-postanı kontrol et ve içerdiği bağlantıya tıkla. Bu tamamlandığında tamama tıkla.</string>
+    <string name="account_email_validation_error">E-posta adresi doğrulanamadı. Lütfen e-postanı kontrol et ve içerdiği bağlantıya tıkla. Bu tamamlandığında tamama tıkla.</string>
+    <string name="account_email_already_used_error">Bu e-posta adresi zaten kullanımda.</string>
+    <string name="account_email_not_found_error">Bu e-posta adresi bulunamadı.</string>
     <string name="account_phone_number_already_used_error">Bu telefon numarası zaten kullanımda.</string>
-    <string name="account_email_error">Epostanı doğrularken bir hata meydana geldi.</string>
+    <string name="account_email_error">E-postanı doğrularken bir hata meydana geldi.</string>
     <string name="settings_password">Şifre</string>
     <string name="settings_change_password">Şifreni değiştir</string>
     <string name="settings_old_password">Mevcut şifre</string>
@@ -733,8 +733,8 @@
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' geçerli bir takma ad biçimi değil</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Bu oda için belirtilen bir ana adresin olmayacak.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Ana adres uyarıları</string>
-    <string name="room_settings_set_main_address">Ana Adres Olarak Ayarla</string>
-    <string name="room_settings_unset_main_address">Ana Adres Olarak Ayarlama</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="room_settings_copy_room_id">Oda ID\'sini Kopyala</string>
     <string name="room_settings_copy_room_address">Oda Adresini Kopyala</string>
     <string name="room_settings_addresses_e2e_enabled">Şifreleme bu oda için etkinleştirilmiş.</string>
@@ -755,7 +755,7 @@
     <string name="encryption_information_sender_device_information">Göndericinin oturum bilgisi</string>
     <string name="encryption_information_device_name">Görünür Ad</string>
     <string name="encryption_information_name">Görünür Ad</string>
-    <string name="encryption_information_device_id">Kimlik</string>
+    <string name="encryption_information_device_id">Oturum kimliği</string>
     <string name="encryption_information_device_key">Oturum anahtarı</string>
     <string name="encryption_information_verification">Doğrulama</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 parmak izi</string>
@@ -796,22 +796,22 @@
 \nBilinmeyen Oturumlar:</string>
     <string name="select_room_directory">Bir oda dizini seç</string>
     <string name="directory_server_fail_to_retrieve_server">Sunucu müsait değil ya da aşırı yüklenmiş</string>
-    <string name="directory_server_type_homeserver">Herkese açık odaları listelemek için bir anamakine girin</string>
-    <string name="directory_server_placeholder">Anamakine URL</string>
+    <string name="directory_server_type_homeserver">Herkese açık odaları listelemek için bir ana sunucu girin</string>
+    <string name="directory_server_placeholder">Ana sunucu URL</string>
     <string name="directory_server_all_rooms_on_server">%s sunucusundaki tüm odalar</string>
     <string name="directory_server_native_rooms">%s deki/daki tüm yerel odalar</string>
     <string name="lock_screen_hint">Buraya yazın…</string>
     <plurals name="notification_unread_notified_messages">
-        <item quantity="one">1 okunmamış bildirilmiş mesaj</item>
-        <item quantity="other">%d okunmamış bildirilmiş mesaj</item>
+        <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_msgs">
-        <item quantity="one">1 okunmamış bildirilmiş mesaj</item>
-        <item quantity="other">%d okunmamış bildirilmiş mesaj</item>
+        <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">1 oda</item>
-        <item quantity="other">%d oda</item>
+        <item quantity="one">%d oda</item>
+        <item quantity="other">%d odalar</item>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%2$s de/da %1$s</string>
     <string name="historical_placeholder">Geçmişte bul</string>
@@ -828,14 +828,14 @@
     <string name="settings_labs_create_conference_with_jitsi">Jitsi ile konferans çağrısı oluştur</string>
     <string name="widget_delete_message_confirmation">Bu widget\'ı odadan kaldırmak istediğine emin misin\?</string>
     <plurals name="active_widgets">
-        <item quantity="one">1 etkin widget</item>
-        <item quantity="other">%d etkin widget</item>
+        <item quantity="one">%d etkin widget</item>
+        <item quantity="other">%d etkin widgetler</item>
     </plurals>
     <string name="widget_integration_unable_to_create">Widget oluşturulamıyor.</string>
     <string name="widget_integration_failed_to_send_request">İstek gönderilemedi.</string>
     <string name="widget_integration_positive_power_level">Erişim seviyesi pozitif tamsayı olmalıdır.</string>
-    <string name="widget_integration_must_be_in_room">Bu oda da değilsin.</string>
-    <string name="widget_integration_no_permission_in_room">Bu oda da bunu yapacak iznin yok.</string>
+    <string name="widget_integration_must_be_in_room">Bu odada değilsin.</string>
+    <string name="widget_integration_no_permission_in_room">Bu odada bunu yapacak iznin yok.</string>
     <string name="widget_integration_missing_room_id">room_id istekte eksik.</string>
     <string name="widget_integration_missing_user_id">user_id istekte eksik.</string>
     <string name="widget_integration_room_not_visible">%s adlı oda görünür değil.</string>
@@ -863,7 +863,7 @@
     <string name="command_description_op_user">Kullanıcının erişim seviyesini belirle</string>
     <string name="command_description_deop_user">Verilen id ile kullanıcıları operatörlükten çıkarır</string>
     <string name="command_description_invite_user">Verilen id ile kullanıcıları şuanki odaya davet eder</string>
-    <string name="command_description_join_room">Verilen takma ad ile odalara katıl</string>
+    <string name="command_description_join_room">Belirtilen adresle odaya katılır</string>
     <string name="command_description_part_room">Odadan ayrıl</string>
     <string name="command_description_topic">Odanın konusunu belirle</string>
     <string name="command_description_remove_user">Verilen id ile kullanıcıları atar</string>
@@ -892,12 +892,12 @@
     <string name="filter_group_members">Grup üyelerini filtrele</string>
     <string name="filter_group_rooms">Grup Odalarını filtrele</string>
     <plurals name="group_members">
-        <item quantity="one">1 üye</item>
-        <item quantity="other">%d üye</item>
+        <item quantity="one">%d üye</item>
+        <item quantity="other">%d üyeler</item>
     </plurals>
     <plurals name="group_rooms">
-        <item quantity="one">1 oda</item>
-        <item quantity="other">%d oda</item>
+        <item quantity="one">%d oda</item>
+        <item quantity="other">%d odalar</item>
     </plurals>
     <string name="group_no_long_description">Topluluk yöneticisi bu topluluk için uzun bir açıklama sağlamadı.</string>
     <string name="has_been_removed">%1$s dan/den %2$s tarafından atıldın</string>
@@ -908,35 +908,35 @@
     <string name="receipt_avatar">Avatar açıklaması</string>
     <string name="notice_avatar">Avatar uyarısı</string>
     <string name="avatar">Avatar</string>
-    <string name="dialog_user_consent_content">%1$s anamakinesini kullanmaya devam etmek için şart ve koşulları gözden geçirip kabul etmelisiniz.</string>
+    <string name="dialog_user_consent_content">%1$s ana sunucusunu kullanmaya devam etmek için şart ve koşulları gözden geçirip kabul etmelisiniz.</string>
     <string name="dialog_user_consent_submit">Şimdi yorumla</string>
     <string name="deactivate_account_title">Hesabı devre dışı bırak</string>
     <string name="deactivate_account_content">Bu hesabınızın kalıcı bir şekilde kullanılamaz yapar. Giriş yapamazsınız ve kimse tekrar aynı kullanıcı ID\'sini kullanarak kayıt yaptıramaz. Bu hesabınızın tüm odalardan ayrılmasına ve kimlik sunucusundan hesap detaylarınızın silinmesine yok açar. <b>Bu eylem geri çevrilemez</b>.
 \n
 \nHesabınızı devre dışı bırakmak <b>varsayılan olarak gönderdiğiniz mesajlarınızın silinmesini sağlamaz</b>. Eğer mesajlarınızın silinmesini istiyorsanız lütfen alttaki kutuyu işaretleyin.
 \n
-\nMatrixdeki mesaj görünürlüğü eposta ile benzerdir. Silinen mesajlarınız yeni ya da kayıtsız kullanıcılarla paylaşılmaz ama kayıtlı ve zaten mesajlarınıza erişebilen kullanıcılar halen mesajlarınızın bir kopyasına sahip olurlar.</string>
+\nMatrixdeki mesaj görünürlüğü e-posta ile benzerdir. Silinen mesajlarınız yeni ya da kayıtsız kullanıcılarla paylaşılmaz ama kayıtlı ve zaten mesajlarınıza erişebilen kullanıcılar halen mesajlarınızın bir kopyasına sahip olurlar.</string>
     <string name="deactivate_account_delete_checkbox">Lütfen hesabım devre dışı olunca gönderdiğim tüm mesajları sil (Uyarı: bu gelecekteki kullanıcıların bitmemiş yarım tartışma görmelerine sebep olur)</string>
     <string name="deactivate_account_prompt_password">Devam etmek için lütfen şifrenizi girin:</string>
     <string name="deactivate_account_submit">Hesabı devre dışı bırak</string>
     <string name="error_empty_field_enter_user_name">Lütfen kullanıcı adı girin.</string>
     <string name="error_empty_field_your_password">Lütfen şifrenizi girin.</string>
-    <string name="room_tombstone_versioned_description">Oda değiştirildi ve artık etkin değil</string>
+    <string name="room_tombstone_versioned_description">Bu oda değiştirildi ve artık aktif değil.</string>
     <string name="room_tombstone_continuation_link">Tartışma burada devam ediyor</string>
     <string name="room_tombstone_continuation_description">Bu oda farklı bir tartışmanın devamı</string>
     <string name="room_tombstone_predecessor_link">Eski mesajları görmek için tıkla</string>
     <string name="resource_limit_exceeded_title">Kaynak Sınırı Aşıldı</string>
     <string name="resource_limit_contact_action">Yöneticiyle iletişime geç</string>
     <string name="resource_limit_contact_admin">Hizmet yöneticin iletişime geç</string>
-    <string name="resource_limit_soft_default">Bu anamakine kaynak sınırılarından birini aştı <b>bazı kullanıcılar giriş yapamayabilir</b>.</string>
-    <string name="resource_limit_hard_default">Bu anamakine kaynak sınırılarından birini aştı.</string>
-    <string name="resource_limit_soft_mau"> Bu anamakine Aylık Etkin Kullanıcı sınırına ulaştı <b>bazı kullanıcılar giriş yapamayabilir</b>.</string>
-    <string name="resource_limit_hard_mau">Bu anamakine Aylık Etkin Kullanıcı sınırına ulaştı.</string>
+    <string name="resource_limit_soft_default">Bu ana sunucu kaynak sınırılarından birini aştı <b>bazı kullanıcılar giriş yapamayabilir</b>.</string>
+    <string name="resource_limit_hard_default">Bu ana sunucu kaynak sınırılarından birini aştı.</string>
+    <string name="resource_limit_soft_mau"> Bu ana sunucu Aylık Etkin Kullanıcı sınırına ulaştı <b>bazı kullanıcılar giriş yapamayabilir</b>.</string>
+    <string name="resource_limit_hard_mau">Bu ana sunucu Aylık Etkin Kullanıcı sınırına ulaştı.</string>
     <string name="resource_limit_soft_contact">Lütfen limitin arttırılması için %s yapın.</string>
     <string name="resource_limit_hard_contact">Lütfen bu hizmeti kullanmak için %s yapın.</string>
     <string name="settings_lazy_loading_title">Yavaş yüklenen oda üyeleri</string>
     <string name="settings_lazy_loading_description">Sadece ilk görüntüdeki oda üyelerini yükleyerek performansı arttırın.</string>
-    <string name="error_lazy_loading_not_supported_by_home_server">Anamakineniz yavaş oda üyeleri yüklemeyi desteklemiyor daha. Daha sonra tekrar deneyin.</string>
+    <string name="error_lazy_loading_not_supported_by_home_server">Ana sunucunuz yavaş oda üyeleri yüklemeyi desteklemiyor daha. Daha sonra tekrar deneyin.</string>
     <string name="unknown_error">Üzgünüz bir hata oluştu</string>
     <string name="merged_events_expand">genişlet</string>
     <string name="merged_events_collapse">daralt</string>
@@ -965,7 +965,7 @@
     <string name="keys_backup_setup_step1_advanced">(Gelişmiş)</string>
     <string name="keys_backup_setup_step1_manual_export">Elle anahtarları dışa aktar</string>
     <string name="keys_backup_setup_step2_text_title">Yedeklemeni parola ile güvence altına al.</string>
-    <string name="keys_backup_setup_step2_text_description">Anahtarlarının şifrelenmiş bir kopyasını anamakinede depolayacağız. Yedeklemeni parola ile koru ve güvenli tut.
+    <string name="keys_backup_setup_step2_text_description">Anahtarlarının şifrelenmiş bir kopyasını ana sunucuda depolayacağız. Yedeklemeni parola ile koru ve güvenli tut.
 \n
 \nÜst düzey güvenlik için parolanız hesap şifresinden farklı olmalıdır.</string>
     <string name="keys_backup_setup_step2_button_title">Parolayı ayarla</string>
@@ -991,7 +991,7 @@
     <string name="recovery_key">Kurtarma Anahtarı</string>
     <string name="unexpected_error">Beklenmeyen hata</string>
     <string name="keys_backup_setup_backup_started_title">Yedekleme Başlatıldı</string>
-    <string name="keys_backup_setup_backup_started_message">Şifreleme anahtarın arkaplanda anamakineye yedeklenecek. İlk yedekleme birkaç dakika sürecek.</string>
+    <string name="keys_backup_setup_backup_started_message">Şifreleme anahtarın arka planda ana sunucuya yedeklenecek. İlk yedekleme birkaç dakika sürecek.</string>
     <string name="keys_backup_setup_skip_title">Emin misin\?</string>
     <string name="keys_backup_setup_skip_msg">Eğer cihazı kaybedersen ya da çıkış yaparsan mesajlara erişimini kaybedeceksin.</string>
     <string name="keys_backup_restore_is_getting_backup_version">Yedekleme sürümü alınıyor…</string>
@@ -1018,7 +1018,7 @@
     </plurals>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d yeni anahtar bu oturuma eklendi.</item>
-        <item quantity="other">%d tane yeni anahtar bu oturuma eklendi.</item>
+        <item quantity="other">%d adet yeni anahtar bu oturuma eklendi.</item>
     </plurals>
     <string name="keys_backup_get_version_error">Son sürüm onarma anahtarı alınırken hata oluştu (%s).</string>
     <string name="keys_backup_no_keysbackup_sdk_error">Kripto oturumu etkin değil</string>
@@ -1054,9 +1054,9 @@
     <string name="call_failed_no_ice_use_alt">%s kullanmayı deneyin</string>
     <string name="call_failed_dont_ask_again">Tekrar sorma</string>
     <string name="auth_login_sso">Tek oturum açma ile giriş yap</string>
-    <string name="auth_add_email_message_2">Hesap kurtarma epostası kaydedin ve daha sonra isteğe bağlı olarak sizi tanıyan kişilerin sizi bulabilmesini sağlayın.</string>
+    <string name="auth_add_email_message_2">Hesap kurtarma e-postası kaydedin ve daha sonra isteğe bağlı olarak sizi tanıyan kişilerin sizi bulabilmesini sağlayın.</string>
     <string name="login_error_unknown_host">Bu adrese erişilemiyor, lütfen kontrol et</string>
-    <string name="settings_notification_privacy_no_background_sync">Bu uygulamanın arkaplanda anasunucuya bağlanması <b>gerekmez</b>, bu durum batarya kullanımını azaltır</string>
+    <string name="settings_notification_privacy_no_background_sync">Bu uygulamanın arka planda anasunucuya bağlanması <b>gerekmez</b>, bu durum batarya kullanımını azaltır</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="people_no_identity_server">Hiçbir kimlik sunucusu yapılandırılmamış.</string>
@@ -1064,8 +1064,8 @@
 \n
 \nAlternatif olarak %2$s herkese açık sunucuyu kullanmayı da deneyebilirsiniz, ancak bu o kadar da güvenilir olmayacak ve IP adresiniz sunucu ile paylaşılacaktır. Bunu ayrıca Ayarlardan da düzenleyebilirsiniz.</string>
     <string name="auth_add_phone_message_2">Telefon numarası kaydedin ve daha sonra isteğe bağlı olarak sizi tanıyan kişilerin sizi bulabilmesini sağlayın.</string>
-    <string name="auth_add_email_phone_message_2">Hesap kurtarma epostası kaydedin. Daha sonra isteğe bağlı eposta veya telefon nuraması kullanarak sizi tanıyan kişilerin sizi bulabilmesini sağlayın.</string>
-    <string name="auth_add_email_and_phone_message_2">Hesap kurtarma epostası kaydedin. Daha sonra isteğe bağlı eposta veya telefon nuraması kullanarak sizi tanıyan kişilerin sizi bulabilmesini sağlayın.</string>
+    <string name="auth_add_email_phone_message_2">Hesap kurtarma e-postası kaydedin. Daha sonra isteğe bağlı e-posta veya telefon nuraması kullanarak sizi tanıyan kişilerin sizi bulabilmesini sağlayın.</string>
+    <string name="auth_add_email_and_phone_message_2">Hesap kurtarma e-postası kaydedin. Daha sonra isteğe bağlı e-posta veya telefon nuraması kullanarak sizi tanıyan kişilerin sizi bulabilmesini sağlayın.</string>
     <string name="login_error_ssl_handshake">Cihazın saldırılara açık, eski bir TLS güvenlik protokolü kullanıyor; güvenliğin için bağlantın engellendi</string>
     <string name="settings_call_ringtone_use_default_stun">İkincil çağrı yardımcı sunucusuna izin ver</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Ana sunucunuz bir tane sunmadığında %sas assist kullanacaktır (arama sırasında IP adresiniz paylaşılacaktır)</string>
@@ -1081,12 +1081,12 @@
     <string name="settings_set_workmanager_delay_summary">%s
 \nSenkronizasyon kaynağın (pil) ya da cihazın durumuna (uyku) bağlı olarak değişebilir.</string>
     <string name="settings_integrations">Entegrasyonlar</string>
-    <string name="settings_integrations_summary">Botları, köprüleri, widget\'ları ve etiket paketlerini yönetmek için bir entegrasyon yöneticisi kullanın.
-\nEntegrasyon yöneticileri yapılandırma verilerini alır ve widget\'ları değiştirebilir, oda davetlerini gönderebilir ve sizin adınıza yetki seviyelerini ayarlayabilir.</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>
     <string name="settings_discovery_category">Keşif</string>
     <string name="settings_discovery_manage">Keşif ayarlarını düzenle.</string>
     <string name="settings_integration_allow">Entegrasyonlara izin ver</string>
-    <string name="settings_integration_manager">Entegre Yöneticisi</string>
+    <string name="settings_integration_manager">Entegrasyon yöneticisi</string>
     <string name="settings_change_password_submit">Şifreyi güncelle</string>
     <string name="settings_fail_to_update_password_invalid_current_password">Şifre geçersiz</string>
     <string name="passwords_do_not_match">Şifreler uyuşmuyor</string>
@@ -1101,11 +1101,11 @@
     <string name="encryption_information_unknown_ip">bilinmeyen ip</string>
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s: 1 mesaj</item>
-        <item quantity="other">%1$s: %2$d tane mesaj</item>
+        <item quantity="other">%1$s: %2$d adet mesaj</item>
     </plurals>
     <plurals name="notification_compat_summary_title">
         <item quantity="one">%d bildirim</item>
-        <item quantity="other">%d tane bildirim</item>
+        <item quantity="other">%d adet bildirim</item>
     </plurals>
     <string name="notification_unknown_new_event">Yeni Etkinlik</string>
     <string name="notification_unknown_room_name">Oda</string>
@@ -1216,7 +1216,7 @@
     <string name="room_list_rooms_empty_title">Odalar</string>
     <string name="room_list_rooms_empty_body">Odalar burada görünecek. Mevcut odaları görmek ya da kendi odanızı kurmak için aşağıdan + butonuna tıklayın.</string>
     <string name="title_activity_emoji_reaction_picker">Tepkiler</string>
-    <string name="action_agree">Bencede</string>
+    <string name="action_agree">Onaylıyorum</string>
     <string name="action_like">Beğendim</string>
     <string name="message_add_reaction">Bir Tepki Ekle</string>
     <string name="message_view_reaction">Tekpileri Görüntüle</string>
@@ -1231,13 +1231,13 @@
     <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 önizlenemez</string>
-    <string name="template_room_preview_world_readable_room_not_supported_yet">${app_name} henüz herkese-açık odaları önizlemeyi desteklemiyor</string>
+    <string name="room_preview_no_preview">Bu oda ön izlenemez</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">${app_name} henüz herkese açık odaları ön izlemeyi desteklemiyor</string>
     <string name="fab_menu_create_room">Odalar</string>
     <string name="fab_menu_create_chat">Doğrudan Mesajlar</string>
     <string name="create_room_title">Yeni Oda</string>
     <string name="create_room_action_create">OLUŞTUR</string>
-    <string name="create_room_name_hint">Oda Adı</string>
+    <string name="create_room_name_hint">İsim</string>
     <string name="create_room_public_title">Herkese Açık</string>
     <string name="create_room_public_description">Herkes bu odaya katılabilir</string>
     <string name="create_room_directory_title">Oda Dizini</string>
@@ -1248,7 +1248,7 @@
     <string name="login_error_homeserver_not_found">Bu URL ile ev-sunucusuna erişilemiyor, lütfen kontrol edin</string>
     <string name="template_settings_add_3pid_flow_not_supported">Bunu ${app_name} mobil ile yapamazsınız</string>
     <string name="settings_add_3pid_authentication_needed">Kimlik doğrulama gereklidir</string>
-    <string name="settings_background_fdroid_sync_mode">Arkaplan Senkronizasyon Modu (Deneysel)</string>
+    <string name="settings_background_fdroid_sync_mode">Arka plan Senkronizasyon Modu (Deneysel)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Batarya için optimize edildi</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Uygulama arka plandayken gelen mesajlar için uyarılmayacaksınız.</string>
     <string name="settings_background_sync_update_error">Ayarlar güncellenemedi.</string>
@@ -1273,14 +1273,14 @@
     <string name="call_format_turn_hd_on">Yüksek çözünürlüğü aç</string>
     <string name="login_error_ssl_peer_unverified">SSL Hatası: karşınıdaki kişinin kimliği doğrulanmadı.</string>
     <string name="login_error_ssl_other">SSL Hatası.</string>
-    <string name="settings_call_show_confirmation_dialog_title">Kazara aramayı önle</string>
+    <string name="settings_call_show_confirmation_dialog_title">Yanlışlıkla aramayı önle</string>
     <string name="settings_call_show_confirmation_dialog_summary">Arama başlatmadan önce onay iste</string>
     <string name="active_call_with_duration">Mevcut Arama (%s)</string>
     <string name="return_to_call">Aramaya dön</string>
     <string name="room_participants_action_cancel_invite">Daveti Geri Çevir</string>
-    <string name="room_participants_power_level_demote_warning_title">Kendini alçaltmak istediğinden emin misin\?</string>
-    <string name="room_participants_power_level_demote_warning_prompt">Kendi yetkinizi alçalttığınız için bunu geri alma şansınız olmayacak, eğer bu odadaki son yetkili kişiyseniz yetkileri geri alma imkânınız olmayacak.</string>
-    <string name="room_participants_power_level_demote">Alçalt</string>
+    <string name="room_participants_power_level_demote_warning_title">Kendi yetkinizi düşürmek istediğinizden emin misin\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Kendi yetkinizi düşürdüğünüzde bunu geri alma şansınız olmayacak, eğer bu odadaki son yetkili kişiyseniz yetkileri geri alma imkânınız olmayacak.</string>
+    <string name="room_participants_power_level_demote">Yetkiyi Düşür</string>
     <string name="room_participants_action_ignore_title">Kullanıcıyı yoksay</string>
     <string name="room_participants_action_ignore_prompt_msg">Bu kullanıcıyı yoksayarsanız ortak odalarınızda mesajlarını görmeyeceksiniz.
 \n
@@ -1310,7 +1310,7 @@
     <string name="disabled_integration_dialog_content">Bunun için ayarlardan \'Entegrasyonlara İzin Ver\'i açın.</string>
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">1 yasaklanmış kullanıcı</item>
-        <item quantity="other">%d yasaklanmış kullanıcı</item>
+        <item quantity="other">%d adet yasaklanmış kullanıcı</item>
     </plurals>
     <string name="encryption_exported_successfully">Anahtarlar başarıyla dışarı aktarıldı</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
@@ -1320,12 +1320,11 @@
     <string name="recovery_key_export_saved">Kurtarma anahtarın kaydedildi.</string>
     <string name="secure_backup_banner_setup_line1">Güvenli Yedekleme</string>
     <string name="settings_troubleshoot_test_push_notification_content">Bildirimi görüntülüyorsunuz! Buraya tıkla!</string>
-    <string name="error_threepid_auth_failed">Sana gönderdiğimiz e-postadaki bağlantıya tıkladığına emin oldu.</string>
+    <string name="error_threepid_auth_failed">Size gönderdiğimiz e-postadaki bağlantıya tıkladığınıza emin olun.</string>
     <string name="settings_phone_numbers">Telefon numaraları</string>
     <string name="settings_emails_empty">Hesabınıza e-posta adresi eklenmemiş</string>
     <string name="settings_emails">E-posta hesapları</string>
     <string name="settings_phone_number_empty">Hesabınıza hiçbir telefon numarası eklenmedi</string>
-    <string name="search_is_not_supported_in_e2e_room">Şifreli odalarda arama yapmak henüz desteklenmiyor.</string>
     <string name="search_banned_user_hint">Banlanan kullanıcıları filtrele</string>
     <string name="room_permissions_change_topic">Konuyu değiştir</string>
     <string name="room_permissions_upgrade_the_room">Odayı geliştir</string>
@@ -1455,8 +1454,8 @@
     <string name="room_settings_alias_title">Oda ayarları</string>
     <string name="settings_emails_and_phone_numbers_summary">Matrix hesabınıza bağlanan e-postaları ve telefon numaralarını yönetin</string>
     <string name="settings_emails_and_phone_numbers_title">E-postalar ve telefon numaraları</string>
-    <string name="settings_show_emoji_keyboard_summary"/>
-    <string name="settings_show_room_member_state_events_summary"/>
+    <string name="settings_show_emoji_keyboard_summary">Emoji klavyesini açmak için mesaj oluşturucuya bir düğme ekleyin</string>
+    <string name="settings_show_room_member_state_events_summary">Davet/katıl/sol/kaldır/yasaklama etkinliklerini ve avatar/görünen ad değişikliklerini içerir.</string>
     <string name="settings_chat_effects_description">/confetti komutunu kullanın veya ❄️ veya 🎉 içeren bir mesaj gönderin</string>
     <string name="settings_show_room_member_state_events">Oda üyesi durumu etkinliklerini göster</string>
     <plurals name="seconds">
@@ -1540,9 +1539,9 @@
     <string name="login_social_signin_with">%s ile giriş yap</string>
     <string name="login_social_continue">Ya da</string>
     <string name="login_server_other_text">Özel ve gelişmiş ayarlar</string>
-    <string name="login_server_modular_learn_more">Daha fazlasını öğren</string>
+    <string name="login_server_modular_learn_more">Daha fazlasını öğrenin</string>
     <string name="login_server_modular_text">Kuruluşlar için premium sunucu(hosting)</string>
-    <string name="login_server_matrix_org_text">En büyük genel sunucuda milyonlara ücretsiz katılın</string>
+    <string name="login_server_matrix_org_text">En büyük genel sunucuda ücretsiz olarak milyonlara katılın</string>
     <string name="login_server_text">Tıpkı e-posta gibi, hesapların da bir sunucusu vardır, ancak tüm sunuculardaki kişilerle konuşabilirsiniz</string>
     <string name="login_server_title">Bir sunucu seçin</string>
     <string name="login_splash_submit">Başlarken</string>
@@ -1591,7 +1590,9 @@
     <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="identity_server_consent_dialog_content">Bildiğiniz kişileri keşfetmek için, rehber verilerinizi (%1$s)</string>
+    <string name="identity_server_consent_dialog_content">Tanıdığınız mevcut kişileri keşfetmek için iletişim verilerinizi (telefon numaraları ve/veya e-postalar) yapılandırılmış kimlik sunucusuna (%1$s) göndermeyi kabul ediyor musunuz\?
+\n
+\n Daha fazla gizlilik için, gönderilen verilere gönderilmeden önce hashing uygulanacaktır.</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>
@@ -1661,7 +1662,7 @@
     <string name="login_reset_password_mail_confirmation_title">Gelen kutunuzu kontrol edin</string>
     <string name="login_reset_password_error_not_found">Bu e-posta herhangi bir hesapla ilişkili değil</string>
     <string name="login_reset_password_password_hint">Yeni parola</string>
-    <string name="login_reset_password_notice">Yeni parolanızı ayarlamayı onaylamak için e-postanıza onaylama linki gelecek.</string>
+    <string name="login_reset_password_notice">Yeni parolanızı ayarlamayı onaylamak için e-postanıza onaylama linki gönderdik.</string>
     <string name="login_reset_password_on">%1$s sunucusunda parolayı yenile</string>
     <string name="login_registration_not_supported">Uygulama bu sunucuda yeni hesap oluşturamıyor.
 \n
@@ -1773,7 +1774,7 @@
     <string name="medium_email">E-posta adresi</string>
     <string name="matrix_error">Matrix hatası</string>
     <string name="network_error">Ağ hatası</string>
-    <string name="message_failed_to_upload">Görüntü yüklenemedi</string>
+    <string name="message_failed_to_upload">Fotoğraf yüklenemedi</string>
     <string name="unable_to_send_message">Mesaj gönderilemedi</string>
     <string name="power_level_default">Varsayılan</string>
     <string name="notice_widget_jitsi_modified_by_you">Video konferansı düzenlediniz</string>
@@ -1847,13 +1848,13 @@
     <string name="video_call_with_participant">%s ile görüntülü arama</string>
     <plurals name="missed_video_call">
         <item quantity="one">Cevapsız görüntülü arama</item>
-        <item quantity="other">%d cevapsız görüntülü aramalar</item>
+        <item quantity="other">%d adet cevapsız görüntülü arama</item>
     </plurals>
     <plurals name="missed_audio_call">
         <item quantity="one">Cevapsız sesli arama</item>
-        <item quantity="other">%d cevapsız sesli aramalar</item>
+        <item quantity="other">%d adet cevapsız sesli arama</item>
     </plurals>
-    <string name="call_ringing">Çağrı çalıyor…</string>
+    <string name="call_ringing">Çalıyor…</string>
     <string name="error_unauthorized">Yetkisiz, eksik geçerli kimlik doğrulama kimlik bilgileri</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Ana sunucuyu seçin</string>
     <string name="login_error_homeserver_from_url_not_found">%s url\'sinde bir ana sunucuya ulaşılamıyor. Lütfen bağlantınızı kontrol edin veya bir ana sunucuyu manuel olarak seçin.</string>
@@ -2000,7 +2001,7 @@
     <string name="room_displayname_invite_from">%s\'den davet</string>
     <string name="room_error_access_unauthorized">Bu odaya katılmanıza izin verilmiyor</string>
     <string name="room_error_join_failed_empty_room">Şu anda boş bir odaya yeniden katılmak mümkün değildir.</string>
-    <string name="could_not_redact">redaksiyon yapılamadı</string>
+    <string name="could_not_redact">Silinemedi</string>
     <string name="notice_crypto_error_unknown_inbound_session_id">Gönderenin cihazı bize bu mesajın anahtarlarını göndermedi.</string>
     <string name="notice_crypto_unable_to_decrypt">** Şifre çözülemiyor: %s **</string>
     <string name="notice_power_level_diff">%1$s, %2$s ile %3$s arasında</string>
@@ -2026,4 +2027,361 @@
     <string name="notice_room_server_acl_updated_banned">• %s ile eşleşen sunucular artık yasaklandı.</string>
     <string name="notice_room_server_acl_updated_title_by_you">Bu oda için sunucu ACL\'lerini değiştirdiniz.</string>
     <string name="notice_room_server_acl_updated_title">%s, bu oda için sunucu ACL\'lerini değiştirdi.</string>
+    <string name="command_description_ignore_user">Bir kullanıcıyı yok sayar, mesajlarını sizden gizler</string>
+    <string name="error_jitsi_join_conf">Üzgünüz, konferansa katılmaya çalışırken bir hata oluştu</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s, %2$s ve %3$s içinde</string>
+    <string name="directory_add_a_new_server_error_already_added">Bu sunucu listede zaten mevcut</string>
+    <string name="directory_add_a_new_server_error">Bu sunucu veya oda listesi bulunamıyor</string>
+    <string name="directory_add_a_new_server_prompt">Keşfetmek istediğiniz yeni sunucunun adını girin.</string>
+    <string name="directory_add_a_new_server">Yeni bir sunucu ekle</string>
+    <string name="directory_your_server">Sunucunuz</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Bilmediğiniz diğer alanlar veya odalar</string>
+    <string name="space_you_know_that_contains_this_room">Bu odayı içerdiğini bildiğin alan</string>
+    <string name="decide_who_can_find_and_join">Bu odayı kimlerin bulabileceğine ve katılacağına karar verin.</string>
+    <string name="tap_to_edit_spaces">Boşlukları düzenlemek için dokunun</string>
+    <string name="select_spaces">Boşluk seçin</string>
+    <string name="decide_which_spaces_can_access">Bu odaya hangi alanların erişebileceğine karar verin. Bir alan seçilirse, üyeleri Oda adını bulabilecek ve katılabilecektir.</string>
+    <string name="spaces_which_can_access">Erişilebilen alanlar</string>
+    <string name="allow_space_member_to_find_and_access">Alan üyelerinin bulmasına ve erişmesine izin verin.</string>
+    <string name="room_create_member_of_space_name_can_join">%s Alanının üyeleri bulabilir, önizleyebilir ve katılabilir.</string>
+    <string name="room_settings_room_access_restricted_description">Bu odaya sahip bir alanda bulunan herkes onu bulabilir ve ona katılabilir. Yalnızca bu odanın yöneticileri onu bir alana ekleyebilir.</string>
+    <string name="room_settings_room_access_restricted_title">Yalnızca alan üyeleri</string>
+    <string name="room_settings_space_access_public_description">Herkes alanı bulabilir ve katılabilir</string>
+    <string name="room_settings_room_access_public_description">Herkes odayı bulabilir ve katılabilir</string>
+    <string name="room_settings_room_access_public_title">Herkese açık</string>
+    <string name="room_settings_room_access_private_description">Yalnızca davet edilen kişiler bulabilir ve katılabilir</string>
+    <string name="room_settings_room_access_private_invite_only_title">Özel (Yalnızca Davetli)</string>
+    <string name="room_settings_room_access_private_title">Özel</string>
+    <string name="room_settings_room_access_entry_unknown">Bilinmeyen erişim ayarı (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Herkes odayı çalabilir, üyeler daha sonra kabul edebilir veya reddedebilir</string>
+    <string name="room_alias_local_address_subtitle">Kullanıcıların bu odayı ev sunucunuz (%1$s) aracılığıyla bulabilmesi için bu odanın adreslerini ayarlayın</string>
+    <string name="room_alias_address_hint">Yeni yayınlanan adres (ör. #kullaniciadi:sunucu)</string>
+    <string name="space_settings_alias_subtitle">Bu alanın adreslerini görün ve yönetin.</string>
+    <string name="space_settings_alias_title">Alan adresleri</string>
+    <string name="room_settings_guest_access_title">Konukların katılmasına izin ver</string>
+    <string name="room_settings_space_access_title">Alan erişimi</string>
+    <string name="room_settings_access_rules_pref_dialog_title">Kimler erişebilir\?</string>
+    <string name="room_settings_room_notifications_account_settings">Hesap ayarları</string>
+    <string name="room_settings_room_notifications_manage_notifications">Bildirimleri %1$s içinde yönetebilirsiniz.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Lütfen bahislerin ve anahtar kelime bildirimlerinin mobil cihazlarda şifreli odalarda mevcut olmadığını unutmayın.</string>
+    <string name="room_settings_room_notifications_notify_me">bana haber ver</string>
+    <string name="legals_no_policy_provided">Bu sunucu herhangi bir politika sağlamaz.</string>
+    <string name="legals_third_party_notices">Üçüncü taraf kitaplıkları</string>
+    <string name="legals_identity_server_title">Kimlik sunucusu politikanız</string>
+    <string name="legals_home_server_title">Ana sunucu politikanız</string>
+    <string name="template_legals_application_title">${app_name} politikası</string>
+    <string name="analytics_opt_in_list_item_3">Bunu istediğiniz zaman ayarlardan kapatabilirsiniz</string>
+    <string name="analytics_opt_in_list_item_2">Bilgileri üçüncü taraflarla <b>paylaşmayız</b></string>
+    <string name="analytics_opt_in_list_item_1">Herhangi bir hesap verisini <b>kaydetmiyoruz</b></string>
+    <string name="analytics_opt_in_content_link">burada</string>
+    <string name="template_analytics_opt_in_content">Anonim kullanım verilerini paylaşarak sorunları belirlememize ve ${app_name}\'i iyileştirmemize yardımcı olun. İnsanların birden fazla cihazı nasıl kullandığını anlamak için, cihazlarınız tarafından paylaşılan rastgele bir tanımlayıcı oluşturacağız.
+\n
+\n Tüm şartlarımızı %s okuyabilirsiniz.</string>
+    <string name="template_analytics_opt_in_title">Öğeyi iyileştirmeye yardımcı olun</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Mobil cihazlarda şifreli odalarda bahsedilenler ve anahtar kelimeler için bildirim almayacaksınız.</string>
+    <string name="settings_room_upgrades">Oda yükseltmeleri</string>
+    <string name="settings_messages_by_bot">Bot tarafından gönderilen mesajlar</string>
+    <string name="settings_room_invitations">Oda davetiyeleri</string>
+    <string name="settings_messages_containing_keywords">anahtar kelimeler</string>
+    <string name="settings_mentions_at_room">\@room</string>
+    <string name="settings_encrypted_group_messages">Şifreli grup mesajları</string>
+    <string name="settings_group_messages">Grup mesajları</string>
+    <string name="settings_encrypted_direct_messages">Şifreli doğrudan mesajlar</string>
+    <string name="settings_messages_direct_messages">Doğrudan mesajlar</string>
+    <string name="settings_messages_containing_username">Kullanıcı adım</string>
+    <string name="settings_messages_containing_display_name">Görünen adım</string>
+    <string name="settings_messages_at_room">\@room içeren mesajlar</string>
+    <string name="settings_when_rooms_are_upgraded">Odalar yükseltildiğinde</string>
+    <string name="settings_messages_in_e2e_group_chat">Grup sohbetlerinde şifreli mesajlar</string>
+    <string name="settings_messages_in_e2e_one_to_one">Bire bir sohbetlerde şifreli mesajlar</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Anahtar kelimeler \'%s\' içeremez</string>
+    <string name="settings_notification_keyword_contains_dot">Anahtar kelimeler \'.\' ile başlayamaz.</string>
+    <string name="settings_notification_new_keyword">Yeni anahtar kelime ekle</string>
+    <string name="settings_notification_your_keywords">Anahtar kelimeleriniz</string>
+    <string name="settings_notification_notify_me_for">Bana haber ver</string>
+    <string name="settings_notification_other">Diğer</string>
+    <string name="settings_notification_mentions_and_keywords">Bahsedilenler ve Anahtar Sözcükler</string>
+    <string name="settings_notification_default">Varsayılan bildirimler</string>
+    <string name="settings_notification_emails_enable_for_email">%s için e-posta bildirimlerini etkinleştir</string>
+    <string name="settings_notification_emails_no_emails">Bildirim içeren e-posta almak için lütfen bir e-postayı Matrix hesabınızla ilişkilendirin</string>
+    <string name="settings_notification_emails_category">Eposta bildirimi</string>
+    <string name="settings_remove_three_pid_confirmation_content">%s kaldırılsın mı\?</string>
+    <string name="shortcut_disabled_reason_sign_out">Oturum kapatıldı!</string>
+    <string name="shortcut_disabled_reason_room_left">Oda terk edildi!</string>
+    <string name="verification_scan_self_emoji_subtitle">Bunun yerine emojiyi karşılaştırarak doğrulayın</string>
+    <string name="verification_scan_emoji_subtitle">Yüz yüze değilseniz, bunun yerine emojiyi karşılaştırın</string>
+    <string name="verification_scan_emoji_title">taranamıyor</string>
+    <string name="verification_scan_with_this_device">Bu cihazla tarayın</string>
+    <string name="verification_scan_their_code">Kodlarını tarayın</string>
+    <string name="verification_scan_self_notice">Kodu diğer cihazınızla tarayın veya bu cihazla geçiş yapın ve tarayın</string>
+    <string name="verification_scan_notice">Birbirinizi güvenli bir şekilde doğrulamak için kodu diğer kullanıcının cihazıyla tarayın</string>
+    <string name="you">Sen</string>
+    <string name="verification_verify_device_manually">Manuel olarak doğrula</string>
+    <string name="verification_verify_device">Bu oturumu doğrula</string>
+    <string name="verification_request">Doğrulama İsteği</string>
+    <string name="verification_sent">Doğrulama Gönderildi</string>
+    <string name="verification_request_you_accepted">kabul ettin</string>
+    <string name="verification_request_other_accepted">%s kabul edildi</string>
+    <string name="verification_request_you_cancelled">iptal ettin</string>
+    <string name="verification_request_other_cancelled">%s iptal edildi</string>
+    <string name="verification_request_waiting">Bekleyiniz…</string>
+    <string name="sent_location">Konumlarını paylaştı</string>
+    <string name="sent_verification_conclusion">Doğrulama Sonucu</string>
+    <string name="sent_a_reaction">İle tepki verdi: %s</string>
+    <string name="sent_a_poll">Anket</string>
+    <string name="send_a_sticker">Etiket</string>
+    <string name="sent_a_file">Dosya</string>
+    <string name="sent_a_voice_message">Ses</string>
+    <string name="sent_an_audio_file">Ses</string>
+    <string name="sent_an_image">Resim.</string>
+    <string name="sent_a_video">Video.</string>
+    <string name="verification_conclusion_compromised">Aşağıdakilerden biri tehlikeye girmiş olabilir:
+\n
+\n- Ana sunucunuz
+\n- Doğruladığınız kullanıcının bağlı olduğu ana sunucusu
+\n- Sizin veya diğer kullanıcıların internet bağlantısı
+\n- Sizin veya diğer kullanıcıların cihazı</string>
+    <string name="verification_conclusion_not_secure">Güvenli değil</string>
+    <string name="verification_green_shield">Bir kullanıcının güvenilir olduğundan emin olmak için yeşil kalkanı arayın. Odanın güvenli olduğundan emin olmak için bir odadaki tüm kullanıcılara güvenin.</string>
+    <string name="verify_user_sas_emoji_security_tip">Nihai güvenlik için başka bir güvenilir iletişim aracı kullanın veya bunu şahsen yapın.</string>
+    <string name="verify_user_sas_emoji_help_text">Aşağıdaki benzersiz emojinin ekranında aynı sırayla göründüğünü onaylayarak bu kullanıcıyı doğrulayın.</string>
+    <string name="verification_sas_do_not_match">eşleşmiyorlar</string>
+    <string name="verification_sas_match">Eşleşiyorlar</string>
+    <string name="verification_conclusion_warning">Güvenilmeyen oturum açma</string>
+    <string name="login_error_threepid_denied">E-posta alan adınız bu sunucuya kaydolma yetkisine sahip değil</string>
+    <string name="create_space_in_progress">Alan yaratmak…</string>
+    <string name="create_room_in_progress">Oda oluşturuluyor…</string>
+    <string name="create_room_alias_invalid">Bazı karakterlere izin verilmiyor</string>
+    <string name="create_room_alias_empty">Lütfen bir oda adresi girin</string>
+    <string name="create_room_alias_already_in_use">Bu adres zaten kullanılıyor</string>
+    <string name="create_space_alias_hint">Alan adresi</string>
+    <string name="create_room_alias_hint">Oda adresi</string>
+    <string name="create_room_disable_federation_description">Oda yalnızca ana sunucunuzdaki dahili ekiplerle işbirliği yapmak için kullanılacaksa bunu etkinleştirebilirsiniz. Bu daha sonra değiştirilemez.</string>
+    <string name="create_room_disable_federation_title">%s üyesi olmayan herkesin bu odaya katılmasını engelle</string>
+    <string name="show_advanced">Gelişmişleri göster</string>
+    <string name="hide_advanced">Gelişmişleri gizle</string>
+    <string name="create_room_encryption_description">Etkinleştirildikten sonra şifreleme devre dışı bırakılamaz.</string>
+    <string name="create_room_encryption_title">Şifrelemeyi etkinleştir</string>
+    <string name="command_description_lenny">Düz metin mesajının başına ( ͡° ͜ʖ ͡°) ekler</string>
+    <string name="command_description_shrug">Düz metin mesajının başına ¯\\_(ツ)_/¯ ekler</string>
+    <string name="settings_developer_mode_show_info_on_screen_summary">Uygulamada hata ayıklamaya yardımcı olacak bazı yararlı bilgiler gösterin</string>
+    <string name="settings_developer_mode_show_info_on_screen_title">Hata ayıklama bilgilerini ekranda göster</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name}, beklenmeyen bir hata oluştuğunda daha sık çökebilir</string>
+    <string name="settings_developer_mode_fail_fast_title">Hızlı arıza</string>
+    <string name="autocomplete_limited_results">Yalnızca ilk sonuçlar gösteriliyor, daha fazla harf yazın…</string>
+    <string name="devices_other_devices">Diğer oturumlar</string>
+    <string name="devices_current_device">Geçerli oturum</string>
+    <string name="settings">Ayarlar</string>
+    <string name="rageshake_detected">Sarsıntı tespit edildi!</string>
+    <string name="settings_rageshake_detection_threshold_summary">Algılama eşiğini test etmek için telefonunuzu sallayın</string>
+    <string name="settings_rageshake_detection_threshold">Algılama eşiği</string>
+    <string name="settings_rageshake">Öfke sarsılması</string>
+    <string name="settings_developer_mode_summary">Geliştirici modu, gizli özellikleri etkinleştirir ve ayrıca uygulamayı daha az kararlı hale getirebilir. Sadece geliştiriciler için!</string>
+    <string name="settings_developer_mode">Geliştirici modu</string>
+    <string name="settings_advanced_settings">Gelişmiş Ayarlar</string>
+    <string name="settings_show_devices_list">Tüm seanslarımı gör</string>
+    <string name="notification_initial_sync">İlk Senkronizasyon…</string>
+    <string name="bug_report_error_too_short">Açıklama çok kısa</string>
+    <string name="permalink_malformed">matrix.to bağlantınız hatalı biçimlendirilmiş</string>
+    <string name="template_soft_logout_sso_not_same_user_error">Geçerli oturum %1$s kullanıcısı içindir ve %2$s kullanıcısı için kimlik bilgileri sağlarsınız. Bu, ${app_name} tarafından desteklenmez.
+\nLütfen önce verileri temizleyin, sonra başka bir hesapta tekrar oturum açın.</string>
+    <string name="soft_logout_clear_data_dialog_submit">Verileri temizle</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Şifreleme anahtarlarınızı kurtarmak için oturum açmadığınız sürece güvenli mesajlara erişiminizi kaybedersiniz.</string>
+    <string name="soft_logout_clear_data_dialog_content">Bu cihazda şu anda depolanan tüm veriler silinsin mi\?
+\nHesap verilerinize ve mesajlarınıza erişmek için tekrar oturum açın.</string>
+    <string name="soft_logout_clear_data_dialog_title">Verileri temizle</string>
+    <string name="soft_logout_clear_data_submit">Tüm verileri temizle</string>
+    <string name="soft_logout_clear_data_title">Kişisel verileri temizle</string>
+    <string name="soft_logout_signin_password_hint">Parola</string>
+    <string name="soft_logout_signin_submit">Kayıt olmak</string>
+    <string name="soft_logout_signin_e2e_warning_notice">Yalnızca bu cihazda depolanan şifreleme anahtarlarını kurtarmak için oturum açın. Tüm güvenli mesajlarınızı herhangi bir cihazda okumak için onlara ihtiyacınız var.</string>
+    <string name="soft_logout_signin_notice">Ana sunucunuz (%1$s) yöneticiniz, %2$s (%3$s) hesabınızdaki oturumunuzu kapattı.</string>
+    <string name="soft_logout_signin_title">Kayıt olmak</string>
+    <string name="soft_logout_title">çıkış yaptınız</string>
+    <string name="signed_out_submit">tekrar oturum aç</string>
+    <string name="signed_out_title">çıkış yaptınız</string>
+    <string name="seen_by">Tarafından görüldü</string>
+    <string name="does_not_look_like_valid_email">Geçerli bir e-posta adresi gibi görünmüyor</string>
+    <string name="login_set_email_notice">Hesabınızı kurtarmak için bir e-posta ayarlayın. Daha sonra isteğe bağlı olarak tanıdığınız kişilerin sizi e-postanızla keşfetmesine izin verebilirsiniz.</string>
+    <string name="login_reset_password_cancel_confirmation_content">Şifreniz henüz değiştirilmedi.
+\n
+\n Şifre değiştirme işlemi durdurulsun mu\?</string>
+    <string name="login_reset_password_success_notice_2">Tüm oturumlardan çıkış yaptınız ve artık anında iletme bildirimleri almayacaksınız. Bildirimleri yeniden etkinleştirmek için her cihazda tekrar oturum açın.</string>
+    <string name="login_mode_not_supported">Uygulama bu ana sunucusunda oturum açamıyor. Ana sunucusu şu oturum açma türlerini destekler: %1$s.
+\n
+\n Bir web istemcisi kullanarak oturum açmak istiyor musunuz\?</string>
+    <string name="login_sso_error_message">Sayfa yüklenirken bir hata oluştu: %1$s (%2$d)</string>
+    <string name="login_server_url_form_common_notice">Kullanmak istediğiniz sunucunun adresini girin</string>
+    <string name="login_server_url_form_modular_notice">Kullanmak istediğiniz Modüler Öğe veya Sunucunun adresini girin</string>
+    <string name="login_server_url_form_modular_text">Kuruluşlar için premium barındırma</string>
+    <string name="login_signin_sso">SSO ile devam et</string>
+    <string name="login_social_continue_with">%s ile devam et</string>
+    <string name="login_splash_already_have_account">zaten bir hesabım var</string>
+    <string name="login_splash_create_account">Hesap oluştur</string>
+    <string name="ftue_auth_carousel_workplace_title">Ekibiniz için mesajlaşma.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Uçtan uca şifrelenir ve telefon numarası gerekmez. Reklam veya veri madenciliği yok.</string>
+    <string name="ftue_auth_carousel_control_body">Size kontrol ve bağımsızlık vererek konuşmalarınızın nerede tutulacağını seçin. Matrix ile bağlandı.</string>
+    <string name="ftue_auth_carousel_secure_body">Size kendi evinizde yüz yüze görüşmeyle aynı düzeyde mahremiyet sağlayan güvenli ve bağımsız iletişim.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Güvenli mesajlaşma.</string>
+    <string name="ftue_auth_carousel_control_title">Kontrol sende.</string>
+    <string name="ftue_auth_carousel_secure_title">Konuşmalarınıza sahip çıkın.</string>
+    <string name="direct_room_join_rules_invite_by_you">Bu daveti yalnızca siz yaptınız.</string>
+    <string name="direct_room_join_rules_invite">%1$s bu daveti yalnızca yaptı.</string>
+    <string name="room_join_rules_invite">%1$s odayı yalnızca davet etti.</string>
+    <string name="room_join_rules_public_by_you">Odayı, bağlantıyı bilen herkese açık hale getirdin.</string>
+    <string name="room_join_rules_public">%1$s, odayı bağlantıyı bilen herkese açık hale getirdi.</string>
+    <string name="reaction_search_type_hint">Bir tepki bulmak için anahtar kelimeleri yazın.</string>
+    <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="template_permissions_rationale_msg_keys_backup_export">${app_name}, E2E anahtarlarınızı diske kaydetmek için izne ihtiyaç duyuyor.
+\n
+\n Anahtarlarınızı manuel olarak dışa aktarabilmek için lütfen bir sonraki açılır pencerede erişime izin verin.</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>
+    <string name="report_content_custom">Özel rapor…</string>
+    <string name="uploads_files_subtitle">%1$s, %2$s konumunda</string>
+    <string name="attachment_viewer_item_x_of_y">%1$d / %2$d</string>
+    <string name="error_handling_incoming_share">Paylaşım verileri işlenemedi</string>
+    <string name="attachment_type_location">Konum</string>
+    <string name="attachment_type_poll">Anket</string>
+    <string name="error_file_too_big">\'%1$s\' (%2$s) dosyası yüklenemeyecek kadar büyük. Sınır %3$s.</string>
+    <string name="error_file_too_big_simple">Dosya yüklenemeyecek kadar büyük.</string>
+    <plurals name="fallback_users_read">
+        <item quantity="one">%d kullanıcı okudu</item>
+        <item quantity="other">%d kullanıcı okudular</item>
+    </plurals>
+    <string name="one_user_read">%s okundu</string>
+    <string name="two_users_read">%1$s ve %2$s okuma</string>
+    <string name="three_users_read">%1$s, %2$s ve %3$s okuma</string>
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s ve %3$d diğer okuma</item>
+        <item quantity="other">%1$s, %2$s ve %3$d kişi daha okudu</item>
+    </plurals>
+    <string name="a11y_beta">Bu özellik beta sürümünde</string>
+    <string name="a11y_close_keys_backup_banner">Anahtarları yedekleme başlığını kapatın</string>
+    <string name="a11y_create_direct_message_by_qr_code">QR kodunu tarayarak yeni bir doğrudan görüşme oluşturun</string>
+    <string name="a11y_create_direct_message_by_mxid">Matrix ID ile yeni bir doğrudan görüşme oluşturun</string>
+    <string name="error_terms_not_accepted">Lütfen ev sunucunuzun hüküm ve koşullarını kabul ettikten sonra yeniden deneyin.</string>
+    <string name="labs_allow_extended_logging">Ayrıntılı günlükleri etkinleştirin.</string>
+    <string name="settings_agree_to_terms">E-posta adresi veya telefon numarası ile keşfedilebilmeniz için kimlik sunucusunu (%s) Hizmet Şartları\'nı kabul edin.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Şu anda %1$s kimlik sunucusunda e-posta adreslerini veya telefon numaralarını paylaşıyorsunuz. Bunları paylaşmayı durdurmak için %2$s\'a yeniden bağlanmanız gerekecek.</string>
+    <string name="settings_text_message_sent">%s\'e bir kısa mesaj gönderildi. Lütfen içerdiği doğrulama kodunu girin.</string>
+    <string name="settings_discovery_no_terms">Seçtiğiniz kimlik sunucusunun herhangi bir hizmet şartı yok. Yalnızca hizmetin sahibine güveniyorsanız devam edin</string>
+    <string name="settings_discovery_no_terms_title">Kimlik sunucusunun hizmet şartı yok</string>
+    <string name="settings_discovery_please_enter_server">Lütfen kimlik sunucusu url\'sini girin</string>
+    <string name="identity_server_consent_dialog_neutral_policy">Politika</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_content_2">Mevcut kişileri keşfetmek için iletişim bilgilerini kimlik sunucunuza göndermeniz gerekir.
+\n
+\nGizlilik için göndermeden önce verilerinizi hash ederiz. Bu bilgiyi göndermeyi kabul ediyor musunuz\?</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>
+    <string name="settings_discovery_confirm_mail">Size %s adresine bir onay e-postası gönderdik, e-postanızı kontrol edin ve onay bağlantısını tıklayın</string>
+    <string name="settings_discovery_msisdn_title">Keşfedilebilir telefon numaraları</string>
+    <string name="settings_discovery_no_msisdn">Bir telefon numarası ekledikten sonra keşif seçenekleri görünecektir.</string>
+    <string name="settings_discovery_no_mails">Bir e-posta ekledikten sonra keşif seçenekleri görünecektir.</string>
+    <string name="settings_discovery_emails_title">Keşfedilebilir e-posta adresleri</string>
+    <string name="settings_discovery_identity_server_info">Şu anda, tanıdığınız mevcut kişiler tarafından keşfedilmek ve keşfedilebilir olmak için %1$s kullanıyorsunuz.</string>
+    <string name="settings_discovery_no_policy_provided">Kimlik sunucusu tarafından sağlanan politika yok</string>
+    <string name="settings_discovery_hide_identity_server_policy_title">Kimlik sunucusu ilkesini gizle</string>
+    <string name="settings_discovery_show_identity_server_policy_title">Kimlik sunucusu politikasını göster</string>
+    <string name="open_discovery_settings">Keşif Ayarlarını Aç</string>
+    <string name="terms_description_for_integration_manager">Botları, köprüleri, widget\'ları ve çıkartma paketlerini kullanın</string>
+    <string name="search_hint_room_name">Arama ismi</string>
+    <string name="user_directory_search_hint_2">İsime, kimliğe veya postaya göre arama yapın</string>
+    <string name="downloaded_file">%1$s dosyası indirildi!</string>
+    <string name="send_file_step_compressing_video">Video %d%% sıkıştırılıyor</string>
+    <string name="send_file_step_compressing_image">Görüntü sıkıştırılıyor…</string>
+    <string name="give_feedback">Geri bildirimde bulunun</string>
+    <string name="feedback_failed">Geri bildirim gönderilemedi (%s)</string>
+    <string name="feedback_sent">Teşekkürler, geri bildiriminiz başarıyla gönderildi</string>
+    <string name="you_may_contact_me">Herhangi bir takip sorunuz varsa benimle iletişime geçebilirsiniz</string>
+    <string name="send_feedback_space_info">"Alanların beta sürümünü kullanıyorsunuz. Geri bildiriminiz sonraki sürümleri bilgilendirmeye yardımcı olacaktır.  Platformunuz ve kullanıcı adınız, geri bildiriminizi elimizden geldiğince kullanmamıza yardımcı olmak için not edilecektir."</string>
+    <string name="feedback">Geri bildirim</string>
+    <string name="send_feedback_space_title">Alan geri bildirimi</string>
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Kayıt belirteci</string>
+    <string name="preference_system_settings">Sistem ayarları</string>
+    <string name="preference_versions">Sürümler</string>
+    <string name="template_preference_help_summary">${app_name}\'i kullanma konusunda yardım alın</string>
+    <string name="preference_help_title">Yardım ve Destek</string>
+    <string name="preference_help">Yardım</string>
+    <string name="preference_root_legals">Yasal</string>
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="settings_expert">Uzman</string>
+    <string name="import_e2e_keys_from_file">\"%1$s\" dosyasından e2e anahtarlarını içe aktarın.</string>
+    <string name="create_new_space">Yeni Alan Yarat</string>
+    <string name="command_description_whois">Bir kullanıcı hakkında bilgi görüntüler</string>
+    <string name="command_description_avatar_for_room">Avatarınızı yalnızca bu odadaki değiştirir</string>
+    <string name="command_description_room_avatar">Mevcut odanın avatarını değiştirir</string>
+    <string name="command_description_nick_for_room">Yalnızca geçerli odadaki görünen takma adınızı değiştirir</string>
+    <string name="command_description_room_name">Oda adını ayarlar</string>
+    <string name="command_description_unignore_user">Bir kullanıcıyı görmezden gelmeyi durdurur, mesajlarını ileriye doğru gösterir</string>
+    <string name="join_anyway">Yine de Katıl</string>
+    <string name="join_space">Alana Katıl</string>
+    <string name="create_space">Alan Oluştur</string>
+    <string name="skip_for_now">Şimdilik atla</string>
+    <string name="invite_just_to_this_room">Sadece bu odaya</string>
+    <string name="invite_by_link">Link paylaş</string>
+    <string name="invite_by_username_or_mail">Kullanıcı adı veya mail ile davet et</string>
+    <string name="invite_by_username">Kullanıcı adı ile davet et</string>
+    <string name="invite_by_email">Mail ile davet et</string>
+    <string name="invite_to_space">%syi davet et</string>
+    <string name="invite_people_menu">İnsanları davet et</string>
+    <string name="invite_people_to_your_space">Alanınıza insanları davet edin</string>
+    <string name="create_space_topic_hint">Açıklama</string>
+    <string name="create_spaces_loading_message">Alan Oluşturuluyor…</string>
+    <string name="create_spaces_default_public_random_room_name">Rastgele</string>
+    <string name="create_spaces_default_public_room_name">Genel</string>
+    <string name="create_spaces_invite_public_header">Takım arkadaşların kimler\?</string>
+    <string name="activity_create_space_title">Alan oluştur</string>
+    <string name="space_type_private_desc">Yalnızca davet edin, kendiniz veya ekipleriniz için en iyisi</string>
+    <string name="space_type_private">Özel</string>
+    <string name="space_type_public_desc">Herkese açık, topluluklar için en iyisi</string>
+    <string name="space_type_public">Halka açık</string>
+    <string name="create_spaces_me_and_teammates">Ben ve takım arkadaşlarım</string>
+    <string name="create_spaces_just_me">Yalnızca ben</string>
+    <string name="create_spaces_who_are_you_working_with">Kiminle çalışıyorsun\?</string>
+    <string name="tooltip_attachment_location">Konum paylaş</string>
+    <string name="room_profile_encrypted_subtitle">Bu odadaki mesajlar uçtan uca şifrelenir.
+\n
+\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_alert_description">Ekstra güvenlik için, her iki cihazınızda da tek seferlik bir kodu kontrol ederek %s\'yi doğrulayın.
+\n
+\nMaksimum güvenlik için bunu bizzat yapın.</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>
+    <string name="a13n_qr_code_description">QR kod resmi</string>
+    <string name="verify_by_emoji_description">Yukarıdaki kodu tarayamıyorsanız, kısa, benzersiz bir emoji seçimini karşılaştırarak doğrulayın.</string>
+    <string name="verify_by_emoji_title">Emojiyi doğrula</string>
+    <string name="verification_no_scan_emoji_title">Emojileri karşılaştırarak doğrulayın</string>
+    <string name="ftue_auth_use_case_connect_to_server">Sunucuya bağlan</string>
+    <string name="ftue_auth_use_case_join_existing_server">Mevcut bir sunucuya katılmak mı istiyorsun\?</string>
+    <string name="ftue_auth_use_case_skip_partial">bu soruyu atla</string>
+    <string name="ftue_auth_use_case_skip">Henüz emin değil misin\? %s yapabilirsin</string>
+    <string name="ftue_auth_use_case_option_three">Topluluklar</string>
+    <string name="ftue_auth_use_case_option_two">Takımlar</string>
+    <string name="ftue_auth_use_case_option_one">Arkadaşlar ve aile</string>
+    <string name="ftue_auth_use_case_subtitle">Bağlanmanıza yardımcı olacağız.</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Bu konuyu zaten görüntülüyorsun!</string>
+    <string name="view_in_room">Odada Görüntüle</string>
+    <string name="search_thread_from_a_thread">Bir Konudan</string>
+    <string name="thread_list_empty_notice">İpucu: Bir mesaja uzun dokunun ve “%s” kullanın.</string>
+    <string name="thread_list_modal_my_threads_subtitle">Katıldığın tüm konuları göster</string>
+    <string name="thread_list_modal_my_threads_title">Konularım</string>
+    <string name="thread_list_modal_all_threads_subtitle">Geçerli odadaki tüm konuları göster</string>
+    <string name="thread_list_modal_all_threads_title">Tüm Konular</string>
+    <string name="thread_list_modal_title">Filtre</string>
+    <string name="thread_list_title">Konular</string>
+    <string name="thread_timeline_title">Konu</string>
+    <string name="room_threads_filter">Odadaki Konuları Filtrele</string>
+    <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>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index c9e8372cc9..f392c6fd9a 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -1104,7 +1104,6 @@
     <string name="attachment_type_audio">Аудіо</string>
     <string name="room_filtering_footer_create_new_room">Створити нову кімнату</string>
     <string name="room_list_rooms_empty_title">Кімнати</string>
-    <string name="search_is_not_supported_in_e2e_room">Пошук у зашифрованих кімнатах не наразі не підтримується.</string>
     <string name="settings_call_show_confirmation_dialog_summary">Запитувати підтвердження перед початком виклику</string>
     <string name="settings_call_show_confirmation_dialog_title">Запобігати випадковим викликам</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Мені не потрібні мої зашифровані повідомлення</string>
@@ -2024,7 +2023,6 @@
     <string name="secure_backup_setup">Налаштувати безпечне резервне копіювання</string>
     <string name="bottom_sheet_setup_secure_backup_title">Безпечне резервне копіювання</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Простори — це новий спосіб згуртувати кімнати та людей.</string>
-    <string name="create_spaces_type_header">Простори — це новий спосіб згуртувати кімнати та людей</string>
     <string name="give_feedback">Надіслати відгук</string>
     <string name="you_may_contact_me">Можете зв’язатися зі мною, якщо у вас виникнуть додаткові запитання</string>
     <string name="space_type_private_desc">Лише запрошені, найкраще для себе та команд</string>
@@ -2064,7 +2062,7 @@
     <string name="create_room_in_progress">Створення кімнати…</string>
     <string name="creating_direct_room">Створення кімнати…</string>
     <string name="settings_hs_admin_e2e_disabled">Адміністратор вашого сервера вимкнув автоматичне наскрізне шифрування для приватних кімнат та особистих повідомлень.</string>
-    <string name="link_this_email_with_your_account">%s у налаштуваннях, щоб отримувати запрошення безпосередньо в Element.</string>
+    <string name="template_link_this_email_with_your_account">%s у налаштуваннях, щоб отримувати запрошення безпосередньо в ${app_name}.</string>
     <string name="settings_encrypted_direct_messages">Зашифровані особисті повідомлення</string>
     <string name="settings_messages_direct_messages">Особисті повідомлення</string>
     <string name="recovery_key_empty_error_message">Введіть ключ відновлення</string>
@@ -2164,7 +2162,6 @@
     <string name="a11y_video">Відео</string>
     <string name="a11y_unsent_draft">має не надіслану чернетку</string>
     <string name="a11y_error_some_message_not_sent">Деякі повідомлення не було надіслано</string>
-    <string name="to_help_space_members_find_and_join">Щоб допомогти учасникам простору знайти та приєднатися до приватної кімнати, перейдіть до її налаштувань, торкнувшись аватара.</string>
     <string name="a11y_delete_avatar">Видалити аватар</string>
     <string name="room_settings_set_avatar">Установити аватар</string>
     <string name="a11y_change_avatar">Змінити аватар</string>
@@ -2983,8 +2980,6 @@
 \n - Домашній сервер, до якого під\'єднаний користувач, якого ви перевірили
 \n - Ваше інтернет-з\'єднання або інтернет-з\'єднання вашого користувача
 \n - Ваш пристрій або пристрій іншого користувача</string>
-    <string name="help_space_members">Допоможіть учасникам простору знаходити приватні кімнати</string>
-    <string name="new_let_people_in_spaces_find_and_join">Нове: Дозволити людям у просторах знаходити та приєднуватися до приватних кімнат</string>
     <string name="invite_just_to_this_room">Лише в цю кімнату</string>
     <string name="invite_to_space_with_name_desc">Вони зможуть переглядати %s</string>
     <string name="invite_by_username_or_mail">Запрошення за іменем користувача або е-поштою</string>
@@ -3019,8 +3014,6 @@
 \nСпробуйте згодом або запитайте адміністратора кімнати, чи є у вас доступ.</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="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Кімнати можуть лишатися закритими для людей ззовні простору, водночас люди в просторі можуть знаходити їх і приєднуватися. Всі нові кімнати в просторі матимуть цю опцію.</string>
-    <string name="help_people_in_spaces_find_and_join">Допомагає людям у просторах знаходити закриті кімнати й приєднуватися самостійно, без потреби вручну запрошувати всіх.</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>
@@ -3131,7 +3124,7 @@
     </plurals>
     <string name="preference_system_settings">Системні налаштування</string>
     <string name="preference_versions">Версії</string>
-    <string name="preference_help_summary">Отримати допомогу в використанні Element</string>
+    <string name="template_preference_help_summary">Отримати допомогу в використанні ${app_name}</string>
     <string name="preference_help_title">Довідка й підтримка</string>
     <string name="preference_help">Довідка</string>
     <string name="preference_root_legals">Правові положення</string>
@@ -3144,10 +3137,10 @@
     <string name="analytics_opt_in_list_item_2">Ми <b>не</b> передаємо даних стороннім особам</string>
     <string name="analytics_opt_in_list_item_1">Ми <b>не</b> записуємо й <b>не</b> аналізуємо жодних даних облікового запису</string>
     <string name="analytics_opt_in_content_link">тут</string>
-    <string name="analytics_opt_in_content">Допомагайте нам визначати проблеми й удосконалювати Element, надсилаючи анонімні дані про використання. Щоб розуміти, як люди використовують кілька пристроїв, ми створимо спільний для ваших пристроїв випадковий ідентифікатор.
+    <string name="template_analytics_opt_in_content">Допомагайте нам визначати проблеми й удосконалювати ${app_name}, надсилаючи анонімні дані про використання. Щоб розуміти, як люди використовують кілька пристроїв, ми створимо спільний для ваших пристроїв випадковий ідентифікатор.
 \n
 \nМожете прочитати всі наші умови %s.</string>
-    <string name="analytics_opt_in_title">Допоможіть покращити Element</string>
+    <string name="template_analytics_opt_in_title">Допоможіть покращити ${app_name}</string>
     <string name="action_enable">Увімкнути</string>
     <string name="restart_the_application_to_apply_changes">Перезапустіть застосунок, щоб зміни набули чинності.</string>
     <string name="labs_enable_latex_maths">Увімкнути підтримку LaTeX</string>
@@ -3162,10 +3155,9 @@
     <string name="labs_auto_report_uisi">Автозвіт про помилки шифрування.</string>
     <string name="room_member_override_nick_color">Замінити колір псевдоніма</string>
     <string name="login_splash_already_have_account">Я вже маю обліковий запис</string>
-    <string name="ftue_auth_carousel_4_title">Удоскональте спілкування в команді.</string>
-    <string name="ftue_auth_carousel_3_title">Захищене спілкування.</string>
-    <string name="ftue_auth_carousel_2_title">Ви контролюєте все.</string>
-    <string name="ftue_auth_carousel_1_title">Володійте своїми розмовами.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Захищене спілкування.</string>
+    <string name="ftue_auth_carousel_control_title">Ви контролюєте все.</string>
+    <string name="ftue_auth_carousel_secure_title">Володійте своїми розмовами.</string>
     <string name="tooltip_attachment_location">Поділитися місцеперебуванням</string>
     <string name="labs_render_locations_in_timeline">Зображувати місцеперебування користувача у стрічці</string>
     <string name="settings_enable_location_sharing_summary">Після увімкнення ви зможете надіслати своє місцеперебування до будь-якої кімнати</string>
@@ -3192,11 +3184,44 @@
     <string name="encryption_has_been_misconfigured">Шифрування неправильно налаштовано.</string>
     <string name="sent_location">Поділилися своїм місцеперебуванням</string>
     <string name="login_splash_create_account">Створити обліковий запис</string>
-    <string name="ftue_auth_carousel_title_messaging">Спілкування вашої команди.</string>
-    <string name="ftue_auth_carousel_body_encrypted">З наскрізним шифруванням і без вимоги номера телефону. Без реклами чи аналізу даних.</string>
-    <string name="ftue_auth_carousel_body_control">Оберіть де спілкуватись, що дасть вам контроль і незалежність. Під\'єднано через Matrix.</string>
-    <string name="ftue_auth_carousel_body_secure">Захищене та незалежне спілкування, яке дає вам такий самий рівень приватності, як розмова віч-на-віч у вашому власному домі.</string>
+    <string name="ftue_auth_carousel_workplace_title">Спілкування вашої команди.</string>
+    <string name="ftue_auth_carousel_encrypted_body">З наскрізним шифруванням і без вимоги номера телефону. Без реклами чи аналізу даних.</string>
+    <string name="ftue_auth_carousel_control_body">Оберіть де спілкуватись, що дасть вам контроль і незалежність. Під\'єднано через Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Захищене та незалежне спілкування, яке дає вам такий самий рівень приватності, як розмова віч-на-віч у вашому власному домі.</string>
     <string name="attachment_type_location">Місцеперебування</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">Шифрування було налаштовано неправильно, тому ви не можете надсилати повідомлення. Торкніться, щоб відкрити налаштування.</string>
     <string name="room_unsupported_e2e_algorithm">Шифрування було налаштовано неправильно, тому ви не можете надсилати повідомлення. Зверніться до адміністратора, щоб відновити роботу шифрування.</string>
+    <string name="message_bubbles">Показувати повідомлення у бульбашках</string>
+    <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="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_skip">Досі не впевнені\? Ви можете %s</string>
+    <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_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>
+    <string name="command_not_supported_in_threads">Команду «%s» розпізнано, але її не підтримують треди.</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_empty_subtitle">Треди допомагають підтримувати розмови за темою та за ними легко стежити.</string>
+    <string name="thread_list_modal_my_threads_subtitle">Показує всі треди, де ви брали участь</string>
+    <string name="thread_list_modal_my_threads_title">Мої треди</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_list_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="action_view_threads">Переглянути треди</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index c71e59d685..24156706ef 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -1430,7 +1430,6 @@
         <item quantity="other">%d phòng</item>
     </plurals>
     <string name="directory_search_results_title">Duyệt danh mục phòng</string>
-    <string name="search_is_not_supported_in_e2e_room">Tìm kiếm trong phòng mã hóa chưa được hỗ trợ.</string>
     <string name="tab_title_search_files">FILES</string>
     <string name="tab_title_search_people">NGƯỜI</string>
     <string name="tab_title_search_messages">TIN NHẮN</string>
@@ -1705,15 +1704,10 @@
     <string name="create_poll_question_hint">Câu hỏi hoặc chủ đề</string>
     <string name="create_poll_question_title">Câu hỏi hoặc chủ đề thăm dò ý kiến</string>
     <string name="create_poll_title">Tạo Cuộc thăm dò ý kiến</string>
-    <string name="link_this_email_with_your_account">%s trong Cài đặt để nhận lời mời trực tiếp trong Element.</string>
+    <string name="template_link_this_email_with_your_account">%s trong Cài đặt để nhận lời mời trực tiếp trong ${app_name}.</string>
     <string name="link_this_email_settings_link">Liên kết email này với tài khoản của bạn</string>
     <string name="this_invite_to_this_space_was_sent">Lời mời này đến Space này đã được gửi đến %s không được liên kết với tài khoản của bạn</string>
     <string name="this_invite_to_this_room_was_sent">Lời mời này đến phòng này đã được gửi đến %s không được liên kết với tài khoản của bạn</string>
-    <string name="to_help_space_members_find_and_join">Để giúp các thành viên Space tìm và tham gia một phòng riêng, hãy vào cài đặt của căn phòng đó bằng cách nhấn vào hình đại diện.</string>
-    <string name="help_space_members">Giúp các thành viên Space tìm phòng riêng</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">Điều này giúp các phòng dễ dàng giữ riêng tư cho một Space, đồng thời cho phép mọi người trong Space tìm và tham gia cùng họ. Tất cả các phòng mới trong một Space sẽ có tùy chọn này có sẵn.</string>
-    <string name="help_people_in_spaces_find_and_join">Giúp mọi người trong Space tự tìm và tham gia phòng riêng, không cần phải tự mời mọi người.</string>
-    <string name="new_let_people_in_spaces_find_and_join">Mới: Cho phép mọi người trong Space tìm và tham gia phòng riêng</string>
     <string name="upgrade_room_for_restricted_note">Xin lưu ý nâng cấp sẽ tạo ra một phiên bản mới của căn phòng. Tất cả các tin nhắn hiện tại sẽ ở trong phòng lưu trữ này.</string>
     <string name="upgrade_room_for_restricted_no_param">Bất cứ ai trong Space cha mẹ sẽ có thể tìm và tham gia căn phòng này - không cần phải mời mọi người theo cách thủ công. Bạn sẽ có thể thay đổi điều này trong cài đặt phòng bất cứ lúc nào.</string>
     <string name="upgrade_room_for_restricted">Bất kỳ ai trong %s sẽ có thể tìm và tham gia phòng này - không cần phải mời mọi người theo cách thủ công. Bạn sẽ có thể thay đổi điều này trong cài đặt phòng bất cứ lúc nào.</string>
@@ -1838,7 +1832,6 @@
     <string name="create_spaces_join_info_help">Để tham gia một Space hiện có, bạn cần một lời mời.</string>
     <string name="create_spaces_you_can_change_later">Bạn có thể thay đổi điều này sau</string>
     <string name="create_spaces_choose_type_label">Bạn muốn tạo ra loại Space nào\?</string>
-    <string name="create_spaces_type_header">Space là một cách mới để nhóm phòng và con người</string>
     <string name="your_private_space">Space riêng tư của bạn</string>
     <string name="your_public_space">Space công cộng của bạn</string>
     <string name="add_space">Thêm Space</string>
@@ -2918,10 +2911,10 @@
     <string name="analytics_opt_in_list_item_2">Chúng tôi <b>không </b> chia sẻ thông tin với bên thứ ba</string>
     <string name="analytics_opt_in_list_item_1">Chúng tôi <b>không</b> ghi âm hoặc tạo hồ sơ bất kỳ dữ liệu tài khoản nào</string>
     <string name="analytics_opt_in_content_link">ở đây</string>
-    <string name="analytics_opt_in_content">Giúp chúng tôi xác định các vấn đề và cải thiện Element bằng cách chia sẻ dữ liệu sử dụng ẩn danh. Để hiểu cách mọi người sử dụng nhiều thiết bị, chúng tôi sẽ tạo ra một mã định danh ngẫu nhiên, được chia sẻ bởi các thiết bị của bạn.
+    <string name="template_analytics_opt_in_content">Giúp chúng tôi xác định các vấn đề và cải thiện ${app_name} bằng cách chia sẻ dữ liệu sử dụng ẩn danh. Để hiểu cách mọi người sử dụng nhiều thiết bị, chúng tôi sẽ tạo ra một mã định danh ngẫu nhiên, được chia sẻ bởi các thiết bị của bạn.
 \n
 \nBạn có thể đọc tất cả các thuật ngữ của chúng tôi %s.</string>
-    <string name="analytics_opt_in_title">Giúp cải thiện Element</string>
+    <string name="template_analytics_opt_in_title">Giúp cải thiện ${app_name}</string>
     <string name="shortcut_disabled_reason_sign_out">Thiết bị đã bị đăng xuất!</string>
     <string name="shortcut_disabled_reason_room_left">Căn phòng đã bị bỏ lại!</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Chọn homeerver</string>
@@ -2969,7 +2962,7 @@
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Token đăng ký</string>
     <string name="preference_system_settings">Cài đặt hệ thống</string>
     <string name="preference_versions">Phiên bản</string>
-    <string name="preference_help_summary">Nhận trợ giúp về việc sử dụng Element</string>
+    <string name="template_preference_help_summary">Nhận trợ giúp về việc sử dụng ${app_name}</string>
     <string name="preference_help_title">Trợ giúp và hỗ trợ</string>
     <string name="preference_help">Trợ giúp</string>
     <string name="preference_root_legals">Pháp lý</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 953ae5c91a..27d9e805e1 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2307,7 +2307,6 @@
     <string name="settings_troubleshoot_test_push_loop_success">应用正在接受推送</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">应用正在等待推送</string>
     <string name="settings_troubleshoot_test_push_loop_title">测试推送</string>
-    <string name="search_is_not_supported_in_e2e_room">尚不支持在加密聊天室中搜索。</string>
     <string name="search_banned_user_hint">过滤被封禁的用户</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">你没有权限发起通话</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">你没有权限发起会议通话</string>
@@ -2556,7 +2555,6 @@
     <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="create_spaces_type_header">空间是一种将聊天室和人们进行分组的新方式</string>
     <string name="spaces_beta_welcome_to_spaces_desc">空间是一种将聊天室和人们进行重新分组的新方式。</string>
     <string name="spaces_beta_welcome_to_spaces">欢迎来到空间！</string>
     <string name="space_add_rooms">添加聊天室</string>
@@ -2810,15 +2808,10 @@
     <string name="settings_notification_default">默认通知</string>
     <string name="call_tile_video_active">活跃视频通话</string>
     <string name="call_tile_voice_active">活跃语音通话</string>
-    <string name="link_this_email_with_your_account">在 Element 中直接接收邀请的设置 %s。</string>
+    <string name="template_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="to_help_space_members_find_and_join">要帮助空间成员找到并加入一个私人聊天室，只需点击头像进入聊天室设置。</string>
-    <string name="help_space_members">帮助空间成员找到私人聊天室</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">这使聊天室很容易在空间中保持私密性，同时让空间中的人们找到并加入它们。空间中的所有新聊天室都有这个选项。</string>
-    <string name="help_people_in_spaces_find_and_join">帮助空间里的人们自己找到和加入私人房间，不需要手动邀请每个人。</string>
-    <string name="new_let_people_in_spaces_find_and_join">新：让人们在空间中找到并加入私人聊天室</string>
     <string name="call_jitsi_started">群通话已启动</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">你所在的全部聊天室将显示在主页上。</string>
     <string name="preference_show_all_rooms_in_home">在主页上显示所有聊天室</string>
@@ -2970,7 +2963,7 @@
     </plurals>
     <string name="preference_system_settings">系统设置</string>
     <string name="preference_versions">版本</string>
-    <string name="preference_help_summary">获取使用 Element 的帮助</string>
+    <string name="template_preference_help_summary">获取使用 ${app_name} 的帮助</string>
     <string name="preference_help_title">帮助和支持</string>
     <string name="preference_help">帮助</string>
     <string name="preference_root_legals">法律</string>
@@ -2983,9 +2976,9 @@
     <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">通过共享匿名使用数据，帮助我们识别问题并改进 Element。为了理解人们如何使用多台设备，我们将生成一个随机标识符，由您的设备共享。
+    <string name="template_analytics_opt_in_content">通过共享匿名使用数据，帮助我们识别问题并改进 ${app_name}。为了理解人们如何使用多台设备，我们将生成一个随机标识符，由您的设备共享。
 \n
 \n你可以阅读我们所有的条款 %s。</string>
-    <string name="analytics_opt_in_title">帮助改进 Element</string>
+    <string name="template_analytics_opt_in_title">帮助改进 ${app_name}</string>
     <string name="action_enable">启用</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 3dcf132f92..b40f4fd893 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2352,7 +2352,6 @@
     <string name="settings_troubleshoot_test_push_loop_success">應用程式正在接收 PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">應用程式正在等待 PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_title">測試推播</string>
-    <string name="search_is_not_supported_in_e2e_room">目前尚不支援在已加密的聊天室中搜尋。</string>
     <string name="search_banned_user_hint">過濾被封鎖的使用者</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">您沒有開始通話的權限</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">您沒有開始會議通話的權限</string>
@@ -2650,7 +2649,6 @@
     <string name="create_spaces_join_info_help">要加入既有的空間，您需要邀請。</string>
     <string name="create_spaces_you_can_change_later">您可以稍後再更改</string>
     <string name="create_spaces_choose_type_label">您想要建立哪種類型的空間？</string>
-    <string name="create_spaces_type_header">空間是一種將聊天室與人們分組的新方式</string>
     <string name="your_private_space">您的私人空間</string>
     <string name="your_public_space">您的公開空間</string>
     <string name="add_space">新增空間</string>
@@ -2808,15 +2806,10 @@
     <string name="settings_notification_other">其他</string>
     <string name="settings_notification_mentions_and_keywords">提及與關鍵字</string>
     <string name="settings_notification_default">預設通知</string>
-    <string name="link_this_email_with_your_account">設定中的 %s 可直接在 Element 中接收邀請。</string>
+    <string name="template_link_this_email_with_your_account">設定中的 %s 可直接在 ${app_name} 中接收邀請。</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="to_help_space_members_find_and_join">要協助空間成員尋找並加入私人聊天室，請點擊大頭照進入該聊天是的設定中。</string>
-    <string name="help_space_members">協助空間成員尋找私人聊天室</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">這讓聊天室可以輕鬆地對空間維持隱密，同時讓空間中的夥伴找到並加入它們。空間中的所有新的聊天室都將提供此選項。</string>
-    <string name="help_people_in_spaces_find_and_join">協助空間內的夥伴自己尋找私人聊天室，不需要手動邀請所有人。</string>
-    <string name="new_let_people_in_spaces_find_and_join">新功能：讓空間中的人尋找並加入私人聊天室</string>
     <string name="call_jitsi_started">群組通話開始</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">您所在的所有聊天室都會顯示在 Home 中。</string>
     <string name="preference_show_all_rooms_in_home">顯示 Home 中的所有聊天室</string>
@@ -2970,7 +2963,7 @@
     </plurals>
     <string name="preference_system_settings">系統設定</string>
     <string name="preference_versions">版本</string>
-    <string name="preference_help_summary">取得關於使用 Element 的協助</string>
+    <string name="template_preference_help_summary">取得關於使用 ${app_name} 的協助</string>
     <string name="preference_help_title">說明與支援</string>
     <string name="preference_help">說明</string>
     <string name="preference_root_legals">法律</string>
@@ -2983,10 +2976,10 @@
     <string name="analytics_opt_in_list_item_2">我們<b>不會</b>與第三方分享資訊</string>
     <string name="analytics_opt_in_list_item_1">我們<b>不會</b>記錄或分析任何帳號資料</string>
     <string name="analytics_opt_in_content_link">這裡</string>
-    <string name="analytics_opt_in_content">透過分享匿名使用資料協助我們找出問題並改善 Element。為了了解人們如何使用多裝置，我們將會產生隨機識別字串，在您的裝置間共享。
+    <string name="template_analytics_opt_in_content">透過分享匿名使用資料協助我們找出問題並改善 ${app_name}。為了了解人們如何使用多裝置，我們將會產生隨機識別字串，在您的裝置間共享。
 \n
 \n您可以閱讀我們的條款 %s。</string>
-    <string name="analytics_opt_in_title">協助改善 Element</string>
+    <string name="template_analytics_opt_in_title">協助改善 ${app_name}</string>
     <string name="action_enable">啟用</string>
     <string name="restart_the_application_to_apply_changes">重新啟動應用程式以讓變更生效。</string>
     <string name="labs_enable_latex_maths">啟用 LaTeX 數學</string>
@@ -3001,10 +2994,9 @@
     <string name="labs_auto_report_uisi">自動回報解密錯誤。</string>
     <string name="room_member_override_nick_color">覆寫暱稱色彩</string>
     <string name="login_splash_already_have_account">我已有一個帳號</string>
-    <string name="ftue_auth_carousel_4_title">減少團隊的懈怠。</string>
-    <string name="ftue_auth_carousel_3_title">安全傳送訊息。</string>
-    <string name="ftue_auth_carousel_2_title">您已掌控了您的資料。</string>
-    <string name="ftue_auth_carousel_1_title">擁有您的對話。</string>
+    <string name="ftue_auth_carousel_encrypted_title">安全傳送訊息。</string>
+    <string name="ftue_auth_carousel_control_title">您已掌控了您的資料。</string>
+    <string name="ftue_auth_carousel_secure_title">擁有您的對話。</string>
     <string name="tooltip_attachment_location">分享位置</string>
     <string name="labs_render_locations_in_timeline">在時間軸中繪製使用者位置</string>
     <string name="settings_enable_location_sharing_summary">啟用後，您就能將您的位置傳送至任何聊天室</string>
@@ -3031,11 +3023,44 @@
     <string name="encryption_has_been_misconfigured">加密設定錯誤。</string>
     <string name="sent_location">分享了他們的位置</string>
     <string name="login_splash_create_account">建立帳號</string>
-    <string name="ftue_auth_carousel_title_messaging">為您的團隊傳送訊息。</string>
-    <string name="ftue_auth_carousel_body_encrypted">端到端加密，不需要電話號碼。沒有廣告或資料挖礦。</string>
-    <string name="ftue_auth_carousel_body_control">選擇保留對話的位置，讓您擁有控制權與獨立性。透過 Matrix 連結。</string>
-    <string name="ftue_auth_carousel_body_secure">安全且獨立的通訊，為您提供與在家中進行面對面對話相同的隱私等級。</string>
+    <string name="ftue_auth_carousel_workplace_title">為您的團隊傳送訊息。</string>
+    <string name="ftue_auth_carousel_encrypted_body">端到端加密，不需要電話號碼。沒有廣告或資料挖礦。</string>
+    <string name="ftue_auth_carousel_control_body">選擇保留對話的位置，讓您擁有控制權與獨立性。透過 Matrix 連結。</string>
+    <string name="ftue_auth_carousel_secure_body">安全且獨立的通訊，為您提供與在家中進行面對面對話相同的隱私等級。</string>
     <string name="attachment_type_location">位置</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">加密設定錯誤，因此您無法傳送訊息。點擊以開啟設定。</string>
     <string name="room_unsupported_e2e_algorithm">加密設定錯誤，因此您無法傳送訊息。請聯絡管理員將加密還原至有效的狀態。</string>
+    <string name="message_bubbles">顯示訊息泡泡</string>
+    <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="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_skip">還不確定？您可以 %s</string>
+    <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_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>
+    <string name="command_not_supported_in_threads">可識別指令「%s」，但在討論串中不支援。</string>
+    <string name="search_thread_from_a_thread">來自討論串</string>
+    <string name="thread_list_empty_notice">秘訣：長按訊息並使用「%s」。</string>
+    <string name="thread_list_empty_subtitle">討論串可以協助您的對話不離題且易於追蹤。</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">我的討論串</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_list_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="action_view_threads">檢視討論串</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/config.xml b/vector/src/main/res/values/config.xml
index 8f23c2e1be..78b92cbfa4 100755
--- a/vector/src/main/res/values/config.xml
+++ b/vector/src/main/res/values/config.xml
@@ -5,7 +5,8 @@
 
     <!-- server urls -->
     <string name="matrix_org_server_url" translatable="false">https://matrix.org</string>
-    <string name="piwik_server_url" translatable="false">https://piwik.riot.im</string>
+
+    <!-- Rageshake configuration -->
     <string name="bug_report_url" translatable="false">https://riot.im/bugreports/submit</string>
     <string name="bug_report_app_name" translatable="false">riot-android</string>
     <string name="bug_report_auto_uisi_app_name" translatable="false">element-auto-uisi</string>
@@ -21,7 +22,7 @@
     <string name="pusher_app_id" translatable="false">im.vector.app.android</string>
 
     <!-- preferred jitsi domain -->
-    <string name="preferred_jitsi_domain" translatable="false">jitsi.riot.im</string>
+    <string name="preferred_jitsi_domain" translatable="false">meet.element.io</string>
 
     <string-array name="room_directory_servers" translatable="false">
         <item>matrix.org</item>
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index af2319883c..411236a62f 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -16,15 +16,4 @@
 
     <!-- onboarding english only word play -->
     <string name="cut_the_slack_from_teams" translatable="false">Cut the slack from teams.</string>
-
-    <!--  WIP strings, will move to strings.xml when signed off  -->
-    <string name="ftue_auth_use_case_title" translatable="false">Who will you chat to the most?</string>
-    <string name="ftue_auth_use_case_subtitle" translatable="false">We\'ll help you get connected.</string>
-    <string name="ftue_auth_use_case_option_one" translatable="false">Friends and family</string>
-    <string name="ftue_auth_use_case_option_two" translatable="false">Teams</string>
-    <string name="ftue_auth_use_case_option_three" translatable="false">Communities</string>
-    <string name="ftue_auth_use_case_skip" translatable="false">Not sure yet? %s</string>
-    <string name="ftue_auth_use_case_skip_partial" translatable="false">You can skip this question</string>
-    <string name="ftue_auth_use_case_join_existing_server" translatable="false">Looking to join an existing server?</string>
-    <string name="ftue_auth_use_case_connect_to_server" translatable="false">Connect to server</string>
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 378b8d7cbf..800d1092f8 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -81,6 +81,10 @@
 
     <string name="notice_room_server_acl_updated_title">%s changed the server ACLs for this room.</string>
     <string name="notice_room_server_acl_updated_title_by_you">You changed the server ACLs for this room.</string>
+    <plurals name="notice_room_server_acl_changes">
+        <item quantity="one">%d server ACLs change</item>
+        <item quantity="other">%d server ACLs changes</item>
+    </plurals>
     <string name="notice_room_server_acl_updated_banned">• Servers matching %s are now banned.</string>
     <string name="notice_room_server_acl_updated_was_banned">• Servers matching %s were removed from the ban list.</string>
     <string name="notice_room_server_acl_updated_allowed">• Servers matching %s are now allowed.</string>
@@ -415,6 +419,7 @@
     <string name="action_sign_out_confirmation_simple">Are you sure you want to sign out?</string>
     <string name="action_voice_call">Voice Call</string>
     <string name="action_video_call">Video Call</string>
+    <string name="action_view_threads">View Threads</string>
     <string name="action_global_search">Global search</string>
     <string name="action_mark_all_as_read">Mark all as read</string>
     <string name="action_historical">Historical</string>
@@ -468,6 +473,10 @@
 
     <string name="copied_to_clipboard">Copied to clipboard</string>
 
+    <!-- actions threads -->
+    <string name="action_thread_view_in_room">View in room</string>
+    <string name="action_thread_copy_link_to_thread">Copy link to thread</string>
+
     <!-- dialog titles -->
     <string name="dialog_title_confirmation">Confirmation</string>
     <string name="dialog_title_warning">Warning</string>
@@ -1029,6 +1038,21 @@
     <string name="room_details_people_invited_group_name">INVITED</string>
     <string name="room_details_people_present_group_name">JOINED</string>
 
+    <!-- Threads -->
+    <string name="room_threads_filter">Filter Threads in room</string>
+    <string name="thread_timeline_title">Thread</string>
+    <string name="thread_list_title">Threads</string>
+    <string name="thread_list_modal_title">Filter</string>
+    <string name="thread_list_modal_all_threads_title">All Threads</string>
+    <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_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>
+    <string name="search_thread_from_a_thread">From a Thread</string>
+
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Reason for reporting this content</string>
     <string name="room_event_action_report_prompt_ignore_user">Do you want to hide all messages from this user?\n\nNote that this action will restart the app and it may take some time.</string>
@@ -1044,7 +1068,6 @@
     <string name="tab_title_search_messages">MESSAGES</string>
     <string name="tab_title_search_people">PEOPLE</string>
     <string name="tab_title_search_files">FILES</string>
-    <string name="search_is_not_supported_in_e2e_room">Searching in encrypted rooms is not supported yet.</string>
 
     <!-- Directory -->
     <string name="directory_search_results_title">Browse directory</string>
@@ -1363,10 +1386,9 @@
     <string name="template_settings_opt_in_of_analytics_prompt">Please enable analytics to help us improve ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Yes, I want to help!</string>
 
-    <!-- analytics v2 -->
-    <string name="analytics_opt_in_title">Help improve Element</string>
+    <string name="template_analytics_opt_in_title">Help improve ${app_name}</string>
     <!-- The template will be replaced by the value of the resource analytics_opt_in_content_link -->
-    <string name="analytics_opt_in_content">Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.\n\nYou can read all our terms %s.</string>
+    <string name="template_analytics_opt_in_content">Help us identify issues and improve ${app_name} by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.\n\nYou can read all our terms %s.</string>
     <string name="analytics_opt_in_content_link">here</string>
     <string name="analytics_opt_in_list_item_1">We <b>don\'t</b> record or profile any account data</string>
     <string name="analytics_opt_in_list_item_2">We <b>don\'t</b> share information with third parties</string>
@@ -1836,6 +1858,7 @@
     <string name="command_error">Command error</string>
     <string name="unrecognized_command">Unrecognized command: %s</string>
     <string name="command_problem_with_parameters">The command \"%s\" needs more parameters, or some parameters are incorrect.</string>
+    <string name="command_not_supported_in_threads">The command \"%s\" is recognized but not supported in threads.</string>
     <string name="command_description_emote">Displays action</string>
     <string name="command_description_ban_user">Bans user with given id</string>
     <string name="command_description_unban_user">Unbans user with given id</string>
@@ -2179,6 +2202,8 @@
 
     <string name="edit">Edit</string>
     <string name="reply">Reply</string>
+    <string name="reply_in_thread">Reply In Thread</string>
+    <string name="view_in_room">View In Room</string>
 
     <string name="global_retry">Retry</string>
     <string name="room_list_empty">"Join a room to start using the app."</string>
@@ -2245,6 +2270,7 @@
     <string name="settings_sdk_version">Matrix SDK Version</string>
     <string name="settings_other_third_party_notices">Other third party notices</string>
     <string name="navigate_to_room_when_already_in_the_room">You are already viewing this room!</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">You are already viewing this thread!</string>
 
     <string name="quick_reactions">Quick Reactions</string>
 
@@ -2270,7 +2296,7 @@
 
     <string name="preference_help">Help</string>
     <string name="preference_help_title">Help and support</string>
-    <string name="preference_help_summary">Get help with using Element</string>
+    <string name="template_preference_help_summary">Get help with using ${app_name}</string>
     <string name="preference_versions">Versions</string>
     <string name="preference_system_settings">System settings</string>
 
@@ -2513,19 +2539,27 @@
     <string name="timeline_unread_messages">Unread messages</string>
 
     <!--  Onboarding -->
-    <string name="ftue_auth_carousel_1_title">Own your conversations.</string>
-    <string name="ftue_auth_carousel_2_title">You\'re in control.</string>
-    <string name="ftue_auth_carousel_3_title">Secure messaging.</string>
-    <!-- TODO Remove -->
-    <string name="ftue_auth_carousel_4_title">Cut the slack from teams.</string>
+    <string name="ftue_auth_carousel_secure_title">Own your conversations.</string>
+    <string name="ftue_auth_carousel_control_title">You\'re in control.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Secure messaging.</string>
+    <string name="ftue_auth_carousel_workplace_title">Messaging for your team.</string>
 
-    <string name="ftue_auth_carousel_body_secure">Secure and independent communication that gives you the same level of privacy as a face-to-face conversation in your own home.</string>
-    <string name="ftue_auth_carousel_body_control">Choose where your conversations are kept, giving you control and independence. Connected via Matrix.</string>
-    <string name="ftue_auth_carousel_body_encrypted">End-to-end encrypted and no phone number required. No ads or datamining.</string>
-    <!-- TODO Rename to ftue_auth_carousel_4_title and move the string with the 3 other titles -->
-    <string name="ftue_auth_carousel_title_messaging">Messaging for your team.</string>
+    <string name="ftue_auth_carousel_secure_body">Secure and independent communication that gives you the same level of privacy as a face-to-face conversation in your own home.</string>
+    <string name="ftue_auth_carousel_control_body">Choose where your conversations are kept, giving you control and independence. Connected via Matrix.</string>
+    <string name="ftue_auth_carousel_encrypted_body">End-to-end encrypted and no phone number required. No ads or datamining.</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
-    <string name="template_ftue_auth_carousel_body_workplace" translatable="false">${app_name} is also great for the workplace. It’s trusted by the world’s most secure organisations.</string>
+    <string name="template_ftue_auth_carousel_workplace_body" translatable="false">${app_name} is also great for the workplace. It’s trusted by the world’s most secure organisations.</string>
+
+    <string name="ftue_auth_use_case_title">Who will you chat to the most?</string>
+    <string name="ftue_auth_use_case_subtitle">We\'ll help you get connected.</string>
+    <string name="ftue_auth_use_case_option_one">Friends and family</string>
+    <string name="ftue_auth_use_case_option_two">Teams</string>
+    <string name="ftue_auth_use_case_option_three">Communities</string>
+    <!-- Note to translators: the %s is replaced by the content of ftue_auth_use_case_skip_partial -->
+    <string name="ftue_auth_use_case_skip">Not sure yet? You can %s</string>
+    <string name="ftue_auth_use_case_skip_partial">skip this question</string>
+    <string name="ftue_auth_use_case_join_existing_server">Looking to join an existing server?</string>
+    <string name="ftue_auth_use_case_connect_to_server">Connect to server</string>
 
     <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>
@@ -3480,12 +3514,11 @@
     <string name="add_space">Add Space</string>
     <string name="your_public_space">Your public space</string>
     <string name="your_private_space">Your private space</string>
-    <string name="create_spaces_type_header">Spaces are a new way to group rooms and people</string>
     <string name="create_spaces_choose_type_label">What type of space do you want to create?</string>
     <string name="create_spaces_you_can_change_later">You can change this later</string>
     <string name="create_spaces_join_info_help">To join an existing space, you need an invite.</string>
     <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. You can change this later.</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_me_and_teammates">Me and teammates</string>
@@ -3572,6 +3605,8 @@
 
     <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_desc">Note: app will be restarted</string>
 
     <string name="user_invites_you">%s invites you</string>
 
@@ -3642,12 +3677,6 @@
 
     <string name="upgrade_room_for_restricted_note">Please note upgrading will make a new version of the room. All current messages will stay in this archived room.</string>
 
-    <string name="new_let_people_in_spaces_find_and_join">New: Let people in spaces find and join private rooms</string>
-    <string name="help_people_in_spaces_find_and_join">Help people in spaces to find and join private rooms themselves, no need to manually invite everyone.</string>
-    <string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.</string>
-    <string name="help_space_members">Help space members find private rooms</string>
-    <string name="to_help_space_members_find_and_join">To help space members find and join a private room, go to that room’s settings by tapping on the avatar.</string>
-
     <!-- %s will be replaced by an email at runtime -->
     <string name="this_invite_to_this_room_was_sent">This invite to this room was sent to %s which is not associated with your account</string>
     <!-- %s will be replaced by an email at runtime -->
@@ -3655,7 +3684,7 @@
 
     <string name="link_this_email_settings_link">Link this email 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 Element.</string>
+    <string name="template_link_this_email_with_your_account">%s in Settings to receive invites directly in ${app_name}.</string>
 
     <string name="labs_enable_latex_maths">Enable LaTeX mathematics</string>
     <string name="restart_the_application_to_apply_changes">Restart the application for the change to take effect.</string>
@@ -3719,6 +3748,9 @@
     <string name="settings_enable_location_sharing">Enable location sharing</string>
     <string name="settings_enable_location_sharing_summary">Once enabled you will be able to send your location to any room</string>
     <string name="labs_render_locations_in_timeline">Render user locations in the timeline</string>
+    <string name="location_timeline_failed_to_load_map">Failed to load map</string>
+
+    <string name="message_bubbles">Show Message bubbles</string>
 
     <string name="tooltip_attachment_photo">Open camera</string>
     <string name="tooltip_attachment_gallery">Send images and videos</string>
@@ -3728,4 +3760,13 @@
     <string name="tooltip_attachment_poll">Create poll</string>
     <string name="tooltip_attachment_location">Share location</string>
 
+    <string name="message_reaction_show_less">Show less</string>
+    <plurals name="message_reaction_show_more">
+        <item quantity="one">"%1$d more"</item>
+        <item quantity="other">"%1$d more"</item>
+    </plurals>
+
+    <string name="room_message_notify_everyone">Notify the whole room</string>
+    <string name="room_message_autocomplete_users">Users</string>
+    <string name="room_message_autocomplete_notification">Room notification</string>
 </resources>
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index d5a9a4cd3c..73193edfd5 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -51,6 +51,12 @@
         android:title="@string/labs_enable_latex_maths" />
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:key="SETTINGS_LABS_ENABLE_THREAD_MESSAGES"
+        android:summary="@string/labs_enable_thread_messages_desc"
+        android:title="@string/labs_enable_thread_messages" />
+
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_AUTO_REPORT_UISI"
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index db0830bca0..061674c049 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -82,6 +82,11 @@
 
     <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_category_timeline">
 
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_INTERFACE_BUBBLE_KEY"
+            android:title="@string/message_bubbles" />
+
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_URL_PREVIEW_KEY"
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
new file mode 100644
index 0000000000..b17c1a8bba
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/analytics/impl/DefaultVectorAnalyticsTest.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.features.analytics.impl
+
+import com.posthog.android.Properties
+import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
+import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
+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.fixtures.AnalyticsConfigFixture.anAnalyticsConfig
+import im.vector.app.test.fixtures.aUserProperties
+import im.vector.app.test.fixtures.aVectorAnalyticsEvent
+import im.vector.app.test.fixtures.aVectorAnalyticsScreen
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
+import org.junit.Before
+import org.junit.Test
+
+private const val AN_ANALYTICS_ID = "analytics-id"
+private val A_SCREEN_EVENT = aVectorAnalyticsScreen()
+private val AN_EVENT = aVectorAnalyticsEvent()
+private val A_LATE_INIT_USER_PROPERTIES = aUserProperties()
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultVectorAnalyticsTest {
+
+    private val fakePostHog = FakePostHog()
+    private val fakeAnalyticsStore = FakeAnalyticsStore()
+    private val fakeLateInitUserPropertiesFactory = FakeLateInitUserPropertiesFactory()
+
+    private val defaultVectorAnalytics = DefaultVectorAnalytics(
+            postHogFactory = FakePostHogFactory(fakePostHog.instance).instance,
+            analyticsStore = fakeAnalyticsStore.instance,
+            globalScope = CoroutineScope(Dispatchers.Unconfined),
+            analyticsConfig = anAnalyticsConfig(isEnabled = true),
+            lateInitUserPropertiesFactory = fakeLateInitUserPropertiesFactory.instance
+    )
+
+    @Before
+    fun setUp() {
+        defaultVectorAnalytics.init()
+    }
+
+    @Test
+    fun `when setting user consent then updates analytics store`() = runBlockingTest {
+        defaultVectorAnalytics.setUserConsent(true)
+
+        fakeAnalyticsStore.verifyConsentUpdated(updatedValue = true)
+    }
+
+    @Test
+    fun `when consenting to analytics then updates posthog opt out to false`() = runBlockingTest {
+        fakeAnalyticsStore.givenUserContent(consent = true)
+
+        fakePostHog.verifyOptOutStatus(optedOut = false)
+    }
+
+    @Test
+    fun `when revoking consent to analytics then updates posthog opt out to true`() = runBlockingTest {
+        fakeAnalyticsStore.givenUserContent(consent = false)
+
+        fakePostHog.verifyOptOutStatus(optedOut = true)
+    }
+
+    @Test
+    fun `when setting the analytics id then updates analytics store`() = runBlockingTest {
+        defaultVectorAnalytics.setAnalyticsId(AN_ANALYTICS_ID)
+
+        fakeAnalyticsStore.verifyAnalyticsIdUpdated(updatedValue = AN_ANALYTICS_ID)
+    }
+
+    @Test
+    fun `given lateinit user properties when valid analytics id updates then identify with lateinit properties`() = runBlockingTest {
+        fakeLateInitUserPropertiesFactory.givenCreatesProperties(A_LATE_INIT_USER_PROPERTIES)
+
+        fakeAnalyticsStore.givenAnalyticsId(AN_ANALYTICS_ID)
+
+        fakePostHog.verifyIdentifies(AN_ANALYTICS_ID, A_LATE_INIT_USER_PROPERTIES)
+    }
+
+    @Test
+    fun `when signing out then resets posthog`() = runBlockingTest {
+        fakeAnalyticsStore.allowSettingAnalyticsIdToCallBackingFlow()
+
+        defaultVectorAnalytics.onSignOut()
+
+        fakePostHog.verifyReset()
+    }
+
+    @Test
+    fun `given user consent when tracking screen events then submits to posthog`() = runBlockingTest {
+        fakeAnalyticsStore.givenUserContent(consent = true)
+
+        defaultVectorAnalytics.screen(A_SCREEN_EVENT)
+
+        fakePostHog.verifyScreenTracked(A_SCREEN_EVENT.getName(), A_SCREEN_EVENT.toPostHogProperties())
+    }
+
+    @Test
+    fun `given user has not consented when tracking screen events then does not track`() = runBlockingTest {
+        fakeAnalyticsStore.givenUserContent(consent = false)
+
+        defaultVectorAnalytics.screen(A_SCREEN_EVENT)
+
+        fakePostHog.verifyNoScreenTracking()
+    }
+
+    @Test
+    fun `given user consent when tracking events then submits to posthog`() = runBlockingTest {
+        fakeAnalyticsStore.givenUserContent(consent = true)
+
+        defaultVectorAnalytics.capture(AN_EVENT)
+
+        fakePostHog.verifyEventTracked(AN_EVENT.getName(), AN_EVENT.toPostHogProperties())
+    }
+
+    @Test
+    fun `given user has not consented when tracking events then does not track`() = runBlockingTest {
+        fakeAnalyticsStore.givenUserContent(consent = false)
+
+        defaultVectorAnalytics.capture(AN_EVENT)
+
+        fakePostHog.verifyNoEventTracking()
+    }
+}
+
+private fun VectorAnalyticsScreen.toPostHogProperties(): Properties? {
+    return getProperties()?.let { properties ->
+        Properties().also { it.putAll(properties) }
+    }
+}
+
+private fun VectorAnalyticsEvent.toPostHogProperties(): Properties? {
+    return getProperties()?.let { properties ->
+        Properties().also { it.putAll(properties) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/analytics/impl/LateInitUserPropertiesFactoryTest.kt b/vector/src/test/java/im/vector/app/features/analytics/impl/LateInitUserPropertiesFactoryTest.kt
new file mode 100644
index 0000000000..c2fa50f789
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/analytics/impl/LateInitUserPropertiesFactoryTest.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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 im.vector.app.features.analytics.plan.UserProperties
+import im.vector.app.features.onboarding.FtueUseCase
+import im.vector.app.test.fakes.FakeActiveSessionDataSource
+import im.vector.app.test.fakes.FakeContext
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fakes.FakeVectorStore
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+@ExperimentalCoroutinesApi
+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`() = runBlockingTest {
+        val result = lateInitUserProperties.createUserProperties()
+
+        result shouldBeEqualTo null
+    }
+
+    @Test
+    fun `given no use case set on an active session when creating properties then returns null`() = runBlockingTest {
+        fakeVectorStore.givenUseCase(null)
+        fakeSession.givenVectorStore(fakeVectorStore.instance)
+        fakeActiveSessionDataSource.setActiveSession(fakeSession)
+
+        val result = lateInitUserProperties.createUserProperties()
+
+        result shouldBeEqualTo null
+    }
+
+    @Test
+    fun `given use case set on an active session when creating properties then includes the use case`() = runBlockingTest {
+        fakeVectorStore.givenUseCase(FtueUseCase.TEAMS)
+        fakeActiveSessionDataSource.setActiveSession(fakeSession)
+        val result = lateInitUserProperties.createUserProperties()
+
+        result shouldBeEqualTo UserProperties(
+                ftueUseCaseSelection = UserProperties.FtueUseCaseSelection.WorkMessaging
+        )
+    }
+}
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 4af03a36f5..f5233a496c 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
@@ -60,7 +60,7 @@ class CommandParserTest {
 
     private fun test(message: String, expectedResult: ParsedCommand) {
         val commandParser = CommandParser()
-        val result = commandParser.parseSlashCommand(message)
+        val result = commandParser.parseSlashCommand(message, false)
         result shouldBeEqualTo expectedResult
     }
 }
diff --git a/vector/src/test/java/im/vector/app/features/location/LocationDataTest.kt b/vector/src/test/java/im/vector/app/features/location/LocationDataTest.kt
index fcfff0096f..e273c0b3c9 100644
--- a/vector/src/test/java/im/vector/app/features/location/LocationDataTest.kt
+++ b/vector/src/test/java/im/vector/app/features/location/LocationDataTest.kt
@@ -18,7 +18,11 @@ package im.vector.app.features.location
 
 import org.amshove.kluent.shouldBeEqualTo
 import org.amshove.kluent.shouldBeNull
+import org.amshove.kluent.shouldBeTrue
 import org.junit.Test
+import org.matrix.android.sdk.api.session.room.model.message.LocationAsset
+import org.matrix.android.sdk.api.session.room.model.message.LocationAssetType
+import org.matrix.android.sdk.api.session.room.model.message.MessageLocationContent
 
 class LocationDataTest {
     @Test
@@ -57,4 +61,16 @@ class LocationDataTest {
         parseGeo("ge o:12.34,56.78;13.56").shouldBeNull()
         parseGeo("geo :12.34,56.78;13.56").shouldBeNull()
     }
+
+    @Test
+    fun selfLocationTest() {
+        val contentWithNullAsset = MessageLocationContent(body = "", geoUri = "", locationAsset = null)
+        contentWithNullAsset.isSelfLocation().shouldBeTrue()
+
+        val contentWithNullAssetType = MessageLocationContent(body = "", geoUri = "", locationAsset = LocationAsset(type = null))
+        contentWithNullAssetType.isSelfLocation().shouldBeTrue()
+
+        val contentWithSelfAssetType = MessageLocationContent(body = "", geoUri = "", locationAsset = LocationAsset(type = LocationAssetType.SELF))
+        contentWithSelfAssetType.isSelfLocation().shouldBeTrue()
+    }
 }
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
new file mode 100644
index 0000000000..4dab6daf3b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeActiveSessionDataSource.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.test.fakes
+
+import arrow.core.Option
+import im.vector.app.ActiveSessionDataSource
+import org.matrix.android.sdk.api.session.Session
+
+class FakeActiveSessionDataSource {
+
+    val instance = ActiveSessionDataSource()
+
+    fun setActiveSession(session: Session) {
+        instance.post(Option.just(session))
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsStore.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsStore.kt
new file mode 100644
index 0000000000..6304da8d37
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeAnalyticsStore.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.test.fakes
+
+import im.vector.app.features.analytics.store.AnalyticsStore
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.runBlocking
+
+class FakeAnalyticsStore {
+
+    private val _consentFlow = MutableSharedFlow<Boolean>()
+    private val _idFlow = MutableSharedFlow<String>()
+
+    val instance = mockk<AnalyticsStore>(relaxed = true) {
+        every { userConsentFlow } returns _consentFlow
+        every { analyticsIdFlow } returns _idFlow
+    }
+
+    fun allowSettingAnalyticsIdToCallBackingFlow() {
+        coEvery { instance.setAnalyticsId(any()) } answers {
+            runBlocking { _idFlow.emit(firstArg()) }
+        }
+    }
+
+    fun verifyConsentUpdated(updatedValue: Boolean) {
+        coVerify { instance.setUserConsent(updatedValue) }
+    }
+
+    suspend fun givenUserContent(consent: Boolean) {
+        _consentFlow.emit(consent)
+    }
+
+    fun verifyAnalyticsIdUpdated(updatedValue: String) {
+        coVerify { instance.setAnalyticsId(updatedValue) }
+    }
+
+    suspend fun givenAnalyticsId(id: String) {
+        _idFlow.emit(id)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeLateInitUserPropertiesFactory.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeLateInitUserPropertiesFactory.kt
new file mode 100644
index 0000000000..9b442ece73
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeLateInitUserPropertiesFactory.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.features.analytics.impl.LateInitUserPropertiesFactory
+import im.vector.app.features.analytics.plan.UserProperties
+import io.mockk.coEvery
+import io.mockk.mockk
+
+class FakeLateInitUserPropertiesFactory {
+
+    val instance = mockk<LateInitUserPropertiesFactory>()
+
+    fun givenCreatesProperties(userProperties: UserProperties?) {
+        coEvery { instance.createUserProperties() } returns userProperties
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakePostHog.kt b/vector/src/test/java/im/vector/app/test/fakes/FakePostHog.kt
new file mode 100644
index 0000000000..e14f809e66
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakePostHog.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.os.Looper
+import com.posthog.android.PostHog
+import com.posthog.android.Properties
+import im.vector.app.features.analytics.plan.UserProperties
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.verify
+
+class FakePostHog {
+
+    init {
+        // workaround to avoid PostHog.HANDLER failing
+        mockkStatic(Looper::class)
+        val looper = mockk<Looper> {
+            every { thread } returns Thread.currentThread()
+        }
+        every { Looper.getMainLooper() } returns looper
+    }
+
+    val instance = mockk<PostHog>(relaxed = true)
+
+    fun verifyOptOutStatus(optedOut: Boolean) {
+        verify { instance.optOut(optedOut) }
+    }
+
+    fun verifyIdentifies(analyticsId: String, userProperties: UserProperties?) {
+        verify {
+            val postHogProperties = userProperties?.getProperties()
+                    ?.let { rawProperties -> Properties().also { it.putAll(rawProperties) } }
+                    ?.takeIf { it.isNotEmpty() }
+            instance.identify(analyticsId, postHogProperties, null)
+        }
+    }
+
+    fun verifyReset() {
+        verify { instance.reset() }
+    }
+
+    fun verifyScreenTracked(name: String, properties: Properties?) {
+        verify { instance.screen(name, properties) }
+    }
+
+    fun verifyNoScreenTracking() {
+        verify(exactly = 0) {
+            instance.screen(any())
+            instance.screen(any(), any())
+            instance.screen(any(), any(), any())
+        }
+    }
+
+    fun verifyEventTracked(name: String, properties: Properties?) {
+        verify { instance.capture(name, properties) }
+    }
+
+    fun verifyNoEventTracking() {
+        verify(exactly = 0) {
+            instance.capture(any())
+            instance.capture(any(), any())
+            instance.capture(any(), any(), any())
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakePostHogFactory.kt b/vector/src/test/java/im/vector/app/test/fakes/FakePostHogFactory.kt
new file mode 100644
index 0000000000..1d18c97d32
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakePostHogFactory.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 com.posthog.android.PostHog
+import im.vector.app.features.analytics.impl.PostHogFactory
+import io.mockk.every
+import io.mockk.mockk
+
+class FakePostHogFactory(postHog: PostHog) {
+    val instance = mockk<PostHogFactory>().also {
+        every { it.createPosthog() } returns postHog
+    }
+}
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 91403b3b2c..a23c43b986 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,8 +16,12 @@
 
 package im.vector.app.test.fakes
 
+import im.vector.app.core.extensions.vectorStore
+import im.vector.app.features.session.VectorSessionStore
 import im.vector.app.test.testCoroutineDispatchers
+import io.mockk.coEvery
 import io.mockk.mockk
+import io.mockk.mockkStatic
 import org.matrix.android.sdk.api.session.Session
 
 class FakeSession(
@@ -25,7 +29,19 @@ class FakeSession(
         val fakeSharedSecretStorageService: FakeSharedSecretStorageService = FakeSharedSecretStorageService()
 ) : Session by mockk(relaxed = true) {
 
+    init {
+        mockkStatic("im.vector.app.core.extensions.SessionKt")
+    }
+
     override fun cryptoService() = fakeCryptoService
     override val sharedSecretStorageService = fakeSharedSecretStorageService
     override val coroutineDispatchers = testCoroutineDispatchers
+
+    fun givenVectorStore(vectorSessionStore: VectorSessionStore) {
+        coEvery {
+            this@FakeSession.vectorStore(any())
+        } coAnswers {
+            vectorSessionStore
+        }
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorStore.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorStore.kt
new file mode 100644
index 0000000000..22a4a5f6cf
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorStore.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 im.vector.app.features.onboarding.FtueUseCase
+import im.vector.app.features.session.VectorSessionStore
+import io.mockk.coEvery
+import io.mockk.mockk
+
+class FakeVectorStore {
+    val instance = mockk<VectorSessionStore>()
+
+    fun givenUseCase(useCase: FtueUseCase?) {
+        coEvery {
+            instance.readUseCase()
+        } coAnswers {
+            useCase
+        }
+    }
+}
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
new file mode 100644
index 0000000000..5fbcdd98d1
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.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.fixtures
+
+import im.vector.app.features.analytics.AnalyticsConfig
+
+object AnalyticsConfigFixture {
+    fun anAnalyticsConfig(
+            isEnabled: Boolean = false,
+            postHogHost: String = "http://posthog.url",
+            postHogApiKey: String = "api-key",
+            policyLink: String = "http://policy.link"
+    ) = object : AnalyticsConfig {
+        override val isEnabled: Boolean = isEnabled
+        override val postHogHost = postHogHost
+        override val postHogApiKey = postHogApiKey
+        override val policyLink = policyLink
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/UserPropertiesFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/UserPropertiesFixture.kt
new file mode 100644
index 0000000000..5a911e2bc9
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/UserPropertiesFixture.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.fixtures
+
+import im.vector.app.features.analytics.plan.UserProperties
+import im.vector.app.features.analytics.plan.UserProperties.FtueUseCaseSelection
+
+fun aUserProperties(
+        ftueUseCase: FtueUseCaseSelection? = FtueUseCaseSelection.Skip
+) = UserProperties(
+        ftueUseCaseSelection = ftueUseCase
+)
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/VectorAnalyticsFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/VectorAnalyticsFixture.kt
new file mode 100644
index 0000000000..95590b0a44
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/VectorAnalyticsFixture.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.test.fixtures
+
+import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
+import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
+
+fun aVectorAnalyticsScreen(
+        name: String = "a-screen-name",
+        properties: Map<String, Any>? = null
+) = object : VectorAnalyticsScreen {
+    override fun getName() = name
+    override fun getProperties() = properties
+}
+
+fun aVectorAnalyticsEvent(
+        name: String = "an-event-name",
+        properties: Map<String, Any>? = null
+) = object : VectorAnalyticsEvent {
+    override fun getName() = name
+    override fun getProperties() = properties
+}