diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000000..dcb9f0a766
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,74 @@
+name: Bug report for the Element Android app
+description: Report any issues that you have found with the Element app. Please [check open issues](https://github.com/vector-im/element-android/issues) first, in case it has already been reported.
+labels: [T-Defect]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+        Please report security issues by email to security@matrix.org
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: Steps to reproduce
+      description: Please attach screenshots, videos or logs if you can.
+      placeholder: Tell us what you see!
+      value: |
+        1. Where are you starting? What can you see?
+        2. What do you click?
+        3. More steps…
+    validations:
+      required: true
+  - type: textarea
+    id: result
+    attributes:
+      label: What happened?
+      placeholder: Tell us what went wrong
+      value: |
+        ### What did you expect?
+
+        ### What happened?
+    validations:
+      required: true
+  - type: input
+    id: device
+    attributes:
+      label: Your phone model
+      placeholder: e.g. Samsung S6
+    validations:
+      required: false
+  - type: input
+    id: os
+    attributes:
+      label: Operating system version
+      placeholder: e.g. Android 10.0
+    validations:
+      required: false
+  - type: input
+    id: version
+    attributes:
+      label: Application version and app store
+      description: You can find the version information in Settings -> Help & About. 
+      placeholder: e.g. Element version 1.7.34, olm version 3.2.3 from F-Droid
+    validations:
+      required: false
+  - type: input
+    id: homeserver
+    attributes:
+      label: Homeserver
+      description: Which server is your account registered on?
+      placeholder: e.g. matrix.org
+    validations:
+      required: false
+  - type: dropdown
+    id: rageshake
+    attributes:
+      label: Have you submitted a rageshake?
+      description:  |
+        Did you know that you can shake your phone to submit logs for this issue? Trigger the defect, then shake your phone and you will see a popup asking if you would like to open the bug report screen. Click YES, and describe the issue, mentioning that you have also filed a bug. Submit the report to send anonymous logs to the developers.
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index d7c3506fa0..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve Element
-title: ''
-labels: ''
-assignees: ''
-
----
-
-#### Describe the bug
-A clear and concise description of what the bug is.
-
-#### To Reproduce
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-#### Expected behavior
-A clear and concise description of what you expected to happen.
-
-#### Screenshots
-If applicable, add screenshots to help explain your problem.
-
-#### Smartphone (please complete the following information):
- - Device: [e.g. Samsung S6]
- - OS: [e.g. Android 6.0]
-
-#### Additional context
- - App version and store [e.g. 1.0.0 - F-Droid]
- - Homeserver: [e.g. matrix.org]
-
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
new file mode 100644
index 0000000000..5d9cfb3c88
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -0,0 +1,36 @@
+name: Enhancement request
+description: Do you have a suggestion or feature request?
+labels: [T-Enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to propose a new feature or make a suggestion.
+  - type: textarea
+    id: usecase
+    attributes:
+      label: Your use case
+      description: What would you like to be able to do? Please feel welcome to include screenshots or mock ups.
+      placeholder: Tell us what you would like to do!
+      value: |
+        #### What would you like to do?
+
+        #### Why would you like to do it?
+
+        #### How would you like to achieve it?
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: Have you considered any alternatives?
+      placeholder: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      placeholder: Is there anything else you'd like to add?
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index da96d461c5..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: type:suggestion
-assignees: ''
-
----
-
-#### Is your feature request related to a problem? Please describe.
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-#### Describe the solution you'd like.
-A clear and concise description of what you want to happen.
-
-#### Describe alternatives you've considered.
-A clear and concise description of any alternative solutions or features you've considered.
-
-#### Additional context
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/matrix-sdk.md b/.github/ISSUE_TEMPLATE/matrix-sdk.md
deleted file mode 100644
index 30f705a575..0000000000
--- a/.github/ISSUE_TEMPLATE/matrix-sdk.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Matrix SDK
-about: Report issue or ask for a feature regarding the Android Matrix SDK
-title: "[SDK] "
-labels: matrix-sdk
-assignees: ''
-
----
-
-<!-- This issue template should be used by third party application maintainers, to report a bug or to request a feature on the SDK module of the application Element Android-->
diff --git a/.github/ISSUE_TEMPLATE/matrix-sdk.yml b/.github/ISSUE_TEMPLATE/matrix-sdk.yml
new file mode 100644
index 0000000000..4033423dd5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/matrix-sdk.yml
@@ -0,0 +1,20 @@
+name: Matrix SDK bug or enhancement
+description: Report issue or ask for a feature in the [Android Matrix SDK](https://github.com/matrix-org/matrix-android-sdk2)
+title: "[SDK] "
+labels: [matrix-sdk]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this issue!
+
+        Please report security issues by email to security@matrix.org
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Report issue or ask for a feature in the [Android Matrix SDK](https://github.com/matrix-org/matrix-android-sdk2)
+      placeholder: This issue template should be used by third party application maintainers, to report a bug or to request a feature on the SDK module of the Element Android application.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
deleted file mode 100644
index 154e93286c..0000000000
--- a/.github/ISSUE_TEMPLATE/release.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-name: Release
-about: Checklist for each release. To be used by the core team only.
-title: "[Release] Element Android v"
-labels: "\U0001F680 Release"
-assignees: bmarty
-
----
-
-For the example, we are releasing the version 1.1.10. Delete this line and replace 1.1.10 with the version in the issue content.
-
-### Before the release
-
-- [ ] Weblate sync, fix lint issue if any (in a dedicated PR)
-- [ ] Check the update of the store descriptions (using Google Translate if necessary) to ensure that the changes are acceptable to be published to the stores.
-- [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.
-
-### Do the release
-
-- [ ] Create release with gitflow, branch name `release/1.1.10`
-- [ ] Run `./tools/import_emojis.py` and commit the change if any.
-- [ ] Run `./tools/import_sas_strings.py` and commit the change if any. If there is no change since a while, ping Travis
-- [ ] 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
-- [ ] 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)
-- [ ] 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
-- [ ] Checkout `develop`
-- [ ] Increase version in `./vector/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 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
-
-### Once Live on PlayStore
-
-- [ ] Ping the Android public room and update its topic
-
-### After at least 2 days
-
-- [ ] Check the [rageshakes](https://github.com/matrix-org/element-android-rageshakes/issues)
-- [ ] Check the crash reports on the GooglePlay console
-- [ ] Check the Android Element room for any reported issues on the new version
-- [ ] If all is OK, push to production and notify Markus (Bubu) to release the F-Droid version
-- [ ] Ping the Android public room and update its topic with the new available version
-
-### Android SDK2
-
-- [ ] Checkout the `main` branch on Element Android project
-
-#### On the SDK2 project
-
-https://github.com/matrix-org/matrix-android-sdk2
-
-- [ ] Create a release with GitFlow
-- [ ] Update the files `./build.gradle` and `./gradle/gradle-wrapper.properties` manually, to use the latest version for the dependency. You can get inspired by the same files on Element Android project.
-- [ ] Run the script `./tools/import_from_element.sh`
-- [ ] Update the version in `./matrix-sdk-android/build.gradle` and let the script finish to build the library
-- [ ] Update the file `CHANGES.md`
-- [ ] Finish the release using GitFlow
-- [ ] Create the release on GitHub from [the tag](https://github.com/matrix-org/matrix-android-sdk2/tags)
-- [ ] Upload the AAR on the GitHub release
-
-### Android SDK2 sample
-
-https://github.com/matrix-org/matrix-android-sdk2-sample
-
-- [ ] Update the dependency to the new version of the SDK2. Jitpack will have to build the AAR, it can take a few minutes. You can check status on https://jitpack.io/#matrix-org/matrix-android-sdk2
-- [ ] Build and run the sample, you may have to fix some API break
-- [ ] Commit and push directly on `main`
-
-<!-- Note: some scripts are not public because they contain some private keys -->
diff --git a/.github/ISSUE_TEMPLATE/release.yml b/.github/ISSUE_TEMPLATE/release.yml
new file mode 100644
index 0000000000..51fe7a7bd1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/release.yml
@@ -0,0 +1,89 @@
+name: Release checklist
+description: Checklist for each release. This template is only for the core team.
+title: "[Release] Element Android v"
+labels: [\U0001F680 Release]
+assignees:
+  - bmarty
+
+body:
+  - type: textarea
+    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.
+      placeholder: |
+        If you are reading this, you have deleted the content of the release template: undo the deletion or start again.
+      value: |
+        ### Before the release
+
+        - [ ] Weblate sync, fix lint issue if any (in a dedicated PR)
+        - [ ] Check the update of the store descriptions (using Google Translate if necessary) to ensure that the changes are acceptable to be published to the stores.
+        - [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.
+
+        ### Do the release
+
+        - [ ] Create release with gitflow, branch name `release/1.1.10`
+        - [ ] Run `./tools/import_emojis.py` and commit the change if any.
+        - [ ] Run `./tools/import_sas_strings.py` and commit the change if any. If there is no change since a while, ping Travis
+        - [ ] 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
+        - [ ] 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)
+        - [ ] 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
+        - [ ] Checkout `develop`
+        - [ ] Increase version in `./vector/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 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
+
+        ### Once Live on PlayStore
+
+        - [ ] Ping the Android public room and update its topic
+
+        ### After at least 2 days
+
+        - [ ] Check the [rageshakes](https://github.com/matrix-org/element-android-rageshakes/issues)
+        - [ ] Check the crash reports on the GooglePlay console
+        - [ ] Check the Android Element room for any reported issues on the new version
+        - [ ] If all is OK, push to production and notify Markus (Bubu) to release the F-Droid version
+        - [ ] Ping the Android public room and update its topic with the new available version
+
+        ### Android SDK2
+
+        - [ ] Checkout the `main` branch on Element Android project
+
+        #### On the SDK2 project
+
+        https://github.com/matrix-org/matrix-android-sdk2
+
+        - [ ] Create a release with GitFlow
+        - [ ] Update the files `./build.gradle` and `./gradle/gradle-wrapper.properties` manually, to use the latest version for the dependency. You can get inspired by the same files on Element Android project.
+        - [ ] Run the script `./tools/import_from_element.sh`
+        - [ ] Update the version in `./matrix-sdk-android/build.gradle` and let the script finish to build the library
+        - [ ] Update the file `CHANGES.md`
+        - [ ] Finish the release using GitFlow
+        - [ ] Create the release on GitHub from [the tag](https://github.com/matrix-org/matrix-android-sdk2/tags)
+        - [ ] Upload the AAR on the GitHub release
+
+        ### Android SDK2 sample
+
+        https://github.com/matrix-org/matrix-android-sdk2-sample
+
+        - [ ] Update the dependency to the new version of the SDK2. Jitpack will have to build the AAR, it can take a few minutes. You can check status on https://jitpack.io/#matrix-org/matrix-android-sdk2
+        - [ ] Build and run the sample, you may have to fix some API break
+        - [ ] Commit and push directly on `main`
+    validations:
+      required: true
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index cb6f1b0e48..984ae0748e 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -6,12 +6,31 @@ on:
     branches: [ main, develop ]
 
 jobs:
+  # Temporary add build of Android tests, which cannot be run on the CI right now, but they need to at least compile
+  # So it will be mandatory for this action to be successful on every PRs
+  compile-android-test:
+    name: Compile Android tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Compile Android tests
+        run: ./gradlew clean assembleAndroidTest --stacktrace -PallWarningsAsErrors=false
+
   integration-tests:
     name: Integration Tests (Synapse)
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        api-level: [21, 30]
+        api-level: [21, 28, 30]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.8
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index a65e6b5dee..0f11915258 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -24,6 +24,7 @@ jobs:
           curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.36.0/ktlint && chmod a+x ktlint
           ./ktlint --android --experimental -v
 
+# Lint for main module and all the other modules
   android-lint:
     name: Android Linter
     runs-on: ubuntu-latest
@@ -37,14 +38,16 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Lint analysis of the SDK
-        run: ./gradlew clean :matrix-sdk-android:lintRelease --stacktrace
+      - name: Lint analysis
+        run: ./gradlew clean :vector:lint --stacktrace
       - name: Upload reports
         uses: actions/upload-artifact@v2
         with:
-          name: linting-report-android-sdk
-          path: matrix-sdk-android/build/reports/*.*
+          name: lint-report
+          path: |
+            vector/build/reports/*.*
 
+# Lint for Gplay and Fdroid release APK
   apk-lint:
     name: Lint APK (${{ matrix.target }})
     runs-on: ubuntu-latest
@@ -69,6 +72,6 @@ jobs:
         uses: actions/upload-artifact@v2
         if: always()
         with:
-          name: release-debug-linting-report-${{ matrix.target }}
+          name: release-lint-report-${{ matrix.target }}
           path: |
             vector/build/reports/*.*
diff --git a/.github/workflows/sanity_test.yml b/.github/workflows/sanity_test.yml
new file mode 100644
index 0000000000..632dee8a58
--- /dev/null
+++ b/.github/workflows/sanity_test.yml
@@ -0,0 +1,50 @@
+name: Sanity Test
+
+on:
+  pull_request: { }
+  push:
+    branches: [ main, develop ]
+
+jobs:
+  integration-tests:
+    name: Sanity Tests (Synapse)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        api-level: [28]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Start synapse server
+        run: |
+          python3 -m venv .synapse
+          source .synapse/bin/activate
+          pip install synapse matrix-synapse
+          curl -sL https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh --no-rate-limit \
+            | sed s/127.0.0.1/0.0.0.0/g | bash
+      - name: Run sanity tests on API ${{ matrix.api-level }}
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          script: ./gradlew -PallWarningsAsErrors=false connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest
+
diff --git a/CHANGES.md b/CHANGES.md
index 640d56a9fd..472b422a1c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,53 @@
+Changes in Element v1.2.1 (2021-09-08)
+======================================
+
+Features ✨
+----------
+ - Support Android 11 Conversation features ([#1809](https://github.com/vector-im/element-android/issues/1809))
+ - Introduces AutoAcceptInvites which can be enabled at compile time. ([#3531](https://github.com/vector-im/element-android/issues/3531))
+ - New call designs ([#3599](https://github.com/vector-im/element-android/issues/3599))
+ - Restricted Join Rule | Inform admins of new option ([#3631](https://github.com/vector-im/element-android/issues/3631))
+ - Mention and Keyword Notification Settings: Turn on/off keyword notifications and edit keywords. ([#3650](https://github.com/vector-im/element-android/issues/3650))
+ - Support accept 3pid invite when email is not bound to account ([#3691](https://github.com/vector-im/element-android/issues/3691))
+ - Space summary pagination ([#3693](https://github.com/vector-im/element-android/issues/3693))
+ - Update Email invite to be aware of spaces ([#3695](https://github.com/vector-im/element-android/issues/3695))
+ - M11.12 Spaces | Default to 'Home' in settings ([#3754](https://github.com/vector-im/element-android/issues/3754))
+ - Call: show dialog for some ended reasons. ([#3853](https://github.com/vector-im/element-android/issues/3853))
+ - Add expired account error code in the matrix SDK ([#3900](https://github.com/vector-im/element-android/issues/3900))
+ - Add password errors in the matrix SDK ([#3927](https://github.com/vector-im/element-android/issues/3927))
+ - Upgrade AGP to 7.0.2.
+  When compiling using command line, make sure to use the JDK 11 by adding for instance `-Dorg.gradle.java.home=/Applications/Android\ Studio\ Preview.app/Contents/jre/Contents/Home` or by setting JAVA_HOME. ([#3954](https://github.com/vector-im/element-android/issues/3954))
+ - Check power level before displaying actions in the room details' timeline ([#3959](https://github.com/vector-im/element-android/issues/3959))
+
+Bugfixes 🐛
+----------
+ - Add mxid to autocomplete suggestion if more than one user in a room has the same displayname ([#1823](https://github.com/vector-im/element-android/issues/1823))
+ - Use WebView cache for widgets to avoid excessive data use ([#2648](https://github.com/vector-im/element-android/issues/2648))
+ - Jitsi-hosted jitsi conferences not loading ([#2846](https://github.com/vector-im/element-android/issues/2846))
+ - Space Explore Rooms no feedback on failed to join ([#3207](https://github.com/vector-im/element-android/issues/3207))
+ - Notifications - Fix missing sound on notifications. ([#3243](https://github.com/vector-im/element-android/issues/3243))
+ - the element-based domain permalinks (e.g. https://app.element.io/#/user/@chagai95:matrix.org) don't have the mxid in the first param (like matrix.to does - https://matrix.to/#/@chagai95:matrix.org) but rather in the second after /user/ so /user/mxid ([#3735](https://github.com/vector-im/element-android/issues/3735))
+ - Update the AccountData with the users' matrix Id instead of their email for those invited by email in a direct chat ([#3743](https://github.com/vector-im/element-android/issues/3743))
+ - Send an empty body for POST rooms/{roomId}/receipt/{receiptType}/{eventId} ([#3789](https://github.com/vector-im/element-android/issues/3789))
+ - Fix order in which the items of the attachment menu appear ([#3793](https://github.com/vector-im/element-android/issues/3793))
+ - Authenticated Jitsi not working in release ([#3841](https://github.com/vector-im/element-android/issues/3841))
+ - Home: Dial pad lost entry when config changes ([#3845](https://github.com/vector-im/element-android/issues/3845))
+ - Message edition is not rendered in e2e rooms after pagination ([#3887](https://github.com/vector-im/element-android/issues/3887))
+ - Crash on opening a room on Android 5.0 and 5.1 - Regression with Voice message ([#3897](https://github.com/vector-im/element-android/issues/3897))
+ - Fix a crash at start-up if translated string is empty ([#3910](https://github.com/vector-im/element-android/issues/3910))
+ - PushRule enabling request is not following the spec ([#3911](https://github.com/vector-im/element-android/issues/3911))
+ - Enable image preview in Android's share sheet (Android 11+) ([#3965](https://github.com/vector-im/element-android/issues/3965))
+ - Voice Message - Cannot render voice message if the waveform data is corrupted ([#3983](https://github.com/vector-im/element-android/issues/3983))
+ - Fix memory leak on RoomDetailFragment (ValueAnimator) ([#3990](https://github.com/vector-im/element-android/issues/3990))
+
+Other changes
+-------------
+ - VoIP: Merge virtual room timeline in corresponding native room (call events only). ([#3520](https://github.com/vector-im/element-android/issues/3520))
+ - Issue templates: modernise and sync with element-web ([#3883](https://github.com/vector-im/element-android/issues/3883))
+ - Issue templates: modernise SDK and release checklists, and add homeserver question for bugs ([#3889](https://github.com/vector-im/element-android/issues/3889))
+ - Issue templates: merge expected and actual results ([#3960](https://github.com/vector-im/element-android/issues/3960))
+
+
 Changes in Element v1.2.0 (2021-08-12)
 ======================================
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5151a618f6..610a6227b7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -116,9 +116,34 @@ You should consider adding Unit tests with your PR, and also integration tests (
 
 ### Internationalisation
 
-When adding new string resources, please only add new entries in file `value/strings.xml`. Translations will be added later by the community of translators with a specific tool named [Weblate](https://translate.riot.im/projects/riot-android/).
+Translations are handled using an external tool: [Weblate](https://translate.element.io/projects/element-android/)
+
+As a general rule, please never edit or add or remove translations to the project in a Pull Request. It can lead to merge conflict if the translations are also modified in Weblate side.
+
+#### Adding new string
+
+When adding new string resources, please only add new entries in file `value/strings.xml`. Translations will be added later by the community of translators using Weblate.
+
+New strings can be added anywhere in the file `value/strings.xml`, not necessarily at the end of the file. Generally, it's even better to add the new strings in some dedicated section per feature, and not at the end of the file, to avoid merge conflict between 2 PR adding strings at the end of the same file.
+
 Do not hesitate to use plurals when appropriate.
 
+#### Editing existing strings
+
+Two cases:
+- If the meaning stays the same, it's OK to edit the original string (i.e. the English version).
+- If the meaning is not the same, please create a new string and do not remove the existing string. See below for instructions to remove existing string.
+
+#### Removing existing strings
+
+If a string is not used anymore, it should be removed from the resource, but please do not remove the strings or its translations in the PR. It can lead to merge conflict with Weblate, and to lint error if new translations from deleted strings are added with Weblate.
+
+Instead, please comment the original string with:
+```xml
+<!-- TO BE REMOVED -->
+```
+The string will be removed during the next sync with Weblate.
+
 ### Accessibility
 
 Please consider accessibility as an important point. As a minimum requirement, in layout XML files please use attributes such as `android:contentDescription` and `android:importantForAccessibility`, and test with a screen reader if it's working well. You can add new string resources, dedicated to accessibility, in this case, please prefix theirs id with `a11y_`.
diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index c393c5f483..d62062ae14 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -34,11 +34,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "11"
     }
 
     buildFeatures {
diff --git a/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml b/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
index 1096267124..cfeb5e9cc6 100644
--- a/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/imageView"
-        android:visibility="visible"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:importantForAccessibility="no"
+        android:visibility="visible" />
 
     <ProgressBar
-        android:layout_centerInParent="true"
         android:id="@+id/imageLoaderProgress"
         style="?android:attr/progressBarStyle"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:layout_centerInParent="true"
         android:visibility="visible"
         tools:visibility="gone" />
 
diff --git a/attachment-viewer/src/main/res/layout/item_video_attachment.xml b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
index 7dd13ea460..cd55be5cb4 100644
--- a/attachment-viewer/src/main/res/layout/item_video_attachment.xml
+++ b/attachment-viewer/src/main/res/layout/item_video_attachment.xml
@@ -9,6 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
+        android:importantForAccessibility="no"
         android:scaleType="centerInside" />
 
     <VideoView
@@ -22,6 +23,7 @@
         android:layout_width="44dp"
         android:layout_height="44dp"
         android:layout_centerInParent="true"
+        android:contentDescription="@string/a11y_play_pause"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/attachment-viewer/src/main/res/values/strings.xml b/attachment-viewer/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..3b32209868
--- /dev/null
+++ b/attachment-viewer/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- TODO Create a dedicated module for translations to be able to translate this string like the others (See #3955) -->
+    <string name="a11y_play_pause">Play or pause the video</string>
+</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d7ba0168dd..ef26530298 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,8 +12,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath 'com.google.gms:google-services:4.3.8'
+        // Release notes of Android Gradle Plugin (AGP):
+        // https://developer.android.com/studio/releases/gradle-plugin
+        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.google.gms:google-services:4.3.10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.4'
@@ -44,6 +46,8 @@ allprojects {
                 includeGroupByRegex 'com\\.github\\.chrisbanes'
                 // PFLockScreen-Android
                 includeGroupByRegex 'com\\.github\\.vector-im'
+                // DraggableView
+                includeGroupByRegex 'com\\.github\\.hyuwah'
 
                 // Chat effects
                 includeGroupByRegex 'com\\.github\\.jetradarmobile'
diff --git a/diff-match-patch/build.gradle b/diff-match-patch/build.gradle
index 82292e24db..f623c57a49 100644
--- a/diff-match-patch/build.gradle
+++ b/diff-match-patch/build.gradle
@@ -3,6 +3,3 @@ apply plugin: 'java-library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
-
-sourceCompatibility = "8"
-targetCompatibility = "8"
diff --git a/fastlane/README.md b/fastlane/README.md
index 54d3a005a6..dc33f422d6 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -44,6 +44,6 @@ Get version code
 
 ----
 
-This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
 More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
 The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40101160.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101160.txt
new file mode 100644
index 0000000000..df927bca03
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Oprava chyby při odesílání šifrované zprávy, pokud se někdo v místnosti odhlásí.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40102000.txt b/fastlane/metadata/android/cs-CZ/changelogs/40102000.txt
new file mode 100644
index 0000000000..929281c388
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Hlasové zprávy jsou povoleny ve výchozím nastavení.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.2.0
diff --git a/fastlane/metadata/android/cs-CZ/full_description.txt b/fastlane/metadata/android/cs-CZ/full_description.txt
index d169c077e1..6732b33fe3 100644
--- a/fastlane/metadata/android/cs-CZ/full_description.txt
+++ b/fastlane/metadata/android/cs-CZ/full_description.txt
@@ -11,7 +11,7 @@ Element je zabezpečený komunikátor a zároveň aplikace pro týmovou spolupr
 Element se zcela liší od ostatních aplikací pro zasílání zpráv a spolupráci. Funguje na platformě Matrix, otevřené síti pro bezpečné zasílání zpráv a decentralizovanou komunikaci. Umožňuje vlastní hostování, aby uživatelé měli maximální vlastnictví a kontrolu nad svými daty a zprávami.
 
 <b>Soukromí a šifrované zprávy</b>
-Element vás chrání před nežádoucími reklamami, vytěžováním dat a tzv. walled gardens. Zabezpečuje také všechna vaše data, video a hlasovou komunikaci jeden na jednoho prostřednictvím šifrování end-to-end a křížového ověřování zařízení.
+Element vás chrání před nežádoucími reklamami, vytěžováním dat a tzv. walled gardens. Zabezpečuje také všechna vaše data, video a hlasovou komunikaci jeden na jednoho prostřednictvím koncového šifrování a křížového ověřování zařízení.
 
 Element vám dává kontrolu nad vaším soukromím a zároveň vám umožňuje bezpečně komunikovat s kýmkoli v síti Matrix nebo s dalšími nástroji pro firemní spolupráci díky integraci s aplikacemi, jako je Slack.
 
@@ -30,7 +30,7 @@ Element vám dává kontrolu různými způsoby:
 Můžete chatovat s kýmkoli v síti Matrix, ať už používá aplikaci Element, jinou aplikaci podporující protokol Matrix nebo dokonce i když používá jinou aplikaci pro zasílání zpráv.
 
 <b>Superbezpečné</b>
-Skutečné end-to-end šifrování (zprávy mohou dešifrovat pouze účastníci konverzace) a křížové ověřování zařízení.
+Skutečné koncové šifrování (zprávy mohou dešifrovat pouze účastníci konverzace) a křížové ověřování zařízení.
 
 <b>Kompletní komunikace a integrace</b>
 Zprávy, hlasové a videohovory, sdílení souborů, sdílení obrazovky a celá řada integrací, botů a widgetů. Vytvářejte místnosti, komunity, zůstaňte v kontaktu a spolupracujte.
diff --git a/fastlane/metadata/android/de-DE/changelogs/40101120.txt b/fastlane/metadata/android/de-DE/changelogs/40101120.txt
new file mode 100644
index 0000000000..ac147c6cbb
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40101120.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Überarbeitetes Design, Crash nach Videoanruf gefixt
+Alle Änderungen: https://github.com/vector-im/element-android/releases/tag/v1.1.12
diff --git a/fastlane/metadata/android/de-DE/changelogs/40101130.txt b/fastlane/metadata/android/de-DE/changelogs/40101130.txt
new file mode 100644
index 0000000000..4ef31c67ed
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40101130.txt
@@ -0,0 +1,2 @@
+Stabilitäts- und Bugfixupdate
+Alle Änderungen: https://github.com/vector-im/element-android/releases/tag/v1.1.13
diff --git a/fastlane/metadata/android/de-DE/changelogs/40101150.txt b/fastlane/metadata/android/de-DE/changelogs/40101150.txt
new file mode 100644
index 0000000000..7fa18ed944
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40101150.txt
@@ -0,0 +1,2 @@
+Hauptänderungen: Sprachnachrichten in experimentellen Einstellungen
+Alle Änderungen: https://github.com/vector-im/element-android/releases/tag/v1.1.15
diff --git a/fastlane/metadata/android/de-DE/changelogs/40101160.txt b/fastlane/metadata/android/de-DE/changelogs/40101160.txt
new file mode 100644
index 0000000000..babd4af04f
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Fehler beim Senden verschlüsselter Nachrichten behoben.
+Alle Änderungen: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/en-US/changelogs/40102000.txt b/fastlane/metadata/android/en-US/changelogs/40102000.txt
index 46d9b07809..4fc02966cd 100644
--- a/fastlane/metadata/android/en-US/changelogs/40102000.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40102000.txt
@@ -1,2 +1,2 @@
 Main changes in this version: Voice Message is enabled by default.
-Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.16
\ No newline at end of file
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.2.0
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40102010.txt b/fastlane/metadata/android/en-US/changelogs/40102010.txt
new file mode 100644
index 0000000000..799b7dc8b6
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40102010.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Many improvements on VoIP and Spaces (still in beta).
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.2.1
\ No newline at end of file
diff --git a/fastlane/metadata/android/es-ES/changelogs/40101140.txt b/fastlane/metadata/android/es-ES/changelogs/40101140.txt
new file mode 100644
index 0000000000..77399d6aef
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/40101140.txt
@@ -0,0 +1,2 @@
+Principales cambios en esta versión: arreglado un problema con los mensajes encriptados.
+Conjunto de cambios completo: https://github.com/vector-im/element-android/releases/tag/v1.1.14
diff --git a/fastlane/metadata/android/es-ES/changelogs/40101150.txt b/fastlane/metadata/android/es-ES/changelogs/40101150.txt
new file mode 100644
index 0000000000..c127db1ef7
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/40101150.txt
@@ -0,0 +1,2 @@
+Principales cambios en esta versión: implementación de mensajes de voz bajo los ajustes lab.
+Conjunto de cambios completo: https://github.com/vector-im/element-android/releases/tag/v1.1.15
diff --git a/fastlane/metadata/android/es-ES/changelogs/40101160.txt b/fastlane/metadata/android/es-ES/changelogs/40101160.txt
new file mode 100644
index 0000000000..0d2ab3e13d
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Principales cambios en esta versión: Solucionado error al enviar mensajes encriptados si alguien en la sala cierra la sesión.
+Conjunto de cambios completo: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/es-ES/short_description.txt b/fastlane/metadata/android/es-ES/short_description.txt
index 473228e0df..0bd47ccf15 100644
--- a/fastlane/metadata/android/es-ES/short_description.txt
+++ b/fastlane/metadata/android/es-ES/short_description.txt
@@ -1 +1 @@
-Chat y VoIP descentralizados y seguros. Mantén tus datos a salvo de terceros.
+Mensajería para grupos - mensajería encriptada, chat para grupos y videollamadas
diff --git a/fastlane/metadata/android/et/changelogs/40101160.txt b/fastlane/metadata/android/et/changelogs/40101160.txt
new file mode 100644
index 0000000000..449a6edfee
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: samaaegse krüptitud sõnumi saatmise ja jututoast väljalogimisega seotud vea parandus.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/et/changelogs/40102000.txt b/fastlane/metadata/android/et/changelogs/40102000.txt
new file mode 100644
index 0000000000..678ad05309
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: häälsõnumid on nüüd vaikimisi kasutusel.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/fa/changelogs/40101020.txt b/fastlane/metadata/android/fa/changelogs/40101020.txt
new file mode 100644
index 0000000000..6c0c205f5c
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: بهبودهای کارایی و رفع اشکال‌ها!
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/fa/changelogs/40101030.txt b/fastlane/metadata/android/fa/changelogs/40101030.txt
new file mode 100644
index 0000000000..6b252e051c
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: بهبودهای کارایی و رفع اشکال‌ها!
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/fa/changelogs/40101040.txt b/fastlane/metadata/android/fa/changelogs/40101040.txt
new file mode 100644
index 0000000000..043647a793
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: بهبودهای کارایی و رفع اشکال‌ها!
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/fa/changelogs/40101050.txt b/fastlane/metadata/android/fa/changelogs/40101050.txt
new file mode 100644
index 0000000000..1c29a55d53
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: تعمیرات فوری برای 1.1.4
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/fa/changelogs/40101060.txt b/fastlane/metadata/android/fa/changelogs/40101060.txt
new file mode 100644
index 0000000000..b9542a3bd7
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: تعمیرات فوری برای 1.1.5
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/fa/changelogs/40101070.txt b/fastlane/metadata/android/fa/changelogs/40101070.txt
new file mode 100644
index 0000000000..8330a5060e
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101070.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: پشتیبانی آزمایشی برای فضاها. فشرده‌سازی ویدیو پیش از فرستادن.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.7
diff --git a/fastlane/metadata/android/fa/changelogs/40101080.txt b/fastlane/metadata/android/fa/changelogs/40101080.txt
new file mode 100644
index 0000000000..02cb3390a3
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101080.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: بهبود برای فضاها.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.8
diff --git a/fastlane/metadata/android/fa/changelogs/40101090.txt b/fastlane/metadata/android/fa/changelogs/40101090.txt
new file mode 100644
index 0000000000..d458caf46c
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101090.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: افزودن پشتیبانی برای شبکهٔ gitter.im.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.9
diff --git a/fastlane/metadata/android/fa/changelogs/40101100.txt b/fastlane/metadata/android/fa/changelogs/40101100.txt
new file mode 100644
index 0000000000..d51bd2427b
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101100.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: به‌روز رسانی زمینه و سبک و ویژگی‌های جدید برای فضاها.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.10
diff --git a/fastlane/metadata/android/fa/changelogs/40101110.txt b/fastlane/metadata/android/fa/changelogs/40101110.txt
new file mode 100644
index 0000000000..efd2ec9f4d
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101110.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: به‌روز رسانی زمینه و سبک و ویژگی‌های جدید برای فضاها (رفع اشکال برای 1.1.10)
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.11
diff --git a/fastlane/metadata/android/fa/changelogs/40101120.txt b/fastlane/metadata/android/fa/changelogs/40101120.txt
new file mode 100644
index 0000000000..1c8fb47c19
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101120.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: به‌روز رسانی زمینه و سبک و رفع یک فروپاشی پس از تماس ویدیویی
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.12
diff --git a/fastlane/metadata/android/fa/changelogs/40101130.txt b/fastlane/metadata/android/fa/changelogs/40101130.txt
new file mode 100644
index 0000000000..55d0801920
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101130.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش:به‌روز رسانی پایداری و رفع مشکل.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.13
diff --git a/fastlane/metadata/android/fa/changelogs/40101140.txt b/fastlane/metadata/android/fa/changelogs/40101140.txt
new file mode 100644
index 0000000000..2239799429
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101140.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: درست کردن مشکلی دربارهٔ پیام‌های رمزنگاری‌شده.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.14
diff --git a/fastlane/metadata/android/fa/changelogs/40101160.txt b/fastlane/metadata/android/fa/changelogs/40101160.txt
new file mode 100644
index 0000000000..82e3668777
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: تعمیر خطا هنگام فرستادن پیام رمزنگاشته در صورت خروج عضوی از سامانه.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/fa/changelogs/40102000.txt b/fastlane/metadata/android/fa/changelogs/40102000.txt
new file mode 100644
index 0000000000..c7e159bf2b
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+تغییرهای اصلی در این نگارش: پیام صوتی به صورت پیش‌گزیده به کار افتاده.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/fa/full_description.txt b/fastlane/metadata/android/fa/full_description.txt
index 3051f491ba..cd2d4eb4c1 100644
--- a/fastlane/metadata/android/fa/full_description.txt
+++ b/fastlane/metadata/android/fa/full_description.txt
@@ -1,30 +1,39 @@
-المنت گونه‌ای جدید از کاره‌های پیام‌رسانی و همکاری است که:
+المنت پیام‌رسانی امن و کاره‌ای برای همکاری گروهی است که برای گپ‌های گروهی هنگام دورکاری، آرمانیست. این کارهٔ گپ برای فراهم کردن کنفرانس ویدیویی، هم‌رسانی پرونده و تماس‌های صوتی، از رمزنگاری سرتاسری استفاده می‌‌کند.
 
-۱. کنترل محرمانگیتان را در دست خودتان می‌گذارد
-۲. می‌گذارد با هرکسی در شبکهٔ ماتریکس و حتا فراتر از آن، ارتباط برقرار کنید
-۳. از شما در برابر تبلیغات، داده‌کاوری و دیوارهای پرداختی، محافظت می‌کند
-۴. با رمزنگاری سرتاسری با ورود چندگانه، امنتان می‌کند
+<b>ویژگی‌های المنت شامل:</b>
+- ابزارهای ارتباط برخط پیش‌رفته
+- پیام‌های کاملاً مزنگاری شده برای ارتباط سازمانی امن، حتا هنگام دورکاری
+- گپ نامتمرکز برپایهٔ چارچوب نرم‌افزاری آزاد ماتریکس
+- هم‌رسانی پروندهٔ امن با داده‌های رمزنگاری شده هنگام مدیریت پروژه‌ها
+- گپ‌های ویدیویی با صدا روی قرارداد اینترنتی و هم‌رسانی پرونده
+- یکپارچگی آسان با دیگر کاره‌های پیام‌رسانی گروهی، خدمات وًیپ، ابزارهای مدیریت پروژه و ابزارهای همکاری برخط محبوبتان
 
-المنت به خاطر نامتمرکز و نرم‌افزار آزاد بودن، کاملاً با دیگر کاره‌های پیام‌رسانی و همکاری، فرق دارد.
+المنت کاملاً با دیگر کاره‌های پیام‌رسانی و همکاری، فرق دارد؛ چرا که روی ماتریکس، شبکه‌ای باز برای پیام‌رسانی امن و ارتباط نامتمرکز عمل می‌کند. این امر، خودمیزبانی را برای دادن بیشینهٔ مالکیت و واپایش روی داده‌ها و پیام‌ها ممکن می‌کند.
 
-المنت می‌گذارد خودمیزبانی کرده یا میزبانی برگزینید که امنیت، مالکیت و واپایش داده‌ها و گفت‌وگوهایتان را در اختیار داشته باشید. این کاره شما را به شبکه‌ای باز و شدیداً امن وصل کرده تا مجبور نباشید فقط با دیگر کاربران المنت صحبت کنید.
+<b>پیام‌رسانی رمزنگاری شده و امن</b>
+المنت شما را از تبلیغات ناخواسته، داده‌کاوی و زمین‌های محصور در امان نگه می‌دارد. همچنین تمامی داده‌هایتان و ارتباطات صوتی و تصویری یک‌به‌یکتان را با رمزنگاری سرتاسری و تأیید افزاره با ورود چندگانه، امن می‌کند.
 
-المنت می‌تواند همهٔ این کارها را بکند، چرا که روی ماتریکس، استانداردی برای گفت‌وگوی باز و نامتمرکز عمل می‌کند.
+المنت مهار محرمانگیتان را به دست خودتان می‌دهد؛ در عین این که می‌گذار با هرکسی روی شبکهٔ ماتریکس یا با یکپارچگی با کاره‌هایی چون اسلک، دیگر ابزارهای همکاری تجاری، در ارتباط باشید.
 
-المنت با اجازه برای گزینش کسی که گفت‌وگوهایتان را میزبانی می‌کند، کنترل را به شما می‌دهد. با کارهٔ المنت، می‌توانید برگزینید که به روش‌های مختلفی میزبانی شوید:
+<b>المنت می‌تواند خودمیزبانی شود</b>
+المنت می‌تواند برای دادن واپایش بیش‌تر روی گفت‌وگوها و داده‌های حسّاستان، خودمیزبانی شده یا می‌توانید هر میزبان مبتنی بر ماتریکسی را که استانداردی برای ارتباط نامتمرکز نرم‌افزار آزاد است، برگزینید. المنت به شما محرمانگی، امنیت و انعطاف می‌دهد.
 
-۱. گرفتن حسابی رایگان روی کارساز عمومی matrix.org که به دست توسعه‌دهندگان ماتریکس میزبانی می‌شود، یا گرینش از میان هزاران کارساز عمومی میزبانی‌شده به دست داوطلبان
-۲. خودمیزبانی حسابتان با اجرای کراسازی روی سخت‌افزار خودتان
-۳. ثبت‌نام برای حسابی روی یک کارساز سفارشی با اشتراک در بن‌یازهٔ میزبانی خدمات ماتریکس المنت
+<b>مالک داده‌هایتان باشید</b>
+خودتان تصمیم می‌گیرید که داده‌ها و پیام‌هایتان، کجا ذخیره شوند. بدون خطر داده‌کاوی یا دسترسی سوم‌شخص.
 
-<b>چرا المنت را برگزینیم؟</b>
+المنت به روش‌های مختلفی مهار را در دستان شما می‌گذارد:
+۱. گرفتن حسابی رایگان روی کارساز عمومی matrix.org که به دست توسعه‌دهندگان ماتریکس میزبانی می‌شود، یا گزینش از میان هزاران کارساز عمومی میزبانی‌شده به دست داوطلبان
+۲. خودمیزبانی حسابتان با اجرای کارسازی روی زیرساخت آی‌تی خودتان
+۳. ثبت‌نام برای حسابی روی یک کارساز سفارشی با اشتراک در بن‌سازهٔ میزبانی خدمات ماتریکس المنت
 
-<b>مالک داده‌هایتان باشید</b>: خوتان تصمیم می‌گیرید که داده‌ها و پیام‌هایتان را کجا نگه دارید. شما صاحبشان هستید و واپایششان می‌کنید، نه شرکت‌های بزرگی که داده‌هایتان را کاویده و به شرکت‌های دیگر دسترسی می‌دهند.
+<b>پیام‌رسانی و همکاری باز</b>
+می‌توانید با هرکسی در شبکهٔ ماتریکس گپ بزنید، چه از المنت استفاده کنند، چه از کارهٔ ماتریکس دیگری و حتا از کاره‌های پیام‌رسانی دیگر.
 
-<b>پیام‌رسانی و همکاری باز</b>: می‌توانید با هرکسی در شبکهٔ ماتریکس گپ بزنید، چه از المنت استفاده کنند و چه از هر کارهٔ ماتریکس دیگری؛ و حتا اگر از سامانهٔ پیام‌رسانی متفاوتی مثل اسلک، آی‌آرسی یا جبر استفاده کنند.
+<b>فوق امن</b>
+رمزنگاری سرتاسری واقعی (فقط کسانی که در گفت‌وگو هستند،‌می‌توانند پیام‌ها را رمزگشایی کنند) و تأیید هویت افزاره با ورود چندگانه.
 
-b>فوق امن</b>: رمزنگاری سرتاسری واقعی (فقط کسانی که در گفت‌وگو هستند،‌می‌توانند پیام‌ها را رمزگشایی کنند) و ورود چندگانه برای تأیید هویت افزاره‌های شرکت‌کنندگان در گفت‌وگو.
+<b>یکپارچگی ارتباط کامل</b>
+پیام‌رسانی، تماس‌های صوتی و تصویری، هم‌رسانی پرونده، هم‌رسانی صفحه و یه عالمه یکپارچگی، بات و ابزارک. اتاق و اجتماع ساخته، در دسترس بوده و کارها را انجام دهید.
 
-<b>ارتباط کامل</b>: پیام‌رسانی، تماس‌های صوتی و تصویری،‌هم‌رسانی پرونده، هم‌رسانی صفحه و یه عالمه یکپارچگی، بات و ابزارک. اتاق و اجتماع ساخته، در دسترس بوده و کارها را انجام دهید.
-
-<b>هرجا که هستید</b>: هر کجا که هستید، با هم‌گام سازی کامل تاریخچهٔ پیام‌ها بین همهٔ افزاره‌هایتان و وب روی https://app.element.io در دسترس باشید.
+<b>ادامه از جایی که رها کرده‌اید</b>
+هر کجا که هستید، با هم‌گام سازی کامل تاریخچهٔ پیام‌ها بین همهٔ افزاره‌هایتان و وب روی https://app.element.io در دسترس باشید
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40101160.txt b/fastlane/metadata/android/fr-FR/changelogs/40101160.txt
new file mode 100644
index 0000000000..785be4ab69
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : correction d’une erreur lors de l’envoi d’un message chiffré si quelqu’un du salon se déconnecte.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/fy/changelogs/40101060.txt b/fastlane/metadata/android/fy/changelogs/40101060.txt
index 47ac5692d5..34b367f6a1 100644
--- a/fastlane/metadata/android/fy/changelogs/40101060.txt
+++ b/fastlane/metadata/android/fy/changelogs/40101060.txt
@@ -1,2 +1,2 @@
-Haadferoaring yn disse ferzje: feroaringen foar 1.1.5
-Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.6
+Haadwiziging yn dizze ferzje: feroaringen foar 1.1.5
+Folsleine wizigingslist: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40101150.txt b/fastlane/metadata/android/hu-HU/changelogs/40101150.txt
new file mode 100644
index 0000000000..48765e903b
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40101150.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: hang üzenetek implementálva a labor beállítások alatt
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40101160.txt b/fastlane/metadata/android/hu-HU/changelogs/40101160.txt
new file mode 100644
index 0000000000..54f435eb96
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: Titkosított üzenetküldés hibájának javítása ha valaki kilépett a szobából.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40102000.txt b/fastlane/metadata/android/hu-HU/changelogs/40102000.txt
new file mode 100644
index 0000000000..1e708b1c7b
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: Hangüzenetek alapértelmezetten engedélyezettek.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/it-IT/changelogs/40101160.txt b/fastlane/metadata/android/it-IT/changelogs/40101160.txt
new file mode 100644
index 0000000000..1c217f50cc
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: corretto errore nell'invio di messaggi cifrati se qualcuno nella stanza si disconnette.
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/it-IT/changelogs/40102000.txt b/fastlane/metadata/android/it-IT/changelogs/40102000.txt
new file mode 100644
index 0000000000..3ba7f8ceb3
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: i messaggi vocali sono attivi in modo predefinito.
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/ja-JP/changelogs/40101160.txt b/fastlane/metadata/android/ja-JP/changelogs/40101160.txt
new file mode 100644
index 0000000000..a498487f46
--- /dev/null
+++ b/fastlane/metadata/android/ja-JP/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点:ルームにて誰かがログアウトした際に発生するエラーを修正しました。
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/ja-JP/full_description.txt b/fastlane/metadata/android/ja-JP/full_description.txt
index 855eb309c9..4e7b01cce3 100644
--- a/fastlane/metadata/android/ja-JP/full_description.txt
+++ b/fastlane/metadata/android/ja-JP/full_description.txt
@@ -1,30 +1,39 @@
-Elementはまったく新しいタイプのメッセンジャーアプリです。
+Elementはセキュアなメッセンジャーであると同時に、リモートワークでのグループチャットにも最適です。エンドツーエンドの暗号化を使用して、強力なビデオ会議、ファイル共有、音声通話を提供します。
 
-1. あなた自身がプライバシーをコントロールすることを可能にします。
-2. Matrixネットワークにいる誰とでも通信できることはもちろん、Slackなどのアプリとの連携によって他のネットワークとも通信ができます。
-3. 広告、データ収集、バックドア、ユーザーの囲い込みから逃れることができます。
-4. エンドツーエンド暗号化とクロス署名によってあなたを保護します。
+<b>Elementの特徴</b>
+- 高度なオンラインコミュニケーションツール
+- 完全に暗号化されたメッセージ
+- Matrixオープンソースフレームワークをベースにした分散型のチャット
+- プロジェクトを管理しながら、暗号化されたデータで安全にファイル共有
+- Voice over IPによるビデオチャットと画面共有
+- お気に入りのオンラインコラボレーションツール、プロジェクト管理ツール、VoIPサービス、その他のチームメッセージングアプリと統合可能
 
-Elementは非中央集権型でオープンソースであるため、他のメッセンジャーアプリとは完全に異なっています。
+Elementは他のメッセージングアプリやコラボレーションアプリとは異なります。安全なメッセージングと分散型（非中央集権）コミュニケーションのためのオープンネットワークであるMatrixで動作します。また、ユーザーが自分のデータやメッセージを最大限にコントロールできるように、セルフホスティングも可能です。
 
-Elementはあなた自身でサーバーをホストすることも、サーバーを選ぶこともできます。これによってあなたのデータと会話に関するプライバシーや所有権はあなた自身で管理できるようになります。さらに、あなたは他のElementユーザーと話せるだけでなくオープンネットワークへのアクセスも可能です。とてもセキュアです。
+<b>プライバシーと暗号化されたやりとり</b>
+Elementは、望ましくない広告、データマイニング、ウォールドガーデンからユーザーを保護します。また、エンド・ツー・エンドの暗号化と相互署名されたデバイスの検証により、すべてのデータ、1対1のビデオおよび音声通信を保護します。
 
-Elementは、オープンな分散型通信の標準規格であるMatrixで動作するため、これらすべてを実現することができています。
+Elementは、Slackなどのアプリと統合することで、Matrixネットワーク上の誰とでも安全にコミュニケーションをとることができると同時に、プライバシーをコントロールすることができます。
 
-Elementではあなたの会話をどのサーバーでホストするか決めることができます。アプリでは、さまざまな方法で選択できます。
+<b>Elementはセルフホスティングが可能</b>
+機密データや会話の管理を強化するために、Elementはセルフホスティングが可能で、オープンソースの分散型コミュニケーションの標準であるマトリックスベースのホストを選択することもできます。Elementは、プライバシー、セキュリティコンプライアンス、および統合の柔軟性を提供します。
 
-1. matrix.orgの公開サーバーで無料のアカウントを取得します。
-2. あなた自身のハードウェアでサーバーを動かし、アカウントを管理します。
-3. Element Matrix Servicesのホスティングプラットフォームに登録することで、カスタムサーバー上のアカウントを取得できます。
+<b>データを所有する</b>
+データやメッセージをどこに保管するかは、お客様が決めることができます。データマイニングやサードパーティからのアクセスされません。
 
-<b>なぜElementを選ぶべきなのか？</b>
+Elementではどのサーバーを使うか決めることができます。さまざまな方法で選択できます。
+1. 開発者がホストする matrix.org のパブリックサーバーで無料アカウントを取得するか、ボランティアがホストしているパブリックサーバーから選択する。
+2. 自分でサーバを実行することにより、アカウントをセルフホストする。
+3. Element Matrix Servicesのホスティングプラットフォームに加入しカスタムサーバー上でアカウントを作る。
 
-<b>データの所有権</b>: 自分でデータやメッセージを保管する場所を決めることができます。あなたが所有権を持ってコントロールすることで、第三者にあなたのデータを渡したり、ビッグデータを収集する巨大テック企業に依存する必要がなくなります。
+<b>オープンなメッセージングとコラボレーション</b>
+Matrixネットワーク上の誰とでも、相手がElementを使っているか、他のMatrixアプリを使っていてもコミュニケーションすることができます。
 
-<b>開かれたネットワークと共同作業</b>: Matrixネットワーク内の他の誰とでも、あるいはElementや他のMatrixアプリを使っているかどうかに関わらず、またSlack、IRC、XMPPのような他のメッセージングシステムを使っているかどうかに関わらず、チャットすることができます。
+<b>すごく安全</b>
+本物のエンド・ツー・エンドの暗号化（会話に参加している人だけがメッセージを復号化できる）と、相互署名されたデバイスの検証を行います。
 
-<b>はるかに安全</b>: 本物のエンドツーエンド暗号化（会話に参加している者のみがメッセージを読める）と会話参加者の真正性を確認するためクロス署名によって。
+<b>包括的なコミュニケーションと統合</b>
+メッセージング、音声およびビデオ通話、ファイル共有、画面共有、その他多くの統合、ボット、ウィジェットを提供します。部屋やコミュニティを作り、連絡を取り合い、物事を成し遂げることができます。
 
-<b>完全なるコミュニケーションの訪れ</b>: テキスト、音声通話、ビデオ通話、ファイル共有、画面共有、連携機能、ボット、ウィジェットなどのコミュニケーションに必要な機能の全てが実装されています。ルームやコミュニティを立ち上げて連絡を取り合い、物事をスムーズに成し遂げることができます。
-
-<b>いつでもどこでも！</b>: すべてのデバイスとウェブ（https://app.element.io）でメッセージの履歴が完全に同期されるため、どこにいても連絡を取ることができます。
+<b>中断からの再開は</b>
+すべてのデバイスとウェブで完全に同期されたメッセージにより、どこにいても連絡を取り合うことができます。https://app.element.io
diff --git a/fastlane/metadata/android/ja-JP/short_description.txt b/fastlane/metadata/android/ja-JP/short_description.txt
index c3991b7a93..0d37b108ac 100644
--- a/fastlane/metadata/android/ja-JP/short_description.txt
+++ b/fastlane/metadata/android/ja-JP/short_description.txt
@@ -1 +1 @@
-安全な分散型チャットとVoIP。あなたの情報が第三者から守られます。
+メッセンジャー - 暗号化されたメッセージング、グループチャット、ビデオコールなど
diff --git a/fastlane/metadata/android/ja-JP/title.txt b/fastlane/metadata/android/ja-JP/title.txt
index 376f4a95de..7c2b777407 100644
--- a/fastlane/metadata/android/ja-JP/title.txt
+++ b/fastlane/metadata/android/ja-JP/title.txt
@@ -1 +1 @@
-Element（エレメントメッセンジャー）
+Element - セキュアメッセンジャー
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101040.txt b/fastlane/metadata/android/no-NO/changelogs/40101040.txt
new file mode 100644
index 0000000000..5d1ecba7fc
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: forbedring av ytelsen og feilrettinger!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101050.txt b/fastlane/metadata/android/no-NO/changelogs/40101050.txt
new file mode 100644
index 0000000000..3ddcb9d04b
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: hurtigreparasjoner for 1.1.4
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101060.txt b/fastlane/metadata/android/no-NO/changelogs/40101060.txt
new file mode 100644
index 0000000000..c556359851
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: hurtigreparasjoner for 1.1.5
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101070.txt b/fastlane/metadata/android/no-NO/changelogs/40101070.txt
new file mode 100644
index 0000000000..bc786eb454
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101070.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: beta støtte for Mellomrom. Komprimer video før du sender.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.7
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101080.txt b/fastlane/metadata/android/no-NO/changelogs/40101080.txt
new file mode 100644
index 0000000000..02d6aa868b
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101080.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: forbedring for Mellomrom.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.8
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101090.txt b/fastlane/metadata/android/no-NO/changelogs/40101090.txt
new file mode 100644
index 0000000000..cdcb4909c7
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101090.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: legg til støtte for gitter.im -nettverket.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.9
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101100.txt b/fastlane/metadata/android/no-NO/changelogs/40101100.txt
new file mode 100644
index 0000000000..8a397f63bb
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101100.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: oppdatering av tema og stil og nye funksjoner for mellomrom.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.10
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101110.txt b/fastlane/metadata/android/no-NO/changelogs/40101110.txt
new file mode 100644
index 0000000000..2db46e97a8
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101110.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: oppdatering av tema og stil og nye funksjoner for mellomrom (feilrettelse for 1.1.10)
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.11
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101120.txt b/fastlane/metadata/android/no-NO/changelogs/40101120.txt
new file mode 100644
index 0000000000..6b7e160a80
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101120.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: tema og stiloppdatering og fikse et krasj etter videosamtale
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.12
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101130.txt b/fastlane/metadata/android/no-NO/changelogs/40101130.txt
new file mode 100644
index 0000000000..db67b87bf9
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101130.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: hovedsakelig stabilitet og oppdateringer av feilrettinger.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.13
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101140.txt b/fastlane/metadata/android/no-NO/changelogs/40101140.txt
new file mode 100644
index 0000000000..7921bd03e0
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101140.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: Løs et problem om krypterte meldinger.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.14
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101150.txt b/fastlane/metadata/android/no-NO/changelogs/40101150.txt
new file mode 100644
index 0000000000..2f4fcb8266
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101150.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: implementering av talemeldinger under laboratorieinnstillinger.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.15
diff --git a/fastlane/metadata/android/no-NO/changelogs/40101160.txt b/fastlane/metadata/android/no-NO/changelogs/40101160.txt
new file mode 100644
index 0000000000..d7f7ca2387
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Hovedendringer i denne versjonen: Løs feil ved sending av kryptert melding hvis noen i rommet logger av.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/no-NO/full_description.txt b/fastlane/metadata/android/no-NO/full_description.txt
index 92a3c4c5c3..08d2383532 100644
--- a/fastlane/metadata/android/no-NO/full_description.txt
+++ b/fastlane/metadata/android/no-NO/full_description.txt
@@ -1,30 +1,39 @@
-Element er en ny type messenger og samarbeidsapp som:
+Element er både en sikker budbringer og en produktivitets team -samarbeidsprogram som er ideell for gruppechatter mens du jobber på fjernkontroll. Denne chat-appen bruker ende-til-ende-kryptering for å tilby kraftige videokonferanser, fildeling og taleanrop.
 
-1. Gir deg kontrollen for å bevare personvernet ditt
-2. Lar deg kommunisere med hvem som helst i Matrix-nettverket, og til og med ved å integrere med apper som Slack
-3. Beskytter deg mot reklame, datamining og inngjerdede hager
-4. Sikrer deg gjennom end-to-end-kryptering, med kryssignering for å bekrefte andre
+<b> Elementets funksjoner inkluderer: </b>
+- Avanserte elektroniske kommunikasjonsverktøy
+- Fullt krypterte meldinger for å tillate tryggere bedriftskommunikasjon, selv for eksterne arbeidere
+- Desentralisert chat basert på Matrix open source -rammeverket
+- Fildeling sikkert med krypterte data mens du administrerer prosjekter
+- Videochatter med Voice over IP og skjermdeling
+- Enkel integrering med dine favoritt online samarbeidsverktøy, prosjektstyringsverktøy, VoIP -tjenester og andre teammeldingsapper
 
-Element er helt forskjellig fra andre meldings- og samarbeidsapper fordi det er desentralisert og åpen kildekode.
+Element er helt annerledes enn andre meldings- og samarbeidsapper. Den opererer på Matrix, et åpent nettverk for sikre meldinger og desentralisert kommunikasjon. Det gjør det mulig for egen hosting å gi brukerne maksimal eierskap og kontroll over sine data og meldinger.
 
-Element lar deg selv være vert - eller velge en vert - slik at du har personvern, eierskap og kontroll over dataene og samtalene dine. Det gir deg tilgang til et åpent nettverk; slik at du ikke bare holder på å snakke med bare andre Element-brukere. Og det er veldig sikkert.
+<b> Personvern og krypterte meldinger </b>
+Element beskytter deg mot uønskede annonser, datautvinning og inngjerdede hager. Den sikrer også alle dataene dine, en-til-en video- og talekommunikasjon gjennom ende-til-ende-kryptering og kryssignert enhetsverifisering.
 
-Element er i stand til å gjøre alt dette fordi det opererer på Matrix - standarden for åpen, desentralisert kommunikasjon.
+Element gir deg kontroll over personvernet ditt, samtidig som du kan kommunisere trygt med alle på Matrix -nettverket eller andre forretningssamarbeidsverktøy ved å integrere med apper som Slack.
 
-Element setter deg i kontroll ved å la deg velge hvem som er vert for samtalene dine. Fra Element-appen kan du velge å være vert på forskjellige måter:
+<b> Elementet kan hostes selv </b>
+For å tillate mer kontroll over dine sensitive data og samtaler, kan Element være egenvert, eller du kan velge hvilken som helst Matrix-basert vert-standarden for åpen kildekode, desentralisert kommunikasjon. Element gir deg personvern, overholdelse av sikkerhet og fleksibilitet for integrering.
 
-1. Få en gratis konto på matrix.org-serveren som er vert for Matrix-utviklerne, eller velg blant tusenvis av offentlige servere som er vert for frivillige
-2. Vær vert for kontoen din ved å kjøre en server på din egen maskinvare
-3. Registrer deg for en konto på en tilpasset server ved å bare abonnere på Hosting Matrix Services-vertsplattformen
+<b> Ei dataene dine </b>
+Du bestemmer hvor du vil beholde dataene og meldingene dine. Uten risiko for datautvinning eller tilgang fra tredjeparter.
 
-<b> Hvorfor velge Element? </b>
+Element gir deg kontroll på forskjellige måter:
+1. Få en gratis konto på den matrix.org offentlige serveren som Matrix -utviklerne er vert for, eller velg blant tusenvis av offentlige servere som er arrangert av frivillige
+2. Vær vert for kontoen din ved å kjøre en server på din egen IT-infrastruktur
+3. Registrer deg for en konto på en tilpasset server ved ganske enkelt å abonnere på Element Matrix Services hosting -plattform
 
-<b> EGNE DATA DINE </b>: Du bestemmer hvor du vil oppbevare dataene og meldingene dine. Du eier den og kontrollerer den, ikke noe MEGACORP som utvinner dataene dine eller gir tilgang til tredjeparter.
+<b> Åpen melding og samarbeid </b>
+Du kan chatte med alle på Matrix -nettverket, enten de bruker Element, en annen Matrix -app eller til og med om de bruker en annen meldingsapp.
 
-<b> ÅPEN MELDING OG SAMARBEID </b>: Du kan chatte med alle andre i Matrix-nettverket, enten de bruker Element eller en annen Matrix-app, og selv om de bruker et annet meldingssystem som Slack, IRC eller XMPP.
+<b> Super sikker </b>
+Ekte ende-til-ende-kryptering (bare de i samtalen kan dekryptere meldinger) og kryssignert enhetsbekreftelse.
 
-<b> SUPER-SECURE </b>: Ekte end-to-end-kryptering (bare de i samtalen kan dekryptere meldinger), og kryssignering for å verifisere enhetene til samtaledeltakerne.
+<b> Fullstendig kommunikasjon og integrering </b>
+Meldinger, tale- og videosamtaler, fildeling, skjermdeling og en hel haug med integrasjoner, bots og widgets. Bygg rom, lokalsamfunn, hold kontakten og få ting gjort.
 
-<b> KOMPLETT KOMMUNIKASJON </b>: Meldinger, tale- og videosamtaler, fildeling, skjermdeling og en hel haug med integrasjoner, bots og widgets. Bygg rom, lokalsamfunn, hold kontakten og få ting gjort.
-
-<b> ALT DER DU ER </b>: Hold kontakten uansett hvor du er med fullt synkronisert meldingslogg på alle enhetene dine og på nettet på https://app.element.io.
+<b> Hent der du slapp </b>
+Hold kontakten uansett hvor du er med fullt synkronisert meldingshistorikk på alle enhetene dine og på nettet på https://app.element.io
diff --git a/fastlane/metadata/android/no-NO/short_description.txt b/fastlane/metadata/android/no-NO/short_description.txt
index b7cad4c849..04c4a8c2e5 100644
--- a/fastlane/metadata/android/no-NO/short_description.txt
+++ b/fastlane/metadata/android/no-NO/short_description.txt
@@ -1 +1 @@
-Sikker desentralisert chat & VoIP. Beskytt dataene dine fra tredjeparter.
+Gruppe meldinger - kryptert meldinger, gruppechat og videosamtaler
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40101160.txt b/fastlane/metadata/android/pt-BR/changelogs/40101160.txt
new file mode 100644
index 0000000000..9ed83f641b
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Consertar erro quando enviando mensagem encriptada se alguém na sala faz logout.
+Changelog completo: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40102000.txt b/fastlane/metadata/android/pt-BR/changelogs/40102000.txt
new file mode 100644
index 0000000000..3c600baeed
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Mensagem de Voz está habilitada por default.
+Changelog completo: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/sq/title.txt b/fastlane/metadata/android/sq/title.txt
new file mode 100644
index 0000000000..b46bbc02b1
--- /dev/null
+++ b/fastlane/metadata/android/sq/title.txt
@@ -0,0 +1 @@
+Element - Shkëmbyes I Sigurt Mesazhesh
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40101160.txt b/fastlane/metadata/android/sv-SE/changelogs/40101160.txt
new file mode 100644
index 0000000000..cfdf3b54d4
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Fixa fel vid sändning av krypterade meddelanden om någon i rummet loggar ut.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40102000.txt b/fastlane/metadata/android/sv-SE/changelogs/40102000.txt
new file mode 100644
index 0000000000..c31355dc09
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Röstmeddelanden är aktiverade som förval.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.2.0
diff --git a/fastlane/metadata/android/uk/changelogs/40101150.txt b/fastlane/metadata/android/uk/changelogs/40101150.txt
new file mode 100644
index 0000000000..c3e724a8a0
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40101150.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: впровадження голосових повідомлень у налаштуваннях лабораторії.
+Повний журнал змін: https://github.com/vector-im/element-android/releases/tag/v1.1.15
diff --git a/fastlane/metadata/android/uk/changelogs/40101160.txt b/fastlane/metadata/android/uk/changelogs/40101160.txt
new file mode 100644
index 0000000000..fe7bb6c7cc
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Основні зміни у цій версії: виправлення помилок надсилання зашифрованого повідомлення, якщо хтось виходить з кімнати.
+Усі зміни: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/uk/changelogs/40102000.txt b/fastlane/metadata/android/uk/changelogs/40102000.txt
new file mode 100644
index 0000000000..07defcbb57
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: голосові повідомлення типово увімкнено.
+Повний журнал змін: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
index df06315754..285f577452 100644
--- a/fastlane/metadata/android/uk/full_description.txt
+++ b/fastlane/metadata/android/uk/full_description.txt
@@ -33,7 +33,7 @@ Element надає такі можливості на вибір:
 Справжнє наскрізне шифрування (лише учасники бесіди можуть розшифровувати повідомлення) та взаємне підписування пристроїв.
 
 <b>Повноцінні спілкування та інтеграція</b>
-Обмін повідомленнями, голосові та відеовиклики, обмін файлами, спільний доступ до екрана та ціла купа інтеграцій, ботів та віджетів. Створюйте кімнати, спільноти, залишайтеся на зв’язку та виконуйте завдання.
+Обмін повідомленнями, голосові та відеовиклики, обмін файлами, спільний доступ до екрана та ціла купа інтеграцій, ботів та розширень. Створюйте кімнати, спільноти, залишайтеся на зв’язку та виконуйте завдання.
 
 <b>Продовжуйте, де зупинилися</b>
 Залишайтеся на зв'язку, де б ви не знаходились, з повністю синхронізованою історією повідомлень на всіх своїх пристроях та в Інтернеті за адресою https://app.element.io
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40101120.txt b/fastlane/metadata/android/zh-CN/changelogs/40101120.txt
new file mode 100644
index 0000000000..06d0540f58
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/40101120.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：主题和样式更新，以及修复视频通话后崩溃的问题
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.1.12
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40101130.txt b/fastlane/metadata/android/zh-CN/changelogs/40101130.txt
new file mode 100644
index 0000000000..623cfca705
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/40101130.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：主要是稳定性和错误修正更新。
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.1.13
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40101140.txt b/fastlane/metadata/android/zh-CN/changelogs/40101140.txt
new file mode 100644
index 0000000000..81dea97d96
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/40101140.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：修复有关加密消息的问题。
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.1.14
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40101150.txt b/fastlane/metadata/android/zh-CN/changelogs/40101150.txt
new file mode 100644
index 0000000000..a6caddbf30
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/40101150.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：实验室设置下的语音消息实现。
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.1.15
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40101160.txt b/fastlane/metadata/android/zh-CN/changelogs/40101160.txt
new file mode 100644
index 0000000000..98357b0dc5
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：修复聊天室中有人登出时发送加密消息所遇到的错误。
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/zh-CN/changelogs/40102000.txt b/fastlane/metadata/android/zh-CN/changelogs/40102000.txt
new file mode 100644
index 0000000000..eedbe81bac
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+此版本中的主要更改：默认启用语音消息。
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40101160.txt b/fastlane/metadata/android/zh-TW/changelogs/40101160.txt
new file mode 100644
index 0000000000..364bec14b9
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：修復在聊天室中有人登出時傳送加密訊息所發生的問題。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40102000.txt b/fastlane/metadata/android/zh-TW/changelogs/40102000.txt
new file mode 100644
index 0000000000..993a59c825
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：語音訊息預設啟用。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.2.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 17ba19021b..a37233c5e2 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=9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
+distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 744e882ed5..1b6c787337 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index e264ef8319..365e4b902c 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -39,13 +39,16 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
+
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "11"
     }
+
     buildFeatures {
         viewBinding true
     }
diff --git a/library/ui-styles/src/main/AndroidManifest.xml b/library/ui-styles/src/main/AndroidManifest.xml
index 19aa89e2e7..254827465d 100644
--- a/library/ui-styles/src/main/AndroidManifest.xml
+++ b/library/ui-styles/src/main/AndroidManifest.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.lib.ui.styles"/>
\ No newline at end of file
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="im.vector.lib.ui.styles">
+
+    <application android:supportsRtl="true" />
+
+</manifest>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/color/keyword_background_selector.xml b/library/ui-styles/src/main/res/color/keyword_background_selector.xml
new file mode 100644
index 0000000000..3420cfeaba
--- /dev/null
+++ b/library/ui-styles/src/main/res/color/keyword_background_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/color_primary_alpha25" android:state_enabled="false" />
+    <item android:color="?colorPrimary" />
+</selector>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/color/keyword_foreground_selector.xml b/library/ui-styles/src/main/res/color/keyword_foreground_selector.xml
new file mode 100644
index 0000000000..339f240246
--- /dev/null
+++ b/library/ui-styles/src/main/res/color/keyword_foreground_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item  android:alpha="0.25" android:color="?attr/colorOnPrimary" android:state_enabled="false" />
+    <item  android:color="?attr/colorOnPrimary"  />
+</selector>
diff --git a/library/ui-styles/src/main/res/layout/dialog_progress_material.xml b/library/ui-styles/src/main/res/layout/dialog_progress_material.xml
index 09c88cc50b..32c4f666c7 100644
--- a/library/ui-styles/src/main/res/layout/dialog_progress_material.xml
+++ b/library/ui-styles/src/main/res/layout/dialog_progress_material.xml
@@ -2,7 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:ignore="UselessParent">
 
     <!-- Inspired from https://android.googlesource.com/platform/frameworks/base/+/master/core/res/res/layout/progress_dialog.xml -->
     <LinearLayout
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index 9d5f15cbde..b58829bb81 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -28,6 +28,7 @@
     <!-- Other useful color -->
     <!-- Emoji text has to use a black text color -->
     <color name="emoji_color">@android:color/black</color>
+    <color name="join_conference_animated_color">#0BAC7E</color>
 
     <color name="half_transparent_status_bar">#80000000</color>
 
diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index 88338f799b..e2e50449ce 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -28,6 +28,10 @@
     <dimen name="pill_min_height">20dp</dimen>
     <dimen name="pill_text_padding">4dp</dimen>
 
+    <dimen name="call_pip_height">128dp</dimen>
+    <dimen name="call_pip_width">88dp</dimen>
+    <dimen name="call_pip_radius">8dp</dimen>
+
 
     <dimen name="item_form_min_height">76dp</dimen>
 
diff --git a/library/ui-styles/src/main/res/values/styles_keyword.xml b/library/ui-styles/src/main/res/values/styles_keyword.xml
new file mode 100644
index 0000000000..76e8eb4fc7
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/styles_keyword.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <attr name="vctr_keyword_style" format="reference" />
+
+    <style name="Widget.Vector.Keyword" parent="Widget.MaterialComponents.Chip.Action">
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
+        <item name="chipBackgroundColor">@color/keyword_background_selector</item>
+        <item name="closeIconTint">@color/keyword_foreground_selector</item>
+        <item name="closeIconVisible">true</item>
+        <item name="android:textColor">@color/keyword_foreground_selector</item>
+        <item name="android:clickable">true</item>
+        <item name="android:checkable">false</item>
+    </style>
+</resources>
\ No newline at end of file
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 0dbdc5ad4f..f83953a527 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -134,6 +134,8 @@
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark</item>
 
         <item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Dark</item>
+        <!-- Keywords -->
+        <item name="vctr_keyword_style">@style/Widget.Vector.Keyword</item>
 
         <!-- Voice Message -->
         <item name="vctr_voice_message_toast_background">@color/vctr_voice_message_toast_background_dark</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 17e0ff2938..cd5e17d607 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -137,6 +137,9 @@
 
         <item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Light</item>
 
+        <!-- Keywords -->
+        <item name="vctr_keyword_style">@style/Widget.Vector.Keyword</item>
+
         <!-- Voice Message -->
         <item name="vctr_voice_message_toast_background">@color/vctr_voice_message_toast_background_light</item>
     </style>
diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle
index 899432b498..d18e3b1d72 100644
--- a/matrix-sdk-android-rx/build.gradle
+++ b/matrix-sdk-android-rx/build.gradle
@@ -24,12 +24,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
@@ -44,5 +44,5 @@ dependencies {
     implementation "androidx.paging:paging-runtime-ktx:2.1.2"
 
     // Logging
-    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.jakewharton.timber:timber:5.0.1'
 }
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 96c9fdb1e6..cbae6a05b3 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "io.realm:realm-gradle-plugin:10.6.1"
+        classpath "io.realm:realm-gradle-plugin:10.8.0"
     }
 }
 
@@ -67,17 +67,13 @@ android {
         installOptions "-g"
     }
 
-    lintOptions {
-        lintConfig file("lint.xml")
-    }
-
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     sourceSets {
@@ -112,7 +108,7 @@ dependencies {
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
-    def daggerVersion = '2.38'
+    def daggerVersion = '2.38.1'
     def work_version = '2.5.0'
     def retrofit_version = '2.9.0'
 
@@ -141,7 +137,7 @@ dependencies {
     implementation "ru.noties.markwon:core:$markwon_version"
 
     // Image
-    implementation 'androidx.exifinterface:exifinterface:1.3.2'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
 
     // Database
     implementation 'com.github.Zhuinden:realm-monarchy:0.7.1'
@@ -162,14 +158,14 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
 
     // Logging
-    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
 
     // Video compression
     implementation 'com.otaliastudios:transcoder:0.10.3'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.28'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.31'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.5.1'
diff --git a/matrix-sdk-android/lint.xml b/matrix-sdk-android/lint.xml
deleted file mode 100644
index 134aba822b..0000000000
--- a/matrix-sdk-android/lint.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <!-- Modify some severity -->
-
-    <!-- Resource -->
-    <issue id="MissingTranslation" severity="warning" />
-    <issue id="TypographyEllipsis" severity="error" />
-    <issue id="ImpliedQuantity" severity="warning" />
-
-    <!-- UX -->
-    <issue id="ButtonOrder" severity="error" />
-
-    <!-- Layout -->
-    <issue id="UnknownIdInLayout" severity="error" />
-    <issue id="StringFormatCount" severity="error" />
-    <issue id="HardcodedText" severity="error" />
-    <issue id="SpUsage" severity="error" />
-    <issue id="ObsoleteLayoutParam" severity="error" />
-    <issue id="InefficientWeight" severity="error" />
-    <issue id="DisableBaselineAlignment" severity="error" />
-    <issue id="ScrollViewSize" severity="error" />
-
-    <!-- RTL -->
-    <issue id="RtlEnabled" severity="error" />
-    <issue id="RtlHardcoded" severity="error" />
-    <issue id="RtlSymmetry" severity="error" />
-
-    <!-- Code -->
-    <issue id="SetTextI18n" severity="error" />
-    <issue id="ViewConstructor" severity="error" />
-    <issue id="UseValueOf" severity="error" />
-    <issue id="ObsoleteSdkInt" severity="error" />
-
-</lint>
diff --git a/matrix-sdk-android/src/androidTest/AndroidManifest.xml b/matrix-sdk-android/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000000..274bd8c87b
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.matrix.android.sdk">
+
+    <application>
+
+        <!--
+        This is mandatory to run integration tests
+        -->
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:exported="false"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt
new file mode 100644
index 0000000000..b11a538949
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt
@@ -0,0 +1,60 @@
+/*
+ * 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
+
+import org.junit.Assert
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.api.session.permalinks.PermalinkData
+import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
+
+@FixMethodOrder(MethodSorters.JVM)
+class PermalinkParserTest {
+
+    @Test
+    fun testParseEmailInvite() {
+        val rawInvite = """
+            https://app.element.io/#/room/%21MRBNLPtFnMAazZVPMO%3Amatrix.org?email=bob%2Bspace%40example.com&signurl=https%3A%2F%2Fvector.im%2F_matrix%2Fidentity%2Fapi%2Fv1%2Fsign-ed25519%3Ftoken%3DXmOwRZnSFabCRhTywFbJWKXWVNPysOpXIbroMGaUymqkJSvHeVKRsjHajwjCYdBsvGSvHauxbKfJmOxtXldtyLnyBMLKpBQCMzyYggrdapbVIceWZBtmslOQrXLABRoe%26private_key%3DT2gq0c3kJB_8OroXVxl1pBnzHsN7V6Xn4bEBSeW1ep4&room_name=Team2&room_avatar_url=&inviter_name=hiphop5&guest_access_token=&guest_user_id=
+        """.trimIndent()
+                .replace("https://app.element.io/#/room/", "https://matrix.to/#/")
+
+        val parsedLink = PermalinkParser.parse(rawInvite)
+        Assert.assertTrue("Should be parsed as email invite but was ${parsedLink::class.java}", parsedLink is PermalinkData.RoomEmailInviteLink)
+        parsedLink as PermalinkData.RoomEmailInviteLink
+        Assert.assertEquals("!MRBNLPtFnMAazZVPMO:matrix.org", parsedLink.roomId)
+        Assert.assertEquals("XmOwRZnSFabCRhTywFbJWKXWVNPysOpXIbroMGaUymqkJSvHeVKRsjHajwjCYdBsvGSvHauxbKfJmOxtXldtyLnyBMLKpBQCMzyYggrdapbVIceWZBtmslOQrXLABRoe", parsedLink.token)
+        Assert.assertEquals("vector.im", parsedLink.identityServer)
+        Assert.assertEquals("Team2", parsedLink.roomName)
+        Assert.assertEquals("hiphop5", parsedLink.inviterName)
+    }
+
+    @Test
+    fun testParseLinkWIthEvent() {
+        val rawInvite = "https://matrix.to/#/!OGEhHVWSdvArJzumhm:matrix.org/\$xuvJUVDJnwEeVjPx029rAOZ50difpmU_5gZk_T0jGfc?via=matrix.org&via=libera.chat&via=matrix.example.io"
+
+        val parsedLink = PermalinkParser.parse(rawInvite)
+        Assert.assertTrue("Should be parsed as room link", parsedLink is PermalinkData.RoomLink)
+        parsedLink as PermalinkData.RoomLink
+        Assert.assertEquals("!OGEhHVWSdvArJzumhm:matrix.org", parsedLink.roomIdOrAlias)
+        Assert.assertEquals("\$xuvJUVDJnwEeVjPx029rAOZ50difpmU_5gZk_T0jGfc", parsedLink.eventId)
+        Assert.assertEquals(3, parsedLink.viaParameters.size)
+        Assert.assertTrue(parsedLink.viaParameters.contains("matrix.example.io"))
+        Assert.assertTrue(parsedLink.viaParameters.contains("matrix.org"))
+        Assert.assertTrue(parsedLink.viaParameters.contains("matrix.example.io"))
+    }
+}
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 6e07223ac7..7817351e53 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
@@ -91,6 +91,7 @@ class CommonTestHelper(context: Context) {
      *
      * @param session    the session to sync
      */
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun syncSession(session: Session, timeout: Long = TestConstants.timeOutMillis) {
         val lock = CountDownLatch(1)
 
@@ -327,6 +328,7 @@ class CommonTestHelper(context: Context) {
         assertTrue(latch.await(timeout ?: TestConstants.timeOutMillis, TimeUnit.MILLISECONDS))
     }
 
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun retryPeriodicallyWithLatch(latch: CountDownLatch, condition: (() -> Boolean)) {
         GlobalScope.launch {
             while (true) {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index da176491c6..a8cbc160dd 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -84,6 +84,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
     /**
      * @return alice and bob sessions
      */
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun doE2ETestWithAliceAndBobInARoom(encryptedRoom: Boolean = true): CryptoTestData {
         val cryptoTestData = doE2ETestWithAliceInARoom(encryptedRoom)
         val aliceSession = cryptoTestData.firstSession
@@ -255,6 +256,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
         )
     }
 
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun createDM(alice: Session, bob: Session): String {
         val roomId = mTestHelper.runBlockingTest {
             alice.createDirectRoom(bob.myUserId)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index d14de30c90..74855b8630 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -60,6 +60,7 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun test_Generate4SKey() {
         val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
@@ -275,6 +276,7 @@ class QuadSTests : InstrumentedTest {
         mTestHelper.signOutAndClose(aliceSession)
     }
 
+    @Suppress("EXPERIMENTAL_API_USAGE")
     private fun assertAccountData(session: Session, type: String): UserAccountDataEvent {
         val accountDataLock = CountDownLatch(1)
         var accountData: UserAccountDataEvent? = null
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
index f156a5eb64..0fe341cad6 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
@@ -139,7 +139,7 @@ class TimelineForwardPaginationTest : InstrumentedTest {
                 // Alice can see the first event of the room (so Back pagination has worked)
                 snapshot.lastOrNull()?.root?.getClearType() == EventType.STATE_ROOM_CREATE
                         // 6 for room creation item (backward pagination), 1 for the context, and 50 for the forward pagination
-                        && snapshot.size == 6 + 1 + 50
+                        && snapshot.size == 57 // 6 + 1 + 50
             }
 
             aliceTimeline.addListener(aliceEventsListener)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
index 9ebac8766a..03a4d41988 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
@@ -189,7 +189,7 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
                     Timber.w(" event ${it.root}")
                 }
 
-                snapshot.size == 8 + 1 + 35
+                snapshot.size == 44 // 8 + 1 + 35
             }
 
             bobTimeline.addListener(eventsListener)
@@ -218,7 +218,7 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
                 // Bob can see the first event of the room (so Back pagination has worked)
                 snapshot.lastOrNull()?.root?.getClearType() == EventType.STATE_ROOM_CREATE
                         // 8 for room creation item 60 message from Alice
-                        && snapshot.size == 8 + 60
+                        && snapshot.size == 68 // 8 + 60
                         && snapshot.checkSendOrder(secondMessage, 30, 0)
                         && snapshot.checkSendOrder(firstMessage, 30, 30)
             }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index a1744a0dae..5911414c25 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -28,12 +28,9 @@ 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.query.ActiveSpaceFilter
 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.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
-import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
@@ -42,7 +39,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
-import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.JoinSpaceResult
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.SessionTestParams
@@ -54,6 +50,7 @@ class SpaceCreationTest : InstrumentedTest {
     private val commonTestHelper = CommonTestHelper(context())
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun createSimplePublicSpace() {
         val session = commonTestHelper.createAccount("Hubble", SessionTestParams(true))
         val roomName = "My Space"
@@ -137,6 +134,7 @@ class SpaceCreationTest : InstrumentedTest {
     }
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun testSimplePublicSpaceWithChildren() {
         val aliceSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
         val bobSession = commonTestHelper.createAccount("bob", SessionTestParams(true))
@@ -162,7 +160,7 @@ class SpaceCreationTest : InstrumentedTest {
 
         commonTestHelper.waitWithLatch {
             GlobalScope.launch {
-                syncedSpace?.addChildren(firstChild!!, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "a", true, suggested = true)
+                syncedSpace?.addChildren(firstChild!!, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "a", suggested = true)
                 it.countDown()
             }
         }
@@ -181,7 +179,7 @@ class SpaceCreationTest : InstrumentedTest {
 
         commonTestHelper.waitWithLatch {
             GlobalScope.launch {
-                syncedSpace?.addChildren(secondChild!!, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "b", false, suggested = true)
+                syncedSpace?.addChildren(secondChild!!, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "b", suggested = true)
                 it.countDown()
             }
         }
@@ -202,19 +200,20 @@ class SpaceCreationTest : InstrumentedTest {
         assertEquals("Room name should be set", roomName, spaceBobPov?.asRoom()?.roomSummary()?.name)
         assertEquals("Room topic should be set", topic, spaceBobPov?.asRoom()?.roomSummary()?.topic)
 
+        // /!\ AUTO_JOIN has been descoped
         // check if bob has joined automatically the first room
 
-        val bobMembershipFirstRoom = bobSession.getRoomSummary(firstChild!!)?.membership
-        assertEquals("Bob should have joined this room", Membership.JOIN, bobMembershipFirstRoom)
-        RoomSummaryQueryParams.Builder()
-
-        val childCount = bobSession.getRoomSummaries(
-                roomSummaryQueryParams {
-                    activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(spaceId)
-                }
-        ).size
-
-        assertEquals("Unexpected number of joined children", 1, childCount)
+//        val bobMembershipFirstRoom = bobSession.getRoomSummary(firstChild!!)?.membership
+//        assertEquals("Bob should have joined this room", Membership.JOIN, bobMembershipFirstRoom)
+//        RoomSummaryQueryParams.Builder()
+//
+//        val childCount = bobSession.getRoomSummaries(
+//                roomSummaryQueryParams {
+//                    activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(spaceId)
+//                }
+//        ).size
+//
+//        assertEquals("Unexpected number of joined children", 1, childCount)
 
         commonTestHelper.signOutAndClose(aliceSession)
         commonTestHelper.signOutAndClose(bobSession)
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 521b5805bd..301cdea461 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
@@ -47,6 +47,7 @@ class SpaceHierarchyTest : InstrumentedTest {
     private val commonTestHelper = CommonTestHelper(context())
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun createCanonicalChildRelation() {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
         val spaceName = "My Space"
@@ -171,6 +172,7 @@ class SpaceHierarchyTest : InstrumentedTest {
 //    }
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun testFilteringBySpace() {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
@@ -179,7 +181,7 @@ class SpaceHierarchyTest : InstrumentedTest {
                 Triple("A2", true, true)
         ))
 
-        val spaceBInfo = createPublicSpace(session, "SpaceB", listOf(
+        /* val spaceBInfo = */ createPublicSpace(session, "SpaceB", listOf(
                 Triple("B1", true /*auto-join*/, true/*canonical*/),
                 Triple("B2", true, true),
                 Triple("B3", true, true)
@@ -254,6 +256,7 @@ class SpaceHierarchyTest : InstrumentedTest {
     }
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun testBreakCycle() {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
@@ -301,6 +304,7 @@ class SpaceHierarchyTest : InstrumentedTest {
     }
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun testLiveFlatChildren() {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
@@ -389,6 +393,7 @@ class SpaceHierarchyTest : InstrumentedTest {
             val roomIds: List<String>
     )
 
+    @Suppress("EXPERIMENTAL_API_USAGE")
     private fun createPublicSpace(session: Session,
                                   spaceName: String,
                                   childInfo: List<Triple<String, Boolean, Boolean?>>
@@ -433,7 +438,7 @@ class SpaceHierarchyTest : InstrumentedTest {
     fun testRootSpaces() {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
-        val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+        /* val spaceAInfo = */ createPublicSpace(session, "SpaceA", listOf(
                 Triple("A1", true /*auto-join*/, true/*canonical*/),
                 Triple("A2", true, true)
         ))
diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml
index 220a168f60..de0731422c 100644
--- a/matrix-sdk-android/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android/src/main/AndroidManifest.xml
@@ -10,15 +10,6 @@
 
     <application android:networkSecurityConfig="@xml/network_security_config">
 
-        <!--
-        This is mandatory to run integration tests
-        -->
-        <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
-            android:exported="false"
-            tools:node="remove" />
-
         <!--
          The SDK offers a secured File provider to access downloaded files.
          Access to these file will be given via the FileService, with a temporary
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
index 0ba61e5890..3149a0218b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
@@ -29,7 +29,9 @@ fun Throwable.is401() =
 
 fun Throwable.isTokenError() =
         this is Failure.ServerError
-                && (error.code == MatrixError.M_UNKNOWN_TOKEN || error.code == MatrixError.M_MISSING_TOKEN)
+                && (error.code == MatrixError.M_UNKNOWN_TOKEN
+                || error.code == MatrixError.M_MISSING_TOKEN
+                || error.code == MatrixError.ORG_MATRIX_EXPIRED_ACCOUNT)
 
 fun Throwable.shouldBeRetried(): Boolean {
     return this is Failure.NetworkConnection
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
index ef770ea1d2..50c84da02b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
@@ -23,4 +23,5 @@ sealed class GlobalError {
     data class InvalidToken(val softLogout: Boolean) : GlobalError()
     data class ConsentNotGivenError(val consentUri: String) : GlobalError()
     data class CertificateError(val fingerprint: Fingerprint) : GlobalError()
+    object ExpiredAccount : GlobalError()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
index 73b0fe0a7c..1bc8636103 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
@@ -182,6 +182,24 @@ data class MatrixError(
         /** (Not documented yet) */
         const val M_WEAK_PASSWORD = "M_WEAK_PASSWORD"
 
+        /** The provided password's length is shorter than the minimum length required by the server. */
+        const val M_PASSWORD_TOO_SHORT = "M_PASSWORD_TOO_SHORT"
+
+        /** The password doesn't contain any digit but the server requires at least one. */
+        const val M_PASSWORD_NO_DIGIT = "M_PASSWORD_NO_DIGIT"
+
+        /** The password doesn't contain any uppercase letter but the server requires at least one. */
+        const val M_PASSWORD_NO_UPPERCASE = "M_PASSWORD_NO_UPPERCASE"
+
+        /** The password doesn't contain any lowercase letter but the server requires at least one. */
+        const val M_PASSWORD_NO_LOWERCASE = "M_PASSWORD_NO_LOWERCASE"
+
+        /** The password doesn't contain any symbol but the server requires at least one. */
+        const val M_PASSWORD_NO_SYMBOL = "M_PASSWORD_NO_SYMBOL"
+
+        /** The password was found in a dictionary, and is not acceptable. */
+        const val M_PASSWORD_IN_DICTIONARY = "M_PASSWORD_IN_DICTIONARY"
+
         const val M_TERMS_NOT_SIGNED = "M_TERMS_NOT_SIGNED"
 
         // For identity service
@@ -189,5 +207,12 @@ data class MatrixError(
 
         // Possible value for "limit_type"
         const val LIMIT_TYPE_MAU = "monthly_active_user"
+
+        /**
+         * The user account has expired. It has to be renewed by clicking on an email or by sending a renewal token.
+         *
+         * More documentation can be found in the dedicated Synapse plugin module repository: https://github.com/matrix-org/synapse-email-account-validity
+         */
+        const val ORG_MATRIX_EXPIRED_ACCOUNT = "ORG_MATRIX_EXPIRED_ACCOUNT"
     }
 }
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 4534368679..1d0acf38fa 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
@@ -15,6 +15,7 @@
  */
 package org.matrix.android.sdk.api.pushrules
 
+import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.api.pushrules.rest.RuleSet
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -39,7 +40,7 @@ interface PushRuleService {
 
     suspend fun updatePushRuleActions(kind: RuleKind, ruleId: String, enable: Boolean, actions: List<Action>?)
 
-    suspend fun removePushRule(kind: RuleKind, pushRule: PushRule)
+    suspend fun removePushRule(kind: RuleKind, ruleId: String)
 
     fun addPushRuleListener(listener: PushRuleListener)
 
@@ -56,4 +57,6 @@ interface PushRuleService {
         fun onEventRedacted(redactedEventId: String)
         fun batchFinish()
     }
+
+    fun getKeywords(): LiveData<Set<String>>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
index 4c01588b03..5b14e97d5e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
@@ -35,6 +35,11 @@ object RuleIds {
     // Default Content Rules
     const val RULE_ID_CONTAIN_USER_NAME = ".m.rule.contains_user_name"
 
+    // The keywords rule id is not a "real" id in that it does not exist server-side.
+    // It is used client-side as a placeholder for rendering the keyword push rule setting
+    // alongside the others. A similar approach and naming is used on Web and iOS.
+    const val RULE_ID_KEYWORDS = "_keywords"
+
     // Default Underride Rules
     const val RULE_ID_CALL = ".m.rule.call"
     const val RULE_ID_ONE_TO_ONE_ENCRYPTED_ROOM = ".m.rule.encrypted_room_one_to_one"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
index 54a1e896ae..b9d0c0ad2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
@@ -52,7 +52,7 @@ interface VerificationService {
                              transactionId: String?): String?
 
     /**
-     * Request a key verification from another user using toDevice events.
+     * Request key verification with another user via room events (instead of the to-device API)
      */
     fun requestKeyVerificationInDMs(methods: List<VerificationMethod>,
                                     otherUserId: String,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
index ae546b6cec..1485ec478b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
@@ -16,6 +16,8 @@
 
 package org.matrix.android.sdk.api.session.identity
 
+import org.matrix.android.sdk.internal.session.identity.model.SignInvitationResult
+
 /**
  * Provides access to the identity server configuration and services identity server can provide
  */
@@ -121,6 +123,18 @@ interface IdentityService {
      */
     suspend fun getShareStatus(threePids: List<ThreePid>): Map<ThreePid, SharedState>
 
+    /**
+     * When one performs a 3pid invite and the third party identifier is unknown, the home server
+     * will store the invitation in the Identity server and store some information in the room state membership event.
+     * The email invite will contains the token and secret that can be used to claim the stored invitation
+     *
+     * To aid clients who may not be able to perform crypto themselves,
+     * the identity server offers some crypto functionality to help in accepting invitations.
+     * This is less secure than the client doing it itself, but may be useful where this isn't possible.
+     */
+    suspend fun sign3pidInvitation(identiyServer: String, token: String, secret: String) : SignInvitationResult
+
     fun addListener(listener: IdentityServiceListener)
+
     fun removeListener(listener: IdentityServiceListener)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
index b3fbdcf1a2..85291cf0f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
@@ -17,6 +17,8 @@
 package org.matrix.android.sdk.api.session.permalinks
 
 import android.net.Uri
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * This sealed class represents all the permalink cases.
@@ -31,6 +33,25 @@ sealed class PermalinkData {
             val viaParameters: List<String>
     ) : PermalinkData()
 
+    /**
+     * &room_name=Team2
+        &room_avatar_url=mxc:
+         &inviter_name=bob
+     */
+    @Parcelize
+    data class RoomEmailInviteLink(
+        val roomId: String,
+        val email: String,
+        val signUrl: String,
+        val roomName: String?,
+        val roomAvatarUrl: String?,
+        val inviterName: String?,
+        val identityServer: String,
+        val token: String,
+        val privateKey: String,
+        val roomType: String?
+    ) : PermalinkData(), Parcelable
+
     data class UserLink(val userId: String) : PermalinkData()
 
     data class GroupLink(val groupId: String) : PermalinkData()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt
index 347a3bb531..005a2edae7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt
@@ -19,14 +19,18 @@ package org.matrix.android.sdk.api.session.permalinks
 import android.net.Uri
 import android.net.UrlQuerySanitizer
 import org.matrix.android.sdk.api.MatrixPatterns
+import timber.log.Timber
+import java.net.URLDecoder
 
 /**
- * This class turns an uri to a [PermalinkData]
+ * This class turns a uri to a [PermalinkData]
+ * element-based domains (e.g. https://app.element.io/#/user/@chagai95:matrix.org) permalinks
+ * or matrix.to permalinks (e.g. https://matrix.to/#/@chagai95:matrix.org)
  */
 object PermalinkParser {
 
     /**
-     * Turns an uri string to a [PermalinkData]
+     * Turns a uri string to a [PermalinkData]
      */
     fun parse(uriString: String): PermalinkData {
         val uri = Uri.parse(uriString)
@@ -34,13 +38,16 @@ object PermalinkParser {
     }
 
     /**
-     * Turns an uri to a [PermalinkData]
+     * Turns a uri to a [PermalinkData]
+     * https://github.com/matrix-org/matrix-doc/blob/master/proposals/1704-matrix.to-permalinks.md
      */
     fun parse(uri: Uri): PermalinkData {
         if (!uri.toString().startsWith(PermalinkService.MATRIX_TO_URL_BASE)) {
             return PermalinkData.FallbackLink(uri)
         }
-        val fragment = uri.fragment
+        // We can't use uri.fragment as it is decoding to early and it will break the parsing
+        // of parameters that represents url (like signurl)
+        val fragment = uri.toString().substringAfter("#") // uri.fragment
         if (fragment.isNullOrEmpty()) {
             return PermalinkData.FallbackLink(uri)
         }
@@ -51,21 +58,23 @@ object PermalinkParser {
         val params = safeFragment
                 .split(MatrixPatterns.SEP_REGEX)
                 .filter { it.isNotEmpty() }
+                .map { URLDecoder.decode(it, "UTF-8") }
                 .take(2)
 
-        val identifier = params.getOrNull(0)
+        // the element-based domain permalinks (e.g. https://app.element.io/#/user/@chagai95:matrix.org) don't have the
+        // mxid in the first param (like matrix.to does - https://matrix.to/#/@chagai95:matrix.org) but rather in the second after /user/ so /user/mxid
+        var identifier = params.getOrNull(0)
+        if (identifier.equals("user")) {
+            identifier = params.getOrNull(1)
+        }
+
         val extraParameter = params.getOrNull(1)
         return when {
             identifier.isNullOrEmpty()             -> PermalinkData.FallbackLink(uri)
             MatrixPatterns.isUserId(identifier)    -> PermalinkData.UserLink(userId = identifier)
             MatrixPatterns.isGroupId(identifier)   -> PermalinkData.GroupLink(groupId = identifier)
             MatrixPatterns.isRoomId(identifier)    -> {
-                PermalinkData.RoomLink(
-                        roomIdOrAlias = identifier,
-                        isRoomAlias = false,
-                        eventId = extraParameter.takeIf { !it.isNullOrEmpty() && MatrixPatterns.isEventId(it) },
-                        viaParameters = viaQueryParameters
-                )
+                handleRoomIdCase(fragment, identifier, uri, extraParameter, viaQueryParameters)
             }
             MatrixPatterns.isRoomAlias(identifier) -> {
                 PermalinkData.RoomLink(
@@ -79,13 +88,59 @@ object PermalinkParser {
         }
     }
 
+    private fun handleRoomIdCase(fragment: String, identifier: String, uri: Uri, extraParameter: String?, viaQueryParameters: List<String>): PermalinkData {
+        // Can't rely on built in parsing because it's messing around the signurl
+        val paramList = safeExtractParams(fragment)
+        val signUrl = paramList.firstOrNull { it.first == "signurl" }?.second
+        val email = paramList.firstOrNull { it.first == "email" }?.second
+        return if (signUrl.isNullOrEmpty().not() && email.isNullOrEmpty().not()) {
+            try {
+                val signValidUri = Uri.parse(signUrl)
+                val identityServerHost = signValidUri.authority ?: throw IllegalArgumentException()
+                val token = signValidUri.getQueryParameter("token") ?: throw IllegalArgumentException()
+                val privateKey = signValidUri.getQueryParameter("private_key") ?: throw IllegalArgumentException()
+                PermalinkData.RoomEmailInviteLink(
+                        roomId = identifier,
+                        email = email!!,
+                        signUrl = signUrl!!,
+                        roomName = paramList.firstOrNull { it.first == "room_name" }?.second,
+                        inviterName = paramList.firstOrNull { it.first == "inviter_name" }?.second,
+                        roomAvatarUrl = paramList.firstOrNull { it.first == "room_avatar_url" }?.second,
+                        roomType = paramList.firstOrNull { it.first == "room_type" }?.second,
+                        identityServer = identityServerHost,
+                        token = token,
+                        privateKey = privateKey
+                )
+            } catch (failure: Throwable) {
+                Timber.i("## Permalink: Failed to parse permalink $signUrl")
+                PermalinkData.FallbackLink(uri)
+            }
+        } else {
+            PermalinkData.RoomLink(
+                    roomIdOrAlias = identifier,
+                    isRoomAlias = false,
+                    eventId = extraParameter.takeIf { !it.isNullOrEmpty() && MatrixPatterns.isEventId(it) },
+                    viaParameters = viaQueryParameters
+            )
+        }
+    }
+
+    private fun safeExtractParams(fragment: String) = fragment.substringAfter("?").split('&').mapNotNull {
+        val splitNameValue = it.split("=")
+        if (splitNameValue.size == 2) {
+            Pair(splitNameValue[0], URLDecoder.decode(splitNameValue[1], "UTF-8"))
+        } else null
+    }
+
     private fun String.getViaParameters(): List<String> {
         return UrlQuerySanitizer(this)
                 .parameterList
                 .filter {
                     it.mParameter == "via"
                 }.map {
-                    it.mValue
+                    it.mValue.let {
+                        URLDecoder.decode(it, "UTF-8")
+                    }
                 }
     }
 }
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 b7377df1b3..5d26b21349 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
@@ -27,6 +27,7 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.session.identity.model.SignInvitationResult
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 
 /**
@@ -63,6 +64,18 @@ interface RoomService {
                          reason: String? = null,
                          viaServers: List<String> = emptyList())
 
+    /**
+     * @param roomId the roomId of the room to join
+     * @param reason optional reason for joining the room
+     * @param thirdPartySigned A signature of an m.third_party_invite token to prove that this user owns a third party identity
+     * which has been invited to the room.
+     */
+    suspend fun joinRoom(
+            roomId: String,
+            reason: String? = null,
+            thirdPartySigned: SignInvitationResult
+    )
+
     /**
      * 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/RoomSortOrder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt
index 36da242527..e721abd6a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt
@@ -19,5 +19,6 @@ package org.matrix.android.sdk.api.session.room
 enum class RoomSortOrder {
     NAME,
     ACTIVITY,
+    PRIORITY_AND_ACTIVITY,
     NONE
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesAllowEntry.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesAllowEntry.kt
index 7b87bc34d2..16298b8ba9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesAllowEntry.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesAllowEntry.kt
@@ -23,11 +23,15 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class RoomJoinRulesAllowEntry(
         /**
-         * space: The room ID of the space to check the membership of.
+         * The room ID to check the membership of.
          */
-        @Json(name = "space") val spaceID: String,
+        @Json(name = "room_id") val roomId: String?,
         /**
-         * via: A list of servers which may be used to peek for membership of the space.
+         * "m.room_membership" to describe that we are allowing access via room membership. Future MSCs may define other types.
          */
-        @Json(name = "via") val via: List<String>
-)
+        @Json(name = "type") val type: String?
+) {
+    companion object {
+        fun restrictedToRoom(roomId: String) = RoomJoinRulesAllowEntry(roomId, "m.room_membership")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
index 33f402cad3..871b299f93 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
@@ -29,7 +29,9 @@ import timber.log.Timber
 data class RoomJoinRulesContent(
         @Json(name = "join_rule") val _joinRules: String? = null,
         /**
-         * If the allow key is an empty list (or not a list at all), then the room reverts to standard public join rules
+         * If the allow key is an empty list (or not a list at all),
+         * then no users are allowed to join without an invite.
+         * Each entry is expected to be an object with the following keys:
          */
         @Json(name = "allow") val allowList: List<RoomJoinRulesAllowEntry>? = null
 ) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
index 8cd2a0538d..7d3109fb6e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
@@ -27,7 +27,7 @@ data class SpaceChildInfo(
         val avatarUrl: String?,
         val order: String?,
         val activeMemberCount: Int?,
-        val autoJoin: Boolean,
+//        val autoJoin: Boolean,
         val viaServers: List<String>,
         val parentRoomId: String?,
         val suggested: Boolean?,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioWaveformInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioWaveformInfo.kt
index d576f1057a..aa05eb7189 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioWaveformInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioWaveformInfo.kt
@@ -32,5 +32,5 @@ data class AudioWaveformInfo(
          * List of integers between zero and 1024, inclusive.
          */
         @Json(name = "waveform")
-        val waveform: List<Int>? = null
+        val waveform: List<Int?>? = 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 3bae6126e0..207050be7d 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
@@ -36,7 +36,7 @@ interface Space {
     suspend fun addChildren(roomId: String,
                             viaServers: List<String>?,
                             order: String?,
-                            autoJoin: Boolean = false,
+//                            autoJoin: Boolean = false,
                             suggested: Boolean? = false)
 
     fun getChildInfo(roomId: String): SpaceChildContent?
@@ -46,8 +46,8 @@ interface Space {
     @Throws
     suspend fun setChildrenOrder(roomId: String, order: String?)
 
-    @Throws
-    suspend fun setChildrenAutoJoin(roomId: String, autoJoin: Boolean)
+//    @Throws
+//    suspend fun setChildrenAutoJoin(roomId: String, autoJoin: Boolean)
 
     @Throws
     suspend fun setChildrenSuggested(roomId: String, suggested: Boolean)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchyData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchyData.kt
new file mode 100644
index 0000000000..ecc3eb5224
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceHierarchyData.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.space
+
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+
+data class SpaceHierarchyData(
+        val rootSummary: RoomSummary,
+        val children: List<SpaceChildInfo>,
+        val childrenState: List<Event>,
+        val nextToken: String? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index e5288e4045..bcc36b579a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -18,9 +18,9 @@ package org.matrix.android.sdk.api.session.space
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
+import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
 
 typealias SpaceSummaryQueryParams = RoomSummaryQueryParams
@@ -58,10 +58,17 @@ interface SpaceService {
 
     /**
      * Get's information of a space by querying the server
+     * @param suggestedOnly If true, return only child events and rooms where the m.space.child event has suggested: true.
+     * @param limit a client-defined limit to the maximum number of rooms to return per page. Must be a non-negative integer.
+     * @param from: Optional. Pagination token given to retrieve the next set of rooms. Note that if a pagination token is provided,
+     * then the parameters given for suggested_only and max_depth must be the same.
      */
     suspend fun querySpaceChildren(spaceId: String,
                                    suggestedOnly: Boolean? = null,
-                                   autoJoinedOnly: Boolean? = null): Pair<RoomSummary, List<SpaceChildInfo>>
+                                   limit: Int? = null,
+                                   from: String? = null,
+                                   // when paginating, pass back the m.space.child state events
+                                   knownStateList: List<Event>? = null): SpaceHierarchyData
 
     /**
      * Get a live list of space summaries. This list is refreshed as soon as the data changes.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
index 0c33cfa1e6..b55f90cef0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
@@ -40,12 +40,12 @@ data class SpaceChildContent(
          * or consist of more than 50 characters, are forbidden and should be ignored if received.)
          */
         @Json(name = "order") val order: String? = null,
-        /**
-         * The auto_join flag on a child listing allows a space admin to list the sub-spaces and rooms in that space which should
-         * be automatically joined by members of that space.
-         * (This is not a force-join, which are descoped for a future MSC; the user can subsequently part these room if they desire.)
-         */
-        @Json(name = "auto_join") val autoJoin: Boolean? = false,
+//        /**
+//         * The auto_join flag on a child listing allows a space admin to list the sub-spaces and rooms in that space which should
+//         * be automatically joined by members of that space.
+//         * (This is not a force-join, which are descoped for a future MSC; the user can subsequently part these room if they desire.)
+//         */
+//        @Json(name = "auto_join") val autoJoin: Boolean? = false,
 
         /**
          * If `suggested` is set to `true`, that indicates that the child should be advertised to
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
index 7e92ff3e88..0ec020bc46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
@@ -23,12 +23,12 @@ import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.failure.shouldBeRetried
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.LocalEcho
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.internal.crypto.model.rest.ShareRequestCancellation
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.createUniqueTxnId
 import org.matrix.android.sdk.internal.session.SessionComponent
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
@@ -43,6 +43,9 @@ internal class CancelGossipRequestWorker(context: Context,
             override val sessionId: String,
             val requestId: String,
             val recipients: Map<String, List<String>>,
+            // The txnId for the sendToDevice request. Nullable for compatibility reasons, but MUST always be provided
+            // to use the same value if this worker is retried.
+            val txnId: String? = null,
             override val lastFailureMessage: String? = null
     ) : SessionWorkerParams {
         companion object {
@@ -51,6 +54,7 @@ internal class CancelGossipRequestWorker(context: Context,
                         sessionId = sessionId,
                         requestId = request.requestId,
                         recipients = request.recipients,
+                        txnId = createUniqueTxnId(),
                         lastFailureMessage = null
                 )
             }
@@ -66,7 +70,10 @@ internal class CancelGossipRequestWorker(context: Context,
     }
 
     override suspend fun doSafeWork(params: Params): Result {
-        val localId = LocalEcho.createLocalEchoId()
+        // params.txnId should be provided in all cases now. But Params can be deserialized by
+        // the WorkManager from data serialized in a previous version of the application, so without the txnId field.
+        // So if not present, we create a txnId
+        val txnId = params.txnId ?: createUniqueTxnId()
         val contentMap = MXUsersDevicesMap<Any>()
         val toDeviceContent = ShareRequestCancellation(
                 requestingDeviceId = credentials.deviceId,
@@ -92,7 +99,7 @@ internal class CancelGossipRequestWorker(context: Context,
                     SendToDeviceTask.Params(
                             eventType = EventType.ROOM_KEY_REQUEST,
                             contentMap = contentMap,
-                            transactionId = localId
+                            transactionId = txnId
                     )
             )
             cryptoStore.updateOutgoingGossipingRequestState(params.requestId, OutgoingGossipingRequestState.CANCELLED)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
index 4a0a274f4f..e8640d5011 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.internal.crypto.model.rest.GossipingDefaultContent
 import org.matrix.android.sdk.internal.crypto.model.rest.GossipingToDeviceObject
 import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.crypto.tasks.createUniqueTxnId
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
@@ -356,7 +357,8 @@ internal class IncomingGossipingRequestManager @Inject constructor(
                         secretValue = secretValue,
                         requestUserId = request.userId,
                         requestDeviceId = request.deviceId,
-                        requestId = request.requestId
+                        requestId = request.requestId,
+                        txnId = createUniqueTxnId()
                 )
 
                 cryptoStore.updateGossipingRequestState(request, GossipingRequestState.ACCEPTING)
@@ -376,13 +378,13 @@ internal class IncomingGossipingRequestManager @Inject constructor(
         }
 
         request.share = { secretValue ->
-
             val params = SendGossipWorker.Params(
                     sessionId = userId,
                     secretValue = secretValue,
                     requestUserId = request.userId,
                     requestDeviceId = request.deviceId,
-                    requestId = request.requestId
+                    requestId = request.requestId,
+                    txnId = createUniqueTxnId()
             )
 
             cryptoStore.updateGossipingRequestState(request, GossipingRequestState.ACCEPTING)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
index c86f2be0a3..ccdb5ab137 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.crypto
 
-import org.matrix.android.sdk.api.session.events.model.LocalEcho
 import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyRequestBody
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.di.SessionId
@@ -26,6 +25,8 @@ import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.internal.crypto.tasks.createUniqueTxnId
+import org.matrix.android.sdk.internal.crypto.util.RequestIdHelper
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -131,7 +132,8 @@ internal class OutgoingGossipingRequestManager @Inject constructor(
         val params = SendGossipRequestWorker.Params(
                 sessionId = sessionId,
                 keyShareRequest = request as? OutgoingRoomKeyRequest,
-                secretShareRequest = request as? OutgoingSecretRequest
+                secretShareRequest = request as? OutgoingSecretRequest,
+                txnId = createUniqueTxnId()
         )
         cryptoStore.updateOutgoingGossipingRequestState(request.requestId, OutgoingGossipingRequestState.SENDING)
         val workRequest = gossipingWorkManager.createWork<SendGossipRequestWorker>(WorkerParamsFactory.toData(params), true)
@@ -154,7 +156,8 @@ internal class OutgoingGossipingRequestManager @Inject constructor(
         if (resend) {
             val reSendParams = SendGossipRequestWorker.Params(
                     sessionId = sessionId,
-                    keyShareRequest = request.copy(requestId = LocalEcho.createLocalEchoId())
+                    keyShareRequest = request.copy(requestId = RequestIdHelper.createUniqueRequestId()),
+                    txnId = createUniqueTxnId()
             )
             val reSendWorkRequest = gossipingWorkManager.createWork<SendGossipRequestWorker>(WorkerParamsFactory.toData(reSendParams), true)
             gossipingWorkManager.postWork(reSendWorkRequest)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
index e8d567b944..2e26720abb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
@@ -23,7 +23,6 @@ import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.failure.shouldBeRetried
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.LocalEcho
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.internal.crypto.model.rest.GossipingToDeviceObject
@@ -31,6 +30,7 @@ import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyShareRequest
 import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.createUniqueTxnId
 import org.matrix.android.sdk.internal.session.SessionComponent
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
@@ -46,6 +46,9 @@ internal class SendGossipRequestWorker(context: Context,
             override val sessionId: String,
             val keyShareRequest: OutgoingRoomKeyRequest? = null,
             val secretShareRequest: OutgoingSecretRequest? = null,
+            // The txnId for the sendToDevice request. Nullable for compatibility reasons, but MUST always be provided
+            // to use the same value if this worker is retried.
+            val txnId: String? = null,
             override val lastFailureMessage: String? = null
     ) : SessionWorkerParams
 
@@ -58,7 +61,10 @@ internal class SendGossipRequestWorker(context: Context,
     }
 
     override suspend fun doSafeWork(params: Params): Result {
-        val localId = LocalEcho.createLocalEchoId()
+        // params.txnId should be provided in all cases now. But Params can be deserialized by
+        // the WorkManager from data serialized in a previous version of the application, so without the txnId field.
+        // So if not present, we create a txnId
+        val txnId = params.txnId ?: createUniqueTxnId()
         val contentMap = MXUsersDevicesMap<Any>()
         val eventType: String
         val requestId: String
@@ -122,7 +128,7 @@ internal class SendGossipRequestWorker(context: Context,
                     SendToDeviceTask.Params(
                             eventType = eventType,
                             contentMap = contentMap,
-                            transactionId = localId
+                            transactionId = txnId
                     )
             )
             cryptoStore.updateOutgoingGossipingRequestState(requestId, OutgoingGossipingRequestState.SENT)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
index 8c68057056..c5c6d26f79 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
@@ -23,7 +23,6 @@ import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.failure.shouldBeRetried
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.LocalEcho
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
 import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
@@ -31,6 +30,7 @@ import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.internal.crypto.model.event.SecretSendEventContent
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.crypto.tasks.createUniqueTxnId
 import org.matrix.android.sdk.internal.session.SessionComponent
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
@@ -48,6 +48,9 @@ internal class SendGossipWorker(context: Context,
             val requestUserId: String?,
             val requestDeviceId: String?,
             val requestId: String?,
+            // The txnId for the sendToDevice request. Nullable for compatibility reasons, but MUST always be provided
+            // to use the same value if this worker is retried.
+            val txnId: String? = null,
             override val lastFailureMessage: String? = null
     ) : SessionWorkerParams
 
@@ -62,7 +65,10 @@ internal class SendGossipWorker(context: Context,
     }
 
     override suspend fun doSafeWork(params: Params): Result {
-        val localId = LocalEcho.createLocalEchoId()
+        // params.txnId should be provided in all cases now. But Params can be deserialized by
+        // the WorkManager from data serialized in a previous version of the application, so without the txnId field.
+        // So if not present, we create a txnId
+        val txnId = params.txnId ?: createUniqueTxnId()
         val eventType: String = EventType.SEND_SECRET
 
         val toDeviceContent = SecretSendEventContent(
@@ -127,7 +133,7 @@ internal class SendGossipWorker(context: Context,
                     SendToDeviceTask.Params(
                             eventType = EventType.ENCRYPTED,
                             contentMap = sendToDeviceMap,
-                            transactionId = localId
+                            transactionId = txnId
                     )
             )
             cryptoStore.updateGossipingRequestState(
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 d997998836..3c8353e83e 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
@@ -27,7 +27,6 @@ import io.realm.Sort
 import io.realm.kotlin.where
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.events.model.LocalEcho
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
@@ -88,6 +87,7 @@ import org.matrix.android.sdk.internal.crypto.store.db.query.delete
 import org.matrix.android.sdk.internal.crypto.store.db.query.get
 import org.matrix.android.sdk.internal.crypto.store.db.query.getById
 import org.matrix.android.sdk.internal.crypto.store.db.query.getOrCreate
+import org.matrix.android.sdk.internal.crypto.util.RequestIdHelper
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.tools.RealmDebugTools
 import org.matrix.android.sdk.internal.di.CryptoDatabase
@@ -1121,7 +1121,7 @@ internal class RealmCryptoStore @Inject constructor(
 
             if (existing == null) {
                 request = realm.createObject(OutgoingGossipingRequestEntity::class.java).apply {
-                    this.requestId = LocalEcho.createLocalEchoId()
+                    this.requestId = RequestIdHelper.createUniqueRequestId()
                     this.setRecipients(recipients)
                     this.requestState = OutgoingGossipingRequestState.UNSENT
                     this.type = GossipRequestType.KEY
@@ -1151,7 +1151,7 @@ internal class RealmCryptoStore @Inject constructor(
                     this.type = GossipRequestType.SECRET
                     setRecipients(recipients)
                     this.requestState = OutgoingGossipingRequestState.UNSENT
-                    this.requestId = LocalEcho.createLocalEchoId()
+                    this.requestId = RequestIdHelper.createUniqueRequestId()
                     this.requestedInfoStr = secretName
                 }.toOutgoingGossipingRequest() as? OutgoingSecretRequest
             } else {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
index 41a5118be0..c6af9b0cd1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
@@ -22,8 +22,8 @@ import org.matrix.android.sdk.internal.crypto.model.rest.SendToDeviceBody
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
+import java.util.UUID
 import javax.inject.Inject
-import kotlin.random.Random
 
 internal interface SendToDeviceTask : Task<SendToDeviceTask.Params, Unit> {
     data class Params(
@@ -31,7 +31,7 @@ internal interface SendToDeviceTask : Task<SendToDeviceTask.Params, Unit> {
             val eventType: String,
             // the content to send. Map from user_id to device_id to content dictionary.
             val contentMap: MXUsersDevicesMap<Any>,
-            // the transactionId
+            // the transactionId. If not provided, a transactionId will be created by the task
             val transactionId: String? = null
     )
 }
@@ -46,16 +46,23 @@ internal class DefaultSendToDeviceTask @Inject constructor(
                 messages = params.contentMap.map
         )
 
+        // If params.transactionId is not provided, we create a unique txnId.
+        // It's important to do that outside the requestBlock parameter of executeRequest()
+        // to use the same value if the request is retried
+        val txnId = params.transactionId ?: createUniqueTxnId()
+
         return executeRequest(
                 globalErrorReceiver,
                 canRetry = true,
                 maxRetriesCount = 3
         ) {
             cryptoApi.sendToDevice(
-                    params.eventType,
-                    params.transactionId ?: Random.nextInt(Integer.MAX_VALUE).toString(),
-                    sendToDeviceBody
+                    eventType = params.eventType,
+                    transactionId = txnId,
+                    body = sendToDeviceBody
             )
         }
     }
 }
+
+internal fun createUniqueTxnId() = UUID.randomUUID().toString()
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/util/RequestIdHelper.kt
similarity index 70%
rename from vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/util/RequestIdHelper.kt
index ed63f723c8..3106d5820c 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetProperties.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/util/RequestIdHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.call.conference
+package org.matrix.android.sdk.internal.crypto.util
 
-data class JitsiWidgetProperties(
-        val domain: String,
-        val confId: String?,
-        val displayName: String?,
-        val avatarUrl: String?
-)
+import java.util.UUID
+
+internal object RequestIdHelper {
+    fun createUniqueRequestId() = UUID.randomUUID().toString()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
index 88aa432fb3..758c7aa5b9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
@@ -17,6 +17,9 @@
 package org.matrix.android.sdk.internal.database
 
 import com.zhuinden.monarchy.Monarchy
+import io.realm.RealmConfiguration
+import io.realm.RealmResults
+import kotlinx.coroutines.launch
 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.model.EventInsertEntity
@@ -24,20 +27,15 @@ import org.matrix.android.sdk.internal.database.model.EventInsertEntityFields
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
-import io.realm.RealmConfiguration
-import io.realm.RealmResults
-import kotlinx.coroutines.launch
-import org.matrix.android.sdk.internal.crypto.EventDecryptor
 import timber.log.Timber
 import javax.inject.Inject
 
 internal class EventInsertLiveObserver @Inject constructor(@SessionDatabase realmConfiguration: RealmConfiguration,
-                                                           private val processors: Set<@JvmSuppressWildcards EventInsertLiveProcessor>,
-                                                           private val eventDecryptor: EventDecryptor)
+                                                           private val processors: Set<@JvmSuppressWildcards EventInsertLiveProcessor>)
     : RealmLiveEntityObserver<EventInsertEntity>(realmConfiguration) {
 
-    override val query = Monarchy.Query<EventInsertEntity> {
-        it.where(EventInsertEntity::class.java)
+    override val query = Monarchy.Query {
+        it.where(EventInsertEntity::class.java).equalTo(EventInsertEntityFields.CAN_BE_PROCESSED, true)
     }
 
     override fun onChange(results: RealmResults<EventInsertEntity>) {
@@ -86,23 +84,6 @@ internal class EventInsertLiveObserver @Inject constructor(@SessionDatabase real
         }
     }
 
-//    private fun decryptIfNeeded(event: Event) {
-//        if (event.isEncrypted() && event.mxDecryptionResult == null) {
-//            try {
-//                val result = eventDecryptor.decryptEvent(event, event.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) {
-//                Timber.v("Failed to decrypt event")
-//                // TODO -> we should keep track of this and retry, or some processing will never be handled
-//            }
-//        }
-//    }
-
     private fun shouldProcess(eventInsertEntity: EventInsertEntity): Boolean {
         return processors.any {
             it.shouldProcess(eventInsertEntity.eventId, eventInsertEntity.eventType, eventInsertEntity.insertType)
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 28ae4d8bfd..aa96ca5e1a 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
@@ -29,6 +29,7 @@ import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFie
 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
@@ -46,7 +47,7 @@ import timber.log.Timber
 
 internal object RealmSessionStoreMigration : RealmMigration {
 
-    const val SESSION_STORE_SCHEMA_VERSION = 16L
+    const val SESSION_STORE_SCHEMA_VERSION = 17L
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
         Timber.v("Migrating Realm Session from $oldVersion to $newVersion")
@@ -67,6 +68,7 @@ internal object RealmSessionStoreMigration : RealmMigration {
         if (oldVersion <= 13) migrateTo14(realm)
         if (oldVersion <= 14) migrateTo15(realm)
         if (oldVersion <= 15) migrateTo16(realm)
+        if (oldVersion <= 16) migrateTo17(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -330,4 +332,10 @@ internal object RealmSessionStoreMigration : RealmMigration {
                     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)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index c32c019625..0cf431c340 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -88,7 +88,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                             avatarUrl = it.childSummaryEntity?.avatarUrl,
                             activeMemberCount = it.childSummaryEntity?.joinedMembersCount,
                             order = it.order,
-                            autoJoin = it.autoJoin ?: false,
+//                            autoJoin = it.autoJoin ?: false,
                             viaServers = it.viaServers.toList(),
                             parentRoomId = roomSummaryEntity.roomId,
                             suggested = it.suggested,
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 c9edbcd889..4dc8712afb 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
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import io.realm.RealmObject
 import io.realm.annotations.Index
+import org.matrix.android.sdk.internal.extensions.assertIsManaged
 
 internal open class EventEntity(@Index var eventId: String = "",
                                 @Index var roomId: String = "",
@@ -56,15 +57,22 @@ internal open class EventEntity(@Index var eventId: String = "",
     companion object
 
     fun setDecryptionResult(result: MXEventDecryptionResult) {
+        assertIsManaged()
         val decryptionResult = OlmDecryptionResult(
                 payload = result.clearEvent,
                 senderKey = result.senderCurve25519Key,
                 keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
                 forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
         )
-        val adapter = MoshiProvider.providesMoshi().adapter<OlmDecryptionResult>(OlmDecryptionResult::class.java)
+        val adapter = MoshiProvider.providesMoshi().adapter(OlmDecryptionResult::class.java)
         decryptionResultJson = adapter.toJson(decryptionResult)
         decryptionErrorCode = null
         decryptionErrorReason = null
+
+        // If we have an EventInsertEntity for the eventId we make sures it can be processed now.
+        realm.where(EventInsertEntity::class.java)
+                .equalTo(EventInsertEntityFields.EVENT_ID, eventId)
+                .findFirst()
+                ?.canBeProcessed = true
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
index f4426207be..5cfd306d2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
@@ -23,7 +23,12 @@ import io.realm.RealmObject
  * in EventEntity table.
  */
 internal open class EventInsertEntity(var eventId: String = "",
-                                      var eventType: String = ""
+                                      var eventType: String = "",
+                                      /**
+                                       * This flag will be used to filter EventInsertEntity in EventInsertLiveObserver.
+                                       * Currently it's set to false when the event content is encrypted.
+                                       */
+                                      var canBeProcessed: Boolean = true
 ) : RealmObject() {
 
     private var insertTypeStr: String = EventInsertType.INCREMENTAL_SYNC.name
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 0bf62a19fe..57e24cf88f 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
@@ -24,6 +24,7 @@ import io.realm.Realm
 import io.realm.RealmList
 import io.realm.RealmQuery
 import io.realm.kotlin.where
+import org.matrix.android.sdk.api.session.events.model.EventType
 
 internal fun EventEntity.copyToRealmOrIgnore(realm: Realm, insertType: EventInsertType): EventEntity {
     val eventEntity = realm.where<EventEntity>()
@@ -31,7 +32,8 @@ internal fun EventEntity.copyToRealmOrIgnore(realm: Realm, insertType: EventInse
             .equalTo(EventEntityFields.ROOM_ID, roomId)
             .findFirst()
     return if (eventEntity == null) {
-        val insertEntity = EventInsertEntity(eventId = eventId, eventType = type).apply {
+        val canBeProcessed = type != EventType.ENCRYPTED || decryptionResultJson != null
+        val insertEntity = EventInsertEntity(eventId = eventId, eventType = type, canBeProcessed = canBeProcessed).apply {
             this.insertType = insertType
         }
         realm.insert(insertEntity)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
index 99c12255cd..361a306d4f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
@@ -30,6 +30,7 @@ internal object NetworkConstants {
     // Identity server
     const val URI_IDENTITY_PREFIX_PATH = "_matrix/identity/v2"
     const val URI_IDENTITY_PATH_V2 = "$URI_IDENTITY_PREFIX_PATH/"
+    const val URI_IDENTITY_PATH_V1 = "_matrix/identity/api/v1/"
 
     // Push Gateway
     const val URI_PUSH_GATEWAY_PREFIX_PATH = "_matrix/push/v1/"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
index 2116063626..8a03102527 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
@@ -19,13 +19,13 @@
 package org.matrix.android.sdk.internal.network
 
 import com.squareup.moshi.JsonEncodingException
+import kotlinx.coroutines.suspendCancellableCoroutine
+import okhttp3.ResponseBody
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.internal.di.MoshiProvider
-import kotlinx.coroutines.suspendCancellableCoroutine
-import okhttp3.ResponseBody
-import org.matrix.android.sdk.api.extensions.orFalse
 import retrofit2.HttpException
 import retrofit2.Response
 import timber.log.Timber
@@ -86,13 +86,18 @@ private fun toFailure(errorBody: ResponseBody?, httpCode: Int, globalErrorReceiv
         val matrixError = matrixErrorAdapter.fromJson(errorBodyStr)
 
         if (matrixError != null) {
-            if (matrixError.code == MatrixError.M_CONSENT_NOT_GIVEN && !matrixError.consentUri.isNullOrBlank()) {
-                // Also send this error to the globalErrorReceiver, for a global management
-                globalErrorReceiver?.handleGlobalError(GlobalError.ConsentNotGivenError(matrixError.consentUri))
-            } else if (httpCode == HttpURLConnection.HTTP_UNAUTHORIZED /* 401 */
-                    && matrixError.code == MatrixError.M_UNKNOWN_TOKEN) {
-                // Also send this error to the globalErrorReceiver, for a global management
-                globalErrorReceiver?.handleGlobalError(GlobalError.InvalidToken(matrixError.isSoftLogout.orFalse()))
+            // Also send following errors to the globalErrorReceiver, for a global management
+            when {
+                matrixError.code == MatrixError.M_CONSENT_NOT_GIVEN && !matrixError.consentUri.isNullOrBlank() -> {
+                    globalErrorReceiver?.handleGlobalError(GlobalError.ConsentNotGivenError(matrixError.consentUri))
+                }
+                httpCode == HttpURLConnection.HTTP_UNAUTHORIZED /* 401 */
+                        && matrixError.code == MatrixError.M_UNKNOWN_TOKEN                                     -> {
+                    globalErrorReceiver?.handleGlobalError(GlobalError.InvalidToken(matrixError.isSoftLogout.orFalse()))
+                }
+                matrixError.code == MatrixError.ORG_MATRIX_EXPIRED_ACCOUNT                                     -> {
+                    globalErrorReceiver?.handleGlobalError(GlobalError.ExpiredAccount)
+                }
             }
 
             return Failure.ServerError(matrixError, httpCode)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
index 7a06c2129c..7294ce4abf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
@@ -24,13 +24,21 @@ import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 
 internal fun RealmQuery<RoomSummaryEntity>.process(sortOrder: RoomSortOrder): RealmQuery<RoomSummaryEntity> {
     when (sortOrder) {
-        RoomSortOrder.NAME     -> {
+        RoomSortOrder.NAME                  -> {
             sort(RoomSummaryEntityFields.DISPLAY_NAME, Sort.ASCENDING)
         }
-        RoomSortOrder.ACTIVITY -> {
+        RoomSortOrder.ACTIVITY              -> {
             sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
         }
-        RoomSortOrder.NONE     -> {
+        RoomSortOrder.PRIORITY_AND_ACTIVITY -> {
+            sort(
+                    arrayOf(
+                            RoomSummaryEntityFields.IS_FAVOURITE,
+                            RoomSummaryEntityFields.IS_LOW_PRIORITY,
+                            RoomSummaryEntityFields.LAST_ACTIVITY_TIME),
+                    arrayOf(Sort.DESCENDING, Sort.ASCENDING, Sort.DESCENDING))
+        }
+        RoomSortOrder.NONE                  -> {
         }
     }
     return this
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 1fe4f9d90a..b36d05b6c0 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
@@ -84,7 +84,7 @@ internal data class RoomVersions(
          *      }
          * }
          */
-        @Json(name = "room_capabilities")
+        @Json(name = "org.matrix.msc3244.room_capabilities")
         val roomCapabilities: JsonDict? = null
 )
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
index 48870b86b7..fdb6caf53f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@@ -52,6 +52,7 @@ import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.session.identity.model.SignInvitationResult
 import timber.log.Timber
 import javax.inject.Inject
 import javax.net.ssl.HttpsURLConnection
@@ -79,6 +80,7 @@ internal class DefaultIdentityService @Inject constructor(
         private val identityApiProvider: IdentityApiProvider,
         private val accountDataDataSource: UserAccountDataDataSource,
         private val homeServerCapabilitiesService: HomeServerCapabilitiesService,
+        private val sign3pidInvitationTask: DefaultSign3pidInvitationTask,
         private val sessionParams: SessionParams
 ) : IdentityService, SessionLifecycleObserver {
 
@@ -290,6 +292,14 @@ internal class DefaultIdentityService @Inject constructor(
         return token.token
     }
 
+    override suspend fun sign3pidInvitation(identiyServer: String, token: String, secret: String): SignInvitationResult {
+        return sign3pidInvitationTask.execute(Sign3pidInvitationTask.Params(
+                url = identiyServer,
+                token = token,
+                privateKey = secret
+        ))
+    }
+
     override fun addListener(listener: IdentityServiceListener) {
         listeners.add(listener)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
index e9e4d17e3a..99bd740463 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
@@ -26,10 +26,12 @@ import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestOwn
 import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForEmailBody
 import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForMsisdnBody
 import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenResponse
+import org.matrix.android.sdk.internal.session.identity.model.SignInvitationResult
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
+import retrofit2.http.Query
 
 /**
  * Ref: https://matrix.org/docs/spec/identity_service/latest
@@ -95,4 +97,16 @@ internal interface IdentityAPI {
     @POST(NetworkConstants.URI_IDENTITY_PATH_V2 + "validate/{medium}/submitToken")
     suspend fun submitToken(@Path("medium") medium: String,
                             @Body body: IdentityRequestOwnershipParams): SuccessResult
+
+    /**
+     * https://matrix.org/docs/spec/identity_service/r0.3.0#post-matrix-identity-v2-sign-ed25519
+     *
+     * Have to rely on V1 for now
+     */
+    @POST(NetworkConstants.URI_IDENTITY_PATH_V1 + "sign-ed25519")
+    suspend fun signInvitationDetails(
+            @Query("token") token: String,
+            @Query("private_key") privateKey: String,
+            @Query("mxid") mxid: String
+    ): SignInvitationResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/Sign3pidInvitationTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/Sign3pidInvitationTask.kt
new file mode 100644
index 0000000000..d491af33ca
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/Sign3pidInvitationTask.kt
@@ -0,0 +1,49 @@
+/*
+ * 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.identity
+
+import dagger.Lazy
+import okhttp3.OkHttpClient
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.session.identity.model.SignInvitationResult
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface Sign3pidInvitationTask : Task<Sign3pidInvitationTask.Params, SignInvitationResult> {
+    data class Params(
+            val token: String,
+            val url: String,
+            val privateKey: String
+    )
+}
+
+internal class DefaultSign3pidInvitationTask @Inject constructor(
+        @Unauthenticated
+        private val okHttpClient: Lazy<OkHttpClient>,
+        private val retrofitFactory: RetrofitFactory,
+        @UserId private val userId: String
+) : Sign3pidInvitationTask {
+
+    override suspend fun execute(params: Sign3pidInvitationTask.Params): SignInvitationResult {
+        val identityAPI = retrofitFactory
+                .create(okHttpClient, "https://${params.url}")
+                .create(IdentityAPI::class.java)
+        return identityAPI.signInvitationDetails(params.token, params.privateKey, userId)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/SignInvitationBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/SignInvitationBody.kt
new file mode 100644
index 0000000000..6998257263
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/SignInvitationBody.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.identity.model
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class SignInvitationBody(
+        /**The Matrix user ID of the user accepting the invitation.*/
+        val mxid: String,
+        /**The token from the call to store- invite..*/
+        val token: String,
+        /** The private key, encoded as Unpadded base64. */
+        val private_key: String
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/SignInvitationResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/SignInvitationResult.kt
new file mode 100644
index 0000000000..27a3f3209f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/SignInvitationResult.kt
@@ -0,0 +1,31 @@
+/*
+ * 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.identity.model
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class SignInvitationResult(
+        /** The Matrix user ID of the user accepting the invitation.*/
+        val mxid: String,
+        /** The Matrix user ID of the user who sent the invitation.*/
+        val sender: String,
+        /**The token from the call to store- invite..*/
+        val signatures: Map<String, *>,
+        /** The token for the invitation */
+        val token: String
+)
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 4e8abcf784..65974151c8 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
@@ -15,6 +15,8 @@
  */
 package org.matrix.android.sdk.internal.session.notification
 
+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.PushRuleService
@@ -26,6 +28,7 @@ import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.api.pushrules.rest.RuleSet
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
+import org.matrix.android.sdk.internal.database.model.PushRuleEntity
 import org.matrix.android.sdk.internal.database.model.PushRulesEntity
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
@@ -117,8 +120,8 @@ internal class DefaultPushRuleService @Inject constructor(
         updatePushRuleActionsTask.execute(UpdatePushRuleActionsTask.Params(kind, ruleId, enable, actions))
     }
 
-    override suspend fun removePushRule(kind: RuleKind, pushRule: PushRule) {
-        removePushRuleTask.execute(RemovePushRuleTask.Params(kind, pushRule))
+    override suspend fun removePushRule(kind: RuleKind, ruleId: String) {
+        removePushRuleTask.execute(RemovePushRuleTask.Params(kind, ruleId))
     }
 
     override fun removePushRuleListener(listener: PushRuleService.PushRuleListener) {
@@ -211,4 +214,19 @@ internal class DefaultPushRuleService @Inject constructor(
             }
         }
     }
+
+    override fun getKeywords(): LiveData<Set<String>> {
+        // Keywords are all content rules that don't start with '.'
+        val liveData = monarchy.findAllMappedWithChanges(
+                { realm ->
+                    PushRulesEntity.where(realm, RuleScope.GLOBAL, RuleSetKey.CONTENT)
+                },
+                { result ->
+                    result.pushRules.map(PushRuleEntity::ruleId).filter { !it.startsWith(".") }
+                }
+        )
+        return Transformations.map(liveData) { results ->
+            results.firstOrNull().orEmpty().toSet()
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
index 21f55bbc42..dff82cb42e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
@@ -78,6 +78,10 @@ internal class ViaParameterFinder @Inject constructor(
                 .toSet()
     }
 
+    // not used much for now but as per MSC1772
+    // the via parameter of m.space.child must contain a via key which gives a list of candidate servers that can be used to join the room.
+    // It is possible for the list of candidate servers and the list of authorised servers to diverge.
+    // It may not be possible for a user to join a room if there's no overlap between these
     fun computeViaParamsForRestricted(roomId: String, max: Int): List<String> {
         val userThatCanInvite = roomGetterProvider.get().getRoom(roomId)
                 ?.getRoomMembers(roomMemberQueryParams { memberships = listOf(Membership.JOIN) })
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/EnabledBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/EnabledBody.kt
new file mode 100644
index 0000000000..5d620ee7aa
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/EnabledBody.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.internal.session.pushers
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class EnabledBody(
+        @Json(name = "enabled")
+        val enabled: Boolean
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt
index d8f0ce12d5..4fed4302c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt
@@ -19,7 +19,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-internal class GetPushersResponse(
+internal data class GetPushersResponse(
         @Json(name = "pushers")
         val pushers: List<JsonPusher>? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
index daf9397ce8..994b4860c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
@@ -41,7 +41,7 @@ internal interface PushRulesApi {
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}/enabled")
     suspend fun updateEnableRuleStatus(@Path("kind") kind: String,
                                        @Path("ruleId") ruleId: String,
-                                       @Body enable: Boolean?)
+                                       @Body enabledBody: EnabledBody)
 
     /**
      * Update the ruleID action
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
index 23d0515f41..bae893608b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
@@ -16,7 +16,6 @@
 package org.matrix.android.sdk.internal.session.pushers
 
 import org.matrix.android.sdk.api.pushrules.RuleKind
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
@@ -25,7 +24,7 @@ import javax.inject.Inject
 internal interface RemovePushRuleTask : Task<RemovePushRuleTask.Params, Unit> {
     data class Params(
             val kind: RuleKind,
-            val pushRule: PushRule
+            val ruleId: String
     )
 }
 
@@ -36,7 +35,7 @@ internal class DefaultRemovePushRuleTask @Inject constructor(
 
     override suspend fun execute(params: RemovePushRuleTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            pushRulesApi.deleteRule(params.kind.value, params.pushRule.ruleId)
+            pushRulesApi.deleteRule(params.kind.value, params.ruleId)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
index b8dbabd09e..33589dc55b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
@@ -39,7 +39,11 @@ internal class DefaultUpdatePushRuleActionsTask @Inject constructor(
 
     override suspend fun execute(params: UpdatePushRuleActionsTask.Params) {
             executeRequest(globalErrorReceiver) {
-                pushRulesApi.updateEnableRuleStatus(params.kind.value, params.ruleId, enable = params.enable)
+                pushRulesApi.updateEnableRuleStatus(
+                        params.kind.value,
+                        params.ruleId,
+                        EnabledBody(params.enable)
+                )
             }
             if (params.actions != null) {
                 val body = mapOf("actions" to params.actions.toJson())
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
index 9d7a46bede..3fe1614678 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
@@ -35,7 +35,11 @@ internal class DefaultUpdatePushRuleEnableStatusTask @Inject constructor(
 
     override suspend fun execute(params: UpdatePushRuleEnableStatusTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            pushRulesApi.updateEnableRuleStatus(params.kind.value, params.pushRule.ruleId, params.enabled)
+            pushRulesApi.updateEnableRuleStatus(
+                    params.kind.value,
+                    params.pushRule.ruleId,
+                    EnabledBody(params.enabled)
+            )
         }
     }
 }
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 632ea4c450..f69949cbb6 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
@@ -38,6 +38,7 @@ import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.identity.model.SignInvitationResult
 import org.matrix.android.sdk.internal.session.room.alias.DeleteRoomAliasTask
 import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
@@ -122,6 +123,12 @@ internal class DefaultRoomService @Inject constructor(
         joinRoomTask.execute(JoinRoomTask.Params(roomIdOrAlias, reason, viaServers))
     }
 
+    override suspend fun joinRoom(roomId: String,
+                                  reason: String?,
+                                  thirdPartySigned: SignInvitationResult) {
+        joinRoomTask.execute(JoinRoomTask.Params(roomId, reason, thirdPartySigned = thirdPartySigned))
+    }
+
     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/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 18ece60629..535fa9df71 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
@@ -159,7 +159,8 @@ internal interface RoomAPI {
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/receipt/{receiptType}/{eventId}")
     suspend fun sendReceipt(@Path("roomId") roomId: String,
                             @Path("receiptType") receiptType: String,
-                            @Path("eventId") eventId: String)
+                            @Path("eventId") eventId: String,
+                            @Body body: JsonDict = emptyMap())
 
     /**
      * Invite a user to the given room.
@@ -253,7 +254,7 @@ internal interface RoomAPI {
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "join/{roomIdOrAlias}")
     suspend fun join(@Path("roomIdOrAlias") roomIdOrAlias: String,
                      @Query("server_name") viaServers: List<String>,
-                     @Body params: Map<String, String?>): JoinRoomResponse
+                     @Body params:  JsonDict): JoinRoomResponse
 
     /**
      * Leave the given room.
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 c04c899e18..794970705c 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
@@ -28,6 +28,8 @@ import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.internal.session.DefaultFileService
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.directory.DirectoryAPI
+import org.matrix.android.sdk.internal.session.identity.DefaultSign3pidInvitationTask
+import org.matrix.android.sdk.internal.session.identity.Sign3pidInvitationTask
 import org.matrix.android.sdk.internal.session.room.accountdata.DefaultUpdateRoomAccountDataTask
 import org.matrix.android.sdk.internal.session.room.accountdata.UpdateRoomAccountDataTask
 import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasTask
@@ -248,4 +250,7 @@ internal abstract class RoomModule {
 
     @Binds
     abstract fun bindRoomVersionUpgradeTask(task: DefaultRoomVersionUpgradeTask): RoomVersionUpgradeTask
+
+    @Binds
+    abstract fun bindSign3pidInvitationTask(task: DefaultSign3pidInvitationTask): Sign3pidInvitationTask
 }
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 de6a71e581..518f0a0a6d 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
@@ -123,7 +123,7 @@ internal class DefaultCreateRoomTask @Inject constructor(
                 this.isDirect = true
             }
         }
-        val directChats = directChatsHelper.getLocalUserAccount()
+        val directChats = directChatsHelper.getLocalDirectMessages()
         updateUserAccountDataTask.execute(UpdateUserAccountDataTask.DirectChatParams(directMessages = directChats))
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
index 2ecacf335b..7528f80cc2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
@@ -20,22 +20,30 @@ import io.realm.Realm
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.events.getFixedRoomMemberContent
+import org.matrix.android.sdk.internal.session.sync.SyncResponsePostTreatmentAggregator
 import org.matrix.android.sdk.internal.session.user.UserEntityFactory
 import javax.inject.Inject
 
-internal class RoomMemberEventHandler @Inject constructor() {
+internal class RoomMemberEventHandler @Inject constructor(
+        @UserId private val myUserId: String
+) {
 
-    fun handle(realm: Realm, roomId: String, event: Event): Boolean {
+    fun handle(realm: Realm, roomId: String, event: Event, aggregator: SyncResponsePostTreatmentAggregator? = null): Boolean {
         if (event.type != EventType.STATE_ROOM_MEMBER) {
             return false
         }
         val userId = event.stateKey ?: return false
         val roomMember = event.getFixedRoomMemberContent()
-        return handle(realm, roomId, userId, roomMember)
+        return handle(realm, roomId, userId, roomMember, aggregator)
     }
 
-    fun handle(realm: Realm, roomId: String, userId: String, roomMember: RoomMemberContent?): Boolean {
+    fun handle(realm: Realm,
+               roomId: String,
+               userId: String,
+               roomMember: RoomMemberContent?,
+               aggregator: SyncResponsePostTreatmentAggregator? = null): Boolean {
         if (roomMember == null) {
             return false
         }
@@ -45,6 +53,14 @@ internal class RoomMemberEventHandler @Inject constructor() {
             val userEntity = UserEntityFactory.create(userId, roomMember)
             realm.insertOrUpdate(userEntity)
         }
+
+        // check whether this new room member event may be used to update the directs dictionary in account data
+        // this is required to handle correctly invite by email in DM
+        val mxId = roomMember.thirdPartyInvite?.signed?.mxid
+        if (mxId != null && mxId != myUserId) {
+            aggregator?.directChatsToCheck?.put(roomId, mxId)
+        }
+
         return true
     }
 }
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 562b25683b..209a904fad 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
@@ -19,6 +19,7 @@ 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
 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
@@ -29,6 +30,7 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.identity.model.SignInvitationResult
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.read.SetReadMarkersTask
@@ -40,7 +42,8 @@ internal interface JoinRoomTask : Task<JoinRoomTask.Params, Unit> {
     data class Params(
             val roomIdOrAlias: String,
             val reason: String?,
-            val viaServers: List<String> = emptyList()
+            val viaServers: List<String> = emptyList(),
+            val thirdPartySigned : SignInvitationResult? = null
     )
 }
 
@@ -59,12 +62,16 @@ internal class DefaultJoinRoomTask @Inject constructor(
             return
         }
         roomChangeMembershipStateDataSource.updateState(params.roomIdOrAlias, ChangeMembershipState.Joining)
+        val extraParams = mutableMapOf<String, Any>().apply {
+            params.reason?.let { this["reason"] = it }
+            params.thirdPartySigned?.let { this["third_party_signed"] = it.toContent() }
+        }
         val joinRoomResponse = try {
             executeRequest(globalErrorReceiver) {
                 roomAPI.join(
                         roomIdOrAlias = params.roomIdOrAlias,
                         viaServers = params.viaServers.take(3),
-                        params = mapOf("reason" to params.reason)
+                        params = extraParams
                 )
             }
         } catch (failure: Throwable) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
index de049d7538..9cea1fe425 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
@@ -45,7 +45,7 @@ internal class DefaultSetRoomNotificationStateTask @Inject constructor(@SessionD
             PushRuleEntity.where(it, scope = RuleScope.GLOBAL, ruleId = params.roomId).findFirst()?.toRoomPushRule()
         }
         if (currentRoomPushRule != null) {
-            removePushRuleTask.execute(RemovePushRuleTask.Params(currentRoomPushRule.kind, currentRoomPushRule.rule))
+            removePushRuleTask.execute(RemovePushRuleTask.Params(currentRoomPushRule.kind, currentRoomPushRule.rule.ruleId))
         }
         val newRoomPushRule = params.roomNotificationState.toRoomPushRule(params.roomId)
         if (newRoomPushRule != null) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
index 2efea7f118..5bad334afc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
@@ -43,7 +43,7 @@ internal class RoomChildRelationInfo(
     data class SpaceChildInfo(
             val roomId: String,
             val order: String?,
-            val autoJoin: Boolean,
+//            val autoJoin: Boolean,
             val viaServers: List<String>
     )
 
@@ -71,7 +71,7 @@ internal class RoomChildRelationInfo(
                             SpaceChildInfo(
                                     roomId = it.stateKey,
                                     order = scc.validOrder(),
-                                    autoJoin = scc.autoJoin ?: false,
+//                                    autoJoin = scc.autoJoin ?: false,
                                     viaServers = via
                             )
                         }
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 a64b903947..6dbb71e096 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
@@ -185,7 +185,7 @@ internal class DefaultSendService @AssistedInject constructor(
                             name = messageContent.body,
                             queryUri = Uri.parse(messageContent.url),
                             type = ContentAttachmentData.Type.AUDIO,
-                            waveform = messageContent.audioWaveformInfo?.waveform
+                            waveform = messageContent.audioWaveformInfo?.waveform?.filterNotNull()
                     )
                     localEchoRepository.updateSendState(localEcho.eventId, roomId, SendState.UNSENT)
                     internalSendMedia(listOf(localEcho.root), attachmentData, true)
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 e98e5646af..13095fbd58 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
@@ -77,7 +77,7 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
         val timelineEvent = timelineEventMapper.map(timelineEventEntity)
         timelineInput.onLocalEchoCreated(roomId = roomId, timelineEvent = timelineEvent)
         taskExecutor.executorScope.asyncTransaction(monarchy) { realm ->
-            val eventInsertEntity = EventInsertEntity(event.eventId, event.type).apply {
+            val eventInsertEntity = EventInsertEntity(event.eventId, event.type, canBeProcessed = true).apply {
                 this.insertType = EventInsertType.LOCAL_ECHO
             }
             realm.insert(eventInsertEntity)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index 7eed22f65f..4ec27976a2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -182,7 +182,7 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
     override suspend fun setJoinRuleRestricted(allowList: List<String>) {
         // we need to compute correct via parameters and check if PL are correct
         val allowEntries = allowList.map { spaceId ->
-            RoomJoinRulesAllowEntry(spaceId, viaParameterFinder.computeViaParamsForRestricted(spaceId, 3))
+            RoomJoinRulesAllowEntry.restrictedToRoom(spaceId)
         }
         updateJoinRule(RoomJoinRules.RESTRICTED, null, allowEntries)
     }
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 842c9d3aba..89a3533946 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
@@ -220,7 +220,7 @@ internal class RoomSummaryUpdater @Inject constructor(
                                     this.childRoomId = child.roomId
                                     this.childSummaryEntity = RoomSummaryEntity.where(realm, child.roomId).findFirst()
                                     this.order = child.order
-                                    this.autoJoin = child.autoJoin
+//                                    this.autoJoin = child.autoJoin
                                     this.viaServers.addAll(child.viaServers)
                                 }
                         )
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 3517f26c5d..721dae0b1b 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
@@ -106,7 +106,8 @@ internal class TimelineEventDecryptor @Inject constructor(
             val result = cryptoService.decryptEvent(request.event, timelineId)
             Timber.v("Successfully decrypted event ${event.eventId}")
             realm.executeTransaction {
-                EventEntity.where(it, eventId = event.eventId ?: "")
+                val eventId = event.eventId ?: ""
+                EventEntity.where(it, eventId = eventId)
                         .findFirst()
                         ?.setDecryptionResult(result)
             }
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 233eef45f8..8a6bbc18fd 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
@@ -21,6 +21,7 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
@@ -50,16 +51,24 @@ internal class DefaultSpace(
     override suspend fun addChildren(roomId: String,
                                      viaServers: List<String>?,
                                      order: String?,
-                                     autoJoin: Boolean,
+//                                     autoJoin: Boolean,
                                      suggested: Boolean?) {
         // Find best via
+        val bestVia = viaServers
+                ?: (spaceSummaryDataSource.getRoomSummary(roomId)
+                        ?.takeIf { it.joinRules == RoomJoinRules.RESTRICTED }
+                        ?.let {
+                            // for restricted room, best to take via from users that can invite in the
+                            // child room
+                            viaParameterFinder.computeViaParamsForRestricted(roomId, 3)
+                        }
+                        ?: viaParameterFinder.computeViaParams(roomId, 3))
 
         room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
-                        via = viaServers ?: viaParameterFinder.computeViaParams(roomId, 3),
-                        autoJoin = autoJoin,
+                        via = bestVia,
                         order = order,
                         suggested = suggested
                 ).toContent()
@@ -80,7 +89,7 @@ internal class DefaultSpace(
                 body = SpaceChildContent(
                         order = null,
                         via = null,
-                        autoJoin = null,
+//                        autoJoin = null,
                         suggested = null
                 ).toContent()
         )
@@ -105,35 +114,35 @@ internal class DefaultSpace(
                 body = SpaceChildContent(
                         order = order,
                         via = existing.via,
-                        autoJoin = existing.autoJoin,
+//                        autoJoin = existing.autoJoin,
                         suggested = existing.suggested
                 ).toContent()
         )
     }
 
-    override suspend fun setChildrenAutoJoin(roomId: String, autoJoin: Boolean) {
-        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
-                .firstOrNull()
-                ?.content.toModel<SpaceChildContent>()
-                ?: throw IllegalArgumentException("$roomId is not a child of this space")
-
-        if (existing.autoJoin == autoJoin) {
-            // nothing to do?
-            return
-        }
-
-        // edit state event and set via to null
-        room.sendStateEvent(
-                eventType = EventType.STATE_SPACE_CHILD,
-                stateKey = roomId,
-                body = SpaceChildContent(
-                        order = existing.order,
-                        via = existing.via,
-                        autoJoin = autoJoin,
-                        suggested = existing.suggested
-                ).toContent()
-        )
-    }
+//    override suspend fun setChildrenAutoJoin(roomId: String, autoJoin: Boolean) {
+//        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+//                .firstOrNull()
+//                ?.content.toModel<SpaceChildContent>()
+//                ?: throw IllegalArgumentException("$roomId is not a child of this space")
+//
+//        if (existing.autoJoin == autoJoin) {
+//            // nothing to do?
+//            return
+//        }
+//
+//        // edit state event and set via to null
+//        room.sendStateEvent(
+//                eventType = EventType.STATE_SPACE_CHILD,
+//                stateKey = roomId,
+//                body = SpaceChildContent(
+//                        order = existing.order,
+//                        via = existing.via,
+//                        autoJoin = autoJoin,
+//                        suggested = existing.suggested
+//                ).toContent()
+//        )
+//    }
 
     override suspend fun setChildrenSuggested(roomId: String, suggested: Boolean) {
         val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
@@ -152,7 +161,7 @@ internal class DefaultSpace(
                 body = SpaceChildContent(
                         order = existing.order,
                         via = existing.via,
-                        autoJoin = existing.autoJoin,
+//                        autoJoin = existing.autoJoin,
                         suggested = suggested
                 ).toContent()
         )
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 0c5c0416f9..7be4cdcda9 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
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.session.space
 import android.net.Uri
 import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -27,6 +28,7 @@ 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.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
@@ -34,6 +36,7 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.space.CreateSpaceParams
 import org.matrix.android.sdk.api.session.space.JoinSpaceResult
 import org.matrix.android.sdk.api.session.space.Space
+import org.matrix.android.sdk.api.session.space.SpaceHierarchyData
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
@@ -108,53 +111,65 @@ internal class DefaultSpaceService @Inject constructor(
 
     override suspend fun querySpaceChildren(spaceId: String,
                                             suggestedOnly: Boolean?,
-                                            autoJoinedOnly: Boolean?): Pair<RoomSummary, List<SpaceChildInfo>> {
-        return resolveSpaceInfoTask.execute(ResolveSpaceInfoTask.Params.withId(spaceId, suggestedOnly, autoJoinedOnly)).let { response ->
+                                            limit: Int?,
+                                            from: String?,
+                                            knownStateList: List<Event>?): SpaceHierarchyData {
+        return resolveSpaceInfoTask.execute(
+                ResolveSpaceInfoTask.Params(
+                        spaceId = spaceId, limit = limit, maxDepth = 1, from = from, suggestedOnly = suggestedOnly
+                )
+        ).let { response ->
             val spaceDesc = response.rooms?.firstOrNull { it.roomId == spaceId }
-            Pair(
-                    first = RoomSummary(
-                            roomId = spaceDesc?.roomId ?: spaceId,
-                            roomType = spaceDesc?.roomType,
-                            name = spaceDesc?.name ?: "",
-                            displayName = spaceDesc?.name ?: "",
-                            topic = spaceDesc?.topic ?: "",
-                            joinedMembersCount = spaceDesc?.numJoinedMembers,
-                            avatarUrl = spaceDesc?.avatarUrl ?: "",
-                            encryptionEventTs = null,
-                            typingUsers = emptyList(),
-                            isEncrypted = false,
-                            flattenParentIds = emptyList()
-                    ),
-                    second = response.rooms
-                            ?.filter { it.roomId != spaceId }
-                            ?.flatMap { childSummary ->
-                                response.events
-                                        ?.filter { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
-                                        ?.mapNotNull { childStateEv ->
-                                            // create a child entry for everytime this room is the child of a space
-                                            // beware that a room could appear then twice in this list
-                                            childStateEv.content.toModel<SpaceChildContent>()?.let { childStateEvContent ->
-                                                SpaceChildInfo(
-                                                        childRoomId = childSummary.roomId,
-                                                        isKnown = true,
-                                                        roomType = childSummary.roomType,
-                                                        name = childSummary.name,
-                                                        topic = childSummary.topic,
-                                                        avatarUrl = childSummary.avatarUrl,
-                                                        order = childStateEvContent.order,
-                                                        autoJoin = childStateEvContent.autoJoin ?: false,
-                                                        viaServers = childStateEvContent.via.orEmpty(),
-                                                        activeMemberCount = childSummary.numJoinedMembers,
-                                                        parentRoomId = childStateEv.roomId,
-                                                        suggested = childStateEvContent.suggested,
-                                                        canonicalAlias = childSummary.canonicalAlias,
-                                                        aliases = childSummary.aliases,
-                                                        worldReadable = childSummary.worldReadable
-                                                )
-                                            }
-                                        }.orEmpty()
-                            }
-                            .orEmpty()
+            val root = RoomSummary(
+                    roomId = spaceDesc?.roomId ?: spaceId,
+                    roomType = spaceDesc?.roomType,
+                    name = spaceDesc?.name ?: "",
+                    displayName = spaceDesc?.name ?: "",
+                    topic = spaceDesc?.topic ?: "",
+                    joinedMembersCount = spaceDesc?.numJoinedMembers,
+                    avatarUrl = spaceDesc?.avatarUrl ?: "",
+                    encryptionEventTs = null,
+                    typingUsers = emptyList(),
+                    isEncrypted = false,
+                    flattenParentIds = emptyList(),
+                    canonicalAlias = spaceDesc?.canonicalAlias,
+                    joinRules = RoomJoinRules.PUBLIC.takeIf { spaceDesc?.worldReadable == true }
+            )
+            val children = response.rooms
+                    ?.filter { it.roomId != spaceId }
+                    ?.flatMap { childSummary ->
+                        (spaceDesc?.childrenState ?: knownStateList)
+                                ?.filter { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
+                                ?.mapNotNull { childStateEv ->
+                                    // create a child entry for everytime this room is the child of a space
+                                    // beware that a room could appear then twice in this list
+                                    childStateEv.content.toModel<SpaceChildContent>()?.let { childStateEvContent ->
+                                        SpaceChildInfo(
+                                                childRoomId = childSummary.roomId,
+                                                isKnown = true,
+                                                roomType = childSummary.roomType,
+                                                name = childSummary.name,
+                                                topic = childSummary.topic,
+                                                avatarUrl = childSummary.avatarUrl,
+                                                order = childStateEvContent.order,
+//                                                        autoJoin = childStateEvContent.autoJoin ?: false,
+                                                viaServers = childStateEvContent.via.orEmpty(),
+                                                activeMemberCount = childSummary.numJoinedMembers,
+                                                parentRoomId = childStateEv.roomId,
+                                                suggested = childStateEvContent.suggested,
+                                                canonicalAlias = childSummary.canonicalAlias,
+                                                aliases = childSummary.aliases,
+                                                worldReadable = childSummary.worldReadable
+                                        )
+                                    }
+                                }.orEmpty()
+                    }
+                    .orEmpty()
+            SpaceHierarchyData(
+                    rootSummary = root,
+                    children = children,
+                    childrenState = spaceDesc?.childrenState.orEmpty(),
+                    nextToken = response.nextBatch
             )
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index e9d5ba5193..7eeaed4ff6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.space
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.TimeoutCancellationException
 import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.space.JoinSpaceResult
 import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
@@ -84,39 +83,39 @@ internal class DefaultJoinSpaceTask @Inject constructor(
         // after that i should have the children (? do I need to paginate to get state)
         val summary = roomSummaryDataSource.getSpaceSummary(params.roomIdOrAlias)
         Timber.v("## Space: Found space summary Name:[${summary?.name}] children: ${summary?.spaceChildren?.size}")
-        summary?.spaceChildren?.forEach {
+//        summary?.spaceChildren?.forEach {
 //            val childRoomSummary = it.roomSummary ?: return@forEach
-            Timber.v("## Space: Processing child :[${it.childRoomId}] autoJoin:${it.autoJoin}")
-            if (it.autoJoin) {
-                // I should try to join as well
-                if (it.roomType == RoomType.SPACE) {
-                    // recursively join auto-joined child of this space?
-                    when (val subspaceJoinResult = execute(JoinSpaceTask.Params(it.childRoomId, null, it.viaServers))) {
-                        JoinSpaceResult.Success           -> {
-                            // nop
-                        }
-                        is JoinSpaceResult.Fail           -> {
-                            errors[it.childRoomId] = subspaceJoinResult.error
-                        }
-                        is JoinSpaceResult.PartialSuccess -> {
-                            errors.putAll(subspaceJoinResult.failedRooms)
-                        }
-                    }
-                } else {
-                    try {
-                        Timber.v("## Space: Joining room child ${it.childRoomId}")
-                        joinRoomTask.execute(JoinRoomTask.Params(
-                                roomIdOrAlias = it.childRoomId,
-                                reason = "Auto-join parent space",
-                                viaServers = it.viaServers
-                        ))
-                    } catch (failure: Throwable) {
-                        errors[it.childRoomId] = failure
-                        Timber.e("## Space: Failed to join room child ${it.childRoomId}")
-                    }
-                }
-            }
-        }
+//            Timber.v("## Space: Processing child :[${it.childRoomId}] suggested:${it.suggested}")
+//            if (it.autoJoin) {
+//                // I should try to join as well
+//                if (it.roomType == RoomType.SPACE) {
+//                    // recursively join auto-joined child of this space?
+//                    when (val subspaceJoinResult = execute(JoinSpaceTask.Params(it.childRoomId, null, it.viaServers))) {
+//                        JoinSpaceResult.Success           -> {
+//                            // nop
+//                        }
+//                        is JoinSpaceResult.Fail           -> {
+//                            errors[it.childRoomId] = subspaceJoinResult.error
+//                        }
+//                        is JoinSpaceResult.PartialSuccess -> {
+//                            errors.putAll(subspaceJoinResult.failedRooms)
+//                        }
+//                    }
+//                } else {
+//                    try {
+//                        Timber.v("## Space: Joining room child ${it.childRoomId}")
+//                        joinRoomTask.execute(JoinRoomTask.Params(
+//                                roomIdOrAlias = it.childRoomId,
+//                                reason = "Auto-join parent space",
+//                                viaServers = it.viaServers
+//                        ))
+//                    } catch (failure: Throwable) {
+//                        errors[it.childRoomId] = failure
+//                        Timber.e("## Space: Failed to join room child ${it.childRoomId}")
+//                    }
+//                }
+//            }
+//        }
 
         return if (errors.isEmpty()) {
             JoinSpaceResult.Success
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
index d2be49b70b..2a396d6ee7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
@@ -24,24 +24,12 @@ import javax.inject.Inject
 internal interface ResolveSpaceInfoTask : Task<ResolveSpaceInfoTask.Params, SpacesResponse> {
     data class Params(
             val spaceId: String,
-            val maxRoomPerSpace: Int?,
-            val limit: Int,
-            val batchToken: String?,
-            val suggestedOnly: Boolean?,
-            val autoJoinOnly: Boolean?
-    ) {
-        companion object {
-            fun withId(spaceId: String, suggestedOnly: Boolean?, autoJoinOnly: Boolean?) =
-                    Params(
-                            spaceId = spaceId,
-                            maxRoomPerSpace = 10,
-                            limit = 20,
-                            batchToken = null,
-                            suggestedOnly = suggestedOnly,
-                            autoJoinOnly = autoJoinOnly
-                    )
-        }
-    }
+            val limit: Int?,
+            val maxDepth: Int?,
+            val from: String?,
+            val suggestedOnly: Boolean?
+//            val autoJoinOnly: Boolean?
+    )
 }
 
 internal class DefaultResolveSpaceInfoTask @Inject constructor(
@@ -49,15 +37,13 @@ internal class DefaultResolveSpaceInfoTask @Inject constructor(
         private val globalErrorReceiver: GlobalErrorReceiver
 ) : ResolveSpaceInfoTask {
     override suspend fun execute(params: ResolveSpaceInfoTask.Params): SpacesResponse {
-        val body = SpaceSummaryParams(
-                maxRoomPerSpace = params.maxRoomPerSpace,
-                limit = params.limit,
-                batch = params.batchToken ?: "",
-                autoJoinedOnly = params.autoJoinOnly,
-                suggestedOnly = params.suggestedOnly
-        )
         return executeRequest(globalErrorReceiver) {
-            spaceApi.getSpaces(params.spaceId, body)
+            spaceApi.getSpaceHierarchy(
+                    spaceId = params.spaceId,
+                    suggestedOnly = params.suggestedOnly,
+                    limit = params.limit,
+                    maxDepth = params.maxDepth,
+                    from = params.from)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
index 0fcc95fdb3..edd10bc2ef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
@@ -17,27 +17,25 @@
 package org.matrix.android.sdk.internal.session.space
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.http.Body
-import retrofit2.http.POST
+import retrofit2.http.GET
 import retrofit2.http.Path
+import retrofit2.http.Query
 
 internal interface SpaceApi {
 
     /**
-     *
-     * POST /_matrix/client/r0/rooms/{roomID}/spaces
-     *  {
-     *    "max_rooms_per_space": 5,      // The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1.
-     *    "auto_join_only": true,        // If true, only return m.space.child events with auto_join:true, default: false, which returns all events.
-     *    "limit": 100,                  // The maximum number of rooms/subspaces to return, server can override this, default: 100.
-     *    "batch": "opaque_string"       // A token to use if this is a subsequent HTTP hit, default: "".
-     *  }
-     *
-     * Ref:
-     * - MSC 2946 https://github.com/matrix-org/matrix-doc/blob/kegan/spaces-summary/proposals/2946-spaces-summary.md
-     * - https://hackmd.io/fNYh4tjUT5mQfR1uuRzWDA
+     * @param suggestedOnly Optional. If true, return only child events and rooms where the m.space.child event has suggested: true.
+     * @param limit: Optional: a client-defined limit to the maximum number of rooms to return per page. Must be a non-negative integer.
+     * @param maxDepth: Optional: The maximum depth in the tree (from the root room) to return.
+     * The deepest depth returned will not include children events. Defaults to no-limit. Must be a non-negative integer.
+     * @param from: Optional. Pagination token given to retrieve the next set of rooms.
+     * Note that if a pagination token is provided, then the parameters given for suggested_only and max_depth must be the same.
      */
-    @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc2946/rooms/{roomId}/spaces")
-    suspend fun getSpaces(@Path("roomId") spaceId: String,
-                  @Body params: SpaceSummaryParams): SpacesResponse
+    @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc2946/rooms/{roomId}/hierarchy")
+    suspend fun getSpaceHierarchy(
+            @Path("roomId") spaceId: String,
+            @Query("suggested_only") suggestedOnly: Boolean?,
+            @Query("limit") limit: Int?,
+            @Query("max_depth") maxDepth: Int?,
+            @Query("from") from: String?): SpacesResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt
index 5021ff638f..e0f273d0c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt
@@ -18,14 +18,17 @@ package org.matrix.android.sdk.internal.session.space
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.events.model.Event
 
+/**
+ * The fields are the same as those returned by /publicRooms (see spec), with the addition of:
+ *       room_type: the value of the m.type field from the room's m.room.create event, if any.
+ *       children_state: The m.space.child events of the room.
+ *       For each event, only the following fields are included: type, state_key, content, room_id, sender,
+ *       with the addition of: origin_server_ts: This is required for sorting of rooms as specified below.
+ */
 @JsonClass(generateAdapter = true)
 internal data class SpaceChildSummaryResponse(
-        /**
-         * The total number of state events which point to or from this room (inbound/outbound edges).
-         * This includes all m.space.child events in the room, in addition to m.room.parent events which point to this room as a parent.
-         */
-        @Json(name = "num_refs") val numRefs: Int? = null,
 
         /**
          * The room type, which is m.space for subspaces.
@@ -33,6 +36,11 @@ internal data class SpaceChildSummaryResponse(
          */
         @Json(name = "room_type") val roomType: String? = null,
 
+        /**  The m.space.child events of the room. For each event, only the following fields are included:
+         *  type, state_key, content, room_id, sender, with the addition of origin_server_ts.
+         */
+        @Json(name = "children_state") val childrenState: List<Event>? = null,
+
         /**
          * Aliases of the room. May be empty.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
deleted file mode 100644
index 013db1c286..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.session.space
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-internal data class SpaceSummaryParams(
-        /**  The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1 */
-        @Json(name = "max_rooms_per_space") val maxRoomPerSpace: Int?,
-        /** The maximum number of rooms/subspaces to return, server can override this, default: 100 */
-        @Json(name = "limit") val limit: Int?,
-        /** A token to use if this is a subsequent HTTP hit, default: "". */
-        @Json(name = "batch") val batch: String = "",
-        /** whether we should only return children with the "suggested" flag set. */
-        @Json(name = "suggested_only") val suggestedOnly: Boolean?,
-        /** whether we should only return children with the "suggested" flag set. */
-        @Json(name = "auto_join_only") val autoJoinedOnly: Boolean?
-)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpacesResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpacesResponse.kt
index 20d63c8814..7d22dce96b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpacesResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpacesResponse.kt
@@ -18,14 +18,11 @@ package org.matrix.android.sdk.internal.session.space
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import org.matrix.android.sdk.api.session.events.model.Event
 
 @JsonClass(generateAdapter = true)
 internal data class SpacesResponse(
         /** Its presence indicates that there are more results to return. */
         @Json(name = "next_batch") val nextBatch: String? = null,
         /** Rooms information like name/avatar/type ... */
-        @Json(name = "rooms") val rooms: List<SpaceChildSummaryResponse>? = null,
-        /** These are the edges of the graph. The objects in the array are complete (or stripped?) m.room.parent or m.space.child events. */
-        @Json(name = "events") val events: List<Event>? = null
+        @Json(name = "rooms") val rooms: List<SpaceChildSummaryResponse>? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
index f6b156a6fb..5cbaaa45c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
@@ -103,7 +103,7 @@ internal class DefaultPeekSpaceTask @Inject constructor(
                     // can't peek :/
                     spaceChildResults.add(
                             SpaceChildPeekResult(
-                                    childId, childPeek, entry.second?.autoJoin, entry.second?.order
+                                    childId, childPeek, entry.second?.order
                             )
                     )
                     // continue to next child
@@ -116,7 +116,7 @@ internal class DefaultPeekSpaceTask @Inject constructor(
                             SpaceSubChildPeekResult(
                                     childId,
                                     childPeek,
-                                    entry.second?.autoJoin,
+//                                    entry.second?.autoJoin,
                                     entry.second?.order,
                                     peekChildren(childStateEvents, depth + 1, maxDepth)
                             )
@@ -127,7 +127,7 @@ internal class DefaultPeekSpaceTask @Inject constructor(
                     Timber.v("## SPACE_PEEK: room child $entry")
                     spaceChildResults.add(
                             SpaceChildPeekResult(
-                                    childId, childPeek, entry.second?.autoJoin, entry.second?.order
+                                    childId, childPeek, entry.second?.order
                             )
                     )
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
index 1df62e94e8..44d879f05d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
@@ -28,21 +28,21 @@ data class SpacePeekSummary(
 interface ISpaceChild {
     val id: String
     val roomPeekResult: PeekResult
-    val default: Boolean?
+//    val default: Boolean?
     val order: String?
 }
 
 data class SpaceChildPeekResult(
         override val id: String,
         override val roomPeekResult: PeekResult,
-        override val default: Boolean? = null,
+//        override val default: Boolean? = null,
         override val order: String? = null
 ) : ISpaceChild
 
 data class SpaceSubChildPeekResult(
         override val id: String,
         override val roomPeekResult: PeekResult,
-        override val default: Boolean?,
+//        override val default: Boolean?,
         override val order: String?,
         val children: List<ISpaceChild>
 ) : ISpaceChild
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index c3586bcea7..830e666c95 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -221,7 +221,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                 }
                 // Give info to crypto module
                 cryptoService.onStateEvent(roomId, event)
-                roomMemberEventHandler.handle(realm, roomId, event)
+                roomMemberEventHandler.handle(realm, roomId, event, aggregator)
             }
         }
         if (roomSync.timeline?.events?.isNotEmpty() == true) {
@@ -233,7 +233,8 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                     roomSync.timeline.prevToken,
                     roomSync.timeline.limited,
                     insertType,
-                    syncLocalTimestampMillis
+                    syncLocalTimestampMillis,
+                    aggregator
             )
             roomEntity.addIfNecessary(chunkEntity)
         }
@@ -337,7 +338,8 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                      prevToken: String? = null,
                                      isLimited: Boolean = true,
                                      insertType: EventInsertType,
-                                     syncLocalTimestampMillis: Long): ChunkEntity {
+                                     syncLocalTimestampMillis: Long,
+                                     aggregator: SyncResponsePostTreatmentAggregator): ChunkEntity {
         val lastChunk = ChunkEntity.findLastForwardChunkOfRoom(realm, roomEntity.roomId)
         val chunkEntity = if (!isLimited && lastChunk != null) {
             lastChunk
@@ -371,7 +373,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                 if (event.type == EventType.STATE_ROOM_MEMBER) {
                     val fixedContent = event.getFixedRoomMemberContent()
                     roomMemberContentsByUser[event.stateKey] = fixedContent
-                    roomMemberEventHandler.handle(realm, roomEntity.roomId, event.stateKey, fixedContent)
+                    roomMemberEventHandler.handle(realm, roomEntity.roomId, event.stateKey, fixedContent, aggregator)
                 }
             }
             roomMemberContentsByUser.getOrPut(event.senderId) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt
index ea10a32f3e..9bb2bfc9b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt
@@ -19,4 +19,6 @@ package org.matrix.android.sdk.internal.session.sync
 internal class SyncResponsePostTreatmentAggregator {
     // List of RoomId
     val ephemeralFilesToDelete = mutableListOf<String>()
+    // Map of roomId to directUserId
+    val directChatsToCheck = mutableMapOf<String, String>()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt
index 12b77c706b..db1100d76c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt
@@ -16,13 +16,20 @@
 
 package org.matrix.android.sdk.internal.session.sync
 
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.toMutable
+import org.matrix.android.sdk.internal.session.user.accountdata.DirectChatsHelper
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
 import javax.inject.Inject
 
 internal class SyncResponsePostTreatmentAggregatorHandler @Inject constructor(
-        private val ephemeralTemporaryStore: RoomSyncEphemeralTemporaryStore
+        private val directChatsHelper: DirectChatsHelper,
+        private val ephemeralTemporaryStore: RoomSyncEphemeralTemporaryStore,
+        private val updateUserAccountDataTask: UpdateUserAccountDataTask
 ) {
-    fun handle(synResHaResponsePostTreatmentAggregator: SyncResponsePostTreatmentAggregator) {
+    suspend fun handle(synResHaResponsePostTreatmentAggregator: SyncResponsePostTreatmentAggregator) {
         cleanupEphemeralFiles(synResHaResponsePostTreatmentAggregator.ephemeralFilesToDelete)
+        updateDirectUserIds(synResHaResponsePostTreatmentAggregator.directChatsToCheck)
     }
 
     private fun cleanupEphemeralFiles(ephemeralFilesToDelete: List<String>) {
@@ -30,4 +37,33 @@ internal class SyncResponsePostTreatmentAggregatorHandler @Inject constructor(
             ephemeralTemporaryStore.delete(it)
         }
     }
+
+    private suspend fun updateDirectUserIds(directUserIdsToUpdate: Map<String, String>) {
+        val directChats = directChatsHelper.getLocalDirectMessages().toMutable()
+        var hasUpdate = false
+        directUserIdsToUpdate.forEach { (roomId, candidateUserId) ->
+            // consider room is a DM if referenced in the DM dictionary
+            val currentDirectUserId = directChats.firstNotNullOfOrNull { (userId, roomIds) -> userId.takeIf { roomId in roomIds } }
+            // update directUserId with the given candidateUserId if it mismatches the current one
+            if (currentDirectUserId != null && !MatrixPatterns.isUserId(currentDirectUserId)) {
+                // link roomId with the matrix id
+                directChats
+                        .getOrPut(candidateUserId) { arrayListOf() }
+                        .apply {
+                            if (!contains(roomId)) {
+                                hasUpdate = true
+                                add(roomId)
+                            }
+                        }
+
+                // remove roomId from currentDirectUserId entry
+                hasUpdate = hasUpdate or(directChats[currentDirectUserId]?.remove(roomId) == true)
+                // remove currentDirectUserId entry if there is no attached room anymore
+                hasUpdate = hasUpdate or(directChats.takeIf { it[currentDirectUserId].isNullOrEmpty() }?.remove(currentDirectUserId) != null)
+            }
+        }
+        if (hasUpdate) {
+            updateUserAccountDataTask.execute(UpdateUserAccountDataTask.DirectChatParams(directMessages = directChats))
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
index b8d987d500..110e77813d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
@@ -53,6 +53,7 @@ import org.matrix.android.sdk.internal.session.sync.model.accountdata.Breadcrumb
 import org.matrix.android.sdk.internal.session.sync.model.accountdata.DirectMessagesContent
 import org.matrix.android.sdk.internal.session.sync.model.accountdata.IgnoredUsersContent
 import org.matrix.android.sdk.internal.session.sync.model.accountdata.UserAccountDataSync
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.toMutable
 import org.matrix.android.sdk.internal.session.user.accountdata.DirectChatsHelper
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
 import timber.log.Timber
@@ -83,7 +84,7 @@ internal class UserAccountDataSyncHandler @Inject constructor(
     // If we get some direct chat invites, we synchronize the user account data including those.
     suspend fun synchronizeWithServerIfNeeded(invites: Map<String, InvitedRoomSync>) {
         if (invites.isNullOrEmpty()) return
-        val directChats = directChatsHelper.getLocalUserAccount()
+        val directChats = directChatsHelper.getLocalDirectMessages().toMutable()
         var hasUpdate = false
         monarchy.doWithRealm { realm ->
             invites.forEach { (roomId, _) ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
index 41173dea96..7c73f1fed0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
@@ -20,3 +20,12 @@ package org.matrix.android.sdk.internal.session.sync.model.accountdata
  * Keys are userIds, values are list of roomIds
  */
 internal typealias DirectMessagesContent = Map<String, List<String>>
+
+/**
+ * Returns a new [MutableMap] with all elements of this collection.
+ */
+internal fun DirectMessagesContent.toMutable(): MutableMap<String, MutableList<String>> {
+    return map { it.key to it.value.toMutableList() }
+            .toMap()
+            .toMutableMap()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt
index a9e5089774..3703057643 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt
@@ -21,6 +21,7 @@ import org.matrix.android.sdk.internal.database.query.getDirectRooms
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import io.realm.Realm
 import io.realm.RealmConfiguration
+import org.matrix.android.sdk.internal.session.sync.model.accountdata.DirectMessagesContent
 import javax.inject.Inject
 
 internal class DirectChatsHelper @Inject constructor(@SessionDatabase
@@ -29,7 +30,7 @@ internal class DirectChatsHelper @Inject constructor(@SessionDatabase
     /**
      * @return a map of userId <-> list of roomId
      */
-    fun getLocalUserAccount(filterRoomId: String? = null): MutableMap<String, MutableList<String>> {
+    fun getLocalDirectMessages(filterRoomId: String? = null): DirectMessagesContent {
         return Realm.getInstance(realmConfiguration).use { realm ->
             // Makes sure we have the latest realm updates, this is important as we sent this information to the server.
             realm.refresh()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
index 5912dc7b53..dfe4b6b810 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
@@ -52,7 +52,7 @@ internal class DefaultWidgetService @Inject constructor(private val widgetManage
         return widgetManager.getWidgetComputedUrl(widget, isLightTheme)
     }
 
-    override fun getRoomWidgetsLive(
+override fun getRoomWidgetsLive(
             roomId: String,
             widgetId: QueryStringValue,
             widgetTypes: Set<String>?,
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt
index 74b6c03d93..3572a1a546 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt
@@ -32,6 +32,7 @@ class CoroutineSequencersTest: MatrixTest {
     private val dispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun sequencer_should_run_sequential() {
         val sequencer = SemaphoreCoroutineSequencer()
         val results = ArrayList<String>()
@@ -60,6 +61,7 @@ class CoroutineSequencersTest: MatrixTest {
     }
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun sequencer_should_run_parallel() {
         val sequencer1 = SemaphoreCoroutineSequencer()
         val sequencer2 = SemaphoreCoroutineSequencer()
@@ -86,6 +88,7 @@ class CoroutineSequencersTest: MatrixTest {
     }
 
     @Test
+    @Suppress("EXPERIMENTAL_API_USAGE")
     fun sequencer_should_jump_to_next_when_current_job_canceled() {
         val sequencer = SemaphoreCoroutineSequencer()
         val results = ArrayList<String>()
diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index 04ce8a2aec..b2a5148b4a 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -44,8 +44,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.fragment:fragment-ktx:1.3.6"
-    implementation 'androidx.exifinterface:exifinterface:1.3.2'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
 
     // Log
-    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.jakewharton.timber:timber:5.0.1'
 }
diff --git a/newsfragment/3207.bugfix b/newsfragment/3207.bugfix
deleted file mode 100644
index 162485907b..0000000000
--- a/newsfragment/3207.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Space Explore Rooms no feedback on failed to join
\ No newline at end of file
diff --git a/newsfragment/3520.misc b/newsfragment/3520.misc
deleted file mode 100644
index d015c3e03d..0000000000
--- a/newsfragment/3520.misc
+++ /dev/null
@@ -1 +0,0 @@
-VoIP: Merge virtual room timeline in corresponding native room (call events only).
\ No newline at end of file
diff --git a/newsfragment/3531.feature b/newsfragment/3531.feature
deleted file mode 100644
index e8b63584e3..0000000000
--- a/newsfragment/3531.feature
+++ /dev/null
@@ -1 +0,0 @@
-Introduces AutoAcceptInvites which can be enabled at compile time.
\ No newline at end of file
diff --git a/tools/release/pushPlayStoreMetaData.sh b/tools/release/pushPlayStoreMetaData.sh
index ad7288ac36..35833bfcc6 100755
--- a/tools/release/pushPlayStoreMetaData.sh
+++ b/tools/release/pushPlayStoreMetaData.sh
@@ -29,7 +29,8 @@ mv ./fastlane/metadata/android/ga  ./fastlane_tmp
 mv ./fastlane/metadata/android/kab ./fastlane_tmp
 mv ./fastlane/metadata/android/nb  ./fastlane_tmp
 
-# Fastlane / PlayStore require longDescription and shortDescription file to be set, so copy the default one for
+# Fastlane / PlayStore require longDescription and shortDescription file to be set, so copy the default
+# one for languages where they are missing
 echo "Copying default description when missing"
 if [[ -f "./fastlane/metadata/android/ro/full_description.txt" ]]; then
   echo "It appears that file ./fastlane/metadata/android/ro/full_description.txt now exists. This can be removed."
@@ -58,6 +59,24 @@ else
   removeShortDes_si=1
 fi
 
+if [[ -f "./fastlane/metadata/android/sq/short_description.txt" ]]; then
+  echo "It appears that file ./fastlane/metadata/android/sq/short_description.txt now exists. This can be removed."
+  removeShortDes_sq=0
+else
+  echo "Copy default short description to ./fastlane/metadata/android/sq"
+  cp ./fastlane/metadata/android/en-US/short_description.txt ./fastlane/metadata/android/sq
+  removeShortDes_sq=1
+fi
+
+if [[ -f "./fastlane/metadata/android/sq/full_description.txt" ]]; then
+  echo "It appears that file ./fastlane/metadata/android/sq/full_description.txt now exists. This can be removed."
+  removeFullDes_sq=0
+else
+  echo "Copy default full description to ./fastlane/metadata/android/sq"
+  cp ./fastlane/metadata/android/en-US/full_description.txt ./fastlane/metadata/android/sq
+  removeFullDes_sq=1
+fi
+
 if [[ -f "./fastlane/metadata/android/th/full_description.txt" ]]; then
   echo "It appears that file ./fastlane/metadata/android/th/full_description.txt now exists. This can be removed."
   removeFullDes_th=0
@@ -98,10 +117,18 @@ if [[ ${removeShortDes_si} -eq 1 ]]; then
   rm ./fastlane/metadata/android/si-LK/short_description.txt
 fi
 
+if [[ ${removeShortDes_sq} -eq 1 ]]; then
+  rm ./fastlane/metadata/android/sq/short_description.txt
+fi
+
 if [[ ${removeFullDes_th} -eq 1 ]]; then
   rm ./fastlane/metadata/android/th/full_description.txt
 fi
 
+if [[ ${removeFullDes_sq} -eq 1 ]]; then
+  rm ./fastlane/metadata/android/sq/full_description.txt
+fi
+
 if [[ ${removeFullDes_vi} -eq 1 ]]; then
   rm ./fastlane/metadata/android/vi/full_description.txt
 fi
diff --git a/vector/build.gradle b/vector/build.gradle
index c3be35bb81..9d3cc7ec3c 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 2
-ext.versionPatch = 0
+ext.versionPatch = 1
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -143,8 +143,10 @@ android {
         resValue "bool", "useLoginV2", "false"
 
         // NotificationSettingsV2 is disabled. To be released in conjunction with iOS/Web
-        resValue "bool", "useNotificationSettingsV1", "true"
-        resValue "bool", "useNotificationSettingsV2", "false"
+        def useNotificationSettingsV2 = true
+        buildConfigField "Boolean", "USE_NOTIFICATION_SETTINGS_V2", "${useNotificationSettingsV2}"
+        resValue "bool", "useNotificationSettingsV1", "${!useNotificationSettingsV2}"
+        resValue "bool", "useNotificationSettingsV2", "${useNotificationSettingsV2}"
 
         buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"
 
@@ -282,16 +284,17 @@ android {
     lintOptions {
         lintConfig file("lint.xml")
 
+        checkDependencies true
         abortOnError true
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     sourceSets {
@@ -314,10 +317,10 @@ dependencies {
     def fragment_version = '1.3.6'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'
-    def big_image_viewer_version = '1.8.0'
+    def big_image_viewer_version = '1.8.1'
     def glide_version = '4.12.0'
     def moshi_version = '1.12.0'
-    def daggerVersion = '2.38'
+    def daggerVersion = '2.38.1'
     def autofill_version = "1.1.0"
     def work_version = '2.5.0'
     def arch_version = '2.1.0'
@@ -345,10 +348,10 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-beta02'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     implementation "androidx.sharetarget:sharetarget:1.1.0"
     implementation 'androidx.core:core-ktx:1.6.0'
-    implementation "androidx.media:media:1.4.0"
+    implementation "androidx.media:media:1.4.1"
     implementation "androidx.transition:transition:1.4.1"
 
     implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
@@ -360,13 +363,13 @@ dependencies {
     kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
 
     // Log
-    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.jakewharton.timber:timber:5.0.1'
 
     // Debug
     implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.28'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.31'
 
     // rx
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
@@ -407,6 +410,7 @@ dependencies {
     implementation "androidx.autofill:autofill:$autofill_version"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
     implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
+    implementation 'com.github.hyuwah:DraggableView:1.0.0'
     implementation 'com.github.Armen101:AudioRecordView:1.0.5'
 
     // Custom Tab
@@ -517,7 +521,7 @@ dependencies {
     // Plant Timber tree for test
     androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
     // "The one who serves a great Espresso"
-    androidTestImplementation('com.schibsted.spain:barista:3.9.0') {
+    androidTestImplementation('com.adevinta.android:barista:4.1.0') {
         exclude group: 'org.jetbrains.kotlin'
     }
 }
diff --git a/vector/proguard-rules.pro b/vector/proguard-rules.pro
index 46fae8338c..7fd72ba895 100644
--- a/vector/proguard-rules.pro
+++ b/vector/proguard-rules.pro
@@ -64,4 +64,15 @@
 -keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
 
 -dontwarn com.facebook.react.**
--keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
\ No newline at end of file
+-keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
+
+-keepattributes InnerClasses
+
+# JWT dependencies
+-keep class io.jsonwebtoken.** { *; }
+-keepnames class io.jsonwebtoken.* { *; }
+-keepnames interface io.jsonwebtoken.* { *; }
+
+-keep class org.bouncycastle.** { *; }
+-keepnames class org.bouncycastle.** { *; }
+-dontwarn org.bouncycastle.**
\ No newline at end of file
diff --git a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
index 285f40aaf3..a562287263 100644
--- a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
@@ -107,6 +107,7 @@ abstract class VerificationTestBase {
         return result!!
     }
 
+    @Suppress("EXPERIMENTAL_API_USAGE")
     private fun syncSession(session: Session) {
         val lock = CountDownLatch(1)
 
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 26365e0c72..bad5d29e06 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -30,18 +30,20 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import com.schibsted.spain.barista.assertion.BaristaListAssertions.assertListItemCount
-import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickBack
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.longClickOn
-import com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton
-import com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton
-import com.schibsted.spain.barista.interaction.BaristaEditTextInteractions.writeTo
-import com.schibsted.spain.barista.interaction.BaristaListInteractions.clickListItem
-import com.schibsted.spain.barista.interaction.BaristaListInteractions.clickListItemChild
-import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions.clickMenu
-import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions.openMenu
+import com.adevinta.android.barista.assertion.BaristaListAssertions.assertListItemCount
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickBack
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.longClickOn
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton
+import com.adevinta.android.barista.interaction.BaristaDrawerInteractions.openDrawer
+import com.adevinta.android.barista.interaction.BaristaEditTextInteractions.writeTo
+import com.adevinta.android.barista.interaction.BaristaListInteractions.clickListItem
+import com.adevinta.android.barista.interaction.BaristaListInteractions.clickListItemChild
+import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions.clickMenu
+import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions.openMenu
+import im.vector.app.BuildConfig
 import im.vector.app.EspressoHelper
 import im.vector.app.R
 import im.vector.app.SleepViewAction
@@ -169,9 +171,13 @@ class UiAllScreensSanityTest {
         }
         clickOn(R.string.create_new_room)
 
+        // Room access bottom sheet
+        clickOn(R.string.room_settings_room_access_private_title)
+        pressBack()
+
         // Create
-        assertListItemCount(R.id.createRoomForm, 10)
-        clickListItemChild(R.id.createRoomForm, 9, R.id.form_submit_button)
+        assertListItemCount(R.id.createRoomForm, 12)
+        clickListItemChild(R.id.createRoomForm, 11, R.id.form_submit_button)
 
         waitUntilActivityVisible<RoomDetailActivity> {
             assertDisplayed(R.id.roomDetailContainer)
@@ -229,6 +235,8 @@ class UiAllScreensSanityTest {
         // Wait a bit for the keyboard layout to update
         sleep(30)
         clickOn(R.id.sendButton)
+        // Wait for the UI to update
+        sleep(1000)
         // Open edit history
         longClickOnMessage("Hello universe! (edited)")
         clickOn(R.string.message_view_edit_history)
@@ -355,7 +363,8 @@ class UiAllScreensSanityTest {
     }
 
     private fun navigateToSettings() {
-        clickOn(R.id.groupToolbarAvatarImageView)
+        // clickOn(R.id.groupToolbarAvatarImageView)
+        openDrawer()
         clickOn(R.id.homeDrawerHeaderSettingsView)
 
         clickOn(R.string.settings_general_title)
@@ -458,8 +467,18 @@ class UiAllScreensSanityTest {
     }
 
     private fun navigateToSettingsNotifications() {
-        clickOn(R.string.settings_notification_advanced)
-        pressBack()
+        if (BuildConfig.USE_NOTIFICATION_SETTINGS_V2) {
+            clickOn(R.string.settings_notification_default)
+            pressBack()
+            clickOn(R.string.settings_notification_mentions_and_keywords)
+            // TODO Test adding a keyword?
+            pressBack()
+            clickOn(R.string.settings_notification_other)
+            pressBack()
+        } else {
+            clickOn(R.string.settings_notification_advanced)
+            pressBack()
+        }
         /*
         clickOn(R.string.settings_noisy_notifications_preferences)
         TODO Cannot go back
diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt b/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt
index ed174b50a2..2cef326501 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt
@@ -20,11 +20,11 @@ import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import com.schibsted.spain.barista.assertion.BaristaEnabledAssertions.assertDisabled
-import com.schibsted.spain.barista.assertion.BaristaEnabledAssertions.assertEnabled
-import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
-import com.schibsted.spain.barista.interaction.BaristaEditTextInteractions.writeTo
+import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertDisabled
+import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertEnabled
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaEditTextInteractions.writeTo
 import im.vector.app.R
 import im.vector.app.espresso.tools.waitUntilActivityVisible
 import im.vector.app.features.home.HomeActivity
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index df85e31208..5aec41e46f 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -271,7 +271,11 @@
             android:name=".features.attachments.preview.AttachmentsPreviewActivity"
             android:theme="@style/Theme.Vector.Black.AttachmentsPreview" />
         <activity
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:name=".features.call.VectorCallActivity"
+            android:launchMode="singleTask"
+            android:taskAffinity=".features.call.VectorCallActivity"
             android:excludeFromRecents="true" />
         <!-- PIP Support https://developer.android.com/guide/topics/ui/picture-in-picture -->
         <activity
diff --git a/vector/src/main/assets/open_source_licenses.html b/vector/src/main/assets/open_source_licenses.html
index 490de1f23a..19daf3359b 100755
--- a/vector/src/main/assets/open_source_licenses.html
+++ b/vector/src/main/assets/open_source_licenses.html
@@ -194,6 +194,37 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 </pre>
 
+<ul>
+    <li>
+        <b>hyuwah/DraggableView</b>
+        <br/>
+        hyuwah/DraggableView is licensed under the MIT License
+        Copyright (c) 2018 Muhammad Wahyudin
+    </li>
+</ul>
+<pre>
+
+Copyright (c) 2018 Muhammad Wahyudin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+</pre>
+
 <ul>
     <li>
         <b>com.github.piasy:BigImageViewer</b>
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 cce0c2a66f..6b42f1e428 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
@@ -106,6 +106,7 @@ import im.vector.app.features.roomprofile.RoomProfileFragment
 import im.vector.app.features.roomprofile.alias.RoomAliasFragment
 import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment
 import im.vector.app.features.roomprofile.members.RoomMemberListFragment
+import im.vector.app.features.roomprofile.notifications.RoomNotificationSettingsFragment
 import im.vector.app.features.roomprofile.permissions.RoomPermissionsFragment
 import im.vector.app.features.roomprofile.settings.RoomSettingsFragment
 import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleChooseRestrictedFragment
@@ -717,6 +718,11 @@ interface FragmentModule {
     @FragmentKey(RoomBannedMemberListFragment::class)
     fun bindRoomBannedMemberListFragment(fragment: RoomBannedMemberListFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(RoomNotificationSettingsFragment::class)
+    fun bindRoomNotificationSettingsFragment(fragment: RoomNotificationSettingsFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(SearchFragment::class)
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
index 4a3379cb5a..68b212c830 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
@@ -31,6 +31,7 @@ import im.vector.app.core.network.WifiDetector
 import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.utils.AssetReader
 import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.call.conference.JitsiActiveConferenceHolder
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.configuration.VectorConfiguration
 import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
@@ -39,7 +40,6 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.CurrentSpaceSuggestedRoomListDataSource
 import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
-import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
 import im.vector.app.features.html.EventHtmlRenderer
 import im.vector.app.features.html.VectorHtmlCompressor
 import im.vector.app.features.invite.AutoAcceptInvites
@@ -165,7 +165,7 @@ interface VectorComponent {
 
     fun webRtcCallManager(): WebRtcCallManager
 
-    fun roomSummaryHolder(): RoomSummariesHolder
+    fun jitsiActiveConferenceHolder(): JitsiActiveConferenceHolder
 
     @Component.Factory
     interface Factory {
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/NotificationSettingsFooterItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/NotificationSettingsFooterItem.kt
new file mode 100644
index 0000000000..4608f2b1ce
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/NotificationSettingsFooterItem.kt
@@ -0,0 +1,62 @@
+/*
+ * 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.core.epoxy.profiles.notifications
+
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextWithColoredPart
+
+@EpoxyModelClass(layout = R.layout.item_notifications_footer)
+abstract class NotificationSettingsFooterItem : VectorEpoxyModel<NotificationSettingsFooterItem.Holder>() {
+
+    @EpoxyAttribute
+    var encrypted: Boolean = false
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var clickListener: ClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        val accountSettingsString = holder.view.context.getString(R.string.room_settings_room_notifications_account_settings)
+        val manageNotificationsString = holder.view.context.getString(
+                R.string.room_settings_room_notifications_manage_notifications,
+                accountSettingsString
+        )
+        val manageNotificationsBuilder = StringBuilder(manageNotificationsString)
+        if (encrypted) {
+            val encryptionNotice = holder.view.context.getString(R.string.room_settings_room_notifications_encryption_notice)
+            manageNotificationsBuilder.appendLine().append(encryptionNotice)
+        }
+
+        holder.textView.setTextWithColoredPart(
+                manageNotificationsBuilder.toString(),
+                accountSettingsString,
+                underline = true
+        ) {
+            clickListener?.invoke(holder.textView)
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val textView by bind<TextView>(R.id.footerText)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/RadioButtonItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/RadioButtonItem.kt
new file mode 100644
index 0000000000..37d16ab6b1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/RadioButtonItem.kt
@@ -0,0 +1,69 @@
+/*
+ * 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.core.epoxy.profiles.notifications
+
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+
+@EpoxyModelClass(layout = R.layout.item_radio)
+abstract class RadioButtonItem : VectorEpoxyModel<RadioButtonItem.Holder>() {
+
+    @EpoxyAttribute
+    var title: CharSequence? = null
+
+    @StringRes
+    @EpoxyAttribute
+    var titleRes: Int? = null
+
+    @EpoxyAttribute
+    var selected = false
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    lateinit var listener: ClickListener
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.view.onClick(listener)
+        if (titleRes != null) {
+            holder.titleText.setText(titleRes!!)
+        } else {
+            holder.titleText.text = title
+        }
+
+        if (selected) {
+            holder.radioImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_radio_on))
+            holder.radioImage.contentDescription = holder.view.context.getString(R.string.a11y_checked)
+        } else {
+            holder.radioImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_radio_off))
+            holder.radioImage.contentDescription = holder.view.context.getString(R.string.a11y_unchecked)
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val titleText by bind<TextView>(R.id.actionTitle)
+        val radioImage by bind<ImageView>(R.id.radioIcon)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/TextHeaderItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/TextHeaderItem.kt
new file mode 100644
index 0000000000..2dfe7be2e6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/TextHeaderItem.kt
@@ -0,0 +1,50 @@
+/*
+ * 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.core.epoxy.profiles.notifications
+
+import android.widget.TextView
+import androidx.annotation.StringRes
+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_text_header)
+abstract class TextHeaderItem : VectorEpoxyModel<TextHeaderItem.Holder>() {
+
+    @EpoxyAttribute
+    var text: String? = null
+
+    @StringRes
+    @EpoxyAttribute
+    var textRes: Int? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        val textResource = textRes
+        if (textResource != null) {
+            holder.textView.setText(textResource)
+        } else {
+            holder.textView.text = text
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val textView by bind<TextView>(R.id.headerText)
+    }
+}
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 bb991ac32c..1c424f7071 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
@@ -65,6 +65,23 @@ fun TextView.setTextWithColoredPart(@StringRes fullTextRes: Int,
     val coloredPart = resources.getString(coloredTextRes)
     // Insert colored part into the full text
     val fullText = resources.getString(fullTextRes, coloredPart)
+
+    setTextWithColoredPart(fullText, coloredPart, colorAttribute, underline, onClick)
+}
+
+/**
+ * Set text with a colored part
+ * @param fullText The full text.
+ * @param coloredPart The colored part of the text
+ * @param colorAttribute attribute of the color. Default to colorPrimary
+ * @param underline true to also underline the text. Default to false
+ * @param onClick attributes to handle click on the colored part if needed
+ */
+fun TextView.setTextWithColoredPart(fullText: String,
+                                    coloredPart: String,
+                                    @AttrRes colorAttribute: Int = R.attr.colorPrimary,
+                                    underline: Boolean = false,
+                                    onClick: (() -> Unit)? = null) {
     val color = ThemeUtils.getColor(context, colorAttribute)
 
     val foregroundSpan = ForegroundColorSpan(color)
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 61abbd445b..dc19520865 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
@@ -267,6 +267,7 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), HasSc
                         activeSessionHolder.getActiveSession().sessionParams.homeServerHost ?: "")
             is GlobalError.CertificateError     ->
                 handleCertificateError(globalError)
+            GlobalError.ExpiredAccount          -> Unit // TODO Handle account expiration
         }.exhaustive
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt b/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt
new file mode 100644
index 0000000000..b57bb27671
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt
@@ -0,0 +1,167 @@
+/*
+ * 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.core.preference
+
+import android.content.Context
+import android.text.Editable
+import android.util.AttributeSet
+import android.view.inputmethod.EditorInfo
+import android.widget.Button
+import android.widget.EditText
+import androidx.core.view.children
+import androidx.preference.PreferenceViewHolder
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
+import com.google.android.material.textfield.TextInputLayout
+import im.vector.app.R
+import im.vector.app.core.epoxy.addTextChangedListenerOnce
+import im.vector.app.core.platform.SimpleTextWatcher
+
+class KeywordPreference : VectorPreference {
+
+    interface Listener {
+        fun onFocusDidChange(hasFocus: Boolean)
+        fun didAddKeyword(keyword: String)
+        fun didRemoveKeyword(keyword: String)
+    }
+
+    private var keywordsEnabled = true
+    private var isCurrentKeywordValid = true
+
+    private var _keywords: LinkedHashSet<String> = linkedSetOf()
+
+    var keywords: Set<String>
+        get() {
+            return _keywords
+        }
+        set(value) {
+            // Updates existing `LinkedHashSet` vs assign a new set.
+            // This preserves the order added while on the screen (avoids keywords jumping around).
+            _keywords.removeAll(_keywords.filter { !value.contains(it) })
+            _keywords.addAll(value.sorted())
+            notifyChanged()
+        }
+
+    var listener: Listener? = null
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
+
+    init {
+        layoutResource = R.layout.vector_preference_chip_group
+    }
+
+    override fun setEnabled(enabled: Boolean) {
+        super.setEnabled(enabled)
+        keywordsEnabled = enabled
+        notifyChanged()
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        super.onBindViewHolder(holder)
+
+        holder.itemView.setOnClickListener(null)
+        holder.itemView.setOnLongClickListener(null)
+
+        val chipEditText = holder.findViewById(R.id.chipEditText) as? EditText ?: return
+        val chipGroup = holder.findViewById(R.id.chipGroup) as? ChipGroup ?: return
+        val addKeywordButton = holder.findViewById(R.id.addKeywordButton) as? Button ?: return
+        val chipTextInputLayout = holder.findViewById(R.id.chipTextInputLayout) as? TextInputLayout ?: return
+
+        chipEditText.text = null
+        chipGroup.removeAllViews()
+
+        keywords.forEach {
+            addChipToGroup(it, chipGroup)
+        }
+
+        chipEditText.isEnabled = keywordsEnabled
+        chipGroup.isEnabled = keywordsEnabled
+        chipGroup.children.forEach { it.isEnabled = keywordsEnabled }
+
+        chipEditText.addTextChangedListenerOnce(onTextChangeListener(chipTextInputLayout, addKeywordButton))
+        chipEditText.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId != EditorInfo.IME_ACTION_DONE) {
+                return@setOnEditorActionListener false
+            }
+            return@setOnEditorActionListener addKeyword(chipEditText)
+        }
+        chipEditText.setOnFocusChangeListener { _, hasFocus ->
+            listener?.onFocusDidChange(hasFocus)
+        }
+
+        addKeywordButton.setOnClickListener {
+            addKeyword(chipEditText)
+        }
+    }
+
+    private fun addKeyword(chipEditText: EditText): Boolean {
+        val keyword = chipEditText.text.toString().trim()
+
+        if (!isCurrentKeywordValid || keyword.isEmpty()) {
+            return false
+        }
+
+        listener?.didAddKeyword(keyword)
+        onPreferenceChangeListener?.onPreferenceChange(this, _keywords)
+        notifyChanged()
+        chipEditText.text = null
+        return true
+    }
+
+    private fun onTextChangeListener(chipTextInputLayout: TextInputLayout, addKeywordButton: Button) = object : SimpleTextWatcher() {
+        override fun afterTextChanged(s: Editable) {
+            val keyword = s.toString().trim()
+            val errorMessage = when {
+                keyword.startsWith(".") -> {
+                    context.getString(R.string.settings_notification_keyword_contains_dot)
+                }
+                keyword.contains("\\")  -> {
+                    context.getString(R.string.settings_notification_keyword_contains_invalid_character, "\\")
+                }
+                keyword.contains("/")   -> {
+                    context.getString(R.string.settings_notification_keyword_contains_invalid_character, "/")
+                }
+                else -> null
+            }
+
+            chipTextInputLayout.isErrorEnabled = errorMessage != null
+            chipTextInputLayout.error = errorMessage
+            val keywordValid = errorMessage == null
+            addKeywordButton.isEnabled = keywordsEnabled && keywordValid
+            this@KeywordPreference.isCurrentKeywordValid = keywordValid
+        }
+    }
+
+    private fun addChipToGroup(keyword: String, chipGroup: ChipGroup) {
+        val chip = Chip(context, null, R.attr.vctr_keyword_style)
+        chip.text = keyword
+        chipGroup.addView(chip)
+
+        chip.setOnCloseIconClickListener {
+            if (!keywordsEnabled) {
+                return@setOnCloseIconClickListener
+            }
+            listener?.didRemoveKeyword(keyword)
+            onPreferenceChangeListener?.onPreferenceChange(this, _keywords)
+            notifyChanged()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
index f23eb07424..faa921b99e 100644
--- a/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
@@ -98,13 +98,10 @@ class CallRingPlayerOutgoing(
     private var player: MediaPlayer? = null
 
     fun start() {
-        val audioManager: AudioManager? = applicationContext.getSystemService()
+        applicationContext.getSystemService<AudioManager>()?.mode = AudioManager.MODE_IN_COMMUNICATION
         player?.release()
         player = createPlayer()
-
-        // Check if sound is enabled
-        val ringerMode = audioManager?.ringerMode
-        if (player != null && ringerMode == AudioManager.RINGER_MODE_NORMAL) {
+        if (player != null) {
             try {
                 if (player?.isPlaying == false) {
                     player?.start()
@@ -116,8 +113,6 @@ class CallRingPlayerOutgoing(
                 Timber.e(failure, "## VOIP Failed to start ringing outgoing")
                 player = null
             }
-        } else {
-            Timber.v("## VOIP Can't play $player ode $ringerMode")
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt b/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt
index e276e24851..ac6ced002e 100644
--- a/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt
+++ b/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt
@@ -21,7 +21,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.media.AudioManager
-import android.os.Build
 import timber.log.Timber
 import java.lang.ref.WeakReference
 
@@ -69,11 +68,7 @@ class WiredHeadsetStateReceiver : BroadcastReceiver() {
         fun createAndRegister(context: Context, listener: HeadsetEventListener): WiredHeadsetStateReceiver {
             val receiver = WiredHeadsetStateReceiver()
             receiver.delegate = WeakReference(listener)
-            val action = if (Build.VERSION.SDK_INT >= 21) {
-                AudioManager.ACTION_HEADSET_PLUG
-            } else {
-                Intent.ACTION_HEADSET_PLUG
-            }
+            val action = AudioManager.ACTION_HEADSET_PLUG
             context.registerReceiver(receiver, IntentFilter(action))
             return receiver
         }
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
deleted file mode 100644
index 256f2d963e..0000000000
--- a/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
+++ /dev/null
@@ -1,110 +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.core.ui.views
-
-import android.content.Context
-import android.text.SpannableString
-import android.text.method.LinkMovementMethod
-import android.text.style.ClickableSpan
-import android.util.AttributeSet
-import android.view.View
-import android.widget.RelativeLayout
-import androidx.core.view.isVisible
-import im.vector.app.R
-import im.vector.app.core.utils.tappableMatchingText
-import im.vector.app.databinding.ViewActiveConferenceViewBinding
-import im.vector.app.features.home.room.detail.RoomDetailViewState
-import im.vector.app.features.themes.ThemeUtils
-import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.widgets.model.Widget
-import org.matrix.android.sdk.api.session.widgets.model.WidgetType
-
-class ActiveConferenceView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
-
-    interface Callback {
-        fun onTapJoinAudio(jitsiWidget: Widget)
-        fun onTapJoinVideo(jitsiWidget: Widget)
-        fun onDelete(jitsiWidget: Widget)
-    }
-
-    var callback: Callback? = null
-    private var jitsiWidget: Widget? = null
-
-    private lateinit var views: ViewActiveConferenceViewBinding
-
-    init {
-        setupView()
-    }
-
-    private fun setupView() {
-        inflate(context, R.layout.view_active_conference_view, this)
-        views = ViewActiveConferenceViewBinding.bind(this)
-        setBackgroundColor(ThemeUtils.getColor(context, R.attr.colorPrimary))
-
-        // "voice" and "video" texts are underlined and clickable
-        val voiceString = context.getString(R.string.ongoing_conference_call_voice)
-        val videoString = context.getString(R.string.ongoing_conference_call_video)
-
-        val fullMessage = context.getString(R.string.ongoing_conference_call, voiceString, videoString)
-
-        val styledText = SpannableString(fullMessage)
-        styledText.tappableMatchingText(voiceString, object : ClickableSpan() {
-            override fun onClick(widget: View) {
-                jitsiWidget?.let {
-                    callback?.onTapJoinAudio(it)
-                }
-            }
-        })
-        styledText.tappableMatchingText(videoString, object : ClickableSpan() {
-            override fun onClick(widget: View) {
-                jitsiWidget?.let {
-                    callback?.onTapJoinVideo(it)
-                }
-            }
-        })
-
-        views.activeConferenceInfo.apply {
-            text = styledText
-            movementMethod = LinkMovementMethod.getInstance()
-        }
-
-        views.deleteWidgetButton.setOnClickListener {
-            jitsiWidget?.let { callback?.onDelete(it) }
-        }
-    }
-
-    fun render(state: RoomDetailViewState) {
-        val summary = state.asyncRoomSummary()
-        if (summary?.membership == Membership.JOIN) {
-            // We only display banner for 'live' widgets
-            jitsiWidget = state.activeRoomWidgets()?.firstOrNull {
-                // for now only jitsi?
-                it.type == WidgetType.Jitsi
-            }
-
-            isVisible = jitsiWidget != null
-            // if sent by me or if i can moderate?
-            views.deleteWidgetButton.isVisible = state.isAllowedToManageWidgets
-        } else {
-            isVisible = false
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsView.kt
index d1332f18dc..2f7eecc22c 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsView.kt
@@ -18,7 +18,9 @@ package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.RelativeLayout
+import android.util.TypedValue
+import android.widget.FrameLayout
+import androidx.appcompat.content.res.AppCompatResources
 import im.vector.app.R
 import im.vector.app.databinding.ViewCurrentCallsBinding
 import im.vector.app.features.call.webrtc.WebRtcCall
@@ -29,7 +31,7 @@ class CurrentCallsView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
+) : FrameLayout(context, attrs, defStyleAttr) {
 
     interface Callback {
         fun onTapToReturnToCall()
@@ -42,25 +44,33 @@ class CurrentCallsView @JvmOverloads constructor(
         inflate(context, R.layout.view_current_calls, this)
         views = ViewCurrentCallsBinding.bind(this)
         setBackgroundColor(ThemeUtils.getColor(context, R.attr.colorPrimary))
+        val outValue = TypedValue().also {
+            context.theme.resolveAttribute(android.R.attr.selectableItemBackground, it, true)
+        }
+        foreground = AppCompatResources.getDrawable(context, outValue.resourceId)
         setOnClickListener { callback?.onTapToReturnToCall() }
     }
 
     fun render(calls: List<WebRtcCall>, formattedDuration: String) {
-        val connectedCalls = calls.filter {
-            it.mxCall.state is CallState.Connected
-        }
-        val heldCalls = connectedCalls.filter {
-            it.isLocalOnHold || it.remoteOnHold
-        }
-        if (connectedCalls.isEmpty()) return
-        views.currentCallsInfo.text = if (connectedCalls.size == heldCalls.size) {
-            resources.getQuantityString(R.plurals.call_only_paused, heldCalls.size, heldCalls.size)
-        } else {
-            if (heldCalls.isEmpty()) {
-                resources.getString(R.string.call_only_active, formattedDuration)
-            } else {
-                resources.getQuantityString(R.plurals.call_one_active_and_other_paused, heldCalls.size, formattedDuration, heldCalls.size)
+        val tapToReturnFormat = if (calls.size == 1) {
+            val firstCall = calls.first()
+            when (firstCall.mxCall.state) {
+                is CallState.Idle,
+                is CallState.CreateOffer,
+                is CallState.LocalRinging,
+                is CallState.Dialing   -> {
+                    resources.getString(R.string.call_ringing)
+                }
+                is CallState.Answering -> {
+                    resources.getString(R.string.call_connecting)
+                }
+                else                   -> {
+                    resources.getString(R.string.call_one_active, formattedDuration)
+                }
             }
+        } else {
+            resources.getQuantityString(R.plurals.call_active_status, calls.size, calls.size)
         }
+        views.currentCallsInfo.text = resources.getString(R.string.call_tap_to_return, tapToReturnFormat)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsViewPresenter.kt b/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsViewPresenter.kt
new file mode 100644
index 0000000000..5aee73ee69
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsViewPresenter.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.ui.views
+
+import androidx.core.view.isVisible
+import im.vector.app.features.call.webrtc.WebRtcCall
+
+class CurrentCallsViewPresenter {
+
+    private var currentCallsView: CurrentCallsView? = null
+    private var currentCall: WebRtcCall? = null
+    private var calls: List<WebRtcCall> = emptyList()
+
+    private val tickListener = object : WebRtcCall.Listener {
+        override fun onTick(formattedDuration: String) {
+            currentCallsView?.render(calls, formattedDuration)
+        }
+    }
+
+    fun updateCall(currentCall: WebRtcCall?, calls: List<WebRtcCall>) {
+        this.currentCall?.removeListener(tickListener)
+        this.currentCall = currentCall
+        this.currentCall?.addListener(tickListener)
+        this.calls = calls
+        val hasActiveCall = currentCall != null
+        currentCallsView?.isVisible = hasActiveCall
+        currentCallsView?.render(calls, currentCall?.formattedDuration() ?: "")
+    }
+
+    fun bind(activeCallView: CurrentCallsView, interactionListener: CurrentCallsView.Callback) {
+        this.currentCallsView = activeCallView
+        this.currentCallsView?.callback = interactionListener
+        this.currentCall?.addListener(tickListener)
+    }
+
+    fun unBind() {
+        this.currentCallsView?.callback = null
+        this.currentCall?.removeListener(tickListener)
+        currentCallsView = null
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt b/vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt
new file mode 100644
index 0000000000..fa1e2c1403
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt
@@ -0,0 +1,69 @@
+/*
+ * 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.core.ui.views
+
+import android.animation.Animator
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import androidx.core.content.ContextCompat
+import im.vector.app.R
+import im.vector.app.databinding.ViewJoinConferenceBinding
+
+class JoinConferenceView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    var views: ViewJoinConferenceBinding? = null
+    var onJoinClicked: (() -> Unit)? = null
+    var backgroundAnimator: Animator? = null
+
+    init {
+        inflate(context, R.layout.view_join_conference, this)
+    }
+
+    @SuppressLint("Recycle")
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        views = ViewJoinConferenceBinding.bind(this)
+        views?.joinConferenceButton?.setOnClickListener { onJoinClicked?.invoke() }
+        val colorFrom = ContextCompat.getColor(context, R.color.palette_element_green)
+        val colorTo = ContextCompat.getColor(context, R.color.join_conference_animated_color)
+        // Animate button color to highlight
+        backgroundAnimator = ValueAnimator.ofObject(ArgbEvaluator(), colorFrom, colorTo).apply {
+            repeatMode = ValueAnimator.REVERSE
+            repeatCount = ValueAnimator.INFINITE
+            duration = 500
+            addUpdateListener { animator ->
+                val color = animator.animatedValue as Int
+                views?.joinConferenceButton?.setBackgroundColor(color)
+            }
+        }
+        backgroundAnimator?.start()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        views = null
+        backgroundAnimator?.cancel()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/KnownCallsViewHolder.kt b/vector/src/main/java/im/vector/app/core/ui/views/KnownCallsViewHolder.kt
deleted file mode 100644
index d49cf929b6..0000000000
--- a/vector/src/main/java/im/vector/app/core/ui/views/KnownCallsViewHolder.kt
+++ /dev/null
@@ -1,114 +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.core.ui.views
-
-import androidx.core.view.isVisible
-import com.google.android.material.card.MaterialCardView
-import im.vector.app.core.epoxy.onClick
-import im.vector.app.features.call.utils.EglUtils
-import im.vector.app.features.call.webrtc.WebRtcCall
-import org.matrix.android.sdk.api.session.call.CallState
-import org.webrtc.RendererCommon
-import org.webrtc.SurfaceViewRenderer
-
-class KnownCallsViewHolder {
-
-    private var activeCallPiP: SurfaceViewRenderer? = null
-    private var currentCallsView: CurrentCallsView? = null
-    private var pipWrapper: MaterialCardView? = null
-    private var currentCall: WebRtcCall? = null
-    private var calls: List<WebRtcCall> = emptyList()
-
-    private var activeCallPipInitialized = false
-
-    private val tickListener = object : WebRtcCall.Listener {
-        override fun onTick(formattedDuration: String) {
-            currentCallsView?.render(calls, formattedDuration)
-        }
-    }
-
-    fun updateCall(currentCall: WebRtcCall?, calls: List<WebRtcCall>) {
-        activeCallPiP?.let {
-            this.currentCall?.detachRenderers(listOf(it))
-        }
-        this.currentCall?.removeListener(tickListener)
-        this.currentCall = currentCall
-        this.currentCall?.addListener(tickListener)
-        this.calls = calls
-        val hasActiveCall = currentCall?.mxCall?.state is CallState.Connected
-        if (hasActiveCall) {
-            val isVideoCall = currentCall?.mxCall?.isVideoCall == true
-            if (isVideoCall) initIfNeeded()
-            currentCallsView?.isVisible = !isVideoCall
-            currentCallsView?.render(calls, currentCall?.formattedDuration() ?: "")
-            pipWrapper?.isVisible = isVideoCall
-            activeCallPiP?.isVisible = isVideoCall
-            activeCallPiP?.let {
-                currentCall?.attachViewRenderers(null, it, null)
-            }
-        } else {
-            currentCallsView?.isVisible = false
-            activeCallPiP?.isVisible = false
-            pipWrapper?.isVisible = false
-            activeCallPiP?.let {
-                currentCall?.detachRenderers(listOf(it))
-            }
-        }
-    }
-
-    private fun initIfNeeded() {
-        if (!activeCallPipInitialized && activeCallPiP != null) {
-            activeCallPiP?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
-            EglUtils.rootEglBase?.let { eglBase ->
-                activeCallPiP?.init(eglBase.eglBaseContext, null)
-                activeCallPiP?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_BALANCED)
-                activeCallPiP?.setEnableHardwareScaler(true /* enabled */)
-                activeCallPiP?.setZOrderMediaOverlay(true)
-                activeCallPipInitialized = true
-            }
-        }
-    }
-
-    fun bind(activeCallPiP: SurfaceViewRenderer,
-             activeCallView: CurrentCallsView,
-             pipWrapper: MaterialCardView,
-             interactionListener: CurrentCallsView.Callback) {
-        this.activeCallPiP = activeCallPiP
-        this.currentCallsView = activeCallView
-        this.pipWrapper = pipWrapper
-        this.currentCallsView?.callback = interactionListener
-        pipWrapper.onClick {
-            interactionListener.onTapToReturnToCall()
-        }
-        this.currentCall?.addListener(tickListener)
-    }
-
-    fun unBind() {
-        activeCallPiP?.let {
-            currentCall?.detachRenderers(listOf(it))
-        }
-        if (activeCallPipInitialized) {
-            activeCallPiP?.release()
-        }
-        this.currentCallsView?.callback = null
-        this.currentCall?.removeListener(tickListener)
-        pipWrapper?.setOnClickListener(null)
-        activeCallPiP = null
-        currentCallsView = null
-        pipWrapper = null
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index d0535b667f..bdaf520ba1 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -36,6 +36,7 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.browser.customtabs.CustomTabsSession
+import androidx.core.app.ShareCompat
 import androidx.core.content.FileProvider
 import androidx.core.content.getSystemService
 import im.vector.app.BuildConfig
@@ -297,23 +298,19 @@ fun openMedia(activity: Activity, savedMediaPath: String, mimeType: String) {
 }
 
 fun shareMedia(context: Context, file: File, mediaMimeType: String?) {
-    var mediaUri: Uri? = null
-    try {
-        mediaUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", file)
+    val mediaUri = try {
+        FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", file)
     } catch (e: Exception) {
         Timber.e(e, "onMediaAction Selected File cannot be shared")
+        return
     }
 
-    if (null != mediaUri) {
-        val sendIntent = Intent()
-        sendIntent.action = Intent.ACTION_SEND
-        // Grant temporary read permission to the content URI
-        sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        sendIntent.type = mediaMimeType
-        sendIntent.putExtra(Intent.EXTRA_STREAM, mediaUri)
+    val sendIntent = ShareCompat.IntentBuilder(context)
+            .setType(mediaMimeType)
+            .setStream(mediaUri)
+            .getIntent()
 
-        sendShareIntent(context, sendIntent)
-    }
+    sendShareIntent(context, sendIntent)
 }
 
 fun shareText(context: Context, text: String) {
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
index c0d4669108..eba5dadeda 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
@@ -103,11 +103,11 @@ class AttachmentTypeSelectorView(context: Context,
             animateWindowInCircular(anchor, contentView)
         }
         animateButtonIn(views.attachmentGalleryButton, ANIMATION_DURATION / 2)
-        animateButtonIn(views.attachmentCameraButton, ANIMATION_DURATION / 2)
-        animateButtonIn(views.attachmentFileButton, ANIMATION_DURATION / 4)
-        animateButtonIn(views.attachmentAudioButton, ANIMATION_DURATION / 2)
+        animateButtonIn(views.attachmentCameraButton, ANIMATION_DURATION / 4)
+        animateButtonIn(views.attachmentFileButton, ANIMATION_DURATION / 2)
+        animateButtonIn(views.attachmentAudioButton, 0)
         animateButtonIn(views.attachmentContactButton, ANIMATION_DURATION / 4)
-        animateButtonIn(views.attachmentStickersButton, 0)
+        animateButtonIn(views.attachmentStickersButton, ANIMATION_DURATION / 2)
     }
 
     override fun dismiss() {
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 ecc607f08d..aa0c10e0a2 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
@@ -71,6 +71,23 @@ class AutocompleteMemberPresenter @AssistedInject constructor(context: Context,
         val members = room.getRoomMembers(queryParams)
                 .asSequence()
                 .sortedBy { it.displayName }
+                .disambiguate()
         controller.setData(members.toList())
     }
 }
+
+private fun Sequence<RoomMemberSummary>.disambiguate(): Sequence<RoomMemberSummary> {
+    val displayNames = hashMapOf<String, Int>().also { map ->
+        for (item in this) {
+            item.displayName?.lowercase()?.also { displayName ->
+                map[displayName] = map.getOrPut(displayName, { 0 }) + 1
+            }
+        }
+    }
+
+    return map { roomMemberSummary ->
+        if (displayNames[roomMemberSummary.displayName?.lowercase()] ?: 0 > 1) {
+            roomMemberSummary.copy(displayName = roomMemberSummary.displayName + " " + roomMemberSummary.userId)
+        } else roomMemberSummary
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt
index f23b26883a..f9e2338077 100644
--- a/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt
@@ -23,13 +23,9 @@ import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.activityViewModel
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetCallControlsBinding
-import im.vector.app.features.call.audio.CallAudioManager
-
-import me.gujun.android.span.span
 
 class CallControlsBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetCallControlsBinding>() {
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetCallControlsBinding {
@@ -45,10 +41,6 @@ class CallControlsBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetC
             renderState(it)
         }
 
-        views.callControlsSoundDevice.views.bottomSheetActionClickableZone.debouncedClicks {
-            callViewModel.handle(VectorCallViewActions.SwitchSoundDevice)
-        }
-
         views.callControlsSwitchCamera.views.bottomSheetActionClickableZone.debouncedClicks {
             callViewModel.handle(VectorCallViewActions.ToggleCamera)
             dismiss()
@@ -72,74 +64,11 @@ class CallControlsBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetC
             callViewModel.handle(VectorCallViewActions.InitiateCallTransfer)
             dismiss()
         }
-
-        callViewModel.observeViewEvents {
-            when (it) {
-                is VectorCallViewEvents.ShowSoundDeviceChooser -> {
-                    showSoundDeviceChooser(it.available, it.current)
-                }
-                else                                           -> {
-                }
-            }
-        }
-    }
-
-    private fun showSoundDeviceChooser(available: Set<CallAudioManager.Device>, current: CallAudioManager.Device) {
-        val soundDevices = available.map {
-            when (it) {
-                CallAudioManager.Device.WIRELESS_HEADSET -> span {
-                    text = getString(R.string.sound_device_wireless_headset)
-                    textStyle = if (current == it) "bold" else "normal"
-                }
-                CallAudioManager.Device.PHONE            -> span {
-                    text = getString(R.string.sound_device_phone)
-                    textStyle = if (current == it) "bold" else "normal"
-                }
-                CallAudioManager.Device.SPEAKER          -> span {
-                    text = getString(R.string.sound_device_speaker)
-                    textStyle = if (current == it) "bold" else "normal"
-                }
-                CallAudioManager.Device.HEADSET          -> span {
-                    text = getString(R.string.sound_device_headset)
-                    textStyle = if (current == it) "bold" else "normal"
-                }
-            }
-        }
-        MaterialAlertDialogBuilder(requireContext())
-                .setItems(soundDevices.toTypedArray()) { d, n ->
-                    d.cancel()
-                    when (soundDevices[n].toString()) {
-                        // TODO Make an adapter and handle multiple Bluetooth headsets. Also do not use translations.
-                        getString(R.string.sound_device_phone) -> {
-                            callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(CallAudioManager.Device.PHONE))
-                        }
-                        getString(R.string.sound_device_speaker) -> {
-                            callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(CallAudioManager.Device.SPEAKER))
-                        }
-                        getString(R.string.sound_device_headset) -> {
-                            callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(CallAudioManager.Device.HEADSET))
-                        }
-                        getString(R.string.sound_device_wireless_headset) -> {
-                            callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(CallAudioManager.Device.WIRELESS_HEADSET))
-                        }
-                    }
-                }
-                .setNegativeButton(R.string.cancel, null)
-                .show()
     }
 
     private fun renderState(state: VectorCallViewState) {
-        views.callControlsSoundDevice.title = getString(R.string.call_select_sound_device)
-        views.callControlsSoundDevice.subTitle = when (state.device) {
-            CallAudioManager.Device.PHONE            -> getString(R.string.sound_device_phone)
-            CallAudioManager.Device.SPEAKER          -> getString(R.string.sound_device_speaker)
-            CallAudioManager.Device.HEADSET          -> getString(R.string.sound_device_headset)
-            CallAudioManager.Device.WIRELESS_HEADSET -> getString(R.string.sound_device_wireless_headset)
-        }
-
         views.callControlsSwitchCamera.isVisible = state.isVideoCall && state.canSwitchCamera
         views.callControlsSwitchCamera.subTitle = getString(if (state.isFrontCamera) R.string.call_camera_front else R.string.call_camera_back)
-
         if (state.isVideoCall) {
             views.callControlsToggleSDHD.isVisible = true
             if (state.isHD) {
diff --git a/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
index 3742de6271..f0f75370e3 100644
--- a/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
@@ -36,16 +36,19 @@ class CallControlsView @JvmOverloads constructor(
     init {
         inflate(context, R.layout.view_call_controls, this)
         views = ViewCallControlsBinding.bind(this)
-
+        views.audioSettingsIcon.setOnClickListener { didTapAudioSettings() }
         views.ringingControlAccept.setOnClickListener { acceptIncomingCall() }
         views.ringingControlDecline.setOnClickListener { declineIncomingCall() }
         views.endCallIcon.setOnClickListener { endOngoingCall() }
         views.muteIcon.setOnClickListener { toggleMute() }
         views.videoToggleIcon.setOnClickListener { toggleVideo() }
-        views.openChatIcon.setOnClickListener { returnToChat() }
         views.moreIcon.setOnClickListener { moreControlOption() }
     }
 
+    private fun didTapAudioSettings() {
+        interactionListener?.didTapAudioSettings()
+    }
+
     private fun acceptIncomingCall() {
         interactionListener?.didAcceptIncomingCall()
     }
@@ -66,10 +69,6 @@ class CallControlsView @JvmOverloads constructor(
         interactionListener?.didTapToggleVideo()
     }
 
-    private fun returnToChat() {
-        interactionListener?.returnToChat()
-    }
-
     private fun moreControlOption() {
         interactionListener?.didTapMore()
     }
@@ -77,49 +76,36 @@ class CallControlsView @JvmOverloads constructor(
     fun updateForState(state: VectorCallViewState) {
         val callState = state.callState.invoke()
         if (state.isAudioMuted) {
-            views.muteIcon.setImageResource(R.drawable.ic_microphone_off)
+            views.muteIcon.setImageResource(R.drawable.ic_mic_off)
             views.muteIcon.contentDescription = resources.getString(R.string.a11y_unmute_microphone)
         } else {
-            views.muteIcon.setImageResource(R.drawable.ic_microphone_on)
+            views.muteIcon.setImageResource(R.drawable.ic_mic_on)
             views.muteIcon.contentDescription = resources.getString(R.string.a11y_mute_microphone)
         }
         if (state.isVideoEnabled) {
             views.videoToggleIcon.setImageResource(R.drawable.ic_video)
             views.videoToggleIcon.contentDescription = resources.getString(R.string.a11y_stop_camera)
         } else {
-          views.videoToggleIcon.setImageResource(R.drawable.ic_video_off)
+            views.videoToggleIcon.setImageResource(R.drawable.ic_video_off)
             views.videoToggleIcon.contentDescription = resources.getString(R.string.a11y_start_camera)
         }
 
         when (callState) {
-            is CallState.Idle,
-            is CallState.Dialing,
-            is CallState.Answering    -> {
-                views.ringingControls.isVisible = true
-                views.ringingControlAccept.isVisible = false
-                views.ringingControlDecline.isVisible = true
-                views.connectedControls.isVisible = false
-            }
             is CallState.LocalRinging -> {
                 views.ringingControls.isVisible = true
                 views.ringingControlAccept.isVisible = true
                 views.ringingControlDecline.isVisible = true
                 views.connectedControls.isVisible = false
             }
-            is CallState.Connected    -> {
-                if (callState.iceConnectionState == MxPeerConnectionState.CONNECTED) {
-                    views.ringingControls.isVisible = false
-                    views.connectedControls.isVisible = true
-                    views.videoToggleIcon.isVisible = state.isVideoCall
-                } else {
-                    views.ringingControls.isVisible = true
-                    views.ringingControlAccept.isVisible = false
-                    views.ringingControlDecline.isVisible = true
-                    views.connectedControls.isVisible = false
-                }
+            is CallState.Connected,
+            is CallState.Dialing,
+            is CallState.Answering    -> {
+                views.ringingControls.isVisible = false
+                views.connectedControls.isVisible = true
+                views.videoToggleIcon.isVisible = state.isVideoCall
+                views.moreIcon.isVisible = callState is CallState.Connected && callState.iceConnectionState == MxPeerConnectionState.CONNECTED
             }
-            is CallState.Ended,
-            null                      -> {
+            else                      -> {
                 views.ringingControls.isVisible = false
                 views.connectedControls.isVisible = false
             }
@@ -127,12 +113,12 @@ class CallControlsView @JvmOverloads constructor(
     }
 
     interface InteractionListener {
+        fun didTapAudioSettings()
         fun didAcceptIncomingCall()
         fun didDeclineIncomingCall()
         fun didEndCall()
         fun didTapToggleMute()
         fun didTapToggleVideo()
-        fun returnToChat()
         fun didTapMore()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/CallSoundDeviceChooserBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/CallSoundDeviceChooserBottomSheet.kt
new file mode 100644
index 0000000000..649b7fee3e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/CallSoundDeviceChooserBottomSheet.kt
@@ -0,0 +1,80 @@
+/*
+ * 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.call
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.epoxy.SimpleEpoxyController
+import com.airbnb.mvrx.activityViewModel
+import im.vector.app.core.epoxy.bottomsheet.BottomSheetActionItem_
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetGenericListBinding
+import im.vector.app.features.call.audio.CallAudioManager
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
+
+class CallSoundDeviceChooserBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetGenericListBinding>() {
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetGenericListBinding {
+        return BottomSheetGenericListBinding.inflate(inflater, container, false)
+    }
+
+    private val callViewModel: VectorCallViewModel by activityViewModel()
+    private val controller = SimpleEpoxyController()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        views.bottomSheetRecyclerView.configureWith(controller, hasFixedSize = false)
+        callViewModel.observeViewEvents {
+            when (it) {
+                is VectorCallViewEvents.ShowSoundDeviceChooser -> {
+                    render(it.available, it.current)
+                }
+                else                                           -> {
+                }
+            }
+        }
+        callViewModel.handle(VectorCallViewActions.SwitchSoundDevice)
+    }
+
+    private fun render(available: Set<CallAudioManager.Device>, current: CallAudioManager.Device) {
+        val models = available.map { device ->
+            val title = when (device) {
+                is CallAudioManager.Device.WirelessHeadset -> device.name ?: getString(device.titleRes)
+                else                                       -> getString(device.titleRes)
+            }
+            BottomSheetActionItem_().apply {
+                id(device.titleRes)
+                text(title)
+                iconRes(device.drawableRes)
+                selected(current == device)
+                listener {
+                    callViewModel.handle(VectorCallViewActions.ChangeAudioDevice(device))
+                    dismiss()
+                }
+            }
+        }
+        controller.setModels(models)
+    }
+
+    companion object {
+        fun newInstance(): RoomListQuickActionsBottomSheet {
+            return RoomListQuickActionsBottomSheet()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/SharedKnownCallsViewModel.kt b/vector/src/main/java/im/vector/app/features/call/SharedKnownCallsViewModel.kt
index b33edd09e0..fb5e48af98 100644
--- a/vector/src/main/java/im/vector/app/features/call/SharedKnownCallsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/SharedKnownCallsViewModel.kt
@@ -32,14 +32,12 @@ class SharedKnownCallsViewModel @Inject constructor(
     val callListener = object : WebRtcCall.Listener {
 
         override fun onStateUpdate(call: MxCall) {
-            // post it-self
-            liveKnownCalls.postValue(liveKnownCalls.value)
+            liveKnownCalls.postValue(callManager.getCalls())
         }
 
         override fun onHoldUnhold() {
             super.onHoldUnhold()
-            // post it-self
-            liveKnownCalls.postValue(liveKnownCalls.value)
+            liveKnownCalls.postValue(callManager.getCalls())
         }
     }
 
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 a1e3717329..f71dcc0635 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
@@ -17,15 +17,20 @@
 package im.vector.app.features.call
 
 import android.app.KeyguardManager
+import android.app.PictureInPictureParams
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
+import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
+import android.util.Rational
+import android.view.MenuItem
 import android.view.View
 import android.view.WindowManager
+import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import androidx.core.view.isInvisible
@@ -34,9 +39,11 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
 import com.airbnb.mvrx.withState
+import com.google.android.material.card.MaterialCardView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL
 import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL
@@ -51,6 +58,8 @@ import im.vector.app.features.call.webrtc.WebRtcCallManager
 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 io.github.hyuwah.draggableviewlib.DraggableView
+import io.github.hyuwah.draggableviewlib.setupDraggable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.extensions.orFalse
@@ -58,6 +67,7 @@ import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.call.CallState
 import org.matrix.android.sdk.api.session.call.MxPeerConnectionState
 import org.matrix.android.sdk.api.session.call.TurnServerResponse
+import org.matrix.android.sdk.api.session.room.model.call.EndCallReason
 import org.webrtc.EglBase
 import org.webrtc.RendererCommon
 import timber.log.Timber
@@ -85,7 +95,6 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
     }
 
     private val callViewModel: VectorCallViewModel by viewModel()
-    private lateinit var callArgs: CallArgs
 
     @Inject lateinit var callManager: WebRtcCallManager
     @Inject lateinit var viewModelFactory: VectorCallViewModel.Factory
@@ -97,6 +106,8 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
     }
 
     private var rootEglBase: EglBase? = null
+    private var pipDraggrableView: DraggableView<MaterialCardView>? = null
+    private var otherCallDraggableView: DraggableView<MaterialCardView>? = null
 
     var surfaceRenderersAreInitialized = false
 
@@ -113,13 +124,6 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
         window.navigationBarColor = Color.BLACK
         super.onCreate(savedInstanceState)
 
-        if (intent.hasExtra(MvRx.KEY_ARG)) {
-            callArgs = intent.getParcelableExtra(MvRx.KEY_ARG)!!
-        } else {
-            Timber.tag(loggerTag.value).e("missing callArgs for VectorCall Activity")
-            finish()
-        }
-
         Timber.tag(loggerTag.value).v("EXTRA_MODE is ${intent.getStringExtra(EXTRA_MODE)}")
         if (intent.getStringExtra(EXTRA_MODE) == INCOMING_RINGING) {
             turnScreenOnAndKeyguardOff()
@@ -127,12 +131,19 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
         if (savedInstanceState != null) {
             (supportFragmentManager.findFragmentByTag(FRAGMENT_DIAL_PAD_TAG) as? CallDialPadBottomSheet)?.callback = dialPadCallback
         }
+        setSupportActionBar(views.callToolbar)
         configureCallViews()
 
         callViewModel.subscribe(this) {
             renderState(it)
         }
 
+        callViewModel.asyncSubscribe(this, VectorCallViewState::callState) {
+            if (it is CallState.Ended) {
+                handleCallEnded(it)
+            }
+        }
+
         callViewModel.viewEvents
                 .observe()
                 .observeOn(AndroidSchedulers.mainThread())
@@ -141,25 +152,89 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
                 }
                 .disposeOnDestroy()
 
-        if (callArgs.isVideoCall) {
-            if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL, this, permissionCameraLauncher, R.string.permissions_rationale_msg_camera_and_audio)) {
-                start()
-            }
-        } else {
-            if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL, this, permissionCameraLauncher, R.string.permissions_rationale_msg_record_audio)) {
-                start()
+        callViewModel.selectSubscribe(this, VectorCallViewState::callId, VectorCallViewState::isVideoCall) { _, isVideoCall ->
+            if (isVideoCall) {
+                if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL, this, permissionCameraLauncher, R.string.permissions_rationale_msg_camera_and_audio)) {
+                    setupRenderersIfNeeded()
+                }
+            } else {
+                if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL, this, permissionCameraLauncher, R.string.permissions_rationale_msg_record_audio)) {
+                    setupRenderersIfNeeded()
+                }
             }
         }
     }
 
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        intent?.takeIf { it.hasExtra(MvRx.KEY_ARG) }
+                ?.let { intent.getParcelableExtra<CallArgs>(MvRx.KEY_ARG) }
+                ?.let {
+                    callViewModel.handle(VectorCallViewActions.SwitchCall(it))
+                }
+    }
+
+    override fun getMenuRes() = R.menu.vector_call
+
+    override fun onUserLeaveHint() {
+        enterPictureInPictureIfRequired()
+    }
+
+    override fun onBackPressed() {
+        if (!enterPictureInPictureIfRequired()) {
+            super.onBackPressed()
+        }
+    }
+
+    private fun enterPictureInPictureIfRequired(): Boolean = withState(callViewModel) {
+        if (!it.isVideoCall) {
+            false
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val aspectRatio = Rational(resources.getDimensionPixelSize(R.dimen.call_pip_width), resources.getDimensionPixelSize(R.dimen.call_pip_height))
+            val params = PictureInPictureParams.Builder()
+                    .setAspectRatio(aspectRatio)
+                    .build()
+            renderPiPMode(it)
+            enterPictureInPictureMode(params)
+        } else {
+            false
+        }
+    }
+
+    private fun isInPictureInPictureModeSafe(): Boolean {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInPictureInPictureMode
+    }
+
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) = withState(callViewModel) {
+        renderState(it)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.menu_call_open_chat) {
+            returnToChat()
+            return true
+        } else if (item.itemId == android.R.id.home) {
+            // We check here as we want PiP in some cases
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
     override fun onDestroy() {
-        callManager.getCallById(callArgs.callId)?.detachRenderers(listOf(views.pipRenderer, views.fullscreenRenderer))
+        detachRenderersIfNeeded()
+        turnScreenOffAndKeyguardOn()
+        super.onDestroy()
+    }
+
+    private fun detachRenderersIfNeeded() {
+        val callId = withState(callViewModel) { it.callId }
+        callManager.getCallById(callId)?.detachRenderers(listOf(views.pipRenderer, views.fullscreenRenderer))
         if (surfaceRenderersAreInitialized) {
             views.pipRenderer.release()
             views.fullscreenRenderer.release()
+            surfaceRenderersAreInitialized = false
         }
-        turnScreenOffAndKeyguardOn()
-        super.onDestroy()
     }
 
     private fun renderState(state: VectorCallViewState) {
@@ -168,53 +243,57 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
             finish()
             return
         }
+        if (isInPictureInPictureModeSafe()) {
+            renderPiPMode(state)
+        } else {
+            renderFullScreenMode(state)
+        }
+    }
 
+    private fun renderFullScreenMode(state: VectorCallViewState) {
+        views.callToolbar.isVisible = true
+        views.callControlsView.isVisible = true
         views.callControlsView.updateForState(state)
         val callState = state.callState.invoke()
-        views.callConnectingProgress.isVisible = false
         views.callActionText.setOnClickListener(null)
         views.callActionText.isVisible = false
         views.smallIsHeldIcon.isVisible = false
         when (callState) {
             is CallState.Idle,
             is CallState.CreateOffer,
-            is CallState.Dialing      -> {
-                views.callVideoGroup.isInvisible = true
+            is CallState.LocalRinging,
+            is CallState.Dialing   -> {
+                views.fullscreenRenderer.isVisible = false
+                views.pipRendererWrapper.isVisible = false
                 views.callInfoGroup.isVisible = true
-                views.callStatusText.setText(R.string.call_ring)
+                views.callToolbar.setSubtitle(R.string.call_ringing)
                 configureCallInfo(state)
             }
-
-            is CallState.LocalRinging -> {
-                views.callVideoGroup.isInvisible = true
+            is CallState.Answering -> {
+                views.fullscreenRenderer.isVisible = false
+                views.pipRendererWrapper.isVisible = false
                 views.callInfoGroup.isVisible = true
-                views.callStatusText.text = null
-                configureCallInfo(state)
-            }
-
-            is CallState.Answering    -> {
-                views.callVideoGroup.isInvisible = true
-                views.callInfoGroup.isVisible = true
-                views.callStatusText.setText(R.string.call_connecting)
-                views.callConnectingProgress.isVisible = true
+                views.callToolbar.setSubtitle(R.string.call_connecting)
                 configureCallInfo(state)
             }
             is CallState.Connected -> {
+                views.callToolbar.subtitle = state.formattedDuration
                 if (callState.iceConnectionState == MxPeerConnectionState.CONNECTED) {
                     if (state.isLocalOnHold || state.isRemoteOnHold) {
                         views.smallIsHeldIcon.isVisible = true
-                        views.callVideoGroup.isInvisible = true
+                        views.fullscreenRenderer.isVisible = false
+                        views.pipRendererWrapper.isVisible = false
                         views.callInfoGroup.isVisible = true
                         configureCallInfo(state, blurAvatar = true)
                         if (state.isRemoteOnHold) {
                             views.callActionText.setText(R.string.call_resume_action)
                             views.callActionText.isVisible = true
                             views.callActionText.setOnClickListener { callViewModel.handle(VectorCallViewActions.ToggleHoldResume) }
-                            views.callStatusText.setText(R.string.call_held_by_you)
+                            views.callToolbar.setSubtitle(R.string.call_held_by_you)
                         } else {
                             views.callActionText.isInvisible = true
                             state.callInfo?.opponentUserItem?.let {
-                                views.callStatusText.text = getString(R.string.call_held_by_user, it.getBestName())
+                                views.callToolbar.subtitle = getString(R.string.call_held_by_user, it.getBestName())
                             }
                         }
                     } else if (state.transferee !is VectorCallViewState.TransfereeState.NoTransferee) {
@@ -226,45 +305,127 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
                         views.callActionText.text = getString(R.string.call_transfer_transfer_to_title, transfereeName)
                         views.callActionText.isVisible = true
                         views.callActionText.setOnClickListener { callViewModel.handle(VectorCallViewActions.TransferCall) }
-                        views.callStatusText.text = state.formattedDuration
                         configureCallInfo(state)
                     } else {
-                        views.callStatusText.text = state.formattedDuration
                         configureCallInfo(state)
-                        if (callArgs.isVideoCall) {
-                            views.callVideoGroup.isVisible = true
+                        if (state.isVideoCall) {
+                            views.fullscreenRenderer.isVisible = true
+                            views.pipRendererWrapper.isVisible = true
                             views.callInfoGroup.isVisible = false
                             views.pipRenderer.isVisible = !state.isVideoCaptureInError && state.otherKnownCallInfo == null
                         } else {
-                            views.callVideoGroup.isInvisible = true
+                            views.fullscreenRenderer.isVisible = false
+                            views.pipRendererWrapper.isVisible = false
                             views.callInfoGroup.isVisible = true
                         }
                     }
                 } else {
                     // This state is not final, if you change network, new candidates will be sent
-                    views.callVideoGroup.isInvisible = true
+                    views.fullscreenRenderer.isVisible = false
+                    views.pipRendererWrapper.isVisible = false
                     views.callInfoGroup.isVisible = true
                     configureCallInfo(state)
-                    views.callStatusText.setText(R.string.call_connecting)
-                    views.callConnectingProgress.isVisible = true
+                    views.callToolbar.setSubtitle(R.string.call_connecting)
                 }
             }
             is CallState.Ended     -> {
-                finish()
+                views.fullscreenRenderer.isVisible = false
+                views.pipRendererWrapper.isVisible = false
+                views.callInfoGroup.isVisible = true
+                views.callToolbar.setSubtitle(R.string.call_ended)
+                configureCallInfo(state)
             }
-            null                   -> {
+            else                   -> {
+                views.fullscreenRenderer.isVisible = false
+                views.pipRendererWrapper.isVisible = false
+                views.callInfoGroup.isInvisible = true
             }
         }
     }
 
+    private fun renderPiPMode(state: VectorCallViewState) {
+        val callState = state.callState.invoke()
+        views.callToolbar.isVisible = false
+        views.callControlsView.isVisible = false
+        views.pipRendererWrapper.isVisible = false
+        views.pipRenderer.isVisible = false
+        views.callActionText.isVisible = false
+        when (callState) {
+            is CallState.Idle,
+            is CallState.CreateOffer,
+            is CallState.LocalRinging,
+            is CallState.Dialing,
+            is CallState.Answering -> {
+                views.fullscreenRenderer.isVisible = false
+                views.callInfoGroup.isVisible = false
+            }
+            is CallState.Connected -> {
+                if (callState.iceConnectionState == MxPeerConnectionState.CONNECTED) {
+                    if (state.isLocalOnHold || state.isRemoteOnHold) {
+                        views.smallIsHeldIcon.isVisible = true
+                        views.fullscreenRenderer.isVisible = false
+                        views.callInfoGroup.isVisible = true
+                        configureCallInfo(state, blurAvatar = true)
+                    } else {
+                        configureCallInfo(state)
+                        views.fullscreenRenderer.isVisible = true
+                        views.callInfoGroup.isVisible = false
+                    }
+                } else {
+                    views.callInfoGroup.isVisible = false
+                }
+            }
+            else                   -> {
+                views.fullscreenRenderer.isVisible = false
+                views.callInfoGroup.isVisible = false
+            }
+        }
+    }
+
+    private fun handleCallEnded(callState: CallState.Ended) {
+        if (isInPictureInPictureModeSafe()) {
+            val startIntent = Intent(this, VectorCallActivity::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+            }
+            startActivity(startIntent)
+        }
+        when (callState.reason) {
+            EndCallReason.USER_BUSY      -> {
+                showEndCallDialog(R.string.call_ended_user_busy_title, R.string.call_ended_user_busy_description)
+            }
+            EndCallReason.INVITE_TIMEOUT -> {
+                showEndCallDialog(R.string.call_ended_invite_timeout_title, R.string.call_error_user_not_responding)
+            }
+            else                         -> {
+                finish()
+            }
+        }
+    }
+
+    private fun showEndCallDialog(@StringRes title: Int, @StringRes description: Int) {
+        MaterialAlertDialogBuilder(this)
+                .setTitle(title)
+                .setMessage(description)
+                .setNegativeButton(R.string.ok, null)
+                .setOnDismissListener {
+                    finish()
+                }
+                .show()
+    }
+
     private fun configureCallInfo(state: VectorCallViewState, blurAvatar: Boolean = false) {
         state.callInfo?.opponentUserItem?.let {
             val colorFilter = ContextCompat.getColor(this, R.color.bg_call_screen_blur)
             avatarRenderer.renderBlur(it, views.bgCallView, sampling = 20, rounded = false, colorFilter = colorFilter, addPlaceholder = false)
             if (state.transferee is VectorCallViewState.TransfereeState.NoTransferee) {
-                views.participantNameText.text = it.getBestName()
+                views.participantNameText.setTextOrHide(null)
+                views.callToolbar.title = if (state.isVideoCall) {
+                    getString(R.string.video_call_with_participant, it.getBestName())
+                } else {
+                    getString(R.string.audio_call_with_participant, it.getBestName())
+                }
             } else {
-                views.participantNameText.text = getString(R.string.call_transfer_consulting_with, it.getBestName())
+                views.participantNameText.setTextOrHide(getString(R.string.call_transfer_consulting_with, it.getBestName()))
             }
             if (blurAvatar) {
                 avatarRenderer.renderBlur(it, views.otherMemberAvatar, sampling = 2, rounded = true, colorFilter = colorFilter, addPlaceholder = true)
@@ -272,7 +433,7 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
                 avatarRenderer.render(it, views.otherMemberAvatar)
             }
         }
-        if (state.otherKnownCallInfo?.opponentUserItem == null) {
+        if (state.otherKnownCallInfo?.opponentUserItem == null || isInPictureInPictureModeSafe()) {
             views.otherKnownCallLayout.isVisible = false
         } else {
             val otherCall = callManager.getCallById(state.otherKnownCallInfo.callId)
@@ -286,7 +447,7 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
                     addPlaceholder = true
             )
             views.otherKnownCallLayout.isVisible = true
-            views.otherSmallIsHeldIcon.isVisible = otherCall?.let { it.isLocalOnHold || it.remoteOnHold }.orFalse()
+            views.otherSmallIsHeldIcon.isVisible = otherCall?.let { it.isLocalOnHold || it.isRemoteOnHold }.orFalse()
         }
     }
 
@@ -295,44 +456,60 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
         views.otherKnownCallLayout.setOnClickListener {
             withState(callViewModel) {
                 val otherCall = callManager.getCallById(it.otherKnownCallInfo?.callId ?: "") ?: return@withState
-                startActivity(newIntent(this, otherCall, null))
-                finish()
+                val callArgs = CallArgs(
+                        signalingRoomId = otherCall.nativeRoomId,
+                        callId = otherCall.callId,
+                        participantUserId = otherCall.mxCall.opponentUserId,
+                        isIncomingCall = !otherCall.mxCall.isOutgoing,
+                        isVideoCall = otherCall.mxCall.isVideoCall
+                )
+                callViewModel.handle(VectorCallViewActions.SwitchCall(callArgs))
             }
         }
+        views.pipRendererWrapper.setOnClickListener {
+            callViewModel.handle(VectorCallViewActions.ToggleCamera)
+        }
+        pipDraggrableView = views.pipRendererWrapper.setupDraggable()
+                .setStickyMode(DraggableView.Mode.STICKY_XY)
+                .build()
+
+        otherCallDraggableView = views.otherKnownCallLayout.setupDraggable()
+                .setStickyMode(DraggableView.Mode.STICKY_XY)
+                .build()
     }
 
     private val permissionCameraLauncher = registerForPermissionsResult { allGranted, _ ->
         if (allGranted) {
-            start()
+            setupRenderersIfNeeded()
         } else {
             // TODO display something
             finish()
         }
     }
 
-    private fun start() {
+    private fun setupRenderersIfNeeded() {
+        detachRenderersIfNeeded()
         rootEglBase = EglUtils.rootEglBase ?: return Unit.also {
             Timber.tag(loggerTag.value).v("rootEglBase is null")
             finish()
         }
 
         // Init Picture in Picture renderer
-        views.pipRenderer.init(rootEglBase!!.eglBaseContext, null)
-        views.pipRenderer.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT)
-
+        views.pipRenderer.apply {
+            init(rootEglBase!!.eglBaseContext, null)
+            setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_BALANCED)
+            setEnableHardwareScaler(true)
+            setZOrderMediaOverlay(true)
+        }
         // Init Full Screen renderer
         views.fullscreenRenderer.init(rootEglBase!!.eglBaseContext, null)
         views.fullscreenRenderer.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
-
-        views.pipRenderer.setZOrderMediaOverlay(true)
-        views.pipRenderer.setEnableHardwareScaler(true /* enabled */)
         views.fullscreenRenderer.setEnableHardwareScaler(true /* enabled */)
 
-        callManager.getCallById(callArgs.callId)?.attachViewRenderers(views.pipRenderer, views.fullscreenRenderer,
-                intent.getStringExtra(EXTRA_MODE)?.takeIf { isFirstCreation() })
-
-        views.pipRenderer.setOnClickListener {
-            callViewModel.handle(VectorCallViewActions.ToggleCamera)
+        val callId = withState(callViewModel) { it.callId }
+        callManager.getCallById(callId)?.also { webRtcCall ->
+            webRtcCall.attachViewRenderers(views.pipRenderer, views.fullscreenRenderer, intent.getStringExtra(EXTRA_MODE))
+            intent.removeExtra(EXTRA_MODE)
         }
         surfaceRenderersAreInitialized = true
     }
@@ -340,9 +517,6 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
     private fun handleViewEvents(event: VectorCallViewEvents?) {
         Timber.tag(loggerTag.value).v("handleViewEvents $event")
         when (event) {
-            VectorCallViewEvents.DismissNoCall             -> {
-                finish()
-            }
             is VectorCallViewEvents.ConnectionTimeout      -> {
                 onErrorTimoutConnect(event.turn)
             }
@@ -352,7 +526,8 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
                 }.show(supportFragmentManager, FRAGMENT_DIAL_PAD_TAG)
             }
             is VectorCallViewEvents.ShowCallTransferScreen -> {
-                navigator.openCallTransfer(this, callArgs.callId)
+                val callId = withState(callViewModel) { it.callId }
+                navigator.openCallTransfer(this, callId)
             }
             null                                           -> {
             }
@@ -364,44 +539,15 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
         // TODO ask to use default stun, etc...
         MaterialAlertDialogBuilder(this)
                 .setTitle(R.string.call_failed_no_connection)
-                .setMessage(getString(R.string.call_failed_no_connection_description))
+                .setMessage(R.string.call_failed_no_connection_description)
                 .setNegativeButton(R.string.ok) { _, _ ->
                     callViewModel.handle(VectorCallViewActions.EndCall)
                 }
                 .show()
     }
 
-    companion object {
-        private const val EXTRA_MODE = "EXTRA_MODE"
-        private const val FRAGMENT_DIAL_PAD_TAG = "FRAGMENT_DIAL_PAD_TAG"
-
-        const val OUTGOING_CREATED = "OUTGOING_CREATED"
-        const val INCOMING_RINGING = "INCOMING_RINGING"
-        const val INCOMING_ACCEPT = "INCOMING_ACCEPT"
-
-        fun newIntent(context: Context, call: WebRtcCall, mode: String?): Intent {
-            return Intent(context, VectorCallActivity::class.java).apply {
-                // what could be the best flags?
-                flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                putExtra(MvRx.KEY_ARG, CallArgs(call.nativeRoomId, call.callId, call.mxCall.opponentUserId, !call.mxCall.isOutgoing, call.mxCall.isVideoCall))
-                putExtra(EXTRA_MODE, mode)
-            }
-        }
-
-        fun newIntent(context: Context,
-                      callId: String,
-                      signalingRoomId: String,
-                      otherUserId: String,
-                      isIncomingCall: Boolean,
-                      isVideoCall: Boolean,
-                      mode: String?): Intent {
-            return Intent(context, VectorCallActivity::class.java).apply {
-                // what could be the best flags?
-                flags = FLAG_ACTIVITY_CLEAR_TOP
-                putExtra(MvRx.KEY_ARG, CallArgs(signalingRoomId, callId, otherUserId, isIncomingCall, isVideoCall))
-                putExtra(EXTRA_MODE, mode)
-            }
-        }
+    override fun didTapAudioSettings() {
+        CallSoundDeviceChooserBottomSheet().show(supportFragmentManager, "SoundDeviceChooser")
     }
 
     override fun didAcceptIncomingCall() {
@@ -424,8 +570,9 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
         callViewModel.handle(VectorCallViewActions.ToggleVideo)
     }
 
-    override fun returnToChat() {
-        val args = RoomDetailArgs(callArgs.signalingRoomId)
+    private fun returnToChat() {
+        val roomId = withState(callViewModel) { it.roomId }
+        val args = RoomDetailArgs(roomId)
         val intent = RoomDetailActivity.newIntent(this, args).apply {
             flags = FLAG_ACTIVITY_CLEAR_TOP
         }
@@ -473,4 +620,37 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
             )
         }
     }
+
+    companion object {
+        private const val EXTRA_MODE = "EXTRA_MODE"
+        private const val FRAGMENT_DIAL_PAD_TAG = "FRAGMENT_DIAL_PAD_TAG"
+
+        const val OUTGOING_CREATED = "OUTGOING_CREATED"
+        const val INCOMING_RINGING = "INCOMING_RINGING"
+        const val INCOMING_ACCEPT = "INCOMING_ACCEPT"
+
+        fun newIntent(context: Context, call: WebRtcCall, mode: String?): Intent {
+            return Intent(context, VectorCallActivity::class.java).apply {
+                // what could be the best flags?
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                putExtra(MvRx.KEY_ARG, CallArgs(call.nativeRoomId, call.callId, call.mxCall.opponentUserId, !call.mxCall.isOutgoing, call.mxCall.isVideoCall))
+                putExtra(EXTRA_MODE, mode)
+            }
+        }
+
+        fun newIntent(context: Context,
+                      callId: String,
+                      signalingRoomId: String,
+                      otherUserId: String,
+                      isIncomingCall: Boolean,
+                      isVideoCall: Boolean,
+                      mode: String?): Intent {
+            return Intent(context, VectorCallActivity::class.java).apply {
+                // what could be the best flags?
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                putExtra(MvRx.KEY_ARG, CallArgs(signalingRoomId, callId, otherUserId, isIncomingCall, isVideoCall))
+                putExtra(EXTRA_MODE, mode)
+            }
+        }
+    }
 }
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 a332153aaa..1834c05e41 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
@@ -29,6 +29,8 @@ sealed class VectorCallViewActions : VectorViewModelAction {
     data class ChangeAudioDevice(val device: CallAudioManager.Device) : VectorCallViewActions()
     object OpenDialPad: VectorCallViewActions()
     data class SendDtmfDigit(val digit: String) : VectorCallViewActions()
+    data class SwitchCall(val callArgs: CallArgs) : VectorCallViewActions()
+
     object SwitchSoundDevice : VectorCallViewActions()
     object HeadSetButtonPressed : VectorCallViewActions()
     object ToggleCamera : 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 91c3154d0a..9f19429c00 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
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.api.session.call.TurnServerResponse
 
 sealed class VectorCallViewEvents : VectorViewEvents {
 
-    object DismissNoCall : VectorCallViewEvents()
     data class ConnectionTimeout(val turn: TurnServerResponse?) : VectorCallViewEvents()
     data class ShowSoundDeviceChooser(
             val available: Set<CallAudioManager.Device>,
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 e7b2b629e1..63ba83bdbc 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
@@ -60,7 +60,7 @@ class VectorCallViewModel @AssistedInject constructor(
             setState {
                 copy(
                         isLocalOnHold = call?.isLocalOnHold ?: false,
-                        isRemoteOnHold = call?.remoteOnHold ?: false
+                        isRemoteOnHold = call?.isRemoteOnHold ?: false
                 )
             }
         }
@@ -137,16 +137,14 @@ class VectorCallViewModel @AssistedInject constructor(
     private val currentCallListener = object : WebRtcCallManager.CurrentCallListener {
 
         override fun onCurrentCallChange(call: WebRtcCall?) {
-            if (call == null) {
-                _viewEvents.post(VectorCallViewEvents.DismissNoCall)
-            } else {
+            if (call != null) {
                 updateOtherKnownCall(call)
             }
         }
 
         override fun onAudioDevicesChange() {
             val currentSoundDevice = callManager.audioManager.selectedDevice ?: return
-            if (currentSoundDevice == CallAudioManager.Device.PHONE) {
+            if (currentSoundDevice == CallAudioManager.Device.Phone) {
                 proximityManager.start()
             } else {
                 proximityManager.stop()
@@ -174,7 +172,12 @@ class VectorCallViewModel @AssistedInject constructor(
     }
 
     init {
-        val webRtcCall = callManager.getCallById(initialState.callId)
+        setupCallWithCurrentState()
+    }
+
+    private fun setupCallWithCurrentState() = withState { state ->
+        call?.removeListener(callListener)
+        val webRtcCall = callManager.getCallById(state.callId)
         if (webRtcCall == null) {
             setState {
                 copy(callState = Fail(IllegalArgumentException("No call")))
@@ -184,17 +187,19 @@ class VectorCallViewModel @AssistedInject constructor(
             callManager.addCurrentCallListener(currentCallListener)
             webRtcCall.addListener(callListener)
             val currentSoundDevice = callManager.audioManager.selectedDevice
-            if (currentSoundDevice == CallAudioManager.Device.PHONE) {
+            if (currentSoundDevice == CallAudioManager.Device.Phone) {
                 proximityManager.start()
             }
             setState {
                 copy(
+                        isAudioMuted = webRtcCall.micMuted,
+                        isVideoEnabled = !webRtcCall.videoMuted,
                         isVideoCall = webRtcCall.mxCall.isVideoCall,
                         callState = Success(webRtcCall.mxCall.state),
                         callInfo = webRtcCall.extractCallInfo(),
-                        device = currentSoundDevice ?: CallAudioManager.Device.PHONE,
+                        device = currentSoundDevice ?: CallAudioManager.Device.Phone,
                         isLocalOnHold = webRtcCall.isLocalOnHold,
-                        isRemoteOnHold = webRtcCall.remoteOnHold,
+                        isRemoteOnHold = webRtcCall.isRemoteOnHold,
                         availableDevices = callManager.audioManager.availableDevices,
                         isFrontCamera = webRtcCall.currentCameraType() == CameraType.FRONT,
                         canSwitchCamera = webRtcCall.canSwitchCamera(),
@@ -227,6 +232,7 @@ class VectorCallViewModel @AssistedInject constructor(
     override fun onCleared() {
         callManager.removeCurrentCallListener(currentCallListener)
         call?.removeListener(callListener)
+        call = null
         proximityManager.stop()
         super.onCleared()
     }
@@ -304,9 +310,13 @@ class VectorCallViewModel @AssistedInject constructor(
                         VectorCallViewEvents.ShowCallTransferScreen
                 )
             }
-            VectorCallViewActions.TransferCall         -> {
+            VectorCallViewActions.TransferCall  -> {
                 handleCallTransfer()
             }
+            is VectorCallViewActions.SwitchCall -> {
+                setState { VectorCallViewState(action.callArgs) }
+                setupCallWithCurrentState()
+            }
         }.exhaustive
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt
index 3e7791cc08..a351806e1a 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt
@@ -35,7 +35,7 @@ data class VectorCallViewState(
         val isHD: Boolean = false,
         val isFrontCamera: Boolean = true,
         val canSwitchCamera: Boolean = true,
-        val device: CallAudioManager.Device = CallAudioManager.Device.PHONE,
+        val device: CallAudioManager.Device = CallAudioManager.Device.Phone,
         val availableDevices: Set<CallAudioManager.Device> = emptySet(),
         val callState: Async<CallState> = Uninitialized,
         val otherKnownCallInfo: CallInfo? = null,
diff --git a/vector/src/main/java/im/vector/app/features/call/audio/API21AudioDeviceDetector.kt b/vector/src/main/java/im/vector/app/features/call/audio/API21AudioDeviceDetector.kt
index 4f54f703b4..eafd1eab20 100644
--- a/vector/src/main/java/im/vector/app/features/call/audio/API21AudioDeviceDetector.kt
+++ b/vector/src/main/java/im/vector/app/features/call/audio/API21AudioDeviceDetector.kt
@@ -50,13 +50,17 @@ internal class API21AudioDeviceDetector(private val context: Context,
 
     private fun getAvailableSoundDevices(): Set<CallAudioManager.Device> {
         return HashSet<CallAudioManager.Device>().apply {
-            if (isBluetoothHeadsetOn()) add(CallAudioManager.Device.WIRELESS_HEADSET)
-            if (isWiredHeadsetOn()) {
-                add(CallAudioManager.Device.HEADSET)
-            } else {
-                add(CallAudioManager.Device.PHONE)
+            if (isBluetoothHeadsetOn()) {
+                connectedBlueToothHeadset?.connectedDevices?.forEach {
+                    add(CallAudioManager.Device.WirelessHeadset(it.name))
+                }
             }
-            add(CallAudioManager.Device.SPEAKER)
+            if (isWiredHeadsetOn()) {
+                add(CallAudioManager.Device.Headset)
+            } else {
+                add(CallAudioManager.Device.Phone)
+            }
+            add(CallAudioManager.Device.Speaker)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt b/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt
index 7174554d5f..fb17338fd1 100644
--- a/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt
+++ b/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt
@@ -33,10 +33,10 @@ internal class API23AudioDeviceDetector(private val audioManager: AudioManager,
         val deviceInfos = audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
         for (info in deviceInfos) {
             when (info.type) {
-                AudioDeviceInfo.TYPE_BLUETOOTH_SCO -> devices.add(CallAudioManager.Device.WIRELESS_HEADSET)
-                AudioDeviceInfo.TYPE_BUILTIN_EARPIECE -> devices.add(CallAudioManager.Device.PHONE)
-                AudioDeviceInfo.TYPE_BUILTIN_SPEAKER -> devices.add(CallAudioManager.Device.SPEAKER)
-                AudioDeviceInfo.TYPE_WIRED_HEADPHONES, AudioDeviceInfo.TYPE_WIRED_HEADSET, TYPE_USB_HEADSET -> devices.add(CallAudioManager.Device.HEADSET)
+                AudioDeviceInfo.TYPE_BLUETOOTH_SCO -> devices.add(CallAudioManager.Device.WirelessHeadset(info.productName.toString()))
+                AudioDeviceInfo.TYPE_BUILTIN_EARPIECE -> devices.add(CallAudioManager.Device.Phone)
+                AudioDeviceInfo.TYPE_BUILTIN_SPEAKER -> devices.add(CallAudioManager.Device.Speaker)
+                AudioDeviceInfo.TYPE_WIRED_HEADPHONES, AudioDeviceInfo.TYPE_WIRED_HEADSET, TYPE_USB_HEADSET -> devices.add(CallAudioManager.Device.Headset)
             }
         }
         callAudioManager.replaceDevices(devices)
diff --git a/vector/src/main/java/im/vector/app/features/call/audio/CallAudioManager.kt b/vector/src/main/java/im/vector/app/features/call/audio/CallAudioManager.kt
index 36a11b5923..f4f56f9844 100644
--- a/vector/src/main/java/im/vector/app/features/call/audio/CallAudioManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/audio/CallAudioManager.kt
@@ -19,7 +19,10 @@ package im.vector.app.features.call.audio
 import android.content.Context
 import android.media.AudioManager
 import android.os.Build
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import androidx.core.content.getSystemService
+import im.vector.app.R
 import org.matrix.android.sdk.api.extensions.orFalse
 import timber.log.Timber
 import java.util.HashSet
@@ -31,11 +34,11 @@ class CallAudioManager(private val context: Context, val configChange: (() -> Un
     private var audioDeviceDetector: AudioDeviceDetector? = null
     private var audioDeviceRouter: AudioDeviceRouter? = null
 
-    enum class Device {
-        PHONE,
-        SPEAKER,
-        HEADSET,
-        WIRELESS_HEADSET
+    sealed class Device(@StringRes val titleRes: Int, @DrawableRes val drawableRes: Int) {
+        object Phone : Device(R.string.sound_device_phone, R.drawable.ic_sound_device_phone)
+        object Speaker : Device(R.string.sound_device_speaker, R.drawable.ic_sound_device_speaker)
+        object Headset : Device(R.string.sound_device_headset, R.drawable.ic_sound_device_headphone)
+        data class WirelessHeadset(val name: String?) : Device(R.string.sound_device_wireless_headset, R.drawable.ic_sound_device_wireless)
     }
 
     enum class Mode {
@@ -133,19 +136,19 @@ class CallAudioManager(private val context: Context, val configChange: (() -> Un
             userSelectedDevice = null
             return true
         }
-        val bluetoothAvailable = _availableDevices.contains(Device.WIRELESS_HEADSET)
-        val headsetAvailable = _availableDevices.contains(Device.HEADSET)
+        val availableBluetoothDevice = _availableDevices.firstOrNull { it is Device.WirelessHeadset }
+        val headsetAvailable = _availableDevices.contains(Device.Headset)
 
         // Pick the desired device based on what's available and the mode.
         var audioDevice: Device
-        audioDevice = if (bluetoothAvailable) {
-            Device.WIRELESS_HEADSET
+        audioDevice = if (availableBluetoothDevice != null) {
+            availableBluetoothDevice
         } else if (headsetAvailable) {
-            Device.HEADSET
+            Device.Headset
         } else if (mode == Mode.VIDEO_CALL) {
-            Device.SPEAKER
+            Device.Speaker
         } else {
-            Device.PHONE
+            Device.Phone
         }
         // Consider the user's selection
         if (userSelectedDevice != null && _availableDevices.contains(userSelectedDevice)) {
diff --git a/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt b/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt
index c252cc9f89..fd85ce075f 100644
--- a/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt
+++ b/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt
@@ -31,8 +31,8 @@ class DefaultAudioDeviceRouter(private val audioManager: AudioManager,
     private var focusRequestCompat: AudioFocusRequestCompat? = null
 
     override fun setAudioRoute(device: CallAudioManager.Device) {
-        audioManager.isSpeakerphoneOn = device === CallAudioManager.Device.SPEAKER
-        setBluetoothAudioRoute(device === CallAudioManager.Device.WIRELESS_HEADSET)
+        audioManager.isSpeakerphoneOn = device is CallAudioManager.Device.Speaker
+        setBluetoothAudioRoute(device is CallAudioManager.Device.WirelessHeadset)
     }
 
     override fun setMode(mode: CallAudioManager.Mode): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiActiveConferenceHolder.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiActiveConferenceHolder.kt
new file mode 100644
index 0000000000..1a9fc5ea10
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiActiveConferenceHolder.kt
@@ -0,0 +1,46 @@
+/*
+ * 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.call.conference
+
+import android.content.Context
+import androidx.lifecycle.ProcessLifecycleOwner
+import org.jitsi.meet.sdk.BroadcastEvent
+import org.matrix.android.sdk.api.extensions.orFalse
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class JitsiActiveConferenceHolder @Inject constructor(context: Context) {
+
+    private var activeConference: String? = null
+
+    init {
+        ProcessLifecycleOwner.get().lifecycle.addObserver(JitsiBroadcastEventObserver(context, this::onBroadcastEvent))
+    }
+
+    fun isJoined(confId: String?): Boolean {
+        return confId != null && activeConference?.endsWith(confId).orFalse()
+    }
+
+    private fun onBroadcastEvent(broadcastEvent: BroadcastEvent) {
+        when (broadcastEvent.type) {
+            BroadcastEvent.Type.CONFERENCE_JOINED     -> activeConference = broadcastEvent.extractConferenceUrl()
+            BroadcastEvent.Type.CONFERENCE_TERMINATED -> activeConference = null
+            else                                      -> Unit
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiBroadcastEvent.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiBroadcastEvent.kt
new file mode 100644
index 0000000000..00ad7c540e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiBroadcastEvent.kt
@@ -0,0 +1,84 @@
+/*
+ * 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.call.conference
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.facebook.react.bridge.JavaOnlyMap
+import org.jitsi.meet.sdk.BroadcastEmitter
+import org.jitsi.meet.sdk.BroadcastEvent
+import org.jitsi.meet.sdk.JitsiMeet
+import org.matrix.android.sdk.api.extensions.tryOrNull
+
+private const val CONFERENCE_URL_DATA_KEY = "url"
+
+fun BroadcastEvent.extractConferenceUrl(): String? {
+    return when (type) {
+        BroadcastEvent.Type.CONFERENCE_TERMINATED,
+        BroadcastEvent.Type.CONFERENCE_WILL_JOIN,
+        BroadcastEvent.Type.CONFERENCE_JOINED -> data[CONFERENCE_URL_DATA_KEY] as? String
+        else                                  -> null
+    }
+}
+
+class JitsiBroadcastEmitter(private val context: Context) {
+
+    fun emitConferenceEnded() {
+        val broadcastEventData = JavaOnlyMap.of(CONFERENCE_URL_DATA_KEY, JitsiMeet.getCurrentConference())
+        BroadcastEmitter(context).sendBroadcast(BroadcastEvent.Type.CONFERENCE_TERMINATED.name, broadcastEventData)
+    }
+}
+
+class JitsiBroadcastEventObserver(private val context: Context,
+                                  private val onBroadcastEvent: (BroadcastEvent) -> Unit) : LifecycleObserver {
+
+    // See https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk#listening-for-broadcasted-events
+    private val broadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            intent?.let { onBroadcastReceived(it) }
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    fun unregisterForBroadcastMessages() {
+        tryOrNull("Unable to unregister receiver") {
+            LocalBroadcastManager.getInstance(context).unregisterReceiver(broadcastReceiver)
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_CREATE)
+    fun registerForBroadcastMessages() {
+        val intentFilter = IntentFilter()
+        for (type in BroadcastEvent.Type.values()) {
+            intentFilter.addAction(type.action)
+        }
+        tryOrNull("Unable to register receiver") {
+            LocalBroadcastManager.getInstance(context).registerReceiver(broadcastReceiver, intentFilter)
+        }
+    }
+
+    private fun onBroadcastReceived(intent: Intent) {
+        val event = BroadcastEvent(intent)
+        onBroadcastEvent(event)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
index 7b01824c6c..b8b6d83dd1 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
@@ -44,12 +44,16 @@ class JitsiService @Inject constructor(
         private val rawService: RawService,
         private val stringProvider: StringProvider,
         private val themeProvider: ThemeProvider,
-        private val jitsiWidgetPropertiesFactory: JitsiWidgetPropertiesFactory,
         private val jitsiJWTFactory: JitsiJWTFactory) {
 
     companion object {
         const val JITSI_OPEN_ID_TOKEN_JWT_AUTH = "openidtoken-jwt"
-        private const val JITSI_AUTH_KEY = "auth"
+    }
+
+    private val jitsiWidgetDataFactory by lazy {
+        JitsiWidgetDataFactory(stringProvider.getString(R.string.preferred_jitsi_domain)) { widget ->
+            session.widgetService().getWidgetComputedUrl(widget, themeProvider.isLightTheme())
+        }
     }
 
     suspend fun createJitsiWidget(roomId: String, withVideo: Boolean): Widget {
@@ -85,17 +89,11 @@ class JitsiService @Inject constructor(
         val widgetEventContent = mapOf(
                 "url" to url,
                 "type" to WidgetType.Jitsi.legacy,
-                "data" to mapOf(
-                        "conferenceId" to confId,
-                        "domain" to jitsiDomain,
-                        "isAudioOnly" to !withVideo,
-                        JITSI_AUTH_KEY to jitsiAuth
-                ),
+                "data" to JitsiWidgetData(jitsiDomain, confId, !withVideo, jitsiAuth),
                 "creatorUserId" to session.myUserId,
                 "id" to widgetId,
                 "name" to "jitsi"
         )
-
         return session.widgetService().createRoomWidget(roomId, widgetId, widgetEventContent)
     }
 
@@ -108,26 +106,30 @@ class JitsiService @Inject constructor(
             this.avatar = userAvatar?.let { URL(it) }
         }
         val roomName = session.getRoomSummary(roomId)?.displayName
-        val properties = session.widgetService().getWidgetComputedUrl(jitsiWidget, themeProvider.isLightTheme())
-                ?.let { url -> jitsiWidgetPropertiesFactory.create(url) } ?: throw IllegalStateException()
-
-        val token = if (jitsiWidget.isOpenIdJWTAuthenticationRequired()) {
-            getOpenIdJWTToken(roomId, properties.domain, userDisplayName ?: session.myUserId, userAvatar ?: "")
+        val widgetData = jitsiWidgetDataFactory.create(jitsiWidget)
+        val token = if (widgetData.isOpenIdJWTAuthenticationRequired()) {
+            getOpenIdJWTToken(roomId, widgetData.domain, userDisplayName ?: session.myUserId, userAvatar ?: "")
         } else {
             null
         }
         return JitsiCallViewEvents.JoinConference(
                 enableVideo = enableVideo,
-                jitsiUrl = properties.domain.ensureProtocol(),
+                jitsiUrl = widgetData.domain.ensureProtocol(),
                 subject = roomName ?: "",
-                confId = properties.confId ?: "",
+                confId = widgetData.confId,
                 userInfo = userInfo,
                 token = token
         )
     }
 
-    private fun Widget.isOpenIdJWTAuthenticationRequired(): Boolean {
-        return widgetContent.data[JITSI_AUTH_KEY] == JITSI_OPEN_ID_TOKEN_JWT_AUTH
+    fun extractJitsiWidgetData(widget: Widget): JitsiWidgetData? {
+        return tryOrNull {
+            jitsiWidgetDataFactory.create(widget)
+        }
+    }
+
+    private fun JitsiWidgetData.isOpenIdJWTAuthenticationRequired(): Boolean {
+        return auth == JITSI_OPEN_ID_TOKEN_JWT_AUTH
     }
 
     private suspend fun getOpenIdJWTToken(roomId: String, domain: String, userDisplayName: String, userAvatar: String): String {
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetData.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetData.kt
new file mode 100644
index 0000000000..323de826a1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetData.kt
@@ -0,0 +1,32 @@
+/*
+ * 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.call.conference
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * This is jitsi widget data
+ * https://github.com/matrix-org/matrix-doc/blob/b910b8966524febe7ffe78f723127a5037defe64/api/widgets/definitions/jitsi_data.yaml
+ */
+@JsonClass(generateAdapter = true)
+data class JitsiWidgetData(
+        @Json(name = "domain") val domain: String,
+        @Json(name = "conferenceId") val confId: String,
+        @Json(name = "isAudioOnly") val isAudioOnly: Boolean = false,
+        @Json(name = "auth") val auth: String? = null
+)
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetDataFactory.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetDataFactory.kt
new file mode 100644
index 0000000000..bceb38d544
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetDataFactory.kt
@@ -0,0 +1,61 @@
+/*
+ * 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.call.conference
+
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import java.net.URL
+import java.net.URLDecoder
+
+class JitsiWidgetDataFactory(private val fallbackJitsiDomain: String, private val urlComputer: (Widget) -> String?) {
+
+    /**
+     * Extract JitsiWidgetData from a widget.
+     * For Widget V2, it will extract data from content.data
+     * For Widget V1, it will extract data from url.
+     */
+    fun create(widget: Widget): JitsiWidgetData {
+        return widget.widgetContent.data.toModel<JitsiWidgetData>() ?: widget.createFromUrl()
+    }
+
+    /**
+     * This creates a JitsiWidgetData from the url.
+     * It's a fallback for Widget V1.
+     * It first get the computed url and then tries to extract JitsiWidgetData from it.
+     */
+    private fun Widget.createFromUrl(): JitsiWidgetData {
+        return urlComputer(this)?.let { url -> createFromUrl(url) } ?: throw IllegalStateException()
+    }
+
+    private fun createFromUrl(url: String): JitsiWidgetData {
+        val configString = tryOrNull { URL(url) }?.query
+        val configs = configString?.split("&")
+                ?.map { it.split("=") }
+                ?.filter { it.size == 2 }
+                ?.map { (key, value) -> key to URLDecoder.decode(value, "UTF-8") }
+                ?.toMap()
+                .orEmpty()
+
+        return JitsiWidgetData(
+                domain = configs["conferenceDomain"] ?: fallbackJitsiDomain,
+                confId = configs["conferenceId"] ?: configs["confId"] ?: throw IllegalStateException(),
+                isAudioOnly = configs["isAudioOnly"].toBoolean(),
+                auth = configs["auth"]
+        )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetPropertiesFactory.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetPropertiesFactory.kt
deleted file mode 100644
index 8014e01fb2..0000000000
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiWidgetPropertiesFactory.kt
+++ /dev/null
@@ -1,46 +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.call.conference
-
-import android.net.Uri
-import im.vector.app.R
-import im.vector.app.core.resources.StringProvider
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import java.net.URLDecoder
-import javax.inject.Inject
-
-class JitsiWidgetPropertiesFactory @Inject constructor(
-        private val stringProvider: StringProvider
-) {
-    fun create(url: String): JitsiWidgetProperties {
-        val configString = tryOrNull { Uri.parse(url) }?.fragment
-
-        val configs = configString?.split("&")
-                ?.map { it.split("=") }
-                ?.filter { it.size == 2 }
-                ?.map { (key, value) -> key to URLDecoder.decode(value, "UTF-8") }
-                ?.toMap()
-                .orEmpty()
-
-        return JitsiWidgetProperties(
-                domain = configs["conferenceDomain"] ?: stringProvider.getString(R.string.preferred_jitsi_domain),
-                confId = configs["conferenceId"],
-                displayName = configs["displayName"],
-                avatarUrl = configs["avatarUrl"]
-        )
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt b/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt
new file mode 100644
index 0000000000..391471d2f2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.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.call.conference
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.core.widget.ImageViewCompat
+import im.vector.app.R
+import im.vector.app.databinding.ViewRemoveJitsiWidgetBinding
+import im.vector.app.features.home.room.detail.RoomDetailViewState
+import org.matrix.android.sdk.api.session.room.model.Membership
+
+@SuppressLint("ClickableViewAccessibility") class RemoveJitsiWidgetView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private sealed class State {
+        object Unmount : State()
+        object Idle : State()
+        data class Sliding(val initialX: Float, val translationX: Float, val hasReachedActivationThreshold: Boolean) : State()
+        object Progress : State()
+    }
+
+    private val views: ViewRemoveJitsiWidgetBinding
+    private var state: State = State.Unmount
+    var onCompleteSliding: (() -> Unit)? = null
+
+    init {
+        inflate(context, R.layout.view_remove_jitsi_widget, this)
+        views = ViewRemoveJitsiWidgetBinding.bind(this)
+        views.removeJitsiSlidingContainer.setOnTouchListener { _, event ->
+            val currentState = state
+            return@setOnTouchListener when (event.action) {
+                MotionEvent.ACTION_DOWN   -> {
+                    if (currentState == State.Idle) {
+                        val initialX = views.removeJitsiSlidingContainer.x - event.rawX
+                        updateState(State.Sliding(initialX, 0f, false))
+                    }
+                    true
+                }
+                MotionEvent.ACTION_UP,
+                MotionEvent.ACTION_CANCEL -> {
+                    if (currentState is State.Sliding) {
+                        if (currentState.hasReachedActivationThreshold) {
+                            updateState(State.Progress)
+                        } else {
+                            updateState(State.Idle)
+                        }
+                    }
+                    true
+                }
+                MotionEvent.ACTION_MOVE   -> {
+                    if (currentState is State.Sliding) {
+                        val translationX = (currentState.initialX + event.rawX).coerceAtLeast(0f)
+                        val hasReachedActivationThreshold = translationX >= views.root.width / 4
+                        updateState(State.Sliding(currentState.initialX, translationX, hasReachedActivationThreshold))
+                    }
+                    true
+                }
+                else                      -> false
+            }
+        }
+        renderInternalState(state)
+    }
+
+    fun render(roomDetailViewState: RoomDetailViewState) {
+        val summary = roomDetailViewState.asyncRoomSummary()
+        val newState = if (summary?.membership != Membership.JOIN
+                || roomDetailViewState.isWebRTCCallOptionAvailable()
+                || !roomDetailViewState.isAllowedToManageWidgets
+                || roomDetailViewState.jitsiState.widgetId == null) {
+            State.Unmount
+        } else if (roomDetailViewState.jitsiState.deleteWidgetInProgress) {
+            State.Progress
+        } else {
+            State.Idle
+        }
+        // Don't force Idle if we are already sliding
+        if (state is State.Sliding && newState is State.Idle) {
+            return
+        } else {
+            updateState(newState)
+        }
+    }
+
+    private fun updateState(newState: State) {
+        if (newState == state) {
+            return
+        }
+        renderInternalState(newState)
+        state = newState
+        if (state == State.Progress) {
+            onCompleteSliding?.invoke()
+        }
+    }
+
+    private fun renderInternalState(state: State) {
+        isVisible = state != State.Unmount
+        when (state) {
+            State.Progress   -> {
+                isVisible = true
+                views.updateVisibilities(true)
+                views.updateHangupColors(true)
+            }
+            State.Idle       -> {
+                isVisible = true
+                views.updateVisibilities(false)
+                views.removeJitsiSlidingContainer.translationX = 0f
+                views.updateHangupColors(false)
+            }
+            is State.Sliding -> {
+                isVisible = true
+                views.updateVisibilities(false)
+                views.removeJitsiSlidingContainer.translationX = state.translationX
+                views.updateHangupColors(state.hasReachedActivationThreshold)
+            }
+            else             -> Unit
+        }
+    }
+
+    private fun ViewRemoveJitsiWidgetBinding.updateVisibilities(isProgress: Boolean) {
+        removeJitsiProgressContainer.isVisible = isProgress
+        removeJitsiHangupContainer.isVisible = !isProgress
+        removeJitsiSlidingContainer.isVisible = !isProgress
+    }
+
+    private fun ViewRemoveJitsiWidgetBinding.updateHangupColors(activated: Boolean) {
+        val iconTintColor: Int
+        val bgColor: Int
+        if (activated) {
+            bgColor = ContextCompat.getColor(context, R.color.palette_vermilion)
+            iconTintColor = ContextCompat.getColor(context, R.color.palette_white)
+        } else {
+            bgColor = ContextCompat.getColor(context, android.R.color.transparent)
+            iconTintColor = ContextCompat.getColor(context, R.color.palette_vermilion)
+        }
+        removeJitsiHangupContainer.setBackgroundColor(bgColor)
+        ImageViewCompat.setImageTintList(removeJitsiHangupIcon, ColorStateList.valueOf(iconTintColor))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index 11b84f4f44..a7a6f99cfc 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -16,18 +16,17 @@
 
 package im.vector.app.features.call.conference
 
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
 import android.widget.FrameLayout
 import android.widget.Toast
 import androidx.core.view.isVisible
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import androidx.lifecycle.Lifecycle
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.Success
@@ -41,6 +40,7 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityJitsiBinding
 import kotlinx.parcelize.Parcelize
 import org.jitsi.meet.sdk.BroadcastEvent
+import org.jitsi.meet.sdk.JitsiMeet
 import org.jitsi.meet.sdk.JitsiMeetActivityDelegate
 import org.jitsi.meet.sdk.JitsiMeetActivityInterface
 import org.jitsi.meet.sdk.JitsiMeetConferenceOptions
@@ -71,13 +71,6 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         injector.inject(this)
     }
 
-    // See https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk#listening-for-broadcasted-events
-    private val broadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            intent?.let { onBroadcastReceived(it) }
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -94,8 +87,47 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
                 JitsiCallViewEvents.LeaveConference               -> handleLeaveConference()
             }.exhaustive
         }
+        lifecycle.addObserver(JitsiBroadcastEventObserver(this, this::onBroadcastEvent))
+    }
 
-        registerForBroadcastMessages()
+    override fun onResume() {
+        super.onResume()
+        JitsiMeetActivityDelegate.onHostResume(this)
+    }
+
+    override fun initUiAndData() {
+        super.initUiAndData()
+        jitsiMeetView = JitsiMeetView(this)
+        val params = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
+        views.jitsiLayout.addView(jitsiMeetView, params)
+    }
+
+    override fun onStop() {
+        JitsiMeetActivityDelegate.onHostPause(this)
+        super.onStop()
+    }
+
+    override fun onDestroy() {
+        val currentConf = JitsiMeet.getCurrentConference()
+        jitsiMeetView?.leave()
+        jitsiMeetView?.dispose()
+        // Fake emitting CONFERENCE_TERMINATED event when currentConf is not null (probably when closing the PiP screen).
+        if (currentConf != null) {
+            JitsiBroadcastEmitter(this).emitConferenceEnded()
+        }
+        JitsiMeetActivityDelegate.onHostDestroy(this)
+        super.onDestroy()
+    }
+
+    override fun onBackPressed() {
+        JitsiMeetActivityDelegate.onBackPressed()
+    }
+
+    override fun onUserLeaveHint() {
+        super.onUserLeaveHint()
+        if (packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+            jitsiMeetView?.enterPictureInPicture()
+        }
     }
 
     private fun handleLeaveConference() {
@@ -116,14 +148,16 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean,
                                                newConfig: Configuration) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+        checkIfActivityShouldBeFinished()
         Timber.w("onPictureInPictureModeChanged($isInPictureInPictureMode)")
     }
 
-    override fun initUiAndData() {
-        super.initUiAndData()
-        jitsiMeetView = JitsiMeetView(this)
-        val params = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
-        views.jitsiLayout.addView(jitsiMeetView, params)
+    private fun checkIfActivityShouldBeFinished() {
+        // OnStop is called when PiP mode is closed directly from the ui
+        // If stopped is called and PiP mode is not active, we should finish the activity and remove the task as Android creates a new one for PiP.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED) && !isInPictureInPictureMode) {
+            finishAndRemoveTask()
+        }
     }
 
     private fun renderState(viewState: JitsiCallViewState) {
@@ -167,34 +201,6 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         jitsiMeetView?.join(jitsiMeetConferenceOptions)
     }
 
-    override fun onStop() {
-        JitsiMeetActivityDelegate.onHostPause(this)
-        super.onStop()
-    }
-
-    override fun onResume() {
-        JitsiMeetActivityDelegate.onHostResume(this)
-        super.onResume()
-    }
-
-    override fun onBackPressed() {
-        JitsiMeetActivityDelegate.onBackPressed()
-        super.onBackPressed()
-    }
-
-    override fun onDestroy() {
-        JitsiMeetActivityDelegate.onHostDestroy(this)
-        unregisterForBroadcastMessages()
-        super.onDestroy()
-    }
-
-    override fun onUserLeaveHint() {
-        super.onUserLeaveHint()
-        if (packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
-            jitsiMeetView?.enterPictureInPicture()
-        }
-    }
-
     override fun onNewIntent(intent: Intent?) {
         JitsiMeetActivityDelegate.onNewIntent(intent)
 
@@ -217,24 +223,7 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
-    private fun registerForBroadcastMessages() {
-        val intentFilter = IntentFilter()
-        for (type in BroadcastEvent.Type.values()) {
-            intentFilter.addAction(type.action)
-        }
-        tryOrNull("Unable to register receiver") {
-            LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter)
-        }
-    }
-
-    private fun unregisterForBroadcastMessages() {
-        tryOrNull("Unable to unregister receiver") {
-            LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver)
-        }
-    }
-
-    private fun onBroadcastReceived(intent: Intent) {
-        val event = BroadcastEvent(intent)
+    private fun onBroadcastEvent(event: BroadcastEvent) {
         Timber.v("Broadcast received: ${event.type}")
         when (event.type) {
             BroadcastEvent.Type.CONFERENCE_TERMINATED -> onConferenceTerminated(event.data)
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
index 91d3ab7ddf..2d39fda2e3 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -39,7 +39,9 @@ import io.reactivex.disposables.Disposable
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.ReplaySubject
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -91,6 +93,7 @@ private const val STREAM_ID = "userMedia"
 private const val AUDIO_TRACK_ID = "${STREAM_ID}a0"
 private const val VIDEO_TRACK_ID = "${STREAM_ID}v0"
 private val DEFAULT_AUDIO_CONSTRAINTS = MediaConstraints()
+private const val INVITE_TIMEOUT_IN_MS = 60_000L
 
 private val loggerTag = LoggerTag("WebRtcCall", LoggerTag.VOIP)
 
@@ -165,12 +168,14 @@ class WebRtcCall(
         }
     }
 
+    private var inviteTimeout: Deferred<Unit>? = null
+
     // Mute status
     var micMuted = false
         private set
     var videoMuted = false
         private set
-    var remoteOnHold = false
+    var isRemoteOnHold = false
         private set
     var isLocalOnHold = false
         private set
@@ -239,6 +244,10 @@ class WebRtcCall(
                 if (mxCall.state == CallState.CreateOffer) {
                     // send offer to peer
                     mxCall.offerSdp(sessionDescription.description)
+                    inviteTimeout = async {
+                        delay(INVITE_TIMEOUT_IN_MS)
+                        endCall(EndCallReason.INVITE_TIMEOUT)
+                    }
                 } else {
                     mxCall.negotiate(sessionDescription.description, SdpType.OFFER)
                 }
@@ -348,7 +357,7 @@ class WebRtcCall(
 
     fun attachViewRenderers(localViewRenderer: SurfaceViewRenderer?, remoteViewRenderer: SurfaceViewRenderer, mode: String?) {
         sessionScope?.launch(dispatcher) {
-            Timber.tag(loggerTag.value).v("attachViewRenderers localRendeder $localViewRenderer / $remoteViewRenderer")
+            Timber.tag(loggerTag.value).v("attachViewRenderers localRenderer $localViewRenderer / $remoteViewRenderer")
             localSurfaceRenderers.addIfNeeded(localViewRenderer)
             remoteSurfaceRenderers.addIfNeeded(remoteViewRenderer)
             when (mode) {
@@ -605,12 +614,12 @@ class WebRtcCall(
     }
 
     private fun updateMuteStatus() {
-        val micShouldBeMuted = micMuted || remoteOnHold
+        val micShouldBeMuted = micMuted || isRemoteOnHold
         localAudioTrack?.setEnabled(!micShouldBeMuted)
-        remoteAudioTrack?.setEnabled(!remoteOnHold)
-        val vidShouldBeMuted = videoMuted || remoteOnHold
+        remoteAudioTrack?.setEnabled(!isRemoteOnHold)
+        val vidShouldBeMuted = videoMuted || isRemoteOnHold
         localVideoTrack?.setEnabled(!vidShouldBeMuted)
-        remoteVideoTrack?.setEnabled(!remoteOnHold)
+        remoteVideoTrack?.setEnabled(!isRemoteOnHold)
     }
 
     /**
@@ -636,16 +645,16 @@ class WebRtcCall(
 
     fun updateRemoteOnHold(onHold: Boolean) {
         sessionScope?.launch(dispatcher) {
-            if (remoteOnHold == onHold) return@launch
+            if (isRemoteOnHold == onHold) return@launch
             val direction: RtpTransceiver.RtpTransceiverDirection
             if (onHold) {
                 wasLocalOnHold = isLocalOnHold
-                remoteOnHold = true
+                isRemoteOnHold = true
                 isLocalOnHold = true
                 direction = RtpTransceiver.RtpTransceiverDirection.SEND_ONLY
                 timer.pause()
             } else {
-                remoteOnHold = false
+                isRemoteOnHold = false
                 isLocalOnHold = wasLocalOnHold
                 onCallBecomeActive(this@WebRtcCall)
                 direction = RtpTransceiver.RtpTransceiverDirection.SEND_RECV
@@ -807,7 +816,7 @@ class WebRtcCall(
                 return@launch
             }
             val reject = mxCall.state is CallState.LocalRinging
-            terminate(EndCallReason.USER_HANGUP, reject)
+            terminate(reason, reject)
             if (reject) {
                 mxCall.reject()
             } else {
@@ -824,6 +833,8 @@ class WebRtcCall(
             val cameraManager = context.getSystemService<CameraManager>()!!
             cameraManager.unregisterAvailabilityCallback(cameraAvailabilityCallback)
         }
+        inviteTimeout?.cancel()
+        inviteTimeout = null
         mxCall.state = CallState.Ended(reason ?: EndCallReason.USER_HANGUP)
         release()
         onCallEnded(callId, reason ?: EndCallReason.USER_HANGUP, rejected)
@@ -845,6 +856,8 @@ class WebRtcCall(
     }
 
     fun onCallAnswerReceived(callAnswerContent: CallAnswerContent) {
+        inviteTimeout?.cancel()
+        inviteTimeout = null
         sessionScope?.launch(dispatcher) {
             Timber.tag(loggerTag.value).v("onCallAnswerReceived ${callAnswerContent.callId}")
             val sdp = SessionDescription(SessionDescription.Type.ANSWER, callAnswerContent.answer.sdp)
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt
index ef9ef3ef9a..ac9d169633 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt
@@ -16,17 +16,20 @@
 
 package im.vector.app.features.call.webrtc
 
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 
 fun WebRtcCall.getOpponentAsMatrixItem(session: Session): MatrixItem? {
-    return session.getRoomSummary(nativeRoomId)?.let { roomSummary ->
+    return session.getRoom(nativeRoomId)?.let { room ->
+        val roomSummary = room.roomSummary() ?: return@let null
         // Fallback to RoomSummary if there is no other member.
-        if (roomSummary.otherMemberIds.isEmpty()) {
+        if (roomSummary.otherMemberIds.isEmpty().orFalse()) {
             roomSummary.toMatrixItem()
         } else {
-            roomSummary.otherMemberIds.first().let { session.getUser(it)?.toMatrixItem() }
+            val userId = roomSummary.otherMemberIds.first()
+            return room.getRoomMember(userId)?.toMatrixItem()
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
index c502d92a4c..36ccef1fca 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
@@ -147,10 +147,6 @@ class RoomDevToolActivity : SimpleFragmentActivity(), RoomDevToolViewModel.Facto
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressed()
-            return true
-        }
         if (item.itemId == R.id.menuItemEdit) {
             viewModel.handle(RoomDevToolAction.MenuEdit)
             return true
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 787027e0e2..d22707bda0 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
@@ -171,6 +171,7 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
                                 .toBitmap(width = iconSize, height = iconSize))
                     }
                 }
+                .apply(RequestOptions.centerCropTransform())
                 .submit(iconSize, iconSize)
                 .get()
     }
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 4a563b563a..a302276f45 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
@@ -24,12 +24,12 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.view.Menu
 import android.view.MenuItem
-import com.google.android.material.appbar.MaterialToolbar
 import androidx.core.view.GravityCompat
 import androidx.core.view.isVisible
 import androidx.drawerlayout.widget.DrawerLayout
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
+import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.AppStateHandler
 import im.vector.app.R
@@ -58,6 +58,7 @@ 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
@@ -89,6 +90,7 @@ class HomeActivity :
         UnknownDeviceDetectorSharedViewModel.Factory,
         ServerBackupStatusViewModel.Factory,
         UnreadMessagesSharedViewModel.Factory,
+        PromoteRestrictedViewModel.Factory,
         NavigationInterceptor,
         SpaceInviteBottomSheet.InteractionListener {
 
@@ -99,6 +101,8 @@ class HomeActivity :
 
     private val serverBackupStatusViewModel: ServerBackupStatusViewModel by viewModel()
     @Inject lateinit var serverBackupviewModelFactory: ServerBackupStatusViewModel.Factory
+    @Inject lateinit var promoteRestrictedViewModelFactory: PromoteRestrictedViewModel.Factory
+    private val promoteRestrictedViewModel: PromoteRestrictedViewModel by viewModel()
 
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var vectorUncaughtExceptionHandler: VectorUncaughtExceptionHandler
@@ -143,6 +147,8 @@ class HomeActivity :
         }
     }
 
+    override fun getCoordinatorLayout() = views.coordinatorLayout
+
     override fun getBinding() = ActivityHomeBinding.inflate(layoutInflater)
 
     override fun injectWith(injector: ScreenComponent) {
@@ -171,18 +177,13 @@ class HomeActivity :
             replaceFragment(R.id.homeDrawerFragmentContainer, HomeDrawerFragment::class.java)
         }
 
-//        appStateHandler.selectedRoomGroupingObservable.subscribe {
-//            if (supportFragmentManager.getFragment())
-//            replaceFragment(R.id.homeDetailFragmentContainer, HomeDetailFragment::class.java, allowStateLoss = true)
-//        }.disposeOnDestroy()
-
         sharedActionViewModel
                 .observe()
                 .subscribe { sharedAction ->
                     when (sharedAction) {
-                        is HomeActivitySharedAction.OpenDrawer -> views.drawerLayout.openDrawer(GravityCompat.START)
-                        is HomeActivitySharedAction.CloseDrawer -> views.drawerLayout.closeDrawer(GravityCompat.START)
-                        is HomeActivitySharedAction.OpenGroup -> {
+                        is HomeActivitySharedAction.OpenDrawer        -> views.drawerLayout.openDrawer(GravityCompat.START)
+                        is HomeActivitySharedAction.CloseDrawer       -> views.drawerLayout.closeDrawer(GravityCompat.START)
+                        is HomeActivitySharedAction.OpenGroup         -> {
                             views.drawerLayout.closeDrawer(GravityCompat.START)
 
                             // Temporary
@@ -196,10 +197,10 @@ class HomeActivity :
                             // we might want to delay that to avoid having the drawer animation lagging
                             // would be probably better to let the drawer do that? in the on closed callback?
                         }
-                        is HomeActivitySharedAction.OpenSpacePreview -> {
+                        is HomeActivitySharedAction.OpenSpacePreview  -> {
                             startActivity(SpacePreviewActivity.newIntent(this, sharedAction.spaceId))
                         }
-                        is HomeActivitySharedAction.AddSpace -> {
+                        is HomeActivitySharedAction.AddSpace          -> {
                             createSpaceResultLauncher.launch(SpaceCreationActivity.newIntent(this))
                         }
                         is HomeActivitySharedAction.ShowSpaceSettings -> {
@@ -212,11 +213,11 @@ class HomeActivity :
                                     })
                                     .show(supportFragmentManager, "SPACE_SETTINGS")
                         }
-                        is HomeActivitySharedAction.OpenSpaceInvite -> {
+                        is HomeActivitySharedAction.OpenSpaceInvite   -> {
                             SpaceInviteBottomSheet.newInstance(sharedAction.spaceId)
                                     .show(supportFragmentManager, "SPACE_INVITE")
                         }
-                        HomeActivitySharedAction.SendSpaceFeedBack -> {
+                        HomeActivitySharedAction.SendSpaceFeedBack    -> {
                             bugReporter.openBugReportScreen(this, ReportType.SPACE_BETA_FEEDBACK)
                         }
                     }.exhaustive
@@ -232,9 +233,9 @@ class HomeActivity :
         homeActivityViewModel.observeViewEvents {
             when (it) {
                 is HomeActivityViewEvents.AskPasswordToInitCrossSigning -> handleAskPasswordToInitCrossSigning(it)
-                is HomeActivityViewEvents.OnNewSession -> handleOnNewSession(it)
-                HomeActivityViewEvents.PromptToEnableSessionPush -> handlePromptToEnablePush()
-                is HomeActivityViewEvents.OnCrossSignedInvalidated -> handleCrossSigningInvalidated(it)
+                is HomeActivityViewEvents.OnNewSession                  -> handleOnNewSession(it)
+                HomeActivityViewEvents.PromptToEnableSessionPush        -> handlePromptToEnablePush()
+                is HomeActivityViewEvents.OnCrossSignedInvalidated      -> handleCrossSigningInvalidated(it)
             }.exhaustive
         }
         homeActivityViewModel.subscribe(this) { renderState(it) }
@@ -242,6 +243,21 @@ class HomeActivity :
         shortcutsHandler.observeRoomsAndBuildShortcuts()
                 .disposeOnDestroy()
 
+        if (!vectorPreferences.didPromoteNewRestrictedFeature()) {
+            promoteRestrictedViewModel.subscribe(this) {
+                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)
         }
@@ -287,7 +303,7 @@ class HomeActivity :
 
     private fun renderState(state: HomeActivityViewState) {
         when (val status = state.initialSyncProgressServiceStatus) {
-            is InitialSyncProgressService.Status.Idle -> {
+            is InitialSyncProgressService.Status.Idle        -> {
                 views.waitingView.root.isVisible = false
             }
             is InitialSyncProgressService.Status.Progressing -> {
@@ -451,15 +467,15 @@ class HomeActivity :
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.menu_home_suggestion -> {
+            R.id.menu_home_suggestion          -> {
                 bugReporter.openBugReportScreen(this, ReportType.SUGGESTION)
                 return true
             }
-            R.id.menu_home_report_bug -> {
+            R.id.menu_home_report_bug          -> {
                 bugReporter.openBugReportScreen(this, ReportType.BUG_REPORT)
                 return true
             }
-            R.id.menu_home_init_sync_legacy -> {
+            R.id.menu_home_init_sync_legacy    -> {
                 // Configure the SDK
                 initialSyncStrategy = InitialSyncStrategy.Legacy
                 // And clear cache
@@ -473,11 +489,11 @@ class HomeActivity :
                 MainActivity.restartApp(this, MainActivityArgs(clearCache = true))
                 return true
             }
-            R.id.menu_home_filter -> {
+            R.id.menu_home_filter              -> {
                 navigator.openRoomsFiltering(this)
                 return true
             }
-            R.id.menu_home_setting -> {
+            R.id.menu_home_setting             -> {
                 navigator.openSettings(this)
                 return true
             }
@@ -548,4 +564,6 @@ class HomeActivity :
         private const val ROOM_LINK_PREFIX = "${MATRIX_TO_CUSTOM_SCHEME_URL_BASE}room/"
         private const val USER_LINK_PREFIX = "${MATRIX_TO_CUSTOM_SCHEME_URL_BASE}user/"
     }
+
+    override fun create(initialState: ActiveSpaceViewState) = promoteRestrictedViewModelFactory.create(initialState)
 }
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 13809bcef3..9b71d1c90c 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
@@ -22,7 +22,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.get
 import androidx.core.view.isVisible
 import androidx.core.view.iterator
 import androidx.fragment.app.Fragment
@@ -39,8 +38,8 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.ui.views.CurrentCallsView
+import im.vector.app.core.ui.views.CurrentCallsViewPresenter
 import im.vector.app.core.ui.views.KeysBackupBanner
-import im.vector.app.core.ui.views.KnownCallsViewHolder
 import im.vector.app.databinding.FragmentHomeDetailBinding
 import im.vector.app.features.call.SharedKnownCallsViewModel
 import im.vector.app.features.call.VectorCallActivity
@@ -117,7 +116,7 @@ class HomeDetailFragment @Inject constructor(
         return FragmentHomeDetailBinding.inflate(inflater, container, false)
     }
 
-    private val activeCallViewHolder = KnownCallsViewHolder()
+    private val currentCallsViewPresenter = CurrentCallsViewPresenter()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -190,11 +189,16 @@ class HomeDetailFragment @Inject constructor(
         sharedCallActionViewModel
                 .liveKnownCalls
                 .observe(viewLifecycleOwner, {
-                    activeCallViewHolder.updateCall(callManager.getCurrentCall(), callManager.getCalls())
+                    currentCallsViewPresenter.updateCall(callManager.getCurrentCall(), callManager.getCalls())
                     invalidateOptionsMenu()
                 })
     }
 
+    override fun onDestroyView() {
+        currentCallsViewPresenter.unBind()
+        super.onDestroyView()
+    }
+
     override fun onResume() {
         super.onResume()
         // update notification tab if needed
@@ -291,12 +295,7 @@ class HomeDetailFragment @Inject constructor(
     }
 
     private fun setupActiveCallView() {
-        activeCallViewHolder.bind(
-                views.activeCallPiP,
-                views.activeCallView,
-                views.activeCallPiPWrap,
-                this
-        )
+        currentCallsViewPresenter.bind(views.currentCallsView, this)
     }
 
     private fun setupToolbar() {
@@ -373,7 +372,7 @@ class HomeDetailFragment @Inject constructor(
                         add(R.id.roomListContainer, RoomListFragment::class.java, params.toMvRxBundle(), fragmentTag)
                     }
                     is HomeTab.DialPad  -> {
-                        add(R.id.roomListContainer, createDialPadFragment())
+                        add(R.id.roomListContainer, createDialPadFragment(), fragmentTag)
                     }
                 }
             } else {
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
new file mode 100644
index 0000000000..ae7b495aa2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/PromoteRestrictedViewModel.kt
@@ -0,0 +1,92 @@
+/*
+ * 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.ActivityViewModelContext
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+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.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+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
+) : MvRxState
+
+class PromoteRestrictedViewModel @AssistedInject constructor(
+        @Assisted initialState: ActiveSpaceViewState,
+        private val activeSessionHolder: ActiveSessionHolder,
+        appStateHandler: AppStateHandler
+) : VectorViewModel<ActiveSpaceViewState, EmptyAction, EmptyViewEvents>(initialState) {
+
+    init {
+        appStateHandler.selectedRoomGroupingObservable.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 {
+        fun create(initialState: ActiveSpaceViewState): PromoteRestrictedViewModel
+    }
+
+    companion object : MvRxViewModelFactory<PromoteRestrictedViewModel, ActiveSpaceViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: ActiveSpaceViewState): PromoteRestrictedViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    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 db396cf990..fc204a0c56 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
@@ -17,7 +17,9 @@
 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
@@ -45,7 +47,7 @@ class ShortcutCreator @Inject constructor(
     private val adaptiveIconOuterSides = dimensionConverter.dpToPx(adaptiveIconOuterSidesDp)
     private val iconSize by lazy {
         if (useAdaptiveIcon) {
-            adaptiveIconSize - adaptiveIconOuterSides
+            adaptiveIconSize - (adaptiveIconOuterSides * 2)
         } else {
             dimensionConverter.dpToPx(72)
         }
@@ -56,27 +58,37 @@ class ShortcutCreator @Inject constructor(
     }
 
     @WorkerThread
-    fun create(roomSummary: RoomSummary): ShortcutInfoCompat {
+    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)
         } catch (failure: Throwable) {
             null
         }
+        val categories = if (Build.VERSION.SDK_INT >= 25) {
+            setOf(directShareCategory, ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)
+        } else {
+            setOf(directShareCategory)
+        }
+
         return ShortcutInfoCompat.Builder(context, roomSummary.roomId)
                 .setShortLabel(roomSummary.displayName)
                 .setIcon(bitmap?.toProfileImageIcon())
                 .setIntent(intent)
-
-                // Make it show up in the direct share menu
-                .setCategories(setOf(directShareCategory))
+                .setLongLived(true)
+                .setRank(rank)
+                .setCategories(categories)
 
                 .build()
     }
 
     private fun Bitmap.toProfileImageIcon(): IconCompat {
         return if (useAdaptiveIcon) {
-            IconCompat.createWithAdaptiveBitmap(this)
+            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)
         } else {
             IconCompat.createWithBitmap(this)
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
index 4a2d001e1d..c3249f5b26 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
@@ -24,7 +24,7 @@ import androidx.core.content.pm.ShortcutManagerCompat
 import im.vector.app.core.di.ActiveSessionHolder
 import io.reactivex.disposables.Disposable
 import io.reactivex.disposables.Disposables
-import org.matrix.android.sdk.api.query.RoomTagQueryFilter
+import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.rx.asObservable
@@ -46,17 +46,25 @@ class ShortcutsHandler @Inject constructor(
                 ?.getPagedRoomSummariesLive(
                         roomSummaryQueryParams {
                             memberships = listOf(Membership.JOIN)
-                            roomTagQueryFilter = RoomTagQueryFilter(isFavorite = true, null, null)
-                        }
+                        },
+                        sortOrder = RoomSortOrder.PRIORITY_AND_ACTIVITY
                 )
                 ?.asObservable()
                 ?.subscribe { rooms ->
-                    val shortcuts = rooms
-                            .take(n = 4) // Android only allows us to create 4 shortcuts
-                            .map { shortcutCreator.create(it) }
+                    // Remove dead shortcuts (i.e. deleted rooms)
+                    val roomIds = rooms.map { it.roomId }
+                    val deadShortcutIds = ShortcutManagerCompat.getShortcuts(context, ShortcutManagerCompat.FLAG_MATCH_DYNAMIC)
+                            .map { it.id }
+                            .filter { !roomIds.contains(it) }
+                    ShortcutManagerCompat.removeLongLivedShortcuts(context, deadShortcutIds)
 
-                    ShortcutManagerCompat.removeAllDynamicShortcuts(context)
-                    ShortcutManagerCompat.addDynamicShortcuts(context, shortcuts)
+                    val shortcuts = rooms.mapIndexed { index, room ->
+                        shortcutCreator.create(room, index)
+                    }
+
+                    shortcuts.forEach { shortcut ->
+                        ShortcutManagerCompat.pushDynamicShortcut(context, shortcut)
+                    }
                 }
                 ?: Disposables.empty()
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index e9e2447b39..f02711690a 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -147,7 +147,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                                     roomSummaryQueryParams {
                                         this.memberships = listOf(Membership.JOIN)
                                         this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
-                                            vectorPreferences.labsSpacesOnlyOrphansInHome()
+                                            !vectorPreferences.prefSpacesShowAllRoomInHome()
                                         } ?: ActiveSpaceFilter.None
                                     }
                             )
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index 6b031159b8..94388dcfeb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.home.room.detail
 import android.net.Uri
 import android.view.View
 import im.vector.app.core.platform.VectorViewModelAction
+import org.jitsi.meet.sdk.BroadcastEvent
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
@@ -89,9 +90,14 @@ sealed class RoomDetailAction : VectorViewModelAction {
     object ManageIntegrations : RoomDetailAction()
     data class AddJitsiWidget(val withVideo: Boolean) : RoomDetailAction()
     data class RemoveWidget(val widgetId: String) : RoomDetailAction()
+
+    object JoinJitsiCall: RoomDetailAction()
+    object LeaveJitsiCall: RoomDetailAction()
+
     data class EnsureNativeWidgetAllowed(val widget: Widget,
                                          val userJustAccepted: Boolean,
                                          val grantedEvents: RoomDetailViewEvents) : RoomDetailAction()
+    data class UpdateJoinJitsiCallStatus(val jitsiEvent: BroadcastEvent): RoomDetailAction()
 
     data class OpenOrCreateDm(val userId: String) : RoomDetailAction()
     data class JumpToReadReceipt(val userId: String) : RoomDetailAction()
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/RoomDetailFragment.kt
index 057b4f2703..d45aa69cf3 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/RoomDetailFragment.kt
@@ -88,10 +88,10 @@ import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.platform.showOptimizedSnackbar
 import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.ui.views.ActiveConferenceView
 import im.vector.app.core.ui.views.CurrentCallsView
+import im.vector.app.core.ui.views.CurrentCallsViewPresenter
 import im.vector.app.core.ui.views.FailedMessagesWarningView
-import im.vector.app.core.ui.views.KnownCallsViewHolder
+import im.vector.app.core.ui.views.JoinConferenceView
 import im.vector.app.core.ui.views.NotificationAreaView
 import im.vector.app.core.utils.Debouncer
 import im.vector.app.core.utils.DimensionConverter
@@ -123,6 +123,8 @@ import im.vector.app.features.attachments.preview.AttachmentsPreviewArgs
 import im.vector.app.features.attachments.toGroupedContentAttachmentData
 import im.vector.app.features.call.SharedKnownCallsViewModel
 import im.vector.app.features.call.VectorCallActivity
+import im.vector.app.features.call.conference.JitsiBroadcastEmitter
+import im.vector.app.features.call.conference.JitsiBroadcastEventObserver
 import im.vector.app.features.call.conference.JitsiCallViewModel
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.command.Command
@@ -182,6 +184,7 @@ import nl.dionsegijn.konfetti.models.Shape
 import nl.dionsegijn.konfetti.models.Size
 import org.billcarsonfr.jsonviewer.JSonViewerDialog
 import org.commonmark.parser.Parser
+import org.jitsi.meet.sdk.BroadcastEvent
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
@@ -307,7 +310,7 @@ class RoomDetailFragment @Inject constructor(
     private lateinit var attachmentTypeSelector: AttachmentTypeSelectorView
 
     private var lockSendButton = false
-    private val knownCallsViewHolder = KnownCallsViewHolder()
+    private val currentCallsViewPresenter = CurrentCallsViewPresenter()
 
     private lateinit var emojiPopup: EmojiPopup
 
@@ -321,6 +324,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        lifecycle.addObserver(JitsiBroadcastEventObserver(vectorBaseActivity, this::onBroadcastJitsiEvent))
         super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
         knownCallsViewModel = activityViewModelProvider.get(SharedKnownCallsViewModel::class.java)
@@ -344,9 +348,9 @@ class RoomDetailFragment @Inject constructor(
         setupJumpToReadMarkerView()
         setupActiveCallView()
         setupJumpToBottomView()
-        setupConfBannerView()
         setupEmojiPopup()
         setupFailedMessagesWarningView()
+        setupRemoveJitsiWidgetView()
         setupVoiceMessageView()
 
         views.roomToolbarContentView.debouncedClicks {
@@ -363,7 +367,7 @@ class RoomDetailFragment @Inject constructor(
         knownCallsViewModel
                 .liveKnownCalls
                 .observe(viewLifecycleOwner, {
-                    knownCallsViewHolder.updateCall(callManager.getCurrentCall(), it)
+                    currentCallsViewPresenter.updateCall(callManager.getCurrentCall(), it)
                     invalidateOptionsMenu()
                 })
 
@@ -412,6 +416,7 @@ class RoomDetailFragment @Inject constructor(
                 RoomDetailViewEvents.OpenActiveWidgetBottomSheet         -> onViewWidgetsClicked()
                 is RoomDetailViewEvents.ShowInfoOkDialog                 -> showDialogWithMessage(it.message)
                 is RoomDetailViewEvents.JoinJitsiConference              -> joinJitsiRoom(it.widget, it.withVideo)
+                RoomDetailViewEvents.LeaveJitsiConference                -> leaveJitsiConference()
                 RoomDetailViewEvents.ShowWaitingView                     -> vectorBaseActivity.showWaitingView()
                 RoomDetailViewEvents.HideWaitingView                     -> vectorBaseActivity.hideWaitingView()
                 is RoomDetailViewEvents.RequestNativeWidgetPermission    -> requestNativeWidgetPermission(it)
@@ -436,6 +441,26 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
+    private fun setupRemoveJitsiWidgetView() {
+        views.removeJitsiWidgetView.onCompleteSliding = {
+            withState(roomDetailViewModel) {
+                val jitsiWidgetId = it.jitsiState.widgetId ?: return@withState
+                if (it.jitsiState.hasJoined) {
+                    leaveJitsiConference()
+                }
+                roomDetailViewModel.handle(RoomDetailAction.RemoveWidget(jitsiWidgetId))
+            }
+        }
+    }
+
+    private fun leaveJitsiConference() {
+        JitsiBroadcastEmitter(vectorBaseActivity).emitConferenceEnded()
+    }
+
+    private fun onBroadcastJitsiEvent(jitsiEvent: BroadcastEvent) {
+        roomDetailViewModel.handle(RoomDetailAction.UpdateJoinJitsiCallStatus(jitsiEvent))
+    }
+
     private fun onCannotRecord() {
         // Update the UI, cancel the animation
         views.voiceMessageRecorderView.initVoiceRecordingViews()
@@ -559,31 +584,6 @@ class RoomDetailFragment @Inject constructor(
         )
     }
 
-    private fun setupConfBannerView() {
-        views.activeConferenceView.callback = object : ActiveConferenceView.Callback {
-            override fun onTapJoinAudio(jitsiWidget: Widget) {
-                // need to check if allowed first
-                roomDetailViewModel.handle(RoomDetailAction.EnsureNativeWidgetAllowed(
-                        widget = jitsiWidget,
-                        userJustAccepted = false,
-                        grantedEvents = RoomDetailViewEvents.JoinJitsiConference(jitsiWidget, false))
-                )
-            }
-
-            override fun onTapJoinVideo(jitsiWidget: Widget) {
-                roomDetailViewModel.handle(RoomDetailAction.EnsureNativeWidgetAllowed(
-                        widget = jitsiWidget,
-                        userJustAccepted = false,
-                        grantedEvents = RoomDetailViewEvents.JoinJitsiConference(jitsiWidget, true))
-                )
-            }
-
-            override fun onDelete(jitsiWidget: Widget) {
-                roomDetailViewModel.handle(RoomDetailAction.RemoveWidget(jitsiWidget.widgetId))
-            }
-        }
-    }
-
     private fun setupEmojiPopup() {
         emojiPopup = EmojiPopup
                 .Builder
@@ -769,7 +769,7 @@ class RoomDetailFragment @Inject constructor(
     override fun onDestroyView() {
         timelineEventController.callback = null
         timelineEventController.removeModelBuildListener(modelBuildListener)
-        views.activeCallView.callback = null
+        currentCallsViewPresenter.unBind()
         modelBuildListener = null
         autoCompleter.clear()
         debouncer.cancelAll()
@@ -780,7 +780,6 @@ class RoomDetailFragment @Inject constructor(
     }
 
     override fun onDestroy() {
-        knownCallsViewHolder.unBind()
         roomDetailViewModel.handle(RoomDetailAction.ExitTrackingUnreadMessagesState)
         super.onDestroy()
     }
@@ -816,12 +815,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun setupActiveCallView() {
-        knownCallsViewHolder.bind(
-                views.activeCallPiP,
-                views.activeCallView,
-                views.activeCallPiPWrap,
-                this
-        )
+        currentCallsViewPresenter.bind(views.currentCallsView, this)
     }
 
     private fun navigateToEvent(action: RoomDetailViewEvents.NavigateToEvent) {
@@ -872,6 +866,10 @@ class RoomDetailFragment @Inject constructor(
                 onOptionsItemSelected(menuItem)
             }
         }
+        val joinConfItem = menu.findItem(R.id.join_conference)
+        (joinConfItem.actionView as? JoinConferenceView)?.onJoinClicked = {
+            roomDetailViewModel.handle(RoomDetailAction.JoinJitsiCall)
+        }
     }
 
     override fun onPrepareOptionsMenu(menu: Menu) {
@@ -880,7 +878,8 @@ class RoomDetailFragment @Inject constructor(
         }
         withState(roomDetailViewModel) { state ->
             // Set the visual state of the call buttons (voice/video) to enabled/disabled according to user permissions
-            val callButtonsEnabled = when (state.asyncRoomSummary.invoke()?.joinedMembersCount) {
+            val hasCallInRoom = callManager.getCallsByRoomId(state.roomId).isNotEmpty() || state.jitsiState.hasJoined
+            val callButtonsEnabled = !hasCallInRoom && when (state.asyncRoomSummary.invoke()?.joinedMembersCount) {
                 1    -> false
                 2    -> state.isAllowedToStartWebRTCCall
                 else -> state.isAllowedToManageWidgets
@@ -891,14 +890,8 @@ class RoomDetailFragment @Inject constructor(
 
             val matrixAppsMenuItem = menu.findItem(R.id.open_matrix_apps)
             val widgetsCount = state.activeRoomWidgets.invoke()?.size ?: 0
-            if (widgetsCount > 0) {
-                val actionView = matrixAppsMenuItem.actionView
-                actionView
-                        .findViewById<ImageView>(R.id.action_view_icon_image)
-                        .setColorFilter(colorProvider.getColorFromAttribute(R.attr.colorPrimary))
-                actionView.findViewById<TextView>(R.id.cart_badge).setTextOrHide("$widgetsCount")
-                matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
-            } else {
+            val hasOnlyJitsiWidget = widgetsCount == 1 && state.hasActiveJitsiWidget()
+            if (widgetsCount == 0 || hasOnlyJitsiWidget) {
                 // icon should be default color no badge
                 val actionView = matrixAppsMenuItem.actionView
                 actionView
@@ -906,6 +899,13 @@ class RoomDetailFragment @Inject constructor(
                         .setColorFilter(ThemeUtils.getColor(requireContext(), R.attr.vctr_content_secondary))
                 actionView.findViewById<TextView>(R.id.cart_badge).isVisible = false
                 matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+            } else {
+                val actionView = matrixAppsMenuItem.actionView
+                actionView
+                        .findViewById<ImageView>(R.id.action_view_icon_image)
+                        .setColorFilter(colorProvider.getColorFromAttribute(R.attr.colorPrimary))
+                actionView.findViewById<TextView>(R.id.cart_badge).setTextOrHide("$widgetsCount")
+                matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
             }
         }
     }
@@ -932,10 +932,6 @@ class RoomDetailFragment @Inject constructor(
                 callActionsHandler.onVideoCallClicked()
                 true
             }
-            R.id.hangup_call      -> {
-                roomDetailViewModel.handle(RoomDetailAction.EndCall)
-                true
-            }
             R.id.search           -> {
                 handleSearchAction()
                 true
@@ -1362,7 +1358,7 @@ class RoomDetailFragment @Inject constructor(
         invalidateOptionsMenu()
         val summary = state.asyncRoomSummary()
         renderToolbar(summary, state.typingMessage)
-        views.activeConferenceView.render(state)
+        views.removeJitsiWidgetView.render(state)
         views.failedMessagesWarningView.render(state.hasFailedSending)
         val inviter = state.asyncInviter()
         if (summary?.membership == Membership.JOIN) {
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 d62c5f6003..2802ee2f83 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
@@ -45,6 +45,7 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
 
     data class NavigateToEvent(val eventId: String) : RoomDetailViewEvents()
     data class JoinJitsiConference(val widget: Widget, val withVideo: Boolean) : RoomDetailViewEvents()
+    object LeaveJitsiConference : RoomDetailViewEvents()
 
     object OpenInvitePeople : RoomDetailViewEvents()
     object OpenSetRoomAvatarDialog : RoomDetailViewEvents()
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/RoomDetailViewModel.kt
index 0ac638034d..3e902dc2ef 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/RoomDetailViewModel.kt
@@ -38,6 +38,7 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.mvrx.runCatchingToAsync
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.call.conference.JitsiActiveConferenceHolder
 import im.vector.app.features.attachments.toContentAttachmentData
 import im.vector.app.features.call.conference.JitsiService
 import im.vector.app.features.call.lookup.CallProtocolsChecker
@@ -51,7 +52,6 @@ import im.vector.app.features.home.room.detail.composer.VoiceMessageHelper
 import im.vector.app.features.home.room.detail.composer.rainbow.RainbowGenerator
 import im.vector.app.features.home.room.detail.sticker.StickerPickerActionHandler
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineFactory
-import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
 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.powerlevel.PowerLevelsObservableFactory
@@ -66,6 +66,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
+import org.jitsi.meet.sdk.BroadcastEvent
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.extensions.tryOrNull
@@ -115,12 +116,12 @@ class RoomDetailViewModel @AssistedInject constructor(
         private val session: Session,
         private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider,
         private val stickerPickerActionHandler: StickerPickerActionHandler,
-        private val roomSummariesHolder: RoomSummariesHolder,
         private val typingHelper: TypingHelper,
         private val callManager: WebRtcCallManager,
         private val chatEffectManager: ChatEffectManager,
         private val directRoomHelper: DirectRoomHelper,
         private val jitsiService: JitsiService,
+        private val activeConferenceHolder: JitsiActiveConferenceHolder,
         private val voiceMessageHelper: VoiceMessageHelper,
         private val voicePlayerHelper: VoicePlayerHelper,
         timelineFactory: TimelineFactory
@@ -241,9 +242,25 @@ class RoomDetailViewModel @AssistedInject constructor(
                 .map { widgets ->
                     widgets.filter { it.isActive }
                 }
-                .execute {
-                    copy(activeRoomWidgets = it)
+                .execute { widgets ->
+                    copy(activeRoomWidgets = widgets)
                 }
+
+        asyncSubscribe(RoomDetailViewState::activeRoomWidgets) { widgets ->
+            setState {
+                val jitsiWidget = widgets.firstOrNull { it.type == WidgetType.Jitsi }
+                val jitsiConfId = jitsiWidget?.let {
+                    jitsiService.extractJitsiWidgetData(it)?.confId
+                }
+                copy(
+                        jitsiState = jitsiState.copy(
+                                confId = jitsiConfId,
+                                widgetId = jitsiWidget?.widgetId,
+                                hasJoined = activeConferenceHolder.isJoined(jitsiConfId)
+                        )
+                )
+            }
+        }
     }
 
     private fun observeMyRoomMember() {
@@ -308,6 +325,9 @@ class RoomDetailViewModel @AssistedInject constructor(
             is RoomDetailAction.EndCall                          -> handleEndCall()
             is RoomDetailAction.ManageIntegrations               -> handleManageIntegrations()
             is RoomDetailAction.AddJitsiWidget                   -> handleAddJitsiConference(action)
+            is RoomDetailAction.UpdateJoinJitsiCallStatus        -> handleJitsiCallJoinStatus(action)
+            is RoomDetailAction.JoinJitsiCall                    -> handleJoinJitsiCall()
+            is RoomDetailAction.LeaveJitsiCall                   -> handleLeaveJitsiCall()
             is RoomDetailAction.RemoveWidget                     -> handleDeleteWidget(action.widgetId)
             is RoomDetailAction.EnsureNativeWidgetAllowed        -> handleCheckWidgetAllowed(action)
             is RoomDetailAction.CancelSend                       -> handleCancel(action)
@@ -340,6 +360,33 @@ class RoomDetailViewModel @AssistedInject constructor(
         }.exhaustive
     }
 
+    private fun handleJitsiCallJoinStatus(action: RoomDetailAction.UpdateJoinJitsiCallStatus) = withState { state ->
+        if (state.jitsiState.confId == null) {
+            // If jitsi widget is removed while on the call
+            if (state.jitsiState.hasJoined) {
+                setState { copy(jitsiState = jitsiState.copy(hasJoined = false)) }
+            }
+            return@withState
+        }
+        when (action.jitsiEvent.type) {
+            BroadcastEvent.Type.CONFERENCE_JOINED,
+            BroadcastEvent.Type.CONFERENCE_TERMINATED -> {
+                setState { copy(jitsiState = jitsiState.copy(hasJoined = activeConferenceHolder.isJoined(jitsiState.confId))) }
+            }
+            else                                      -> Unit
+        }
+    }
+
+    private fun handleLeaveJitsiCall() {
+        _viewEvents.post(RoomDetailViewEvents.LeaveJitsiConference)
+    }
+
+    private fun handleJoinJitsiCall() = withState { state ->
+        val jitsiWidget = state.activeRoomWidgets()?.firstOrNull { it.widgetId == state.jitsiState.widgetId } ?: return@withState
+        val action = RoomDetailAction.EnsureNativeWidgetAllowed(jitsiWidget, false, RoomDetailViewEvents.JoinJitsiConference(jitsiWidget, true))
+        handleCheckWidgetAllowed(action)
+    }
+
     private fun handleAcceptCall(action: RoomDetailAction.AcceptCall) {
         callManager.getCallById(action.callId)?.also {
             _viewEvents.post(RoomDetailViewEvents.DisplayAndAcceptCall(it))
@@ -448,10 +495,15 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleDeleteWidget(widgetId: String) {
-        _viewEvents.post(RoomDetailViewEvents.ShowWaitingView)
+    private fun handleDeleteWidget(widgetId: String) = withState { state ->
+        val isJitsiWidget = state.jitsiState.widgetId == widgetId
         viewModelScope.launch(Dispatchers.IO) {
             try {
+                if (isJitsiWidget) {
+                    setState { copy(jitsiState = jitsiState.copy(deleteWidgetInProgress = true)) }
+                } else {
+                    _viewEvents.post(RoomDetailViewEvents.ShowWaitingView)
+                }
                 session.widgetService().destroyRoomWidget(room.roomId, widgetId)
                 // local echo
                 setState {
@@ -467,7 +519,11 @@ class RoomDetailViewModel @AssistedInject constructor(
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.ShowMessage(stringProvider.getString(R.string.failed_to_remove_widget)))
             } finally {
-                _viewEvents.post(RoomDetailViewEvents.HideWaitingView)
+                if (isJitsiWidget) {
+                    setState { copy(jitsiState = jitsiState.copy(deleteWidgetInProgress = false)) }
+                } else {
+                    _viewEvents.post(RoomDetailViewEvents.HideWaitingView)
+                }
             }
         }
     }
@@ -682,9 +738,10 @@ class RoomDetailViewModel @AssistedInject constructor(
             R.id.timeline_setting -> true
             R.id.invite           -> state.canInvite
             R.id.open_matrix_apps -> true
-            R.id.voice_call,
-            R.id.video_call       -> callManager.getCallsByRoomId(state.roomId).isEmpty()
-            R.id.hangup_call      -> callManager.getCallsByRoomId(state.roomId).isNotEmpty()
+            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
@@ -1515,7 +1572,6 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     private fun observeSummaryState() {
         asyncSubscribe(RoomDetailViewState::asyncRoomSummary) { summary ->
-            roomSummariesHolder.set(summary)
             setState {
                 val typingMessage = typingHelper.getTypingMessage(summary.typingUsers)
                 copy(
@@ -1563,7 +1619,6 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     override fun onCleared() {
-        roomSummariesHolder.remove(room.roomId)
         timeline.dispose()
         timeline.removeAllListeners()
         if (vectorPreferences.sendTypingNotifs()) {
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 d10456b7c2..1c75429d11 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.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
@@ -26,6 +27,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 
 /**
  * Describes the current send mode:
@@ -55,6 +57,14 @@ sealed class UnreadState {
     data class HasUnread(val firstUnreadEventId: String) : UnreadState()
 }
 
+data class JitsiState(
+        val hasJoined: Boolean = false,
+        // Not null if we have an active jitsi widget on the room
+        val confId: String? = null,
+        val widgetId: String? = null,
+        val deleteWidgetInProgress: Boolean = false
+)
+
 data class RoomDetailViewState(
         val roomId: String,
         val eventId: String?,
@@ -75,7 +85,8 @@ data class RoomDetailViewState(
         val canInvite: Boolean = true,
         val isAllowedToManageWidgets: Boolean = false,
         val isAllowedToStartWebRTCCall: Boolean = true,
-        val hasFailedSending: Boolean = false
+        val hasFailedSending: Boolean = false,
+        val jitsiState: JitsiState = JitsiState()
 ) : MvRxState {
 
     constructor(args: RoomDetailArgs) : this(
@@ -85,5 +96,11 @@ data class RoomDetailViewState(
             highlightedEventId = args.eventId
     )
 
+    fun isWebRTCCallOptionAvailable() = (asyncRoomSummary.invoke()?.joinedMembersCount ?: 0) <= 2
+
+    // 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
 }
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 b71b90ace3..92a75b449a 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
@@ -26,7 +26,6 @@ import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.settings.VectorPreferences
-import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 
 class StartCallActionsHandler(
         private val roomId: String,
@@ -36,7 +35,7 @@ class StartCallActionsHandler(
         private val roomDetailViewModel: RoomDetailViewModel,
         private val startCallActivityResultLauncher: ActivityResultLauncher<Array<String>>,
         private val showDialogWithMessage: (String) -> Unit,
-        private val onTapToReturnToCall: () -> Unit)  {
+        private val onTapToReturnToCall: () -> Unit) {
 
     fun onVideoCallClicked() {
         handleCallRequest(true)
@@ -61,16 +60,8 @@ class StartCallActionsHandler(
             }
             2    -> {
                 val currentCall = callManager.getCurrentCall()
-                if (currentCall != null) {
-                    // resume existing if same room, if not prompt to kill and then restart new call?
-                    if (currentCall.signalingRoomId == roomId) {
-                        onTapToReturnToCall()
-                    }
-                    //                        else {
-                    // TODO might not work well, and should prompt
-                    //                            webRtcPeerConnectionManager.endCall()
-                    //                            safeStartCall(it, isVideoCall)
-                    //                        }
+                if (currentCall?.signalingRoomId == roomId) {
+                    onTapToReturnToCall()
                 } else if (!state.isAllowedToStartWebRTCCall) {
                     showDialogWithMessage(fragment.getString(
                             if (state.isDm()) {
@@ -96,9 +87,8 @@ class StartCallActionsHandler(
                             }
                     ))
                 } else {
-                    if (state.activeRoomWidgets()?.filter { it.type == WidgetType.Jitsi }?.any() == true) {
-                        // A conference is already in progress!
-                        showDialogWithMessage(fragment.getString(R.string.conference_call_in_progress))
+                    if (state.hasActiveJitsiWidget()) {
+                        // A conference is already in progress, return
                     } else {
                         MaterialAlertDialogBuilder(fragment.requireContext())
                                 .setTitle(if (isVideoCall) R.string.video_meeting else R.string.audio_meeting)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
index 47e72b46f7..5f4f53cf1e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
@@ -40,11 +40,7 @@ import kotlin.math.floor
 /**
  * Encapsulates the voice message recording view and animations.
  */
-class VoiceMessageRecorderView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr), VoiceMessagePlaybackTracker.Listener {
+class VoiceMessageRecorderView: ConstraintLayout, VoiceMessagePlaybackTracker.Listener {
 
     interface Callback {
         // Return true if the recording is started
@@ -54,7 +50,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         fun onVoicePlaybackButtonClicked()
     }
 
-    private val views: ViewVoiceMessageRecorderBinding
+    private lateinit var views: ViewVoiceMessageRecorderBinding
 
     var callback: Callback? = null
     var voiceMessagePlaybackTracker: VoiceMessagePlaybackTracker? = null
@@ -80,7 +76,17 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     private val distanceToCancel = dimensionConverter.dpToPx(120).toFloat()
     private val rtlXMultiplier = context.resources.getInteger(R.integer.rtl_x_multiplier)
 
-    init {
+    // Don't convert to primary constructor.
+    // We need to define views as lateinit var to be able to check if initialized for the bug fix on api 21 and 22.
+    @JvmOverloads constructor(
+            context: Context,
+            attrs: AttributeSet? = null,
+            defStyleAttr: Int = 0
+    ) : super(context, attrs, defStyleAttr) {
+        initialize()
+    }
+
+    fun initialize() {
         inflate(context, R.layout.view_voice_message_recorder, this)
         views = ViewVoiceMessageRecorderBinding.bind(this)
 
@@ -90,6 +96,9 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 
     override fun onVisibilityChanged(changedView: View, visibility: Int) {
         super.onVisibilityChanged(changedView, visibility)
+        // onVisibilityChanged is called by constructor on api 21 and 22.
+        if (!this::views.isInitialized) return
+
         if (changedView == this && visibility == VISIBLE) {
             views.voiceMessageMicButton.contentDescription = context.getString(R.string.a11y_start_voice_message)
         } else {
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 e1dae11c1c..8be319f2a8 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
@@ -31,8 +31,7 @@ import im.vector.app.core.epoxy.LoadingItem_
 import im.vector.app.core.extensions.localDateTime
 import im.vector.app.core.extensions.nextOrNull
 import im.vector.app.core.extensions.prevOrNull
-import im.vector.app.core.resources.UserPreferencesProvider
-import im.vector.app.features.call.webrtc.WebRtcCallManager
+import im.vector.app.features.home.room.detail.JitsiState
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.RoomDetailViewState
 import im.vector.app.features.home.room.detail.UnreadState
@@ -40,6 +39,7 @@ import im.vector.app.features.home.room.detail.timeline.factory.MergedHeaderItem
 import im.vector.app.features.home.room.detail.timeline.factory.ReadReceiptsItemFactory
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactory
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactoryParams
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventsGroups
 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.TimelineControllerInterceptorHelper
@@ -47,14 +47,13 @@ import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventDiff
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityStateChangedListener
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
-import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
 import im.vector.app.features.home.room.detail.timeline.item.BasedMergedItem
 import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem
 import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem_
+import im.vector.app.features.home.room.detail.timeline.item.ItemWithEvents
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem
-import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
 import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
@@ -65,6 +64,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
@@ -80,14 +80,30 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                                                   private val timelineMediaSizeProvider: TimelineMediaSizeProvider,
                                                   private val mergedHeaderItemFactory: MergedHeaderItemFactory,
                                                   private val session: Session,
-                                                  private val callManager: WebRtcCallManager,
                                                   @TimelineEventControllerHandler
                                                   private val backgroundHandler: Handler,
-                                                  private val userPreferencesProvider: UserPreferencesProvider,
                                                   private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper,
                                                   private val readReceiptsItemFactory: ReadReceiptsItemFactory
 ) : EpoxyController(backgroundHandler, backgroundHandler), Timeline.Listener, EpoxyController.Interceptor {
 
+    /**
+     * This is a partial state of the RoomDetailViewState
+     */
+    data class PartialState(
+            val unreadState: UnreadState = UnreadState.Unknown,
+            val highlightedEventId: String? = null,
+            val jitsiState: JitsiState = JitsiState(),
+            val roomSummary: RoomSummary? = null
+    ) {
+
+        constructor(state: RoomDetailViewState) : this(
+                unreadState = state.unreadState,
+                highlightedEventId = state.highlightedEventId,
+                jitsiState = state.jitsiState,
+                roomSummary = state.asyncRoomSummary()
+        )
+    }
+
     interface Callback :
             BaseCallback,
             ReactionPillCallback,
@@ -149,14 +165,15 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
 
     // Map eventId to adapter position
     private val adapterPositionMapping = HashMap<String, Int>()
+    private val timelineEventsGroups = TimelineEventsGroups()
+    private val receiptsByEvent = HashMap<String, MutableList<ReadReceipt>>()
     private val modelCache = arrayListOf<CacheItemData?>()
     private var currentSnapshot: List<TimelineEvent> = emptyList()
     private var inSubmitList: Boolean = false
     private var hasReachedInvite: Boolean = false
     private var hasUTD: Boolean = false
-    private var unreadState: UnreadState = UnreadState.Unknown
     private var positionOfReadMarker: Int? = null
-    private var eventIdToHighlight: String? = null
+    private var partialState: PartialState = PartialState()
 
     var callback: Callback? = null
     var timeline: Timeline? = null
@@ -174,7 +191,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                 // it's sent by the same user so we are sure we have up to date information.
                 val invalidatedSenderId: String? = currentSnapshot.getOrNull(position)?.senderInfo?.userId
                 val prevDisplayableEventIndex = currentSnapshot.subList(0, position).indexOfLast {
-                    timelineEventVisibilityHelper.shouldShowEvent(it, eventIdToHighlight)
+                    timelineEventVisibilityHelper.shouldShowEvent(it, partialState.highlightedEventId)
                 }
                 if (prevDisplayableEventIndex != -1 && currentSnapshot[prevDisplayableEventIndex].senderInfo.userId == invalidatedSenderId) {
                     modelCache[prevDisplayableEventIndex] = null
@@ -215,9 +232,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
 
     private val interceptorHelper = TimelineControllerInterceptorHelper(
             ::positionOfReadMarker,
-            adapterPositionMapping,
-            userPreferencesProvider,
-            callManager
+            adapterPositionMapping
     )
 
     init {
@@ -226,29 +241,22 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     }
 
     override fun intercept(models: MutableList<EpoxyModel<*>>) = synchronized(modelCache) {
-        interceptorHelper.intercept(models, unreadState, timeline, callback)
+        interceptorHelper.intercept(models, partialState.unreadState, timeline, callback)
     }
 
-    fun update(viewState: RoomDetailViewState) {
-        var requestModelBuild = false
-        if (eventIdToHighlight != viewState.highlightedEventId) {
+    fun update(viewState: RoomDetailViewState) = synchronized(modelCache) {
+        val newPartialState = PartialState(viewState)
+        if (partialState.highlightedEventId != newPartialState.highlightedEventId) {
             // Clear cache to force a refresh
-            synchronized(modelCache) {
-                for (i in 0 until modelCache.size) {
-                    if (modelCache[i]?.eventId == viewState.highlightedEventId
-                            || modelCache[i]?.eventId == eventIdToHighlight) {
-                        modelCache[i] = null
-                    }
+            for (i in 0 until modelCache.size) {
+                if (modelCache[i]?.eventId == viewState.highlightedEventId
+                        || modelCache[i]?.eventId == partialState.highlightedEventId) {
+                    modelCache[i] = null
                 }
             }
-            eventIdToHighlight = viewState.highlightedEventId
-            requestModelBuild = true
         }
-        if (this.unreadState != viewState.unreadState) {
-            this.unreadState = viewState.unreadState
-            requestModelBuild = true
-        }
-        if (requestModelBuild) {
+        if (newPartialState != partialState) {
+            partialState = newPartialState
             requestModelBuild()
         }
     }
@@ -346,31 +354,33 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         if (modelCache.isEmpty()) {
             return
         }
-        val receiptsByEvents = getReadReceiptsByShownEvent()
-        val lastSentEventWithoutReadReceipts = searchLastSentEventWithoutReadReceipts(receiptsByEvents)
+        preprocessReverseEvents()
+        val lastSentEventWithoutReadReceipts = searchLastSentEventWithoutReadReceipts(receiptsByEvent)
         (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, eventIdToHighlight)
+                timelineEventVisibilityHelper.shouldShowEvent(it, partialState.highlightedEventId)
             }
-            val params = TimelineItemFactoryParams(
-                    event = event,
-                    prevEvent = prevEvent,
-                    nextEvent = nextEvent,
-                    nextDisplayableEvent = nextDisplayableEvent,
-                    highlightedEventId = eventIdToHighlight,
-                    lastSentEventIdWithoutReadReceipts = lastSentEventWithoutReadReceipts,
-                    callback = callback
-            )
             // Should be build if not cached or if model should be refreshed
-            if (modelCache[position] == null || modelCache[position]?.shouldTriggerBuild == true) {
+            if (modelCache[position] == null || modelCache[position]?.isCacheable == false) {
+                val timelineEventsGroup = timelineEventsGroups.getOrNull(event)
+                val params = TimelineItemFactoryParams(
+                        event = event,
+                        prevEvent = prevEvent,
+                        nextEvent = nextEvent,
+                        nextDisplayableEvent = nextDisplayableEvent,
+                        partialState = partialState,
+                        lastSentEventIdWithoutReadReceipts = lastSentEventWithoutReadReceipts,
+                        callback = callback,
+                        eventsGroup = timelineEventsGroup
+                )
                 modelCache[position] = buildCacheItem(params)
             }
             val itemCachedData = modelCache[position] ?: return@forEach
             // Then update with additional models if needed
-            modelCache[position] = itemCachedData.enrichWithModels(event, nextEvent, position, receiptsByEvents)
+            modelCache[position] = itemCachedData.enrichWithModels(event, nextEvent, position, receiptsByEvent)
         }
     }
 
@@ -384,12 +394,13 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             it.id(event.localId)
             it.setOnVisibilityStateChanged(TimelineEventVisibilityStateChangedListener(callback, event))
         }
-        val shouldTriggerBuild = eventModel is AbsMessageItem && eventModel.attributes.informationData.sendStateDecoration == SendStateDecoration.SENT
+        val isCacheable = eventModel is ItemWithEvents && eventModel.isCacheable()
         return CacheItemData(
                 localId = event.localId,
                 eventId = event.root.eventId,
                 eventModel = eventModel,
-                shouldTriggerBuild = shouldTriggerBuild)
+                isCacheable = isCacheable
+        )
     }
 
     private fun CacheItemData.enrichWithModels(event: TimelineEvent,
@@ -399,10 +410,11 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         val wantsDateSeparator = wantsDateSeparator(event, nextEvent)
         val mergedHeaderModel = mergedHeaderItemFactory.create(event,
                 nextEvent = nextEvent,
+                partialState = partialState,
                 items = this@TimelineEventController.currentSnapshot,
                 addDaySeparator = wantsDateSeparator,
                 currentPosition = position,
-                eventIdToHighlight = eventIdToHighlight,
+                eventIdToHighlight = partialState.highlightedEventId,
                 callback = callback
         ) {
             requestModelBuild()
@@ -431,7 +443,7 @@ 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, eventIdToHighlight)) {
+            if (!timelineEventVisibilityHelper.shouldShowEvent(event, partialState.highlightedEventId)) {
                 continue
             }
             // If the event is sent by us, we update the holder with the eventId and stop the search
@@ -442,19 +454,18 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         return null
     }
 
-    private fun getReadReceiptsByShownEvent(): Map<String, List<ReadReceipt>> {
-        val receiptsByEvent = HashMap<String, MutableList<ReadReceipt>>()
-        if (!userPreferencesProvider.shouldShowReadReceipts()) {
-            return receiptsByEvent
-        }
-        var lastShownEventId: String? = null
+    private fun preprocessReverseEvents() {
+        receiptsByEvent.clear()
+        timelineEventsGroups.clear()
         val itr = currentSnapshot.listIterator(currentSnapshot.size)
+        var lastShownEventId: String? = null
         while (itr.hasPrevious()) {
             val event = itr.previous()
+            timelineEventsGroups.addOrIgnore(event)
             val currentReadReceipts = ArrayList(event.readReceipts).filter {
                 it.user.userId != session.myUserId
             }
-            if (timelineEventVisibilityHelper.shouldShowEvent(event, eventIdToHighlight)) {
+            if (timelineEventVisibilityHelper.shouldShowEvent(event, partialState.highlightedEventId)) {
                 lastShownEventId = event.eventId
             }
             if (lastShownEventId == null) {
@@ -463,7 +474,6 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             val existingReceipts = receiptsByEvent.getOrPut(lastShownEventId) { ArrayList() }
             existingReceipts.addAll(currentReadReceipts)
         }
-        return receiptsByEvent
     }
 
     private fun buildDaySeparatorItem(originServerTs: Long?): DaySeparatorItem {
@@ -536,6 +546,6 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             val eventModel: EpoxyModel<*>? = null,
             val mergedHeaderModel: BasedMergedItem<*>? = null,
             val formattedDayModel: DaySeparatorItem? = null,
-            val shouldTriggerBuild: Boolean = false
+            val isCacheable: Boolean = true
     )
 }
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 b9c368ebdc..6e6c7c1dbe 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
@@ -36,6 +36,7 @@ import im.vector.app.features.html.VectorHtmlCompressor
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import im.vector.app.features.reactions.data.EmojiDataSource
 import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.extensions.orFalse
 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.events.model.EventType
@@ -207,7 +208,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                     EventType.CALL_CANDIDATES,
                     EventType.CALL_HANGUP,
                     EventType.CALL_ANSWER -> {
-                        noticeEventFormatter.format(timelineEvent)
+                        noticeEventFormatter.format(timelineEvent, room?.roomSummary()?.isDirect.orFalse())
                     }
                     else                  -> null
                 }
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 9697fb6672..97f2618fe6 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
@@ -16,127 +16,122 @@
 package im.vector.app.features.home.room.detail.timeline.factory
 
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.features.call.vectorCallService
-import im.vector.app.features.call.webrtc.WebRtcCallManager
+import im.vector.app.core.resources.UserPreferencesProvider
 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.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.CallSignalingEventsGroup
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
-import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
 import im.vector.app.features.home.room.detail.timeline.item.CallTileTimelineItem
 import im.vector.app.features.home.room.detail.timeline.item.CallTileTimelineItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.model.call.CallAnswerContent
-import org.matrix.android.sdk.api.session.room.model.call.CallHangupContent
-import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
-import org.matrix.android.sdk.api.session.room.model.call.CallRejectContent
-import org.matrix.android.sdk.api.session.room.model.call.CallSignalingContent
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class CallItemFactory @Inject constructor(
         private val session: Session,
+        private val userPreferencesProvider: UserPreferencesProvider,
         private val messageColorProvider: MessageColorProvider,
         private val messageInformationDataFactory: MessageInformationDataFactory,
         private val messageItemAttributesFactory: MessageItemAttributesFactory,
         private val avatarSizeProvider: AvatarSizeProvider,
-        private val roomSummariesHolder: RoomSummariesHolder,
-        private val callManager: WebRtcCallManager
-) {
+        private val noticeItemFactory: NoticeItemFactory) {
 
     fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
         val event = params.event
         if (event.root.eventId == null) return null
-        val roomId = event.roomId
+        val showHiddenEvents = userPreferencesProvider.shouldShowHiddenEvents()
+        val callEventGrouper = params.eventsGroup?.let { CallSignalingEventsGroup(it) } ?: return null
+        val roomSummary = params.partialState.roomSummary ?: return null
         val informationData = messageInformationDataFactory.create(params)
-        val callSignalingContent = event.getCallSignalingContent() ?: return null
-        val callId = callSignalingContent.callId ?: return null
-        val call = callManager.getCallById(callId)
-        val callKind = when {
-            call == null            -> CallTileTimelineItem.CallKind.UNKNOWN
-            call.mxCall.isVideoCall -> CallTileTimelineItem.CallKind.VIDEO
-            else                    -> CallTileTimelineItem.CallKind.AUDIO
-        }
-        return when (event.root.getClearType()) {
+        val callKind = if (callEventGrouper.isVideo()) CallTileTimelineItem.CallKind.VIDEO else CallTileTimelineItem.CallKind.AUDIO
+        val callItem = when (event.root.getClearType()) {
             EventType.CALL_ANSWER -> {
-                createCallTileTimelineItem(
-                        roomId = roomId,
-                        callId = callId,
-                        callStatus = CallTileTimelineItem.CallStatus.IN_CALL,
-                        callKind = callKind,
-                        callback = params.callback,
-                        highlight = params.isHighlighted,
-                        informationData = informationData,
-                        isStillActive = call != null
-                )
+                if (callEventGrouper.isInCall()) {
+                    createCallTileTimelineItem(
+                            roomSummary = roomSummary,
+                            callId = callEventGrouper.callId,
+                            callStatus = CallTileTimelineItem.CallStatus.IN_CALL,
+                            callKind = callKind,
+                            callback = params.callback,
+                            highlight = params.isHighlighted,
+                            informationData = informationData,
+                            isStillActive = callEventGrouper.isInCall(),
+                            formattedDuration = callEventGrouper.formattedDuration()
+                    )
+                } else {
+                    null
+                }
             }
             EventType.CALL_INVITE -> {
-                createCallTileTimelineItem(
-                        roomId = roomId,
-                        callId = callId,
-                        callStatus = CallTileTimelineItem.CallStatus.INVITED,
-                        callKind = callKind,
-                        callback = params.callback,
-                        highlight = params.isHighlighted,
-                        informationData = informationData,
-                        isStillActive = call != null
-                )
+                if (callEventGrouper.isRinging()) {
+                    createCallTileTimelineItem(
+                            roomSummary = roomSummary,
+                            callId = callEventGrouper.callId,
+                            callStatus = CallTileTimelineItem.CallStatus.INVITED,
+                            callKind = callKind,
+                            callback = params.callback,
+                            highlight = params.isHighlighted,
+                            informationData = informationData,
+                            isStillActive = callEventGrouper.isRinging(),
+                            formattedDuration = callEventGrouper.formattedDuration()
+                    )
+                } else {
+                    null
+                }
             }
             EventType.CALL_REJECT -> {
                 createCallTileTimelineItem(
-                        roomId = roomId,
-                        callId = callId,
+                        roomSummary = roomSummary,
+                        callId = callEventGrouper.callId,
                         callStatus = CallTileTimelineItem.CallStatus.REJECTED,
                         callKind = callKind,
                         callback = params.callback,
                         highlight = params.isHighlighted,
                         informationData = informationData,
-                        isStillActive = false
+                        isStillActive = false,
+                        formattedDuration = callEventGrouper.formattedDuration()
                 )
             }
             EventType.CALL_HANGUP -> {
                 createCallTileTimelineItem(
-                        roomId = roomId,
-                        callId = callId,
-                        callStatus = CallTileTimelineItem.CallStatus.ENDED,
+                        roomSummary = roomSummary,
+                        callId = callEventGrouper.callId,
+                        callStatus = if (callEventGrouper.callWasMissed()) CallTileTimelineItem.CallStatus.MISSED else CallTileTimelineItem.CallStatus.ENDED,
                         callKind = callKind,
                         callback = params.callback,
                         highlight = params.isHighlighted,
                         informationData = informationData,
-                        isStillActive = false
+                        isStillActive = false,
+                        formattedDuration = callEventGrouper.formattedDuration()
                 )
             }
             else                  -> null
         }
-    }
-
-    private fun TimelineEvent.getCallSignalingContent(): CallSignalingContent? {
-        return when (root.getClearType()) {
-            EventType.CALL_INVITE -> root.getClearContent().toModel<CallInviteContent>()
-            EventType.CALL_HANGUP -> root.getClearContent().toModel<CallHangupContent>()
-            EventType.CALL_REJECT -> root.getClearContent().toModel<CallRejectContent>()
-            EventType.CALL_ANSWER -> root.getClearContent().toModel<CallAnswerContent>()
-            else                  -> null
+        return if (callItem == null && showHiddenEvents) {
+            // Fallback to notice item for showing hidden events
+            noticeItemFactory.create(params)
+        } else {
+            callItem
         }
     }
 
     private fun createCallTileTimelineItem(
-            roomId: String,
+            roomSummary: RoomSummary,
             callId: String,
             callKind: CallTileTimelineItem.CallKind,
             callStatus: CallTileTimelineItem.CallStatus,
             informationData: MessageInformationData,
             highlight: Boolean,
             isStillActive: Boolean,
+            formattedDuration: String,
             callback: TimelineEventController.Callback?
     ): CallTileTimelineItem? {
-        val correctedRoomId = session.vectorCallService.userMapper.nativeRoomForVirtualRoom(roomId) ?: roomId
-        val userOfInterest = roomSummariesHolder.get(correctedRoomId)?.toMatrixItem() ?: return null
+        val userOfInterest = roomSummary.toMatrixItem()
         val attributes = messageItemAttributesFactory.create(null, informationData, callback).let {
             CallTileTimelineItem.Attributes(
                     callId = callId,
@@ -144,6 +139,7 @@ class CallItemFactory @Inject constructor(
                     callStatus = callStatus,
                     informationData = informationData,
                     avatarRenderer = it.avatarRenderer,
+                    formattedDuration = formattedDuration,
                     messageColorProvider = messageColorProvider,
                     itemClickListener = it.itemClickListener,
                     itemLongClickListener = it.itemLongClickListener,
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 cb2a067540..25b5dc34d6 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
@@ -22,7 +22,6 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.MergedTimelineEventVisibilityStateChangedListener
-import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
 import im.vector.app.features.home.room.detail.timeline.helper.canBeMerged
 import im.vector.app.features.home.room.detail.timeline.helper.isRoomConfiguration
@@ -47,8 +46,7 @@ import javax.inject.Inject
 class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
                                                   private val avatarRenderer: AvatarRenderer,
                                                   private val avatarSizeProvider: AvatarSizeProvider,
-                                                  private val roomSummariesHolder: RoomSummariesHolder,
-private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
+                                                  private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
 
     private val collapsedEventIds = linkedSetOf<Long>()
     private val mergeItemCollapseStates = HashMap<Long, Boolean>()
@@ -60,6 +58,7 @@ private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
     fun create(event: TimelineEvent,
                nextEvent: TimelineEvent?,
                items: List<TimelineEvent>,
+               partialState: TimelineEventController.PartialState,
                addDaySeparator: Boolean,
                currentPosition: Int,
                eventIdToHighlight: String?,
@@ -70,18 +69,17 @@ private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
                 && event.isRoomConfiguration(nextEvent.root.getClearContent()?.toModel<RoomCreateContent>()?.creator)) {
             // It's the first item before room.create
             // Collapse all room configuration events
-            buildRoomCreationMergedSummary(currentPosition, items, event, eventIdToHighlight, requestModelBuild, callback)
+            buildRoomCreationMergedSummary(currentPosition, items, partialState, event, eventIdToHighlight, requestModelBuild, callback)
         } else if (!event.canBeMerged() || (nextEvent?.root?.getClearType() == event.root.getClearType() && !addDaySeparator)) {
             null
         } else {
-            buildMembershipEventsMergedSummary(currentPosition, items, event, eventIdToHighlight, requestModelBuild, callback)
+            buildMembershipEventsMergedSummary(currentPosition, items, partialState, event, eventIdToHighlight, requestModelBuild, callback)
         }
     }
 
-    private fun isDirectRoom(roomId: String) = roomSummariesHolder.get(roomId)?.isDirect.orFalse()
-
     private fun buildMembershipEventsMergedSummary(currentPosition: Int,
                                                    items: List<TimelineEvent>,
+                                                   partialState: TimelineEventController.PartialState,
                                                    event: TimelineEvent,
                                                    eventIdToHighlight: String?,
                                                    requestModelBuild: () -> Unit,
@@ -102,7 +100,7 @@ private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
                         memberName = mergedEvent.senderInfo.disambiguatedDisplayName,
                         localId = mergedEvent.localId,
                         eventId = mergedEvent.root.eventId ?: "",
-                        isDirectRoom = isDirectRoom(event.roomId)
+                        isDirectRoom = partialState.isDirectRoom()
                 )
                 mergedData.add(data)
             }
@@ -141,6 +139,7 @@ private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
 
     private fun buildRoomCreationMergedSummary(currentPosition: Int,
                                                items: List<TimelineEvent>,
+                                               partialState: TimelineEventController.PartialState,
                                                event: TimelineEvent,
                                                eventIdToHighlight: String?,
                                                requestModelBuild: () -> Unit,
@@ -173,7 +172,7 @@ private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
                                 memberName = mergedEvent.senderInfo.disambiguatedDisplayName,
                                 localId = mergedEvent.localId,
                                 eventId = mergedEvent.root.eventId ?: "",
-                                isDirectRoom = isDirectRoom(event.roomId)
+                                isDirectRoom = partialState.isDirectRoom()
                         )
                         mergedData.add(data)
                     }
@@ -206,7 +205,8 @@ private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
                     isEncryptionAlgorithmSecure = encryptionAlgorithm == MXCRYPTO_ALGORITHM_MEGOLM,
                     callback = callback,
                     currentUserId = currentUserId,
-                    roomSummary = roomSummariesHolder.get(event.roomId),
+                    roomSummary = partialState.roomSummary,
+                    canInvite = powerLevelsHelper?.isUserAbleToInvite(currentUserId) ?: false,
                     canChangeAvatar = powerLevelsHelper?.isUserAllowedToSend(currentUserId, true, EventType.STATE_ROOM_AVATAR) ?: false,
                     canChangeTopic = powerLevelsHelper?.isUserAllowedToSend(currentUserId, true, EventType.STATE_ROOM_TOPIC) ?: false,
                     canChangeName = powerLevelsHelper?.isUserAllowedToSend(currentUserId, true, EventType.STATE_ROOM_NAME) ?: false
@@ -223,6 +223,10 @@ private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
         } else null
     }
 
+    private fun TimelineEventController.PartialState.isDirectRoom(): Boolean {
+        return roomSummary?.isDirect.orFalse()
+    }
+
     fun isCollapsed(localId: Long): Boolean {
         return collapsedEventIds.contains(localId)
     }
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 e67fa7cca0..287cd014e9 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
@@ -622,11 +622,13 @@ class MessageItemFactory @Inject constructor(
                 .highlighted(highlight)
     }
 
-    private fun List<Int>?.toFft(): List<Int>? {
-        return this?.map {
-            // Value comes from AudioRecordView.maxReportableAmp, and 1024 is the max value in the Matrix spec
-            it * 22760 / 1024
-        }
+    private fun List<Int?>?.toFft(): List<Int>? {
+        return this
+                ?.filterNotNull()
+                ?.map {
+                    // Value comes from AudioRecordView.maxReportableAmp, and 1024 is the max value in the Matrix spec
+                    it * 22760 / 1024
+                }
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
index e757b6b47b..ed6620dcd4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
@@ -22,6 +22,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvide
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.item.NoticeItem
 import im.vector.app.features.home.room.detail.timeline.item.NoticeItem_
+import org.matrix.android.sdk.api.extensions.orFalse
 import javax.inject.Inject
 
 class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEventFormatter,
@@ -31,7 +32,7 @@ class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEv
 
     fun create(params: TimelineItemFactoryParams): NoticeItem? {
         val event = params.event
-        val formattedText = eventFormatter.format(event) ?: return null
+        val formattedText = eventFormatter.format(event, isDm = params.partialState.roomSummary?.isDirect.orFalse()) ?: return null
         val informationData = informationDataFactory.create(params)
         val attributes = NoticeItem.Attributes(
                 avatarRenderer = avatarRenderer,
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 0e595ba30e..cdfedb2925 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
@@ -17,6 +17,7 @@
 package im.vector.app.features.home.room.detail.timeline.factory
 
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventsGroup
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 data class TimelineItemFactoryParams(
@@ -24,9 +25,14 @@ data class TimelineItemFactoryParams(
         val prevEvent: TimelineEvent? = null,
         val nextEvent: TimelineEvent? = null,
         val nextDisplayableEvent: TimelineEvent? = null,
-        val highlightedEventId: String? = null,
+        val partialState: TimelineEventController.PartialState = TimelineEventController.PartialState(),
         val lastSentEventIdWithoutReadReceipts: String? = null,
-        val callback: TimelineEventController.Callback? = null
+        val callback: TimelineEventController.Callback? = null,
+        val eventsGroup: TimelineEventsGroup? = null
 ) {
+
+    val highlightedEventId: String?
+        get() = partialState.highlightedEventId
+
     val isHighlighted = highlightedEventId == event.eventId
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
index 1fc57489a5..52f72810c9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
@@ -16,34 +16,28 @@
 
 package im.vector.app.features.home.room.detail.timeline.factory
 
-import im.vector.app.ActiveSessionDataSource
-import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyModel
-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.helper.AvatarSizeProvider
+import im.vector.app.features.home.room.detail.timeline.helper.JitsiWidgetEventsGroup
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
-import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
-import im.vector.app.features.home.room.detail.timeline.item.WidgetTileTimelineItem
-import im.vector.app.features.home.room.detail.timeline.item.WidgetTileTimelineItem_
-import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.session.events.model.Event
+import im.vector.app.features.home.room.detail.timeline.item.CallTileTimelineItem
+import im.vector.app.features.home.room.detail.timeline.item.CallTileTimelineItem_
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class WidgetItemFactory @Inject constructor(
-        private val sp: StringProvider,
-        private val messageItemAttributesFactory: MessageItemAttributesFactory,
         private val informationDataFactory: MessageInformationDataFactory,
         private val noticeItemFactory: NoticeItemFactory,
         private val avatarSizeProvider: AvatarSizeProvider,
-        private val activeSessionDataSource: ActiveSessionDataSource
-) {
-    private val currentUserId: String?
-        get() = activeSessionDataSource.currentValue?.orNull()?.myUserId
-
-    private fun Event.isSentByCurrentUser() = senderId != null && senderId == currentUserId
+        private val messageColorProvider: MessageColorProvider,
+        private val avatarRenderer: AvatarRenderer,
+        private val userPreferencesProvider: UserPreferencesProvider) {
 
     fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
         val event = params.event
@@ -51,62 +45,54 @@ class WidgetItemFactory @Inject constructor(
         val previousWidgetContent: WidgetContent? = event.root.resolvedPrevContent().toModel()
 
         return when (WidgetType.fromString(widgetContent.type ?: previousWidgetContent?.type ?: "")) {
-            WidgetType.Jitsi -> createJitsiItem(params, widgetContent, previousWidgetContent)
+            WidgetType.Jitsi -> createJitsiItem(params, widgetContent)
             // There is lot of other widget types we could improve here
             else             -> noticeItemFactory.create(params)
         }
     }
 
-    private fun createJitsiItem(params: TimelineItemFactoryParams,
-                                widgetContent: WidgetContent,
-                                previousWidgetContent: WidgetContent?): VectorEpoxyModel<*> {
-        val timelineEvent = params.event
+    private fun createJitsiItem(params: TimelineItemFactoryParams, widgetContent: WidgetContent): VectorEpoxyModel<*>? {
         val informationData = informationDataFactory.create(params)
-        val attributes = messageItemAttributesFactory.create(null, informationData, params.callback)
-
-        val disambiguatedDisplayName = timelineEvent.senderInfo.disambiguatedDisplayName
-        val message = if (widgetContent.isActive()) {
-            val widgetName = widgetContent.getHumanName()
-            if (previousWidgetContent?.isActive().orFalse()) {
-                // Widget has been modified
-                if (timelineEvent.root.isSentByCurrentUser()) {
-                    sp.getString(R.string.notice_widget_jitsi_modified_by_you, widgetName)
-                } else {
-                    sp.getString(R.string.notice_widget_jitsi_modified, disambiguatedDisplayName, widgetName)
-                }
+        val userOfInterest = params.partialState.roomSummary?.toMatrixItem() ?: return null
+        val isActiveTile = widgetContent.isActive()
+        val jitsiWidgetEventsGroup = params.eventsGroup?.let { JitsiWidgetEventsGroup(it) } ?: return null
+        val isCallStillActive = jitsiWidgetEventsGroup.isStillActive()
+        val showHiddenEvents = userPreferencesProvider.shouldShowHiddenEvents()
+        if (isActiveTile && !isCallStillActive) {
+            return if (showHiddenEvents) {
+                noticeItemFactory.create(params)
             } else {
-                // Widget has been added
-                if (timelineEvent.root.isSentByCurrentUser()) {
-                    sp.getString(R.string.notice_widget_jitsi_added_by_you, widgetName)
-                } else {
-                    sp.getString(R.string.notice_widget_jitsi_added, disambiguatedDisplayName, widgetName)
-                }
-            }
-        } else {
-            // Widget has been removed
-            val widgetName = previousWidgetContent?.getHumanName()
-            if (timelineEvent.root.isSentByCurrentUser()) {
-                sp.getString(R.string.notice_widget_jitsi_removed_by_you, widgetName)
-            } else {
-                sp.getString(R.string.notice_widget_jitsi_removed, disambiguatedDisplayName, widgetName)
+                null
             }
         }
-
-        return WidgetTileTimelineItem_()
-                .attributes(
-                        WidgetTileTimelineItem.Attributes(
-                                title = message,
-                                drawableStart = R.drawable.ic_video,
-                                informationData = informationData,
-                                avatarRenderer = attributes.avatarRenderer,
-                                messageColorProvider = attributes.messageColorProvider,
-                                itemLongClickListener = attributes.itemLongClickListener,
-                                itemClickListener = attributes.itemClickListener,
-                                reactionPillCallback = attributes.reactionPillCallback,
-                                readReceiptsCallback = attributes.readReceiptsCallback,
-                                emojiTypeFace = attributes.emojiTypeFace
-                        )
-                )
+        val callStatus = if (isActiveTile && params.event.root.stateKey == params.partialState.jitsiState.widgetId) {
+            if (params.partialState.jitsiState.hasJoined) {
+                CallTileTimelineItem.CallStatus.IN_CALL
+            } else {
+                CallTileTimelineItem.CallStatus.INVITED
+            }
+        } else {
+            CallTileTimelineItem.CallStatus.ENDED
+        }
+        val attributes = CallTileTimelineItem.Attributes(
+                callId = jitsiWidgetEventsGroup.callId,
+                callKind = CallTileTimelineItem.CallKind.CONFERENCE,
+                callStatus = callStatus,
+                informationData = informationData,
+                avatarRenderer = avatarRenderer,
+                messageColorProvider = messageColorProvider,
+                itemClickListener = null,
+                itemLongClickListener = null,
+                reactionPillCallback = params.callback,
+                readReceiptsCallback = params.callback,
+                userOfInterest = userOfInterest,
+                callback = params.callback,
+                isStillActive = isCallStillActive,
+                formattedDuration = ""
+        )
+        return CallTileTimelineItem_()
+                .attributes(attributes)
+                .highlighted(params.isHighlighted)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
index e6fbc5294b..5a9af975ed 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
@@ -41,7 +41,7 @@ class DisplayableEventFormatter @Inject constructor(
         private val noticeEventFormatter: NoticeEventFormatter
 ) {
 
-    fun format(timelineEvent: TimelineEvent, appendAuthor: Boolean): CharSequence {
+    fun format(timelineEvent: TimelineEvent, isDm: Boolean, appendAuthor: Boolean): CharSequence {
         if (timelineEvent.root.isRedacted()) {
             return noticeEventFormatter.formatRedactedEvent(timelineEvent.root)
         }
@@ -135,7 +135,7 @@ class DisplayableEventFormatter @Inject constructor(
             }
             else                            -> {
                 return span {
-                    text = noticeEventFormatter.format(timelineEvent) ?: ""
+                    text = noticeEventFormatter.format(timelineEvent, isDm) ?: ""
                     textStyle = "italic"
                 }
             }
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 b1b96df9ea..c80a92d568 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
@@ -19,7 +19,6 @@ package im.vector.app.features.home.room.detail.timeline.format
 import im.vector.app.ActiveSessionDataSource
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
 import im.vector.app.features.roomprofile.permissions.RoleFormatter
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.extensions.appendNl
@@ -40,7 +39,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.RoomNameContent
 import org.matrix.android.sdk.api.session.room.model.RoomServerAclContent
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
 import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
 import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
@@ -58,7 +56,6 @@ class NoticeEventFormatter @Inject constructor(
         private val roomHistoryVisibilityFormatter: RoomHistoryVisibilityFormatter,
         private val roleFormatter: RoleFormatter,
         private val vectorPreferences: VectorPreferences,
-        private val roomSummariesHolder: RoomSummariesHolder,
         private val sp: StringProvider
 ) {
 
@@ -67,28 +64,25 @@ class NoticeEventFormatter @Inject constructor(
 
     private fun Event.isSentByCurrentUser() = senderId != null && senderId == currentUserId
 
-    private fun RoomSummary?.isDm() = this?.isDirect.orFalse()
-
-    fun format(timelineEvent: TimelineEvent): CharSequence? {
-        val rs = roomSummariesHolder.get(timelineEvent.roomId)
+    fun format(timelineEvent: TimelineEvent, isDm: Boolean): CharSequence? {
         return when (val type = timelineEvent.root.getClearType()) {
-            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
-            EventType.STATE_ROOM_CREATE             -> formatRoomCreateEvent(timelineEvent.root, rs)
+            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
+            EventType.STATE_ROOM_CREATE             -> formatRoomCreateEvent(timelineEvent.root, isDm)
             EventType.STATE_ROOM_NAME               -> formatRoomNameEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_TOPIC              -> formatRoomTopicEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_AVATAR             -> formatRoomAvatarEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
-            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
+            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
+            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
             EventType.STATE_ROOM_ALIASES            -> formatRoomAliasesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_CANONICAL_ALIAS    -> formatRoomCanonicalAliasEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_HISTORY_VISIBILITY ->
-                formatRoomHistoryVisibilityEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
+                formatRoomHistoryVisibilityEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
             EventType.STATE_ROOM_SERVER_ACL         -> formatRoomServerAclEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_GUEST_ACCESS       -> formatRoomGuestAccessEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
+            EventType.STATE_ROOM_GUEST_ACCESS       -> formatRoomGuestAccessEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
             EventType.STATE_ROOM_ENCRYPTION         -> formatRoomEncryptionEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_WIDGET,
             EventType.STATE_ROOM_WIDGET_LEGACY      -> formatWidgetEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
+            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, isDm)
             EventType.STATE_ROOM_POWER_LEVELS       -> formatRoomPowerLevels(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.CALL_INVITE,
             EventType.CALL_CANDIDATES,
@@ -176,20 +170,20 @@ class NoticeEventFormatter @Inject constructor(
         }
     }
 
-    fun format(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
+    fun format(event: Event, senderName: String?, isDm: Boolean): CharSequence? {
         return when (val type = event.getClearType()) {
-            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(event, senderName, rs)
+            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(event, senderName, isDm)
             EventType.STATE_ROOM_NAME               -> formatRoomNameEvent(event, senderName)
             EventType.STATE_ROOM_TOPIC              -> formatRoomTopicEvent(event, senderName)
             EventType.STATE_ROOM_AVATAR             -> formatRoomAvatarEvent(event, senderName)
-            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(event, senderName, rs)
-            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(event, senderName, rs)
-            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(event, senderName, rs)
+            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(event, senderName, isDm)
+            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(event, senderName, isDm)
+            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(event, senderName, isDm)
             EventType.CALL_INVITE,
             EventType.CALL_HANGUP,
             EventType.CALL_REJECT,
             EventType.CALL_ANSWER                   -> formatCallEvent(type, event, senderName)
-            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(event, senderName, rs)
+            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(event, senderName, isDm)
             else                                    -> {
                 Timber.v("Type $type not handled by this formatter")
                 null
@@ -201,14 +195,14 @@ class NoticeEventFormatter @Inject constructor(
         return "Debug: event type \"${event.getClearType()}\""
     }
 
-    private fun formatRoomCreateEvent(event: Event, rs: RoomSummary?): CharSequence? {
+    private fun formatRoomCreateEvent(event: Event, isDm: Boolean): CharSequence? {
         return event.getClearContent().toModel<RoomCreateContent>()
                 ?.takeIf { it.creator.isNullOrBlank().not() }
                 ?.let {
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_created_by_you else R.string.notice_room_created_by_you)
+                        sp.getString(if (isDm) R.string.notice_direct_room_created_by_you else R.string.notice_room_created_by_you)
                     } else {
-                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_created else R.string.notice_room_created, it.creator)
+                        sp.getString(if (isDm) R.string.notice_direct_room_created else R.string.notice_room_created, it.creator)
                     }
                 }
     }
@@ -230,11 +224,11 @@ class NoticeEventFormatter @Inject constructor(
         }
     }
 
-    private fun formatRoomTombstoneEvent(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
+    private fun formatRoomTombstoneEvent(event: Event, senderName: String?, isDm: Boolean): CharSequence? {
         return if (event.isSentByCurrentUser()) {
-            sp.getString(if (rs.isDm()) R.string.notice_direct_room_update_by_you else R.string.notice_room_update_by_you)
+            sp.getString(if (isDm) R.string.notice_direct_room_update_by_you else R.string.notice_room_update_by_you)
         } else {
-            sp.getString(if (rs.isDm()) R.string.notice_direct_room_update else R.string.notice_room_update, senderName)
+            sp.getString(if (isDm) R.string.notice_direct_room_update else R.string.notice_room_update, senderName)
         }
     }
 
@@ -272,20 +266,20 @@ class NoticeEventFormatter @Inject constructor(
         }
     }
 
-    private fun formatRoomHistoryVisibilityEvent(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
+    private fun formatRoomHistoryVisibilityEvent(event: Event, senderName: String?, isDm: Boolean): CharSequence? {
         val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.historyVisibility ?: return null
 
         val historyVisibilitySuffix = roomHistoryVisibilityFormatter.getNoticeSuffix(historyVisibility)
         return if (event.isSentByCurrentUser()) {
-            sp.getString(if (rs.isDm()) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
+            sp.getString(if (isDm) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
                     historyVisibilitySuffix)
         } else {
-            sp.getString(if (rs.isDm()) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
+            sp.getString(if (isDm) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
                     senderName, historyVisibilitySuffix)
         }
     }
 
-    private fun formatRoomThirdPartyInvite(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
+    private fun formatRoomThirdPartyInvite(event: Event, senderName: String?, isDm: Boolean): CharSequence? {
         val content = event.getClearContent().toModel<RoomThirdPartyInviteContent>()
         val prevContent = event.resolvedPrevContent()?.toModel<RoomThirdPartyInviteContent>()
 
@@ -294,24 +288,24 @@ class NoticeEventFormatter @Inject constructor(
                 // Revoke case
                 if (event.isSentByCurrentUser()) {
                     sp.getString(
-                            if (rs.isDm()) {
+                            if (isDm) {
                                 R.string.notice_direct_room_third_party_revoked_invite_by_you
                             } else {
                                 R.string.notice_room_third_party_revoked_invite_by_you
                             },
                             prevContent.displayName)
                 } else {
-                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
+                    sp.getString(if (isDm) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
                             senderName, prevContent.displayName)
                 }
             }
             content != null     -> {
                 // Invitation case
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
+                    sp.getString(if (isDm) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
                             content.displayName)
                 } else {
-                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
+                    sp.getString(if (isDm) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
                             senderName, content.displayName)
                 }
             }
@@ -358,7 +352,7 @@ class NoticeEventFormatter @Inject constructor(
                 }
             EventType.CALL_REJECT     ->
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(R.string.call_tile_you_declined, "")
+                    sp.getString(R.string.call_tile_you_declined_this_call)
                 } else {
                     sp.getString(R.string.call_tile_other_declined, senderName)
                 }
@@ -366,13 +360,13 @@ class NoticeEventFormatter @Inject constructor(
         }
     }
 
-    private fun formatRoomMemberEvent(event: Event, senderName: String?, rs: RoomSummary?): String? {
+    private fun formatRoomMemberEvent(event: Event, senderName: String?, isDm: Boolean): String? {
         val eventContent: RoomMemberContent? = event.getClearContent().toModel()
         val prevEventContent: RoomMemberContent? = event.resolvedPrevContent().toModel()
         val isMembershipEvent = prevEventContent?.membership != eventContent?.membership
                 || eventContent?.membership == Membership.LEAVE
         return if (isMembershipEvent) {
-            buildMembershipNotice(event, senderName, eventContent, prevEventContent, rs)
+            buildMembershipNotice(event, senderName, eventContent, prevEventContent, isDm)
         } else {
             buildProfileNotice(event, senderName, eventContent, prevEventContent)
         }
@@ -554,25 +548,25 @@ class NoticeEventFormatter @Inject constructor(
         }
     }
 
-    private fun formatRoomGuestAccessEvent(event: Event, senderName: String?, rs: RoomSummary?): String? {
+    private fun formatRoomGuestAccessEvent(event: Event, senderName: String?, isDm: Boolean): String? {
         val eventContent: RoomGuestAccessContent? = event.getClearContent().toModel()
         return when (eventContent?.guestAccess) {
             GuestAccess.CanJoin   ->
                 if (event.isSentByCurrentUser()) {
                     sp.getString(
-                            if (rs.isDm()) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you
+                            if (isDm) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you
                     )
                 } else {
-                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
+                    sp.getString(if (isDm) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
                             senderName)
                 }
             GuestAccess.Forbidden ->
                 if (event.isSentByCurrentUser()) {
                     sp.getString(
-                            if (rs.isDm()) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you
+                            if (isDm) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you
                     )
                 } else {
-                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
+                    sp.getString(if (isDm) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
                             senderName)
                 }
             else                  -> null
@@ -656,7 +650,7 @@ class NoticeEventFormatter @Inject constructor(
                                       senderName: String?,
                                       eventContent: RoomMemberContent?,
                                       prevEventContent: RoomMemberContent?,
-                                      rs: RoomSummary?): String? {
+                                      isDm: Boolean): String? {
         val senderDisplayName = senderName ?: event.senderId ?: ""
         val targetDisplayName = eventContent?.displayName ?: prevEventContent?.displayName ?: event.stateKey ?: ""
         return when (eventContent?.membership) {
@@ -706,17 +700,17 @@ class NoticeEventFormatter @Inject constructor(
             Membership.JOIN   ->
                 eventContent.safeReason?.let { reason ->
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
+                        sp.getString(if (isDm) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
                                 reason)
                     } else {
-                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
+                        sp.getString(if (isDm) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
                                 senderDisplayName, reason)
                     }
                 } ?: run {
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
+                        sp.getString(if (isDm) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
                     } else {
-                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_join else R.string.notice_room_join,
+                        sp.getString(if (isDm) R.string.notice_direct_room_join else R.string.notice_room_join,
                                 senderDisplayName)
                     }
                 }
@@ -738,7 +732,7 @@ class NoticeEventFormatter @Inject constructor(
                             eventContent.safeReason?.let { reason ->
                                 if (event.isSentByCurrentUser()) {
                                     sp.getString(
-                                            if (rs.isDm()) {
+                                            if (isDm) {
                                                 R.string.notice_direct_room_leave_with_reason_by_you
                                             } else {
                                                 R.string.notice_room_leave_with_reason_by_you
@@ -746,14 +740,14 @@ class NoticeEventFormatter @Inject constructor(
                                             reason
                                     )
                                 } else {
-                                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
+                                    sp.getString(if (isDm) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
                                             senderDisplayName, reason)
                                 }
                             } ?: run {
                                 if (event.isSentByCurrentUser()) {
-                                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
+                                    sp.getString(if (isDm) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
                                 } else {
-                                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_leave else R.string.notice_room_leave,
+                                    sp.getString(if (isDm) R.string.notice_direct_room_leave else R.string.notice_room_leave,
                                             senderDisplayName)
                                 }
                             }
@@ -818,14 +812,14 @@ class NoticeEventFormatter @Inject constructor(
         }
     }
 
-    private fun formatJoinRulesEvent(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
+    private fun formatJoinRulesEvent(event: Event, senderName: String?, isDm: Boolean): CharSequence? {
         val content = event.getClearContent().toModel<RoomJoinRulesContent>() ?: return null
         return when (content.joinRules) {
             RoomJoinRules.INVITE ->
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (rs.isDm()) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
+                    sp.getString(if (isDm) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
                 } else {
-                    sp.getString(if (rs.isDm()) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
+                    sp.getString(if (isDm) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
                             senderName)
                 }
             RoomJoinRules.PUBLIC ->
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 221149aced..da75a808d8 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
@@ -34,6 +34,7 @@ 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.toModel
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -48,7 +49,6 @@ import javax.inject.Inject
  * This class compute if data of an event (such has avatar, display name, ...) should be displayed, depending on the previous event in the timeline
  */
 class MessageInformationDataFactory @Inject constructor(private val session: Session,
-                                                        private val roomSummariesHolder: RoomSummariesHolder,
                                                         private val dateFormatter: VectorDateFormatter,
                                                         private val visibilityHelper: TimelineEventVisibilityHelper,
                                                         private val vectorPreferences: VectorPreferences) {
@@ -74,7 +74,8 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                         || nextDisplayableEvent.isEdition()
 
         val time = dateFormatter.format(event.root.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
-        val e2eDecoration = getE2EDecoration(event)
+        val roomSummary = params.partialState.roomSummary
+        val e2eDecoration = getE2EDecoration(roomSummary, event)
 
         // SendState Decoration
         val isSentByMe = event.root.senderId == session.myUserId
@@ -140,8 +141,7 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         }
     }
 
-    private fun getE2EDecoration(event: TimelineEvent): E2EDecoration {
-        val roomSummary = roomSummariesHolder.get(event.roomId)
+    private fun getE2EDecoration(roomSummary: RoomSummary?, event: TimelineEvent): E2EDecoration {
         return if (
                 event.root.sendState == SendState.SYNCED
                 && roomSummary?.isEncrypted.orFalse()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummariesHolder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummariesHolder.kt
deleted file mode 100644
index ac953f91f7..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummariesHolder.kt
+++ /dev/null
@@ -1,43 +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.home.room.detail.timeline.helper
-
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/*
-    You can use this to share room summary instances within the app.
-    You should probably use this only in the context of the timeline
- */
-@Singleton
-class RoomSummariesHolder @Inject constructor() {
-
-    private var roomSummaries = HashMap<String, RoomSummary>()
-
-    fun set(roomSummary: RoomSummary) {
-        roomSummaries[roomSummary.roomId] = roomSummary
-    }
-
-    fun get(roomId: String) = roomSummaries[roomId]
-
-    fun remove(roomId: String) = roomSummaries.remove(roomId)
-
-    fun clear() {
-        roomSummaries.clear()
-    }
-}
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 3121f031e2..736da63ee2 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
@@ -19,12 +19,8 @@ package im.vector.app.features.home.room.detail.timeline.helper
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.VisibilityState
 import im.vector.app.core.epoxy.LoadingItem_
-import im.vector.app.core.epoxy.TimelineEmptyItem_
-import im.vector.app.core.resources.UserPreferencesProvider
-import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.home.room.detail.UnreadState
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
-import im.vector.app.features.home.room.detail.timeline.item.CallTileTimelineItem
 import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem
 import im.vector.app.features.home.room.detail.timeline.item.ItemWithEvents
 import im.vector.app.features.home.room.detail.timeline.item.TimelineReadMarkerItem_
@@ -34,9 +30,7 @@ import kotlin.reflect.KMutableProperty0
 private const val DEFAULT_PREFETCH_THRESHOLD = 30
 
 class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMutableProperty0<Int?>,
-                                          private val adapterPositionMapping: MutableMap<String, Int>,
-                                          private val userPreferencesProvider: UserPreferencesProvider,
-                                          private val callManager: WebRtcCallManager
+                                          private val adapterPositionMapping: MutableMap<String, Int>
 ) {
 
     private var previousModelsSize = 0
@@ -50,14 +44,12 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
     ) {
         positionOfReadMarker.set(null)
         adapterPositionMapping.clear()
-        val callIds = mutableSetOf<String>()
 
         // Add some prefetch loader if needed
         models.addBackwardPrefetchIfNeeded(timeline, callback)
         models.addForwardPrefetchIfNeeded(timeline, callback)
 
         val modelsIterator = models.listIterator()
-        val showHiddenEvents = userPreferencesProvider.shouldShowHiddenEvents()
         var index = 0
         val firstUnreadEventId = (unreadState as? UnreadState.HasUnread)?.firstUnreadEventId
         var atLeastOneVisibleItemSinceLastDaySeparator = false
@@ -83,11 +75,6 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                     return@forEach
                 }
                 atLeastOneVisibleItemSinceLastDaySeparator = false
-            } else if (epoxyModel is CallTileTimelineItem) {
-                val hasBeenRemoved = modelsIterator.removeCallItemIfNeeded(epoxyModel, callIds, showHiddenEvents)
-                if (!hasBeenRemoved) {
-                    atLeastOneVisibleItemSinceLastDaySeparator = true
-                }
             }
             if (appendReadMarker) {
                 modelsIterator.addReadMarkerItem(callback)
@@ -109,29 +96,6 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
         add(readMarker)
     }
 
-    private fun MutableListIterator<EpoxyModel<*>>.removeCallItemIfNeeded(
-            epoxyModel: CallTileTimelineItem,
-            callIds: MutableSet<String>,
-            showHiddenEvents: Boolean
-    ): Boolean {
-        val callId = epoxyModel.attributes.callId
-        // We should remove the call tile if we already have one for this call or
-        // if this is an active call tile without an actual call (which can happen with permalink)
-        val shouldRemoveCallItem = callIds.contains(callId)
-                || (!callManager.getAdvertisedCalls().contains(callId) && epoxyModel.attributes.callStatus.isActive())
-        val removed = shouldRemoveCallItem && !showHiddenEvents
-        if (removed) {
-            remove()
-            val emptyItem = TimelineEmptyItem_()
-                    .id(epoxyModel.id())
-                    .eventId(epoxyModel.attributes.informationData.eventId)
-                    .notBlank(false)
-            add(emptyItem)
-        }
-        callIds.add(callId)
-        return removed
-    }
-
     private fun MutableList<EpoxyModel<*>>.addBackwardPrefetchIfNeeded(timeline: Timeline?, callback: TimelineEventController.Callback?) {
         val shouldAddBackwardPrefetch = timeline?.hasMoreToLoad(Timeline.Direction.BACKWARDS) ?: false
         if (shouldAddBackwardPrefetch) {
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
new file mode 100644
index 0000000000..3910204293
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventsGroups.kt
@@ -0,0 +1,133 @@
+/*
+ * 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 im.vector.app.core.utils.TextUtils
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
+import org.threeten.bp.Duration
+
+class TimelineEventsGroup(val groupId: String) {
+
+    val events: Set<TimelineEvent>
+        get() = _events
+
+    private val _events = HashSet<TimelineEvent>()
+
+    fun add(timelineEvent: TimelineEvent) {
+        _events.add(timelineEvent)
+    }
+}
+
+class TimelineEventsGroups {
+
+    private val groups = HashMap<String, TimelineEventsGroup>()
+
+    fun addOrIgnore(event: TimelineEvent) {
+        val groupId = event.getGroupIdOrNull() ?: return
+        groups.getOrPut(groupId) { TimelineEventsGroup(groupId) }.add(event)
+    }
+
+    fun getOrNull(event: TimelineEvent): TimelineEventsGroup? {
+        val groupId = event.getGroupIdOrNull() ?: return null
+        return groups[groupId]
+    }
+
+    private fun TimelineEvent.getGroupIdOrNull(): String? {
+        val type = root.getClearType()
+        val content = root.getClearContent()
+        return if (EventType.isCallEvent(type)) {
+            (content?.get("call_id") as? String)
+        } else if (type == EventType.STATE_ROOM_WIDGET || type == EventType.STATE_ROOM_WIDGET_LEGACY) {
+            root.stateKey
+        } else {
+            null
+        }
+    }
+
+    fun clear() {
+        groups.clear()
+    }
+}
+
+class JitsiWidgetEventsGroup(private val group: TimelineEventsGroup) {
+
+    val callId: String = group.groupId
+
+    fun isStillActive(): Boolean {
+        return group.events.none {
+            it.root.getClearContent().toModel<WidgetContent>()?.isActive() == false
+        }
+    }
+}
+
+class CallSignalingEventsGroup(private val group: TimelineEventsGroup) {
+
+    val callId: String = group.groupId
+
+    fun isVideo(): Boolean {
+        val invite = getInvite() ?: return false
+        return invite.root.getClearContent().toModel<CallInviteContent>()?.isVideo().orFalse()
+    }
+
+    fun isRinging(): Boolean {
+        return getAnswer() == null && getHangup() == null && getReject() == null
+    }
+
+    fun isInCall(): Boolean {
+        return getHangup() == null && getReject() == null
+    }
+
+    fun formattedDuration(): String {
+        val start = getAnswer()?.root?.originServerTs
+        val end = getHangup()?.root?.originServerTs
+        return if (start == null || end == null) {
+            ""
+        } else {
+            val durationInMillis = (end - start).coerceAtLeast(0L)
+            val duration = Duration.ofMillis(durationInMillis)
+            TextUtils.formatDuration(duration)
+        }
+    }
+
+    /**
+     * Returns true if there are only events from one side.
+     */
+    fun callWasMissed(): Boolean {
+        return group.events.distinctBy { it.senderInfo.userId }.size == 1
+    }
+
+    private fun getAnswer(): TimelineEvent? {
+        return group.events.firstOrNull { it.root.getClearType() == EventType.CALL_ANSWER }
+    }
+
+    private fun getInvite(): TimelineEvent? {
+        return group.events.firstOrNull { it.root.getClearType() == EventType.CALL_INVITE }
+    }
+
+    private fun getHangup(): TimelineEvent? {
+        return group.events.firstOrNull { it.root.getClearType() == EventType.CALL_HANGUP }
+    }
+
+    private fun getReject(): TimelineEvent? {
+        return group.events.firstOrNull { it.root.getClearType() == EventType.CALL_REJECT }
+    }
+}
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 fd5eea1b49..b53495fdaf 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
@@ -42,6 +42,10 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
     override val baseAttributes: AbsBaseMessageItem.Attributes
         get() = attributes
 
+    override fun isCacheable(): Boolean {
+        return attributes.informationData.sendStateDecoration != SendStateDecoration.SENT
+    }
+
     @EpoxyAttribute
     lateinit var attributes: Attributes
 
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 1f12bdbd2c..46392a494f 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
@@ -15,6 +15,7 @@
  */
 package im.vector.app.features.home.room.detail.timeline.item
 
+import android.content.res.Resources
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
@@ -31,13 +32,11 @@ 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.setLeftDrawable
-import im.vector.app.core.extensions.setTextWithColoredPart
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailAction
 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.util.MatrixItem
-import timber.log.Timber
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_state)
 abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Holder>() {
@@ -45,6 +44,8 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
     override val baseAttributes: AbsBaseMessageItem.Attributes
         get() = attributes
 
+    override fun isCacheable() = false
+
     @EpoxyAttribute
     lateinit var attributes: Attributes
 
@@ -57,81 +58,190 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
         }
         holder.creatorNameView.text = attributes.userOfInterest.getBestName()
         attributes.avatarRenderer.render(attributes.userOfInterest, holder.creatorAvatarView)
-        if (attributes.callKind != CallKind.UNKNOWN) {
-            holder.callKindView.isVisible = true
-            holder.callKindView.setText(attributes.callKind.title)
-            holder.callKindView.setLeftDrawable(attributes.callKind.icon)
-        } else {
-            holder.callKindView.isVisible = false
+        when (attributes.callStatus) {
+            CallStatus.INVITED  -> renderInvitedStatus(holder)
+            CallStatus.IN_CALL  -> renderInCallStatus(holder)
+            CallStatus.REJECTED -> renderRejectedStatus(holder)
+            CallStatus.ENDED    -> renderEndedStatus(holder)
+            CallStatus.MISSED   -> renderMissedStatus(holder)
         }
-        if (attributes.callStatus == CallStatus.INVITED && !attributes.informationData.sentByMe && attributes.isStillActive) {
-            holder.acceptRejectViewGroup.isVisible = true
-            holder.acceptView.onClick {
-                attributes.callback?.onTimelineItemAction(RoomDetailAction.AcceptCall(callId = attributes.callId))
+        renderSendState(holder.view, null, holder.failedToSendIndicator)
+    }
+
+    private fun renderMissedStatus(holder: Holder) {
+        // Sent by me means I made the call and opponent missed it.
+        if (attributes.informationData.sentByMe) {
+            if (attributes.callKind.isVoiceCall) {
+                holder.statusView.setStatus(R.string.call_tile_no_answer, R.drawable.ic_voice_call_declined)
+            } else {
+                holder.statusView.setStatus(R.string.call_tile_no_answer, R.drawable.ic_video_call_declined)
             }
-            holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorOnPrimary)
-            holder.rejectView.onClick {
-                attributes.callback?.onTimelineItemAction(RoomDetailAction.EndCall)
+        } else {
+            if (attributes.callKind.isVoiceCall) {
+                holder.statusView.setStatus(R.string.call_tile_voice_missed, R.drawable.ic_missed_voice_call_small)
+            } else {
+                holder.statusView.setStatus(R.string.call_tile_video_missed, R.drawable.ic_missed_video_call_small)
             }
-            holder.statusView.isVisible = false
-            when (attributes.callKind) {
-                CallKind.CONFERENCE -> {
-                    holder.rejectView.setText(R.string.ignore)
-                    holder.acceptView.setText(R.string.join)
-                    holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorOnPrimary)
+        }
+        holder.acceptRejectViewGroup.isVisible = true
+        holder.acceptView.setText(R.string.call_tile_call_back)
+        holder.acceptView.setLeftDrawable(attributes.callKind.icon, R.attr.colorOnPrimary)
+        holder.acceptView.onClick {
+            val callbackAction = RoomDetailAction.StartCall(attributes.callKind == CallKind.VIDEO)
+            attributes.callback?.onTimelineItemAction(callbackAction)
+        }
+        holder.rejectView.isVisible = false
+    }
+
+    private fun renderEndedStatus(holder: Holder) {
+        holder.acceptRejectViewGroup.isVisible = false
+        when (attributes.callKind) {
+            CallKind.VIDEO      -> {
+                val endCallStatus = holder.resources.getString(R.string.call_tile_video_call_has_ended, attributes.formattedDuration)
+                holder.statusView.setStatus(endCallStatus)
+            }
+            CallKind.AUDIO      -> {
+                val endCallStatus = holder.resources.getString(R.string.call_tile_voice_call_has_ended, attributes.formattedDuration)
+                holder.statusView.setStatus(endCallStatus)
+            }
+            CallKind.CONFERENCE -> {
+                holder.statusView.setStatus(R.string.call_tile_ended)
+            }
+        }
+    }
+
+    private fun renderRejectedStatus(holder: Holder) {
+        holder.acceptRejectViewGroup.isVisible = true
+        holder.acceptView.setText(R.string.call_tile_call_back)
+        holder.acceptView.setLeftDrawable(attributes.callKind.icon, R.attr.colorOnPrimary)
+        holder.acceptView.onClick {
+            val callbackAction = RoomDetailAction.StartCall(attributes.callKind == CallKind.VIDEO)
+            attributes.callback?.onTimelineItemAction(callbackAction)
+        }
+        holder.rejectView.isVisible = false
+        // Sent by me means I rejected the call made by opponent.
+        if (attributes.informationData.sentByMe) {
+            if (attributes.callKind.isVoiceCall) {
+                holder.statusView.setStatus(R.string.call_tile_voice_declined, R.drawable.ic_voice_call_declined)
+            } else {
+                holder.statusView.setStatus(R.string.call_tile_video_declined, R.drawable.ic_video_call_declined)
+            }
+        } else {
+            if (attributes.callKind.isVoiceCall) {
+                holder.statusView.setStatus(R.string.call_tile_no_answer, R.drawable.ic_voice_call_declined)
+            } else {
+                holder.statusView.setStatus(R.string.call_tile_no_answer, R.drawable.ic_video_call_declined)
+            }
+        }
+    }
+
+    private fun renderInCallStatus(holder: Holder) {
+        holder.acceptRejectViewGroup.isVisible = true
+        holder.acceptView.isVisible = false
+        when {
+            attributes.callKind == CallKind.CONFERENCE -> {
+                holder.rejectView.isVisible = true
+                holder.rejectView.setText(R.string.leave)
+                holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorOnPrimary)
+                holder.rejectView.onClick {
+                    attributes.callback?.onTimelineItemAction(RoomDetailAction.LeaveJitsiCall)
                 }
-                CallKind.AUDIO      -> {
+            }
+            attributes.isStillActive                   -> {
+                holder.rejectView.isVisible = true
+                holder.rejectView.setText(R.string.call_notification_hangup)
+                holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorOnPrimary)
+                holder.rejectView.onClick {
+                    attributes.callback?.onTimelineItemAction(RoomDetailAction.EndCall)
+                }
+            }
+            else                                       -> {
+                holder.acceptRejectViewGroup.isVisible = false
+            }
+        }
+        if (attributes.callKind.isVoiceCall) {
+            holder.statusView.setStatus(R.string.call_tile_voice_active)
+        } else {
+            holder.statusView.setStatus(R.string.call_tile_video_active)
+        }
+    }
+
+    private fun renderInvitedStatus(holder: Holder) {
+        when {
+            attributes.callKind == CallKind.CONFERENCE                       -> {
+                holder.acceptRejectViewGroup.isVisible = true
+                holder.acceptView.onClick {
+                    attributes.callback?.onTimelineItemAction(RoomDetailAction.JoinJitsiCall)
+                }
+                holder.acceptView.isVisible = true
+                holder.rejectView.isVisible = false
+                holder.acceptView.setText(R.string.join)
+                holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorOnPrimary)
+            }
+            !attributes.informationData.sentByMe && attributes.isStillActive -> {
+                holder.acceptRejectViewGroup.isVisible = true
+                holder.acceptView.isVisible = true
+                holder.rejectView.isVisible = true
+                holder.acceptView.onClick {
+                    attributes.callback?.onTimelineItemAction(RoomDetailAction.AcceptCall(callId = attributes.callId))
+                }
+                holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorOnPrimary)
+                holder.rejectView.onClick {
+                    attributes.callback?.onTimelineItemAction(RoomDetailAction.EndCall)
+                }
+                if (attributes.callKind == CallKind.AUDIO) {
                     holder.rejectView.setText(R.string.call_notification_reject)
                     holder.acceptView.setText(R.string.call_notification_answer)
                     holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorOnPrimary)
-                }
-                CallKind.VIDEO      -> {
+                } else if (attributes.callKind == CallKind.VIDEO) {
                     holder.rejectView.setText(R.string.call_notification_reject)
                     holder.acceptView.setText(R.string.call_notification_answer)
                     holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorOnPrimary)
                 }
-                else                -> {
-                    Timber.w("Shouldn't be in that state")
-                }
             }
-        } else {
-            holder.acceptRejectViewGroup.isVisible = false
-            holder.statusView.isVisible = true
+            else                                                             -> {
+                holder.acceptRejectViewGroup.isVisible = false
+            }
+        }
+        when {
+            // Invite state for conference should show as InCallStatus
+            attributes.callKind == CallKind.CONFERENCE -> {
+                holder.statusView.setStatus(R.string.call_tile_video_active)
+            }
+            attributes.informationData.sentByMe -> {
+                holder.statusView.setStatus(R.string.call_ringing)
+            }
+            attributes.callKind.isVoiceCall     -> {
+                holder.statusView.setStatus(R.string.call_tile_voice_incoming)
+            }
+            else                                -> {
+                holder.statusView.setStatus(R.string.call_tile_video_incoming)
+            }
         }
-        holder.statusView.setCallStatus(attributes)
-        renderSendState(holder.view, null, holder.failedToSendIndicator)
     }
 
-    private fun TextView.setCallStatus(attributes: Attributes) {
-        when (attributes.callStatus) {
-            CallStatus.INVITED  -> if (attributes.informationData.sentByMe) {
-                setText(R.string.call_tile_you_started_call)
-            } else {
-                text = context.getString(R.string.call_tile_other_started_call, attributes.userOfInterest.getBestName())
-            }
-            CallStatus.IN_CALL  -> setText(R.string.call_tile_in_call)
-            CallStatus.REJECTED -> if (attributes.informationData.sentByMe) {
-                setTextWithColoredPart(R.string.call_tile_you_declined, R.string.call_tile_call_back) {
-                    val callbackAction = RoomDetailAction.StartCall(attributes.callKind == CallKind.VIDEO)
-                    attributes.callback?.onTimelineItemAction(callbackAction)
-                }
-            } else {
-                text = context.getString(R.string.call_tile_other_declined, attributes.userOfInterest.getBestName())
-            }
-            CallStatus.ENDED    -> setText(R.string.call_tile_ended)
-        }
+    private fun TextView.setStatus(@StringRes statusRes: Int, @DrawableRes drawableRes: Int? = null) {
+        val status = resources.getString(statusRes)
+        setStatus(status, drawableRes)
+    }
+
+    private fun TextView.setStatus(status: String, @DrawableRes drawableRes: Int? = null) {
+        setLeftDrawable(drawableRes ?: attributes.callKind.icon)
+        text = status
     }
 
     class Holder : AbsBaseMessageItem.Holder(STUB_ID) {
         val acceptView by bind<Button>(R.id.itemCallAcceptView)
         val rejectView by bind<Button>(R.id.itemCallRejectView)
         val acceptRejectViewGroup by bind<ViewGroup>(R.id.itemCallAcceptRejectViewGroup)
-        val callKindView by bind<TextView>(R.id.itemCallKindTextView)
         val creatorAvatarView by bind<ImageView>(R.id.itemCallCreatorAvatar)
         val creatorNameView by bind<TextView>(R.id.itemCallCreatorNameTextView)
         val statusView by bind<TextView>(R.id.itemCallStatusTextView)
         val endGuideline by bind<View>(R.id.messageEndGuideline)
         val failedToSendIndicator by bind<ImageView>(R.id.messageFailToSendIndicator)
+
+        val resources: Resources
+            get() = view.context.resources
     }
 
     companion object {
@@ -144,6 +254,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
             val callStatus: CallStatus,
             val userOfInterest: MatrixItem,
             val isStillActive: Boolean,
+            val formattedDuration: String,
             val callback: TimelineEventController.Callback? = null,
             override val informationData: MessageInformationData,
             override val avatarRenderer: AvatarRenderer,
@@ -157,14 +268,17 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
     enum class CallKind(@DrawableRes val icon: Int, @StringRes val title: Int) {
         VIDEO(R.drawable.ic_call_video_small, R.string.action_video_call),
         AUDIO(R.drawable.ic_call_audio_small, R.string.action_voice_call),
-        CONFERENCE(R.drawable.ic_call_conference_small, R.string.conference_call_in_progress),
-        UNKNOWN(0, 0)
+        CONFERENCE(R.drawable.ic_call_video_small, R.string.action_video_call);
+
+        val isVoiceCall
+            get() = this == AUDIO
     }
 
     enum class CallStatus {
         INVITED,
         IN_CALL,
         REJECTED,
+        MISSED,
         ENDED;
 
         fun isActive() = this == INVITED || this == IN_CALL
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt
index 050cba0d56..d508023668 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt
@@ -26,4 +26,9 @@ interface ItemWithEvents {
     fun canAppendReadMarker(): Boolean = true
 
     fun isVisible(): Boolean = true
+
+    /**
+     * Returns false if you want epoxy controller to rebuild the event each time a built is triggered
+     */
+    fun isCacheable(): Boolean = true
 }
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 43a9618a06..2305cc3754 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
@@ -143,7 +143,8 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
         val topic = roomSummary?.topic
         if (topic.isNullOrBlank()) {
             // do not show hint for DMs or group DMs
-            if (!isDirect) {
+            val canSetTopic = attributes.canChangeTopic && !isDirect
+            if (canSetTopic) {
                 val addTopicLink = holder.view.resources.getString(R.string.add_a_topic_link_text)
                 val styledText = SpannableString(holder.view.resources.getString(R.string.room_created_summary_no_topic_creation_text, addTopicLink))
                 holder.roomTopicText.setTextOrHide(styledText.tappableMatchingText(addTopicLink, object : ClickableSpan() {
@@ -189,8 +190,9 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
             }
         }
 
-        holder.addPeopleButton.isVisible = !isDirect
-        if (!isDirect) {
+        val canInvite = attributes.canInvite && !isDirect
+        holder.addPeopleButton.isVisible = canInvite
+        if (canInvite) {
             holder.addPeopleButton.onClick {
                 attributes.callback?.onTimelineItemAction(RoomDetailAction.QuickActionInvitePeople)
             }
@@ -227,6 +229,7 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
             val hasEncryptionEvent: Boolean,
             val isEncryptionAlgorithmSecure: Boolean,
             val roomSummary: RoomSummary?,
+            val canInvite: Boolean = false,
             val canChangeAvatar: Boolean = false,
             val canChangeName: Boolean = false,
             val canChangeTopic: Boolean = false
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt
index 32c8e6ee92..8859aaeacf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt
@@ -80,7 +80,7 @@ class UpgradeRoomViewModelTask @Inject constructor(
                                 roomId = updatedRoomId,
                                 viaServers = currentInfo.via,
                                 order = currentInfo.order,
-                                autoJoin = currentInfo.autoJoin ?: false,
+//                                autoJoin = currentInfo.autoJoin ?: false,
                                 suggested = currentInfo.suggested
                         )
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
index 13a6fc0d2d..7063281853 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
@@ -230,8 +230,11 @@ class RoomListSectionBuilderSpace(
                                 Observable.just(emptyList())
                             } else {
                                 liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
-                                    val spaceSum = tryOrNull { session.spaceService().querySpaceChildren(selectedSpace.roomId, suggestedOnly = true) }
-                                    val value = spaceSum?.second.orEmpty().distinctBy { it.childRoomId }
+                                    val spaceSum = tryOrNull {
+                                        session.spaceService()
+                                                .querySpaceChildren(selectedSpace.roomId, suggestedOnly = true, null, null)
+                                    }
+                                    val value = spaceSum?.children.orEmpty().distinctBy { it.childRoomId }
                                     // i need to check if it's already joined.
                                     val filtered = value.filter {
                                         session.getRoomSummary(it.childRoomId)?.membership?.isActive() != true
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 845be0b18b..11f92284a6 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
@@ -131,7 +131,7 @@ class RoomListViewModel @Inject constructor(
                     updatableQuery = it
                 },
                 suggestedRoomJoiningState,
-                vectorPreferences.labsSpacesOnlyOrphansInHome()
+                !vectorPreferences.prefSpacesShowAllRoomInHome()
         )
     } else {
         RoomListSectionBuilderGroup(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 17d96f210f..c06ab33a54 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -114,7 +114,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
         var latestEventTime: CharSequence = ""
         val latestEvent = roomSummary.latestPreviewableEvent
         if (latestEvent != null) {
-            latestFormattedEvent = displayableEventFormatter.format(latestEvent, roomSummary.isDirect.not())
+            latestFormattedEvent = displayableEventFormatter.format(latestEvent, roomSummary.isDirect, roomSummary.isDirect.not())
             latestEventTime = dateFormatter.format(latestEvent.root.originServerTs, DateFormatKind.ROOM_LIST)
         }
         val typingMessage = typingHelper.getTypingMessage(roomSummary.typingUsers)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionViewState.kt
new file mode 100644
index 0000000000..d063e07ed7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionViewState.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list.actions
+
+import im.vector.app.features.roomprofile.notifications.RoomNotificationSettingsViewState
+
+data class RoomListQuickActionViewState(
+        val roomListActionsArgs: RoomListActionsArgs,
+        val notificationSettingsViewState: RoomNotificationSettingsViewState
+)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
index 94f9aaf496..8c1bdc086f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
@@ -22,15 +22,23 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetGenericListBinding
 import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.roomprofile.notifications.RoomNotificationSettingsAction
+import im.vector.app.features.roomprofile.notifications.RoomNotificationSettingsViewEvents
+import im.vector.app.features.roomprofile.notifications.RoomNotificationSettingsViewModel
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import javax.inject.Inject
 
 @Parcelize
@@ -54,11 +62,13 @@ class RoomListQuickActionsBottomSheet :
 
     private lateinit var sharedActionViewModel: RoomListQuickActionsSharedActionViewModel
     @Inject lateinit var sharedViewPool: RecyclerView.RecycledViewPool
-    @Inject lateinit var roomListActionsViewModelFactory: RoomListQuickActionsViewModel.Factory
+    @Inject lateinit var roomNotificationSettingsViewModelFactory: RoomNotificationSettingsViewModel.Factory
     @Inject lateinit var roomListActionsEpoxyController: RoomListQuickActionsEpoxyController
     @Inject lateinit var navigator: Navigator
+    @Inject lateinit var errorFormatter: ErrorFormatter
 
-    private val viewModel: RoomListQuickActionsViewModel by fragmentViewModel(RoomListQuickActionsViewModel::class)
+    private val roomListActionsArgs: RoomListActionsArgs by args()
+    private val viewModel: RoomNotificationSettingsViewModel by fragmentViewModel(RoomNotificationSettingsViewModel::class)
 
     override val showExpanded = true
 
@@ -80,6 +90,12 @@ class RoomListQuickActionsBottomSheet :
                 disableItemAnimation = true
         )
         roomListActionsEpoxyController.listener = this
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is RoomNotificationSettingsViewEvents.Failure -> displayErrorDialog(it.throwable)
+            }
+        }
     }
 
     override fun onDestroyView() {
@@ -89,7 +105,11 @@ class RoomListQuickActionsBottomSheet :
     }
 
     override fun invalidate() = withState(viewModel) {
-        roomListActionsEpoxyController.setData(it)
+        val roomListViewState = RoomListQuickActionViewState(
+                roomListActionsArgs,
+                it
+        )
+        roomListActionsEpoxyController.setData(roomListViewState)
         super.invalidate()
     }
 
@@ -103,6 +123,10 @@ class RoomListQuickActionsBottomSheet :
         }
     }
 
+    override fun didSelectRoomNotificationState(roomNotificationState: RoomNotificationState) {
+        viewModel.handle(RoomNotificationSettingsAction.SelectNotificationState(roomNotificationState))
+    }
+
     companion object {
         fun newInstance(roomId: String, mode: RoomListActionsArgs.Mode): RoomListQuickActionsBottomSheet {
             return RoomListQuickActionsBottomSheet().apply {
@@ -110,4 +134,12 @@ class RoomListQuickActionsBottomSheet :
             }
         }
     }
+
+    private fun displayErrorDialog(throwable: Throwable) {
+        MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(R.string.dialog_title_error)
+                .setMessage(errorFormatter.toHumanReadable(throwable))
+                .setPositiveButton(R.string.ok, null)
+                .show()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
index 4604159338..7e39156b18 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
@@ -15,13 +15,19 @@
  */
 package im.vector.app.features.home.room.list.actions
 
+import androidx.annotation.StringRes
 import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.BuildConfig
+import im.vector.app.R
 import im.vector.app.core.epoxy.bottomSheetDividerItem
 import im.vector.app.core.epoxy.bottomsheet.bottomSheetActionItem
 import im.vector.app.core.epoxy.bottomsheet.bottomSheetRoomPreviewItem
+import im.vector.app.core.epoxy.profiles.notifications.radioButtonItem
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomprofile.notifications.notificationOptions
+import im.vector.app.features.roomprofile.notifications.notificationStateMapped
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
@@ -33,16 +39,19 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
         private val colorProvider: ColorProvider,
         private val stringProvider: StringProvider
-) : TypedEpoxyController<RoomListQuickActionsState>() {
+) : TypedEpoxyController<RoomListQuickActionViewState>() {
 
     var listener: Listener? = null
 
-    override fun buildModels(state: RoomListQuickActionsState) {
-        val roomSummary = state.roomSummary() ?: return
+    override fun buildModels(state: RoomListQuickActionViewState) {
+        val notificationViewState = state.notificationSettingsViewState
+        val roomSummary = notificationViewState.roomSummary() ?: return
         val host = this
-        val showAll = state.mode == RoomListActionsArgs.Mode.FULL
+        val isV2 = BuildConfig.USE_NOTIFICATION_SETTINGS_V2
+        // V2 always shows full details as we no longer display the sheet from RoomProfile > Notifications
+        val showFull = state.roomListActionsArgs.mode == RoomListActionsArgs.Mode.FULL || isV2
 
-        if (showAll) {
+        if (showFull) {
             // Preview, favorite, settings
             bottomSheetRoomPreviewItem {
                 id("room_preview")
@@ -63,17 +72,38 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
             }
         }
 
-        val selectedRoomState = state.roomNotificationState()
-        RoomListQuickActionsSharedAction.NotificationsAllNoisy(roomSummary.roomId).toBottomSheetItem(0, selectedRoomState)
-        RoomListQuickActionsSharedAction.NotificationsAll(roomSummary.roomId).toBottomSheetItem(1, selectedRoomState)
-        RoomListQuickActionsSharedAction.NotificationsMentionsOnly(roomSummary.roomId).toBottomSheetItem(2, selectedRoomState)
-        RoomListQuickActionsSharedAction.NotificationsMute(roomSummary.roomId).toBottomSheetItem(3, selectedRoomState)
+        if (isV2) {
+            notificationViewState.notificationOptions.forEach {  notificationState ->
+                val title = titleForNotificationState(notificationState)
+                radioButtonItem {
+                    id(notificationState.name)
+                    titleRes(title)
+                    selected(notificationViewState.notificationStateMapped() == notificationState)
+                    listener {
+                    host.listener?.didSelectRoomNotificationState(notificationState)
+                    }
+                }
+            }
+        } else {
+            val selectedRoomState = notificationViewState.notificationState()
+            RoomListQuickActionsSharedAction.NotificationsAllNoisy(roomSummary.roomId).toBottomSheetItem(0, selectedRoomState)
+            RoomListQuickActionsSharedAction.NotificationsAll(roomSummary.roomId).toBottomSheetItem(1, selectedRoomState)
+            RoomListQuickActionsSharedAction.NotificationsMentionsOnly(roomSummary.roomId).toBottomSheetItem(2, selectedRoomState)
+            RoomListQuickActionsSharedAction.NotificationsMute(roomSummary.roomId).toBottomSheetItem(3, selectedRoomState)
+        }
 
-        if (showAll) {
-            RoomListQuickActionsSharedAction.Leave(roomSummary.roomId).toBottomSheetItem(5)
+        if (showFull) {
+            RoomListQuickActionsSharedAction.Leave(roomSummary.roomId, showIcon = !isV2).toBottomSheetItem(5)
         }
     }
 
+    @StringRes
+    private fun titleForNotificationState(notificationState: RoomNotificationState): Int? = when (notificationState) {
+        RoomNotificationState.ALL_MESSAGES_NOISY -> R.string.room_settings_all_messages
+        RoomNotificationState.MENTIONS_ONLY      -> R.string.room_settings_mention_and_keyword_only
+        RoomNotificationState.MUTE               -> R.string.room_settings_none
+        else -> null
+    }
     private fun RoomListQuickActionsSharedAction.toBottomSheetItem(index: Int, roomNotificationState: RoomNotificationState? = null) {
         val host = this@RoomListQuickActionsEpoxyController
         val selected = when (this) {
@@ -86,7 +116,11 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
         return bottomSheetActionItem {
             id("action_$index")
             selected(selected)
-            iconRes(iconResId)
+            if (iconResId != null) {
+                iconRes(iconResId)
+            } else {
+                showIcon(false)
+            }
             textRes(titleRes)
             destructive(this@toBottomSheetItem.destructive)
             listener { host.listener?.didSelectMenuAction(this@toBottomSheetItem) }
@@ -95,5 +129,6 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
 
     interface Listener {
         fun didSelectMenuAction(quickAction: RoomListQuickActionsSharedAction)
+        fun didSelectRoomNotificationState(roomNotificationState: RoomNotificationState)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
index 075dca0c52..6f93599d02 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
@@ -23,7 +23,7 @@ import im.vector.app.core.platform.VectorSharedAction
 
 sealed class RoomListQuickActionsSharedAction(
         @StringRes val titleRes: Int,
-        @DrawableRes val iconResId: Int,
+        @DrawableRes val iconResId: Int?,
         val destructive: Boolean = false)
     : VectorSharedAction {
 
@@ -60,9 +60,9 @@ sealed class RoomListQuickActionsSharedAction(
             R.string.room_list_quick_actions_favorite_add,
             R.drawable.ic_star_24dp)
 
-    data class Leave(val roomId: String) : RoomListQuickActionsSharedAction(
+    data class Leave(val roomId: String, val showIcon: Boolean = true) : RoomListQuickActionsSharedAction(
             R.string.room_list_quick_actions_leave,
-            R.drawable.ic_room_actions_leave,
+            if (showIcon) R.drawable.ic_room_actions_leave else null,
             true
     )
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsState.kt
deleted file mode 100644
index 2731620cec..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsState.kt
+++ /dev/null
@@ -1,33 +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.actions
-
-import com.airbnb.mvrx.Async
-import com.airbnb.mvrx.MvRxState
-import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
-
-data class RoomListQuickActionsState(
-        val roomId: String,
-        val mode: RoomListActionsArgs.Mode,
-        val roomSummary: Async<RoomSummary> = Uninitialized,
-        val roomNotificationState: Async<RoomNotificationState> = Uninitialized
-) : MvRxState {
-
-    constructor(args: RoomListActionsArgs) : this(roomId = args.roomId, mode = args.mode)
-}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt
deleted file mode 100644
index 75e9459d2c..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt
+++ /dev/null
@@ -1,78 +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.actions
-
-import com.airbnb.mvrx.FragmentViewModelContext
-import com.airbnb.mvrx.MvRxViewModelFactory
-import com.airbnb.mvrx.ViewModelContext
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import dagger.assisted.AssistedFactory
-import im.vector.app.core.platform.EmptyAction
-import im.vector.app.core.platform.EmptyViewEvents
-import im.vector.app.core.platform.VectorViewModel
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.rx.rx
-import org.matrix.android.sdk.rx.unwrap
-
-class RoomListQuickActionsViewModel @AssistedInject constructor(@Assisted initialState: RoomListQuickActionsState,
-                                                                session: Session
-) : VectorViewModel<RoomListQuickActionsState, EmptyAction, EmptyViewEvents>(initialState) {
-
-    @AssistedFactory
-    interface Factory {
-        fun create(initialState: RoomListQuickActionsState): RoomListQuickActionsViewModel
-    }
-
-    companion object : MvRxViewModelFactory<RoomListQuickActionsViewModel, RoomListQuickActionsState> {
-
-        @JvmStatic
-        override fun create(viewModelContext: ViewModelContext, state: RoomListQuickActionsState): RoomListQuickActionsViewModel? {
-            val fragment: RoomListQuickActionsBottomSheet = (viewModelContext as FragmentViewModelContext).fragment()
-            return fragment.roomListActionsViewModelFactory.create(state)
-        }
-    }
-
-    private val room = session.getRoom(initialState.roomId)!!
-
-    init {
-        observeRoomSummary()
-        observeNotificationState()
-    }
-
-    private fun observeNotificationState() {
-        room
-                .rx()
-                .liveNotificationState()
-                .execute {
-                    copy(roomNotificationState = it)
-                }
-    }
-
-    private fun observeRoomSummary() {
-        room
-                .rx()
-                .liveRoomSummary()
-                .unwrap()
-                .execute {
-                    copy(roomSummary = it)
-                }
-    }
-
-    override fun handle(action: EmptyAction) {
-        // No op
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index 1c78348b56..566cf769f2 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -183,6 +183,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                 // not yet supported
                 _viewEvents.post(MatrixToViewEvents.Dismiss)
             }
+            is PermalinkData.RoomEmailInviteLink,
             is PermalinkData.FallbackLink -> {
                 _viewEvents.post(MatrixToViewEvents.Dismiss)
             }
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 e51490a59c..00d107513c 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
@@ -62,7 +62,7 @@ class SpaceCardRenderer @Inject constructor(
                 inCard.matrixToAccessImage.isVisible = true
                 inCard.matrixToAccessImage.setImageResource(R.drawable.ic_room_private)
             }
-            val memberCount = spaceSummary.otherMemberIds.size
+            val memberCount = spaceSummary.joinedMembersCount ?: 0
             if (memberCount != 0) {
                 inCard.matrixToMemberPills.isVisible = true
                 inCard.spaceChildMemberCountText.text = stringProvider.getQuantityString(R.plurals.room_title_members, memberCount, memberCount)
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 01290a57ea..fd163f7a34 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
@@ -86,6 +86,7 @@ import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgsBuilder
 import im.vector.app.space
 import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.api.session.widgets.model.Widget
@@ -249,7 +250,7 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
-    override fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData) {
+    override fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData, fromEmailInviteLink: PermalinkData.RoomEmailInviteLink?) {
         val intent = RoomPreviewActivity.newIntent(context, roomPreviewData)
         context.startActivity(intent)
     }
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 cf0263a1e8..ffe9562761 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
@@ -30,6 +30,7 @@ import im.vector.app.features.roomdirectory.RoomDirectoryData
 import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
+import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.api.session.widgets.model.Widget
@@ -65,7 +66,7 @@ interface Navigator {
 
     fun openRoomPreview(context: Context, publicRoom: PublicRoom, roomDirectoryData: RoomDirectoryData)
 
-    fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData)
+    fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData, fromEmailInviteLink: PermalinkData.RoomEmailInviteLink? = null)
 
     fun openMatrixToBottomSheet(context: Context, link: String)
 
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index 494c30aab9..a19d579c05 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -21,6 +21,7 @@ import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter
 import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
@@ -135,7 +136,7 @@ class NotifiableEventResolver @Inject constructor(
         if (room == null) {
             Timber.e("## Unable to resolve room for eventId [$event]")
             // Ok room is not known in store, but we can still display something
-            val body = displayableEventFormatter.format(event, false)
+            val body = displayableEventFormatter.format(event, isDm = false, appendAuthor = false)
             val roomName = stringProvider.getString(R.string.notification_unknown_room_name)
             val senderDisplayName = event.senderInfo.disambiguatedDisplayName
 
@@ -168,7 +169,7 @@ class NotifiableEventResolver @Inject constructor(
                 }
             }
 
-            val body = displayableEventFormatter.format(event, false).toString()
+            val body = displayableEventFormatter.format(event, isDm = room.roomSummary()?.isDirect.orFalse(), appendAuthor = false).toString()
             val roomName = room.roomSummary()?.displayName ?: ""
             val senderDisplayName = event.senderInfo.disambiguatedDisplayName
 
@@ -209,7 +210,7 @@ class NotifiableEventResolver @Inject constructor(
         val roomId = event.roomId ?: return null
         val dName = event.senderId?.let { session.getRoomMember(it, roomId)?.displayName }
         if (Membership.INVITE == content.membership) {
-            val body = noticeEventFormatter.format(event, dName, session.getRoomSummary(roomId))
+            val body = noticeEventFormatter.format(event, dName, isDm = session.getRoomSummary(roomId)?.isDirect.orFalse())
                     ?: stringProvider.getString(R.string.notification_new_invitation)
             return InviteNotifiableEvent(
                     session.myUserId,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 37ed1e654a..fea4716b39 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -100,13 +100,14 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
             if (existing != null) {
                 if (existing.isPushGatewayEvent) {
                     // Use the event coming from the event stream as it may contains more info than
-                    // the fcm one (like type/content/clear text)
+                    // the fcm one (like type/content/clear text) (e.g when an encrypted message from
+                    // FCM should be update with clear text after a sync)
                     // In this case the message has already been notified, and might have done some noise
                     // So we want the notification to be updated even if it has already been displayed
-                    // But it should make no noise (e.g when an encrypted message from FCM should be
-                    // update with clear text after a sync)
+                    // Use setOnlyAlertOnce to ensure update notification does not interfere with sound
+                    // from first notify invocation as outlined in:
+                    // https://developer.android.com/training/notify-user/build-notification#Updating
                     notifiableEvent.hasBeenDisplayed = false
-                    notifiableEvent.noisy = false
                     eventList.remove(existing)
                     eventList.add(notifiableEvent)
                 } else {
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 cf13150e59..a74c13a496 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
@@ -168,7 +168,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
          * intrude.
          */
         notificationManager.createNotificationChannel(NotificationChannel(NOISY_NOTIFICATION_CHANNEL_ID,
-                stringProvider.getString(R.string.notification_noisy_notifications),
+                stringProvider.getString(R.string.notification_noisy_notifications).ifEmpty { "Noisy notifications" },
                 NotificationManager.IMPORTANCE_DEFAULT)
                 .apply {
                     description = stringProvider.getString(R.string.notification_noisy_notifications)
@@ -181,7 +181,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
          * Low notification importance: shows everywhere, but is not intrusive.
          */
         notificationManager.createNotificationChannel(NotificationChannel(SILENT_NOTIFICATION_CHANNEL_ID,
-                stringProvider.getString(R.string.notification_silent_notifications),
+                stringProvider.getString(R.string.notification_silent_notifications).ifEmpty { "Silent notifications" },
                 NotificationManager.IMPORTANCE_LOW)
                 .apply {
                     description = stringProvider.getString(R.string.notification_silent_notifications)
@@ -191,7 +191,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                 })
 
         notificationManager.createNotificationChannel(NotificationChannel(LISTENING_FOR_EVENTS_NOTIFICATION_CHANNEL_ID,
-                stringProvider.getString(R.string.notification_listening_for_events),
+                stringProvider.getString(R.string.notification_listening_for_events).ifEmpty { "Listening for events" },
                 NotificationManager.IMPORTANCE_MIN)
                 .apply {
                     description = stringProvider.getString(R.string.notification_listening_for_events)
@@ -200,7 +200,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                 })
 
         notificationManager.createNotificationChannel(NotificationChannel(CALL_NOTIFICATION_CHANNEL_ID,
-                stringProvider.getString(R.string.call),
+                stringProvider.getString(R.string.call).ifEmpty { "Call" },
                 NotificationManager.IMPORTANCE_HIGH)
                 .apply {
                     description = stringProvider.getString(R.string.call)
@@ -360,7 +360,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         val builder = NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID)
                 .setContentTitle(ensureTitleNotEmpty(title))
                 .apply {
-                    setContentText(stringProvider.getString(R.string.call_ring))
+                    setContentText(stringProvider.getString(R.string.call_ringing))
                     if (call.mxCall.isVideoCall) {
                         setSmallIcon(R.drawable.ic_call_answer_video)
                     } else {
@@ -540,6 +540,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
 
         val channelID = if (roomInfo.shouldBing) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
         return NotificationCompat.Builder(context, channelID)
+                .setOnlyAlertOnce(true)
                 .setWhen(lastMessageTimestamp)
                 // MESSAGING_STYLE sets title and content for API 16 and above devices.
                 .setStyle(messageStyle)
@@ -549,6 +550,9 @@ class NotificationUtils @Inject constructor(private val context: Context,
                 // that can be displayed in not disturb mode if white listed (the later will need compat28.x)
                 .setCategory(NotificationCompat.CATEGORY_MESSAGE)
 
+                // ID of the corresponding shortcut, for conversation features under API 30+
+                .setShortcutId(roomInfo.roomId)
+
                 // Title for API < 16 devices.
                 .setContentTitle(roomInfo.roomDisplayName)
                 // Content for API < 16 devices.
@@ -641,6 +645,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         val channelID = if (inviteNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
 
         return NotificationCompat.Builder(context, channelID)
+                .setOnlyAlertOnce(true)
                 .setContentTitle(stringProvider.getString(R.string.app_name))
                 .setContentText(inviteNotifiableEvent.description)
                 .setGroup(stringProvider.getString(R.string.app_name))
@@ -704,6 +709,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         val channelID = if (simpleNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
 
         return NotificationCompat.Builder(context, channelID)
+                .setOnlyAlertOnce(true)
                 .setContentTitle(stringProvider.getString(R.string.app_name))
                 .setContentText(simpleNotifiableEvent.description)
                 .setGroup(stringProvider.getString(R.string.app_name))
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 aa977730db..ecaeea1899 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,6 +22,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.toast
 import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
@@ -77,7 +78,7 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
             buildTask: Boolean
     ): Single<Boolean> {
         return when (permalinkData) {
-            is PermalinkData.RoomLink -> {
+            is PermalinkData.RoomLink            -> {
                 permalinkData.getRoomId()
                         .observeOn(AndroidSchedulers.mainThread())
                         .map {
@@ -94,19 +95,30 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
                             true
                         }
             }
-            is PermalinkData.GroupLink -> {
+            is PermalinkData.GroupLink           -> {
                 navigator.openGroupDetail(permalinkData.groupId, context, buildTask)
                 Single.just(true)
             }
-            is PermalinkData.UserLink -> {
+            is PermalinkData.UserLink            -> {
                 if (navigationInterceptor?.navToMemberProfile(permalinkData.userId, rawLink) != true) {
                     navigator.openRoomMemberProfile(userId = permalinkData.userId, roomId = null, context = context, buildTask = buildTask)
                 }
                 Single.just(true)
             }
-            is PermalinkData.FallbackLink -> {
+            is PermalinkData.FallbackLink        -> {
                 Single.just(false)
             }
+            is PermalinkData.RoomEmailInviteLink -> {
+                val data = RoomPreviewData(
+                        roomId = permalinkData.roomId,
+                        roomName = permalinkData.roomName,
+                        avatarUrl = permalinkData.roomAvatarUrl,
+                        fromEmailInvite = permalinkData,
+                        roomType = permalinkData.roomType
+                )
+                navigator.openRoomPreview(context, data)
+                Single.just(true)
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/popup/JitsiCallAlert.kt b/vector/src/main/java/im/vector/app/features/popup/JitsiCallAlert.kt
new file mode 100644
index 0000000000..1c0ec65c36
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/popup/JitsiCallAlert.kt
@@ -0,0 +1,50 @@
+/*
+ * 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.popup
+
+import android.app.Activity
+import android.view.View
+import im.vector.app.R
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.databinding.AlerterJitsiCallLayoutBinding
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+
+class JitsiCallAlert(uid: String,
+                     override val shouldBeDisplayedIn: ((Activity) -> Boolean) = { true }
+) : DefaultVectorAlert(uid, "", "", 0, shouldBeDisplayedIn) {
+
+    override val priority = PopupAlertManager.JITSI_CALL_PRIORITY
+    override val layoutRes = R.layout.alerter_jitsi_call_layout
+    override var colorAttribute: Int? = R.attr.colorSurface
+    override val dismissOnClick: Boolean = false
+    override val isLight: Boolean = true
+
+    class ViewBinder(private val matrixItem: MatrixItem?,
+                     private val avatarRenderer: AvatarRenderer,
+                     private val onJoin: () -> Unit) : VectorAlert.ViewBinder {
+
+        override fun bind(view: View) {
+            val views = AlerterJitsiCallLayoutBinding.bind(view)
+            views.jitsiCallNameView.text = matrixItem?.getBestName()
+            matrixItem?.let { avatarRenderer.render(it, views.jitsiCallAvatar, GlideApp.with(view.context.applicationContext)) }
+            views.jitsiCallJoinView.setOnClickListener {
+                onJoin()
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index d6aa0a1943..9842709f9e 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -44,6 +44,7 @@ class PopupAlertManager @Inject constructor() {
 
     companion object {
         const val INCOMING_CALL_PRIORITY = Int.MAX_VALUE
+        const val JITSI_CALL_PRIORITY = INCOMING_CALL_PRIORITY - 1
     }
 
     private var weakCurrentActivity: WeakReference<Activity>? = null
@@ -51,6 +52,10 @@ class PopupAlertManager @Inject constructor() {
 
     private val alertQueue = mutableListOf<VectorAlert>()
 
+    fun hasAlertsToShow() : Boolean {
+        return currentAlerter != null || alertQueue.isNotEmpty()
+    }
+
     fun postVectorAlert(alert: VectorAlert) {
         synchronized(alertQueue) {
             alertQueue.add(alert)
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java b/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java
index 7a29bf12e4..a530b6e667 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java
@@ -224,7 +224,7 @@ public class BugReporterMultipartBody extends RequestBody {
         }
 
         public static Part createFormData(String name, String value) {
-            return createFormData(name, null, RequestBody.create(null, value));
+            return createFormData(name, null, RequestBody.create(value, null));
         }
 
         public static Part createFormData(String name, String filename, RequestBody body) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index f40829e4b7..fb70003dcf 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -253,10 +253,7 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted private val init
                             state.parentSpaceId?.let {
                                 featurePreset = RestrictedRoomPreset(
                                         session.getHomeServerCapabilities(),
-                                        listOf(RoomJoinRulesAllowEntry(
-                                                state.parentSpaceId,
-                                                listOf(state.homeServerName)
-                                        ))
+                                        listOf(RoomJoinRulesAllowEntry.restrictedToRoom(state.parentSpaceId))
                                 )
                             }
                         }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt
index 8e0d2db67e..a44affff12 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt
@@ -20,4 +20,5 @@ import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomPreviewAction : VectorViewModelAction {
     object Join : RoomPreviewAction()
+    object JoinThirdParty : RoomPreviewAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
index d56870d623..0121d5d795 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
@@ -27,6 +27,7 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.roomdirectory.RoomDirectoryData
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.util.MatrixItem
 import timber.log.Timber
@@ -37,12 +38,14 @@ data class RoomPreviewData(
         val eventId: String? = null,
         val roomName: String? = null,
         val roomAlias: String? = null,
+        val roomType: String? = null,
         val topic: String? = null,
         val worldReadable: Boolean = false,
         val avatarUrl: String? = null,
         val homeServers: List<String> = emptyList(),
         val peekFromServer: Boolean = false,
-        val buildTask: Boolean = false
+        val buildTask: Boolean = false,
+        val fromEmailInvite: PermalinkData.RoomEmailInviteLink? = null
 ) : Parcelable {
     val matrixItem: MatrixItem
         get() = MatrixItem.RoomItem(roomId, roomName ?: roomAlias, avatarUrl)
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
index e1536281ef..ef70a31a00 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
@@ -16,12 +16,15 @@
 
 package im.vector.app.features.roomdirectory.roompreview
 
+import android.graphics.Typeface
 import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.text.style.ClickableSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.text.toSpannable
 import androidx.core.view.isVisible
-import androidx.transition.TransitionManager
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.args
@@ -31,10 +34,16 @@ import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.ButtonStateView
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.styleMatchingText
+import im.vector.app.core.utils.tappableMatchingText
 import im.vector.app.databinding.FragmentRoomPreviewNoPreviewBinding
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.roomdirectory.JoinState
-
+import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.themes.ThemeUtils
+import me.gujun.android.span.span
+import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.util.MatrixItem
 import javax.inject.Inject
 
@@ -61,7 +70,6 @@ class RoomPreviewNoPreviewFragment @Inject constructor(
     }
 
     override fun invalidate() = withState(roomPreviewViewModel) { state ->
-        TransitionManager.beginDelayedTransition(views.coordinatorLayout)
 
         views.roomPreviewNoPreviewJoin.render(
                 when (state.roomJoinState) {
@@ -83,7 +91,11 @@ class RoomPreviewNoPreviewFragment @Inject constructor(
             // Quit this screen
             requireActivity().finish()
             // Open room
-            navigator.openRoom(requireActivity(), state.roomId, roomPreviewData.eventId, roomPreviewData.buildTask)
+            if (state.roomType == RoomType.SPACE) {
+                navigator.switchToSpace(requireActivity(), state.roomId, Navigator.PostSwitchSpaceAction.None)
+            } else {
+                navigator.openRoom(requireActivity(), state.roomId, roomPreviewData.eventId, roomPreviewData.buildTask)
+            }
         }
 
         val bestName = state.roomName ?: state.roomAlias ?: state.roomId
@@ -98,19 +110,57 @@ class RoomPreviewNoPreviewFragment @Inject constructor(
                     PeekingState.FOUND     -> {
                         // show join buttons
                         views.roomPreviewNoPreviewJoin.isVisible = true
-                        renderState(bestName, state.matrixItem(), state.roomTopic)
+                        renderState(bestName, state.matrixItem(), state.roomTopic
+                                /**, state.roomType*/)
+                        if (state.fromEmailInvite != null && !state.isEmailBoundToAccount) {
+                            views.roomPreviewNoPreviewLabel.text =
+                                    span {
+                                        span {
+                                            textColor = ThemeUtils.getColor(requireContext(), R.attr.vctr_content_primary)
+                                            text = if (state.roomType == RoomType.SPACE) {
+                                                getString(R.string.this_invite_to_this_space_was_sent, state.fromEmailInvite.email)
+                                            } else {
+                                                getString(R.string.this_invite_to_this_room_was_sent, state.fromEmailInvite.email)
+                                            }
+                                                    .toSpannable()
+                                                    .styleMatchingText(state.fromEmailInvite.email, Typeface.BOLD)
+                                        }
+                                        +"\n"
+                                        span {
+                                            text = getString(
+                                                    R.string.link_this_email_with_your_account,
+                                                    getString(R.string.link_this_email_settings_link)
+                                            )
+                                                    .toSpannable()
+                                                    .tappableMatchingText(getString(R.string.link_this_email_settings_link), object : ClickableSpan() {
+                                                        override fun onClick(widget: View) {
+                                                            navigator.openSettings(
+                                                                    requireContext(),
+                                                                    VectorSettingsActivity.EXTRA_DIRECT_ACCESS_DISCOVERY_SETTINGS
+                                                            )
+                                                        }
+                                                    })
+                                        }
+                                    }
+                            views.roomPreviewNoPreviewLabel.movementMethod = LinkMovementMethod.getInstance()
+                            views.roomPreviewNoPreviewJoin.commonClicked = {
+                                roomPreviewViewModel.handle(RoomPreviewAction.JoinThirdParty)
+                            }
+                        }
                     }
                     PeekingState.NO_ACCESS -> {
                         views.roomPreviewNoPreviewJoin.isVisible = true
                         views.roomPreviewNoPreviewLabel.isVisible = true
                         views.roomPreviewNoPreviewLabel.setText(R.string.room_preview_no_preview_join)
-                        renderState(bestName, state.matrixItem().takeIf { state.roomAlias != null }, state.roomTopic)
+                        renderState(bestName, state.matrixItem().takeIf { state.roomAlias != null }, state.roomTopic
+                                /**, state.roomType*/)
                     }
                     else                   -> {
                         views.roomPreviewNoPreviewJoin.isVisible = false
                         views.roomPreviewNoPreviewLabel.isVisible = true
                         views.roomPreviewNoPreviewLabel.setText(R.string.room_preview_not_found)
-                        renderState(bestName, null, state.roomTopic)
+                        renderState(bestName, null, state.roomTopic
+                                /**, state.roomType*/)
                     }
                 }
             }
@@ -118,13 +168,16 @@ class RoomPreviewNoPreviewFragment @Inject constructor(
                 // Render with initial state, no peeking
                 views.roomPreviewPeekingProgress.isVisible = false
                 views.roomPreviewNoPreviewJoin.isVisible = true
-                renderState(bestName, state.matrixItem(), state.roomTopic)
+                renderState(bestName, state.matrixItem(), state.roomTopic
+                        /**, state.roomType*/)
                 views.roomPreviewNoPreviewLabel.isVisible = false
             }
         }
     }
 
-    private fun renderState(roomName: String, matrixItem: MatrixItem?, topic: String?) {
+    private fun renderState(roomName: String, matrixItem: MatrixItem?, topic: String?
+            /**, roomType: String?*/
+    ) {
         // Toolbar
         if (matrixItem != null) {
             views.roomPreviewNoPreviewToolbarAvatar.isVisible = true
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 c4d479374b..a559b0554d 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
@@ -23,8 +23,8 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
@@ -34,6 +34,8 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.identity.SharedState
+import org.matrix.android.sdk.api.session.identity.ThreePid
 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.peeking.PeekResult
@@ -64,7 +66,39 @@ class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val ini
         observeRoomSummary()
         observeMembershipChanges()
 
-        if (initialState.shouldPeekFromServer) {
+        if (initialState.fromEmailInvite != null) {
+            setState {
+                copy(peekingState = Loading())
+            }
+            viewModelScope.launch {
+                // we might want to check if the mail is bound to this account?
+                // if it is the invite
+                val threePids = session
+                        .getThreePids()
+                        .filterIsInstance<ThreePid.Email>()
+
+                val status = if (threePids.indexOfFirst { it.email == initialState.fromEmailInvite.email } != -1) {
+                    try {
+                        session.identityService().getShareStatus(threePids)
+                    } catch (failure: Throwable) {
+                        Timber.w(failure, "## Room Invite: Failed to get 3pids shared status")
+                        // If terms not signed, or no identity server setup, or different
+                        // id server from the one in the email invite, we consider the mails as not bound
+                        emptyMap()
+                    }.firstNotNullOfOrNull { if (it.key.value == initialState.fromEmailInvite.email) it.value else null }
+                            ?: SharedState.NOT_SHARED
+                } else {
+                    SharedState.NOT_SHARED
+                }
+
+                setState {
+                    copy(
+                            isEmailBoundToAccount = status == SharedState.SHARED,
+                            peekingState = Success(PeekingState.FOUND)
+                    )
+                }
+            }
+        } else if (initialState.shouldPeekFromServer) {
             peekRoomFromServer()
         }
     }
@@ -128,6 +162,7 @@ class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val ini
     private fun observeRoomSummary() {
         val queryParams = roomSummaryQueryParams {
             roomId = QueryStringValue.Equals(initialState.roomId)
+            excludeType = null
         }
         session
                 .rx()
@@ -136,6 +171,11 @@ class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val ini
                     val isRoomJoined = list.any {
                         it.membership == Membership.JOIN
                     }
+                    list.firstOrNull { it.roomId == initialState.roomId }?.roomType?.let {
+                        setState {
+                            copy(roomType = it)
+                        }
+                    }
                     if (isRoomJoined) {
                         setState { copy(roomJoinState = JoinState.JOINED) }
                     }
@@ -163,10 +203,43 @@ class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val ini
 
     override fun handle(action: RoomPreviewAction) {
         when (action) {
-            is RoomPreviewAction.Join -> handleJoinRoom()
+            is RoomPreviewAction.Join        -> handleJoinRoom()
+            RoomPreviewAction.JoinThirdParty -> handleJoinRoomThirdParty()
         }.exhaustive
     }
 
+    private fun handleJoinRoomThirdParty() = withState { state ->
+        if (state.roomJoinState == JoinState.JOINING) {
+            // Request already sent, should not happen
+            Timber.w("Try to join an already joining room. Should not happen")
+            return@withState
+        }
+        // local echo
+        setState {
+            copy(roomJoinState = JoinState.JOINING)
+        }
+        viewModelScope.launch {
+            try {
+                // XXX this could be done locally, but the spec is incomplete and it's not clear
+                // what needs to be signed with what?
+                val thirdPartySigned = session.identityService().sign3pidInvitation(
+                        state.fromEmailInvite?.identityServer ?: "",
+                        state.fromEmailInvite?.token ?: "",
+                        state.fromEmailInvite?.privateKey ?: ""
+                )
+
+                session.joinRoom(state.roomId, reason = null, thirdPartySigned)
+            } catch (failure: Throwable) {
+                setState {
+                    copy(
+                            roomJoinState = JoinState.JOINING_ERROR,
+                            lastError = failure
+                    )
+                }
+            }
+        }
+    }
+
     private fun handleJoinRoom() = withState { state ->
         if (state.roomJoinState == JoinState.JOINING) {
             // Request already sent, should not happen
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt
index 0b2e0c048b..75286ea24f 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt
@@ -20,6 +20,8 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import im.vector.app.features.roomdirectory.JoinState
+import org.matrix.android.sdk.api.session.permalinks.PermalinkData
+import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.util.MatrixItem
 
 data class RoomPreviewViewState(
@@ -27,6 +29,7 @@ data class RoomPreviewViewState(
         // The room id
         val roomId: String = "",
         val roomAlias: String? = null,
+        val roomType: String? = null,
 
         val roomName: String? = null,
         val roomTopic: String? = null,
@@ -40,7 +43,11 @@ data class RoomPreviewViewState(
         // Current state of the room in preview
         val roomJoinState: JoinState = JoinState.NOT_JOINED,
         // Last error of join room request
-        val lastError: Throwable? = null
+        val lastError: Throwable? = null,
+
+        val fromEmailInvite: PermalinkData.RoomEmailInviteLink? = null,
+        // used only if it's an email invite
+        val isEmailBoundToAccount: Boolean = false
 ) : MvRxState {
 
     constructor(args: RoomPreviewData) : this(
@@ -50,10 +57,13 @@ data class RoomPreviewViewState(
             roomName = args.roomName,
             roomTopic = args.topic,
             avatarUrl = args.avatarUrl,
-            shouldPeekFromServer = args.peekFromServer
+            shouldPeekFromServer = args.peekFromServer,
+            fromEmailInvite = args.fromEmailInvite,
+            roomType = args.roomType
     )
 
     fun matrixItem() : MatrixItem {
-        return MatrixItem.RoomItem(roomId, roomName ?: roomAlias, avatarUrl)
+        return if (roomType == RoomType.SPACE) MatrixItem.SpaceItem(roomId, roomName ?: roomAlias, avatarUrl)
+            else MatrixItem.RoomItem(roomId, roomName ?: roomAlias, avatarUrl)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
index 07ba442621..d28878283f 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
@@ -39,6 +39,7 @@ import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment
 import im.vector.app.features.roomprofile.members.RoomMemberListFragment
 import im.vector.app.features.roomprofile.settings.RoomSettingsFragment
 import im.vector.app.features.roomprofile.alias.RoomAliasFragment
+import im.vector.app.features.roomprofile.notifications.RoomNotificationSettingsFragment
 import im.vector.app.features.roomprofile.permissions.RoomPermissionsFragment
 import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment
 import javax.inject.Inject
@@ -107,12 +108,13 @@ class RoomProfileActivity :
                 .observe()
                 .subscribe { sharedAction ->
                     when (sharedAction) {
-                        RoomProfileSharedAction.OpenRoomMembers             -> openRoomMembers()
-                        RoomProfileSharedAction.OpenRoomSettings            -> openRoomSettings()
-                        RoomProfileSharedAction.OpenRoomAliasesSettings     -> openRoomAlias()
-                        RoomProfileSharedAction.OpenRoomPermissionsSettings -> openRoomPermissions()
-                        RoomProfileSharedAction.OpenRoomUploads             -> openRoomUploads()
-                        RoomProfileSharedAction.OpenBannedRoomMembers       -> openBannedRoomMembers()
+                        RoomProfileSharedAction.OpenRoomMembers                 -> openRoomMembers()
+                        RoomProfileSharedAction.OpenRoomSettings                -> openRoomSettings()
+                        RoomProfileSharedAction.OpenRoomAliasesSettings         -> openRoomAlias()
+                        RoomProfileSharedAction.OpenRoomPermissionsSettings     -> openRoomPermissions()
+                        RoomProfileSharedAction.OpenRoomUploads                 -> openRoomUploads()
+                        RoomProfileSharedAction.OpenBannedRoomMembers        -> openBannedRoomMembers()
+                        RoomProfileSharedAction.OpenRoomNotificationSettings -> openRoomNotificationSettings()
                     }.exhaustive
                 }
                 .disposeOnDestroy()
@@ -162,6 +164,10 @@ class RoomProfileActivity :
         addFragmentToBackstack(R.id.simpleFragmentContainer, RoomBannedMemberListFragment::class.java, roomProfileArgs)
     }
 
+    private fun openRoomNotificationSettings() {
+        addFragmentToBackstack(R.id.simpleFragmentContainer, RoomNotificationSettingsFragment::class.java, roomProfileArgs)
+    }
+
     override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
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 14ddf896ca..4b37d038b5 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
@@ -30,6 +30,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.animations.AppBarStateChangeListener
 import im.vector.app.core.animations.MatrixItemAppBarStateChangeListener
@@ -253,9 +254,13 @@ class RoomProfileFragment @Inject constructor(
     }
 
     override fun onNotificationsClicked() {
-        RoomListQuickActionsBottomSheet
-                .newInstance(roomProfileArgs.roomId, RoomListActionsArgs.Mode.NOTIFICATIONS)
-                .show(childFragmentManager, "ROOM_PROFILE_NOTIFICATIONS")
+        if (BuildConfig.USE_NOTIFICATION_SETTINGS_V2) {
+            roomProfileSharedActionViewModel.post(RoomProfileSharedAction.OpenRoomNotificationSettings)
+        } else {
+            RoomListQuickActionsBottomSheet
+                    .newInstance(roomProfileArgs.roomId, RoomListActionsArgs.Mode.NOTIFICATIONS)
+                    .show(childFragmentManager, "ROOM_PROFILE_NOTIFICATIONS")
+        }
     }
 
     override fun onUploadsClicked() {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt
index 2a5775d1af..eb4ab56634 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt
@@ -28,4 +28,5 @@ sealed class RoomProfileSharedAction : VectorSharedAction {
     object OpenRoomUploads : RoomProfileSharedAction()
     object OpenRoomMembers : RoomProfileSharedAction()
     object OpenBannedRoomMembers : RoomProfileSharedAction()
+    object OpenRoomNotificationSettings : RoomProfileSharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsAction.kt
new file mode 100644
index 0000000000..10c8861183
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsAction.kt
@@ -0,0 +1,24 @@
+/*
+ * 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.roomprofile.notifications
+
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+
+sealed class RoomNotificationSettingsAction : VectorViewModelAction {
+    data class SelectNotificationState(val notificationState: RoomNotificationState): RoomNotificationSettingsAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
new file mode 100644
index 0000000000..9a2085a7e8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
@@ -0,0 +1,76 @@
+/*
+ * 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.roomprofile.notifications
+
+import androidx.annotation.StringRes
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.epoxy.profiles.notifications.notificationSettingsFooterItem
+import im.vector.app.core.epoxy.profiles.notifications.radioButtonItem
+import im.vector.app.core.epoxy.profiles.notifications.textHeaderItem
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import javax.inject.Inject
+
+class RoomNotificationSettingsController @Inject constructor() : TypedEpoxyController<RoomNotificationSettingsViewState>() {
+
+    interface Callback {
+        fun didSelectRoomNotificationState(roomNotificationState: RoomNotificationState)
+        fun didSelectAccountSettingsLink()
+    }
+
+    var callback: Callback? = null
+
+    init {
+        setData(null)
+    }
+
+    override fun buildModels(data: RoomNotificationSettingsViewState?) {
+        val host = this
+        data ?: return
+
+        textHeaderItem {
+            id("roomNotificationSettingsHeader")
+            textRes(R.string.room_settings_room_notifications_notify_me)
+        }
+        data.notificationOptions.forEach {  notificationState ->
+            val title = titleForNotificationState(notificationState)
+            radioButtonItem {
+                id(notificationState.name)
+                titleRes(title)
+                selected(data.notificationStateMapped() == notificationState)
+                listener {
+                    host.callback?.didSelectRoomNotificationState(notificationState)
+                }
+            }
+        }
+        notificationSettingsFooterItem {
+            id("roomNotificationSettingsFooter")
+            encrypted(data.roomSummary()?.isEncrypted == true)
+            clickListener {
+                host.callback?.didSelectAccountSettingsLink()
+            }
+        }
+    }
+
+    @StringRes
+    private fun titleForNotificationState(notificationState: RoomNotificationState): Int? = when (notificationState) {
+        RoomNotificationState.ALL_MESSAGES_NOISY -> R.string.room_settings_all_messages
+        RoomNotificationState.MENTIONS_ONLY      -> R.string.room_settings_mention_and_keyword_only
+        RoomNotificationState.MUTE               -> R.string.room_settings_none
+        else -> null
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt
new file mode 100644
index 0000000000..ce0fde32c6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsFragment.kt
@@ -0,0 +1,99 @@
+/*
+ * 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.roomprofile.notifications
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import 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.FragmentRoomSettingGenericBinding
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.settings.VectorSettingsActivity
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class RoomNotificationSettingsFragment @Inject constructor(
+        val viewModelFactory: RoomNotificationSettingsViewModel.Factory,
+        private val roomNotificationSettingsController: RoomNotificationSettingsController,
+        private val avatarRenderer: AvatarRenderer
+) : VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
+        RoomNotificationSettingsController.Callback {
+
+    private val viewModel: RoomNotificationSettingsViewModel by fragmentViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRoomSettingGenericBinding {
+        return FragmentRoomSettingGenericBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar(views.roomSettingsToolbar)
+        roomNotificationSettingsController.callback = this
+        views.roomSettingsRecyclerView.configureWith(roomNotificationSettingsController, hasFixedSize = true)
+        setupWaitingView()
+        observeViewEvents()
+    }
+
+    override fun onDestroyView() {
+        views.roomSettingsRecyclerView.cleanup()
+        roomNotificationSettingsController.callback = null
+        super.onDestroyView()
+    }
+
+    private fun setupWaitingView() {
+        views.waitingView.waitingStatusText.setText(R.string.please_wait)
+        views.waitingView.waitingStatusText.isVisible = true
+    }
+
+    private fun observeViewEvents() {
+        viewModel.observeViewEvents {
+            when (it) {
+                is RoomNotificationSettingsViewEvents.Failure -> displayErrorDialog(it.throwable)
+            }
+        }
+    }
+
+    override fun invalidate() = withState(viewModel) { viewState ->
+        roomNotificationSettingsController.setData(viewState)
+        views.waitingView.root.isVisible = viewState.isLoading
+        renderRoomSummary(viewState)
+    }
+
+    override fun didSelectRoomNotificationState(roomNotificationState: RoomNotificationState) {
+        viewModel.handle(RoomNotificationSettingsAction.SelectNotificationState(roomNotificationState))
+    }
+
+    override fun didSelectAccountSettingsLink() {
+        navigator.openSettings(requireContext(), VectorSettingsActivity.EXTRA_DIRECT_ACCESS_NOTIFICATIONS)
+    }
+
+    private fun renderRoomSummary(state: RoomNotificationSettingsViewState) {
+        state.roomSummary()?.let {
+            views.roomSettingsToolbarTitleView.text = it.displayName
+            avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView)
+            views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewEvents.kt
new file mode 100644
index 0000000000..dda858283b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewEvents.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.roomprofile.notifications
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class RoomNotificationSettingsViewEvents : VectorViewEvents {
+    data class Failure(val throwable: Throwable) : RoomNotificationSettingsViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewModel.kt
new file mode 100644
index 0000000000..dd0535f51b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewModel.kt
@@ -0,0 +1,107 @@
+/*
+ * 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.roomprofile.notifications
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
+
+class RoomNotificationSettingsViewModel @AssistedInject constructor(
+        @Assisted initialState: RoomNotificationSettingsViewState,
+        session: Session
+) : VectorViewModel<RoomNotificationSettingsViewState, RoomNotificationSettingsAction, RoomNotificationSettingsViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: RoomNotificationSettingsViewState): RoomNotificationSettingsViewModel
+    }
+
+    companion object : MvRxViewModelFactory<RoomNotificationSettingsViewModel, RoomNotificationSettingsViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: RoomNotificationSettingsViewState): RoomNotificationSettingsViewModel {
+            val fragmentModelContext = (viewModelContext as FragmentViewModelContext)
+            return if (fragmentModelContext.fragment is RoomNotificationSettingsFragment) {
+                val fragment: RoomNotificationSettingsFragment = fragmentModelContext.fragment()
+                fragment.viewModelFactory.create(state)
+            } else {
+                val fragment: RoomListQuickActionsBottomSheet = fragmentModelContext.fragment()
+                fragment.roomNotificationSettingsViewModelFactory.create(state)
+            }
+        }
+    }
+
+    private val room = session.getRoom(initialState.roomId)!!
+
+    init {
+        observeSummary()
+        observeNotificationState()
+    }
+
+    private fun observeSummary() {
+        room.rx().liveRoomSummary()
+                .unwrap()
+                .execute { async ->
+                    copy(roomSummary = async)
+                }
+    }
+
+    private fun observeNotificationState() {
+        room.rx()
+                .liveNotificationState()
+                .execute {
+                    copy(notificationState = it)
+                }
+    }
+
+    override fun handle(action: RoomNotificationSettingsAction) {
+        when (action) {
+            is RoomNotificationSettingsAction.SelectNotificationState -> handleSelectNotificationState(action)
+        }
+    }
+
+    private fun handleSelectNotificationState(action: RoomNotificationSettingsAction.SelectNotificationState) {
+        setState { copy(isLoading = true) }
+        viewModelScope.launch {
+            runCatching {  room.setRoomNotificationState(action.notificationState) }
+                    .fold(
+                            {
+                                setState {
+                                    copy(isLoading = false, notificationState = Success(action.notificationState))
+                                }
+                            },
+                            {
+                                setState {
+                                    copy(isLoading = false)
+                                }
+                                _viewEvents.post(RoomNotificationSettingsViewEvents.Failure(it))
+                            }
+                    )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
new file mode 100644
index 0000000000..72e61fba70
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
@@ -0,0 +1,62 @@
+/*
+ * 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.roomprofile.notifications
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import im.vector.app.features.home.room.list.actions.RoomListActionsArgs
+import im.vector.app.features.roomprofile.RoomProfileArgs
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+
+data class RoomNotificationSettingsViewState(
+        val roomId: String,
+        val roomSummary: Async<RoomSummary> = Uninitialized,
+        val isLoading: Boolean = false,
+        val notificationState: Async<RoomNotificationState> = Uninitialized
+)  : MvRxState {
+    constructor(args: RoomProfileArgs) : this(roomId = args.roomId)
+    constructor(args: RoomListActionsArgs) : this(roomId = args.roomId)
+}
+
+/**
+ * Used to map this old room notification settings to the new options in v2.
+ */
+val RoomNotificationSettingsViewState.notificationStateMapped: Async<RoomNotificationState>
+    get() {
+        if ((roomSummary()?.isEncrypted == true && notificationState() == RoomNotificationState.MENTIONS_ONLY)
+                || notificationState() == RoomNotificationState.ALL_MESSAGES) {
+            /** if in an encrypted room, mentions notifications are not supported so show "All Messages" as selected.
+             * Also in the new settings there is no notion of notifications without sound so it maps to noisy also
+             */
+            return Success(RoomNotificationState.ALL_MESSAGES_NOISY)
+        }
+        return  notificationState
+    }
+/**
+ * Used to enumerate the new settings in notification settings v2. Notifications without sound and mentions in encrypted rooms not supported.
+ */
+val RoomNotificationSettingsViewState.notificationOptions: List<RoomNotificationState>
+    get() {
+        return if (roomSummary()?.isEncrypted == true) {
+            listOf(RoomNotificationState.ALL_MESSAGES_NOISY, RoomNotificationState.MUTE)
+        } else {
+            listOf(RoomNotificationState.ALL_MESSAGES_NOISY, RoomNotificationState.MENTIONS_ONLY, RoomNotificationState.MUTE)
+        }
+    }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedViewModel.kt
index dbe4e0ced7..eaa435f853 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedViewModel.kt
@@ -77,14 +77,14 @@ class RoomJoinRuleChooseRestrictedViewModel @AssistedInject constructor(
             val knownParentSpacesAllowed = mutableListOf<MatrixItem>()
             val unknownAllowedOrRooms = mutableListOf<MatrixItem>()
             initialAllowList.orEmpty().forEach { entry ->
-                val summary = session.getRoomSummary(entry.spaceID)
+                val summary = entry.roomId?.let { session.getRoomSummary(it) }
                 if (summary == null // it's not known by me
                         || summary.roomType != RoomType.SPACE // it's not a space
                         || !roomSummary.flattenParentIds.contains(summary.roomId) // it's not a parent space
                 ) {
-                    unknownAllowedOrRooms.add(
-                            summary?.toMatrixItem() ?: MatrixItem.RoomItem(entry.spaceID, null, null)
-                    )
+                    (summary?.toMatrixItem() ?: entry.roomId?.let { MatrixItem.RoomItem(it, null, null) })?.let {
+                        unknownAllowedOrRooms.add(it)
+                    }
                 } else {
                     knownParentSpacesAllowed.add(summary.toMatrixItem())
                 }
@@ -136,8 +136,11 @@ class RoomJoinRuleChooseRestrictedViewModel @AssistedInject constructor(
                         currentRoomJoinRules = safeRule,
                         choices = choices,
                         initialAllowList = initialAllowList.orEmpty(),
-                        updatedAllowList = initialAllowList.orEmpty().map {
-                            session.getRoomSummary(it.spaceID)?.toMatrixItem() ?: MatrixItem.RoomItem(it.spaceID, null, null)
+                        updatedAllowList = initialAllowList.orEmpty().mapNotNull {
+                            it.roomId?.let { roomId ->
+                                session.getRoomSummary(roomId)?.toMatrixItem()
+                                        ?: MatrixItem.RoomItem(roomId, null, null)
+                            }
                         },
                         possibleSpaceCandidate = possibleSpaceCandidate,
                         unknownRestricted = unknownAllowedOrRooms,
@@ -158,7 +161,7 @@ class RoomJoinRuleChooseRestrictedViewModel @AssistedInject constructor(
         }
 
         if (state.currentRoomJoinRules == RoomJoinRules.RESTRICTED) {
-            val allowDidChange = state.initialAllowList.map { it.spaceID } != state.updatedAllowList.map { it.id }
+            val allowDidChange = state.initialAllowList.map { it.roomId } != state.updatedAllowList.map { it.id }
             setState {
                 copy(hasUnsavedChanges = allowDidChange)
             }
@@ -317,8 +320,11 @@ class RoomJoinRuleChooseRestrictedViewModel @AssistedInject constructor(
         // to make it easier for users to spot the changes
         val union = mutableListOf<MatrixItem>().apply {
             addAll(
-                    state.initialAllowList.map {
-                        session.getRoomSummary(it.spaceID)?.toMatrixItem() ?: MatrixItem.RoomItem(it.spaceID, null, null)
+                    state.initialAllowList.mapNotNull {
+                        it.roomId?.let { roomId ->
+                            session.getRoomSummary(roomId)?.toMatrixItem()
+                                    ?: MatrixItem.RoomItem(roomId, null, null)
+                        }
                     }
             )
             addAll(selection)
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 e3949983fc..259c3662fc 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
@@ -153,6 +153,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         const val SETTINGS_LABS_ALLOW_EXTENDED_LOGS = "SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
         const val SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE = "SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE"
         const val SETTINGS_LABS_SPACES_HOME_AS_ORPHAN = "SETTINGS_LABS_SPACES_HOME_AS_ORPHAN"
+        const val SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME = "SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME"
 
         private const val SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         private const val SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY = "SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
@@ -187,6 +188,7 @@ 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"
 
         private const val MEDIA_SAVING_3_DAYS = 0
         private const val MEDIA_SAVING_1_WEEK = 1
@@ -344,6 +346,16 @@ 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.
      *
@@ -971,10 +983,16 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE, false)
     }
 
-    fun labsSpacesOnlyOrphansInHome(): Boolean {
+    private fun labsSpacesOnlyOrphansInHome(): Boolean {
         return defaultPrefs.getBoolean(SETTINGS_LABS_SPACES_HOME_AS_ORPHAN, false)
     }
 
+    fun prefSpacesShowAllRoomInHome(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME,
+                // migration of old property
+                !labsSpacesOnlyOrphansInHome())
+    }
+
     /*
      * Photo / video picker
      */
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
index 646709626c..4546313198 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
@@ -26,6 +26,7 @@ import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityVectorSettingsBinding
+import im.vector.app.features.discovery.DiscoverySettingsFragment
 import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment
 import im.vector.app.features.settings.notifications.VectorSettingsNotificationPreferenceFragment
 
@@ -79,6 +80,9 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
                     requestHighlightPreferenceKeyOnResume(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
                     replaceFragment(R.id.vector_settings_page, VectorSettingsNotificationPreferenceFragment::class.java, null, FRAGMENT_TAG)
                 }
+                EXTRA_DIRECT_ACCESS_DISCOVERY_SETTINGS                    -> {
+                    replaceFragment(R.id.vector_settings_page, DiscoverySettingsFragment::class.java, null, FRAGMENT_TAG)
+                }
 
                 else                                                 ->
                     replaceFragment(R.id.vector_settings_page, VectorSettingsRootFragment::class.java, null, FRAGMENT_TAG)
@@ -160,6 +164,7 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
         const val EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS = 3
         const val EXTRA_DIRECT_ACCESS_GENERAL = 4
         const val EXTRA_DIRECT_ACCESS_NOTIFICATIONS = 5
+        const val EXTRA_DIRECT_ACCESS_DISCOVERY_SETTINGS = 6
 
         private const val FRAGMENT_TAG = "VectorSettingsPreferencesFragment"
     }
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 069216aaae..efbd1cd1b4 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
@@ -21,6 +21,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.annotation.CallSuper
 import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.di.DaggerScreenComponent
 import im.vector.app.core.di.HasScreenInjector
@@ -160,9 +161,21 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), HasScree
         }
         activity?.runOnUiThread {
             if (errorMessage != null && errorMessage.isNotBlank()) {
-                activity?.toast(errorMessage)
+                displayErrorDialog(errorMessage)
             }
             hideLoadingView()
         }
     }
+
+    protected fun displayErrorDialog(throwable: Throwable) {
+        displayErrorDialog(errorFormatter.toHumanReadable(throwable))
+    }
+
+    protected fun displayErrorDialog(errorMessage: String) {
+        MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(R.string.dialog_title_error)
+                .setMessage(errorMessage)
+                .setPositiveButton(R.string.ok, null)
+                .show()
+    }
 }
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 ae6b24e4e4..f457980403 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
@@ -17,24 +17,12 @@
 package im.vector.app.features.settings
 
 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 javax.inject.Inject
 
-class VectorSettingsLabsFragment @Inject constructor(
-        private val vectorPreferences: VectorPreferences
-) : VectorSettingsBaseFragment() {
+class VectorSettingsLabsFragment @Inject constructor() : VectorSettingsBaseFragment() {
 
     override var titleRes = R.string.room_settings_labs_pref_title
     override val preferenceXmlRes = R.xml.vector_settings_labs
 
-    override fun bindPref() {
-        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_SPACES_HOME_AS_ORPHAN)!!.let { pref ->
-            pref.setOnPreferenceChangeListener { _, _ ->
-                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = false))
-                true
-            }
-        }
-    }
+    override fun bindPref() {}
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index 83780f362c..212147e628 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -27,7 +27,10 @@ import im.vector.app.core.dialogs.PhotoOrVideoDialog
 import im.vector.app.core.extensions.restart
 import im.vector.app.core.preference.VectorListPreference
 import im.vector.app.core.preference.VectorPreference
+import im.vector.app.core.preference.VectorSwitchPreference
 import im.vector.app.databinding.DialogSelectTextSizeBinding
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.configuration.VectorConfiguration
 import im.vector.app.features.themes.ThemeUtils
 import javax.inject.Inject
@@ -67,6 +70,14 @@ class VectorSettingsPreferencesFragment @Inject constructor(
             }
         }
 
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME)!!.let { pref ->
+            pref.isChecked = vectorPreferences.prefSpacesShowAllRoomInHome()
+            pref.setOnPreferenceChangeListener { _, _ ->
+                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = false))
+                true
+            }
+        }
+
         // Url preview
         /*
         TODO Note: we keep the setting client side for now
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/PushRuleDefinitions.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/PushRuleDefinitions.kt
index dd9077508e..d101d86aa3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/PushRuleDefinitions.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/PushRuleDefinitions.kt
@@ -86,6 +86,12 @@ fun getStandardAction(ruleId: String, index: NotificationIndex): StandardActions
                 NotificationIndex.SILENT -> StandardActions.Notify
                 NotificationIndex.NOISY  -> StandardActions.Highlight
             }
+        RuleIds.RULE_ID_KEYWORDS                    ->
+            when (index) {
+                NotificationIndex.OFF    -> StandardActions.Disabled
+                NotificationIndex.SILENT -> StandardActions.Notify
+                NotificationIndex.NOISY  -> StandardActions.HighlightDefaultSound
+            }
         else                                        -> null
     }
 }
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 7d6b74b093..3fc6293e6b 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
@@ -17,6 +17,7 @@
 package im.vector.app.features.settings.notifications
 
 import im.vector.app.R
+import im.vector.app.core.preference.VectorPreferenceCategory
 import org.matrix.android.sdk.api.pushrules.RuleIds
 
 class VectorSettingsDefaultNotificationPreferenceFragment
@@ -32,4 +33,10 @@ class VectorSettingsDefaultNotificationPreferenceFragment
                 "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_ONE_ONE_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ONE_TO_ONE_ENCRYPTED_ROOM,
                 "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ENCRYPTED
         )
+
+    override fun bindPref() {
+        super.bindPref()
+        val category = findPreference<VectorPreferenceCategory>("SETTINGS_DEFAULT")!!
+        category.isIconSpaceReserved = false
+    }
 }
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 37acc1d898..59ed727191 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
@@ -16,8 +16,22 @@
 
 package im.vector.app.features.settings.notifications
 
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.lifecycleScope
+import androidx.preference.Preference
 import im.vector.app.R
+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 kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.pushrules.toJson
 
 class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
     : VectorSettingsPushRuleNotificationPreferenceFragment() {
@@ -26,6 +40,139 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
 
     override val preferenceXmlRes = R.xml.vector_settings_notification_mentions_and_keywords
 
+    private var keywordsHasFocus = false
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        session.getKeywords().observe(viewLifecycleOwner, this::updateWithKeywords)
+    }
+
+    override fun bindPref() {
+        super.bindPref()
+        val mentionCategory = findPreference<VectorPreferenceCategory>("SETTINGS_KEYWORDS_AND_MENTIONS")!!
+        mentionCategory.isIconSpaceReserved = false
+
+        val yourKeywordsCategory = findPreference<VectorPreferenceCategory>("SETTINGS_YOUR_KEYWORDS")!!
+        yourKeywordsCategory.isIconSpaceReserved = false
+
+        val keywordRules = session.getPushRules().content?.filter { !it.ruleId.startsWith(".") }.orEmpty()
+        val enableKeywords = keywordRules.isEmpty() || keywordRules.any(PushRule::enabled)
+
+        val editKeywordPreference = findPreference<KeywordPreference>("SETTINGS_KEYWORD_EDIT")!!
+        editKeywordPreference.isEnabled = enableKeywords
+
+        val keywordPreference = findPreference<VectorCheckboxPreference>("SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_KEYWORDS_PREFERENCE_KEY")!!
+        keywordPreference.isIconSpaceReserved = false
+        keywordPreference.isChecked = enableKeywords
+
+        val footerPreference = findPreference<VectorPreference>("SETTINGS_KEYWORDS_FOOTER")!!
+        footerPreference.isIconSpaceReserved = false
+        keywordPreference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+            val keywords = editKeywordPreference.keywords
+            val newChecked = newValue as Boolean
+            displayLoadingView()
+            updateKeywordPushRules(keywords, newChecked) {  result ->
+                hideLoadingView()
+                if (!isAdded) {
+                    return@updateKeywordPushRules
+                }
+                result.onSuccess {
+                    keywordPreference.isChecked = newChecked
+                    editKeywordPreference.isEnabled = newChecked
+                }
+                result.onFailure { failure ->
+                    refreshDisplay()
+                    displayErrorDialog(failure)
+                }
+            }
+            false
+        }
+
+        editKeywordPreference.listener  = object: KeywordPreference.Listener {
+            override fun onFocusDidChange(hasFocus: Boolean) {
+                keywordsHasFocus = true
+            }
+
+            override fun didAddKeyword(keyword: String) {
+                addKeyword(keyword)
+            }
+
+            override fun didRemoveKeyword(keyword: String) {
+                removeKeyword(keyword)
+            }
+        }
+    }
+
+    fun updateKeywordPushRules(keywords: Set<String>, checked: Boolean, completion: (Result<Unit>) -> Unit) {
+        val newIndex = if (checked) NotificationIndex.NOISY else NotificationIndex.OFF
+        val standardAction = getStandardAction(RuleIds.RULE_ID_KEYWORDS, newIndex) ?: return
+        val enabled = standardAction != StandardActions.Disabled
+        val newActions = standardAction.actions
+
+        lifecycleScope.launch {
+            val results = keywords.map {
+                runCatching {
+                    withContext(Dispatchers.Default) {
+                        session.updatePushRuleActions(RuleKind.CONTENT,
+                                it,
+                                enabled,
+                                newActions)
+                    }
+                }
+            }
+            val firstError = results.firstNotNullOfOrNull(Result<Unit>::exceptionOrNull)
+            if (firstError == null) {
+                completion(Result.success(Unit))
+            } else {
+                completion(Result.failure(firstError))
+            }
+        }
+    }
+
+    fun updateWithKeywords(keywords: Set<String>) {
+        val editKeywordPreference = findPreference<KeywordPreference>("SETTINGS_KEYWORD_EDIT") ?: return
+        editKeywordPreference.keywords = keywords
+        if (keywordsHasFocus) {
+            scrollToPreference(editKeywordPreference)
+        }
+    }
+
+    fun addKeyword(keyword: String) {
+        val standardAction = getStandardAction(RuleIds.RULE_ID_KEYWORDS, NotificationIndex.NOISY) ?: return
+        val enabled = standardAction != StandardActions.Disabled
+        val newActions = standardAction.actions ?: return
+        val newRule = PushRule(actions = newActions.toJson(), pattern = keyword, enabled = enabled, ruleId = keyword)
+        displayLoadingView()
+        lifecycleScope.launch {
+            val result = runCatching {
+                session.addPushRule(RuleKind.CONTENT, newRule)
+            }
+            hideLoadingView()
+            if (!isAdded) {
+                return@launch
+            }
+            // Already added to UI, no-op on success
+
+            result.onFailure(::displayErrorDialog)
+        }
+    }
+
+    fun removeKeyword(keyword: String) {
+        displayLoadingView()
+        lifecycleScope.launch {
+            val result = runCatching {
+                session.removePushRule(RuleKind.CONTENT, keyword)
+            }
+            hideLoadingView()
+            if (!isAdded) {
+                return@launch
+            }
+            // Already added to UI, no-op on success
+
+            result.onFailure(::displayErrorDialog)
+        }
+    }
+
     override val prefKeyToPushRuleId = mapOf(
                 "SETTINGS_PUSH_RULE_CONTAINING_MY_DISPLAY_NAME_PREFERENCE_KEY" to RuleIds.RULE_ID_CONTAIN_DISPLAY_NAME,
                 "SETTINGS_PUSH_RULE_CONTAINING_MY_USER_NAME_PREFERENCE_KEY" to RuleIds.RULE_ID_CONTAIN_USER_NAME,
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsOtherNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsOtherNotificationPreferenceFragment.kt
index 42203fb613..2e083a7d65 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsOtherNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsOtherNotificationPreferenceFragment.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.settings.notifications
 
 import im.vector.app.R
+import im.vector.app.core.preference.VectorPreferenceCategory
 import org.matrix.android.sdk.api.pushrules.RuleIds
 
 class VectorSettingsOtherNotificationPreferenceFragment
@@ -32,4 +33,10 @@ class VectorSettingsOtherNotificationPreferenceFragment
                 "SETTINGS_PUSH_RULE_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY" to RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS,
                 "SETTINGS_PUSH_RULE_ROOMS_UPGRADED_KEY" to RuleIds.RULE_ID_TOMBSTONE
         )
+
+    override fun bindPref() {
+        super.bindPref()
+        val category = findPreference<VectorPreferenceCategory>("SETTINGS_OTHER")!!
+        category.isIconSpaceReserved = false
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
index 6f28876e1d..dbf33f8fb3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
@@ -19,9 +19,9 @@ package im.vector.app.features.settings.notifications
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import im.vector.app.core.preference.VectorCheckboxPreference
-import im.vector.app.core.utils.toast
 import im.vector.app.features.settings.VectorSettingsBaseFragment
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.pushrules.RuleKind
 import org.matrix.android.sdk.api.pushrules.rest.PushRuleAndKind
 
 abstract class VectorSettingsPushRuleNotificationPreferenceFragment
@@ -32,6 +32,7 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment
     override fun bindPref() {
         for (preferenceKey in prefKeyToPushRuleId.keys) {
             val preference = findPreference<VectorCheckboxPreference>(preferenceKey)!!
+            preference.isIconSpaceReserved = false
             val ruleAndKind: PushRuleAndKind? = session.getPushRules().findDefaultRule(prefKeyToPushRuleId[preferenceKey])
             if (ruleAndKind == null) {
                 // The rule is not defined, hide the preference
@@ -41,40 +42,43 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment
                 val initialIndex = ruleAndKind.pushRule.notificationIndex
                 preference.isChecked = initialIndex != NotificationIndex.OFF
                 preference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                    val newIndex = if (newValue as Boolean) NotificationIndex.NOISY else NotificationIndex.OFF
-                    val standardAction = getStandardAction(ruleAndKind.pushRule.ruleId, newIndex) ?: return@OnPreferenceChangeListener false
-                    val enabled = standardAction != StandardActions.Disabled
-                    val newActions = standardAction.actions
-                    displayLoadingView()
-
-                    lifecycleScope.launch {
-                        val result = runCatching {
-                            session.updatePushRuleActions(ruleAndKind.kind,
-                                    ruleAndKind.pushRule.ruleId,
-                                    enabled,
-                                    newActions)
-                        }
-                        if (!isAdded) {
-                            return@launch
-                        }
-                        hideLoadingView()
-                        result.onSuccess {
-                            preference.isChecked = newValue
-                        }
-                        result.onFailure { failure ->
-                            // Restore the previous value
-                            refreshDisplay()
-                            activity?.toast(errorFormatter.toHumanReadable(failure))
-                        }
-                    }
-
+                    updatePushRule(ruleAndKind.pushRule.ruleId, ruleAndKind.kind, newValue as Boolean, preference)
                     false
                 }
             }
         }
     }
 
-    private fun refreshDisplay() {
+    fun updatePushRule(ruleId: String, kind: RuleKind, checked: Boolean, preference: VectorCheckboxPreference) {
+        val newIndex = if (checked) NotificationIndex.NOISY else NotificationIndex.OFF
+        val standardAction = getStandardAction(ruleId, newIndex) ?: return
+        val enabled = standardAction != StandardActions.Disabled
+        val newActions = standardAction.actions
+        displayLoadingView()
+
+        lifecycleScope.launch {
+            val result = runCatching {
+                session.updatePushRuleActions(kind,
+                        ruleId,
+                        enabled,
+                        newActions)
+            }
+            hideLoadingView()
+            if (!isAdded) {
+                return@launch
+            }
+            result.onSuccess {
+                preference.isChecked = checked
+            }
+            result.onFailure { failure ->
+                // Restore the previous value
+                refreshDisplay()
+                displayErrorDialog(failure)
+            }
+        }
+    }
+
+    fun refreshDisplay() {
         listView?.adapter?.notifyDataSetChanged()
     }
 }
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
new file mode 100644
index 0000000000..dbea6807ce
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/RestrictedPromoBottomSheet.kt
@@ -0,0 +1,72 @@
+/*
+ * 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/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 400a658d1b..12c4ddbfc4 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -121,7 +121,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
                     this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
-                        vectorPreferences.labsSpacesOnlyOrphansInHome()
+                        !vectorPreferences.prefSpacesShowAllRoomInHome()
                     } ?: ActiveSpaceFilter.None
                 }, sortOrder = RoomSortOrder.NONE
         ).asObservable()
@@ -139,7 +139,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
                                 this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
-                                    vectorPreferences.labsSpacesOnlyOrphansInHome()
+                                    !vectorPreferences.prefSpacesShowAllRoomInHome()
                                 } ?: ActiveSpaceFilter.None
                             }
                     )
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
index 0a3c392c83..c68b8a0b9b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -111,10 +111,7 @@ class CreateSpaceViewModelTask @Inject constructor(
                                         this.featurePreset = RestrictedRoomPreset(
                                                 homeServerCapabilities,
                                                 listOf(
-                                                        RoomJoinRulesAllowEntry(
-                                                                spaceID = spaceID,
-                                                                via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
-                                                        )
+                                                        RoomJoinRulesAllowEntry.restrictedToRoom(spaceID)
                                                 )
                                         )
                                         if (e2eByDefault) {
@@ -137,7 +134,7 @@ class CreateSpaceViewModelTask @Inject constructor(
                             timeout.roomID
                         }
                         val via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
-                        createdSpace!!.addChildren(roomId, via, null, autoJoin = false, suggested = true)
+                        createdSpace!!.addChildren(roomId, via, null, suggested = true)
                         // set canonical
                         session.spaceService().setSpaceParent(
                                 roomId,
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 1e67da7a4d..4aa4256857 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -18,8 +18,10 @@ package im.vector.app.features.spaces.explore
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.epoxy.VisibilityState
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
+import com.airbnb.mvrx.Uninitialized
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.errorWithRetryItem
@@ -54,13 +56,15 @@ class SpaceDirectoryController @Inject constructor(
         fun onRoomClick(spaceChildInfo: SpaceChildInfo)
         fun retry()
         fun addExistingRooms(spaceId: String)
+        fun loadAdditionalItemsIfNeeded()
     }
 
     var listener: InteractionListener? = null
 
     override fun buildModels(data: SpaceDirectoryState?) {
         val host = this
-        val results = data?.spaceSummaryApiResult
+        val currentRootId = data?.hierarchyStack?.lastOrNull() ?: data?.spaceId ?: return
+        val results = data?.apiResults?.get(currentRootId)
 
         if (results is Incomplete) {
             loadingItem {
@@ -94,7 +98,9 @@ class SpaceDirectoryController @Inject constructor(
                 }
             }
         } else {
-            val flattenChildInfo = results?.invoke()
+            val hierarchySummary = results?.invoke()
+            val flattenChildInfo = hierarchySummary
+                    ?.children
                     ?.filter {
                         it.parentRoomId == (data.hierarchyStack.lastOrNull() ?: data.spaceId)
                     }
@@ -132,6 +138,7 @@ class SpaceDirectoryController @Inject constructor(
                     // if it's known use that matrixItem because it would have a better computed name
                     val matrixItem = data?.knownRoomSummaries?.find { it.roomId == info.childRoomId }?.toMatrixItem()
                             ?: info.toMatrixItem()
+
                     spaceChildInfoItem {
                         id(info.childRoomId)
                         matrixItem(matrixItem)
@@ -162,6 +169,28 @@ class SpaceDirectoryController @Inject constructor(
                     }
                 }
             }
+            if (hierarchySummary?.nextToken != null) {
+                val paginationStatus = data.paginationStatus[currentRootId] ?: Uninitialized
+                if (paginationStatus is Fail) {
+                    errorWithRetryItem {
+                        id("error_${currentRootId}_${hierarchySummary.nextToken}")
+                        text(host.errorFormatter.toHumanReadable(paginationStatus.error))
+                        listener { host.listener?.loadAdditionalItemsIfNeeded() }
+                    }
+                } else {
+                    loadingItem {
+                        id("pagination_${currentRootId}_${hierarchySummary.nextToken}")
+                        showLoader(true)
+                        onVisibilityStateChanged { _, _, visibilityState ->
+                            // Do something with the new visibility state
+                            if (visibilityState == VisibilityState.VISIBLE) {
+                                // we can trigger a seamless load of additional items
+                                host.listener?.loadAdditionalItemsIfNeeded()
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 }
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 323d8a7c87..63813042b2 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
@@ -25,6 +25,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.text.toSpannable
 import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyVisibilityTracker
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -72,6 +73,7 @@ class SpaceDirectoryFragment @Inject constructor(
             FragmentSpaceDirectoryBinding.inflate(layoutInflater, container, false)
 
     private val viewModel by activityViewModel(SpaceDirectoryViewModel::class)
+    private val epoxyVisibilityTracker = EpoxyVisibilityTracker()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -84,6 +86,7 @@ class SpaceDirectoryFragment @Inject constructor(
         }
         epoxyController.listener = this
         views.spaceDirectoryList.configureWith(epoxyController)
+        epoxyVisibilityTracker.attach(views.spaceDirectoryList)
 
         viewModel.selectSubscribe(this, SpaceDirectoryState::canAddRooms) {
             invalidateOptionsMenu()
@@ -95,6 +98,7 @@ class SpaceDirectoryFragment @Inject constructor(
 
     override fun onDestroyView() {
         epoxyController.listener = null
+        epoxyVisibilityTracker.detach(views.spaceDirectoryList)
         views.spaceDirectoryList.cleanup()
         super.onDestroyView()
     }
@@ -102,21 +106,20 @@ class SpaceDirectoryFragment @Inject constructor(
     override fun invalidate() = withState(viewModel) { state ->
         epoxyController.setData(state)
 
-        val currentParent = state.hierarchyStack.lastOrNull()?.let { currentParent ->
-            state.spaceSummaryApiResult.invoke()?.firstOrNull { it.childRoomId == currentParent }
-        }
+        val currentParentId = state.hierarchyStack.lastOrNull()
 
-        if (currentParent == null) {
+        if (currentParentId == null) {
+            // it's the root
             val title = getString(R.string.space_explore_activity_title)
             views.toolbar.title = title
-
-            spaceCardRenderer.render(state.spaceSummary.invoke(), emptyList(), this, views.spaceCard)
         } else {
-            val title = currentParent.name ?: currentParent.canonicalAlias ?: getString(R.string.space_explore_activity_title)
+            val title = state.currentRootSummary?.name
+                    ?: state.currentRootSummary?.canonicalAlias
+                    ?: getString(R.string.space_explore_activity_title)
             views.toolbar.title = title
-
-            spaceCardRenderer.render(currentParent, emptyList(), this, views.spaceCard)
         }
+
+        spaceCardRenderer.render(state.currentRootSummary, emptyList(), this, views.spaceCard)
     }
 
     override fun onPrepareOptionsMenu(menu: Menu) = withState(viewModel) { state ->
@@ -170,6 +173,10 @@ class SpaceDirectoryFragment @Inject constructor(
         addExistingRoomActivityResult.launch(SpaceManageActivity.newIntent(requireContext(), spaceId, ManageType.AddRooms))
     }
 
+    override fun loadAdditionalItemsIfNeeded() {
+        viewModel.handle(SpaceDirectoryViewAction.LoadAdditionalItemsIfNeeded)
+    }
+
     override fun onUrlClicked(url: String, title: String): Boolean {
         permalinkHandler
                 .launch(requireActivity(), url, null)
@@ -206,7 +213,4 @@ class SpaceDirectoryFragment @Inject constructor(
         // nothing?
         return false
     }
-//    override fun navigateToRoom(roomId: String) {
-//        viewModel.handle(SpaceDirectoryViewAction.NavigateToRoom(roomId))
-//    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt
index 21541a51ab..33b494075d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt
@@ -18,28 +18,27 @@ package im.vector.app.features.spaces.explore
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
-import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.session.space.SpaceHierarchyData
 
 data class SpaceDirectoryState(
         // The current filter
         val spaceId: String,
         val currentFilter: String = "",
-        val spaceSummary: Async<RoomSummary> = Uninitialized,
-        val spaceSummaryApiResult: Async<List<SpaceChildInfo>> = Uninitialized,
+        val apiResults: Map<String, Async<SpaceHierarchyData>> = emptyMap(),
+        val currentRootSummary: RoomSummary? = null,
         val childList: List<SpaceChildInfo> = emptyList(),
         val hierarchyStack: List<String> = emptyList(),
-        // True if more result are available server side
-        val hasMore: Boolean = false,
         // Set of joined roomId / spaces,
         val joinedRoomsIds: Set<String> = emptySet(),
         // keys are room alias or roomId
         val changeMembershipStates: Map<String, ChangeMembershipState> = emptyMap(),
         val canAddRooms: Boolean = false,
-        // cached room summaries of known rooms
-        val knownRoomSummaries : List<RoomSummary> = emptyList()
+        // cached room summaries of known rooms, we use it because computed room name would be better using it
+        val knownRoomSummaries: List<RoomSummary> = emptyList(),
+        val paginationStatus: Map<String, Async<Unit>> = emptyMap()
 ) : MvRxState {
     constructor(args: SpaceDirectoryArgs) : this(
             spaceId = args.spaceId
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
index 83cdf2916d..3ced017d61 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
@@ -26,4 +26,5 @@ sealed class SpaceDirectoryViewAction : VectorViewModelAction {
     data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewAction()
     object HandleBack : SpaceDirectoryViewAction()
     object Retry : SpaceDirectoryViewAction()
+    object LoadAdditionalItemsIfNeeded : SpaceDirectoryViewAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index de31f43322..1006f5a570 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -23,6 +23,7 @@ import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -34,6 +35,8 @@ import kotlinx.coroutines.launch
 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.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+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.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
@@ -67,11 +70,11 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
         setState {
             copy(
                     childList = spaceSum?.spaceChildren ?: emptyList(),
-                    spaceSummary = spaceSum?.let { Success(spaceSum) } ?: Loading()
+                    currentRootSummary = spaceSum
             )
         }
 
-        refreshFromApi()
+        refreshFromApi(initialState.spaceId)
         observeJoinedRooms()
         observeMembershipChanges()
         observePermissions()
@@ -93,29 +96,44 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
                 .disposeOnClear()
     }
 
-    private fun refreshFromApi() {
+    private fun refreshFromApi(rootId: String?) = withState { state ->
+        val spaceId = rootId ?: initialState.spaceId
         setState {
             copy(
-                    spaceSummaryApiResult = Loading()
+                    apiResults = state.apiResults.toMutableMap().apply {
+                        this[spaceId] = Loading()
+                    }.toMap()
             )
         }
         viewModelScope.launch(Dispatchers.IO) {
+            val cachedResults = state.apiResults.toMutableMap()
             try {
-                val query = session.spaceService().querySpaceChildren(initialState.spaceId)
-                val knownSummaries = query.second.mapNotNull {
+                val query = session.spaceService().querySpaceChildren(
+                        spaceId,
+                        limit = 10
+                )
+                val knownSummaries = query.children.mapNotNull {
                     session.getRoomSummary(it.childRoomId)
                             ?.takeIf { it.membership == Membership.JOIN } // only take if joined because it will be up to date (synced)
-                }
+                }.distinctBy { it.roomId }
                 setState {
                     copy(
-                            spaceSummaryApiResult = Success(query.second),
-                            knownRoomSummaries = knownSummaries
+                            apiResults = cachedResults.apply {
+                                this[spaceId] = Success(query)
+                            },
+                            currentRootSummary = query.rootSummary,
+                            paginationStatus = state.paginationStatus.toMutableMap().apply {
+                                this[spaceId] = Uninitialized
+                            }.toMap(),
+                            knownRoomSummaries = (state.knownRoomSummaries + knownSummaries).distinctBy { it.roomId }
                     )
                 }
             } catch (failure: Throwable) {
                 setState {
                     copy(
-                            spaceSummaryApiResult = Fail(failure)
+                            apiResults = cachedResults.apply {
+                                this[spaceId] = Fail(failure)
+                            }
                     )
                 }
             }
@@ -149,39 +167,143 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
 
     override fun handle(action: SpaceDirectoryViewAction) {
         when (action) {
-            is SpaceDirectoryViewAction.ExploreSubSpace -> {
-                setState {
-                    copy(hierarchyStack = hierarchyStack + listOf(action.spaceChildInfo.childRoomId))
-                }
+            is SpaceDirectoryViewAction.ExploreSubSpace          -> {
+                handleExploreSubSpace(action)
             }
-            SpaceDirectoryViewAction.HandleBack         -> {
-                withState {
-                    if (it.hierarchyStack.isEmpty()) {
-                        _viewEvents.post(SpaceDirectoryViewEvents.Dismiss)
-                    } else {
-                        setState {
-                            copy(
-                                    hierarchyStack = hierarchyStack.dropLast(1)
-                            )
-                        }
-                    }
-                }
+            SpaceDirectoryViewAction.HandleBack                  -> {
+                handleBack()
             }
-            is SpaceDirectoryViewAction.JoinOrOpen      -> {
+            is SpaceDirectoryViewAction.JoinOrOpen               -> {
                 handleJoinOrOpen(action.spaceChildInfo)
             }
-            is SpaceDirectoryViewAction.NavigateToRoom  -> {
+            is SpaceDirectoryViewAction.NavigateToRoom           -> {
                 _viewEvents.post(SpaceDirectoryViewEvents.NavigateToRoom(action.roomId))
             }
-            is SpaceDirectoryViewAction.ShowDetails     -> {
+            is SpaceDirectoryViewAction.ShowDetails              -> {
                 // This is temporary for now to at least display something for the space beta
                 // It's not ideal as it's doing some peeking that is not needed.
                 session.permalinkService().createRoomPermalink(action.spaceChildInfo.childRoomId)?.let {
                     _viewEvents.post(SpaceDirectoryViewEvents.NavigateToMxToBottomSheet(it))
                 }
             }
-            SpaceDirectoryViewAction.Retry              -> {
-                refreshFromApi()
+            SpaceDirectoryViewAction.Retry                       -> {
+                handleRetry()
+            }
+            SpaceDirectoryViewAction.LoadAdditionalItemsIfNeeded -> {
+                loadAdditionalItemsIfNeeded()
+            }
+        }
+    }
+
+    private fun handleBack() = withState { state ->
+        if (state.hierarchyStack.isEmpty()) {
+            _viewEvents.post(SpaceDirectoryViewEvents.Dismiss)
+        } else {
+            val newStack = state.hierarchyStack.dropLast(1)
+            val newRootId = newStack.lastOrNull() ?: initialState.spaceId
+            val rootSummary = state.apiResults[newRootId]?.invoke()?.rootSummary
+            setState {
+                copy(
+                        hierarchyStack = hierarchyStack.dropLast(1),
+                        currentRootSummary = rootSummary
+                )
+            }
+        }
+    }
+
+    private fun handleRetry() = withState { state ->
+        refreshFromApi(state.hierarchyStack.lastOrNull() ?: initialState.spaceId)
+    }
+
+    private fun handleExploreSubSpace(action: SpaceDirectoryViewAction.ExploreSubSpace) = withState { state ->
+        val newRootId = action.spaceChildInfo.childRoomId
+        val curSum = RoomSummary(
+                roomId = action.spaceChildInfo.childRoomId,
+                roomType = action.spaceChildInfo.roomType,
+                name = action.spaceChildInfo.name ?: "",
+                canonicalAlias = action.spaceChildInfo.canonicalAlias,
+                topic = action.spaceChildInfo.topic ?: "",
+                joinedMembersCount = action.spaceChildInfo.activeMemberCount,
+                avatarUrl = action.spaceChildInfo.avatarUrl ?: "",
+                isEncrypted = false,
+                joinRules = if (action.spaceChildInfo.worldReadable) RoomJoinRules.PUBLIC else RoomJoinRules.PRIVATE,
+                encryptionEventTs = 0,
+                typingUsers = emptyList()
+        )
+        setState {
+            copy(
+                    hierarchyStack = hierarchyStack + listOf(newRootId),
+                    currentRootSummary = curSum
+            )
+        }
+        val shouldLoad = when (state.apiResults[newRootId]) {
+            Uninitialized -> true
+            is Loading    -> false
+            is Success    -> false
+            is Fail       -> true
+            null          -> true
+        }
+
+        if (shouldLoad) {
+            refreshFromApi(newRootId)
+        }
+    }
+
+    private fun loadAdditionalItemsIfNeeded() = withState { state ->
+        val currentRootId = state.hierarchyStack.lastOrNull() ?: initialState.spaceId
+        val mutablePaginationStatus = state.paginationStatus.toMutableMap().apply {
+            if (this[currentRootId] == null) {
+                this[currentRootId] = Uninitialized
+            }
+        }
+
+        if (mutablePaginationStatus[currentRootId] is Loading) return@withState
+
+        setState {
+            copy(paginationStatus = mutablePaginationStatus.toMap())
+        }
+
+        viewModelScope.launch(Dispatchers.IO) {
+            val cachedResults = state.apiResults.toMutableMap()
+            try {
+                val currentResponse = cachedResults[currentRootId]?.invoke()
+                if (currentResponse == null) {
+                    // nothing to paginate through...
+                    setState {
+                        copy(paginationStatus = mutablePaginationStatus.apply { this[currentRootId] = Uninitialized }.toMap())
+                    }
+                    return@launch
+                }
+                val query = session.spaceService().querySpaceChildren(
+                        currentRootId,
+                        limit = 10,
+                        from = currentResponse.nextToken,
+                        knownStateList = currentResponse.childrenState
+                )
+                val knownSummaries = query.children.mapNotNull {
+                    session.getRoomSummary(it.childRoomId)
+                            ?.takeIf { it.membership == Membership.JOIN } // only take if joined because it will be up to date (synced)
+                }.distinctBy { it.roomId }
+
+                cachedResults[currentRootId] = Success(
+                        currentResponse.copy(
+                                children = currentResponse.children + query.children,
+                                nextToken = query.nextToken
+                        )
+                )
+                setState {
+                    copy(
+                            apiResults = cachedResults.toMap(),
+                            paginationStatus = mutablePaginationStatus.apply { this[currentRootId] = Success(Unit) }.toMap(),
+                            knownRoomSummaries = (state.knownRoomSummaries + knownSummaries).distinctBy { it.roomId }
+                    )
+                }
+            } catch (failure: Throwable) {
+                setState {
+                    copy(
+                            paginationStatus = mutablePaginationStatus.apply { this[currentRootId] = Fail(failure) }.toMap()
+                    )
+                }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt
index c232377aba..d11155f365 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt
@@ -25,4 +25,5 @@ sealed class SpaceManageRoomViewAction : VectorViewModelAction {
     data class MarkAllAsSuggested(val suggested: Boolean) : SpaceManageRoomViewAction()
     object BulkRemove : SpaceManageRoomViewAction()
     object RefreshFromServer : SpaceManageRoomViewAction()
+    object LoadAdditionalItemsIfNeeded : SpaceManageRoomViewAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt
index 7bae216b10..34173828a7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt
@@ -20,15 +20,18 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.session.space.SpaceHierarchyData
 
 data class SpaceManageRoomViewState(
         val spaceId: String,
         val spaceSummary: Async<RoomSummary> = Uninitialized,
-        val childrenInfo: Async<List<SpaceChildInfo>> = Uninitialized,
+        val childrenInfo: Async<SpaceHierarchyData> = Uninitialized,
         val selectedRooms: List<String> = emptyList(),
         val currentFilter: String = "",
-        val actionState: Async<Unit> = Uninitialized
+        val actionState: Async<Unit> = Uninitialized,
+        val paginationStatus: Async<Unit> = Uninitialized,
+        // cached room summaries of known rooms, we use it because computed room name would be better using it
+        val knownRoomSummaries: List<RoomSummary> = emptyList()
 ) : MvRxState {
     constructor(args: SpaceManageArgs) : this(
             spaceId = args.spaceId
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
index 0374f2518f..f9dfec8f40 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.spaces.manage
 
 import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.epoxy.VisibilityState
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import im.vector.app.R
@@ -39,6 +40,7 @@ class SpaceManageRoomsController @Inject constructor(
     interface Listener {
         fun toggleSelection(childInfo: SpaceChildInfo)
         fun retry()
+        fun loadAdditionalItemsIfNeeded()
     }
 
     var listener: Listener? = null
@@ -60,7 +62,7 @@ class SpaceManageRoomsController @Inject constructor(
             return
         }
 
-        val roomList = roomListAsync?.invoke() ?: return
+        val roomList = roomListAsync?.invoke()?.children ?: return
 
         val directChildren = roomList.filter {
             it.parentRoomId == data.spaceId
@@ -78,7 +80,10 @@ class SpaceManageRoomsController @Inject constructor(
             filteredResult.forEach { childInfo ->
                 roomManageSelectionItem {
                     id(childInfo.childRoomId)
-                    matrixItem(childInfo.toMatrixItem())
+                    matrixItem(
+                            data.knownRoomSummaries.firstOrNull { it.roomId == childInfo.childRoomId }?.toMatrixItem()
+                                    ?: childInfo.toMatrixItem()
+                    )
                     avatarRenderer(host.avatarRenderer)
                     suggested(childInfo.suggested ?: false)
                     selected(data.selectedRooms.contains(childInfo.childRoomId))
@@ -88,5 +93,29 @@ class SpaceManageRoomsController @Inject constructor(
                 }
             }
         }
+        val nextToken = roomListAsync.invoke()?.nextToken
+        if (nextToken != null) {
+            // show loading item
+            val paginationStatus = data.paginationStatus
+            if (paginationStatus is Fail) {
+                errorWithRetryItem {
+                    id("error_$nextToken")
+                    text(host.errorFormatter.toHumanReadable(paginationStatus.error))
+                    listener { host.listener?.loadAdditionalItemsIfNeeded() }
+                }
+            } else {
+                loadingItem {
+                    id("pagination_$nextToken")
+                    showLoader(true)
+                    onVisibilityStateChanged { _, _, visibilityState ->
+                        // Do something with the new visibility state
+                        if (visibilityState == VisibilityState.VISIBLE) {
+                            // we can trigger a seamless load of additional items
+                            host.listener?.loadAdditionalItemsIfNeeded()
+                        }
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
index 8bc66e7232..186d733982 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
@@ -26,6 +26,7 @@ import androidx.appcompat.view.ActionMode
 import androidx.appcompat.view.ActionMode.Callback
 import androidx.core.view.isVisible
 import androidx.transition.TransitionManager
+import com.airbnb.epoxy.EpoxyVisibilityTracker
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
@@ -54,6 +55,7 @@ class SpaceManageRoomsFragment @Inject constructor(
 
     private val viewModel by fragmentViewModel(SpaceManageRoomsViewModel::class)
     private val sharedViewModel: SpaceManageSharedViewModel by activityViewModel()
+    private val epoxyVisibilityTracker = EpoxyVisibilityTracker()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) = FragmentSpaceAddRoomsBinding.inflate(inflater)
 
@@ -69,6 +71,7 @@ class SpaceManageRoomsFragment @Inject constructor(
         views.createNewRoom.isVisible = false
         epoxyController.listener = this
         views.roomList.configureWith(epoxyController, hasFixedSize = true, dividerDrawable = R.drawable.divider_horizontal)
+        epoxyVisibilityTracker.attach(views.roomList)
 
         views.publicRoomsFilter.queryTextChanges()
                 .debounce(200, TimeUnit.MILLISECONDS)
@@ -99,6 +102,7 @@ class SpaceManageRoomsFragment @Inject constructor(
 
     override fun onDestroyView() {
         epoxyController.listener = null
+        epoxyVisibilityTracker.detach(views.roomList)
         views.roomList.cleanup()
         super.onDestroyView()
     }
@@ -136,6 +140,10 @@ class SpaceManageRoomsFragment @Inject constructor(
         viewModel.handle(SpaceManageRoomViewAction.RefreshFromServer)
     }
 
+    override fun loadAdditionalItemsIfNeeded() {
+        viewModel.handle(SpaceManageRoomViewAction.LoadAdditionalItemsIfNeeded)
+    }
+
     override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
         val inflater = mode?.menuInflater
         inflater?.inflate(R.menu.menu_manage_space, menu)
@@ -150,7 +158,7 @@ class SpaceManageRoomsFragment @Inject constructor(
     override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
         withState(viewModel) { state ->
             // check if we show mark as suggested or not
-            val areAllSuggested = state.childrenInfo.invoke().orEmpty().filter { state.selectedRooms.contains(it.childRoomId) }
+            val areAllSuggested = state.childrenInfo.invoke()?.children.orEmpty().filter { state.selectedRooms.contains(it.childRoomId) }
                     .all { it.suggested == true }
             menu?.findItem(R.id.action_mark_as_suggested)?.isVisible = !areAllSuggested
             menu?.findItem(R.id.action_mark_as_not_suggested)?.isVisible = areAllSuggested
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
index d1e1d8f0fb..0222dde275 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.spaces.manage
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
@@ -39,6 +40,8 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
         private val session: Session
 ) : VectorViewModel<SpaceManageRoomViewState, SpaceManageRoomViewAction, SpaceManageRoomViewEvents>(initialState) {
 
+    private val paginationLimit = 10
+
     init {
         val spaceSummary = session.getRoomSummary(initialState.spaceId)
         setState {
@@ -48,16 +51,7 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
             )
         }
 
-        viewModelScope.launch(Dispatchers.IO) {
-            val apiResult = runCatchingToAsync {
-                session.spaceService().querySpaceChildren(spaceId = initialState.spaceId).second
-            }
-            setState {
-                copy(
-                        childrenInfo = apiResult
-                )
-            }
-        }
+        refreshSummaryAPI()
     }
 
     @AssistedFactory
@@ -77,22 +71,25 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
 
     override fun handle(action: SpaceManageRoomViewAction) {
         when (action) {
-            is SpaceManageRoomViewAction.ToggleSelection -> handleToggleSelection(action)
-            is SpaceManageRoomViewAction.UpdateFilter -> {
+            is SpaceManageRoomViewAction.ToggleSelection          -> handleToggleSelection(action)
+            is SpaceManageRoomViewAction.UpdateFilter             -> {
                 setState { copy(currentFilter = action.filter) }
             }
-            SpaceManageRoomViewAction.ClearSelection -> {
+            SpaceManageRoomViewAction.ClearSelection              -> {
                 setState { copy(selectedRooms = emptyList()) }
             }
-            SpaceManageRoomViewAction.BulkRemove -> {
+            SpaceManageRoomViewAction.BulkRemove                  -> {
                 handleBulkRemove()
             }
-            is SpaceManageRoomViewAction.MarkAllAsSuggested -> {
+            is SpaceManageRoomViewAction.MarkAllAsSuggested       -> {
                 handleBulkMarkAsSuggested(action.suggested)
             }
-            SpaceManageRoomViewAction.RefreshFromServer -> {
+            SpaceManageRoomViewAction.RefreshFromServer           -> {
                 refreshSummaryAPI()
             }
+            SpaceManageRoomViewAction.LoadAdditionalItemsIfNeeded -> {
+                paginateIfNeeded()
+            }
         }
     }
 
@@ -120,7 +117,7 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
 
     private fun handleBulkMarkAsSuggested(suggested: Boolean) = withState { state ->
         setState { copy(actionState = Loading()) }
-        val selection = state.childrenInfo.invoke()?.filter {
+        val selection = state.childrenInfo.invoke()?.children?.filter {
             state.selectedRooms.contains(it.childRoomId)
         }.orEmpty()
         session.coroutineScope.launch(Dispatchers.IO) {
@@ -131,8 +128,8 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
                             roomId = info.childRoomId,
                             viaServers = info.viaServers,
                             order = info.order,
-                            suggested = suggested,
-                            autoJoin = info.autoJoin
+                            suggested = suggested
+//                            autoJoin = info.autoJoin
                     )
                 } catch (failure: Throwable) {
                     errorList.add(failure)
@@ -156,16 +153,72 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
         }
         viewModelScope.launch(Dispatchers.IO) {
             val apiResult = runCatchingToAsync {
-                session.spaceService().querySpaceChildren(spaceId = initialState.spaceId).second
+                session.spaceService().querySpaceChildren(
+                        spaceId = initialState.spaceId,
+                        limit = paginationLimit
+                )
             }
             setState {
                 copy(
-                        childrenInfo = apiResult
+                        childrenInfo = apiResult,
+                        paginationStatus = Uninitialized,
+                        knownRoomSummaries = apiResult.invoke()?.children?.mapNotNull {
+                            session.getRoomSummary(it.childRoomId)
+                        }.orEmpty()
                 )
             }
         }
     }
 
+    private fun paginateIfNeeded() = withState { state ->
+        if (state.paginationStatus is Loading) return@withState
+        val knownResults = state.childrenInfo.invoke()
+        val nextToken = knownResults?.nextToken
+        if (knownResults == null || nextToken == null) {
+            setState {
+                copy(
+                        paginationStatus = Uninitialized
+                )
+            }
+            return@withState
+        }
+        setState {
+            copy(
+                    paginationStatus = Loading()
+            )
+        }
+
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                val apiResult = session.spaceService().querySpaceChildren(
+                        spaceId = initialState.spaceId,
+                        from = nextToken,
+                        knownStateList = knownResults.childrenState.orEmpty(),
+                        limit = paginationLimit
+                )
+                val newKnown = apiResult.children.mapNotNull { session.getRoomSummary(it.childRoomId) }
+                setState {
+                    copy(
+                            childrenInfo = Success(
+                                    knownResults.copy(
+                                            children = knownResults.children + apiResult.children,
+                                            nextToken = apiResult.nextToken
+                                    )
+                            ),
+                            paginationStatus = Success(Unit),
+                            knownRoomSummaries = (state.knownRoomSummaries + newKnown).distinctBy { it.roomId }
+                    )
+                }
+            } catch (failure: Throwable) {
+                setState {
+                    copy(
+                            paginationStatus = Fail(failure)
+                    )
+                }
+            }
+        }
+    }
+
     private fun handleToggleSelection(action: SpaceManageRoomViewAction.ToggleSelection) = withState { state ->
         val existing = state.selectedRooms.toMutableList()
         if (existing.contains(action.roomId)) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index 61328d2a1c..0f1afd8371 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -151,7 +151,7 @@ class SpacePreviewViewModel @AssistedInject constructor(
         setState {
             copy(
                     spaceInfo = Success(
-                            resolveResult.first.let {
+                            resolveResult.rootSummary.let {
                                 ChildInfo(
                                         roomId = it.roomId,
                                         avatarUrl = it.avatarUrl,
@@ -165,7 +165,7 @@ class SpacePreviewViewModel @AssistedInject constructor(
                             }
                     ),
                     childInfoList = Success(
-                            resolveResult.second.map {
+                            resolveResult.children.map {
                                 ChildInfo(
                                         roomId = it.childRoomId,
                                         avatarUrl = it.avatarUrl,
diff --git a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
index 753d81dc8a..7147529e5f 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
@@ -21,7 +21,6 @@ import android.view.ViewGroup
 import android.webkit.CookieManager
 import android.webkit.PermissionRequest
 import android.webkit.WebChromeClient
-import android.webkit.WebSettings
 import android.webkit.WebView
 import im.vector.app.R
 import im.vector.app.features.themes.ThemeUtils
@@ -36,10 +35,6 @@ fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) {
     // clear caches
     clearHistory()
     clearFormData()
-    clearCache(true)
-
-    // does not cache the data
-    settings.cacheMode = WebSettings.LOAD_NO_CACHE
 
     // Enable Javascript
     settings.javaScriptEnabled = true
@@ -78,8 +73,6 @@ fun WebView.clearAfterWidget() {
     (parent as? ViewGroup)?.removeAllViews()
     webChromeClient = null
     clearHistory()
-    // NOTE: clears RAM cache, if you pass true, it will also clear the disk cache.
-    clearCache(true)
     // Loading a blank page is optional, but will ensure that the WebView isn't doing anything when you destroy it.
     loadUrl("about:blank")
     removeAllViews()
diff --git a/vector/src/main/res/drawable-nodpi/room_settings.png b/vector/src/main/res/drawable-nodpi/room_settings.png
new file mode 100644
index 0000000000..2e3fb404fa
Binary files /dev/null and b/vector/src/main/res/drawable-nodpi/room_settings.png differ
diff --git a/vector/src/main/res/drawable/ic_call_audio_settings.xml b/vector/src/main/res/drawable/ic_call_audio_settings.xml
new file mode 100644
index 0000000000..8a47d27d9a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_call_audio_settings.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="26dp"
+    android:viewportWidth="30"
+    android:viewportHeight="26">
+  <path
+      android:pathData="M14.9623,0.7826L7.5,7.0012L1.875,7.0012C0.8395,7.0012 0,7.8406 0,8.8762V17.1262C0,18.1617 0.8395,19.0012 1.875,19.0012L7.5,19.0012L14.9623,25.2198C15.5729,25.7286 16.5,25.2944 16.5,24.4996V1.5028C16.5,0.7079 15.5729,0.2737 14.9623,0.7826Z"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M26.486,3.2332C26.0621,2.6883 25.2768,2.5902 24.7318,3.014C24.1875,3.4374 24.089,4.2214 24.5112,4.7663L24.5121,4.7675L24.5133,4.7691L24.5304,4.7918C24.547,4.8141 24.5737,4.8504 24.609,4.9002C24.6798,4.9999 24.785,5.153 24.9134,5.3548C25.1706,5.759 25.5181,6.3541 25.8665,7.1007C26.5669,8.6014 27.2493,10.6674 27.2493,13.0007C27.2493,15.3339 26.5669,17.4 25.8665,18.9006C25.5181,19.6472 25.1706,20.2424 24.9134,20.6465C24.785,20.8483 24.6798,21.0015 24.609,21.1011C24.5737,21.1509 24.547,21.1873 24.5304,21.2095L24.5133,21.2322L24.5121,21.2338L24.511,21.2353C24.089,21.7801 24.1876,22.5641 24.7318,22.9874C25.2768,23.4112 26.0621,23.313 26.486,22.7681L25.5544,22.0435C26.486,22.7681 26.486,22.7681 26.486,22.7681L26.4884,22.7649L26.492,22.7602L26.5024,22.7467L26.5355,22.7027C26.5629,22.6659 26.6007,22.6144 26.6473,22.5486C26.7406,22.4173 26.8697,22.2289 27.0226,21.9887C27.3279,21.509 27.7304,20.8184 28.132,19.9579C28.9317,18.2442 29.7493,15.8103 29.7493,13.0007C29.7493,10.191 28.9317,7.7571 28.132,6.0435C27.7304,5.1829 27.3279,4.4924 27.0226,4.0126C26.8697,3.7724 26.7406,3.5841 26.6473,3.4527C26.6007,3.387 26.5629,3.3354 26.5355,3.2987L26.5024,3.2547L26.492,3.2411L26.4884,3.2365L26.4871,3.2347C26.4871,3.2347 26.486,3.2332 25.4993,4.0007L26.486,3.2332Z"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M21.9871,7.7335C21.5632,7.1886 20.7779,7.0904 20.2329,7.5143C19.6894,7.937 19.5904,8.7193 20.0104,9.2641L20.0147,9.2698C20.0202,9.2773 20.0308,9.2917 20.0457,9.3126C20.0754,9.3545 20.1221,9.4223 20.1802,9.5136C20.2967,9.6967 20.4567,9.9705 20.6176,10.3153C20.943,11.0124 21.2504,11.9534 21.2504,13.001C21.2504,14.0485 20.943,14.9895 20.6176,15.6866C20.4567,16.0314 20.2967,16.3052 20.1802,16.4883C20.1221,16.5796 20.0754,16.6474 20.0457,16.6893C20.0308,16.7102 20.0202,16.7246 20.0147,16.7321L20.0104,16.7378C19.5904,17.2826 19.6894,18.0649 20.2329,18.4876C20.7779,18.9115 21.5632,18.8133 21.9871,18.2684L21.0004,17.5009C21.9871,18.2684 21.9871,18.2684 21.9871,18.2684L21.9893,18.2655L21.992,18.2619L21.9992,18.2526L22.0198,18.2252C22.0362,18.2032 22.0578,18.1736 22.084,18.1368C22.1363,18.0632 22.2068,17.9602 22.2893,17.8305C22.454,17.5718 22.669,17.2026 22.8831,16.7438C23.3078,15.8338 23.7504,14.5249 23.7504,13.001C23.7504,11.477 23.3078,10.1681 22.8831,9.2581C22.669,8.7993 22.454,8.4302 22.2893,8.1714C22.2068,8.0417 22.1363,7.9387 22.084,7.8651C22.0578,7.8282 22.0362,7.7987 22.0198,7.7766L21.9992,7.7493L21.992,7.74L21.9893,7.7364L21.9881,7.7349C21.9881,7.7349 21.9871,7.7335 21.0004,8.5009L21.9871,7.7335Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_call_back_to_chat.xml b/vector/src/main/res/drawable/ic_call_back_to_chat.xml
new file mode 100644
index 0000000000..b1c532f17d
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_call_back_to_chat.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.8,12C22.8,17.9646 17.9647,22.8 12,22.8C10.0252,22.8 8.1742,22.2699 6.5815,21.3444L2.4145,22.6302C1.6455,22.8675 0.9255,22.1455 1.1649,21.3772L2.4903,17.1235C1.6672,15.599 1.2,13.854 1.2,12C1.2,6.0353 6.0353,1.1999 12,1.1999C17.9647,1.1999 22.8,6.0353 22.8,12ZM8.4,12C8.4,12.6627 7.8628,13.2 7.2,13.2C6.5373,13.2 6,12.6627 6,12C6,11.3372 6.5373,10.8 7.2,10.8C7.8628,10.8 8.4,11.3372 8.4,12ZM12,13.2C12.6628,13.2 13.2,12.6627 13.2,12C13.2,11.3372 12.6628,10.8 12,10.8C11.3373,10.8 10.8,11.3372 10.8,12C10.8,12.6627 11.3373,13.2 12,13.2ZM18,12C18,12.6627 17.4628,13.2 16.8,13.2C16.1373,13.2 15.6,12.6627 15.6,12C15.6,11.3372 16.1373,10.8 16.8,10.8C17.4628,10.8 18,11.3372 18,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_call_speaker_active.xml b/vector/src/main/res/drawable/ic_call_speaker_active.xml
deleted file mode 100644
index 97035b1915..0000000000
--- a/vector/src/main/res/drawable/ic_call_speaker_active.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:autoMirrored="true" android:height="40dp"
-    android:viewportHeight="40" android:viewportWidth="40"
-    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.2" android:fillColor="#000000"
-        android:fillType="evenOdd"
-        android:pathData="M20,20m-20,0a20,20 0,1 1,40 0a20,20 0,1 1,-40 0"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M13.25,17.75L13.25,22.25L16.25,22.25L20,26L20,14L16.25,17.75L13.25,17.75ZM23.375,20C23.375,18.6725 22.61,17.5325 21.5,16.9775L21.5,23.015C22.61,22.4675 23.375,21.3275 23.375,20ZM21.5,13.4225L21.5,14.9675C23.6675,15.6125 25.25,17.6225 25.25,20C25.25,22.3775 23.6675,24.3875 21.5,25.0325L21.5,26.5775C24.5075,25.895 26.75,23.21 26.75,20C26.75,16.79 24.5075,14.105 21.5,13.4225Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_speaker_default.xml b/vector/src/main/res/drawable/ic_call_speaker_default.xml
deleted file mode 100644
index 2fc06a5795..0000000000
--- a/vector/src/main/res/drawable/ic_call_speaker_default.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:autoMirrored="true" android:height="18dp"
-    android:viewportHeight="18" android:viewportWidth="18"
-    android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M2.25,6.75L2.25,11.25L5.25,11.25L9,15L9,3L5.25,6.75L2.25,6.75ZM12.375,9C12.375,7.6725 11.61,6.5325 10.5,5.9775L10.5,12.015C11.61,11.4675 12.375,10.3275 12.375,9ZM10.5,2.4225L10.5,3.9675C12.6675,4.6125 14.25,6.6225 14.25,9C14.25,11.3775 12.6675,13.3875 10.5,14.0325L10.5,15.5775C13.5075,14.895 15.75,12.21 15.75,9C15.75,5.79 13.5075,3.105 10.5,2.4225Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_video_small.xml b/vector/src/main/res/drawable/ic_call_video_small.xml
index abb2d85719..5e2ae23598 100644
--- a/vector/src/main/res/drawable/ic_call_video_small.xml
+++ b/vector/src/main/res/drawable/ic_call_video_small.xml
@@ -9,4 +9,5 @@
   <path
       android:pathData="M12.6666,3.9999L14.3753,2.633C15.03,2.1092 16,2.5754 16,3.4139V8.586C16,9.4245 15.03,9.8906 14.3753,9.3668L12.6666,7.9999V3.9999Z"
       android:fillColor="#737D8C"/>
+
 </vector>
diff --git a/vector/src/main/res/drawable/ic_call_videocam_off_active.xml b/vector/src/main/res/drawable/ic_call_videocam_off_active.xml
deleted file mode 100644
index 106317ed56..0000000000
--- a/vector/src/main/res/drawable/ic_call_videocam_off_active.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:autoMirrored="true" android:height="40dp"
-    android:viewportHeight="40" android:viewportWidth="40"
-    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.2" android:fillColor="#000000"
-        android:fillType="evenOdd"
-        android:pathData="M20,20m-20,0a20,20 0,1 1,40 0a20,20 0,1 1,-40 0"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M26.75,15.875L23.75,18.875L23.75,16.25C23.75,15.8375 23.4125,15.5 23,15.5L18.365,15.5L26.75,23.885L26.75,15.875ZM13.4525,12.5L12.5,13.4525L14.5475,15.5L14,15.5C13.5875,15.5 13.25,15.8375 13.25,16.25L13.25,23.75C13.25,24.1625 13.5875,24.5 14,24.5L23,24.5C23.1575,24.5 23.2925,24.44 23.405,24.365L25.7975,26.75L26.75,25.7975L13.4525,12.5Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_videocam_off_default.xml b/vector/src/main/res/drawable/ic_call_videocam_off_default.xml
deleted file mode 100644
index 0b3d9baf04..0000000000
--- a/vector/src/main/res/drawable/ic_call_videocam_off_default.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:autoMirrored="true" android:height="18dp"
-    android:viewportHeight="18" android:viewportWidth="18"
-    android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M15.75,4.875L12.75,7.875L12.75,5.25C12.75,4.8375 12.4125,4.5 12,4.5L7.365,4.5L15.75,12.885L15.75,4.875ZM2.4525,1.5L1.5,2.4525L3.5475,4.5L3,4.5C2.5875,4.5 2.25,4.8375 2.25,5.25L2.25,12.75C2.25,13.1625 2.5875,13.5 3,13.5L12,13.5C12.1575,13.5 12.2925,13.44 12.405,13.365L14.7975,15.75L15.75,14.7975L2.4525,1.5Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_mic_off.xml b/vector/src/main/res/drawable/ic_mic_off.xml
new file mode 100644
index 0000000000..8e199f115a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_mic_off.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,11h-1.7c0,0.74 -0.16,1.43 -0.43,2.05l1.23,1.23c0.56,-0.98 0.9,-2.09 0.9,-3.28zM14.98,11.17c0,-0.06 0.02,-0.11 0.02,-0.17L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v0.18l5.98,5.99zM4.27,3L3,4.27l6.01,6.01L9.01,11c0,1.66 1.33,3 2.99,3 0.22,0 0.44,-0.03 0.65,-0.08l1.66,1.66c-0.71,0.33 -1.5,0.52 -2.31,0.52 -2.76,0 -5.3,-2.1 -5.3,-5.1L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c0.91,-0.13 1.77,-0.45 2.54,-0.9L19.73,21 21,19.73 4.27,3z"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_mic_on.xml b/vector/src/main/res/drawable/ic_mic_on.xml
new file mode 100644
index 0000000000..791b475704
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_mic_on.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_microphone_off.xml b/vector/src/main/res/drawable/ic_microphone_off.xml
deleted file mode 100644
index 92d5044902..0000000000
--- a/vector/src/main/res/drawable/ic_microphone_off.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M1,2L23,24"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M15,10.34V5C15.0007,4.256 14.725,3.5383 14.2264,2.9862C13.7277,2.4341 13.0417,2.0869 12.3015,2.0122C11.5613,1.9374 10.8197,2.1403 10.2207,2.5816C9.6217,3.0228 9.208,3.6709 9.06,4.4M9,10V13C9.0005,13.593 9.1768,14.1725 9.5064,14.6653C9.8361,15.1582 10.3045,15.5423 10.8523,15.7691C11.4002,15.996 12.0029,16.0554 12.5845,15.9399C13.1661,15.8243 13.7005,15.539 14.12,15.12L9,10Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M16.9999,17.95C16.0237,18.9464 14.7721,19.6285 13.4056,19.9086C12.039,20.1887 10.62,20.0542 9.3304,19.5223C8.0409,18.9903 6.9397,18.0853 6.1681,16.9232C5.3965,15.761 4.9897,14.3949 4.9999,13V11M18.9999,11V13C18.9996,13.4124 18.9628,13.824 18.8899,14.23"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M12,20V24"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8,24H16"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_microphone_on.xml b/vector/src/main/res/drawable/ic_microphone_on.xml
deleted file mode 100644
index aaa9987860..0000000000
--- a/vector/src/main/res/drawable/ic_microphone_on.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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,0C10.9391,0 9.9217,0.4214 9.1716,1.1716C8.4214,1.9217 8,2.9391 8,4V12C8,13.0609 8.4214,14.0783 9.1716,14.8284C9.9217,15.5786 10.9391,16 12,16C13.0609,16 14.0783,15.5786 14.8284,14.8284C15.5786,14.0783 16,13.0609 16,12V4C16,2.9391 15.5786,1.9217 14.8284,1.1716C14.0783,0.4214 13.0609,0 12,0ZM10.5858,2.5858C10.9609,2.2107 11.4696,2 12,2C12.5304,2 13.0391,2.2107 13.4142,2.5858C13.7893,2.9609 14,3.4696 14,4V12C14,12.5304 13.7893,13.0391 13.4142,13.4142C13.0391,13.7893 12.5304,14 12,14C11.4696,14 10.9609,13.7893 10.5858,13.4142C10.2107,13.0391 10,12.5304 10,12V4C10,3.4696 10.2107,2.9609 10.5858,2.5858ZM6,10C6,9.4477 5.5523,9 5,9C4.4477,9 4,9.4477 4,10V12C4,14.1217 4.8429,16.1566 6.3432,17.6569C7.6058,18.9195 9.247,19.7165 11,19.9373V22H8C7.4477,22 7,22.4477 7,23C7,23.5523 7.4477,24 8,24H12H16C16.5523,24 17,23.5523 17,23C17,22.4477 16.5523,22 16,22H13V19.9373C14.753,19.7165 16.3942,18.9195 17.6569,17.6569C19.1571,16.1566 20,14.1217 20,12V10C20,9.4477 19.5523,9 19,9C18.4477,9 18,9.4477 18,10V12C18,13.5913 17.3679,15.1174 16.2426,16.2426C15.1174,17.3679 13.5913,18 12,18C10.4087,18 8.8826,17.3679 7.7574,16.2426C6.6321,15.1174 6,13.5913 6,12V10Z"
-      android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_sound_device_headphone.xml b/vector/src/main/res/drawable/ic_sound_device_headphone.xml
new file mode 100644
index 0000000000..4648465356
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_sound_device_headphone.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M0,10V17.7778C0,19 1,20 2.2222,20H4.4444C5.6667,20 6.6667,19 6.6667,17.7778V13.3333C6.6667,12.1111 5.6667,11.1111 4.4444,11.1111H2.2222V10C2.2222,5.7 5.7,2.2222 10,2.2222C14.3,2.2222 17.7778,5.7 17.7778,10V11.1111H15.5556C14.3333,11.1111 13.3333,12.1111 13.3333,13.3333V17.7778C13.3333,19 14.3333,20 15.5556,20H17.7778C19,20 20,19 20,17.7778V10C20,4.4778 15.5222,0 10,0C4.4778,0 0,4.4778 0,10Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_sound_device_phone.xml b/vector/src/main/res/drawable/ic_sound_device_phone.xml
new file mode 100644
index 0000000000..fd825c77f0
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_sound_device_phone.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="22dp"
+    android:viewportWidth="14"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M12,0.01L2,0C0.9,0 0,0.9 0,2V20C0,21.1 0.9,22 2,22H12C13.1,22 14,21.1 14,20V2C14,0.9 13.1,0.01 12,0.01ZM12,18H2V4H12V18Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_sound_device_speaker.xml b/vector/src/main/res/drawable/ic_sound_device_speaker.xml
new file mode 100644
index 0000000000..eb786d3fe1
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_sound_device_speaker.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M11.9699,0.226L6,5.2009L1.5,5.2009C0.6716,5.2009 0,5.8725 0,6.7009V13.3009C0,14.1294 0.6716,14.8009 1.5,14.8009L6,14.8009L11.9699,19.7758C12.4584,20.1829 13.2,19.8355 13.2,19.1996V0.8022C13.2,0.1663 12.4584,-0.181 11.9699,0.226Z"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M21.1888,2.1866C20.8497,1.7507 20.2214,1.6721 19.7855,2.0112C19.35,2.3499 19.2712,2.9771 19.6089,3.413L19.6097,3.414L19.6107,3.4153L19.6243,3.4335C19.6376,3.4513 19.6589,3.4803 19.6872,3.5202C19.7438,3.5999 19.828,3.7224 19.9308,3.8839C20.1365,4.2072 20.4145,4.6833 20.6932,5.2806C21.2535,6.4811 21.7994,8.134 21.7994,10.0005C21.7994,11.8671 21.2535,13.52 20.6932,14.7205C20.4145,15.3178 20.1365,15.7939 19.9308,16.1172C19.828,16.2786 19.7438,16.4012 19.6872,16.4809C19.6589,16.5208 19.6376,16.5498 19.6243,16.5676L19.6107,16.5858L19.6097,16.5871L19.6088,16.5882C19.2712,17.0241 19.3501,17.6512 19.7855,17.9899C20.2214,18.329 20.8497,18.2504 21.1888,17.8145L20.4435,17.2348C21.1888,17.8145 21.1888,17.8145 21.1888,17.8145L21.1908,17.8119L21.1936,17.8082L21.2019,17.7974L21.2284,17.7621C21.2503,17.7327 21.2805,17.6915 21.3179,17.6389C21.3925,17.5338 21.4958,17.3832 21.6181,17.191C21.8623,16.8072 22.1843,16.2547 22.5056,15.5663C23.1453,14.1954 23.7994,12.2482 23.7994,10.0005C23.7994,7.7528 23.1453,5.8057 22.5056,4.4348C22.1843,3.7463 21.8623,3.1939 21.6181,2.8101C21.4958,2.6179 21.3925,2.4673 21.3179,2.3622C21.2805,2.3096 21.2503,2.2683 21.2284,2.2389L21.2019,2.2037L21.1936,2.1929L21.1908,2.1892L21.1897,2.1877C21.1897,2.1877 21.1888,2.1866 20.3994,2.8005L21.1888,2.1866Z"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M17.5896,5.7868C17.2506,5.3509 16.6223,5.2723 16.1864,5.6114C15.7515,5.9496 15.6723,6.5755 16.0083,7.0113L16.0117,7.0159C16.0162,7.0219 16.0246,7.0333 16.0365,7.0501C16.0603,7.0836 16.0977,7.1378 16.1441,7.2108C16.2374,7.3574 16.3654,7.5764 16.4941,7.8522C16.7544,8.4099 17.0003,9.1628 17.0003,10.0008C17.0003,10.8388 16.7544,11.5916 16.4941,12.1493C16.3654,12.4251 16.2374,12.6441 16.1441,12.7907C16.0977,12.8637 16.0603,12.9179 16.0365,12.9514C16.0246,12.9682 16.0162,12.9797 16.0117,12.9857L16.0083,12.9903C15.6723,13.4261 15.7515,14.0519 16.1864,14.3901C16.6223,14.7292 17.2506,14.6506 17.5896,14.2147L16.8003,13.6008C17.5896,14.2147 17.5896,14.2147 17.5896,14.2147L17.5914,14.2124L17.5936,14.2095L17.5994,14.2021L17.6158,14.1802C17.6289,14.1626 17.6463,14.1389 17.6672,14.1094C17.709,14.0505 17.7654,13.9682 17.8315,13.8644C17.9632,13.6574 18.1352,13.3621 18.3065,12.9951C18.6462,12.267 19.0003,11.2199 19.0003,10.0008C19.0003,8.7816 18.6462,7.7345 18.3065,7.0065C18.1352,6.6394 17.9632,6.3441 17.8315,6.1371C17.7654,6.0333 17.709,5.951 17.6672,5.8921C17.6463,5.8626 17.6289,5.8389 17.6158,5.8213L17.5994,5.7995L17.5936,5.792L17.5914,5.7891L17.5905,5.7879C17.5905,5.7879 17.5896,5.7868 16.8003,6.4008L17.5896,5.7868Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_sound_device_wireless.xml b/vector/src/main/res/drawable/ic_sound_device_wireless.xml
new file mode 100644
index 0000000000..02287aa96c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_sound_device_wireless.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="M10.8817,3.1593L5.4545,7.682L1.3636,7.682C0.6105,7.682 0,8.2925 0,9.0456V15.0456C0,15.7987 0.6105,16.4092 1.3636,16.4092L5.4545,16.4092L10.8817,20.9318C11.3258,21.3019 12,20.9861 12,20.4081V3.6831C12,3.1051 11.3258,2.7893 10.8817,3.1593Z"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M23.6656,7.8241L20.0887,4.2472C19.5634,3.7219 18.6629,4.0888 18.6629,4.8309V9.9836L15.4195,6.7402C15.0943,6.415 14.5691,6.415 14.2439,6.7402C13.9187,7.0654 13.9187,7.5907 14.2439,7.9159L18.3211,11.993L14.2439,16.0703C13.9187,16.3954 13.9187,16.9207 14.2439,17.2459C14.5691,17.5711 15.0943,17.5711 15.4195,17.2459L18.6629,14.0025V19.1553C18.6629,19.8973 19.5634,20.2725 20.0887,19.7472L23.6656,16.162C23.9908,15.8368 23.9908,15.3115 23.6656,14.9863L20.6724,11.993L23.6656,9.0081C23.9908,8.6829 23.9908,8.1493 23.6656,7.8241ZM20.3305,6.8486L21.898,8.4161L20.3305,9.9836V6.8486ZM21.898,15.57L20.3305,17.1375V14.0025L21.898,15.57Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_video.xml b/vector/src/main/res/drawable/ic_video.xml
index d751601281..e5f4eacedb 100644
--- a/vector/src/main/res/drawable/ic_video.xml
+++ b/vector/src/main/res/drawable/ic_video.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="25"
     android:viewportHeight="25">
   <path
       android:pathData="M0.5,7.5C0.5,5.8432 1.8432,4.5 3.5,4.5H14.5C16.1569,4.5 17.5,5.8432 17.5,7.5V17.5C17.5,19.1569 16.1569,20.5 14.5,20.5H3.5C1.8432,20.5 0.5,19.1569 0.5,17.5V7.5Z"
+      android:strokeLineJoin="round"
       android:fillColor="#000000"/>
   <path
       android:pathData="M19.5,9.5L22.8753,6.7998C23.5301,6.2759 24.5,6.7421 24.5,7.5806V17.4194C24.5,18.2579 23.5301,18.7241 22.8753,18.2002L19.5,15.5V9.5Z"
diff --git a/vector/src/main/res/drawable/ic_video_call_declined.xml b/vector/src/main/res/drawable/ic_video_call_declined.xml
new file mode 100644
index 0000000000..dc5457178a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_video_call_declined.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="12dp"
+    android:viewportWidth="16"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M0,2.8182C0,1.7638 0.8954,0.9091 2,0.9091H9.3333C10.4379,0.9091 11.3333,1.7638 11.3333,2.8182V9.1818C11.3333,10.2361 10.4379,11.0909 9.3333,11.0909H2C0.8954,11.0909 0,10.2361 0,9.1818V2.8182ZM12.6667,4.0909L14.9169,2.3726C15.3534,2.0392 16,2.3359 16,2.8695V9.1305C16,9.6641 15.3534,9.9607 14.9169,9.6274L12.6667,7.9091V4.0909ZM7.8233,3.8154C7.965,3.9571 7.965,4.1869 7.8233,4.3285L6.1798,5.972L7.8937,7.6859C8.0354,7.8276 8.0354,8.0574 7.8937,8.1991C7.752,8.3408 7.5223,8.3408 7.3805,8.1991L5.6667,6.4852L3.9528,8.1991C3.8111,8.3408 3.5813,8.3408 3.4396,8.1991C3.2979,8.0574 3.2979,7.8276 3.4396,7.6859L5.1535,5.972L3.51,4.3285C3.3683,4.1869 3.3683,3.9571 3.51,3.8154C3.6517,3.6737 3.8815,3.6737 4.0232,3.8154L5.6667,5.4589L7.3102,3.8154C7.4519,3.6737 7.6816,3.6737 7.8233,3.8154Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_video_off.xml b/vector/src/main/res/drawable/ic_video_off.xml
index 34abdb5b51..9a262b9c79 100644
--- a/vector/src/main/res/drawable/ic_video_off.xml
+++ b/vector/src/main/res/drawable/ic_video_off.xml
@@ -1,20 +1,7 @@
-<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="M10.66,5H14C14.5304,5 15.0391,5.2107 15.4142,5.5858C15.7893,5.9609 16,6.4696 16,7V10.34L17,11.34L23,7V17M16,16V17C16,17.5304 15.7893,18.0391 15.4142,18.4142C15.0391,18.7893 14.5304,19 14,19H3C2.4696,19 1.9609,18.7893 1.5858,18.4142C1.2107,18.0391 1,17.5304 1,17V7C1,6.4696 1.2107,5.9609 1.5858,5.5858C1.9609,5.2107 2.4696,5 3,5H5L16,16Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#2E2F32"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M1,1L23,23"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#2E2F32"
-      android:strokeLineCap="round"/>
+<vector android:height="24dp" android:viewportHeight="32"
+    android:viewportWidth="32" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <path android:fillColor="#FF000000" android:pathData="M22.5,20.9l5,3C27.6,24 27.8,24 28,24c0.2,0 0.3,0 0.5,-0.1c0.3,-0.2 0.5,-0.5 0.5,-0.9V9c0,-0.4 -0.2,-0.7 -0.5,-0.9c-0.3,-0.2 -0.7,-0.2 -1,0l-5,3C22.2,11.3 22,11.6 22,12v8C22,20.4 22.2,20.7 22.5,20.9z"/>
+  <path android:fillColor="#FF000000" android:pathData="M29.7,28.3L20,18.6V11c0,-1.7 -1.3,-3 -3,-3H9.4L3.7,2.3c-0.4,-0.4 -1,-0.4 -1.4,0s-0.4,1 0,1.4l26,26c0.2,0.2 0.5,0.3 0.7,0.3s0.5,-0.1 0.7,-0.3C30.1,29.3 30.1,28.7 29.7,28.3z"/>
+  <path android:fillColor="#FF000000" android:pathData="M3,11v10c0,1.7 1.3,3 3,3h11c0.8,0 1.5,-0.3 2,-0.8L4.3,8.5C3.5,9.1 3,10 3,11z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_videocam.xml b/vector/src/main/res/drawable/ic_videocam.xml
deleted file mode 100644
index b7a50f9a57..0000000000
--- a/vector/src/main/res/drawable/ic_videocam.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_voice_call_declined.xml b/vector/src/main/res/drawable/ic_voice_call_declined.xml
new file mode 100644
index 0000000000..2eb04a7e5a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_voice_call_declined.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M5.8514,10.6408C6.6121,11.4621 8.4433,12.8842 8.9424,13.176C8.9719,13.1933 9.0057,13.2134 9.0435,13.2358C9.8051,13.6886 12.1916,15.1072 13.9304,13.7796C15.2775,12.751 14.8395,11.5939 14.386,11.25C14.0756,11.0085 13.161,10.3429 12.3005,9.7434C11.4555,9.1548 10.9846,9.6264 10.6662,9.9453C10.6603,9.9512 10.6545,9.957 10.6488,9.9627L10.0081,10.6034C9.845,10.7665 9.5968,10.707 9.3591,10.5203C8.5062,9.8707 7.8788,9.2439 7.5649,8.93L7.5623,8.9273C7.2484,8.6135 6.6293,7.9938 5.9798,7.1409C5.7931,6.9032 5.7335,6.655 5.8967,6.4919L6.5373,5.8512C6.5431,5.8455 6.5489,5.8397 6.5547,5.8338C6.8736,5.5154 7.3453,5.0445 6.7566,4.1995C6.1571,3.339 5.4915,2.4244 5.2501,2.114C4.9061,1.6606 3.749,1.2226 2.7204,2.5697C1.3928,4.3085 2.8115,6.6949 3.2642,7.4565C3.2867,7.4943 3.3068,7.5281 3.324,7.5576C3.6159,8.0567 5.0301,9.8801 5.8514,10.6408Z"
+      android:fillColor="#737D8C"/>
+  <path
+      android:pathData="M14.2982,2.0522C14.4601,1.8877 14.4601,1.6211 14.2982,1.4567C14.1362,1.2923 13.8736,1.2923 13.7117,1.4567L11.8334,3.3637L9.9551,1.4567C9.7932,1.2923 9.5306,1.2923 9.3687,1.4567C9.2067,1.6211 9.2067,1.8877 9.3687,2.0522L11.2469,3.9592L9.2882,5.9479C9.1263,6.1124 9.1263,6.379 9.2882,6.5434C9.4502,6.7078 9.7127,6.7078 9.8747,6.5434L11.8334,4.5546L13.7921,6.5434C13.9541,6.7078 14.2167,6.7078 14.3786,6.5434C14.5406,6.379 14.5406,6.1124 14.3786,5.9479L12.4199,3.9592L14.2982,2.0522Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 0df28cf16a..342ae11562 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -22,60 +22,102 @@
 
     <org.webrtc.SurfaceViewRenderer
         android:id="@+id/fullscreenRenderer"
+        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
+        android:id="@+id/pipContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/callControlsView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/callToolbar">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/pipRendererWrapper"
+            android:layout_width="@dimen/call_pip_width"
+            android:layout_height="@dimen/call_pip_height"
+            android:layout_marginEnd="16dp"
+            app:layout_goneMarginEnd="0dp"
+            app:cardCornerRadius="@dimen/call_pip_radius"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <org.webrtc.SurfaceViewRenderer
+                android:id="@+id/pipRenderer"
+                android:layout_width="@dimen/call_pip_width"
+                android:layout_height="@dimen/call_pip_height"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/otherKnownCallLayout"
+            android:layout_width="@dimen/call_pip_width"
+            android:layout_height="@dimen/call_pip_height"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@color/element_background_light"
+            android:foreground="?attr/selectableItemBackground"
+            android:visibility="gone"
+            app:cardBackgroundColor="@color/bg_call_screen"
+            app:cardCornerRadius="@dimen/call_pip_radius"
+            app:cardElevation="4dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/pipRendererWrapper"
+            tools:visibility="visible">
+
+            <ImageView
+                android:id="@+id/otherKnownCallAvatarView"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_gravity="center"
+                android:importantForAccessibility="no"
+                android:scaleType="centerCrop"
+                tools:src="@tools:sample/avatars" />
+
+            <ImageView
+                android:id="@+id/otherSmallIsHeldIcon"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_call_small_pause" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/callToolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <org.webrtc.SurfaceViewRenderer
-        android:id="@+id/pipRenderer"
-        android:layout_width="wrap_content"
-        android:layout_height="144dp"
-        android:layout_gravity="bottom|end"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/otherKnownCallLayout"
-        android:layout_width="80dp"
-        android:layout_height="144dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="16dp"
-        android:background="@color/element_background_light"
-        android:foreground="?attr/selectableItemBackground"
-        android:visibility="gone"
-        app:cardBackgroundColor="@color/bg_call_screen"
-        app:cardCornerRadius="4dp"
-        app:cardElevation="4dp"
+        android:background="@android:color/transparent"
+        android:fitsSystemWindows="true"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible">
-
-        <ImageView
-            android:id="@+id/otherKnownCallAvatarView"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:layout_gravity="center"
-            android:importantForAccessibility="no"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-
-        <ImageView
-            android:id="@+id/otherSmallIsHeldIcon"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_call_small_pause" />
-
-    </com.google.android.material.card.MaterialCardView>
+        app:navigationIcon="@drawable/ic_back_24dp"
+        app:navigationIconTint="@color/element_background_light"
+        app:subtitle="3:10"
+        app:subtitleTextAppearance="@style/TextAppearance.Vector.Caption"
+        app:subtitleTextColor="@color/element_background_light"
+        app:title="Video call"
+        app:titleMarginTop="16dp"
+        app:titleTextAppearance="@style/TextAppearance.Vector.Body.Medium"
+        app:titleTextColor="@color/element_background_light" />
 
     <ImageView
         android:id="@+id/otherMemberAvatar"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
         android:contentDescription="@string/avatar"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
@@ -112,22 +154,6 @@
         app:layout_constraintTop_toBottomOf="@id/otherMemberAvatar"
         tools:text="@sample/users.json/data/displayName" />
 
-    <TextView
-        android:id="@+id/callStatusText"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginBottom="8dp"
-        android:gravity="center"
-        android:textColor="@android:color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/participantNameText"
-        tools:text="@string/call_connecting" />
-
     <Button
         android:id="@+id/callActionText"
         style="@style/Widget.Vector.Button.Text"
@@ -138,35 +164,15 @@
         android:textColor="?colorSecondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/callStatusText"
+        app:layout_constraintTop_toBottomOf="@id/participantNameText"
         tools:text="@string/call_resume_action" />
 
-    <ProgressBar
-        android:id="@+id/callConnectingProgress"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_margin="8dp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/callStatusText"
-        tools:visibility="visible" />
-
     <androidx.constraintlayout.widget.Group
         android:id="@+id/callInfoGroup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="visible"
-        app:constraint_referenced_ids="participantNameText, otherMemberAvatar,callStatusText" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/callVideoGroup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="visible"
-        app:constraint_referenced_ids="pipRenderer, fullscreenRenderer"
-        tools:visibility="invisible" />
+        app:constraint_referenced_ids="participantNameText, otherMemberAvatar" />
 
     <im.vector.app.features.call.CallControlsView
         android:id="@+id/callControlsView"
@@ -174,16 +180,4 @@
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    <FrameLayout
-        android:id="@+id/hud_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <FrameLayout
-            android:id="@+id/call_fragment_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/alerter_jitsi_call_layout.xml b/vector/src/main/res/layout/alerter_jitsi_call_layout.xml
new file mode 100644
index 0000000000..163f88d492
--- /dev/null
+++ b/vector/src/main/res/layout/alerter_jitsi_call_layout.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    tools:style="@style/AlertStyle">
+
+    <ImageView
+        android:id="@+id/jitsiCallAvatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_margin="12dp"
+        android:contentDescription="@string/call_notification_answer"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/user_round_avatars" />
+
+    <TextView
+        android:id="@+id/jitsiCallNameView"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_primary"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/jitsiCallJoinView"
+        app:layout_constraintStart_toEndOf="@id/jitsiCallAvatar"
+        app:layout_constraintTop_toTopOf="@id/jitsiCallAvatar"
+        tools:text="@sample/users.json/data/displayName" />
+
+    <TextView
+        android:id="@+id/jitsiCallKindView"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="8dp"
+        android:drawablePadding="4dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/call_jitsi_started"
+        android:textColor="?vctr_content_secondary"
+        app:layout_constraintEnd_toStartOf="@+id/jitsiCallJoinView"
+        app:layout_constraintStart_toStartOf="@id/jitsiCallNameView"
+        app:layout_constraintTop_toBottomOf="@id/jitsiCallNameView" />
+
+    <Button
+        android:id="@+id/jitsiCallJoinView"
+        style="@style/Widget.Vector.Button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="12dp"
+        android:contentDescription="@string/call_notification_answer"
+        android:drawableStart="@drawable/ic_call_video_small"
+        android:padding="8dp"
+        android:text="@string/join"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index d9c1794a60..86dcd41340 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -12,7 +12,7 @@
         android:id="@+id/ivUserAvatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/alerter_texts"
         app:layout_constraintStart_toStartOf="parent"
@@ -78,4 +78,4 @@
 
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_call_controls.xml b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
index bb4a91ea72..e751ac412a 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_controls.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
@@ -7,16 +7,6 @@
     android:background="?colorSurface"
     android:orientation="vertical">
 
-    <im.vector.app.core.ui.views.BottomSheetActionButton
-        android:id="@+id/callControlsSoundDevice"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:actionTitle="@string/call_select_sound_device"
-        app:leftIcon="@drawable/ic_call_speaker_default"
-        app:tint="?vctr_content_primary"
-        app:titleTextColor="?vctr_content_primary"
-        tools:actionDescription="Speaker" />
-
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/callControlsSwitchCamera"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/bottom_sheet_call_sound_device_chooser.xml b/vector/src/main/res/layout/bottom_sheet_call_sound_device_chooser.xml
new file mode 100644
index 0000000000..e751ac412a
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_call_sound_device_chooser.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?colorSurface"
+    android:orientation="vertical">
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/callControlsSwitchCamera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/call_switch_camera"
+        app:leftIcon="@drawable/ic_video_flip"
+        app:tint="?vctr_content_primary"
+        app:titleTextColor="?vctr_content_primary"
+        tools:actionDescription="Front" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/callControlsOpenDialPad"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/call_dial_pad_title"
+        app:leftIcon="@drawable/ic_call_dial_pad"
+        app:tint="?vctr_content_primary"
+        app:titleTextColor="?vctr_content_primary"
+        tools:actionDescription="" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/callControlsToggleSDHD"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/call_format_turn_hd_on"
+        app:leftIcon="@drawable/ic_hd"
+        app:tint="?vctr_content_primary"
+        app:titleTextColor="?vctr_content_primary"
+        tools:actionDescription="Front" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/callControlsToggleHoldResume"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="Hold/resume"
+        app:leftIcon="@drawable/ic_call_hold_action"
+        app:tint="?vctr_content_primary"
+        app:titleTextColor="?vctr_content_primary"
+        tools:actionDescription="" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/callControlsTransfer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/call_transfer_title"
+        app:leftIcon="@drawable/ic_call_transfer"
+        app:tint="?vctr_content_primary"
+        app:titleTextColor="?vctr_content_primary"
+        tools:actionDescription="" />
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
index 6dbf4d91ee..5686c8879e 100644
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -25,7 +25,7 @@
                 android:id="@+id/inviterAvatarImage"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:contentDescription="@string/avatar"
+                android:importantForAccessibility="no"
                 android:transitionName="profile"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0"
@@ -75,4 +75,4 @@
 
     </LinearLayout>
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 3195877b5b..d082c407d1 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -45,7 +45,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/user_round_avatars" />
 
         <LinearLayout
@@ -118,4 +118,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
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
new file mode 100644
index 0000000000..b0f8c3893d
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
@@ -0,0 +1,92 @@
+<?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/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_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index a6c6ded739..dc1fec20ef 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -21,7 +21,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:adjustViewBounds="true"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:scaleType="centerCrop"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index 2dec5c23c0..ffb5b839c7 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -29,7 +29,7 @@
         android:id="@+id/composerRelatedMessageAvatar"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         tools:ignore="MissingConstraints" />
 
     <TextView
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index a098606ab9..eae8457121 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -32,7 +32,7 @@
         android:id="@+id/composerRelatedMessageAvatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintEnd_toStartOf="parent" />
@@ -192,4 +192,4 @@
         app:layout_constraintEnd_toEndOf="parent" />
     -->
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 1ef31900f7..c09b95f6f7 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -33,7 +33,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageActionIcon"
         app:layout_constraintEnd_toStartOf="@+id/composerRelatedMessageTitle"
         app:layout_constraintStart_toStartOf="parent"
@@ -192,4 +192,4 @@
         tools:ignore="MissingPrefix"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index cf744712ab..b84ab29bea 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -11,6 +11,15 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent">
 
+        <im.vector.app.core.ui.views.CurrentCallsView
+            android:id="@+id/currentCallsView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="48dp"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@id/homeKeysBackupBanner"
+            tools:visibility="visible" />
+
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/groupToolbar"
             android:layout_width="match_parent"
@@ -128,41 +137,12 @@
         app:layout_constraintTop_toBottomOf="@id/syncStateView"
         tools:visibility="visible" />
 
-    <im.vector.app.core.ui.views.CurrentCallsView
-        android:id="@+id/activeCallView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/homeKeysBackupBanner"
-        tools:visibility="visible" />
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/roomListContainer"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
-        app:layout_constraintTop_toBottomOf="@+id/activeCallView" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/activeCallPiPWrap"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:clickable="true"
-        android:focusable="true"
-        app:cardCornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/activeCallView">
-
-        <org.webrtc.SurfaceViewRenderer
-            android:id="@+id/activeCallPiP"
-            android:layout_width="120dp"
-            android:layout_height="120dp"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-    </com.google.android.material.card.MaterialCardView>
+        app:layout_constraintTop_toBottomOf="@+id/homeKeysBackupBanner" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottomNavigationView"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index d1af004490..36d9d8fca3 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -22,7 +22,7 @@
             android:layout_height="40dp"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginTop="24dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:transitionName="profile"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -174,4 +174,4 @@
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingPrefix" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_login_account_created.xml b/vector/src/main/res/layout/fragment_login_account_created.xml
index 0ec4881544..61a8710f88 100644
--- a/vector/src/main/res/layout/fragment_login_account_created.xml
+++ b/vector/src/main/res/layout/fragment_login_account_created.xml
@@ -60,7 +60,7 @@
                     android:id="@+id/loginAccountCreatedAvatar"
                     android:layout_width="44dp"
                     android:layout_height="44dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:src="@tools:sample/avatars" />
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 cdbf53b8f9..81188bddf0 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
@@ -19,7 +19,7 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginTop="20dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:elevation="4dp"
             android:transitionName="profile"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 623cd91b2a..be4559d009 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -12,6 +12,14 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent">
 
+        <im.vector.app.core.ui.views.CurrentCallsView
+            android:id="@+id/currentCallsView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="48dp"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/roomToolbar"
             android:layout_width="match_parent"
@@ -29,7 +37,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -100,21 +108,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
-    <im.vector.app.core.ui.views.CurrentCallsView
-        android:id="@+id/activeCallView"
+    <im.vector.app.features.call.conference.RemoveJitsiWidgetView
+        android:id="@+id/removeJitsiWidgetView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/syncStateView"
-        tools:visibility="visible" />
+        android:background="?android:colorBackground"
+        android:minHeight="54dp"
+        android:visibility="visible"
+        app:layout_constraintTop_toBottomOf="@id/syncStateView" />
 
-    <im.vector.app.core.ui.views.ActiveConferenceView
-        android:id="@+id/activeConferenceView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/activeCallView"
-        tools:visibility="visible" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/timelineRecyclerView"
@@ -124,7 +126,7 @@
         app:layout_constraintBottom_toTopOf="@+id/timelineRecyclerViewBarrier"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/activeConferenceView"
+        app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
         tools:listitem="@layout/item_timeline_event_base" />
 
     <com.google.android.material.chip.Chip
@@ -140,7 +142,7 @@
         app:closeIcon="@drawable/ic_close_24dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/activeConferenceView"
+        app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
         tools:visibility="visible" />
 
 
@@ -205,27 +207,6 @@
         app:barrierDirection="top"
         app:constraint_referenced_ids="composerLayout,notificationAreaView, failedMessagesWarningView" />
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/activeCallPiPWrap"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:clickable="true"
-        android:focusable="true"
-        app:cardCornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/jumpToReadMarkerView">
-
-        <org.webrtc.SurfaceViewRenderer
-            android:id="@+id/activeCallPiP"
-            android:layout_width="120dp"
-            android:layout_height="120dp"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-    </com.google.android.material.card.MaterialCardView>
-
     <im.vector.app.core.platform.BadgeFloatingActionButton
         android:id="@+id/jumpToBottomView"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index acbd5a1f4f..af9fdf0a8d 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -31,7 +31,7 @@
                         android:layout_height="40dp"
                         android:layout_marginTop="8dp"
                         android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/avatar"
+                        android:importantForAccessibility="no"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -149,4 +149,4 @@
 
     </LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 7d63c140f3..981bf64a4e 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -31,7 +31,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index 9d4155229f..50e26ba72b 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -29,7 +29,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
+                    android:importantForAccessibility="no"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -81,4 +81,4 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index e5c0a933d7..86d514b2f8 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -33,7 +33,7 @@
                         android:layout_height="40dp"
                         android:layout_marginTop="8dp"
                         android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/avatar"
+                        android:importantForAccessibility="no"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -120,4 +120,4 @@
 
     </LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 10a5998d1d..1810a37a24 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -135,6 +135,7 @@
                         android:id="@+id/showUserCodeQRImage"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:contentDescription="@string/a11y_qr_code_for_verification"
                         tools:src="@drawable/ic_qr_code_add" />
 
                 </com.google.android.material.card.MaterialCardView>
@@ -147,7 +148,7 @@
             android:id="@+id/showUserCodeAvatar"
             android:layout_width="76dp"
             android:layout_height="76dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:elevation="4dp"
             android:transitionName="profile"
             app:layout_constraintBottom_toTopOf="@id/showUserCodeCard"
@@ -203,4 +204,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index 20899f8075..ca213332b9 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -16,7 +16,6 @@
         android:layout_marginBottom="8dp"
         android:adjustViewBounds="true"
         android:background="@drawable/circle"
-        android:contentDescription="@string/avatar"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index 6df60344fe..b9f3eaacd9 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -14,7 +14,7 @@
         android:id="@+id/contactAvatar"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -37,4 +37,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 18e9d1d3ec..fb32c809d8 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -24,7 +24,7 @@
             android:id="@+id/createDirectRoomUserAvatar"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/user_round_avatars" />
 
         <ImageView
@@ -72,4 +72,4 @@
         app:layout_constraintTop_toBottomOf="@+id/createDirectRoomUserName"
         tools:text="@sample/users.json/data/id" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_display_read_receipt.xml b/vector/src/main/res/layout/item_display_read_receipt.xml
index 58ddf8e5ad..6f3498ac59 100644
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@@ -16,7 +16,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginEnd="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         tools:src="@sample/user_round_avatars" />
 
     <TextView
@@ -29,4 +29,4 @@
         style="@style/BottomSheetItemTime"
         tools:text="10:44" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index bc17752cbc..668d56ba66 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -16,7 +16,7 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
@@ -62,4 +62,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 48b180de5f..7494356bb1 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -24,7 +24,7 @@
             android:id="@+id/knownUserAvatar"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/user_round_avatars" />
 
         <ImageView
@@ -71,4 +71,4 @@
         app:layout_constraintTop_toBottomOf="@+id/knownUserName"
         tools:text="@sample/users.json/data/id" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_notifications_footer.xml b/vector/src/main/res/layout/item_notifications_footer.xml
new file mode 100644
index 0000000000..36db166e8f
--- /dev/null
+++ b/vector/src/main/res/layout/item_notifications_footer.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Widget.Vector.TextView.Body"
+    android:id="@+id/footerText"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/layout_horizontal_margin"
+    android:paddingTop="@dimen/layout_vertical_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    android:paddingBottom="@dimen/layout_vertical_margin"
+    android:textColor="?vctr_content_secondary"
+    tools:text="@string/room_settings_room_notifications_encryption_notice" />
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 51818250cd..636113752b 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -19,7 +19,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_centerVertical="true"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:scaleType="centerInside"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 4662cd9e58..89853a8878 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -19,7 +19,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_centerVertical="true"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:scaleType="centerInside"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 12aaf8a653..0410e4b4f8 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -17,7 +17,7 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -116,4 +116,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_radio.xml b/vector/src/main/res/layout/item_radio.xml
new file mode 100644
index 0000000000..4cd5312dc0
--- /dev/null
+++ b/vector/src/main/res/layout/item_radio.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:focusable="true"
+    android:minHeight="64dp"
+    android:foreground="?attr/selectableItemBackground"
+    android:paddingStart="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin">
+
+    <TextView
+        android:id="@+id/actionTitle"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?vctr_content_primary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/radioIcon"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/room_settings_all_messages" />
+
+    <ImageView
+        android:id="@+id/radioIcon"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:contentDescription="@string/a11y_checked"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:ignore="MissingPrefix"
+        tools:src="@drawable/ic_radio_on" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 11fe6c5b54..601ee14799 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -34,7 +34,7 @@
             android:id="@+id/roomAvatarImageView"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/room_round_avatars" />
 
         <ImageView
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 355f14cef3..a0ff909c07 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -18,7 +18,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
         android:background="@drawable/circle"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:padding="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -71,7 +71,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:contentDescription="@string/a11y_selected"
         android:padding="8dp"
         android:src="@drawable/ic_check_on"
         android:visibility="gone"
@@ -80,4 +80,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index 63c81c3aab..674d48fe72 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -53,7 +53,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:contentDescription="@string/remove"
         android:padding="8dp"
         android:src="@drawable/ic_delete"
         android:visibility="gone"
@@ -64,4 +64,4 @@
         tools:ignore="MissingPrefix"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index e526b10c53..e662dbf33a 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -16,7 +16,7 @@
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="12dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/room_round_avatars" />
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index 5b04d49d81..809e58a912 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -16,7 +16,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginStart="16dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -53,4 +53,4 @@
         tools:src="@drawable/ic_checkbox_on" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
index 1299fa4440..bc30eec1c5 100644
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -16,7 +16,7 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginStart="16dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -70,4 +70,4 @@
         tools:src="@drawable/ic_checkbox_on" />
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index e62be19333..3342c19590 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -12,7 +12,7 @@
         android:layout_height="44dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/user_round_avatars" />
@@ -61,4 +61,4 @@
         app:layout_constraintTop_toBottomOf="@+id/messageMemberNameView"
         tools:text="@sample/messages.json/data/message" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 147112ebb1..d91fc09a2a 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -26,7 +26,7 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toEndOf="@id/indent"
@@ -148,4 +148,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index 538709dfbb..f45f03297d 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -18,7 +18,6 @@
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:background="@drawable/rounded_rect_shape_8"
         android:backgroundTint="?colorPrimary"
-        android:contentDescription="@string/avatar"
         android:duplicateParentState="true"
         android:importantForAccessibility="no"
         android:padding="10dp"
@@ -43,4 +42,4 @@
         app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
         app:layout_constraintTop_toTopOf="parent" />
 
-</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index e1d8b8edd6..354d875b78 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -31,7 +31,7 @@
             android:layout_height="40dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             android:scaleType="centerInside"
             android:visibility="visible"
             app:layout_constraintStart_toStartOf="parent"
@@ -115,4 +115,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index d915ce28aa..b5b6f6927f 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -26,7 +26,7 @@
         android:layout_height="26dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/indent"
@@ -119,4 +119,4 @@
         app:tint="?vctr_content_primary"
         tools:ignore="MissingPrefix" />
 
-</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.CheckableConstraintLayout>
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index 011aea8dae..e791f63079 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -21,7 +21,7 @@
             android:id="@+id/roomAvatarImageView"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:contentDescription="@string/avatar"
+            android:importantForAccessibility="no"
             tools:src="@sample/room_round_avatars" />
 
     </FrameLayout>
diff --git a/vector/src/main/res/layout/item_text_header.xml b/vector/src/main/res/layout/item_text_header.xml
new file mode 100644
index 0000000000..3f876e5ece
--- /dev/null
+++ b/vector/src/main/res/layout/item_text_header.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/headerText"
+    style="@style/Widget.Vector.TextView.Subtitle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/layout_horizontal_margin"
+    android:paddingTop="@dimen/layout_vertical_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    android:paddingBottom="@dimen/layout_vertical_margin"
+    android:textColor="?vctr_content_secondary"
+    android:textStyle="bold"
+    tools:text="@string/room_settings_room_notifications_notify_me" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index 79e260f605..95f9e6661a 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -11,7 +11,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="center_horizontal"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         tools:src="@sample/user_round_avatars" />
 
     <TextView
@@ -20,41 +20,29 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="8dp"
         android:drawablePadding="6dp"
         android:gravity="center"
         android:textColor="?vctr_content_primary"
         android:textStyle="bold"
         tools:text="@sample/users.json/data/displayName" />
 
-
-    <TextView
-        android:id="@+id/itemCallKindTextView"
-        style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="12dp"
-        android:drawablePadding="4dp"
-        android:gravity="center"
-        android:textColor="?vctr_content_primary"
-        tools:text="@string/action_video_call" />
-
     <TextView
         android:id="@+id/itemCallStatusTextView"
         style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:layout_marginTop="8dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
         android:textColor="?vctr_content_secondary"
-        tools:text="@string/video_call_in_progress" />
+        android:maxLines="3"
+        android:drawablePadding="8dp"
+        tools:drawableLeft="@drawable/ic_missed_video_call"
+        tools:text="@string/call_tile_video_incoming" />
 
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -80,7 +68,6 @@
             style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:layout_marginEnd="4dp"
             android:minWidth="120dp"
             app:layout_constraintEnd_toStartOf="@+id/itemCallAcceptView"
@@ -92,4 +79,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index c6428861c3..95b8f36911 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -17,7 +17,7 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_marginStart="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -50,4 +50,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 5ea46822ac..7f625e8308 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -16,7 +16,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginStart="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/user_round_avatars" />
@@ -56,4 +56,4 @@
         tools:text="@sample/users.json/data/displayName"
         tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/layout_join_conference_action.xml b/vector/src/main/res/layout/layout_join_conference_action.xml
new file mode 100644
index 0000000000..4e2c792904
--- /dev/null
+++ b/vector/src/main/res/layout/layout_join_conference_action.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.ui.views.JoinConferenceView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp" />
diff --git a/vector/src/main/res/layout/merge_overlay_waiting_view.xml b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
index 3e5fe1b85d..f41139502c 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -1,72 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge 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:id="@+id/waiting_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?vctr_waiting_background_color"
+    android:clickable="true"
+    android:focusable="true"
+    android:visibility="gone"
+    tools:visibility="visible">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/waiting_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?vctr_waiting_background_color"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone"
-        tools:visibility="visible">
+    <LinearLayout
+        android:id="@+id/waiting_view_content"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/layout_horizontal_margin"
+        android:background="?attr/colorBackgroundFloating"
+        android:orientation="vertical"
+        android:padding="@dimen/layout_horizontal_margin"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent="@dimen/dialog_width_ratio">
 
         <LinearLayout
-            android:id="@+id/waiting_view_content"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/layout_horizontal_margin"
-            android:background="?attr/colorBackgroundFloating"
-            android:orientation="vertical"
-            android:padding="@dimen/layout_horizontal_margin"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_percent="@dimen/dialog_width_ratio">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <ProgressBar
-                    android:id="@+id/waitingCircularProgress"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="6dp" />
-
-                <TextView
-                    android:id="@+id/waitingStatusText"
-                    style="@style/Widget.Vector.TextView.Body"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="?vctr_content_secondary"
-                    android:visibility="gone"
-                    tools:text="Waiting status..."
-                    tools:visibility="visible" />
-
-            </LinearLayout>
+            android:orientation="horizontal">
 
             <ProgressBar
-                android:id="@+id/waitingHorizontalProgress"
-                style="@style/Widget.Vector.ProgressBar.Horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="20dp"
-                android:layout_marginTop="10dp"
+                android:id="@+id/waitingCircularProgress"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="6dp" />
+
+            <TextView
+                android:id="@+id/waitingStatusText"
+                style="@style/Widget.Vector.TextView.Body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textColor="?vctr_content_secondary"
                 android:visibility="gone"
-                tools:max="100"
-                tools:progress="30"
+                tools:text="Waiting status..."
                 tools:visibility="visible" />
 
         </LinearLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <ProgressBar
+            android:id="@+id/waitingHorizontalProgress"
+            style="@style/Widget.Vector.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_marginTop="10dp"
+            android:visibility="gone"
+            tools:max="100"
+            tools:progress="30"
+            tools:visibility="visible" />
 
-</merge>
\ No newline at end of file
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 6dc5fd41c7..deaaaa9902 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -13,7 +13,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="86dp"
         android:layout_marginEnd="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -94,4 +94,4 @@
         app:layout_constraintTop_toBottomOf="@id/inviteAcceptView" />
 
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/vector/src/main/res/layout/vector_preference_chip_group.xml b/vector/src/main/res/layout/vector_preference_chip_group.xml
new file mode 100644
index 0000000000..42891f7277
--- /dev/null
+++ b/vector/src/main/res/layout/vector_preference_chip_group.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="16dp"
+    android:focusable="true"
+    android:focusableInTouchMode="true">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/chipTextInputLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        app:errorEnabled="false"
+        app:hintEnabled="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/chipEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:inputType="text"
+            android:imeOptions="actionDone"
+            android:hint="@string/settings_notification_new_keyword" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+        android:id="@+id/addKeywordButton"
+        style="@style/Widget.Vector.Button.Positive"
+        android:layout_gravity="end"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:textAllCaps="false"
+        android:text="@string/action_add" />
+
+    <com.google.android.material.chip.ChipGroup
+        android:id="@+id/chipGroup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        app:chipSpacing="12dp"
+        android:paddingTop="16dp"
+        />
+
+</LinearLayout>
+
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
deleted file mode 100644
index 9f26ed9a1a..0000000000
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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"
-    android:background="?colorPrimary"
-    tools:parentTag="android.widget.RelativeLayout">
-
-    <TextView
-        android:id="@+id/activeConferenceInfo"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/deleteWidgetButton"
-        android:drawablePadding="10dp"
-        android:gravity="center_vertical"
-        android:paddingStart="16dp"
-        android:paddingTop="12dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="12dp"
-        android:textColor="?colorOnPrimary"
-        android:textColorLink="?colorOnPrimary"
-        app:drawableStartCompat="@drawable/ic_call_answer"
-        app:drawableTint="?colorOnPrimary"
-        tools:text="@string/ongoing_conference_call" />
-
-    <Button
-        android:id="@+id/deleteWidgetButton"
-        style="@style/Widget.Vector.Button.Text.OnPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/activeConferenceInfo"
-        android:layout_alignBottom="@+id/activeConferenceInfo"
-        android:layout_alignParentEnd="true"
-        android:clickable="false"
-        android:focusable="false"
-        android:paddingStart="8dp"
-        android:paddingEnd="16dp"
-        android:text="@string/action_close"
-        android:textStyle="bold" />
-
-</merge>
diff --git a/vector/src/main/res/layout/view_call_controls.xml b/vector/src/main/res/layout/view_call_controls.xml
index 2ef5be5ad0..6b12c42f5b 100644
--- a/vector/src/main/res/layout/view_call_controls.xml
+++ b/vector/src/main/res/layout/view_call_controls.xml
@@ -58,23 +58,25 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="16dp"
-        android:paddingStart="32dp"
-        android:paddingEnd="32dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="0dp"
         android:visibility="gone"
         tools:background="@color/password_strength_bar_low"
         tools:layout_marginTop="120dp"
         tools:visibility="visible">
 
         <ImageView
-            android:id="@+id/openChatIcon"
-            android:layout_width="@dimen/layout_touch_size"
-            android:layout_height="@dimen/layout_touch_size"
+            android:id="@+id/audioSettingsIcon"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
             android:background="@drawable/bg_rounded_button"
             android:clickable="true"
-            android:contentDescription="@string/a11y_open_chat"
+            android:contentDescription="@string/call_select_sound_device"
             android:focusable="true"
             android:scaleType="center"
-            android:src="@drawable/ic_call_pip"
+            android:src="@drawable/ic_call_audio_settings"
+            app:backgroundTint="?android:colorBackground"
+            app:tint="?vctr_content_primary"
             tools:ignore="MissingConstraints,MissingPrefix" />
 
         <ImageView
@@ -85,8 +87,23 @@
             android:clickable="true"
             android:contentDescription="@string/a11y_mute_microphone"
             android:focusable="true"
-            android:padding="16dp"
-            android:src="@drawable/ic_microphone_off"
+            android:padding="12dp"
+            android:src="@drawable/ic_mic_off"
+            app:backgroundTint="?android:colorBackground"
+            app:tint="?vctr_content_primary"
+            tools:ignore="MissingConstraints,MissingPrefix" />
+
+
+        <ImageView
+            android:id="@+id/videoToggleIcon"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:background="@drawable/bg_rounded_button"
+            android:clickable="true"
+            android:contentDescription="@string/a11y_stop_camera"
+            android:focusable="true"
+            android:padding="12dp"
+            android:src="@drawable/ic_video"
             app:backgroundTint="?android:colorBackground"
             app:tint="?vctr_content_primary"
             tools:ignore="MissingConstraints,MissingPrefix" />
@@ -105,24 +122,11 @@
             app:tint="?colorOnPrimary"
             tools:ignore="MissingConstraints,MissingPrefix" />
 
-        <ImageView
-            android:id="@+id/videoToggleIcon"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:background="@drawable/bg_rounded_button"
-            android:clickable="true"
-            android:contentDescription="@string/a11y_stop_camera"
-            android:focusable="true"
-            android:padding="16dp"
-            android:src="@drawable/ic_call_videocam_off_default"
-            app:backgroundTint="?android:colorBackground"
-            app:tint="?vctr_content_primary"
-            tools:ignore="MissingConstraints,MissingPrefix" />
-
         <ImageView
             android:id="@+id/moreIcon"
             android:layout_width="@dimen/layout_touch_size"
             android:layout_height="@dimen/layout_touch_size"
+            android:layout_marginTop="8dp"
             android:background="@drawable/bg_rounded_button"
             android:clickable="true"
             android:contentDescription="@string/settings"
@@ -135,9 +139,10 @@
         <androidx.constraintlayout.helper.widget.Flow
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:constraint_referenced_ids="openChatIcon, muteIcon, endCallIcon,videoToggleIcon,moreIcon"
+            app:constraint_referenced_ids="videoToggleIcon, audioSettingsIcon, muteIcon, endCallIcon, moreIcon"
             app:flow_horizontalGap="16dp"
             app:flow_horizontalStyle="packed"
+            app:flow_wrapMode="chain"
             tools:ignore="MissingConstraints" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_current_calls.xml b/vector/src/main/res/layout/view_current_calls.xml
index 36a999e275..892f097e01 100644
--- a/vector/src/main/res/layout/view_current_calls.xml
+++ b/vector/src/main/res/layout/view_current_calls.xml
@@ -6,39 +6,20 @@
     android:layout_height="wrap_content"
     android:background="?colorPrimary"
     android:foreground="?attr/selectableItemBackground"
-    tools:parentTag="android.widget.RelativeLayout">
+    tools:parentTag="android.widget.FrameLayout">
 
     <TextView
         android:id="@+id/currentCallsInfo"
         style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/returnToCallButton"
         android:drawablePadding="10dp"
-        android:gravity="center_vertical"
+        android:gravity="center"
         android:paddingStart="16dp"
         android:paddingTop="12dp"
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
         android:text="@string/call_only_active"
-        android:textColor="?colorOnPrimary"
-        app:drawableStartCompat="@drawable/ic_call_answer"
-        app:drawableTint="?colorOnPrimary" />
-
-    <Button
-        android:id="@+id/returnToCallButton"
-        style="@style/Widget.Vector.Button.Text.OnPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/currentCallsInfo"
-        android:layout_alignBottom="@+id/currentCallsInfo"
-        android:layout_alignParentEnd="true"
-        android:clickable="false"
-        android:focusable="false"
-        android:gravity="center"
-        android:paddingStart="8dp"
-        android:paddingEnd="16dp"
-        android:text="@string/action_return"
-        android:textStyle="bold" />
+        android:textColor="?colorOnPrimary" />
 
 </merge>
diff --git a/vector/src/main/res/layout/view_join_conference.xml b/vector/src/main/res/layout/view_join_conference.xml
new file mode 100644
index 0000000000..c47eddc18f
--- /dev/null
+++ b/vector/src/main/res/layout/view_join_conference.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    tools:parentTag="android.widget.FrameLayout"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp">
+
+    <Button
+        android:id="@+id/join_conference_button"
+        android:layout_width="56dp"
+        android:layout_height="wrap_content"
+        android:minHeight="32dp"
+        app:icon="@drawable/ic_call_video_small"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:iconTint="@color/element_background_light" />
+
+</merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_remove_jitsi_widget.xml b/vector/src/main/res/layout/view_remove_jitsi_widget.xml
new file mode 100644
index 0000000000..0bfdfe60d1
--- /dev/null
+++ b/vector/src/main/res/layout/view_remove_jitsi_widget.xml
@@ -0,0 +1,127 @@
+<?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"
+    android:minHeight="54dp"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <LinearLayout android:id="@+id/removeJitsiProgressContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        android:gravity="center_vertical"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ProgressBar
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
+            android:indeterminateTintMode="src_atop"
+            android:indeterminateTint="?vctr_content_primary"
+            android:layout_width="16dp"
+            android:layout_height="16dp" />
+
+        <TextView
+            android:text="@string/call_remove_jitsi_widget_progress"
+            style="@style/Widget.Vector.TextView.Body"
+            android:textColor="?vctr_content_primary"
+            android:layout_marginStart="8dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:id="@+id/removeJitsiSlidingContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:visibility="visible"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <TextView
+            android:id="@+id/removeJitsiSlidingTextView"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
+            android:text="@string/call_slide_to_end_conference"
+            android:textColor="?vctr_content_primary" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:src="@drawable/ic_arrow_right"
+            tools:ignore="ContentDescription"
+            app:tint="?vctr_content_quaternary" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:alpha="0.5"
+            android:src="@drawable/ic_arrow_right"
+            tools:ignore="ContentDescription"
+            app:tint="?vctr_content_quaternary" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:alpha="0.2"
+            android:src="@drawable/ic_arrow_right"
+            tools:ignore="ContentDescription"
+            app:tint="?vctr_content_quaternary" />
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/removeJitsiHangupContainer"
+        android:layout_width="88dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="@color/vector_warning_color_2">
+
+        <ImageView
+            android:id="@+id/removeJitsiHangupIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            tools:ignore="ContentDescription"
+            android:src="@drawable/ic_call_hangup" />
+
+    </FrameLayout>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?attr/vctr_system"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?attr/vctr_system"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
+</merge>
\ 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 5db30dfb5b..54967f1706 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -37,14 +37,11 @@
         app:showAsAction="always"
         tools:visible="true" />
 
-    <item
-        android:id="@+id/hangup_call"
-        android:icon="@drawable/ic_call_end"
-        android:title="@string/call_notification_hangup"
-        android:visible="false"
-        app:iconTint="?colorError"
+    <item android:id="@+id/join_conference"
+        android:title="@string/join"
+        app:actionLayout="@layout/layout_join_conference_action"
         app:showAsAction="always"
-        tools:visible="true" />
+        />
 
     <item
         android:id="@+id/open_matrix_apps"
diff --git a/vector/src/main/res/menu/vector_call.xml b/vector/src/main/res/menu/vector_call.xml
new file mode 100644
index 0000000000..80e525eb3f
--- /dev/null
+++ b/vector/src/main/res/menu/vector_call.xml
@@ -0,0 +1,11 @@
+<?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">
+
+    <item
+        android:id="@+id/menu_call_open_chat"
+        app:showAsAction="always"
+        android:icon="@drawable/ic_call_back_to_chat"
+        android:title="@string/a11y_open_chat" />
+
+</menu>
\ 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 9249228546..39dc53140e 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -1178,7 +1178,6 @@
     <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="labs_space_show_orphan_in_home">مساحة تجريبية - فقط أعرض المُيتِّمة في الصفحة الرئيسية</string>
     <string name="spaces_feeling_experimental_subspace">تشعر بالتجربة؟
 \nيمكنك إضافة مساحات موجودة إلى مساحة.</string>
     <string name="spaces_no_server_support_description">يرجى الاتصال بمسؤول الخادم الخاص بك للحصول على مزيد من المعلومات</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index f87c4bdd21..6a68166bb7 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -529,7 +529,7 @@
     <string name="preview">Previsualitza</string>
     <string name="reject">Rebutja</string>
     <!-- Room -->
-    <string name="room_jump_to_first_unread">Salta fins al primer missatge no llegit.</string>
+    <string name="room_jump_to_first_unread">Vés fins al primer no llegit</string>
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">L\'usuari %s t\'ha convidat a unir-te a aquesta sala</string>
     <string name="room_preview_unlinked_email_warning">Aquesta invitació s\'ha enviat a %s, que no està associat amb aquest compte.
@@ -593,7 +593,7 @@
     <string name="room_resend_unsent_messages">Reenvia els missatges no enviats</string>
     <string name="room_delete_unsent_messages">Elimina els missatges no enviats</string>
     <string name="room_message_file_not_found">No s\'ha trobat el fitxer</string>
-    <string name="room_do_not_have_permission_to_post">No tens permís per publicar res en aquesta sala</string>
+    <string name="room_do_not_have_permission_to_post">No tens permís per publicar en aquesta sala.</string>
     <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Confia</string>
     <string name="ssl_do_not_trust">No hi confiïs</string>
@@ -1119,7 +1119,7 @@
     <string name="deactivate_account_prompt_password">Per a continuar, si us plau escriviu la vostra contrasenya:</string>
     <string name="deactivate_account_submit">Desactivar el compte</string>
     <string name="error_empty_field_your_password">Si us plau escriviu la vostra contrasenya.</string>
-    <string name="room_tombstone_versioned_description">Aquesta sala s\'ha substituït i ja no està activa</string>
+    <string name="room_tombstone_versioned_description">Aquesta sala s\'ha substituït i ja no està activa.</string>
     <string name="room_tombstone_continuation_link">El xat segueix aquí</string>
     <string name="room_tombstone_continuation_description">Aquesta sala és un continuació d\'un altre xat</string>
     <string name="room_tombstone_predecessor_link">Feu clic aquí per veure els missatges antics</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 5e8a852562..ca31bad408 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -29,7 +29,7 @@
     <string name="notice_room_visibility_shared">všechny členy místnosti.</string>
     <string name="notice_room_visibility_world_readable">kohokoliv.</string>
     <string name="notice_room_visibility_unknown">neznámým (%s).</string>
-    <string name="notice_end_to_end">%1$s zapnuli end-to-end šifrování (%2$s)</string>
+    <string name="notice_end_to_end">%1$s zapnuli koncové šifrování (%2$s)</string>
     <string name="notice_requested_voip_conference">%1$s požádali o VoIP konferenci</string>
     <string name="notice_voip_started">Začala VoIP konference</string>
     <string name="notice_voip_finished">VoIP konference skončila</string>
@@ -113,7 +113,7 @@
     <string name="notice_answered_call_by_you">Přijali jste hovor.</string>
     <string name="notice_ended_call_by_you">Ukončili jste hovor.</string>
     <string name="notice_made_future_room_visibility_by_you">Učinili jste budoucí historii místnosti viditelnou pro %1$s</string>
-    <string name="notice_end_to_end_by_you">Zapnuli jste end-to-end šifrování (%1$s)</string>
+    <string name="notice_end_to_end_by_you">Zapnuli jste koncové šifrování (%1$s)</string>
     <string name="notice_room_update_by_you">Povýšili jste tuto místnost.</string>
     <string name="notice_requested_voip_conference_by_you">Požádali jste o VoIP konferenci</string>
     <string name="notice_room_name_removed_by_you">Odstranili jste jméno místnosti</string>
@@ -190,10 +190,10 @@
     <string name="notice_room_guest_access_can_join_by_you">Povolili jste hostům vstoupit do místnosti.</string>
     <string name="notice_room_guest_access_forbidden">%1$s zamezili hostům vstoupit do místnosti.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Zamezili jste hostům vstoupit do místnosti.</string>
-    <string name="notice_end_to_end_ok">%1$s zapnuli end-to-end šifrování.</string>
-    <string name="notice_end_to_end_ok_by_you">Zapnuli jste end-to-end šifrování.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s zapnuli end-to-end šifrování (neznámý algoritmus %2$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Zapnuli jste end-to-end šifrování (neznámý algoritmus %1$s).</string>
+    <string name="notice_end_to_end_ok">%1$s zapnuli koncové šifrování.</string>
+    <string name="notice_end_to_end_ok_by_you">Zapnuli jste koncové šifrování.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s zapnuli koncové šifrování (neznámý algoritmus %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Zapnuli jste koncové šifrování (neznámý algoritmus %1$s).</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">Zamezili jste hostům vstoupit do této místnosti.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s zamezil hostům vstoupit do této místnosti.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">Povolili jste hostům vstoupit.</string>
@@ -910,7 +910,7 @@
 \nSync může být odložen v závislosti na zdrojích (baterie) nebo stavu zařízení (spánek).</string>
     <string name="settings_set_sync_delay">Prodleva mezi jednotlivými syncy</string>
     <string name="settings_version">Verze</string>
-    <string name="settings_olm_version">verze olm</string>
+    <string name="settings_olm_version">Verze olm</string>
     <string name="settings_app_term_conditions">Všeobecné podmínky</string>
     <string name="settings_third_party_notices">Oznámení třetích stran</string>
     <string name="settings_copyright">Vlastnická práva</string>
@@ -1067,8 +1067,8 @@
     <string name="room_settings_addresses_pref_title">Adresa</string>
     <string name="room_settings_labs_pref_title">Experimentální funkce</string>
     <string name="room_settings_labs_warning_message">Toto jsou experimentální funkce, které mohou selhat neočekávanými způsoby. Použijte obezřetně.</string>
-    <string name="room_settings_labs_end_to_end">Šifrování end-to-end</string>
-    <string name="room_settings_labs_end_to_end_is_active">Šifrování end-to-end je aktivní</string>
+    <string name="room_settings_labs_end_to_end">Koncové šifrování</string>
+    <string name="room_settings_labs_end_to_end_is_active">Koncové šifrování je aktivní</string>
     <string name="room_settings_labs_end_to_end_warnings">Pro aktivaci šifrování se musíte odhlásit.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Šifruj pouze do ověřených relací</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Nikdy neposílejte šifrované zprávy do neověřených relací v této místnosti z této relace.</string>
@@ -1093,7 +1093,7 @@
     <string name="directory_title">Adresář</string>
     <string name="settings_theme">Motiv vzhledu</string>
     <string name="failed_to_load_timeline_position">%s se pokusil načíst určitý okamžik v historii této místnosti, ale nemohl jej najít.</string>
-    <string name="encryption_information_title">Informace o šifrování end-to-end</string>
+    <string name="encryption_information_title">Informace o koncovém šifrování</string>
     <string name="encryption_information_device_info">Informace of události</string>
     <string name="encryption_information_user_id">Uživatelské id</string>
     <string name="encryption_information_curve25519_identity_key">Identifikační klíč Curve25519</string>
@@ -1393,7 +1393,7 @@
     <string name="template_keys_backup_passphrase_not_empty_error_message">Prosím, smažte přístupovou frázi, přejete-li si, aby ${app_name} generoval klíč pro obnovu.</string>
     <string name="keys_backup_no_session_error">Žádná relace Matrix není dostupná</string>
     <string name="keys_backup_setup_step1_title">Nikdy neztraťte šifrované zprávy</string>
-    <string name="keys_backup_setup_step1_description">Zprávy v šifrovaných místnostech jsou zabezpečeny pomocí end-to-end šifrováním. Pouze Vy a adresát(i) máte klíče ke čtení těchto zpráv.
+    <string name="keys_backup_setup_step1_description">Zprávy v šifrovaných místnostech jsou zabezpečeny pomocí koncového šifrování. Pouze Vy a adresát(i) máte klíče ke čtení těchto zpráv.
 \n
 \nKlíče bezpečně zálohujte, abyste je neztratili.</string>
     <string name="keys_backup_setup">Začít používat zálohu klíčů</string>
@@ -1490,7 +1490,7 @@
     <string name="sas_security_advise">Pro nejvyšší bezpečnost doporučujeme, abyste to provedli osobně nebo jiným způsobem důvěryhodné komunikace.</string>
     <string name="sas_verify_start_button_title">Začít ověření</string>
     <string name="sas_incoming_request_title">Příchozí požadavek na ověření</string>
-    <string name="sas_incoming_request_description">Ověřuji tuto relaci, abych ji označil za důvěryhodnou. Důvěřování relacím partnerů Vám dodá více klidu mysli, používáte-li end-to-end šifrované zprávy.</string>
+    <string name="sas_incoming_request_description">Ověřuji tuto relaci, abych ji označil za důvěryhodnou. Ověřování relací uživatelů vám dává větší jistotu, že je komunikace důvěrná.</string>
     <string name="sas_incoming_request_description_2">Ověření této relace ji označí za důvěryhodnou a také označí Vaši relaci důvěryhodnou Vašemu partnerovi.</string>
     <string name="sas_emoji_description">Ověřit tuto relaci potvrzením, že se následující emoji ukáže na obrazovce partnera</string>
     <string name="sas_decimal_description">Ověřit tuto relaci potvrzením, že se následující čísla ukážou na obrazovce partnera</string>
@@ -1499,7 +1499,7 @@
     <string name="sas_waiting_for_partner">Čekám na potvrzení od partnera…</string>
     <string name="sas_verified">Ověřeno!</string>
     <string name="sas_verified_successful">Úspěšně jste ověřili tuto relaci.</string>
-    <string name="sas_verified_successful_description">Zabezpečené zprávy s tímto uživatelem jsou end-to-end šifrovány a nemohou být čteny třetími stranami.</string>
+    <string name="sas_verified_successful_description">Zabezpečené zprávy s tímto uživatelem jsou koncově šifrovány a nemohou být čteny třetími stranami.</string>
     <string name="sas_got_it">Rozumím</string>
     <string name="sas_verifying_keys">Nic se neukazuje\? Dosud nepodporují všichni klienti interaktivní ověření. Použijte tradiční ověření.</string>
     <string name="sas_legacy_verification_button_title">Použijte tradiční ověření.</string>
@@ -1575,7 +1575,7 @@
     <string name="quick_reactions">Rychlé reakce</string>
     <string name="settings_general_title">Obecná</string>
     <string name="settings_preferences">Možnosti</string>
-    <string name="settings_security_and_privacy">Bezpečí a soukromí</string>
+    <string name="settings_security_and_privacy">Zabezpečení a soukromí</string>
     <string name="settings_expert">Expert</string>
     <string name="settings_push_rules">Push pravidla</string>
     <string name="settings_push_rules_no_rules">Žádná push pravidla nejsou definována</string>
@@ -1705,7 +1705,7 @@
     <string name="room_list_quick_actions_notifications_all_noisy">Všechny zprávy (hlučné)</string>
     <string name="room_list_quick_actions_notifications_all">Všechny zprávy</string>
     <string name="room_list_quick_actions_notifications_mentions">Pouze zmínky</string>
-    <string name="room_list_quick_actions_notifications_mute">Utišit</string>
+    <string name="room_list_quick_actions_notifications_mute">Ztlumit</string>
     <string name="room_list_quick_actions_settings">Nastavení</string>
     <string name="room_list_quick_actions_leave">Opustit místnost</string>
     <string name="notice_member_no_changes">%1$s neučinil žádné změny</string>
@@ -1756,7 +1756,7 @@
     <string name="login_reset_password_email_hint">Email</string>
     <string name="login_reset_password_password_hint">Nové heslo</string>
     <string name="login_reset_password_warning_title">Varování!</string>
-    <string name="login_reset_password_warning_content">Změna hesla přenastaví všechny end-to-end šifrovací klíče pro všechny Vaše relace, a tak učiní zašifrovanou historii chatů nečitelnou. Nastavte zálohu klíčů nebo exportujte své klíče místností z jiné relace, než se rozhodnete pokračovat.</string>
+    <string name="login_reset_password_warning_content">Změna hesla přenastaví všechny šifrovací klíče pro všechny Vaše relace, a tak učiní zašifrovanou historii chatů nečitelnou. Nastavte zálohu klíčů nebo exportujte své klíče místností z jiné relace, než se rozhodnete pokračovat.</string>
     <string name="login_reset_password_warning_submit">Pokračovat</string>
     <string name="login_reset_password_error_not_found">Tato emailová adresa se nevztahuje k žádnému účtu</string>
     <string name="login_reset_password_mail_confirmation_title">Nahlédněte do inboxu</string>
@@ -1856,7 +1856,7 @@
     <string name="devices_other_devices">Jiné relace</string>
     <string name="autocomplete_limited_results">Ukazuji jen první výsledky, zadejte více znaků…</string>
     <string name="settings_developer_mode_fail_fast_title">Fail-fast</string>
-    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} se může zbořit častěji, když se objeví neočekávané chyby</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} může spadnout častěji, když se objeví neočekávané chyby</string>
     <string name="command_description_shrug">Předsune ¯\\_(ツ)_/¯ do textové zprávy</string>
     <string name="create_room_encryption_title">Zapnout šifrování</string>
     <string name="create_room_encryption_description">Jakmile zapnuto, šifrování nelze vypnout.</string>
@@ -1902,8 +1902,8 @@
     <string name="verification_request_alert_description">Pro vyšší zabezpečení ověřte %s kontrolou jednorázového kódu na obou zařízeních.
 \n
 \nPro nejvyšší zabezpečení proveďte osobně.</string>
-    <string name="room_profile_not_encrypted_subtitle">Zprávy v této místnosti nejsou šifrovány end-to-end.</string>
-    <string name="room_profile_encrypted_subtitle">Zprávy v této místnosti jsou šifrovány end-to-end.
+    <string name="room_profile_not_encrypted_subtitle">Zprávy v této místnosti nejsou koncově šifrovány.</string>
+    <string name="room_profile_encrypted_subtitle">Zprávy v této místnosti jsou koncově šifrovány.
 \n
 \nVaše zprávy jsou zabezpečeny zámky a pouze Vy a příjemce máte jedinečné klíče k jejich odemknutí.</string>
     <string name="room_profile_section_security">Zabezpečení</string>
@@ -1940,7 +1940,7 @@
     <string name="command_description_rainbow_emote">Odešle daný emote zabarvený jako duha</string>
     <string name="settings_category_timeline">Časová osa</string>
     <string name="settings_category_composer">Editor zpráv</string>
-    <string name="room_settings_enable_encryption">Zapnout šifrování end-to-end…</string>
+    <string name="room_settings_enable_encryption">Zapnout koncové šifrování…</string>
     <string name="room_settings_enable_encryption_warning">Jakmile zapnuto, šifrování nelze vypnout.</string>
     <string name="room_settings_enable_encryption_dialog_title">Zapnout šifrování\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Jakmile zapnuto, šifrování místnosti nelze vypnout. Zprávy odeslané v zašifrované místnosti nemohou být čteny serverem, ale pouze účastníky místnosti. Zapnutím šifrování mohou boty a můstky přestat správně pracovat.</string>
@@ -1949,7 +1949,7 @@
     <string name="verification_request_start_notice">Za účelem bezpečnosti to proveďte osobně nebo použijte jiný způsob komunikace.</string>
     <string name="verification_emoji_notice">Porovnejte jedinečná emoji a ujistěte se, že se ukážou ve stejném pořadí.</string>
     <string name="verification_code_notice">Porovnejte kód s tím na obrazovce druhého uživatele.</string>
-    <string name="verification_conclusion_ok_notice">Zprávy s tímto uživatelem jsou zašifrovány end-to-end a nemohou být čteny třetími stranami.</string>
+    <string name="verification_conclusion_ok_notice">Zprávy s tímto uživatelem jsou koncově šifrovány a nemohou být čteny třetími stranami.</string>
     <string name="verification_conclusion_ok_self_notice">Vaše nová relace je nyní ověřena. Má přístup k Vašim zašifrovaným zprávám a ostatní uživatelé ji uvidi jako důvěryhodnou.</string>
     <string name="encryption_information_cross_signing_state">Křížový podpis</string>
     <string name="encryption_information_dg_xsigning_complete">Křížový podpis je zapnut.
@@ -2086,7 +2086,7 @@
 \nPokud nechcete nastavit bezpečnostní frázi pro zprávy, založte klíč pro zprávy.</string>
     <string name="bootstrap_skip_text_no_gen_key">Nastavení přístupové fráze pro obnovení Vám umožní zabezpečit a odemknout zašifrované zprávy a důvěryhodnost.</string>
     <string name="encryption_enabled">Šifrování zapnuto</string>
-    <string name="encryption_enabled_tile_description">Zprávy v této místnosti jsou end-to-end šifrovány. Zjistěte více a ověřte uživatele v jejich profilech.</string>
+    <string name="encryption_enabled_tile_description">Zprávy v této místnosti jsou koncově šifrovány. Zjistěte více a ověřte uživatele v jejich profilech.</string>
     <string name="encryption_not_enabled">Šifrování není zapnuto</string>
     <string name="encryption_unknown_algorithm_tile_description">Šifrování použité v této místnosti není podporováno</string>
     <string name="room_created_summary_item">%s založil a nastavil tuto místnost.</string>
@@ -2326,7 +2326,7 @@
     <string name="send_a_sticker">Nálepka</string>
     <string name="room_profile_section_admin">Akce správce</string>
     <string name="room_member_power_level_default_in">Výchozí v %1$s</string>
-    <string name="settings_hs_admin_e2e_disabled">Správce Vašeho serveru vypnul end-to-end šifrování jako výchozí v soukromých místnostech a přímých zprávách.</string>
+    <string name="settings_hs_admin_e2e_disabled">Správce vašeho serveru vypnul ve výchozím nastavení koncové šifrování v soukromých místnostech a přímých zprávách.</string>
     <string name="bootstrap_info_text_2">Zadejte přístupovou frázi, jež znáte pouze Vy, k zabezpečení klíčů na vašem serveru.</string>
     <string name="bootstrap_cancel_text">Pokud nyní přerušíte, mohli byste přijít o šifrované zprávy &amp; data, pokud ztratíte přístup k Vašemu účtu.
 \n
@@ -2365,7 +2365,7 @@
     <string name="notice_crypto_unable_to_decrypt_final">Nemůžete číst tuto zprávu</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Čekám na tuto zprávu, může to chvíli trvat</string>
     <string name="crypto_utd">Nelze dešifrovat</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Kvůli end-to-end šifrování se může stát, že budete muset počkat, než zpráva dorazí, protože šifrovací klíče Vám nebyly řádně zaslány.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Kvůli koncovému šifrování se může stát, že budete muset počkat, než zpráva dorazí, protože šifrovací klíče Vám nebyly řádně zaslány.</string>
     <string name="crypto_error_withheld_blacklisted">Nemůžete číst tuto zprávu, protože odesílatel Vás blokuje</string>
     <string name="crypto_error_withheld_unverified">Nemůžete číst tuto zprávu, protože Vaše relace není pro odesílatele důvěryhodná</string>
     <string name="crypto_error_withheld_generic">Nemůžete číst tuto zprávu, protože odesílatel účelově neposlal klíče</string>
@@ -2451,13 +2451,13 @@
     <string name="bad_passphrase_key_reset_all_action">Zapomněli nebo ztratili jste možnosti obnovení\? Resetovat vše</string>
     <string name="direct_room_created_summary_item_by_you">Vstoupili jste.</string>
     <string name="direct_room_created_summary_item">%s vstoupil.</string>
-    <string name="direct_room_encryption_enabled_tile_description">Zprávy v této místnosti jsou e2e šifrovány.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Zprávy v této místnosti jsou koncově šifrovány.</string>
     <string name="direct_room_profile_section_more_leave">Odejít</string>
     <string name="direct_room_profile_section_more_settings">Nastavení</string>
-    <string name="direct_room_profile_encrypted_subtitle">Zprávy zde jsou e2e šifrovány.
+    <string name="direct_room_profile_encrypted_subtitle">Zprávy zde jsou koncově šifrovány.
 \n
 \nVaše zprávy jsou zabezpečeny zámky a pouze Vy a příjemce máte jedinečné klíče k jejich odemknutí.</string>
-    <string name="direct_room_profile_not_encrypted_subtitle">Zprávy zde nejsou e2e šifrovány.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Zprávy zde nejsou koncově šifrovány.</string>
     <string name="login_error_outdated_homeserver_warning_content">Tento domovský server používá starou verzi. Požádejte správce svého domovského serveru o aktualizaci. Můžete pokračovat, ale některé funkce možná nebudou správně pracovat.</string>
     <string name="direct_room_join_rules_invite_by_you">Omezili jste na pouze pro pozvané.</string>
     <string name="direct_room_join_rules_invite">%1$s omezili na pouze pro pozvané.</string>
@@ -2647,7 +2647,7 @@
     <string name="call_tile_call_back">Zavolat zpět</string>
     <string name="call_tile_ended">Tento hovor skončil</string>
     <string name="call_tile_other_declined">%1$s odmítl tento hovor</string>
-    <string name="call_tile_you_declined">Odmítli jste tento hovor %1$s</string>
+    <string name="call_tile_you_declined">Odmítli jste tento hovor %s</string>
     <string name="call_tile_in_call">Aktuálně jste v tomto hovoru</string>
     <string name="call_tile_other_started_call">%1$s zahájil hovor</string>
     <string name="call_tile_you_started_call">Zahájili jste hovor</string>
@@ -2687,7 +2687,7 @@
     <string name="a11y_trust_level_default">Výchozí úroveň důvěryhodnosti</string>
     <string name="a11y_selected">Vybrané</string>
     <string name="a11y_video">Video</string>
-    <string name="a11y_unsent_draft">Tato místnost má neodeslaný koncept</string>
+    <string name="a11y_unsent_draft">má neodeslaný koncept</string>
     <string name="a11y_error_some_message_not_sent">Některé zprávy nebyly odeslány</string>
     <string name="a11y_delete_avatar">Smazat avatar</string>
     <string name="a11y_change_avatar">Změnit avatar</string>
@@ -2812,7 +2812,7 @@
     <string name="space_settings_manage_rooms">Správa místností</string>
     <string name="looking_for_someone_not_in_space">Hledáte někoho, kdo není v %s\?</string>
     <string name="user_invites_you">%s Vás zve</string>
-    <string name="a11y_public_room">Tato místnosti je veřejná</string>
+    <string name="a11y_public_room">Veřejná místnost</string>
     <string name="send_images_and_video_with_original_size">Poslat media v původní velikosti</string>
     <plurals name="send_videos_with_original_size">
         <item quantity="one">Poslat video v původní velikosti</item>
@@ -2832,7 +2832,6 @@
     <string name="spaces_no_server_support_title">Vypadá to, že váš domovský server zatím Prostory nepodporuje</string>
     <string name="spaces_feeling_experimental_subspace">Chcete experimentovat\?
 \nDo prostoru můžete přidat existující prostory.</string>
-    <string name="labs_space_show_orphan_in_home">Experimentální prostor - Zobrazit pouze sirotky v Domově</string>
     <string name="space_add_rooms">Přidat místnosti</string>
     <string name="space_leave_prompt_msg_as_admin">Jste administrátorem tohoto prostoru, ujistěte se, že jste před odchodem převedli administrátorská práva na jiného člena.</string>
     <string name="space_leave_prompt_msg_private">Tento prostor není veřejný. Bez pozvánky se do něj nebudete moci znovu připojit.</string>
@@ -2850,7 +2849,7 @@
     <string name="unnamed_room">Nepojmenovaná místnost</string>
     <string name="private_space">Soukromý prostor</string>
     <string name="public_space">Veřejný prostor</string>
-    <string name="a11y_public_space">Tento Prostor je veřejný</string>
+    <string name="a11y_public_space">Veřejný prostor</string>
     <string name="call_transfer_unknown_person">Neznámá osoba</string>
     <string name="call_transfer_transfer_to_title">Převod na %1$s</string>
     <string name="call_transfer_consulting_with">Konzultace s %1$s</string>
@@ -2873,7 +2872,7 @@
     <string name="upgrade_room_no_power_to_manage">K aktualizaci místnosti potřebujete oprávnění</string>
     <string name="upgrade_room_update_parent_space">Automaticky aktualizovat mateřský prostor</string>
     <string name="upgrade_room_auto_invite">Automaticky pozvat uživatele</string>
-    <string name="upgrade_public_room_from_to">Budete aktualizovat tuto místnost z %s na %s.</string>
+    <string name="upgrade_public_room_from_to">Budete aktualizovat tuto místnost z %1$s na %2$s.</string>
     <string name="upgrade_room_warning">Aktualizace místnosti je pokročilá akce a obvykle se doporučuje tehdy, je-li místnost nestabilní kvůli chybám, chybějícím funkcím nebo slabým místům v zabezpečení.
 \nObvykle má vliv pouze na to, jak server místnost zpracovává.</string>
     <string name="upgrade_private_room">Aktualizovat soukromou místnost</string>
@@ -2935,4 +2934,72 @@
     <string name="room_create_member_of_space_name_can_join">Členové prostoru %s mohou vyhledávat, prohlížet a připojovat se.</string>
     <string name="room_settings_room_access_private_invite_only_title">Soukromé (pouze pro pozvané)</string>
     <string name="denied_permission_voice_message">Chcete-li odesílat hlasové zprávy, povolte oprávnění mikrofonu.</string>
+    <string name="settings_room_upgrades">Aktualizace místnosti</string>
+    <string name="settings_messages_by_bot">Zprávy od bota</string>
+    <string name="settings_room_invitations">Pozvánky do místnosti</string>
+    <string name="settings_encrypted_group_messages">Šifrované skupinové zprávy</string>
+    <string name="settings_group_messages">Skupinové zprávy</string>
+    <string name="settings_encrypted_direct_messages">Šifrované přímé zprávy</string>
+    <string name="settings_messages_direct_messages">Přímé zprávy</string>
+    <string name="settings_messages_containing_username">Mé uživatelské jméno</string>
+    <string name="settings_messages_containing_display_name">Mé zobrazované jméno</string>
+    <string name="settings_notification_notify_me_for">Upozorněte mě na</string>
+    <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="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 najít 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 domovském zobrazení.</string>
+    <string name="preference_show_all_rooms_in_home">Zobrazit všechny místnosti v domovském zobrazení</string>
+    <string name="call_slide_to_end_conference">Posunutím ukončíte hovor</string>
+    <string name="call_tap_to_return">%1$s Klepněte pro návrat</string>
+    <string name="call_one_active">Probíhající hovor (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">Probíhající hovor ·</item>
+        <item quantity="few">%1$d probíhající hovory ·</item>
+        <item quantity="other">%1$d probíhajících hovorů ·</item>
+    </plurals>
+    <string name="call_tile_connection_failed">Připojení se nezdařilo</string>
+    <string name="call_tile_no_answer">Žádná odpověď</string>
+    <string name="call_tile_video_missed">Zmeškaný videohovor</string>
+    <string name="call_tile_voice_missed">Zmeškaný hlasový hovor</string>
+    <string name="call_tile_video_declined">Videohovor odmítnut</string>
+    <string name="call_tile_voice_declined">Hlasový hovor odmítnut</string>
+    <string name="call_tile_video_call_has_ended">Videohovor ukončen • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">Hlasový hovor ukončen • %1$s</string>
+    <string name="call_tile_video_active">Probíhající videohovor</string>
+    <string name="call_tile_voice_active">Probíhající hlasový hovor</string>
+    <string name="call_tile_video_incoming">Příchozí videohovor</string>
+    <string name="call_tile_voice_incoming">Příchozí hlasový hovor</string>
+    <string name="call_tile_you_declined_this_call">Tento hovor jste odmítli</string>
+    <string name="room_settings_room_notifications_account_settings">Nastavení účtu</string>
+    <string name="room_settings_room_notifications_manage_notifications">Oznámení můžete spravovat v %1$s.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Upozorňujeme, že upozornění na zmínky a klíčová slova nejsou v zašifrovaných místnostech k dispozici na mobilním zařízení.</string>
+    <string name="room_settings_room_notifications_notify_me">Upozorněte mě na</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Na mobilním zařízení nedostanete upozornění na zmínky a klíčová slova v zašifrovaných místnostech.</string>
+    <string name="settings_messages_containing_keywords">Klíčová slova</string>
+    <string name="settings_mentions_at_room">\@místnost</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Klíčová slova nemohou obsahovat \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">Klíčová slova nemohou začínat znakem \'.\'</string>
+    <string name="settings_notification_new_keyword">Přidat nové klíčové slovo</string>
+    <string name="settings_notification_your_keywords">Vaše klíčová slova</string>
+    <string name="room_settings_none">Žádné</string>
+    <string name="room_settings_mention_and_keyword_only">Pouze zmínky a klíčová slova</string>
+    <string name="call_remove_jitsi_widget_progress">Ukončení hovoru…</string>
+    <string name="call_ended_invite_timeout_title">Žádná odpověď</string>
+    <string name="call_ended_user_busy_description">Volaný uživatel je zaneprázdněn.</string>
+    <string name="call_ended_user_busy_title">Uživatel zaneprázdněn</string>
+    <string name="audio_call_with_participant">Hlasový hovor s %s</string>
+    <string name="video_call_with_participant">Videohovor s %s</string>
+    <string name="call_ringing">Vyzvánění…</string>
+    <string name="spaces">Prostory</string>
+    <string name="learn_more">Dozvědět se více</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 65e27a7f9f..bfa44cf467 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -252,9 +252,9 @@
     <string name="notice_room_server_acl_updated_no_change">Keine Änderung.</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Server, die mit IPs übereinstimmen, sind jetzt gesperrt.</string>
     <string name="notice_room_server_acl_updated_ip_literals_allowed">• Server, die mit IPs übereinstimmen, sind nicht erlaubt.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Server, die mit %s übereinstimmen, wurden von der Erlaubten-Liste entfernt.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Server, die mit %s übereinstimmen, wurden von der Liste der Erlaubten entfernt.</string>
     <string name="notice_room_server_acl_updated_allowed">• Server, die mit %s übereinstimmen, sind jetzt erlaubt.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Server, die mit %s übereinstimmen, werden von der Sperrliste entfernt.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Server, die mit %s übereinstimmen, wurden von der Sperrliste entfernt.</string>
     <string name="notice_room_server_acl_updated_banned">• Server, die mit %s übereinstimmen, sind jetzt gesperrt.</string>
     <string name="notice_room_server_acl_updated_title_by_you">Du hast die Server-ACL für diesen Raum geändert.</string>
     <string name="notice_room_server_acl_updated_title">%s hat die Server-Zugriffssteuerungsliste (ACL) für diesen Raum geändert.</string>
@@ -317,7 +317,7 @@
     <string name="action_video_call">Videoanruf</string>
     <string name="action_global_search">Globale Suche</string>
     <string name="action_mark_all_as_read">Alle als gelesen markieren</string>
-    <string name="action_historical">Historisch</string>
+    <string name="action_historical">Archiv</string>
     <string name="action_quick_reply">Antworten</string>
     <string name="action_open">Öffnen</string>
     <string name="action_close">Schließen</string>
@@ -923,7 +923,7 @@
     <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 führt zu einem Ausschluss eines Nutzers von diesem Raum und verhindert einen erneuten Beitritt.</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_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>
@@ -1079,7 +1079,7 @@
     <string name="command_description_nick">Ändert deinen Anzeigenamen</string>
     <string name="command_description_markdown">(De-)Aktiviert Markdown</string>
     <string name="command_description_clear_scalar_token">Um das Matrix-App-Management zu reparieren</string>
-    <string name="room_tombstone_versioned_description">Dieser Raum wurde ersetzt und ist nicht länger aktiv</string>
+    <string name="room_tombstone_versioned_description">Dieser Raum wurde ersetzt und ist nicht länger aktiv.</string>
     <string name="room_tombstone_continuation_link">Die Konversation wird hier fortgesetzt</string>
     <string name="room_tombstone_continuation_description">Dieser Raum ist die Fortsetzung einer anderen Konversation</string>
     <string name="room_tombstone_predecessor_link">Klicke hier um die älteren Nachrichten zu sehen</string>
@@ -1199,8 +1199,8 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Abfragen des FCM-Tokens fehlgeschlagen:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_token_registration_success">FCM-Token erfolgreich beim Home-Server registriert.</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">FCM-Token konnte nicht beim Home-Server registriert werden:
+    <string name="settings_troubleshoot_test_token_registration_success">FCM-Token erfolgreich beim Homeserver registriert.</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">FCM-Token konnte nicht beim Homeserver registriert werden:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_foreground_service_started_title">Benachrichtigungsdienst</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Benachrichtigungsdienst läuft.</string>
@@ -1409,7 +1409,7 @@
     <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="settings_notification_privacy_no_background_sync">Die App braucht sich <b>nicht</b> im Hintergrund mit dem Home-Server verbinden, dies sollte die Akkunutzung reduzieren</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>
         <item quantity="other">%1$s: %2$d Nachrichten</item>
@@ -1438,7 +1438,7 @@
     <string name="start_verification_short_label">Verifizieren</string>
     <string name="share_without_verifying_short_label">Teilen</string>
     <string name="ignore_request_short_label">Ignorieren</string>
-    <string name="keys_backup_setup_override_backup_prompt_tile">Auf deinem Home-Server existiert bereits eine Sicherung</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">Auf deinem Homeserver existiert bereits ein Backup</string>
     <string name="keys_backup_setup_override_replace">Ersetzen</string>
     <string name="keys_backup_setup_override_stop">Stopp</string>
     <string name="keys_backup_settings_checking_backup_state">Überprüfe Sicherungsstatus</string>
@@ -2074,7 +2074,7 @@
 \n- Die Internetverbindung, die von den Geräten genutzt wird
 \n
 \nWir empfehlen dir dein Passwort &amp; Wiederherstellungsschlüssel in den Einstellungen sofort zu ändern.</string>
-    <string name="verify_cancelled_notice">Verifiziere deine Geräte in den Einstellungen.</string>
+    <string name="verify_cancelled_notice">Verifizierung abgebrochen. Du kannst sie erneut starten.</string>
     <string name="verification_cancelled">Verifizierung abgebrochen</string>
     <string name="generate_message_key">Generiere einen Nachrichtenschlüssel</string>
     <string name="confirm_recovery_passphrase">Bestätige %s</string>
@@ -2236,9 +2236,9 @@
     <string name="room_participants_action_cancel_invite_prompt_msg">Bist du dir sicher, dass du die Einladung für diesen Benutzer zurückziehen möchtest\?</string>
     <string name="room_participants_kick_title">Benutzer entfernen</string>
     <string name="room_participants_kick_reason">Grund für das Entfernen</string>
-    <string name="room_participants_kick_prompt_msg">Das Entfernen wird den Benutzer von diesem Raum ausschließen.
+    <string name="room_participants_kick_prompt_msg">Du entfernst diese Person aus dem Raum.
 \n
-\nUm einen erneuten Beitritt zu verhindern, solltest du ihn stattdessen bannen.</string>
+\nBanne sie stattdessen, um erneutes Beitreten zu verhindern.</string>
     <string name="room_participants_ban_title">Benutzer bannen</string>
     <string name="room_participants_ban_reason">Grund für den Bann</string>
     <string name="room_participants_unban_title">Bann des Benutzers aufheben</string>
@@ -2572,7 +2572,7 @@
     <string name="create_room_disable_federation_title">Begrenze Zugang zu diesem Raum (für immer!) auf Mitglieder von %s</string>
     <string name="attachment_viewer_item_x_of_y">%1$d von %2$d</string>
     <string name="a11y_create_direct_message_by_qr_code">QR-Code scannen, um eine neue Direktnachricht schicken</string>
-    <string name="identity_server_consent_dialog_content">Um bestehende Kontakte zu finden, ist es notwendig, Ihre Kontaktdaten (Telefonnummern und/oder E-Mails) mit dem ausgewählten Identitätsserver (%1$s) zu teilen.
+    <string name="identity_server_consent_dialog_content">Um bestehende Kontakte zu finden, musst du deine Kontaktdaten (Telefonnummern und/oder E-Mails) mit dem ausgewählten Identitätsserver (%1$s) zu teilen.
 \n
 \nFür mehr Datenschutz werden die gesendeten Daten vor dem Versenden gehasht.</string>
     <string name="room_preview_no_preview_join">Keine Vorschau für diesen Raum verfügbar. Willst du direkt beitreten\?</string>
@@ -2805,7 +2805,7 @@
     <string name="add_space">Space hinzufügen</string>
     <string name="command_description_create_space">Space erstellen</string>
     <string name="room_settings_room_access_restricted_description">Jeder, der sich in einem Space mit diesem Raum befindet, kann diesen Raum finden und ihm beitreten. Nur die Administratoren des Raums können diesen zu einem Space hinzufügen.</string>
-    <string name="room_settings_room_access_restricted_title">Spaces</string>
+    <string name="room_settings_room_access_restricted_title">Nur Space-Mitglieder</string>
     <plurals name="space_people_you_know">
         <item quantity="one">%d Person, die du kennst, ist bereits beigetreten</item>
         <item quantity="other">%d Personen, die du kennst, sind bereits beigetreten</item>
@@ -2842,7 +2842,6 @@
     <string name="this_space_has_no_rooms_not_admin">Möglicherweise musst du extra eingeladen werden, damit du die Räume siehst.
 \nDie fehlt die Berechtigung, Räume hinzuzufügen.</string>
     <string name="spaces_feeling_experimental_subspace">Du kannst Unterspaces zu einem Space hinzufügen.</string>
-    <string name="labs_space_show_orphan_in_home">Experimentelle Spaces - Nur verweiste Räume auf Startseite</string>
     <string name="error_jitsi_join_conf">Leider ist ein Fehler beim Betreten der Konferenz aufgetreten</string>
     <string name="unnamed_room">Unbenannter Raum</string>
     <string name="this_space_has_no_rooms">Dieser Space hat noch keine Räume</string>
@@ -2884,4 +2883,79 @@
     <string name="settings_server_room_version_unstable">instabil</string>
     <string name="settings_server_room_versions">Raumversionen 👓</string>
     <string name="missing_permissions_title">Fehlende Berechtigungen</string>
+    <string name="upgrade_room_for_restricted_note">Beachte, dass das Raumupgrade einen neuen Raum erstellt. Alte Nachrichten verbleiben in diesem archivierten Raum.</string>
+    <string name="upgrade_room_for_restricted">Alle in %s können diesen Raum finden und betreten - du musst niemanden mehr manuell einladen. Du kannst dies jederzeit in den Raumeinstellungen ändern.</string>
+    <string name="voice_message_reply_content">Sprachnachricht (%1$s)</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Antworten und Bearbeiten ist während einer aktiven Sprachnachricht nicht möglich</string>
+    <string name="error_voice_message_unable_to_record">Fehler beim Aufnehmen der Sprachnachricht</string>
+    <string name="error_voice_message_unable_to_play">Sprachnachricht kann nicht abgespielt werden</string>
+    <string name="labs_use_voice_message">Sprachnachrichten</string>
+    <string name="voice_message_tap_to_stop_toast">Klicke, um die Aufnahme zu starten oder stoppen</string>
+    <string name="voice_message_n_seconds_warning_toast">%1$ds übrig</string>
+    <string name="voice_message_release_to_send_toast">Zum Aufnehmen drücken, zum Senden loslassen</string>
+    <string name="a11y_delete_recorded_voice_message">Aufgenommene Sprachnachricht löschen</string>
+    <string name="a11y_recording_voice_message">Sprachnachricht wird aufgenommen</string>
+    <string name="a11y_pause_voice_message">Sprachnachricht pausieren</string>
+    <string name="a11y_play_voice_message">Sprachnachricht abspielen</string>
+    <string name="a11y_lock_voice_message">Sprachnachricht einrasten</string>
+    <string name="a11y_start_voice_message">Sprachnachricht starten</string>
+    <string name="room_using_unstable_room_version">Dieser Raum verwendet die Raumversion %s, die von diesem Heimserver als instabil markiert ist.</string>
+    <string name="upgrade_room_no_power_to_manage">Du benötigst die Berechtigung, um einen Raum upzugraden</string>
+    <string name="upgrade_room_update_parent_space">Übergeordneten Space automatisch updaten</string>
+    <string name="upgrade_room_auto_invite">Benutzer automatisch einladen</string>
+    <string name="upgrade_public_room_from_to">Du upgradest diesen Raum von %1$s zu %2$s.</string>
+    <string name="upgrade_room_warning">Das Raumupgrade ist eine erweiterte Option und ist empfohlen wenn sich der Raum instabil verhält, von Sicherheitslücken betroffen ist oder Features fehlen.
+\nNormalerweise ändert sich dadurch nur wie der Raum am Server verarbeitet wird.</string>
+    <string name="upgrade_private_room">Privaten Raum upgraden</string>
+    <string name="upgrade_public_room">Öffentlichen Raum upgraden</string>
+    <string name="upgrade_required">Upgrade benötigt</string>
+    <string name="upgrade">Upgraden</string>
+    <string name="it_may_take_some_time">Bitte hab Geduld, dies kann einige Zeit dauern.</string>
+    <string name="settings_server_default_room_version">Vorgeschlagene Version</string>
+    <string name="verification_scan_self_emoji_subtitle">Stattdessen mit Emojis vergleichen</string>
+    <string name="verification_scan_with_this_device">Mit diesem Gerät scannen</string>
+    <string name="verification_scan_self_notice">Scanne den Code mit einem anderen Gerät oder umgekehrt</string>
+    <string name="sent_a_voice_message">Sprachnachricht</string>
+    <string name="decide_who_can_find_and_join">Lege fest, wer diesen Raum finden und betreten kann.</string>
+    <string name="tap_to_edit_spaces">Klicke, um die Spaces zu bearbeiten</string>
+    <string name="select_spaces">Spaces auswählen</string>
+    <string name="room_create_member_of_space_name_can_join">Mitglieder von %s können Räume finden, betrachten und betreten.</string>
+    <string name="room_settings_room_access_private_invite_only_title">Privat (Zutritt nur mit Einladung)</string>
+    <string name="settings_room_upgrades">Raumupgrades</string>
+    <string name="settings_messages_by_bot">Nachrichten von Bots</string>
+    <string name="settings_room_invitations">Raumeinladungen</string>
+    <string name="settings_encrypted_group_messages">Verschlüsselten Gruppenchats</string>
+    <string name="settings_group_messages">Gruppenchats</string>
+    <string name="settings_encrypted_direct_messages">Verschlüsselten Direktnachrichten</string>
+    <string name="settings_messages_direct_messages">Direktnachrichten</string>
+    <string name="settings_messages_containing_username">Nachrichten mit meinem Benutzernamen</string>
+    <string name="settings_messages_containing_display_name">Nachrichten mit meinem Anzeigenamen</string>
+    <string name="settings_notification_notify_me_for">Benachrichtige mich bei</string>
+    <string name="settings_notification_other">Andere</string>
+    <string name="settings_notification_mentions_and_keywords">Erwähnungen und Schlüsselwörter</string>
+    <string name="settings_notification_default">Normale Benachrichtigungen</string>
+    <plurals name="missed_video_call">
+        <item quantity="one">Verpasster Videoanruf</item>
+        <item quantity="other">%d verpasste Videoanrufe</item>
+    </plurals>
+    <plurals name="missed_audio_call">
+        <item quantity="one">Verpasster Sprachanruf</item>
+        <item quantity="other">%d verpasste Sprachanrufe</item>
+    </plurals>
+    <string name="hs_client_url">Heimserver API URL</string>
+    <string name="denied_permission_voice_message">Um Sprachnachrichten zu senden, erlaube bitte Zugriff aufs Mikrofon.</string>
+    <string name="denied_permission_camera">Um fortzufahren, erlaube bitte in den Systemeinstellungen Zugriff auf die Kamera.</string>
+    <string name="denied_permission_generic">Für diese Aktion fehlen einige Berechtigungen, bitte erlaube diese in den Systemeinstellungen.</string>
+    <string name="voice_message_slide_to_cancel">Wische zum Abbrechen</string>
+    <string name="spaces_which_can_access">Spaces mit Zugriff auf</string>
+    <string name="allow_space_member_to_find_and_access">Space-Mitgliedern Auffinden und Zugriff erlauben.</string>
+    <string name="upgrade_room_for_restricted_no_param">Alle im übergeordneten Space haben Zugriff auf den Raum - es ist nicht nötig jeden einzeln einzuladen. Du kannst dies in den Raumeinstellungen jederzeit ändern.</string>
+    <string name="allow_anyone_in_room_to_access">Allen in %s Zugriff erlauben. Du auch mehrere Spaces auswählen.</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Andere Spaces oder Räume die du kennst</string>
+    <string name="space_you_know_that_contains_this_room">Spaces mit diesem Raum und dir als Mitglied</string>
+    <string name="room_settings_mention_and_keyword_only">Nur Erwähnungen &amp; Schlüsselwörter</string>
+    <string name="call_remove_jitsi_widget_progress">Auflegen…</string>
+    <string name="audio_call_with_participant">Sprachanruf mit %s</string>
+    <string name="video_call_with_participant">Videoanruf mit %s</string>
+    <string name="learn_more">Mehr erfahren</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 36ba941734..e7ede2e900 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -1495,7 +1495,7 @@
     <string name="lock_screen_hint">Tajpu ĉi tie…</string>
     <string name="directory_server_native_rooms">Ĉiuj propraj ĉambroj de %s</string>
     <string name="directory_server_all_rooms_on_server">Ĉiuj ĉambroj de servilo %s</string>
-    <string name="directory_server_placeholder">URL de hejmservilo</string>
+    <string name="directory_server_placeholder">Nomo de servilo</string>
     <string name="directory_server_fail_to_retrieve_server">La servilo eble estas nedisponebla aŭ troŝarĝita</string>
     <string name="unknown_devices_alert_message">Ĉi tiu ĉambro enhavas nekonatajn salutaĵojn, kiuj ne estas kontrolitaj.
 \nTio signifas, ke nenio garantias, ke la salutaĵoj apartenas al la pretendataj uzantoj.
@@ -1788,7 +1788,7 @@
     <string name="room_tombstone_predecessor_link">Klaku ĉi tien por vidi pli malnovajn mesaĝojn</string>
     <string name="room_tombstone_continuation_description">Ĉi tiu ĉambro estas la daŭrigo de alia interparolo</string>
     <string name="room_tombstone_continuation_link">La interparolo daŭras ĉi tie</string>
-    <string name="room_tombstone_versioned_description">Ĉi tiu ĉambro estis anstataŭigita kaj ne plu aktivas</string>
+    <string name="room_tombstone_versioned_description">Ĉi tiu ĉambro estis anstataŭigita kaj ne plu aktivas.</string>
     <string name="error_empty_field_your_password">Bonvolu enigi vian pasvorton.</string>
     <string name="error_empty_field_enter_user_name">Bonvolu enigi uzantonomon.</string>
     <string name="deactivate_account_submit">Malaktivigi konton</string>
@@ -2190,7 +2190,7 @@
     <string name="message_key">Ŝlosilo de mesaĝoj</string>
     <string name="recovery_passphrase">Rehava pasfrazo</string>
     <string name="verification_cancelled">Kontrolo nuliĝis</string>
-    <string name="verify_cancelled_notice">Kontrolu viajn aparatojn per la agordoj.</string>
+    <string name="verify_cancelled_notice">Kontrolo nuliĝis. Vi povas rekomenci ĝin.</string>
     <string name="verify_not_me_self_verification">La sekureco de unu el la sekvaj povus esti rompita:
 \n
 \n- Via pasvorto
@@ -2529,9 +2529,9 @@
     <string name="invite_friends">Inviti amikojn</string>
     <string name="add_people">Aldoni personojn</string>
     <string name="failed_to_initialize_cross_signing">Malsukcesis agordi delegajn subskribojn</string>
-    <string name="default_message_emote_snow">sendas neĝon ❄️</string>
+    <string name="default_message_emote_snow">sendas neĝadon ❄️</string>
     <string name="default_message_emote_confetti">sendas konfetojn 🎉</string>
-    <string name="command_snow">Sendas la donitan mesaĝon kun neĝo</string>
+    <string name="command_snow">Sendas la donitan mesaĝon kun neĝado</string>
     <string name="command_confetti">Sendas la donitan mesaĝon kun konfetoj</string>
     <string name="topic_prefix">"Temo: "</string>
     <string name="add_a_topic_link_text">Aldonu temon</string>
@@ -2603,7 +2603,7 @@
     <string name="feedback_failed">Malsukcesis sendi la prikomentojn (%s)</string>
     <string name="feedback_sent">Dankon, viaj prikomentoj sendiĝis sukcese</string>
     <string name="room_settings_room_access_restricted_description">Ĉiu ajn en aro kun ĉi tiu ĉambro povas ĝin trovi kaj aliĝi. Nur administrantoj de ĉi tiu ĉambro povas ĝin arigi.</string>
-    <string name="room_settings_room_access_restricted_title">Aroj</string>
+    <string name="room_settings_room_access_restricted_title">Nur aranoj</string>
     <string name="room_settings_room_access_public_description">Ĉiu ajn povas trovi kaj aliĝi la ĉambron</string>
     <string name="room_settings_room_access_public_title">Publika</string>
     <string name="room_settings_room_access_private_description">Nur invititoj povas trovi kaj aliĝi</string>
@@ -2656,7 +2656,6 @@
     <string name="spaces_no_server_support_title">Ŝajnas, ke via hejmservilo ankoraŭ ne subtenas arojn</string>
     <string name="spaces_feeling_experimental_subspace">Ĉu vi eksperimentemas\?
 \nVi povas arigi jamajn arojn.</string>
-    <string name="labs_space_show_orphan_in_home">Eksperimenta aro – montri nur orfojn en la Hejmo</string>
     <string name="space_manage_rooms_and_spaces">Administri ĉambrojn kaj arojn</string>
     <string name="space_mark_as_not_suggested">Marki nerekomendita</string>
     <string name="space_mark_as_suggested">Marki rekomendita</string>
@@ -2779,4 +2778,96 @@
     <string name="a11y_delete_avatar">Forigi profilbildon</string>
     <string name="a11y_change_avatar">Ŝanĝi profilbildon</string>
     <string name="a11y_image">Bildo</string>
+    <string name="upgrade_room_for_restricted_note">Bonvolu scii, ke gradaltigo kreos novan version de la ĉambro. Ĉiuj nunaj mesaĝoj restos en ĉi tiu arĥivita ĉambro.</string>
+    <string name="upgrade_room_for_restricted">Ĉiu en %s povos trovi ĉi tiun ĉambron kaj aliĝi al ĝi – ne necesas permane ĉiun inviti. Vi povos ŝanĝi tion en agordoj de la ĉambro iam ajn.</string>
+    <string name="voice_message_reply_content">Voĉmesaĝo (%1$s)</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Ne povas respondi aŭ redakti dum voĉmesaĝo aktivas</string>
+    <string name="error_voice_message_unable_to_record">Ne povas registri voĉmesaĝon</string>
+    <string name="error_voice_message_unable_to_play">Ne povas ludi ĉi tiun voĉmesaĝon</string>
+    <string name="labs_use_voice_message">Ŝalti voĉmesaĝojn</string>
+    <string name="voice_message_tap_to_stop_toast">Tuŝetu vian registraĵon por haltigi aŭ aŭskulti ĝin</string>
+    <string name="voice_message_n_seconds_warning_toast">%1$ds restas</string>
+    <string name="voice_message_release_to_send_toast">Tenu por registri, lasu por sendi</string>
+    <string name="a11y_delete_recorded_voice_message">Forigi registritan voĉmesaĝon</string>
+    <string name="a11y_pause_voice_message">Paŭzigi voĉmesaĝon</string>
+    <string name="a11y_play_voice_message">Ludi voĉmesaĝon</string>
+    <string name="voice_message_slide_to_cancel">Ŝovu por nuligi</string>
+    <string name="a11y_start_voice_message">Komenci voĉmesaĝon</string>
+    <string name="error_failed_to_join_room">Pardonu, eraris aliĝo: %s</string>
+    <string name="room_upgrade_to_recommended_version">Gradaltigi al rekomendata versio de ĉambro</string>
+    <string name="room_using_unstable_room_version">Ĉi tiu ĉambro estas de versio %s, kiun la hejmservilo markis malstabila.</string>
+    <string name="allow_anyone_in_room_to_access">Rajtigi ĉiun en %s trovi kaj aliri. Vi povas elekti ankaŭ aliajn arojn.</string>
+    <string name="upgrade_room_no_power_to_manage">Vi bezonas permeson gradaltigi ĉambron</string>
+    <string name="upgrade_room_auto_invite">Memage inviti uzantojn</string>
+    <string name="upgrade_public_room_from_to">Vi gradaltigos ĉi tiun ĉambron de %1$s al %2$s.</string>
+    <string name="upgrade_room_warning">Gradaltigo de ĉambro estas altnivela ago, kiu ofte estas rekomendata kiam ĉambro malfirmas pro eraroj, manko de funkcioj, aŭ sekurecaj misoj.
+\nĈi tio kutime nur influas la servilflankan traktadon de la ĉambro.</string>
+    <string name="upgrade_private_room">Gradaltigi privatan ĉambron</string>
+    <string name="upgrade_public_room">Gradaltigi publikan ĉambron</string>
+    <string name="upgrade_required">Necesas gradaltigo</string>
+    <string name="upgrade">Gradaltigi</string>
+    <string name="it_may_take_some_time">Bonvolu pacienci, ĝi povas iom daŭri.</string>
+    <string name="joining_replacement_room">Aliĝi al anstataŭa ĉambro</string>
+    <string name="unnamed_room">Sennoma ĉambro</string>
+    <string name="private_space">Privata aro</string>
+    <string name="public_space">Publika aro</string>
+    <string name="command_description_upgrade_room">Gradaltigas ĉambron al nova versio</string>
+    <string name="a11y_public_space">Ĉi tiu aro estas publika</string>
+    <string name="re_authentication_activity_title">Necesas aŭtentikiĝo rea</string>
+    <string name="call_transfer_unknown_person">Nekonata persono</string>
+    <string name="call_transfer_transfer_to_title">Transdonante al %1$s</string>
+    <string name="call_transfer_consulting_with">Konsultante kun %1$s</string>
+    <string name="call_transfer_connect_action">Konekti</string>
+    <string name="settings_server_room_version_unstable">nestabila</string>
+    <string name="settings_server_room_version_stable">stabila</string>
+    <string name="settings_server_default_room_version">Implicita versio</string>
+    <string name="settings_server_room_versions">Versioj de ĉambro 👓</string>
+    <string name="verification_scan_self_emoji_subtitle">Kontroli per bildosignoj anstataŭe</string>
+    <string name="verification_scan_with_this_device">Skani per ĉi tiu aparato</string>
+    <string name="verification_scan_self_notice">Skanu la kodon per alia via aparato, aŭ baskulu kaj skanu per ĉi tiu aparato</string>
+    <string name="sent_a_voice_message">Voĉo</string>
+    <string name="create_space_alias_hint">Adreso de aro</string>
+    <string name="directory_add_a_new_server_error_already_added">Ĉi tiu servilo jam estas en la listo</string>
+    <string name="directory_add_a_new_server_error">Ne povas trovi ĉi tiun servilon aŭ ĝian liston de ĉambroj</string>
+    <string name="directory_add_a_new_server_prompt">Enigu nomon de nova servilo, kiun vi volas esplori.</string>
+    <string name="directory_add_a_new_server">Aldoni novan servilon</string>
+    <string name="directory_your_server">Via servilo</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Aliaj aroj aŭ ĉambroj, kiujn vi eble ne konas</string>
+    <string name="decide_who_can_find_and_join">Decidu, kiu povas trovi la ĉambron kaj aliĝi al ĝi.</string>
+    <string name="tap_to_edit_spaces">Tuŝetu por redakti arojn</string>
+    <string name="select_spaces">Elekti arojn</string>
+    <string name="decide_which_spaces_can_access">Decidu, kiuj aroj povas aliri al ĉi tiu ĉambro. Anoj de elektitaj aroj povos trovi nomon de la ĉambro kaj aliĝi al ĝi.</string>
+    <string name="spaces_which_can_access">Aroj kun aliro</string>
+    <string name="allow_space_member_to_find_and_access">Permesi al aranoj trovi kaj aliri.</string>
+    <string name="room_create_member_of_space_name_can_join">Anoj de aro %s povas trovi, antaŭrigardi, kaj aliĝi.</string>
+    <string name="room_settings_room_access_private_invite_only_title">Privata (nur por invititoj)</string>
+    <string name="space_settings_alias_subtitle">Vidi kaj administri adresojn de ĉi tiu aro.</string>
+    <string name="space_settings_alias_title">Adresoj de aro</string>
+    <string name="settings_room_upgrades">Gradaltigoj de ĉambroj</string>
+    <string name="settings_messages_by_bot">Mesaĝoj de robotoj</string>
+    <string name="settings_room_invitations">Invitoj al ĉambroj</string>
+    <string name="settings_encrypted_group_messages">Grupaj babiloj ĉifritaj</string>
+    <string name="settings_group_messages">Grupaj babiloj</string>
+    <string name="settings_encrypted_direct_messages">Individuaj babiloj ĉifritaj</string>
+    <string name="settings_messages_direct_messages">Individuaj babiloj</string>
+    <string name="settings_messages_containing_username">Mesaĝoj enhavantaj mian uzantonomon</string>
+    <string name="settings_messages_containing_display_name">Mesaĝoj enhavantaj mian prezentan nomon</string>
+    <string name="settings_notification_notify_me_for">Sciigu min pri</string>
+    <string name="settings_notification_other">Aliaj</string>
+    <string name="settings_notification_mentions_and_keywords">Mencioj kaj ĉefvortoj</string>
+    <string name="settings_notification_default">Implicitaj sciigoj</string>
+    <string name="continue_anyway">Tamen daŭrigi</string>
+    <plurals name="missed_video_call">
+        <item quantity="one">Nerespondita vidvoko</item>
+        <item quantity="other">%d neresponditaj vidvokoj</item>
+    </plurals>
+    <plurals name="missed_audio_call">
+        <item quantity="one">Nerespondita voĉvoko</item>
+        <item quantity="other">%d neresponditaj voĉvokoj</item>
+    </plurals>
+    <string name="hs_client_url">URL de API de hejmservilo</string>
+    <string name="missing_permissions_title">Mankas permesoj</string>
+    <string name="denied_permission_voice_message">Por sendi voĉmesaĝojn, bonvolu doni permeson uzi mikrofonon.</string>
+    <string name="denied_permission_camera">Por ĉi tiu ago, vi bezonas permeson uzi filmilon de la sistemaj agordoj.</string>
+    <string name="denied_permission_generic">Iuj permesoj necesaj por ĉi tiu ago mankas. Bonvolu doni la permesojn per la sistemaj agordoj.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 5e5b4727e6..7d7a24febe 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -2001,7 +2001,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_phone_numbers">Numeros telefonicos</string>
     <string name="settings_emails_and_phone_numbers_title">Correos y numeros telefonicos</string>
     <string name="settings_emails_and_phone_numbers_summary">Administre el correo y numero telefonico de su cuenta</string>
-    <string name="settings_show_redacted">Mostrar mensages eliminados</string>
+    <string name="settings_show_redacted">Mostrar mensajes eliminados</string>
     <string name="settings_show_redacted_summary">Indicar marca de mensaje eliminado</string>
     <string name="uploads_files_title">ARCHIVOS</string>
     <string name="uploads_files_no_result">No se han subido archivos a la sala</string>
@@ -2625,11 +2625,11 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="space_explore_activity_title">Explorar salas</string>
     <string name="join_anyway">Unirte igualmente</string>
     <string name="skip_for_now">Saltar por ahora</string>
-    <string name="invite_just_to_this_room">Solo esta sala</string>
+    <string name="invite_just_to_this_room">Sólo a esta sala</string>
     <string name="invite_to_space_with_name">Invitar a %s</string>
     <string name="invite_by_link">Compartir enlace</string>
     <string name="invite_by_mxid">Invitar por nombre de usuario</string>
-    <string name="invite_by_email">Invitar por correo</string>
+    <string name="invite_by_email">Invitar por correo electrónico</string>
     <string name="invite_to_space">Invitar a %s</string>
     <string name="invite_people_to_your_space">Invitar gente a tu espacio</string>
     <string name="invite_people_menu">Invitar gente</string>
@@ -2637,12 +2637,12 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="create_spaces_loading_message">Creando espacio…</string>
     <string name="create_spaces_default_public_random_room_name">Aleatorio</string>
     <string name="create_spaces_default_public_room_name">General</string>
-    <string name="create_spaces_room_private_header">En que cosas estas trabajando\?</string>
+    <string name="create_spaces_room_private_header">¿En qué cosas estás trabajando\?</string>
     <string name="create_space_error_empty_field_space_name">Dale un nombre para continuar.</string>
-    <string name="space_type_private_desc">Solo por invitación, lo mejor para tu mismo o para equipos</string>
+    <string name="space_type_private_desc">Solo por invitación, mejor para ti mismo o para equipos</string>
     <string name="space_type_private">Privado</string>
-    <string name="space_type_public_desc">Abierto a cualquiera, lo mejor para comunidades</string>
-    <string name="space_type_public">Publico</string>
+    <string name="space_type_public_desc">Abierto a cualquiera, mejor para comunidades</string>
+    <string name="space_type_public">Público</string>
     <string name="create_spaces_me_and_teammates">Yo y mis compañeros</string>
     <string name="create_spaces_just_me">Solo yo</string>
     <string name="your_private_space">Tu espacio privado</string>
@@ -2651,7 +2651,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="event_status_a11y_failed">Falló</string>
     <string name="event_status_a11y_sent">Enviado</string>
     <string name="event_status_a11y_sending">Enviando</string>
-    <string name="dev_tools_success_event">Evento enviado!</string>
+    <string name="dev_tools_success_event">¡Evento enviado!</string>
     <string name="dev_tools_event_content_hint">Contenido del evento</string>
     <string name="dev_tools_error_malformed_event">Evento malformado</string>
     <string name="dev_tools_error_no_content">Sin contenido</string>
@@ -2771,4 +2771,153 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="event_status_sent_message">Mensaje enviado</string>
     <string name="initial_sync_start_downloading">Sincronización inicial:
 \nDescargando datos…</string>
+    <string name="decide_who_can_find_and_join">Decide quién puede unirse a esta sala.</string>
+    <string name="tap_to_edit_spaces">Toca para editar espacios</string>
+    <string name="select_spaces">Selecciona espacios</string>
+    <string name="decide_which_spaces_can_access">Decide qué espacios pueden acceder a esta sala. Si un espacio es seleccionado, sus miembros podrán encontrar y unirse al nombre de la Sala.</string>
+    <string name="spaces_which_can_access">Espacios que pueden acceder</string>
+    <string name="allow_space_member_to_find_and_access">Permite a los miembros del espacio encontrar y acceder.</string>
+    <string name="room_create_member_of_space_name_can_join">Miembros del Espacio %s pueden encontrar, previsualizar y unirse.</string>
+    <string name="room_settings_room_access_restricted_description">Cualquiera dentro de un espacio con esta sala puede encontrarla y unirse a ella. Únicamente los administradores de la sala pueden añadirla a un espacio.</string>
+    <string name="room_settings_room_access_private_description">Solo la gente invitada puede encontrar y unirse a l sala</string>
+    <string name="room_settings_room_access_private_invite_only_title">Privada (solo mediante invitación)</string>
+    <string name="room_settings_room_access_entry_knock">Cualquiera puede solicitar entrar en la sala, serán los miembros quienes decidan aceptar o rechazar la solicitud</string>
+    <string name="room_alias_local_address_subtitle">Configurar las direcciones para esta sala de forma que otros usuarios puedan encontrarla mediante tu homeserver (%1$s).</string>
+    <string name="room_alias_address_empty_can_add">Ninguna dirección publicada aún, añade una debajo.</string>
+    <string name="room_alias_published_alias_subtitle">Las direcciones publicadas pueden ser usadas por cualquiera en cualquier servidor para unirse a tu sala. Para publicar una dirección es necesario configurarla previamente como dirección local.</string>
+    <string name="space_settings_alias_subtitle">Ver y gestionar direcciones de este espacio.</string>
+    <string name="space_settings_alias_title">Direcciones del esapcio</string>
+    <string name="room_settings_room_read_history_dialog_subtitle">Cambios de quién puede leer el historial solo serán aplicados a futuros mensajes de en esta sala. La visibilidad del historial existente no será cambiado.</string>
+    <string name="settings_room_upgrades">Actualizaciones de sala</string>
+    <string name="settings_messages_by_bot">Mensajes de bots</string>
+    <string name="settings_room_invitations">Invitaciones a salas</string>
+    <string name="settings_encrypted_group_messages">Mensajes de grupo encriptados</string>
+    <string name="settings_group_messages">Mensajes de grupo</string>
+    <string name="settings_encrypted_direct_messages">Mensajes directos encriptados</string>
+    <string name="settings_messages_direct_messages">Mensajes directos</string>
+    <string name="settings_messages_containing_username">Mensajes que contengan mi nombre de usuario</string>
+    <string name="settings_messages_containing_display_name">Mensajes que contengan mi nombre</string>
+    <string name="settings_notification_notify_me_for">Notficarme para</string>
+    <string name="settings_notification_other">Otros</string>
+    <string name="settings_notification_mentions_and_keywords">Menciones y palabras clave</string>
+    <string name="settings_notification_default">Notificaciones por defecto</string>
+    <string name="continue_anyway">Continuar en cualquier caso</string>
+    <plurals name="missed_video_call">
+        <item quantity="one">Videollamada perdida</item>
+        <item quantity="other">%d videollamadas perdidas</item>
+    </plurals>
+    <plurals name="missed_audio_call">
+        <item quantity="one">Llamada de audio perdida</item>
+        <item quantity="other">%d llamadas de audio perdidas</item>
+    </plurals>
+    <string name="hs_client_url">Homeserver API URL</string>
+    <string name="missing_permissions_title">Faltan permisos</string>
+    <string name="denied_permission_voice_message">Para enviar mensajes de voz has de otorgar el permiso de Micrófono.</string>
+    <string name="denied_permission_camera">Para llevar a cabo esta acción has de otorgar el permiso de Cámara en las preferencias del sistema.</string>
+    <string name="denied_permission_generic">Se requieren permisos para llevar a cabo esta acción. Por favor, otórgalos desde las preferencias del sistema.</string>
+    <string name="create_room_disable_federation_title">Impedir a cualquiera que no forme parte de %s unirse a este sala</string>
+    <string name="identity_server_consent_dialog_content">Con la finalidad de descubrir contactos existentes que conozcas, ¿aceptas enviar tus datos de contacto (números de teléfono y/o emails) al servidor identidad configurado (%1$s)\?
+\n
+\nPara una mayor privacidad, los datos serán encriptados antes de ser enviados.</string>
+    <string name="settings_discovery_consent_action_give_consent">Dar consentimiento</string>
+    <string name="settings_discovery_consent_action_revoke">Revocar consentimiento</string>
+    <string name="settings_discovery_consent_notice_off">No has dado consentimiento para enviar emails y números de teléfono a este servidor identidad para descubrir otros usuarios desde tus contactos.</string>
+    <string name="settings_discovery_consent_notice_on">Has dado tu consentimiento para enviar emails y números de teléfono a este servidor identidad para descubrir a otros usuarios desde tus contactos.</string>
+    <string name="feedback">Realimentación</string>
+    <string name="directory_add_a_new_server_error_already_added">Este servidor ya está presente en esta lista</string>
+    <string name="directory_add_a_new_server_error">No se pudo encontrar este servidor o su lista de salas</string>
+    <string name="directory_add_a_new_server_prompt">Introduce el nombre del servidor que quieras explorar.</string>
+    <string name="directory_add_a_new_server">Añadir un nuevo servidor</string>
+    <string name="directory_your_server">Tu servidor</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Otros espacios o habitaciones que puede que no conozcas</string>
+    <string name="joining_replacement_room">Unirse a la sala de repuesto</string>
+    <string name="a11y_unsent_draft">Esta sala tiene borradores sin enviar</string>
+    <string name="you_may_contact_me">Puedes contactarme si tienes dudas de seguimiento</string>
+    <string name="upgrade_room_no_power_to_manage">Necesitas permiso para actualizar una sala</string>
+    <string name="upgrade_room_update_parent_space">Actualizar el espacio padre automáticamente</string>
+    <string name="upgrade_room_auto_invite">Invitar usuarios automáticamente</string>
+    <string name="upgrade_public_room_from_to">Actualizarás esta sala de %1$s a %2$s.</string>
+    <string name="upgrade_room_warning">Actualizar una sala es una acción avanzada y normalmente recomendada cuando una sala es inestable debido a errores, falta de funciones o vulnerabilidades en la seguridad.
+\nÉsto normalmente sólo afecta en cómo la sala es procesada en el servidor.</string>
+    <string name="upgrade_private_room">Actualizar sala privada</string>
+    <string name="upgrade_public_room">Actualizar sala pública</string>
+    <string name="upgrade_required">Actualización requerida</string>
+    <string name="upgrade">Actualizar</string>
+    <string name="it_may_take_some_time">Por favor, se paciente. Ésto puede llevar algo de tiempo.</string>
+    <string name="teammate_spaces_might_not_join">Por el momento puede que la gente no pueda unirse a salas privadas que crees.
+\n
+\nEstamos mejorándolo ya que aun está en fase beta, pero queríamos hacértelo saber.</string>
+    <string name="teammate_spaces_arent_quite_ready">Los espacios de trabajo en equipo aun no están listos, pero puedes probarlos</string>
+    <string name="unnamed_room">Sala sin nombre</string>
+    <string name="spaces_no_server_support_description">Por favor, contacta con el administrador de tu homeserver para más información</string>
+    <string name="spaces_no_server_support_title">Parece que tu homeserver no soporta Espacios todavía</string>
+    <string name="spaces_feeling_experimental_subspace">¿Con ganas de experimentar\?
+\nPuedes añadir espacios ya existentes a otros.</string>
+    <string name="space_manage_rooms_and_spaces">Gestionar salas y espacios</string>
+    <string name="space_settings_manage_rooms">Gestionar salas</string>
+    <string name="looking_for_someone_not_in_space">¿Buscas a alguien que no está en %s\?</string>
+    <string name="labs_use_restricted_join_rule_desc">Los avisos requieren soporte del servidor y una versión de sala experimental</string>
+    <string name="space_add_existing_rooms">Añade salas y espacios existentes</string>
+    <string name="space_leave_prompt_msg_as_admin">Eres administrador de este espacio, asegúrate de haber transferido el derecho de administrador a otro miembro antes de salir.</string>
+    <string name="space_leave_prompt_msg_private">Este espacio no es público. No podrás volver a unirte sin una invitación.</string>
+    <string name="space_leave_prompt_msg_only_you">Eres la única persona aquí. Si sales, nadie podrá unirse a aquí en el futuro, incluido tú.</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d persona que conoces ya se ha unido</item>
+        <item quantity="other">%d personas que conoces ya se han unido</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Bienvenido a %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">No estás en ninguna sala todavía. Debajo hay algunas salas sugeridas, pero puedes ver más pulsando el botón verde de la derecha.</string>
+    <string name="room_alias_preview_not_found">Este alias no está disponible en este momento.
+\nPrueba de nuevo más tarde o pide al administrador de sala que compruebe si tienes acceso.</string>
+    <string name="share_space_link_message">Unirse a mi espacio %1$s·%2$s</string>
+    <string name="invite_just_to_this_room_desc">Ellos no serán parte de %s</string>
+    <string name="invite_to_space_with_name_desc">Ellos podrán explorar %s</string>
+    <string name="invite_people_to_your_space_desc">Por el momento sólo estás tú. %s será incluso mejor con otros.</string>
+    <string name="create_spaces_room_private_header_desc">Vamos a crear una sala para cada uno de ellos. Puedes añadir más en otro momento también, incluso aquellas que ya existan.</string>
+    <string name="create_spaces_room_public_header_desc">Crearemos salas para ellos. Puedes añadir más en otro momento también.</string>
+    <string name="create_spaces_room_public_header">¿Cuáles son las discusiones que quieres tener en %s\?</string>
+    <string name="create_spaces_details_private_header">Añade algunos detalles para ayudar a la gente a identificarlo. Puedes cambiar esto en cualquier momento.</string>
+    <string name="create_spaces_details_public_header">Añade algunos detalles para ayudarlo a destacar. Puedes cambiar esto en cualquier momento.</string>
+    <string name="create_spaces_private_teammates">Un espacio privado para ti y tus compañeros de equipo</string>
+    <string name="create_spaces_organise_rooms">Un espacio privado para organizar tus salas</string>
+    <string name="create_spaces_make_sure_access">Asegúrate de que son las personas correctas las que tienen acceso a %s. Puedes cambiar esto más tarde.</string>
+    <string name="create_spaces_who_are_you_working_with">¿Con quién estás trabajando\?</string>
+    <string name="create_spaces_join_info_help">Para unirte a un espacio existente necesitas una invitación.</string>
+    <string name="create_spaces_you_can_change_later">Puedes cambiar esto más tarde</string>
+    <string name="create_spaces_choose_type_label">¿Qué tipo de espacio quieres crear\?</string>
+    <string name="private_space">Espacio privado</string>
+    <string name="public_space">Espacio público</string>
+    <string name="event_status_delete_all_failed_dialog_message">¿Estás seguro de querer eliminar todos los mensajes no enviados en esta sala\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Eliminar mensajes no enviados</string>
+    <string name="event_status_failed_messages_warning">Envío de mensajes fallido</string>
+    <string name="event_status_cancel_sending_dialog_message">¿Quieres cancelar el envío del mensaje\?</string>
+    <string name="command_description_upgrade_room">Actualiza una sala a una nueva versión</string>
+    <string name="command_description_leave_room">Salir de la habitación con el id dado (o la habitación actual si “null”)</string>
+    <string name="command_description_join_space">Unirse al Espacio con el id dado</string>
+    <string name="dev_tools_success_state_event">¡Estado del evento enviado!</string>
+    <string name="dev_tools_error_no_message_type">Falta el tipo de mensaje</string>
+    <string name="dev_tools_form_hint_event_content">Contenido del evento</string>
+    <string name="dev_tools_explore_room_state">Explora el Estado de Sala</string>
+    <string name="a11y_public_space">Este Espacio es público</string>
+    <string name="a11y_trust_level_trusted">Nivel de confianza seguro</string>
+    <string name="a11y_trust_level_warning">Aviso de nivel de confianza</string>
+    <string name="a11y_trust_level_default">Nivel de confianza por defecto</string>
+    <string name="a11y_error_some_message_not_sent">Algunos mensajes no han sido enviados</string>
+    <string name="call_transfer_unknown_person">Persona desconocida</string>
+    <string name="call_transfer_transfer_to_title">Transferir a %1$s</string>
+    <string name="call_transfer_consulting_with">Consultando con %1$s</string>
+    <string name="call_transfer_failure">Ocurrió un error al transferir la llamada</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">1 llamada activa (%1$s) · 1 llamada en pausa</item>
+        <item quantity="other">1 llamada activa (%1$s) · %2$d llamadas en pausa</item>
+    </plurals>
+    <string name="call_dial_pad_lookup_error">Hubo un error al buscar el número de teléfono</string>
+    <string name="call_tile_call_back">Devolver la llamada</string>
+    <string name="phone_book_perform_lookup">Buscar contactos en Matrix</string>
+    <string name="identity_server_user_consent_not_provided">No se ha proveído el consentimiento del usuario.</string>
+    <string name="failed_to_initialize_cross_signing">Error al configurar la Firma Cruzada</string>
+    <string name="command_snow">Envía el mensaje con copos de nieve cayendo</string>
+    <string name="command_confetti">Envía el mensaje con confeti</string>
+    <string name="send_images_and_video_with_original_size">Enviar contenido multimedia con su tamaño original</string>
+    <string name="settings_server_room_version_unstable">inestable</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 f1fe015df8..4413737c23 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2597,7 +2597,7 @@
     <string name="call_tile_call_back">Helista tagasi</string>
     <string name="call_tile_ended">See kõne on lõppenud</string>
     <string name="call_tile_other_declined">%1$s keeldus kõnest</string>
-    <string name="call_tile_you_declined">Sa keeldusid %1$s kõnest</string>
+    <string name="call_tile_you_declined">Sa keeldusid %s kõnest</string>
     <string name="call_tile_in_call">Sul on parasjagu see kõne pooleli</string>
     <string name="call_tile_other_started_call">%1$s alustas kõnet</string>
     <string name="call_tile_you_started_call">Sa alustasid kõnet</string>
@@ -2635,7 +2635,7 @@
     <string name="a11y_trust_level_default">Vaikmisi usaldusmäär</string>
     <string name="a11y_selected">Valitud</string>
     <string name="a11y_video">Video</string>
-    <string name="a11y_unsent_draft">Selles jututoas on ärasaatmata sõnumimustand</string>
+    <string name="a11y_unsent_draft">ärasaatmata sõnumimustand</string>
     <string name="a11y_error_some_message_not_sent">Mõned sõnumid on saatmata</string>
     <string name="a11y_delete_avatar">Kustuta tunnuspilt</string>
     <string name="a11y_change_avatar">Muuda tunnuspilti</string>
@@ -2760,7 +2760,7 @@
     <string name="space_settings_manage_rooms">Halda jututubasid</string>
     <string name="looking_for_someone_not_in_space">Kas sa otsid kedagi, kes ei leidu %s kogukonnas\?</string>
     <string name="user_invites_you">%s kutsus sind</string>
-    <string name="a11y_public_room">See jututuba on avalik</string>
+    <string name="a11y_public_room">Avalik jututuba</string>
     <string name="send_images_and_video_with_original_size">Saada meedia algses suuruses</string>
     <plurals name="send_videos_with_original_size">
         <item quantity="one">Saada videofail algses suuruses</item>
@@ -2779,7 +2779,6 @@
     <string name="spaces_no_server_support_title">Tundub, et sinu koduserver veel ei võimalda kogukonnakeskuste kasutamist</string>
     <string name="spaces_feeling_experimental_subspace">Kas sa tahad katsetada\?
 \nSa võid kogukonnakeskusele lisada ka teisi kogukonnakeskuseid.</string>
-    <string name="labs_space_show_orphan_in_home">Katseline kogukonnakeskus, mis näitab avalehel vaid hüljatud jututube</string>
     <string name="space_add_rooms">Lisa jututube</string>
     <string name="space_leave_prompt_msg_as_admin">Sa oled selle kogukonnakeskuse haldaja. Enne oma lahkumist palun lisa siia veel vähemalt üks uus haldaja.</string>
     <string name="space_leave_prompt_msg_private">See ei ole avalik kogukonnakeskus. Ilma kutseta sa ei saa uuesti liituda.</string>
@@ -2797,7 +2796,7 @@
     <string name="unnamed_room">Nimetu jututuba</string>
     <string name="private_space">Privaatne kogukonnakeskus</string>
     <string name="public_space">Avalik kogukonnakeskus</string>
-    <string name="a11y_public_space">See kogukonnakeskus on avalik</string>
+    <string name="a11y_public_space">Avalik kogukonnakeskus</string>
     <string name="call_transfer_unknown_person">Tundmatu isik</string>
     <string name="call_transfer_transfer_to_title">Suuna kasutajale %1$s</string>
     <string name="call_transfer_consulting_with">Pean nõu kasutajaga %1$s</string>
@@ -2822,7 +2821,7 @@
     <string name="upgrade_room_no_power_to_manage">Jututoa versiooni uuendamiseks on sul vaja õigusi</string>
     <string name="upgrade_room_update_parent_space">Uuenda automaatselt ka kogukonnakeskust, kus jututuba osaleb</string>
     <string name="upgrade_room_auto_invite">Kutsu automaatselt kasutajaid</string>
-    <string name="upgrade_public_room_from_to">Sa oled uuendamas jututoa versiooni: %s -&gt; %s.</string>
+    <string name="upgrade_public_room_from_to">Sa oled uuendamas jututoa versiooni: %1$s -&gt; %2$s.</string>
     <string name="upgrade_room_warning">Jututoa versiooni uuendamine on erandlik tegevus ning soovitame seda vaid siis kui ta on vigade tõttu raskestikasutatav, tal puuduvad uued funktsionaalsused või temas leidub turvavigu.
 \nTavaliselt versiooniuuendus mõjutab vaid seda viisi kuidas andmeid töödeldakse serveris.</string>
     <string name="upgrade_private_room">Uuenda omavaheline jututuba</string>
@@ -2860,4 +2859,91 @@
     <string name="allow_space_member_to_find_and_access">Luba kogukonna liikmetel leida ja vaadata.</string>
     <string name="room_settings_room_access_private_invite_only_title">Privaatne (vaid kutse alusel)</string>
     <string name="denied_permission_voice_message">Häälsõnumite saatmiseks palun anna rakendusele õigus mikrofoni kasutada.</string>
+    <string name="a11y_start_voice_message">Alusta häälsõnumi salvestust</string>
+    <string name="voice_message_slide_to_cancel">Tühistamiseks viipa</string>
+    <string name="a11y_lock_voice_message">Häälsõnumi lukustus</string>
+    <string name="a11y_pause_voice_message">Peata häälsõnumi esitus</string>
+    <string name="a11y_play_voice_message">Esita häälsõnumit</string>
+    <string name="a11y_recording_voice_message">Salvestan häälsõnumit</string>
+    <string name="a11y_delete_recorded_voice_message">Kustuta salvestatud häälsõnum</string>
+    <string name="voice_message_release_to_send_toast">Salvestamiseks vajuta nuppu, saatmiseks lase nupp lahti</string>
+    <string name="voice_message_n_seconds_warning_toast">Jäänud on %1$d s</string>
+    <string name="voice_message_tap_to_stop_toast">Salvestuse peatamiseks ja taasesituseks vajuta salvestuse vaadet</string>
+    <string name="labs_use_voice_message">Võta häälsõnumid kasutusele</string>
+    <string name="error_voice_message_unable_to_play">Selle häälsõnumi esitamine ei õnnestu</string>
+    <string name="error_voice_message_unable_to_record">Häälsõnumi salvestamine ei õnnestu</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Kui häälsõnum on esitamisel, siis sa ei saa talle vastata ega teda muuta</string>
+    <string name="voice_message_reply_content">Häälsõnum (%1$s)</string>
+    <string name="upgrade_room_for_restricted_note">Palun arvesta, et uuendusega tehakse jututoast uus variant. Kõik senised sõnumid jäävad sellesse jututuppa arhiveeritud olekus.</string>
+    <string name="sent_a_voice_message">Häälkõne</string>
+    <string name="settings_room_upgrades">Jututubade versiooniuuendused</string>
+    <string name="settings_messages_by_bot">Robotite saadetud sõnumid</string>
+    <string name="settings_room_invitations">Kutsed jututubadesse</string>
+    <string name="settings_encrypted_group_messages">Krüptitud rühmavestlused</string>
+    <string name="settings_group_messages">Rühmavestlused</string>
+    <string name="settings_encrypted_direct_messages">Krüptitud otsevestlused</string>
+    <string name="settings_messages_direct_messages">Otsevestlused</string>
+    <string name="settings_messages_containing_username">Minu kasutajatunnus</string>
+    <string name="settings_messages_containing_display_name">Minu kuvatav nimi</string>
+    <string name="settings_notification_notify_me_for">Teavita mind</string>
+    <string name="settings_notification_other">Muud</string>
+    <string name="settings_notification_mentions_and_keywords">Mainimised ja märksõnad</string>
+    <string name="settings_notification_default">Vaikimisi teavitused</string>
+    <string name="allow_anyone_in_room_to_access">Kõik %s kogukonna liikmed saavad antud jututuba leida ja sellega liituda. Sa võid lisada ka teisi kogukondi.</string>
+    <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="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>
+    <string name="call_slide_to_end_conference">Kõne lõpetamiseks viipa</string>
+    <string name="call_one_active">Kõne on pooleli (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">Kõne on pooleli ·</item>
+        <item quantity="other">%1$d kõnet on pooleli ·</item>
+    </plurals>
+    <string name="call_tile_connection_failed">Ühendus ebaõnnestus</string>
+    <string name="call_tile_no_answer">Keegi ei vasta kõnele</string>
+    <string name="call_tile_video_missed">Vastamata videokõne</string>
+    <string name="call_tile_voice_missed">Vastamata kõne</string>
+    <string name="call_tile_video_declined">Loobusid videokõnest</string>
+    <string name="call_tile_voice_declined">Loobusid kõnest</string>
+    <string name="call_tile_video_call_has_ended">Videokõne lõppes • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">Kõne lõppes • %1$s</string>
+    <string name="call_tile_video_active">Pooleliolev videokõne</string>
+    <string name="call_tile_voice_active">Pooleliolev kõne</string>
+    <string name="call_tile_video_incoming">Saabuv videokõne</string>
+    <string name="call_tile_voice_incoming">Saabuv häälkõne</string>
+    <string name="call_tile_you_declined_this_call">Sa keeldusid sellest kõnest</string>
+    <string name="room_settings_room_notifications_account_settings">Kasutajakonto seadistused</string>
+    <string name="room_settings_room_notifications_manage_notifications">Sa võid hallata teavitusi %1$s jututoas.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Teavitused mainimiste ja märksõnade esinemise puhul pole mobiilirakenduses krüptitud jututoas saadaval.</string>
+    <string name="call_remove_jitsi_widget_progress">Kõne lõpp…</string>
+    <string name="call_ended_invite_timeout_title">Keegi ei vasta kõnele</string>
+    <string name="audio_call_with_participant">Häälkõne kasutajaga %s</string>
+    <string name="video_call_with_participant">Videokõne kasutajaga %s</string>
+    <string name="call_ringing">Sulle on kõne…</string>
+    <string name="room_settings_room_notifications_notify_me">Teavita mind</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Mobiilseadmes ei toimi krüptitud jututubades mainimiste ja märksõnade alusel tehtavad teavitused.</string>
+    <string name="settings_messages_containing_keywords">Märksõnad</string>
+    <string name="settings_mentions_at_room">\@jututuba</string>
+    <string name="settings_notification_keyword_contains_invalid_character">„%s“ ei tohi sisalduda märksõnas</string>
+    <string name="settings_notification_keyword_contains_dot">Märksõna alguses ei saa olla punkt „.“</string>
+    <string name="settings_notification_new_keyword">Lisa uus märksõna</string>
+    <string name="settings_notification_your_keywords">Sinu märksõnad</string>
+    <string name="room_settings_none">Ei midagi</string>
+    <string name="room_settings_mention_and_keyword_only">Vaid mainimised ja märksõnad</string>
+    <string name="call_ended_user_busy_description">Kasutaja, kellele sa helistasid, on hõivatud.</string>
+    <string name="call_ended_user_busy_title">Kasutaja on hõivatud</string>
+    <string name="spaces">Kogukonnakeskused</string>
+    <string name="learn_more">Lisateave</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 a085d4c08e..ec45a40abf 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -255,7 +255,7 @@
     <string name="action_global_search">جستجوی جهانی</string>
     <string name="action_mark_all_as_read">همه را به عنوان خوانده شده علامت بزن</string>
     <string name="action_quick_reply">پاسخ سریع</string>
-    <string name="action_open">باز کردن</string>
+    <string name="action_open">گشودن</string>
     <string name="action_close">بستن</string>
     <string name="copied_to_clipboard">در کلیپ‌بورد کپی شد</string>
     <string name="disable">غیرفعال</string>
@@ -343,10 +343,10 @@
     <string name="home_filter_placeholder_groups">پالایش نام‌های انجمن</string>
     <string name="invitations_header">دعوت‌ها</string>
     <string name="system_alerts_header">هشدارهای سیستمی</string>
-    <string name="local_address_book_header">مخاطبین من</string>
+    <string name="local_address_book_header">دفترچه نشانی محلّی</string>
     <string name="user_directory_header">فهرست کاربران</string>
-    <string name="matrix_only_filter">فقط مخاطبین ماتریکس</string>
-    <string name="template_no_contact_access_placeholder">شما اجازه‌ی دسترسی به مخاطبین را به برنامه نداده‌اید</string>
+    <string name="matrix_only_filter">فقط آشنایان ماتریکس</string>
+    <string name="template_no_contact_access_placeholder">اجازهٔ دسترسی به آشنایان محلّیتان را به ${app_name} نداده‌اید</string>
     <string name="no_result_placeholder">نتیجه‌ای نیست</string>
     <string name="rooms_directory_header">فهرست اتاق‌ها</string>
     <string name="no_room_placeholder">اتاقی نیست</string>
@@ -366,7 +366,7 @@
     <string name="send_bug_report_failed">امکان ارسال گزارش اشکال وجود نداشت، دوباره تلاش کنید (%s)</string>
     <string name="send_bug_report_progress">پیشرفت (%s%%)</string>
     <string name="send_files_in">ارسال در</string>
-    <string name="hs_url">نشانی کارساز(سرور) خانگی</string>
+    <string name="hs_url">نشانی کارساز خانگی</string>
     <string name="identity_url">نشانی کارساز هویت</string>
     <string name="option_send_voice">ارسال صدا</string>
     <string name="start_new_chat_prompt_msg">آیا مطمئنید می‌خواهید با %s یک گپ جدید را آغاز کنید؟</string>
@@ -386,7 +386,7 @@
     <string name="auth_invalid_token">توکن نامعتبر است</string>
     <string name="auth_missing_email_or_phone">نشانی رایانامه یا شماره تلفن وارد نشده</string>
     <string name="auth_email_already_defined">این نشانی رایانامه قبلاً ثبت شده.</string>
-    <string name="auth_home_server">کارساز(سرور) خانگی:</string>
+    <string name="auth_home_server">کارساز خانگی:</string>
     <string name="auth_identity_server">کارساز هویت:</string>
     <string name="login_error_unable_login">امکان ورود وجود ندارد</string>
     <string name="attachment_remaining_time_minutes">%1$dد %2$dث</string>
@@ -495,9 +495,9 @@
     <string name="view_decrypted_source">مشاهده منبع رمزگشایی شده</string>
     <string name="action_historical">تاریخی</string>
     <string name="auth_invalid_user_name">نام کاربری تنها می‌تواند شامل حروف انگلیسی، اعداد، نقطه، خط زیر و خط تیره باشد</string>
-    <string name="auth_threepid_warning_message">ثبت‌نام با ورود همزمان ایمیل و شماره تلفن در حال حاضر پشتیبانی نمی‌شود. تنها شماره تلفن شما برای حساب‌تان ثبت خواهد شد.
+    <string name="auth_threepid_warning_message">تا هنگام ایجاد رابط برنامه‌نویسی، هنوز ثبت‌نام هم‌زمان با رایانامه و شماره تلفن پشتیبانی نمی‌شود. تنها شماره تلفنتان برای حساب ثبت خواهد شد.
 \n
-\nمی‌توانید در ادامه ایمیل خود را در تنظیمات برنامه به پروفایل خود اضافه کنید.</string>
+\nمی‌توانید در تنظیمات، رایانامه‌تان را به نمایه‌تان بیفزایید.</string>
     <string name="auth_recaptcha_message">این کارساز خانگی می‌خواهد مطمئن شود که روبات نیستید</string>
     <string name="auth_username_in_use">نام کاربری قبلاً استفاده شده است</string>
     <string name="e2e_re_request_encryption_key"><u>بازدرخواست کلیدهای رمزنگاری</u> از دیگر نشست‌هایتان.</string>
@@ -534,7 +534,7 @@
     <string name="room_sliding_menu_third_party_notices">تذکّرهای سوم‌شخص</string>
     <string name="room_sliding_menu_copyright">حق رونوشت</string>
     <string name="room_sliding_menu_privacy_policy">سیاست محرمانگی</string>
-    <string name="settings_profile_picture">عکس پروفایل</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>
@@ -586,8 +586,8 @@
     <string name="settings_cryptography">رمزنویسی</string>
     <string name="settings_cryptography_manage_keys">مدیریت کلیدهای رمزنویسی</string>
     <string name="settings_notifications_targets">هدف‌های آگاهی</string>
-    <string name="settings_contact">مخاطبان محلّی</string>
-    <string name="settings_contacts_app_permission">اجازهٔ مخاطبان</string>
+    <string name="settings_contact">آشنایان محلّی</string>
+    <string name="settings_contacts_app_permission">اجازهٔ آشنایان</string>
     <string name="settings_contacts_phonebook_country">کشور دفترچه تلفن</string>
     <string name="settings_home_display">نمای حانه</string>
     <string name="settings_pin_missed_notifications">سنجاق کردن اتاق‌هایی با آگاهی‌های بی‌پاسخ</string>
@@ -602,7 +602,7 @@
     <string name="devices_delete_pswd">گذرواژه:</string>
     <string name="devices_delete_submit_button_label">ثبت</string>
     <string name="settings_logged_in">واردشده به عنوان</string>
-    <string name="settings_home_server">کارساز(سرور) خانگی</string>
+    <string name="settings_home_server">کارساز خانگی</string>
     <string name="settings_identity_server">کارساز هویت</string>
     <string name="settings_integration_allow">اجازهٔ یک‌پارچگی‌ها</string>
     <string name="settings_integration_manager">مدیر یکپارچگی</string>
@@ -800,7 +800,7 @@
     <string name="media_picker_cannot_record_video">نمی‌توان ویدیو ظبط کرد</string>
     <string name="permissions_rationale_popup_title">اطلاعات</string>
     <string name="template_permissions_rationale_msg_camera">المنت برای گرفتن عکس و تماس‌های ویدیویی نیاز به اجازه دارد.</string>
-    <string name="open_chat_header">بازکردن سرتیتر</string>
+    <string name="open_chat_header">گشودن سرایند</string>
     <string name="room_sync_in_progress">در حال هم‌گام‌سازی…</string>
     <string name="room_jump_to_first_unread">پرش به ناخوانده</string>
     <string name="room_preview_invitation_format">شما برای پیوستن به این اتاق توسط %s دعوت شدید</string>
@@ -907,7 +907,7 @@
     <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="people_search_invite_by_id"><u>با شناسه دعوت شده</u></string>
-    <string name="people_search_local_contacts">مخاطبان محلّی (%d)</string>
+    <string name="people_search_local_contacts">آشنایان محلّی (%d)</string>
     <string name="people_search_user_directory">شاخهٔ کاربر (%s)</string>
     <string name="people_search_filter_text">فقط کاربران ماتریکس</string>
     <string name="people_search_invite_by_id_dialog_title">دعوت کاربر با شناسه</string>
@@ -1056,7 +1056,7 @@
     <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_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>
@@ -1156,7 +1156,7 @@
     <string name="room_widget_open_in_browser">گشودن در مرورگر</string>
     <string name="room_widget_revoke_access">ابطال دسترسی من</string>
     <string name="room_widget_permission_display_name">نام نمایشیتان</string>
-    <string name="room_widget_permission_avatar_url">نشانی اینترنتی آواتارتان</string>
+    <string name="room_widget_permission_avatar_url">نشانی اینترنتی چهرکتان</string>
     <string name="room_widget_permission_user_id">شناسهٔ کاربریتان</string>
     <string name="room_widget_permission_widget_id">شناسهٔ ابزارک</string>
     <string name="room_widget_permission_room_id">شناسهٔ اتاق</string>
@@ -1251,7 +1251,7 @@
     <string name="room_filtering_footer_title">نمی‌توانید کسی که به دنبالش هستید را بیابید؟</string>
     <string name="room_filtering_footer_open_room_directory">مشاهدهٔ شاخهٔ اتاق</string>
     <string name="labs_show_unread_notifications_as_tab">افزودن زبانه‌ای اختصاصی روی صفحهٔ اصلی برای آگاهی‌های خوانده‌نشده.</string>
-    <string name="link_copied_to_clipboard">پیوند در تخته‌گیره رونشت شد</string>
+    <string name="link_copied_to_clipboard">پیوند در تخته‌گیره رونوشت شد</string>
     <string name="creating_direct_room">ایجاد کردن اتاق…</string>
     <string name="direct_room_start_search">برغای گرفتن نتایج، شروع به نوشتن کنید</string>
     <string name="joining_room">پیوستن به اتاق…</string>
@@ -1272,7 +1272,7 @@
     <string name="labs_allow_extended_logging">به کار انداختن گزارش‌های پرگو.</string>
     <string name="labs_allow_extended_logging_summary">گزارش‌های پرگو با فراهم کردن گزارش‌های بیش‌تر هنگام تکان دادن محکم گوشی، به توسعه‌دهندگان کمک می‌کند. حتا هنگام به کار افتاده بودن هم برنامه، محتوای پیام یا هیچ دادهٔ خصوصی دیگری را گزارش نمی‌کند.</string>
     <string name="attachment_type_file">پرونده</string>
-    <string name="attachment_type_contact">مخاطب</string>
+    <string name="attachment_type_contact">آشنا</string>
     <string name="attachment_type_camera">دوربین</string>
     <string name="attachment_type_audio">صدا</string>
     <string name="attachment_type_gallery">جُنگ</string>
@@ -1670,10 +1670,10 @@
     <string name="member_banned_by">تحریم شده به دست %1$s</string>
     <string name="three_pid_revoke_invite_dialog_content">پس گرفتن دعوت به %1$s؟</string>
     <string name="three_pid_revoke_invite_dialog_title">پس گرفتن دعوت</string>
-    <string name="contacts_book_title">دفتر مخاطبان</string>
-    <string name="empty_contact_book">دفتر مخاطبانتان خالیست</string>
-    <string name="loading_contact_book">بازیابی کردن مخاطبانتان…</string>
-    <string name="search_in_my_contacts">جست‌وجو در مخاطبانم</string>
+    <string name="contacts_book_title">دفترچهٔ آشنایان</string>
+    <string name="empty_contact_book">دفترچهٔ آشنایانتان خالیست</string>
+    <string name="loading_contact_book">بازیابی کردن آشنایانتان…</string>
+    <string name="search_in_my_contacts">جست‌وجو در آشنایانم</string>
     <string name="phone_book_title">دفتر تلفن</string>
     <string name="empty_phone_book">دفتر تلفنتان خالیست</string>
     <string name="add_from_phone_book">افزودن از دفتر تلفنم</string>
@@ -1695,11 +1695,11 @@
     <string name="template_startup_notification_privacy_message">المنت می تواند در پس‌زمینه اجرا شده تا آگاهی‌هایتان را به صورت ایمن و محرمانه مدیریت کند. ممکن است بر مصرف باتری تأثیر بگذارد.</string>
     <string name="reset_secure_backup_warning">این کار کلید امنیتی قبلی شما را حذف می‌کند.</string>
     <string name="reset_secure_backup_title">یک کلید امنیتی جدید به صورت تصادفی ایجاد کنید یا یک عبارت امنیتی جدید برای فایل‌های پشتیبان موجود خود تنظیم کنید.</string>
-    <string name="settings_send_message_with_enter_summary">فشردن اینتر به جای رفتن به خط بعد، پیام را ارسال خواهد کرد</string>
-    <string name="settings_send_message_with_enter">ارسال با فشردن اینتر</string>
+    <string name="settings_send_message_with_enter_summary">دکمهٔ ورود صفحه‌کلید نرم، به جای افزودن یک شکست خط، پیام را خواهد فرستاد</string>
+    <string name="settings_send_message_with_enter">ارسال با فشردن ورود</string>
     <string name="settings_preview_media_before_sending">پیش‌نمایش محتوای چندرسانه‌ای قبل از ارسال</string>
     <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_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">نمایش پیام‌های پیوستن و ترک اتاق</string>
@@ -1778,7 +1778,7 @@
     <string name="room_details_files">پرونده‌ها</string>
     <string name="room_details_people">افراد</string>
     <string name="room_details_title">اطلاعات اتاق</string>
-    <string name="ssl_only_accept">گواهی را تنها در صورتی تایید کنید که اثر انگشت آن با اثر انگشتی که ادمین سرور ارائه کرده‌است برابر باشد.</string>
+    <string name="ssl_only_accept">تنها اگر مدیر کارساز، اثرانگشتی منتشر کرده که با بالایی مطابق است، بپذیرید.</string>
     <string name="ssl_expected_existing_expl">گواهی از آنی که مورد اطمینان بوده، تغییر کرده. ممکن است کارساز، گواهیش را نوسازی کرده باشد. برای دریافت اثر انگشت مورد انتظار، با مدیر کارساز تماس بگیرید.</string>
     <string name="ssl_unexpected_existing_expl">گواهی از آنی که مورد اطمینان تلفنتان است، تغییر کرده. این مورد بسیار نامعمول است. توصیه می شود این گواهی جدید را نپذیرید.</string>
     <string name="ssl_cert_new_account_expl">اگر مدیر کارساز خبر از مورد انتظار بودنش داده، مطمئن شوید که اثر انگشت زیر با اثر انگشت ارائه شده به دستشان مطابق است.</string>
@@ -1880,7 +1880,7 @@
 \n- اتصال اینترنت دستگاه
 \n
 \nما توصیه می‌کنیم گذرواژه و کلید بازیابی خود را بلافاصله در تنظیمات تغییر دهید.</string>
-    <string name="verify_cancel_other">اگر اکنون انصراف دهید، %1$s (%2$s) را تأیید نخواهید کرد. البته می‌توانید از طریق پروفایل کاربری آنها نیز این کار را انجام دهید.</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_compromized">ممکن است اکانت شما هک شده باشد</string>
@@ -2052,8 +2052,8 @@
     </plurals>
     <string name="a11y_jump_to_bottom">به پایین بروید</string>
     <string name="a11y_close_keys_backup_banner">بستن بنر پشتیبان کلیدها</string>
-    <string name="a11y_create_menu_close">باز کردن منوی ایجاد اتاق…</string>
-    <string name="a11y_create_menu_open">باز کردن منوی ایجاد اتاق</string>
+    <string name="a11y_create_menu_close">بستن فهرست ایجاد اتاق…</string>
+    <string name="a11y_create_menu_open">گشودن فهرست ایجاد اتاق</string>
     <string name="a11y_open_drawer">کشوی پیمایش را باز کنید</string>
     <string name="send_attachment">ارسال ضمیمه</string>
     <string name="error_network_timeout">به نظر می رسد پاسخگویی سرور بسیار طولانی شده‌است، این امر می‌تواند به دلیل اتصال ضعیف یا خطای موجود در سرور باشد. لطفا پس از مدتی دوباره امتحان کنید.</string>
@@ -2071,8 +2071,8 @@
     <string name="settings_discovery_confirm_mail_not_clicked">ما یک ایمیل تأیید به %s ارسال کردیم، ابتدا ایمیل خود را بررسی کرده و روی لینک تأیید کلیک کنید</string>
     <string name="settings_discovery_confirm_mail">ما یک ایمیل تأیید به %s ارسال کردیم، ایمیل خود را بررسی کرده و روی لینک تأیید کلیک کنید</string>
     <string name="settings_discovery_disconnect_identity_server_info">قطع ارتباط با سرور هویت‌سنجی به این معنی است که توسط کاربران دیگر قابل شناسایی نخواهید بود و نمی توانید دیگران را از طریق ایمیل یا تلفن دعوت کنید.</string>
-    <string name="settings_discovery_identity_server_info_none">شما در حال حاضر از سرور هویت‌سنجی استفاده نمی‌کنید. برای اینکه مخاطبین فعلی‌ای را که می‌شناسید پیدا کرده و آنها نیز شما را پیدا کنند، این سرور را در زیر پیکربندی کنید.</string>
-    <string name="settings_discovery_identity_server_info">شما در حال حاضر از %1$s استفاده می کنید تا مخاطبین فعلی را که می‌شناسید پیدا کرده و آنها نیز شما را پیدا کنند.</string>
+    <string name="settings_discovery_identity_server_info_none">در حال استفاده از کارساز هویتی نیستید. برای کشق و قابل کشف بودن به دست آشنایان موجودی که می‌شناسید، یک کارساز هویت در زیر پیکربندی کنید.</string>
+    <string name="settings_discovery_identity_server_info">دارید برای کشف و قابل کشف بودن به دست آشنایان موجودی که می‌شناسید از %1$s استفاده می‌کنید.</string>
     <string name="read_at">بخوانید در</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">ثبت توکن</string>
     <string name="push_gateway_item_format">فرمت:</string>
@@ -2234,14 +2234,14 @@
     <string name="show_info_area_always">همواره</string>
     <string name="settings_info_area_show">نمایش جزيیات</string>
     <string name="merged_events_collapse">جمع کردن</string>
-    <string name="merged_events_expand">باز کردن</string>
+    <string name="merged_events_expand">گستردن</string>
     <string name="unknown_error">متأسفیم ، خطایی رخ داد</string>
     <string name="resource_limit_hard_contact">لطفا %s تا استفاده از این سرویس را ادامه دهید.</string>
     <string name="resource_limit_soft_contact">لطفا %s تا این محدودیت را برطرف نمائید.</string>
-    <string name="resource_limit_hard_mau">این سرور به محدودیت کاربر فعال ماهانه خود رسیده است.</string>
-    <string name="resource_limit_soft_mau"> این سرور به محدودیت کاربر فعال ماهانه خود رسیده است <b>بنابراین برخی از کاربران نمی توانند وارد سیستم شوند</b>.</string>
-    <string name="resource_limit_hard_default">سرور از یکی از محدودیت های منابع خود فراتر رفته است.</string>
-    <string name="resource_limit_soft_default">سرور از یکی از محدودیت های منابع خود فراتر رفته است <b>بنابراین برخی از کاربران نمی توانند وارد سیستم شوند</b>.</string>
+    <string name="resource_limit_hard_mau">این کارساز خانگی به کران کاربر فعّال ماهانه‌اش رسیده.</string>
+    <string name="resource_limit_soft_mau"> این کارساز خانگی به کران کاربر فعّال ماهانه‌اش رسیده، پس <b>برخی کاربران قادر به ورود نخواهند بود</b>.</string>
+    <string name="resource_limit_hard_default">این کارساز خانگی از کران یکی از منابعش تجاوز کرده.</string>
+    <string name="resource_limit_soft_default">این کارساز خانگی از کران یکی از منابعش تجاوز کرده، پس <b>برخی کاربران قادر به ورود نخواهند بود</b>.</string>
     <string name="room_tombstone_continuation_description">این اتاق ادامه‌ی گفتگوی دیگر است</string>
     <string name="room_tombstone_continuation_link">گفتگو در اینجا ادامه دارد</string>
     <string name="room_tombstone_versioned_description">این اتاق جایگزین شده و دیگر فعّال نیست.</string>
@@ -2388,7 +2388,7 @@
     <string name="invalid_qr_code_uri">رمز QR نامعتبر (نشانی نامعتبر)!</string>
     <string name="cannot_dm_self">نمی‌توانید به خودتان پیام دهید!</string>
     <string name="share_by_text">هم‌رسانی با متن</string>
-    <string name="phone_book_perform_lookup">جست‌وجوی مخاطبان در ماتریکس</string>
+    <string name="phone_book_perform_lookup">جست‌وجوی آشنایان روی ماتریکس</string>
     <string name="room_settings_set_avatar">تنظیم آواتار</string>
     <string name="save_your_security_key_title">ذخیرهٔ کلید امنیتیتان</string>
     <string name="set_a_security_phrase_again_notice">برای تأیید عبارت امنیتیتان، دوباره واردش کنید.</string>
@@ -2432,13 +2432,13 @@
     <string name="settings_discovery_consent_action_revoke">ابطال رضایتم</string>
     <string name="settings_discovery_consent_title">فرستادن رایانامه‌ها و شماره تلفن‌ها</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_contacts_title">آشنایان</string>
     <string name="direct_room_user_list_known_title">کاربران شناخته</string>
     <string name="direct_room_user_list_recent_title">اخیر</string>
     <string name="qr_code">رمز QR</string>
     <string name="add_by_qr_code">افزودن با رمز QR</string>
     <string name="user_directory_search_hint">جست‌وجو با نام یا شناسه</string>
-    <string name="permissions_denied_add_contact">دسترسی به مخاطبانتان را مجاز کنید.</string>
+    <string name="permissions_denied_add_contact">دادن اجازهٔ دسترسی به آشنایانتان.</string>
     <string name="permissions_denied_qr_code">برای پویش یک رمز QR نیاز است دسترسی به دوربین را مجاز کنید.</string>
     <string name="start_chatting">آغاز به گپ</string>
     <string name="settings_export_trail">برون‌ریزی بازرسی</string>
@@ -2454,8 +2454,8 @@
         <item quantity="one">دستگاهی را که می‌توانید با استفاده از آن‌ها خود را تایید کنید نشان بده</item>
         <item quantity="other">%d دستگاهی را که می‌توانید با استفاده از آن‌ها خود را تایید کنید نشان بده</item>
     </plurals>
-    <string name="settings_discovery_consent_notice_off">شما عدم رضایت خود را برای ارسال ایمیل و شماره تلفن به این سرور اعلام کرده‌اید در نتیجه نمی‌توانید کاربران دیگر را با استفاده از مخاطبین خود پیدا کنید.</string>
-    <string name="settings_discovery_consent_notice_on">شما رضایت خود را برای ارسال ایمیل و شماره تلفن به این سرور اعلام کرده‌اید تا بتوانید کاربران دیگر را مخاطبین خود پیدا کنید.</string>
+    <string name="settings_discovery_consent_notice_off">رضاییتان را برای فرستادن رایانامه‌ها و شماره‌تلفن‌ها به این کارساز هویت به منظور کشف دیگر کاربران از آشنایانتان، نداده‌اید.</string>
+    <string name="settings_discovery_consent_notice_on">رضاییتان را برای فرستادن رایانامه‌ها و شماره‌تلفن‌ها به این کارساز هویت به منظور کشف دیگر کاربران از آشنایانتان، داده‌اید.</string>
     <string name="room_preview_not_found">در حال حاضر این اتاق قابل دسترسی نیست.
 \nبعدا دوباره تلاش کنید، یا از مدیر اتاق بخواهید بررسی کند که آیا دسترسی دارید.</string>
     <string name="room_alias_action_publish">انتشار این نشانی</string>
@@ -2549,7 +2549,7 @@
     <string name="call_tile_call_back">تماس بگیرید</string>
     <string name="call_tile_ended">این تماس پایان یافته است</string>
     <string name="call_tile_other_declined">%1$s تماس را رد کرد</string>
-    <string name="call_tile_you_declined">شما این تماس را رد کردید %1$s</string>
+    <string name="call_tile_you_declined">این تماس را رد کردید %s</string>
     <string name="call_tile_in_call">شما در حال حاضر در این تماس هستید</string>
     <string name="failed_to_initialize_cross_signing">خطا در تنظیم امضای متقابل</string>
     <string name="call_tile_other_started_call">%1$s یک تماس را شروع کرد</string>
@@ -2590,7 +2590,7 @@
     <string name="a11y_selected">گزیده</string>
     <string name="a11y_image">تصویر</string>
     <string name="a11y_video">ویدیو</string>
-    <string name="a11y_unsent_draft">این اتاق پیش‌نویس‌هایی نفرستاده دارد</string>
+    <string name="a11y_unsent_draft">پیش‌نویسی نفرستاده دارد</string>
     <string name="a11y_error_some_message_not_sent">برخی پیام‌ها ارسال نشده‌اند</string>
     <string name="a11y_delete_avatar">حذف چهرک</string>
     <string name="a11y_change_avatar">تغییر چهرک</string>
@@ -2636,8 +2636,8 @@
     </plurals>
     <string name="initial_sync_start_downloading">همگام‌سازی اولیه:
 \nبارگیری داده‌ها…</string>
-    <string name="initial_sync_start_server_computing">همگام‌سازی اولیه:
-\nمنتظر پاسخ سرور بمانید…</string>
+    <string name="initial_sync_start_server_computing">همگام‌سازی نخستین:
+\nمنتظر پاسخ کارساز…</string>
     <string name="room_displayname_empty_room_was">اتاق خالی (%s بود)</string>
     <string name="notice_widget_jitsi_modified_by_you">شما جلسه‌ی تصویری را تغییر دادید</string>
     <string name="notice_widget_jitsi_modified">جلسه‌ی تصویری توسط %1$s تغییر کرد</string>
@@ -2645,22 +2645,22 @@
     <string name="notice_widget_jitsi_added">جلسه‌ی تصویری توسط %1$s آغاز گردید</string>
     <string name="notice_widget_jitsi_removed">جلسه‌ی تصویری توسط %1$s خاتمه یافت</string>
     <string name="notice_widget_jitsi_removed_by_you">شما به جلسه‌ی تصویری خاتمه دادید</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 همه‌ی سرورها از مشارکت منع شده‌اند! این اتاق دیگر قابل استفاده نیست.</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">لیترال‌های آی‌پی برای تطبیق سرور هم‌اکنون ممنوع شد.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">لیترال‌های آی‌پی برای تطبیق سرور هم‌اکنون اجازه داده‌شد.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">تطبیق سرور %s از لیست موارد مجاز حذف گردید.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• کارسازهای مطابق با نشانی‌های آی‌پی تحریم شده‌اند.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• کارسازهای مطابق با نشانی‌های آی‌پی مجاز شده‌اند.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• کارسازهای مطابق با %s از سیاههٔ مجازبرداشته شدند.</string>
     <string name="notice_room_server_acl_updated_allowed">• اکنون‌کارسازهای مطابق با %s مجاز شده‌اند.</string>
-    <string name="notice_room_server_acl_updated_was_banned">تطبیق سرور %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">شما سطح کنترل دسترسی این اتاق را تغییر دادید.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">لیترال‌های آی‌پی برای تطبیق سرور اجازه داده شده‌است.</string>
-    <string name="notice_room_server_acl_set_title">%s سطح کنترل دسترسی‌ها برای این اتاق را بر روی سرور تنظیم کرد.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• کارسازهای مطابق با نشانی‌های آی‌پی مجازنند.</string>
+    <string name="notice_room_server_acl_set_title">%s سطح واپایش دسترسی‌های کارساز را برای این اتاق تنظیم کرد.</string>
     <string name="notice_room_server_acl_updated_title">%s سطح کنترل دسترسی برای این اتاق را تغییر داد.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">لیترال‌های آی‌پی برای تطبیق سرور ممنوع است.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• کارسازهای مطابق با نشانی‌های آی‌پی تحریمند.</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_by_you">سطح واپایش دسترسی‌های کارساز را برای این اتاق تنظیم کردید.</string>
     <string name="event_status_delete_all_failed_dialog_message">مطمئنید که می‌خواهید تمام پیام‌های فرستاده نشده در این اتاق را حذف کنید؟</string>
     <string name="event_status_delete_all_failed_dialog_title">حذف پیام‌های فرستاده نشده</string>
     <string name="event_status_failed_messages_warning">فرستادن پیام‌ها شکست خورد</string>
@@ -2728,7 +2728,7 @@
     <string name="create_spaces_just_me">فقط من</string>
     <string name="create_spaces_make_sure_access">مطمئن شوید که افراد درست به %s دسترسی دارند. می‌توانید بعدها این را تغییر دهید.</string>
     <string name="command_description_create_space">ساخت یک فضا</string>
-    <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="spaces_header">فضا‌ها</string>
     <string name="create_spaces_who_are_you_working_with">با چه کسانی کار می‌کنی؟</string>
@@ -2743,9 +2743,9 @@
     <string name="command_description_join_space">پیوستن به فضا با شناسهٔ داده‌شده</string>
     <string name="a11y_unchecked">علامت زده نشده</string>
     <string name="search_hint_room_name">جستجو با نام اتاق</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_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>
@@ -2760,7 +2760,7 @@
     <string name="space_settings_manage_rooms">مدیریت اتاق‌ها</string>
     <string name="looking_for_someone_not_in_space">دنبال کسی هستید که در %s نیست؟</string>
     <string name="user_invites_you">%s دعوتتان می‌کند</string>
-    <string name="a11y_public_room">این اتاق عمومی است</string>
+    <string name="a11y_public_room">اتاق عمومی</string>
     <string name="send_images_and_video_with_original_size">رسانه را با اندازه اصلی ارسال کن</string>
     <plurals name="send_videos_with_original_size">
         <item quantity="one">ارسال فیلم با اندازه اصلی</item>
@@ -2784,7 +2784,7 @@
     <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_add_a_new_server">افزودن کارسازی جدید</string>
     <string name="directory_your_server">کارساز شما</string>
     <string name="unnamed_room">اتاق بی‌نام</string>
     <string name="this_space_has_no_rooms_admin">ممکن است برخی اتاق‌ها پنهان باشند، زیرا خصوصی بوده و نیاز به دعوت دارید.</string>
@@ -2809,7 +2809,6 @@
     <string name="upgrade_room_no_power_to_manage">برای ارتقای اتاق نیاز به اجازه دارید</string>
     <string name="upgrade_room_update_parent_space">به‌روز رسانی خودکار والد فضا</string>
     <string name="upgrade_room_auto_invite">دعوت خودکار کاربران</string>
-    <string name="upgrade_public_room_from_to">این اتاق را از %s به %s ارتقا خواهید داد.</string>
     <string name="upgrade_room_warning">ارتقای اتاق، عملی پیش‌رفته است و معمولاً هنگامی که اتاقی به خاطر اشکال‌ها، کمبود ویژگی‌ها یا آسیب‌پذیری‌های امنیتی ناپایدار است، پیشنهاد می‌شود.
 \nاین عمل معمولاً فقط روی چگونگی فراوری اتاق روی کارساز اثر می‌گذارد.</string>
     <string name="upgrade_private_room">ارتقای اتاق خصوصی</string>
@@ -2835,10 +2834,9 @@
     <string name="private_space">فضای خصوصی</string>
     <string name="public_space">فضای عمومی</string>
     <string name="command_description_upgrade_room">اتاقی را به نگارشی جدید ارتقا می‌دهد</string>
-    <string name="a11y_public_space">این فضا عمومی است</string>
+    <string name="a11y_public_space">فضای عمومی</string>
     <string name="spaces_feeling_experimental_subspace">حس آزمایش دارید؟
 \nمی‌توانید فضاهای موجود را به فضایی بیفزایید.</string>
-    <string name="labs_space_show_orphan_in_home">فضای آزمایشی - فقط نمایش یتسم‌ها در خانه</string>
     <string name="call_transfer_consulting_with">مشاوره با %1$s</string>
     <string name="voice_message_reply_content">پیام صوتی (%1$s)</string>
     <string name="error_voice_message_cannot_reply_or_edit">نمی‌توان هنگام فعّال بودن پیام صوتی، پاسخ داد یا ویراست</string>
@@ -2876,4 +2874,76 @@
         <item quantity="other">%d تماس صوتی بی‌پاسخ</item>
     </plurals>
     <string name="denied_permission_voice_message">لطفاً برای فرستادن پیام صوتی، اجازهٔ میکروفون را اعطا کنید.</string>
+    <string name="upgrade_room_for_restricted_note">به خاطر داشته باشید که ارتقا، نگارشی جدید از اتاق خواهد ساخت. تمامی پیام‌های کنونی در این اتاق بایگانی‌شده خواهند ماند.</string>
+    <string name="upgrade_room_for_restricted_no_param">هرکسی در یک فضای والد قادر خواهد بود این اتاق را یافته و بپیوندد - نیازی به دعوت دستی همه نیست. می‌توانید هر زمان در تنظیمات اتاق، عوضش کنید.</string>
+    <string name="upgrade_room_for_restricted">هرکسی در %s قادر خواهد بود این اتاق را یافته و بپیوندد - نیازی به دعوت دستی همه نیست. می‌توانید هر زمان در تنظیمات اتاق، عوضش کنید.</string>
+    <string name="allow_anyone_in_room_to_access">اجازه به هرکسی در %s برای یافتن و دسترسی. می‌توانید دیگر فضاها را نیز برگزینید.</string>
+    <string name="settings_room_upgrades">ارتقاهای اتاق</string>
+    <string name="settings_messages_by_bot">پیام‌ها از بات</string>
+    <string name="settings_room_invitations">دعوت‌های اتاق</string>
+    <string name="settings_encrypted_direct_messages">پیام‌های مستقیم رمزنگاشته</string>
+    <string name="settings_encrypted_group_messages">پیام‌های گروهی رمزنگاشته</string>
+    <string name="settings_group_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_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="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>
+    <string name="preference_show_all_rooms_in_home">نمایش تمامی اتاق‌ها در خانه</string>
+    <string name="call_slide_to_end_conference">برای پایان تماس، بکشید</string>
+    <string name="call_tap_to_return">%1$s برای بازگشت بزنید</string>
+    <string name="call_one_active">تماس فعّال (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">تماس فعّال ·</item>
+        <item quantity="other">%1$d تماس فعّال ·</item>
+    </plurals>
+    <string name="call_tile_connection_failed">اتصال شکست خورد</string>
+    <string name="call_tile_no_answer">بدون پاسخ</string>
+    <string name="call_tile_video_missed">تماس تصویری از دست رفته</string>
+    <string name="call_tile_voice_missed">تماس صوتی از دست رفته</string>
+    <string name="call_tile_video_declined">تماس تصویری رد شد</string>
+    <string name="call_tile_voice_declined">تماس صوتی رد شد</string>
+    <string name="call_tile_video_call_has_ended">تماس تصویری پایان یافت • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">تماس صوتی پایان یافت • %1$s</string>
+    <string name="call_tile_video_active">فعّال کردن تماس تصویری</string>
+    <string name="call_tile_voice_active">فعّال کردن تماس صوتی</string>
+    <string name="call_tile_video_incoming">تماس تصویری ورودی</string>
+    <string name="call_tile_voice_incoming">تماس صوتی ورودی</string>
+    <string name="call_tile_you_declined_this_call">این تماس را رد کردید</string>
+    <string name="room_settings_room_notifications_account_settings">تنظیمات حساب</string>
+    <string name="room_settings_room_notifications_manage_notifications">می‌توانید آگاهی‌ها را در %1$s مدیریت کنید.</string>
+    <string name="room_settings_room_notifications_encryption_notice">لطفاً به خاطر داشته باشید که آگاهی‌های کلیدواژگان و اشاره در اتاق‌های رمزشده روی تلفن همراه، در دسترس نیست.</string>
+    <string name="room_settings_room_notifications_notify_me">آگاهم کن برای</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">روی تلفن همراه، از اشاره‌ها و کلیدواژگان در اتاق‌های رمزشده آگاه نخواهید شد.</string>
+    <string name="settings_messages_containing_keywords">کلیدواژگان</string>
+    <string name="settings_mentions_at_room">\@room</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="room_settings_none">هیچ‌کدام</string>
+    <string name="room_settings_mention_and_keyword_only">فقط اشاره‌ها و کلیدواژگان</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="audio_call_with_participant">تماس صوتی با %s</string>
+    <string name="video_call_with_participant">تماس تصویری با %s</string>
+    <string name="call_ringing">زنگ خوردن تماس…</string>
+    <string name="spaces">فضاها</string>
+    <string name="learn_more">بیش‌تر بدانید</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fr-rCA/strings.xml b/vector/src/main/res/values-fr-rCA/strings.xml
index fe2e08780e..ab6e988870 100644
--- a/vector/src/main/res/values-fr-rCA/strings.xml
+++ b/vector/src/main/res/values-fr-rCA/strings.xml
@@ -2730,7 +2730,6 @@
     <string name="spaces_no_server_support_title">Il semble que votre serveur d’accueil ne prend pas encore en charge les espaces</string>
     <string name="spaces_feeling_experimental_subspace">Envie d’expérimenter\?
 \nVous pouvez ajouter des espaces existants à un espace.</string>
-    <string name="labs_space_show_orphan_in_home">Espace expérimental – afficher seulement les orphelins dans Accueil</string>
     <string name="space_manage_rooms_and_spaces">Gérer les salons et les espaces</string>
     <string name="space_mark_as_not_suggested">Marquer comme non recommandé</string>
     <string name="space_mark_as_suggested">Marquer comme recommandé</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index ff4d325bda..57c19f0488 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2778,7 +2778,6 @@
         <item quantity="one">Envoyer la vidéo en taille originale</item>
         <item quantity="other">Envoyer les vidéos en taille originale</item>
     </plurals>
-    <string name="labs_space_show_orphan_in_home">Espace expérimental – afficher seulement les orphelins dans Accueil</string>
     <string name="space_leave_prompt_msg_as_admin">Vous êtes administrateur de cet espace, assurez-vous d’avoir transféré les droits d’administration à un autre membre avant de partir.</string>
     <string name="send_feedback_space_info">Vous utilisez une version bêta des espaces. Vos remarques aideront à concevoir les prochaines versions. Votre plateforme et votre nom d’utilisateur seront marqués pour nous aider à utiliser vos remarques autant que possible.</string>
     <string name="this_space_has_no_rooms_admin">Il se peut que certains salons soient masqués parce qu’ils sont privés et vous avez besoin d’une invitation.</string>
@@ -2827,7 +2826,7 @@
     <string name="upgrade_room_no_power_to_manage">Vous devez avoir le droit de mettre à jour ce salon</string>
     <string name="upgrade_room_update_parent_space">Mettre à jour automatiquement l’espace parent</string>
     <string name="upgrade_room_auto_invite">Inviter automatiquement des utilisateurs</string>
-    <string name="upgrade_public_room_from_to">Vous allez mettre à jour ce salon de %s à %s.</string>
+    <string name="upgrade_public_room_from_to">Vous allez mettre à jour ce salon de %1$s à %2$s.</string>
     <string name="upgrade_room_warning">La mise-à-jour d’un salon est une action avancée et n’est normalement recommandé que si un salon est instable à cause de bogues, fonctionnalités manquantes, ou failles de sécurité.
 \nCela n’affecte normalement que la manière dont le salon est géré par le serveur.</string>
     <string name="upgrade_private_room">Mettre à jour un salon privé</string>
@@ -2887,4 +2886,17 @@
     <string name="room_create_member_of_space_name_can_join">Les membres de l’espace %s peuvent trouver, prévisualiser et venir.</string>
     <string name="room_settings_room_access_private_invite_only_title">Privé (seulement sur invitation)</string>
     <string name="denied_permission_voice_message">Pour envoyer des messages vocaux, veuillez accorder la permission Microphone.</string>
+    <string name="settings_room_upgrades">Les mises-à-jour de salon</string>
+    <string name="settings_messages_by_bot">Les messages envoyés par un robot</string>
+    <string name="settings_room_invitations">Les invitations à des salons</string>
+    <string name="settings_encrypted_group_messages">Les conversations de groupe chiffrées</string>
+    <string name="settings_group_messages">Les conversations de groupe</string>
+    <string name="settings_encrypted_direct_messages">Les conversations privées chiffrées</string>
+    <string name="settings_messages_direct_messages">Les conversations privées</string>
+    <string name="settings_messages_containing_username">Les messages contenant mon nom d’utilisateur</string>
+    <string name="settings_messages_containing_display_name">Les messages contenant mon nom d’affichage</string>
+    <string name="settings_notification_notify_me_for">Me notifier pour</string>
+    <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>
 </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 7db0afa759..0e31fcbd00 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="light_theme">Ljocht tema</string>
-    <string name="dark_theme">Tsjuster tema</string>
+    <string name="dark_theme">Donker tema</string>
     <string name="black_theme">Swart tema</string>
-    <string name="notification_sync_init">Tsjinst inisjalisearje</string>
+    <string name="notification_sync_init">Tsjinst wurdt inisjalisearre</string>
     <string name="notification_sync_in_progress">Syngronisearje…</string>
     <string name="notification_listening_for_events">Lústerje nei barrens</string>
     <string name="notification_noisy_notifications">Lûdsmeldingen</string>
@@ -31,7 +31,7 @@
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Do silst de tagong ta dyn fersifere berjochten ferlieze, útsein asto earst in reservekopy fan dyn kaaien makkest eardatsto dy ôfmeldst.</string>
     <string name="dialog_title_third_party_licences">Lisinsjes fan tredde partijen</string>
     <string name="loading">Lade…</string>
-    <string name="ok">Oké</string>
+    <string name="ok">OK</string>
     <string name="cancel">Annulearje</string>
     <string name="save">Bewarje</string>
     <string name="leave">Ferlitte</string>
@@ -143,9 +143,9 @@
     <string name="call_notification_hangup">Ophingje</string>
     <string name="call_notification_reject">Ferfalle litte</string>
     <string name="call_notification_answer">Akseptearje</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Do hast it haadadres fan disse keamer fuortsmiten.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s hat it adres fan disse keamer feroare.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Do hast it adres fan disse keamer feroare.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Do hast it haadadres fan dizze keamer fuortsmiten.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s hat it adres fan dizze keamer feroare.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Do hast it adres fan dizze keamer feroare.</string>
     <string name="notice_direct_room_leave_with_reason_by_you">Do binst fuort gien. Reden: %1$s</string>
     <string name="notice_direct_room_leave_with_reason">%1$s is fuort gien. Reden: %2$s</string>
     <string name="notice_room_leave_with_reason_by_you">Do hast de keamer ferlitten. Reden: %1$s</string>
@@ -168,30 +168,30 @@
 \nMienskippen Binnenhelje</string>
     <string name="initial_sync_start_importing_account_left_rooms">Inisjele Syngronisaasje:
 \nOerblieuwne Keamers Binnenhelje</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Inisjele Syngronisaasje:
-\nKeamers Werst Foar Útnûge Binst Binnenhelje</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Inisjele Syngronisaasje:
-\nKeamers wer ast yn kaam binst binnenhelje</string>
-    <string name="initial_sync_start_importing_account_rooms">Inisjele Syngronisaasje:
-\nKeamers binnenhelje</string>
-    <string name="initial_sync_start_importing_account">Inisjele Syngronisaasje:
-\nAkkount importearje…</string>
-    <string name="initial_sync_start_downloading">Inisjele Syngronisaasje:
-\nData binnenhelje…</string>
-    <string name="initial_sync_start_server_computing">Inisjele Syngronisaasje:
-\nWachtsjend op reaksje fan tsjinner…</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Inisjele syngronisaasje:
+\nKeamers dêr\'t jo foar útnûge binne ymportearje</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Inisjele syngronisaasje:
+\nKeamers wer ast yn kaam bist ymportearje</string>
+    <string name="initial_sync_start_importing_account_rooms">Inisjele syngronisaasje:
+\nKeamers ymportearje</string>
+    <string name="initial_sync_start_importing_account">Inisjele syngronisaasje:
+\nAccount ymportearje…</string>
+    <string name="initial_sync_start_downloading">Inisjele syngronisaasje:
+\nData downloade…</string>
+    <string name="initial_sync_start_server_computing">Inisjele syngronisaasje:
+\nWachtsjend op reaksje fan server…</string>
     <string name="room_displayname_empty_room_was">Lege keamer (wie %s)</string>
     <string name="room_displayname_empty_room">Lege keamer</string>
-    <string name="medium_email">Email adres</string>
-    <string name="room_displayname_invite_from">Útnûging fan %s</string>
-    <string name="medium_phone_number">Tillefoan nûmer</string>
-    <string name="message_failed_to_upload">Upload fan ôfbylding mislearre</string>
+    <string name="medium_email">E-mailadres</string>
+    <string name="room_displayname_invite_from">Utnûging fan %s</string>
+    <string name="medium_phone_number">Telefoannûmer</string>
+    <string name="message_failed_to_upload">Opladen fan ôfbylding mislearre</string>
     <string name="notice_crypto_unable_to_decrypt">** Koe %s net ûntsiferje **</string>
     <string name="could_not_redact">Koe net ynlûke</string>
     <string name="power_level_custom_no_value">Oanpast</string>
     <string name="power_level_custom">Oanpast (%1$d)</string>
     <string name="power_level_default">Standert</string>
-    <string name="notice_widget_jitsi_modified_by_you">Do hast de fideo konferînsje oanpast</string>
+    <string name="notice_widget_jitsi_modified_by_you">Do hast de fideokonferinsje oanpast</string>
     <string name="power_level_admin">Behearder</string>
     <string name="notice_event_redacted_by_with_reason">Berjocht fuortsmiten troch %1$s [reden: %2$s]</string>
     <string name="notice_event_redacted_with_reason">Berjocht fuortsmiten [reden: %1$s]</string>
@@ -224,15 +224,15 @@
     <string name="room_participants_create">Oanmeitsje</string>
     <string name="room_participants_action_remove">Út disse keamer smite</string>
     <string name="room_settings_enable_encryption_no_permission">Do hast gjin tastimming om enkripsje yn te skakeljen yn disse keamer.</string>
-    <string name="sound_device_phone">Tillefoan</string>
-    <string name="call_failed_dont_ask_again">My net wer freechje</string>
+    <string name="sound_device_phone">Telefoan</string>
+    <string name="call_failed_dont_ask_again">My net wer freegje</string>
     <string name="start_new_chat">Nij petear begjinne</string>
     <string name="search">Sykje</string>
-    <string name="create_account">Akkount oanmeitsje</string>
+    <string name="create_account">Account oanmeitsje</string>
     <string name="username">Brûkersnamme</string>
-    <string name="logout">Útlogge</string>
-    <string name="login">Ynlogge</string>
-    <string name="read_receipt">Léze</string>
+    <string name="logout">Ofmelde</string>
+    <string name="login">Oanmelde</string>
+    <string name="read_receipt">Lêzen</string>
     <string name="search_in_my_contacts">Yn mien kontakten sykje</string>
     <string name="phone_book_perform_lookup">Om matrix kontakten sykje</string>
     <string name="message_action_item_redact">Fuortsmite…</string>
@@ -318,58 +318,58 @@
     <string name="groups_list">Groepslist</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Oanfraach ferstjoerd</string>
     <string name="e2e_re_request_encryption_key_sent">Kaai oanfraach ferstjoerd.</string>
-    <string name="login_error_login_email_not_yet">De email link wer oft noch net op klikt is</string>
-    <string name="login_error_user_in_use">Disse brûkersnamme wurd ol brûkt</string>
-    <string name="login_error_limit_exceeded">Der binne te folle oanfraachen festjoerd</string>
-    <string name="login_error_bad_json">Misfoarme JSON</string>
-    <string name="login_error_forbidden">Ûnjildiche brûkersnamme/wachtwurd</string>
-    <string name="login_error_ssl_handshake">Dyn apperaat brûkt in âlde ferzje fan it TLS feiligings protokol, kwetsber foar oanfallen, foar dyn feiligens kinst no net ferbine</string>
-    <string name="login_error_ssl_other">SSL Flater.</string>
-    <string name="login_error_homeserver_not_found">Kin de thústsjinner op disse URL net berikke, kontroleerje dit</string>
-    <string name="login_error_no_homeserver_found">Dit is net in jildich Matrix tsjinner adres</string>
-    <string name="login_error_unknown_host">Disse URL is net te berikken, kontroleerje dit</string>
+    <string name="login_error_login_email_not_yet">Der is noch net op de keppeling yn it e-mailberjocht klikt</string>
+    <string name="login_error_user_in_use">Dizze brûkersnamme is al yn gebrûk</string>
+    <string name="login_error_limit_exceeded">Der binne te folle oanfragen ferstjoerd</string>
+    <string name="login_error_bad_json">Unjildige JSON</string>
+    <string name="login_error_forbidden">Unjildige brûkersnamme/wachtwurd</string>
+    <string name="login_error_ssl_handshake">Jo apparaat brûkt in âlde ferzje fan it TLS-befeiligingsprotokol, kwetsber foar oanfallen. Ut feilichheidsoerwagingen sille jo gjin ferbining meitsje kinne</string>
+    <string name="login_error_ssl_other">SSL-flater.</string>
+    <string name="login_error_homeserver_not_found">Kin de thússerver op dizze URL net berikke, kontrolearje dit</string>
+    <string name="login_error_no_homeserver_found">Dit is net in jildich Matrix-serveradres</string>
+    <string name="login_error_unknown_host">Dizze URL is net te berikken, kontrolearje dit</string>
     <string name="login_error_invalid_home_server">Fier in jildiche URL yn</string>
-    <string name="login_error_unable_register">Kin net registreerje</string>
-    <string name="login_error_registration_network_error">Kin net registreerje: Netwurk flater</string>
-    <string name="login_error_unable_login">Kin net ynlogge</string>
-    <string name="auth_reset_password_error_unauthorized">Koe it email adres net ferifiëre: wês der wis fan dost op it linkje yn\'e email klikt hast</string>
-    <string name="auth_reset_password_email_validation_message">Der is een email nei %s stjoerd. Ost op it linkje klikt hast wot der yn stie, klikst hjir ûnder.</string>
-    <string name="auth_email_validation_message">Kontroleerje dyn email om troch te gean mei de registraasje</string>
+    <string name="login_error_unable_register">Registrearjen mislearre</string>
+    <string name="login_error_registration_network_error">Kin net registrearje: netwurkflater</string>
+    <string name="login_error_unable_login">Kin net oanmelde</string>
+    <string name="auth_reset_password_error_unauthorized">Koe it e-mailadres net ferifiearje: soargje dat jo op de keppeling yn it e-mailberjocht klikt hawwe</string>
+    <string name="auth_reset_password_email_validation_message">Der is in e-mail nei %s stjoerd. Klik hjirûnder sa gau as jo de keppeling yn de e-mail besocht hawwe.</string>
+    <string name="auth_email_validation_message">Kontrolearje dyn e-mail om troch te gean mei de registraasje</string>
     <string name="auth_forgot_password">Wachtwurd fergetten\?</string>
     <string name="auth_password_dont_match">Wachtwurden binne net gelyk</string>
-    <string name="auth_invalid_token">Ûnjildich token</string>
-    <string name="auth_missing_email_or_phone">Der mist een email adres of tillefoan nûmer</string>
-    <string name="auth_missing_phone">Tillefoan nûmer mist</string>
-    <string name="auth_missing_email">Email adres mist</string>
-    <string name="auth_email_already_defined">Dit email adres wurd ol brûkt.</string>
-    <string name="auth_invalid_phone">Dit sjucht der net út as in jildich tillefoan nûmer</string>
-    <string name="auth_opt_phone_number_placeholder">Tillefoan nûmer (opsjoneel)</string>
-    <string name="auth_phone_number_placeholder">Tillefoan nûmer</string>
+    <string name="auth_invalid_token">Unjildich token</string>
+    <string name="auth_missing_email_or_phone">Der mist in e-mailadres of telefoannûmer</string>
+    <string name="auth_missing_phone">Telefoannûmer mist</string>
+    <string name="auth_missing_email">E-mailadres mist</string>
+    <string name="auth_email_already_defined">Dit e-mailadres is al yn gebrûk.</string>
+    <string name="auth_invalid_phone">Dit is gjin jildich telefoannûmer</string>
+    <string name="auth_opt_phone_number_placeholder">Telefoannûmer (opsjoneel)</string>
+    <string name="auth_phone_number_placeholder">Telefoannûmer</string>
     <string name="auth_invalid_password">Wachtwurd te koart (min 6)</string>
-    <string name="auth_repeat_password_placeholder">Wachtwurd nog ris ynfiere</string>
+    <string name="auth_repeat_password_placeholder">Wachtwurd werhelje</string>
     <string name="auth_new_password_placeholder">Nij wachtwurd</string>
-    <string name="auth_login">Ynlogge</string>
+    <string name="auth_login">Oanmelde</string>
     <string name="call_switch_camera">Fan kamera wikselje</string>
-    <string name="option_take_video">Fideo nimme</string>
-    <string name="option_take_photo">Foto nimme</string>
-    <string name="option_take_photo_video">Foto of fideo nimme</string>
+    <string name="option_take_video">Fideo meitsje</string>
+    <string name="option_take_photo">Foto meitsje</string>
+    <string name="option_take_photo_video">Foto of fideo meitsje</string>
     <string name="option_send_sticker">Stickers ferstjoere</string>
-    <string name="option_send_files">Triemen ferstjoere</string>
-    <string name="call_format_turn_hd_on">HD ynskakelje</string>
-    <string name="call_format_turn_hd_off">HD útskakelje</string>
+    <string name="option_send_files">Bestannen ferstjoere</string>
+    <string name="call_format_turn_hd_on">HD ynskeakelje</string>
+    <string name="call_format_turn_hd_off">HD útskeakelje</string>
     <string name="call_camera_back">Efterkant</string>
     <string name="call_camera_front">Foarkant</string>
-    <string name="go_on_with">troch gean mei…</string>
+    <string name="go_on_with">trochgean mei…</string>
     <string name="auth_user_name_placeholder">Brûkersnamme</string>
     <string name="auth_missing_password">Wachtwurd mist</string>
-    <string name="auth_recaptcha_message">Disse Thús Tsjinner wol der graach wis fon wéze dost gjin robot bist</string>
-    <string name="auth_reset_password_missing_password">Der mat in nij wachtwurd ynfierd wurde.</string>
-    <string name="auth_reset_password_missing_email">It email adres dyt by dien akkount hjeard mat hjir ynfierd wurde.</string>
-    <string name="auth_reset_password_message">Om dyn wachtwurd opnij yn te stellen, mast it email adres dyt by dien account hjeard hjir ynfiere:</string>
-    <string name="auth_reset_password_next_step_button">Ik ha myn emailadres ferifiere</string>
-    <string name="auth_identity_server">Identiteits Tsjinner:</string>
-    <string name="auth_home_server">Thús Tsjinner:</string>
-    <string name="auth_username_in_use">Brûkernamme wurd ol brûkt</string>
+    <string name="auth_recaptcha_message">Dizze thússerver wol der graach wis fan wêze dat jo gjin robot binne</string>
+    <string name="auth_reset_password_missing_password">Der moat in nij wachtwurd ynfierd wurde.</string>
+    <string name="auth_reset_password_missing_email">It e-mailadres dat oan jo account keppele is moat ynfierd wurde.</string>
+    <string name="auth_reset_password_message">Om jo wachtwurd opnij yn te stellen, moatte jo it e-mailadres dat oan jo account keppele is ynfiere:</string>
+    <string name="auth_reset_password_next_step_button">Ik haw myn e-mailadres ferifiearre</string>
+    <string name="auth_identity_server">Identiteitsserver:</string>
+    <string name="auth_home_server">Thússerver:</string>
+    <string name="auth_username_in_use">Brûkersnamme al yn gebrûk</string>
     <string name="settings_security_and_privacy">Feiligens &amp; Privacy</string>
     <string name="room_widget_resource_grant_permission">Tastean</string>
     <string name="room_settings_room_version_title">Keamer ferzje</string>
@@ -388,8 +388,8 @@
     <string name="action_add">Tafoegje</string>
     <string name="bottom_action_notification">Notifikaasjes</string>
     <string name="create_spaces_default_public_room_name">Olgemien</string>
-    <string name="matrix_error">Matrix flater</string>
-    <string name="network_error">Netwurk flater</string>
+    <string name="matrix_error">Matrix-flater</string>
+    <string name="network_error">Netwurkflater</string>
     <string name="unable_to_send_message">Kin it berjocht net ferstjoere</string>
     <string name="notice_event_redacted">Berjocht fuortsmiten</string>
     <string name="labs_use_restricted_join_rule_desc">Waskôging hat ûndersteuning fan\'e tsjinner en in eksperimintele keamer nedich</string>
@@ -481,10 +481,10 @@
     <string name="call_transfer_users_tab_title">Brûkers</string>
     <string name="command_description_emote">Aksje sjen litte</string>
     <string name="notice_member_no_changes_by_you">Do hast neat feroare</string>
-    <string name="notice_room_topic_removed_by_you">Do hast it keamer ûnderwerp fuortsmiten</string>
-    <string name="notice_room_topic_removed">%1$s hat it keamer ûnderwerp fuortsmiten</string>
-    <string name="notice_room_name_removed_by_you">Do hast de keamer namme fuortsmiten</string>
-    <string name="notice_room_name_removed">%1$s hat de keamer namme fuortsmiten</string>
+    <string name="notice_room_topic_removed_by_you">Do hast it keamerûnderwerp fuortsmiten</string>
+    <string name="notice_room_topic_removed">%1$s hat it keamerûnderwerp fuortsmiten</string>
+    <string name="notice_room_name_removed_by_you">Do hast de keamernamme fuortsmiten</string>
+    <string name="notice_room_name_removed">%1$s hat de keamernamme fuortsmiten</string>
     <string name="notice_room_kick_with_reason">%1$s hat %2$s der út skopt. Reden: %3$s</string>
     <string name="notice_room_kick_with_reason_by_you">Do hast %1$s fuortskopt. Reden: %2$s</string>
     <string name="notice_direct_room_update_by_you">Do hast hjir fernijd.</string>
@@ -663,7 +663,7 @@
     <string name="room_permissions_change_settings">Ynstellingen feroarje</string>
     <string name="room_settings_permissions_title">Keamer rjochten</string>
     <string name="notice_room_server_acl_updated_title_by_you">Do hast de tsjinner ACLs foar dizze keamer feroare.</string>
-    <string name="notice_room_server_acl_updated_title">%s hat de tsjinner ACLs foar dizze keamer feroare.</string>
+    <string name="notice_room_server_acl_updated_title">%s hat de server-ACL\'s foar dizze keamer feroare.</string>
     <string name="notice_avatar_url_changed_by_you">Do hast dyn profyl ôfbylding feroare</string>
     <string name="send_suggestion_failed">Koe de suggestje net ferstjoere (%s)</string>
     <string name="send_suggestion_sent">Dankewol, it ferstjoeren fan de suggestje is slagge</string>
@@ -935,65 +935,65 @@
     <string name="media_slider_saved">Opslein</string>
     <string name="media_picker_both_capture_title">In foto as fideo meitsje</string>
     <string name="media_picker_cannot_record_video">Kin gjin fideo opnimme</string>
-    <string name="call"/>
+    <string name="call">Belje</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_cancel_download">It delheljen ôfbrekke\?</string>
     <string name="e2e_re_request_encryption_key">Opnij de fersifering kaaien fan jo oare sesjes opfreegje.</string>
-    <string name="login_error_unable_register_mail_ownership">Kin net registrearre : flater mei it befêstigjen fan eigendom fan e-mail adres</string>
-    <string name="login_error_network_error">Kin net ynlogge: Netwurk flater</string>
+    <string name="login_error_unable_register_mail_ownership">Registrearjen mislearre: e-mail-eigendomsflater</string>
+    <string name="login_error_network_error">Kin net oanmelde: netwurkflater</string>
     <string name="login_error_must_start_http">URL moat mei http[s]:// begjinne</string>
     <string name="auth_repeat_new_password_placeholder">Jo nije wachtwurd befêstigje</string>
-    <string name="auth_opt_email_placeholder">E-mail adres (opsjoneel)</string>
-    <string name="auth_email_placeholder">E-mail adres</string>
-    <string name="auth_user_id_placeholder">E-mailadres as brûkers namme</string>
+    <string name="auth_opt_email_placeholder">E-mailadres (opsjoneel)</string>
+    <string name="auth_email_placeholder">E-mailadres</string>
+    <string name="auth_user_id_placeholder">E-mailadres of brûkersnamme</string>
     <string name="auth_password_placeholder">Wachtwurd</string>
     <string name="auth_skip">Oerslaan</string>
     <string name="use_as_default_and_do_not_ask_again">As standert ynstelle en net wer freegje</string>
     <string name="option_always_ask">Altyd freegje</string>
-    <string name="sound_device_wireless_headset">Triedleaze Koptelefoan</string>
+    <string name="sound_device_wireless_headset">Triedleaze koptelefoan</string>
     <string name="sound_device_headset">Koptelefoan</string>
     <string name="sound_device_speaker">Lûdsprekker</string>
     <string name="call_failed_no_ice_use_alt">Probearje ris %s te brûken</string>
     <string name="option_send_voice">Stimlûd ferstjoere</string>
-    <string name="start_video_call">Begjinne mei Fideo Beljen</string>
-    <string name="start_voice_call">Begjinne mei Beljen</string>
-    <string name="identity_url">Identiteits Tsjinner URL</string>
-    <string name="hs_client_url">Thús tsjinner API URL</string>
-    <string name="hs_url">Thús tsjinner URL</string>
+    <string name="start_video_call">Fideo-oprop begjinne</string>
+    <string name="start_voice_call">Spraakoprop begjinne</string>
+    <string name="identity_url">URL identiteitsserver</string>
+    <string name="hs_client_url">API URL thússerver</string>
+    <string name="hs_url">URL thússerver</string>
     <string name="send_bug_report_failed">It oanjaan fan in flater yn dizze applikaasje is net slagge (%s)</string>
     <string name="send_bug_report_sent">It oanjaan fan in flater yn dizze applikaasje is slagge</string>
     <string name="join_room">Keamer binnen gean</string>
-    <string name="send_bug_report_progress">Avesaasje (%s%%)</string>
-    <string name="send_bug_report_app_crashed">Dizze applikaasje is de lêste kear fêst rûn. Wolle jo miskien it skerm iepenje om in flater yn dizze applikaasje oan te jaan\?</string>
-    <string name="send_bug_report_alert_message">It liker der op dat jo út lilkens mei jo telefoan skodzje. Wolle jo miskien it skerm iepenje om in flater yn dizze applikaasje oan te jaan\?</string>
-    <string name="spaces_header">Rômtes</string>
-    <string name="spaces_invited_header">Útnûgingen</string>
-    <string name="settings_room_directory_show_all_rooms_summary">Alle keamers yn it keamer oersjoch sjen litte, ek keamers mei ynhâld foar folwoeksenen.</string>
-    <string name="settings_room_directory_show_all_rooms">Keamers mei ynhâld foar folwoeksenen sjen litte</string>
-    <string name="settings_category_room_directory">Keamer oersjoch</string>
+    <string name="send_bug_report_progress">Foarútgong (%s%%)</string>
+    <string name="send_bug_report_app_crashed">Dizze applikaasje is de lêste kear fêstrûn. Wolle jo miskien it skerm iepenje om in flater yn dizze applikaasje oan te jaan\?</string>
+    <string name="send_bug_report_alert_message">It liket der op dat jo út lilkens mei jo telefoan skodzje. Wolle jo miskien it skerm iepenje om in flater yn dizze applikaasje oan te jaan\?</string>
+    <string name="spaces_header">Romten</string>
+    <string name="spaces_invited_header">Utnûgingen</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Alle keamers yn it keameroersjoch toane, ek keamers mei ynhâld foar folwoeksenen.</string>
+    <string name="settings_room_directory_show_all_rooms">Keamers mei ynhâld foar folwoeksenen toane</string>
+    <string name="settings_category_room_directory">Keameroersjoch</string>
     <string name="no_more_results">Gjin resultaten mear</string>
     <string name="suggested_header">Oanrekommandearre Keamers</string>
     <string name="dialog_edit_hint">Nije wearde</string>
     <string name="action_switch">Omskeakelje</string>
-    <string name="action_copy">Kopiearre</string>
+    <string name="action_copy">Kopiearje</string>
     <string name="cannot_call_yourself">Jo kinne josels net belje</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Jo meie gjin konferinsje starte</string>
-    <string name="no_permissions_to_start_conf_call">Jo meie gjin konferinsje petear yn dizze keamer starte</string>
-    <string name="start_chatting">Start jo Petearen</string>
-    <string name="denied_permission_camera">Om dizze aksje út te fieren, skeakelje dan graach de Kamera permisje yn fanút de systeem ynstellingen.</string>
-    <string name="notice_end_to_end_ok_by_you">Jo hawwe ein-oan-ein fersifering ynskeakele.</string>
-    <string name="notice_end_to_end_ok">%1$s hat ein-oan-ein fersifering ynskeakele.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s hat foarkaam dat gasten dizze keamer binnen gean kinne.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Jo hawwe foarkaam dat gasten dizze keamer binnen gean kinne.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s hat foarkaam dat gasten dizze keamer binnen gean kinne.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Jo hawwe foarkaam dat gasten dizze keamer binnen gean kinne.</string>
+    <string name="no_permissions_to_start_conf_call">Jo meie gjin konferinsjepetear yn dizze keamer starte</string>
+    <string name="start_chatting">Petearen starte</string>
+    <string name="denied_permission_camera">Om dizze aksje út te fieren, skeakelje dan de kameratastimming yn fan de systeemynstellingen út.</string>
+    <string name="notice_end_to_end_ok_by_you">Jo hawwe end-to-end-fersifering ynskeakele.</string>
+    <string name="notice_end_to_end_ok">%1$s hat end-to-end-fersifering ynskeakele.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s hat opkeard dat gasten dizze keamer binnen gean kinne.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Jo hawwe opkeard dat gasten dizze keamer binnen gean kinne.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s hat opkeard dat gasten dizze keamer binnen gean kinne.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Jo hawwe opkeard dat gasten dizze keamer binnen gean kinne.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">Jo hawwe gasten tastien om hjir binnen te gean.</string>
     <string name="notice_direct_room_guest_access_can_join">%1$s hat gasten tastien om hjir binnen te gean.</string>
     <string name="notice_room_guest_access_can_join_by_you">Jo hawwe gasten tastien om dizze keamer binnen te gean.</string>
     <string name="notice_room_guest_access_can_join">%1$s hat gasten tastien om dizze keamer binnen te gean.</string>
-    <string name="system_theme">Systeem Standert</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Jo hawwe ein-oan-ein fersifering ynskeakele (net erkend algoritme %1$s).</string>
+    <string name="system_theme">Systeemstandert</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Jo hawwe end-to-end-fersifering ynskeakele (net erkend algoritme %1$s).</string>
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s en 1 oar</item>
         <item quantity="other">%1$s en %2$d oaren</item>
@@ -1005,24 +1005,24 @@
     <string name="room_displayname_4_members">%1$s, %2$s, %3$s en %4$s</string>
     <string name="room_displayname_3_members">%1$s, %2$s en %3$s</string>
     <string name="room_displayname_two_members">%1$s en %2$s</string>
-    <string name="room_displayname_room_invite">Keamer Útnoeging</string>
+    <string name="room_displayname_room_invite">Keamerútnûging</string>
     <string name="room_error_join_failed_empty_room">It is no net mooglik om in lege keamer wer binnen te gean.</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Jo hawwe de útnoeging nei %1$s oannaam</string>
-    <string name="notice_room_third_party_registered_invite">%1$s hat de útnoeging nei %2$s oannaam</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Jo hawwe de útnoeging nei %1$s ynlutsen</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s hat de útnoeging nei %2$s wer ynlutsen</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Jo hawwe de útnoeging nei %1$s om de keamer binnen te gean wer ynlutsen</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s hat de útnoeging nei %2$s om de keamer binnen te gean wer ynlutsen</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Jo hawwe %1$s útnoege</string>
-    <string name="notice_direct_room_third_party_invite">%1$s hat %2$s útnoege</string>
-    <string name="notice_room_third_party_invite_by_you">Jo hawwe in útnoeging om de keamer binnen te gean nei %1$s stjoerd</string>
-    <string name="notice_room_third_party_invite">%1$s hat in útnoeging om de keamer binnen te gean nei %2$s stjoerd</string>
-    <string name="notice_room_avatar_removed">%1$s hat de keamer ôfbylding fuortsmiten</string>
-    <string name="notice_voip_finished">VoIP konferinsje ôfrûn</string>
-    <string name="notice_voip_started">VoIP konferinsje begûn</string>
-    <string name="notice_requested_voip_conference_by_you">Jo hawwe in VoIP konferinsje oanfrege</string>
-    <string name="notice_requested_voip_conference">%1$s hat in VoIP konferinsje oanfrege</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Alle tsjinners bin ferballe fan it meidwaan! Dizze keamer kin net mear brûkt wurde.</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Jo hawwe de útnûging nei %1$s oannaam</string>
+    <string name="notice_room_third_party_registered_invite">%1$s hat de útnûging nei %2$s oannaam</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Jo hawwe de útnûging nei %1$s ynlutsen</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s hat de útnûging nei %2$s wer ynlutsen</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Jo hawwe de útnûging nei %1$s om de keamer binnen te gean wer ynlutsen</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s hat de útnûging nei %2$s om de keamer binnen te gean wer ynlutsen</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Jo hawwe %1$s útnûge</string>
+    <string name="notice_direct_room_third_party_invite">%1$s hat %2$s útnûge</string>
+    <string name="notice_room_third_party_invite_by_you">Jo hawwe in útnûging nei %1$s stjoerd om de keamer binnen te gean</string>
+    <string name="notice_room_third_party_invite">%1$s hat in útnûging nei %2$s stjoerd om de keamer binnen te gean</string>
+    <string name="notice_room_avatar_removed">%1$s hat de keamerôfbylding fuortsmiten</string>
+    <string name="notice_voip_finished">VoIP-konferinsje ôfrûn</string>
+    <string name="notice_voip_started">VoIP-konferinsje begûn</string>
+    <string name="notice_requested_voip_conference_by_you">Jo hawwe in VoIP-konferinsje oanfrege</string>
+    <string name="notice_requested_voip_conference">%1$s hat in VoIP-konferinsje oanfrege</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Alle servers bin ferballe fan it meidwaan! Dizze keamer kin net mear brûkt wurde.</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Tsjinners dy oerien komme mei IP adressen binne no ferballe.</string>
     <string name="notice_room_server_acl_updated_ip_literals_allowed">• Tsjinners dy oerien komme mei IP adressen binne no tastien.</string>
     <string name="notice_room_server_acl_updated_was_allowed">• Tsjinners dy oerien komme mei %s binne út de list mei tastiene tsjinners wei helle.</string>
@@ -1032,7 +1032,7 @@
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Tsjinners dy oerien komme mei IP adressen binne ferballe.</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">• Tsjinners dy oerien komme mei IP adressen binne tastien.</string>
     <string name="notice_room_server_acl_set_banned">• Tsjinners dy oerien komme mei %s binne ferballe.</string>
-    <string name="notice_room_avatar_removed_by_you">Jo hawwe de keamer ôfbylding fuortsmiten</string>
+    <string name="notice_room_avatar_removed_by_you">Jo hawwe de keamerôfbylding fuortsmiten</string>
     <string name="notice_room_avatar_changed_by_you">Jo hawwe de keamer ôfbylding feroare</string>
     <string name="notice_room_avatar_changed">%1$s hat de keamer ôfbylding feroare</string>
     <string name="notice_avatar_url_changed">%1$s hat syn profylfoto feroare</string>
@@ -1048,4 +1048,21 @@
     </plurals>
     <string name="search_members_hint">Keamerleden filterje</string>
     <string name="soft_logout_title">Jo binne útlogd</string>
+    <string name="auth_use_server_options">Oanpaste serverynstellingen brûke (avansearre)</string>
+    <string name="auth_add_phone_message_2">Kies in telefoannûmer. Letter kinne jo derfoar kieze om minsken jo fine te litten fia dit nûmer.</string>
+    <string name="auth_add_email_message_2">Kies in e-mailadres om te brûken foar accountwerstel. Letter kinne jo derfoar kieze om minsken jo fine te litten fia jo e-mailadres.</string>
+    <string name="auth_return_to_login">Tebek nei it oanmeldingsskerm</string>
+    <string name="auth_send_reset_email">E-mail foar opnij ynstellen ferstjoere</string>
+    <string name="auth_submit">Yntsjinje</string>
+    <string name="auth_register">Account oanmeitsje</string>
+    <string name="auth_login_sso">Oanmelde mei unike oanmelding</string>
+    <string name="send_files_in">Ferstjoere nei</string>
+    <string name="action_unpublish">Depublisearje</string>
+    <string name="audio_meeting">Start audiopetear</string>
+    <string name="video_meeting">Start fideopetear</string>
+    <string name="missing_permissions_title">Missende tastimmingen</string>
+    <string name="spaces">Romten</string>
+    <string name="learn_more">Mear ynfo</string>
+    <string name="reset">Opnij ynstelle</string>
+    <string name="dismiss">Slute</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ga/strings.xml b/vector/src/main/res/values-ga/strings.xml
index ee84da7b92..ee70c5a802 100644
--- a/vector/src/main/res/values-ga/strings.xml
+++ b/vector/src/main/res/values-ga/strings.xml
@@ -34,24 +34,24 @@
     </plurals>
     <plurals name="format_time_h">
         <item quantity="one">%du</item>
-        <item quantity="two"></item>
+        <item quantity="two"/>
         <item quantity="few">%du</item>
         <item quantity="many">%du</item>
         <item quantity="other">%du</item>
     </plurals>
     <plurals name="format_time_m">
         <item quantity="one">%dn</item>
-        <item quantity="two"></item>
-        <item quantity="few"></item>
+        <item quantity="two"/>
+        <item quantity="few"/>
         <item quantity="many">%dn</item>
         <item quantity="other">%dn</item>
     </plurals>
     <plurals name="format_time_s">
-        <item quantity="one"></item>
-        <item quantity="two"></item>
-        <item quantity="few"></item>
+        <item quantity="one"/>
+        <item quantity="two"/>
+        <item quantity="few"/>
         <item quantity="many">%ds</item>
-        <item quantity="other"></item>
+        <item quantity="other"/>
     </plurals>
     <string name="room_sync_in_progress">Ag sioncronú…</string>
     <string name="reject">Diúltaigh</string>
@@ -162,4 +162,67 @@
     <string name="power_level_admin">Riarthóir</string>
     <string name="notice_room_visibility_world_readable">aon duine.</string>
     <string name="summary_message">%1$s: %2$s</string>
+    <string name="notice_room_visibility_unknown">anaithnid (%s).</string>
+    <string name="notice_room_visibility_shared">gach baill na tseomra.</string>
+    <string name="notice_room_visibility_joined">gach baill an tseomra, óna n-uair dulta isteach.</string>
+    <string name="notice_room_visibility_invited">gach baill an tseomra, óna n-uair cuireadh.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Rinne tú inléite teachtaireachtaí amach anseo do %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">Rinne %1$s inléite teachtaireachtaí amach anseo do %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Rinne tú inléite stair an tseomra amach anseo do %1$s</string>
+    <string name="notice_made_future_room_visibility">Rinne %1$s inléite stair an tseomra amach anseo do %2$s</string>
+    <string name="notice_ended_call_by_you">Chuir tú deireadh leis an glao.</string>
+    <string name="notice_ended_call">Chuir %s deireadh leis an glao.</string>
+    <string name="notice_answered_call_by_you">D\'fhreagair tú an glao.</string>
+    <string name="notice_answered_call">D\'fhreagair %s an glao.</string>
+    <string name="notice_call_candidates_by_you">Sheol tú sonraí chun an glao a shocrú.</string>
+    <string name="notice_call_candidates">Sheol %s sonraí chun an glao a shocrú.</string>
+    <string name="notice_placed_voice_call_by_you">Rinne tú guthghlao.</string>
+    <string name="notice_placed_voice_call">Rinne %s guthghlao.</string>
+    <string name="notice_placed_video_call_by_you">Físghlaoigh tú.</string>
+    <string name="notice_placed_video_call">Físghlaoigh %s.</string>
+    <string name="notice_room_name_changed_by_you">D\'athraigh tú ainm an tseomra go: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">D\'athraigh tú abhatár an tseomra</string>
+    <string name="notice_room_avatar_changed">D\'athraigh %1$s abhatár an tseomra</string>
+    <string name="notice_room_name_changed">D\'athraigh %1$s ainm an tseomra go: %2$s</string>
+    <string name="notice_room_topic_changed_by_you">D\'athraigh tú an ábhar go: %1$s</string>
+    <string name="notice_room_topic_changed">D\'athraigh %1$s an ábhar go: %2$s</string>
+    <string name="notice_display_name_removed_by_you">Bhain tú d\'ainm taispeána (Bhí sé %1$s)</string>
+    <string name="notice_display_name_removed">Bhain %1$s a n-ainm taispeána (Bhí sé %2$s)</string>
+    <string name="notice_display_name_changed_from_by_you">D\'athraigh tú d\'ainm taispeána ó %1$s go %2$s</string>
+    <string name="notice_display_name_changed_from">D\'athraigh %1$s a n-ainm taispeána ó %2$s go %3$s</string>
+    <string name="notice_display_name_set_by_you">Shonraigh tú d\'ainm taispeána mar %1$s</string>
+    <string name="notice_display_name_set">Shonraigh %1$s a n-ainm taispeána mar %2$s</string>
+    <string name="notice_avatar_url_changed_by_you">D\'athraigh tú d\'abhatár</string>
+    <string name="notice_avatar_url_changed">D\'athraigh %1$s a n-abhatár</string>
+    <string name="notice_room_withdraw_by_you">Thóg tú cuireadh %1$s ar ais</string>
+    <string name="notice_room_withdraw">Thóg %1$s cuireadh %2$s ar ais</string>
+    <string name="notice_room_unban">Chuir %1$s deireadh leis an cosc ar %2$s</string>
+    <string name="notice_room_unban_by_you">Chuir tú deireadh leis an cosc ar %1$s</string>
+    <string name="notice_room_ban_by_you">Chuir tú cosc ar %1$s</string>
+    <string name="notice_room_ban">Chuir %1$s cosc ar %2$s</string>
+    <string name="notice_room_kick_by_you">Dhíbir tú %1$s</string>
+    <string name="notice_room_kick">Dhíbir %1$s %2$s</string>
+    <string name="notice_room_reject_by_you">Dhiúltaigh tú don chuireadh</string>
+    <string name="notice_room_reject">Dhiúltaigh %1$s don chuireadh</string>
+    <string name="notice_direct_room_leave_by_you">D’fhág tú an seomra</string>
+    <string name="notice_direct_room_leave">D’fhág %1$s an seomra</string>
+    <string name="notice_room_leave_by_you">D’fhág tú an seomra</string>
+    <string name="notice_room_leave">D’fhág %1$s an seomra</string>
+    <string name="notice_direct_room_join_by_you">Chuaigh tú isteach</string>
+    <string name="notice_direct_room_join">Chuaigh %1$s isteach</string>
+    <string name="notice_room_join_by_you">Chuaigh tú isteach sa seomra</string>
+    <string name="notice_room_join">Chuaigh %1$s isteach sa seomra</string>
+    <string name="notice_room_invite_you">Thug %1$s cuireadh duit</string>
+    <string name="notice_room_invite_by_you">Thug tú cuireadh do %1$s</string>
+    <string name="notice_room_invite">Thug %1$s cuireadh do %2$s</string>
+    <string name="notice_direct_room_created_by_you">Chruthaigh tú an plé</string>
+    <string name="notice_direct_room_created">Chruthaigh %1$s an plé</string>
+    <string name="notice_room_created_by_you">Chruthaigh tú an seomra</string>
+    <string name="notice_room_created">Chruthaigh %1$s an seomra</string>
+    <string name="notice_room_invite_no_invitee_by_you">Do chuireadh</string>
+    <string name="notice_room_invite_no_invitee">Cuireadh %s</string>
+    <string name="summary_you_sent_sticker">Sheol tú greamán.</string>
+    <string name="summary_user_sent_sticker">Sheol %1$s greamán.</string>
+    <string name="summary_you_sent_image">Sheol tú íomhá.</string>
+    <string name="summary_user_sent_image">Sheol %1$s íomhá.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 58eebfe0f4..4113f38efe 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -2472,7 +2472,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="spaces_no_server_support_title">Úgy látszik a matrix szervered nem támogatja egyelőre a Tereket</string>
     <string name="spaces_feeling_experimental_subspace">Szeretsz kísérletezni\?
 \nTereket adhatsz terekhez.</string>
-    <string name="labs_space_show_orphan_in_home">Kísérleti tér - Csak árvák mutatása a Kezdőlapon</string>
     <string name="space_manage_rooms_and_spaces">Szobák és terek kezelése</string>
     <string name="space_mark_as_not_suggested">Nem javasoltnak jelölés</string>
     <string name="space_mark_as_suggested">Javasoltnak jelölés</string>
@@ -2576,7 +2575,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="dev_tools_send_custom_event">Egyéni esemény elküldése</string>
     <string name="dev_tools_explore_room_state">Szoba állapot felderítése</string>
     <string name="dev_tools_menu_name">Fejlesztői Eszközök</string>
-    <string name="a11y_public_room">Ez egy nyilvános szoba</string>
+    <string name="a11y_public_room">Nyilvános szoba</string>
     <string name="a11y_view_read_receipts">Olvasás visszajelzés megjelenítése</string>
     <string name="a11y_rule_notify_off">Nincs értesítés</string>
     <string name="a11y_rule_notify_silent">Értesítés hang nélkül</string>
@@ -2591,7 +2590,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="a11y_trust_level_default">Alapértelmezett megbízhatósági szint</string>
     <string name="a11y_selected">Kiválasztott</string>
     <string name="a11y_video">Videó</string>
-    <string name="a11y_unsent_draft">Ebben a szobába küldetlen piszkozat van</string>
+    <string name="a11y_unsent_draft">küldetlen piszkozat van</string>
     <string name="a11y_error_some_message_not_sent">Néhány üzenet nem lett elküldve</string>
     <string name="a11y_delete_avatar">Profilkép törlése</string>
     <string name="a11y_change_avatar">Profilkép megváltoztatása</string>
@@ -2629,7 +2628,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="call_tile_call_back">Visszahívás</string>
     <string name="call_tile_ended">Hívás befejeződött</string>
     <string name="call_tile_other_declined">%1$s elutasította a hívást</string>
-    <string name="call_tile_you_declined">Elutasítottad ezt a hívást: %1$s</string>
+    <string name="call_tile_you_declined">Elutasítottad ezt a hívást: %s</string>
     <string name="call_tile_in_call">Jelenleg ebben a hívásban van</string>
     <string name="call_tile_other_started_call">%1$s hívást kezdeményezett</string>
     <string name="call_tile_you_started_call">Hívást kezdeményeztél</string>
@@ -2754,7 +2753,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
         <item quantity="other">%d meghívó</item>
     </plurals>
     <string name="room_settings_room_version_title">Szoba verzió</string>
-    <string name="room_settings_room_access_restricted_title">Terek</string>
+    <string name="room_settings_room_access_restricted_title">Csak Tér tagoknak</string>
     <string name="room_settings_room_access_public_description">Bárki rátalálhat és beléphet a szobába</string>
     <string name="room_settings_room_access_public_title">Nyilvános</string>
     <string name="room_settings_room_access_private_description">Csak a meghívott személyek találják meg és tudnak belépni</string>
@@ -2803,7 +2802,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="unnamed_room">Névtelen szoba</string>
     <string name="private_space">Privát tér</string>
     <string name="public_space">Nyilvános tér</string>
-    <string name="a11y_public_space">Ez a Tér nyilvános</string>
+    <string name="a11y_public_space">Nyilvános Tér</string>
     <string name="call_transfer_unknown_person">Ismeretlen személy</string>
     <string name="call_transfer_consulting_with">Konzultáció vele: %1$s</string>
     <string name="directory_add_a_new_server_error_already_added">Ez a szerver már szerepel a listában</string>
@@ -2825,7 +2824,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="upgrade_room_no_power_to_manage">A szoba fejlesztéséhez engedélyre van szükséged</string>
     <string name="upgrade_room_update_parent_space">Szülő tér automatikus frissítése</string>
     <string name="upgrade_room_auto_invite">Felhasználók automatikus meghívása</string>
-    <string name="upgrade_public_room_from_to">A szobát fejleszted %s verzióról %s verzióra.</string>
+    <string name="upgrade_public_room_from_to">A szobát fejleszted %1$s verzióról %2$s verzióra.</string>
     <string name="upgrade_room_warning">A szoba fejlesztése haladó művelet és általában akkor ajánlott, ha a szoba valami hiba miatt instabil, hiányzik belőle valamilyen funkció vagy biztonsági hiányosság van benne.
 \nEz általában a szoba szerveren való feldolgozásának módját érinti.</string>
     <string name="upgrade_private_room">Privát szoba fejlesztése</string>
@@ -2853,4 +2852,103 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
         <item quantity="one">Nem fogadott hanghívás</item>
         <item quantity="other">%d nem fogadott hanghívás</item>
     </plurals>
+    <string name="upgrade_required">Fejlesztés szükséges</string>
+    <string name="sent_a_voice_message">Hanggal</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Más terek vagy szobák melyről lehet, hogy nem tudsz</string>
+    <string name="space_you_know_that_contains_this_room">Tér melyről tudod, hogy ezt a szobát tartalmazza</string>
+    <string name="decide_who_can_find_and_join">Döntsd el ki találhatja meg és léphet be ebbe a szobába.</string>
+    <string name="tap_to_edit_spaces">A terek szerkesztéséhez koppints</string>
+    <string name="select_spaces">Terek kiválasztása</string>
+    <string name="decide_which_spaces_can_access">Döntsd el melyik terek férhetnek hozzá ehhez a szobához. Ha a tér ki van választva a tagsága megtalálhatja és beléphet ebbe a szobába.</string>
+    <string name="spaces_which_can_access">A tér ezekhez fér hozzá:</string>
+    <string name="allow_space_member_to_find_and_access">Tér tagoknak engedélyezett a megtalálás és a hozzáférés.</string>
+    <string name="room_create_member_of_space_name_can_join">%s tér tagjai találhatják meg, kaphatnak bepillantást és csatlakozhatnak.</string>
+    <string name="room_settings_room_access_private_invite_only_title">Privát (csak meghívóval)</string>
+    <string name="settings_room_upgrades">Szoba fejlesztések</string>
+    <string name="settings_messages_by_bot">Üzenetek robotoktól</string>
+    <string name="settings_room_invitations">Szoba meghívók</string>
+    <string name="settings_encrypted_group_messages">Titkosított csoport beszélgetések</string>
+    <string name="settings_group_messages">Csoport üzenetek</string>
+    <string name="settings_encrypted_direct_messages">Titkosított közvetlen beszélgetések</string>
+    <string name="settings_messages_direct_messages">Közvetlen beszélgetések</string>
+    <string name="settings_messages_containing_username">Felhasználói nevem</string>
+    <string name="settings_messages_containing_display_name">Megjelenítési nevem</string>
+    <string name="settings_notification_notify_me_for">Értesítés ezért:</string>
+    <string name="settings_notification_other">Más</string>
+    <string name="settings_notification_mentions_and_keywords">Megemlítések és kulcsszavak</string>
+    <string name="settings_notification_default">Alapértelmezett értesítések</string>
+    <string name="denied_permission_voice_message">Hangüzenet küldéséhez engedélyezd a hozzáférést a mikrofonhoz.</string>
+    <string name="upgrade_room_for_restricted_note">Vedd figyelembe, hogy a fejlesztés a szoba új verzióját hozza létre. Minden jelenlegi üzenet itt marad az archivált szobában.</string>
+    <string name="upgrade_room_for_restricted_no_param">A szülő térből bárki megtalálhatja és beléphet ebbe a szobába - nem kell meghívni egyenként senkit. Ezt a beállítást bármikor megváltoztathatod a szoba beállításokban.</string>
+    <string name="upgrade_room_for_restricted">Itt: %s bárki megtalálhatja és beléphet ebbe a szobába - nem kell meghívni egyenként senkit. Ezt a beállítást bármikor megváltoztathatod a szoba beállításokban.</string>
+    <string name="voice_message_reply_content">Hang üzenet (%1$s)</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Válaszolni vagy szerkeszteni nem lehet hang üzenet módban</string>
+    <string name="error_voice_message_unable_to_record">Hang üzenetet nem lehet felvenni</string>
+    <string name="error_voice_message_unable_to_play">Ezt a hangüzenetet nem lehet lejátszani</string>
+    <string name="labs_use_voice_message">Hang üzenetek engedélyezése</string>
+    <string name="voice_message_tap_to_stop_toast">Megállításhoz és visszajátszáshoz koppints a felvételre</string>
+    <string name="voice_message_n_seconds_warning_toast">vissza van: %1$d</string>
+    <string name="voice_message_release_to_send_toast">Felvételhez tartsd nyomva, a küldéshez engedd el</string>
+    <string name="a11y_delete_recorded_voice_message">Felvett hang üzenet törlése</string>
+    <string name="a11y_recording_voice_message">Hang üzenet felvétel</string>
+    <string name="a11y_pause_voice_message">Hang üzenet szüneteltetése</string>
+    <string name="a11y_play_voice_message">Hang üzenet lejátszása</string>
+    <string name="a11y_lock_voice_message">Hang üzenet kitartó rögzítése</string>
+    <string name="voice_message_slide_to_cancel">Elhúzás a megszakításhoz</string>
+    <string name="a11y_start_voice_message">Hang üzenet indítása</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="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>
+    <string name="call_slide_to_end_conference">A hívás befejezéséhez oldalra húzni</string>
+    <string name="call_tap_to_return">%1$s koppintás a visszatéréshez</string>
+    <string name="call_one_active">Aktív hívás (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">Aktív hívás ·</item>
+        <item quantity="other">%1$d aktív hívás ·</item>
+    </plurals>
+    <string name="call_tile_connection_failed">Kapcsolódás sikertelen</string>
+    <string name="call_tile_no_answer">Nincs válasz</string>
+    <string name="call_tile_video_missed">Nem fogadott videóhívás</string>
+    <string name="call_tile_voice_missed">Nem fogadott hanghívás</string>
+    <string name="call_tile_video_declined">Videóhívás elutasítva</string>
+    <string name="call_tile_voice_declined">Hanghívás elutasítva</string>
+    <string name="call_tile_video_call_has_ended">Videóhívás befejeződött • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">Videóhívás befejeződött • %1$s</string>
+    <string name="call_tile_video_active">Videó hívás folyamatban</string>
+    <string name="call_tile_voice_active">Hanghívás folyamatban</string>
+    <string name="call_tile_video_incoming">Bejövő videó hívás</string>
+    <string name="call_tile_voice_incoming">Bejövő hanghívás</string>
+    <string name="call_tile_you_declined_this_call">Elutasítottad a hívást</string>
+    <string name="room_settings_room_notifications_account_settings">Fiók beállítások</string>
+    <string name="room_settings_room_notifications_manage_notifications">Értesítések kezelése itt: %1$s.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Megjegyzendő, hogy titkosított szobákban a megemlítésekre és kulcsszavakra való értesítés mobil eszközökön nem érhető el.</string>
+    <string name="room_settings_room_notifications_notify_me">Értesítés ezért:</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Titkosított szobákból mobiltelefonon nem kapsz értesítést megemlítésekről és kulcsszavakról.</string>
+    <string name="settings_messages_containing_keywords">Kulcsszavak</string>
+    <string name="settings_mentions_at_room">\@room</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Kulcsszavak nem tartalmazhatják ezt: „%s”</string>
+    <string name="settings_notification_keyword_contains_dot">Kulcsszó nem kezdődhet „.”-tal</string>
+    <string name="settings_notification_new_keyword">Kulcsszó hozzáadása</string>
+    <string name="settings_notification_your_keywords">Kulcsszavak</string>
+    <string name="room_settings_none">Nincs</string>
+    <string name="room_settings_mention_and_keyword_only">Csak megemlítések és kulcsszavak</string>
+    <string name="call_remove_jitsi_widget_progress">Hívás vége…</string>
+    <string name="call_ended_invite_timeout_title">Nincs válasz</string>
+    <string name="call_ended_user_busy_description">A hívott felhasználó foglalt.</string>
+    <string name="call_ended_user_busy_title">Felhasználó foglalt</string>
+    <string name="audio_call_with_participant">Hanghívás vele: %s</string>
+    <string name="video_call_with_participant">Videóhívás vele: %s</string>
+    <string name="call_ringing">Hívás kicseng…</string>
+    <string name="spaces">Terek</string>
+    <string name="learn_more">Tudj meg többet</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 c4737ac5ce..8d69b4ded9 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1185,8 +1185,7 @@
     <string name="open_settings">Apri le Impostazioni</string>
     <string name="settings_troubleshoot_test_account_settings_title">Impostazioni account.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Le notifiche sono abilitate per il tuo account.</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">Le notifiche sono disabilitate per il tuo account.
-\nControlla le impostazioni dell\'account.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Le notifiche sono disabilitate per il tuo account.\nControlla le impostazioni dell\'account.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Abilita</string>
     <string name="settings_troubleshoot_test_device_settings_title">Impostazioni sessione.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Le notifiche sono attive per questa sessione.</string>
@@ -1742,13 +1741,13 @@
     <string name="room_join_rules_public">%1$s ha reso la stanza pubblica. Ora è raggiungibile da chiunque ne conosca l\'indirizzo.</string>
     <string name="room_join_rules_invite">%1$s ha reso la stanza accessibile solo su invito.</string>
     <string name="timeline_unread_messages">Messaggi non letti</string>
-    <string name="login_splash_title">Le -tue- conversazioni appartengono solo a te.</string>
+    <string name="login_splash_title">Le tue conversazioni appartengono solo a te.</string>
     <string name="login_splash_text1">Scambia messaggi diretti o nei gruppi</string>
     <string name="login_splash_text2">Rendi sicure le tue conversazioni grazie alla crittografia</string>
     <string name="login_splash_text3">Estendi e personalizza la tua esperienza</string>
     <string name="login_splash_submit">Inizia</string>
     <string name="login_server_title">Seleziona un server</string>
-    <string name="login_server_text">Proprio come le email: puoi fare un account dove preferisci e interagire con tutti</string>
+    <string name="login_server_text">Proprio come con le email, puoi creare un account dove preferisci e interagire con chiunque</string>
     <string name="login_server_matrix_org_text">Unisciti gratuitamente a milioni di utenti sul più grande server pubblico</string>
     <string name="login_server_modular_text">Hosting premium per organizzazioni</string>
     <string name="login_server_modular_learn_more">Maggiori info</string>
@@ -2649,7 +2648,7 @@
     <string name="call_tile_call_back">Richiama</string>
     <string name="call_tile_ended">Questa chiamata è terminata</string>
     <string name="call_tile_other_declined">%1$s ha rifiutato questa chiamata</string>
-    <string name="call_tile_you_declined">Hai rifiutato questa chiamata %1$s</string>
+    <string name="call_tile_you_declined">Hai rifiutato questa chiamata %s</string>
     <string name="call_tile_in_call">Stai partecipando a questa chiamata</string>
     <string name="call_tile_other_started_call">%1$s ha iniziato una chiamata</string>
     <string name="call_tile_you_started_call">Hai iniziato una chiamata</string>
@@ -2697,7 +2696,7 @@
     <string name="a11y_trust_level_default">Livello di fiducia predefinito</string>
     <string name="a11y_selected">Selezionato</string>
     <string name="a11y_video">Video</string>
-    <string name="a11y_unsent_draft">Questa stanza ha una bozza non inviata</string>
+    <string name="a11y_unsent_draft">ha una bozza non inviata</string>
     <string name="a11y_error_some_message_not_sent">Alcuni messaggi non sono stati inviati</string>
     <string name="a11y_delete_avatar">Elimina immagine profilo</string>
     <string name="a11y_change_avatar">Cambia immagine profilo</string>
@@ -2814,7 +2813,7 @@
     <string name="space_settings_manage_rooms">Gestisci stanze</string>
     <string name="looking_for_someone_not_in_space">Cerchi qualcuno che non è in %s\?</string>
     <string name="user_invites_you">%s ti ha invitato</string>
-    <string name="a11y_public_room">Questa stanza è pubblica</string>
+    <string name="a11y_public_room">Stanza pubblica</string>
     <string name="send_images_and_video_with_original_size">Invia i file multimediali nella dimensione originale</string>
     <plurals name="send_videos_with_original_size">
         <item quantity="one">Invia il video nella dimensione originale</item>
@@ -2839,7 +2838,6 @@
     <string name="space_leave_prompt_msg_as_admin">Sei l\'Amministratore di questo Spazio. Assicurati di aver nominato un altro amministratore prima di uscire.</string>
     <string name="space_leave_prompt_msg_only_you">Sei l\'unico utente di questo Spazio. Se esci nessuno potrà più entrarci. Nemmeno tu.</string>
     <string name="space_add_rooms">Aggiungi stanze</string>
-    <string name="labs_space_show_orphan_in_home">Spazio sperimentale - Mostra solo stanze orfane nella Home</string>
     <string name="this_space_has_no_rooms_admin">Alcune stanze potrebbero essere nascoste perché sono private e ti serve il loro invito.</string>
     <string name="this_space_has_no_rooms_not_admin">Alcune stanze potrebbero essere nascoste perché sono private e ti serve il loro invito.
 \nNon hai il permesso di aggiungere stanze.</string>
@@ -2851,7 +2849,7 @@
     <string name="unnamed_room">Stanza senza nome</string>
     <string name="private_space">Spazio privato</string>
     <string name="public_space">Spazio pubblico</string>
-    <string name="a11y_public_space">Questo spazio è pubblico</string>
+    <string name="a11y_public_space">Spazio pubblico</string>
     <string name="call_transfer_unknown_person">Persona sconosciuta</string>
     <string name="call_transfer_transfer_to_title">Trasferisci a %1$s</string>
     <string name="call_transfer_consulting_with">Consultazione con %1$s</string>
@@ -2874,7 +2872,7 @@
     <string name="upgrade_room_no_power_to_manage">Ti serve il permesso per aggiornare una stanza</string>
     <string name="upgrade_room_update_parent_space">Aggiorna il padre dello spazio automaticamente</string>
     <string name="upgrade_room_auto_invite">Invita utenti automaticamente</string>
-    <string name="upgrade_public_room_from_to">Aggiornerai questa stanza dalla %s alla %s.</string>
+    <string name="upgrade_public_room_from_to">Aggiornerai questa stanza dalla %1$s alla %2$s.</string>
     <string name="upgrade_room_warning">L\'aggiornamento di una stanza è un\'azione avanzata e solitamente è consigliata quando una stanza è instabile a causa di errori, funzionalità mancanti o vulnerabilità di sicurezza.
 \nDi solito influisce solo su come la stanza viene elaborata sul server.</string>
     <string name="upgrade_private_room">Aggiorna stanza privata</string>
@@ -2934,4 +2932,71 @@
     <string name="room_create_member_of_space_name_can_join">I membri dello spazio %s possono trovare, vedere l\'anteprima ed entrare.</string>
     <string name="room_settings_room_access_private_invite_only_title">Privata (solo a invito)</string>
     <string name="denied_permission_voice_message">Per inviare messaggi vocali, consenti l\'autorizzazione del microfono.</string>
+    <string name="settings_room_upgrades">Aggiornamenti stanza</string>
+    <string name="settings_messages_by_bot">Messaggi da bot</string>
+    <string name="settings_room_invitations">Inviti a stanze</string>
+    <string name="settings_encrypted_group_messages">Messaggi di gruppo cifrati</string>
+    <string name="settings_group_messages">Messaggi di gruppo</string>
+    <string name="settings_encrypted_direct_messages">Messaggi diretti cifrati</string>
+    <string name="settings_messages_direct_messages">Messaggi diretti</string>
+    <string name="settings_messages_containing_username">Il mio nome utente</string>
+    <string name="settings_messages_containing_display_name">Il mio nome visibile</string>
+    <string name="settings_notification_notify_me_for">Notificami per</string>
+    <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="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>
+    <string name="call_slide_to_end_conference">Scorri per terminare la chiamata</string>
+    <string name="call_tap_to_return">%1$s Tocca per tornare</string>
+    <string name="call_one_active">Chiamata attiva (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">Chiamata attiva ·</item>
+        <item quantity="other">%1$d chiamate attive ·</item>
+    </plurals>
+    <string name="call_tile_connection_failed">Connessione fallita</string>
+    <string name="call_tile_no_answer">Nessuna risposta</string>
+    <string name="call_tile_video_missed">Videochiamata persa</string>
+    <string name="call_tile_voice_missed">Telefonata persa</string>
+    <string name="call_tile_video_declined">Videochiamata rifiutata</string>
+    <string name="call_tile_voice_declined">Telefonata rifiutata</string>
+    <string name="call_tile_video_call_has_ended">Videochiamata terminata • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">Telefonata terminata • %1$s</string>
+    <string name="call_tile_video_active">Videochiamata attiva</string>
+    <string name="call_tile_voice_active">Telefonata attiva</string>
+    <string name="call_tile_video_incoming">Videochiamata in arrivo</string>
+    <string name="call_tile_voice_incoming">Telefonata in arrivo</string>
+    <string name="call_tile_you_declined_this_call">Hai rifiutato questa chiamata</string>
+    <string name="room_settings_room_notifications_account_settings">Impostazioni dell\'account</string>
+    <string name="room_settings_room_notifications_manage_notifications">Puoi gestire le notifiche nelle %1$s.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Nota che le notifiche per menzioni e parole chiave non sono disponibili nelle stanze cifrate su mobile.</string>
+    <string name="room_settings_room_notifications_notify_me">Notificami per</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Non riceverai notifiche per menzioni e parole chiave in stanze cifrate su mobile.</string>
+    <string name="settings_messages_containing_keywords">Parole chiave</string>
+    <string name="settings_mentions_at_room">\@stanza</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Le parole chiave non possono contenere \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">Le parole chiave non possono iniziare con \'.\'</string>
+    <string name="settings_notification_new_keyword">Aggiungi nuova parola chiave</string>
+    <string name="settings_notification_your_keywords">Le tue parole chiave</string>
+    <string name="room_settings_none">Nessuno</string>
+    <string name="room_settings_mention_and_keyword_only">Solo menzioni e parole chiave</string>
+    <string name="call_remove_jitsi_widget_progress">Chiusura chiamata…</string>
+    <string name="call_ended_invite_timeout_title">Nessuna risposta</string>
+    <string name="call_ended_user_busy_description">L\'utente che hai chiamato è occupato.</string>
+    <string name="call_ended_user_busy_title">Utente occupato</string>
+    <string name="audio_call_with_participant">Telefonata con %s</string>
+    <string name="video_call_with_participant">Videochiamata con %s</string>
+    <string name="call_ringing">Sta squillando…</string>
+    <string name="spaces">Spazi</string>
+    <string name="learn_more">Maggiori informazioni</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 7412b950a5..96324c2058 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -105,16 +105,16 @@
     <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_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_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>
+    <string name="no_public_room_placeholder">公開されたルームがありません</string>
     <plurals name="public_room_nb_users">
         <item quantity="other">%d名</item>
     </plurals>
@@ -135,7 +135,7 @@
     <string name="action_video_call">ビデオ通話</string>
     <string name="action_global_search">全体検索</string>
     <string name="local_address_book_header">端末の電話帳</string>
-    <string name="no_room_placeholder">部屋がありません</string>
+    <string name="no_room_placeholder">ルームがありません</string>
     <string name="search">検索</string>
     <string name="option_send_files">ファイルを送信</string>
     <string name="auth_return_to_login">ログイン画面へ戻る</string>
@@ -206,7 +206,7 @@
     <string name="remove">削除</string>
     <string name="join">参加</string>
     <string name="room_preview_invitation_format">あなたは %s さんに呼ばれてこの部屋へ参加しました</string>
-    <string name="room_creation_title">新しい対話</string>
+    <string name="room_creation_title">新しい会話</string>
     <string name="room_creation_add_member">参加者を追加</string>
     <string name="room_title_one_member">1名</string>
     <string name="room_participants_remove_prompt_msg">本当に%sさんを退室させますか?</string>
@@ -227,7 +227,7 @@
     <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_direct_chat">会話</string>
     <string name="room_settings_forget">忘れる</string>
     <string name="settings_profile_picture">自分のアイコン画像</string>
     <string name="settings_display_name">表示名</string>
@@ -238,7 +238,7 @@
     <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">1対1対話に発言されたとき</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_call_invitations">通話の呼出があったとき</string>
@@ -349,7 +349,7 @@
     <string name="view_decrypted_source">暗号解除されたソースコードを表示</string>
     <string name="rename">名前変更</string>
     <string name="offline">切断中</string>
-    <string name="start_new_chat">対話を開始</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>
@@ -364,8 +364,8 @@
     <string name="no_conversation_placeholder">会話なし</string>
     <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_header">ルーム</string>
+    <string name="rooms_directory_header">ルーム一覧</string>
     <string name="user_directory_header">利用者一覧</string>
     <string name="send_files_in">送信する</string>
     <string name="logout">サインアウト</string>
@@ -394,7 +394,7 @@
     <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_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>
@@ -453,7 +453,7 @@
     <string name="room_recents_favourites">お気に入り</string>
     <string name="room_recents_conversations">部屋</string>
     <string name="room_recents_low_priority">低優先度</string>
-    <string name="room_recents_start_chat">対話を開始</string>
+    <string name="room_recents_start_chat">会話を開始</string>
     <string name="room_recents_create_room">部屋を作成</string>
     <string name="room_recents_join_room">部屋へ参加</string>
     <string name="room_recents_join_room_title">部屋へ参加</string>
@@ -472,7 +472,7 @@
     <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_identity_server">認証サーバー</string>
     <string name="account_email_not_found_error">メールアドレスが見つかりません。</string>
     <string name="account_phone_number_already_used_error">この電話番号は既に使用されています。</string>
     <string name="settings_change_password">パスワード変更</string>
@@ -501,7 +501,7 @@
     <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="identity_url">認証サーバ ーURL</string>
     <string name="auth_login">ログイン</string>
     <string name="room_add_matrix_apps">Matrixアプリを追加</string>
     <string name="widget_integration_positive_power_level">権限の数値は正の整数で入力してください。</string>
@@ -671,7 +671,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="groups_invite_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_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>
@@ -971,7 +971,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="fab_menu_create_chat">ダイレクトメッセージ</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_name_hint">名前</string>
     <string name="create_room_public_title">公開する</string>
     <string name="create_room_public_description">部屋が公開され、誰でもこの部屋に参加できるようになります</string>
     <string name="create_room_directory_title">部屋一覧</string>
@@ -1179,7 +1179,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="reset">リセット</string>
     <string name="none">なし</string>
     <string name="room_settings_topic_hint">トピック</string>
-    <string name="room_settings_name_hint">部屋名</string>
+    <string name="room_settings_name_hint">ルーム名</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>
@@ -1196,12 +1196,12 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="invite_friends">フレンドを招待</string>
     <string name="user_directory_search_hint">名前または ID で検索</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_title">インテグレーションが無効になっています</string>
-    <string name="settings_integration_manager">インテグレーションマネージャー（統合管理）</string>
+    <string name="settings_integration_manager">インテグレーションマネージャー</string>
     <string name="settings_integration_allow">インテグレーションを許可</string>
     <string name="settings_data_save_mode_summary">データセーブモードでは、特定のフィルターを適用することで、プレゼンスの更新やタイピングの通知がフィルタリングされます。</string>
     <string name="settings_troubleshoot_test_fcm_success">FCMトークンが正常に取得されました:
@@ -1365,10 +1365,10 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     </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_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_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_direct_room_update">%sがここをアップグレードしました。</string>
     <string name="notice_room_update">%s がこのルームをアップグレードしました。</string>
@@ -1450,7 +1450,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <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_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>
@@ -1486,8 +1486,8 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <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>
+    <string name="settings_integrations_summary">ボット、ブリッジ、ウィジェット、ステッカーパックの管理をします。
+\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>
@@ -1531,9 +1531,9 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <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_token_registration_failed">FCMトークンのホームサーバーへの登録に失敗しました。:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_token_registration_success">FCMトークンがホームサーバーに正常に登録されました。</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCMトークンのホームサーバーへの登録が成功しました。</string>
     <string name="settings_troubleshoot_test_token_registration_title">トークンの登録</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">アカウントを追加する</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
@@ -1546,12 +1546,12 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
 \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_updated_ip_literals_not_allowed">• サーバーにマッチするIPリテラルが禁止されるようになりました。</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>
     <string name="notice_room_server_acl_updated_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_banned">• %sに一致するサーバーは禁止されています。</string>
     <plurals name="two_and_some_others_read">
         <item quantity="other">%1$sや %2$sそれに%3$dに他の人も読みました</item>
     </plurals>
@@ -1605,7 +1605,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="invite_by_link">リンクを共有</string>
     <string name="invite_to_space_with_name">%s に招待する</string>
     <string name="invite_by_email">Eメールで招待</string>
-    <string name="create_space_topic_hint">説明</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>
@@ -1637,12 +1637,12 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <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_get_version_error">最新の復号キーのバージョンを取得するのに失敗しました（%s）。</string>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="other">%d個の新しい鍵がこのセッションに追加されました。</item>
     </plurals>
     <plurals name="keys_backup_restore_success_description_part1">
-        <item quantity="other">%d個の鍵を含めたバックアップを復元しました。</item>
+        <item quantity="other">%d個のキーが含まれたバックアップを復元しました。</item>
     </plurals>
     <string name="keys_backup_restore_success_title">バックアップが復元されました %s！</string>
     <string name="keys_backup_recovery_code_error_decrypt">この復元鍵ではバックアップを復号できませんでした。正しい復元鍵を入力したことを確認してください。</string>
@@ -1669,12 +1669,12 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <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_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
@@ -1686,7 +1686,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
 \n復元鍵はパスワードマネージャーや金庫のような、非常に安全な場所で保管してください。</string>
     <string name="keys_backup_setup_step3_text_line1">暗号鍵がバックアップ中です。</string>
     <string name="keys_backup_setup_step2_skip_button_title">（高度）復元鍵を使用して設定</string>
-    <string name="keys_backup_setup_step1_recovery_key_alternative">または、復元鍵を使用してバックアップを保護しバックアップを保護できます。復元鍵は安全な場所で保管してください。</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">または、リカバリーキーでバックアップを保護し、安全な場所に保存します。</string>
     <string name="keys_backup_setup_step2_text_description">暗号鍵のコピーを暗号化してホームサーバに保存します。バックアップを保護するためにパスフレーズを設定してください。
 \n
 \n最高度のセキュリティのために、アカウントのパスワードと異なることが大切です。</string>
@@ -1731,7 +1731,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <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">%2$sと%3$sに%1$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>
@@ -1743,17 +1743,17 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     </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_prompt">検索される新しいサーバーの名前を入力します。</string>
     <string name="directory_add_a_new_server">新しいサーバーを追加</string>
     <string name="directory_your_server">あなたのサーバ</string>
     <string name="encryption_message_recovery">暗号化されたメッセージの復元</string>
-    <string name="device_name_warning">セッションの公開名は対話中の相手に閲覧できます</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>
     </plurals>
     <string name="room_settings_room_access_restricted_description">この部屋が含まれているスペースの参加者誰でも発見し参加できます。部屋をスペースに追加できるのは部屋の管理者だけです。</string>
-    <string name="room_settings_room_access_restricted_title">スペース</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_title">公開</string>
     <string name="room_settings_room_access_private_description">参加された人のみが部屋を発見し参加できます</string>
@@ -1787,7 +1787,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="continue_anyway">無視して続行</string>
     <string name="option_always_ask">毎回確認する</string>
     <string name="spaces_invited_header">招待</string>
-    <string name="suggested_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>
@@ -1842,4 +1842,213 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <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="send_file_step_compressing_image">画像を圧縮しています…</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="feedback">フィードバック</string>
+    <string name="send_feedback_space_info">現在、spaceのベータ版を使用しています。お客様のフィードバックは次のバージョンに反映されます。ご意見を参考にさせていただくため、お客様のプラットフォームとユーザー名を記載させていただきます。</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>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="settings_push_gateway_no_pushers">登録されたプッシュゲートウェイはありません</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="keys_backup_unable_to_get_trust_info">信頼情報の取得中にエラーが発生しました</string>
+    <string name="create_room_federation_error">ルーム作成されましたが、一部の招待が送信されていません
+\n理由:
+\n
+\n%s</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_name_section">ルーム名</string>
+    <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="please_wait">お待ち下さい…</string>
+    <string name="error_no_network">ネットワークがありません。インターネット接続を確認してください。</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="reactions_like">いいね</string>
+    <string name="reactions_agree">同意</string>
+    <string name="title_activity_emoji_reaction_picker">リアクション</string>
+    <string name="room_list_rooms_empty_body">ルームがここに表示されます。右下の[+]をタップして、既存のルームを検索するか、独自のルームを開始します。</string>
+    <string name="room_list_people_empty_body">ダイレクトメッセージの会話がここに表示されます。右下の[+]をタップして開始します。</string>
+    <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="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">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_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_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="sas_cancelled_by_me">検証がキャンセルされました。
+\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_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_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 \"のカスタムサーバ構成を検出しました。
+\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="secure_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="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="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="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_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_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>
+    </plurals>
+    <plurals name="missed_audio_call">
+        <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="no_more_results">結果がありません</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="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）に送信することに同意しますか？
+\n
+\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_mail_pending">未確認</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="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_identity_server">他の人が見つけられるように</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="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="link_copied_to_clipboard">クリップボードにコピーされたリンク</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_title">お探しのものが見つかりませんか？</string>
+    <string name="send_suggestion_report_placeholder">あなたの提案をここに書いてください</string>
+    <string name="send_suggestion_content">ご意見・ご感想をお聞かせください。</string>
+    <string name="send_suggestion">提案する</string>
+    <string name="push_gateway_item_format">フォーマット:</string>
+    <string name="push_gateway_item_url">URL:</string>
+    <string name="push_gateway_item_device_name">セッション名:</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index bf220237da..822b37f2d7 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1700,4 +1700,61 @@
     <string name="summary_you_sent_image">Du sendte et bilde.</string>
     <string name="summary_user_sent_image">%1$s sendte et bilde.</string>
     <string name="summary_message">%1$s: %2$s</string>
+    <string name="this_space_has_no_rooms_admin">Noen rom kan være skjult fordi de er private, og du trenger en invitasjon.</string>
+    <string name="it_may_take_some_time">Vær tålmodig, det kan ta litt tid.</string>
+    <string name="upgrade">Oppgrader</string>
+    <string name="upgrade_room_auto_invite">Inviter brukere automatisk</string>
+    <string name="upgrade_room_no_power_to_manage">Du trenger tillatelse for å oppgradere et rom</string>
+    <string name="room_upgrade_to_recommended_version">Oppgrader til den anbefalte romversjonen</string>
+    <string name="error_failed_to_join_room">Beklager, det oppstod en feil under forsøk på å bli med: %s</string>
+    <string name="a11y_start_voice_message">Start talemelding</string>
+    <string name="voice_message_slide_to_cancel">Skyv for å avbryte</string>
+    <string name="a11y_play_voice_message">Spill av talemelding</string>
+    <string name="a11y_delete_recorded_voice_message">Slett innspilt talemelding</string>
+    <string name="voice_message_release_to_send_toast">Hold inne for å spille inn, slipp for å sende</string>
+    <string name="voice_message_tap_to_stop_toast">Trykk på innspillingen for å stoppe eller lytte</string>
+    <string name="labs_use_voice_message">Aktiver talemelding</string>
+    <string name="error_voice_message_unable_to_play">Kan ikke spille denne talemeldingen</string>
+    <string name="error_voice_message_unable_to_record">Kan ikke ta opp en talemelding</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Kan ikke svare eller redigere mens talemeldingen er aktiv</string>
+    <string name="voice_message_reply_content">Talemelding (%1$s)</string>
+    <string name="upgrade_room_for_restricted_no_param">Alle i et forelderrom vil kunne finne og bli med i dette rommet - du trenger ikke å invitere alle manuelt. Du kan når som helst endre dette i rominnstillingene.</string>
+    <string name="upgrade_room_for_restricted_note">Vær oppmerksom på at oppgradering vil gjøre en ny versjon av rommet. Alle nåværende meldinger vil forbli i dette arkiverte rommet.</string>
+    <string name="notice_room_kick">%1$s sparket %2$s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Din invitasjon</string>
+    <string name="suggested_rooms_pills_on_empty_header">Velkommen til %1$s, %2$s.</string>
+    <string name="space_add_rooms">Legg til rom</string>
+    <string name="spaces_beta_welcome_to_spaces">Velkommen til Mellomrom!</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Mellomrom er en ny måte å gruppere rom og mennesker på.</string>
+    <string name="you_are_invited">Du er invitert</string>
+    <string name="labs_use_restricted_join_rule_desc">Advarsel krever serverstøtte og eksperimentell romversjon</string>
+    <string name="user_invites_you">%s inviterer deg</string>
+    <string name="looking_for_someone_not_in_space">Leter du etter noen som ikke er i %s\?</string>
+    <string name="space_settings_manage_rooms">Administrer rom</string>
+    <string name="make_this_space_public">Gjør dette rommet offentlig</string>
+    <string name="space_suggested">Foreslått</string>
+    <string name="space_mark_as_suggested">Merk som foreslått</string>
+    <string name="space_mark_as_not_suggested">Merk som ikke foreslått</string>
+    <string name="space_manage_rooms_and_spaces">Administrer rom og mellomrom</string>
+    <string name="spaces_feeling_experimental_subspace">Føler du deg eksperimentell\?
+\nDu kan legge til eksisterende mellomrom i et mellomrom.</string>
+    <string name="spaces_no_server_support_title">Det ser ut til at hjemmeserveren din ikke støtter Mellomrom ennå</string>
+    <string name="spaces_no_server_support_description">Ta kontakt med din hjemmetjener -administrator for mer informasjon</string>
+    <string name="this_space_has_no_rooms_not_admin">Noen rom kan være skjult fordi de er private, og du trenger en invitasjon.
+\nDu har ikke tillatelse til å legge til rom.</string>
+    <string name="teammate_spaces_might_not_join">For øyeblikket er det ikke sikkert at folk kan bli med i private rom du lager.
+\n
+\nVi vil forbedre dette som en del av betaen, men ville bare gi deg beskjed.</string>
+    <string name="upgrade_required">Oppgradering kreves</string>
+    <string name="upgrade_public_room">Oppgrader offentlig rom</string>
+    <string name="upgrade_private_room">Oppgrader privat rom</string>
+    <string name="upgrade_room_warning">Oppgradering av et rom er en avansert handling og anbefales vanligvis når et rom er ustabilt på grunn av feil, manglende funksjoner eller sikkerhetsproblemer.
+\nDette påvirker vanligvis bare hvordan rommet behandles på serveren.</string>
+    <string name="upgrade_public_room_from_to">Du oppgraderer dette rommet fra %1$s til %2$s.</string>
+    <string name="allow_anyone_in_room_to_access">La alle i %s finne og få tilgang. Du kan også velge andre mellomrom.</string>
+    <string name="room_using_unstable_room_version">Dette rommet kjører romversjon %s, som denne hjemmeserveren har merket som ustabil.</string>
+    <string name="a11y_lock_voice_message">Lås for talemeldinger</string>
+    <string name="a11y_pause_voice_message">Pause talemelding</string>
+    <string name="a11y_recording_voice_message">Tar opp talemelding</string>
+    <string name="upgrade_room_for_restricted">Alle i %s vil kunne finne og bli med i dette rommet - du trenger ikke å invitere alle manuelt. Du kan når som helst endre dette i rominnstillingene.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index a76c94cc05..6c4038e56a 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -21,7 +21,7 @@
     <string name="notice_placed_video_call">%s heeft een video-oproep gemaakt.</string>
     <string name="notice_placed_voice_call">%s heeft een spraakoproep gemaakt.</string>
     <string name="notice_answered_call">%s heeft de oproep beantwoord.</string>
-    <string name="notice_ended_call">%s heeft opgehangen.</string>
+    <string name="notice_ended_call">%s heeft de oproep beëindigd.</string>
     <string name="notice_made_future_room_visibility">%1$s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor %2$s</string>
     <string name="notice_room_visibility_invited">alle deelnemers aan het gesprek, vanaf het punt dat ze zijn uitgenodigd.</string>
     <string name="notice_room_visibility_joined">alle deelnemers aan het gesprek, vanaf het punt dat ze zijn toegetreden.</string>
@@ -84,7 +84,7 @@
 \nGemeenschappen worden geïmporteerd</string>
     <string name="initial_sync_start_importing_account_data">Initiële synchronisatie:
 \nAccountgegevens worden geïmporteerd</string>
-    <string name="notice_room_update">%s heeft dit gesprek opgewaardeerd.</string>
+    <string name="notice_room_update">%s heeft dit gesprek geüpgraded.</string>
     <string name="event_status_sending_message">Bericht wordt verstuurd…</string>
     <string name="clear_timeline_send_queue">Uitgaande wachtrij legen</string>
     <string name="notice_room_third_party_revoked_invite">%1$s heeft de uitnodiging voor %2$s om het gesprek toe te treden ingetrokken</string>
@@ -107,12 +107,12 @@
     </plurals>
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s heeft %2$s als gespreksadres verwijderd.</item>
-        <item quantity="other">%1$s heeft %3$s als gespreksadressen verwijderd.</item>
+        <item quantity="other">%1$s heeft %2$s als gespreksadressen verwijderd.</item>
     </plurals>
     <string name="notice_room_aliases_added_and_removed">%1$s heeft %2$s als gespreksadres toegevoegd en %3$s verwijderd.</string>
     <string name="notice_room_canonical_alias_set">%1$s heeft het hoofdadres voor dit gesprek ingesteld op %2$s.</string>
     <string name="notice_room_canonical_alias_unset">%1$s heeft het hoofdadres voor dit gesprek verwijderd.</string>
-    <string name="notice_room_guest_access_can_join">%1$s heeft gasten de toegang tot het gesprek verleend.</string>
+    <string name="notice_room_guest_access_can_join">%1$s heeft gasten de toegang tot deze kamer verleend.</string>
     <string name="notice_room_guest_access_forbidden">%1$s heeft gasten de toegang tot het gesprek verhinderd.</string>
     <string name="notice_end_to_end_ok">%1$s heeft eind-tot-eind-versleuteling ingeschakeld.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s heeft eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %2$s).</string>
@@ -358,7 +358,7 @@
     <string name="preview">Voorvertoning</string>
     <string name="reject">Afwijzen</string>
     <!-- Room -->
-    <string name="room_jump_to_first_unread">Ga naar het eerste ongelezen bericht.</string>
+    <string name="room_jump_to_first_unread">Ga naar ongelezen</string>
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">%s heeft u uitgenodigd in dit gesprek</string>
     <string name="room_preview_unlinked_email_warning">Deze uitnodiging is naar %s verstuurd, maar die is niet geassocieerd met deze account.
@@ -420,7 +420,7 @@
     <string name="room_resend_unsent_messages">Onverstuurde berichten opnieuw versturen</string>
     <string name="room_delete_unsent_messages">Onverstuurde berichten verwijderen</string>
     <string name="room_message_file_not_found">Bestand niet gevonden</string>
-    <string name="room_do_not_have_permission_to_post">U heeft geen toestemming om dit naar dit gesprek te sturen</string>
+    <string name="room_do_not_have_permission_to_post">U heeft geen toestemming om dit naar dit gesprek te sturen.</string>
     <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Vertrouwen</string>
     <string name="ssl_do_not_trust">Niet vertrouwen</string>
@@ -684,7 +684,7 @@
     <string name="select_room_directory">Kies een gesprekscatalogus</string>
     <string name="directory_server_fail_to_retrieve_server">Het kan zijn dat de server niet beschikbaar of overbelast is</string>
     <string name="directory_server_type_homeserver">Voer een thuisserver in om de publieke gesprekken ervan weer te geven</string>
-    <string name="directory_server_placeholder">Thuisserver-URL</string>
+    <string name="directory_server_placeholder">Thuisserver-naam</string>
     <string name="directory_server_all_rooms_on_server">Alle gesprekken op server %s</string>
     <string name="directory_server_native_rooms">Alle lokale gesprekken op %s</string>
     <!-- historical -->
@@ -789,7 +789,7 @@
         <item quantity="one">%d deelnemer</item>
         <item quantity="other">%d deelnemers</item>
     </plurals>
-    <string name="room_participants_ban_prompt_msg">Weet u zeker dat u deze gebruiker uit dit gesprek wilt verbannen\?</string>
+    <string name="room_participants_ban_prompt_msg">Als een gebruiker wordt verbannen, wordt deze uit deze kamer verwijderd en wordt er voorkomen dat hij opnieuw lid wordt.</string>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d nieuw bericht</item>
         <item quantity="other">%d nieuwe berichten</item>
@@ -927,7 +927,7 @@
     <string name="command_description_kick_user">Stuurt gebruiker met gegeven ID eruit</string>
     <string name="command_description_nick">Wijzigt uw weergavenaam</string>
     <string name="command_description_markdown">Markdown aan/uit</string>
-    <string name="room_tombstone_versioned_description">Dit gesprek is vervangen en is niet langer actief</string>
+    <string name="room_tombstone_versioned_description">Dit gesprek is vervangen en is niet langer actief.</string>
     <string name="room_tombstone_continuation_link">Het gesprek wordt hier voortgezet</string>
     <string name="room_tombstone_continuation_description">Dit gesprek is een voortzetting van een ander gesprek</string>
     <string name="room_tombstone_predecessor_link">Klik hier om oudere berichten te zien</string>
@@ -1445,7 +1445,7 @@
     <string name="create_room_public_description">Iedereen zal dit gesprek kunnen toetreden</string>
     <string name="pause_video">Pauzeren</string>
     <string name="play_video">Afspelen</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Je hebt het hoofdadres voor dit gesprek verwijderd.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">U heeft het hoofdadres voor dit gesprek verwijderd.</string>
     <string name="notice_room_invite_with_reason_by_you">Je hebt %1$s uitgenodigd. Reden: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Jouw uitnodiging. Reden: %1$s</string>
     <string name="event_status_sent_message">Bericht verstuurd</string>
@@ -1458,25 +1458,25 @@
     <string name="notice_direct_room_third_party_invite_by_you">Je hebt %1$s uitgenodigd</string>
     <string name="notice_direct_room_third_party_invite">%1$s nodigde %2$s uit</string>
     <string name="notice_room_server_acl_updated_no_change">Geen verandering.</string>
-    <string name="notice_end_to_end_by_you">Je hebt end-to-end encryptie ingeschakeld (%1$s)</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Je hebt toekomstige berichten zichtbaar gemaakt voor %1$s</string>
+    <string name="notice_end_to_end_by_you">U heeft eind-tot-eind-versleuteling ingeschakeld (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">U heeft toekomstige berichten zichtbaar gemaakt voor %1$s</string>
     <string name="notice_made_future_direct_room_visibility">%1$s heeft toekomstige berichten zichtbaar gemaakt voor %2$s</string>
-    <string name="notice_ended_call_by_you">Je hebt de oproep beëindigd.</string>
-    <string name="notice_answered_call_by_you">Je hebt de oproep beantwoord.</string>
-    <string name="notice_display_name_changed_from_by_you">Je hebt je schermnaam gewijzigd van %1$s naar %2$s</string>
-    <string name="notice_display_name_set_by_you">Je hebt je schermnaam ingesteld op %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Je hebt je avatar aangepast</string>
-    <string name="notice_room_reject_by_you">Je hebt de uitnodiging geweigerd</string>
-    <string name="notice_direct_room_leave_by_you">Je hebt de kamer verlaten</string>
+    <string name="notice_ended_call_by_you">U hebt de oproep beëindigd.</string>
+    <string name="notice_answered_call_by_you">U hebt de oproep beantwoord.</string>
+    <string name="notice_display_name_changed_from_by_you">U heeft uw schermnaam gewijzigd van %1$s naar %2$s</string>
+    <string name="notice_display_name_set_by_you">U heeft uw schermnaam ingesteld op %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">U heeft uw avatar aangepast</string>
+    <string name="notice_room_reject_by_you">U heeft de uitnodiging geweigerd</string>
+    <string name="notice_direct_room_leave_by_you">U heeft de kamer verlaten</string>
     <string name="notice_direct_room_leave">%1$s heeft de kamer verlaten</string>
-    <string name="notice_room_leave_by_you">Je hebt de kamer verlaten</string>
-    <string name="notice_room_invite_by_you">Jij hebt %1$s uitgenodigd</string>
-    <string name="notice_direct_room_created_by_you">Jij hebt de discussie aangemaakt</string>
+    <string name="notice_room_leave_by_you">U heeft de kamer verlaten</string>
+    <string name="notice_room_invite_by_you">U heeft %1$s uitgenodigd</string>
+    <string name="notice_direct_room_created_by_you">U heeft de discussie aangemaakt</string>
     <string name="notice_direct_room_created">%1$s heeft de discussie aangemaakt</string>
-    <string name="notice_room_created_by_you">Jij hebt de kamer aangemaakt</string>
+    <string name="notice_room_created_by_you">U heeft de kamer aangemaakt</string>
     <string name="notice_room_created">%1$s heeft de kamer aangemaakt</string>
-    <string name="notice_room_invite_no_invitee_by_you">Jouw uitnodiging</string>
-    <string name="summary_you_sent_image">Je hebt een afbeelding gestuurd.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Uw uitnodiging</string>
+    <string name="summary_you_sent_image">U heeft een afbeelding gestuurd.</string>
     <string name="notice_room_ban_with_reason_by_you">U heeft %1$s verbannen. Reden: %2$s</string>
     <string name="notice_room_unban_with_reason_by_you">U heeft de verbanning van %1$s opgeheven. Reden: %2$s</string>
     <string name="notice_room_kick_with_reason_by_you">U heeft %1$s eruit getrapt. Reden: %2$s</string>
@@ -1521,14 +1521,14 @@
     <string name="notice_room_avatar_removed">%1$s heeft de kameravatar verwijderd</string>
     <string name="notice_room_topic_removed_by_you">U heeft het kameronderwerp verwijderd</string>
     <string name="notice_room_name_removed_by_you">U heeft de kamernaam verwijderd</string>
-    <string name="notice_room_update_by_you">U heeft de ruimte geüpgradet.</string>
+    <string name="notice_room_update_by_you">U heeft de kamer geüpgraded.</string>
     <string name="notice_call_candidates_by_you">U verstuurde data om het gesprek op te zetten.</string>
     <string name="notice_call_candidates">%s verstuurde data om het gesprek op te zetten.</string>
     <string name="notice_placed_voice_call_by_you">U heeft een audiogesprek geopend.</string>
     <string name="notice_placed_video_call_by_you">U heeft een videogesprek geopend.</string>
-    <string name="notice_room_name_changed_by_you">U heeft de ruimtenaam veranderd naar: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">U heeft de ruimteavatar aangepast</string>
-    <string name="notice_room_avatar_changed">%1$s heeft de ruimteavatar aangepast</string>
+    <string name="notice_room_name_changed_by_you">U heeft de kamernaam veranderd naar: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">U heeft de kamer afbeelding aangepast</string>
+    <string name="notice_room_avatar_changed">%1$s heeft de kamer afbeelding aangepast</string>
     <string name="notice_room_topic_changed_by_you">U heeft het onderwerp gewijzigd naar: %1$s</string>
     <string name="notice_display_name_removed_by_you">U heeft uw weergavenaam verwijderd (voorheen %1$s)</string>
     <string name="notice_room_withdraw_by_you">U heeft de uitnodiging van %1$s ingetrokken</string>
@@ -1537,6 +1537,52 @@
     <string name="notice_room_kick_by_you">U heeft %1$s eruit getrapt</string>
     <string name="notice_direct_room_join_by_you">U sloot zich aan</string>
     <string name="notice_direct_room_join">%1$s sluit aan</string>
-    <string name="notice_room_join_by_you">Je hebt de kamer betreden</string>
-    <string name="summary_you_sent_sticker">Je hebt een sticker verzonden.</string>
+    <string name="notice_room_join_by_you">U heeft de kamer betreden</string>
+    <string name="summary_you_sent_sticker">U heeft een sticker verzonden.</string>
+    <string name="voice_message_tap_to_stop_toast">Druk op je opname om te stoppen of om te luisteren</string>
+    <string name="voice_message_release_to_send_toast">Houd ingedrukt om op te nemen, laat los om te verzenden</string>
+    <string name="a11y_delete_recorded_voice_message">Verwijder opgenomen stembericht</string>
+    <string name="a11y_recording_voice_message">Stembericht aan het opnemen</string>
+    <string name="a11y_pause_voice_message">Pauzeer stembericht</string>
+    <string name="a11y_play_voice_message">Speel stembericht af</string>
+    <string name="upgrade_room_for_restricted">Iedereen in %s kan de ruimte vinden en betreden - het is niet nodig om iedereen handmatig uit te nodigen. Je kan dit op elk moment aanpassen in de ruimte-instellingen.</string>
+    <string name="voice_message_reply_content">Stembericht (%1$s)</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Kan niet antwoorden of aanpassen als stembericht actief is</string>
+    <string name="error_voice_message_unable_to_record">Kan stembericht niet opnemen</string>
+    <string name="error_voice_message_unable_to_play">Kan stembericht niet afspelen</string>
+    <string name="notice_profile_change_redacted_by_you">Je hebt je profiel geüpdatet %1$s</string>
+    <string name="notice_requested_voip_conference_by_you">Je hebt een VoIP-vergadering aangevraagd</string>
+    <string name="notice_room_guest_access_can_join_by_you">U heeft gasten de toegang tot deze kamer verleend.</string>
+    <string name="notice_room_canonical_alias_set_by_you">U heeft het hoofdadres voor dit gesprek ingesteld op %1$s.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">U heeft %1$s als gespreksadres toegevoegd en %2$s verwijderd.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">U heeft %1$s als gespreksadres verwijderd.</item>
+        <item quantity="other">U heeft %1$s als gespreksadressen verwijderd.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">U heeft %1$s als gespreksadres toegevoegd.</item>
+        <item quantity="other">U heeft %1$s als gespreksadressen toegevoegd.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">U heeft de uitnodiging van %1$s ingetrokken. Reden: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">U heeft de uitnodiging voor %1$s aanvaard. Reden: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">U heeft de uitnodiging voor %1$s ingetrokken. Reden: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">U heeft %1$s een uitnodiging voor het gesprek gestuurd. Reden: %2$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Alle servers zijn uitgesloten van deelname! Deze kamer kan niet meer gebruikt worden.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servers die overeenkomen met IP-tekens zijn nu verbannen.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servers die overeenkomen met IP-tekens zijn nu toegestaan.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servers die overeenkomen met IP-letters zijn verbannen.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servers die overeenkomen met IP-tekens zijn toegestaan.</string>
+    <string name="notice_room_server_acl_set_title">%s heeft de server ACL\'s voor deze kamer ingesteld.</string>
+    <string name="notice_room_server_acl_set_title_by_you">U heeft de server ACL\'s voor deze kamer ingesteld.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">U heeft de server ACL\'s voor deze kamer aangepast.</string>
+    <string name="notice_room_server_acl_updated_title">%s heeft de server ACL\'s voor deze kamer aangepast.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Servers die overeenkomen met %s zijn verwijderd uit de toegestane lijst.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Servers die overeenkomen met %s zijn nu toegestaan.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Servers die overeenkomen met %s zijn verwijderd uit de banlijst.</string>
+    <string name="notice_room_server_acl_updated_banned">• Servers die overeenkomen met %s zijn nu verbannen.</string>
+    <string name="notice_room_server_acl_set_allowed">• Servers die overeenkomen met %s zijn toegestaan.</string>
+    <string name="notice_room_server_acl_set_banned">• Servers die overeenkomen met %s zijn verbannen.</string>
+    <string name="notice_direct_room_update_by_you">U heeft hier geüpgraded.</string>
+    <string name="notice_direct_room_update">%s heeft hier geüpgraded.</string>
+    <string name="notice_made_future_room_visibility_by_you">U heeft toekomstige kamergeschiedenis zichtbaar gemaakt voor %1$s</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 55f1acfc40..0cec8007b5 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -369,7 +369,7 @@
     <string name="send_bug_report_app_crashed">O aplicativo tem crashado da última vez. Você gostaria de abrir a tela de reporte de crash\?</string>
     <string name="send_files_in">Enviar para</string>
     <string name="read_receipt">Lida</string>
-    <string name="join_room">Juntar-se a Sala</string>
+    <string name="join_room">Juntar-Se a Sala</string>
     <string name="username">Nome de Usuária(o)</string>
     <string name="create_account">Criar Conta</string>
     <string name="login">Fazer Login</string>
@@ -517,8 +517,8 @@
     <!-- Room -->
     <string name="room_jump_to_first_unread">Pular para não-lida(s)</string>
     <!-- Room Preview -->
-    <string name="room_preview_invitation_format">Você tem sido convidada(o) a juntar-se a esta sala por %s</string>
-    <string name="room_preview_unlinked_email_warning">Este convite foi enviado para %s, que não está associada(o) a esta conta.
+    <string name="room_preview_invitation_format">Você tem sido convidada(o) para se juntar a esta sala por %s</string>
+    <string name="room_preview_unlinked_email_warning">Este convite foi enviado para %s, que não está associada(o) com esta conta.
 \nVocê pode desejar fazer login com uma conta diferente, ou adicionar este email a sua conta.</string>
     <string name="room_preview_try_join_an_unknown_room">Você está tentando acessar %s. Você gostaria de se juntar a fim de participar na discussão\?</string>
     <string name="room_preview_try_join_an_unknown_room_default">uma sala</string>
@@ -656,7 +656,7 @@
     <string name="settings_turn_screen_on">Ligar a tela por 3 segundos</string>
     <string name="settings_messages_in_one_to_one">Mnsgns em chats um-a-um</string>
     <string name="settings_messages_in_group_chat">Mnsgns em chats de grupo</string>
-    <string name="settings_invited_to_room">Quando eu sou convidada(o) a uma sala</string>
+    <string name="settings_invited_to_room">Quando eu sou convidada(o) para uma sala</string>
     <string name="settings_call_invitations">Convites de chamada</string>
     <string name="settings_messages_sent_by_bot">Mensagens enviadas por bot</string>
     <string name="settings_background_sync">Sincronização no background</string>
@@ -1845,7 +1845,7 @@
     <string name="login_server_text">Assim como email, contas têm uma casa, embora você pode falar com qualquer pessoa</string>
     <string name="login_server_matrix_org_text">Junte-se a milhões de graça no maior servidor público</string>
     <string name="login_server_modular_text">Hospedagem premium para organizações</string>
-    <string name="login_server_modular_learn_more">Saiba mais</string>
+    <string name="login_server_modular_learn_more">Saber mais</string>
     <string name="login_server_other_title">Outro</string>
     <string name="login_server_other_text">Configurações personalizadas &amp; avançadas</string>
     <string name="login_continue">Continuar</string>
@@ -1869,7 +1869,7 @@
     <string name="login_registration_not_supported">O aplicativo não é capaz de criar uma conta neste servidorcasa.
 \n
 \nVocê quer fazer signup usando um cliente web\?</string>
-    <string name="login_login_with_email_error">Este email não está associado a nenhuma conta.</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_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>
@@ -2038,7 +2038,7 @@
 \n
 \nSuas mensagens são asseguradas com cadeados e somente você e a/o recipente têm as chaves únicas para as destrancar.</string>
     <string name="room_profile_section_security">Segurança</string>
-    <string name="room_profile_section_security_learn_more">Saiba mais</string>
+    <string name="room_profile_section_security_learn_more">Saber mais</string>
     <string name="room_profile_section_more">Mais</string>
     <string name="room_profile_section_admin">Ações de Admin</string>
     <string name="room_profile_section_more_settings">Configurações de sala</string>
@@ -2152,7 +2152,7 @@
         <item quantity="other">Enviar imagens com o tamanho original</item>
     </plurals>
     <string name="delete_event_dialog_title">Confirmar Remoção</string>
-    <string name="delete_event_dialog_content">Você tem certeza que você deseja remover (deletar) este evento\? Note que se você deletar um nome de sala ou mudança de tópico, poderia desfazer a mudança.</string>
+    <string name="delete_event_dialog_content">Você tem certeza que você deseja remover (deletar) este evento\? Note que se você deletar um nome de sala ou mudança de tópico, isto poderia desfazer a mudança.</string>
     <string name="delete_event_dialog_reason_checkbox">Incluir uma razão</string>
     <string name="delete_event_dialog_reason_hint">Razão para redigir</string>
     <string name="event_redacted_by_user_reason_with_reason">Evento deletado por usuária(o), razão: %1$s</string>
@@ -2666,7 +2666,7 @@
     <string name="call_tile_call_back">Chamar de volta</string>
     <string name="call_tile_ended">Esta chamada tem terminado</string>
     <string name="call_tile_other_declined">%1$s declinou esta chamada</string>
-    <string name="call_tile_you_declined">Você declinou esta chamada %1$s</string>
+    <string name="call_tile_you_declined">Você declinou esta chamada %s</string>
     <string name="call_tile_in_call">Você está atualmente nesta chamada</string>
     <string name="call_tile_other_started_call">%1$s começou uma chamada</string>
     <string name="call_tile_you_started_call">Você começou uma chamada</string>
@@ -2736,7 +2736,7 @@
     <string name="a11y_checked">Checado</string>
     <string name="a11y_close_emoji_picker">Fechar Seletor de Emoji</string>
     <string name="a11y_open_emoji_picker">Abrir seletor de Emoji</string>
-    <string name="a11y_unsent_draft">Esta sala tem rascunho não-enviado</string>
+    <string name="a11y_unsent_draft">tem rascunho não-enviado</string>
     <plurals name="entries">
         <item quantity="one">%d entrada</item>
         <item quantity="other">%d entradas</item>
@@ -2771,7 +2771,7 @@
     <string name="send_feedback_space_title">Feedback de espaços</string>
     <string name="error_jitsi_join_conf">Desculpe, um erro ocorreu enquanto tentando se juntar à conferência</string>
     <string name="command_description_join_space">Juntar-se ao Espaço com a dada id</string>
-    <string name="a11y_public_room">Esta sala é pública</string>
+    <string name="a11y_public_room">Sala pública</string>
     <string name="a11y_unchecked">Não-checado</string>
     <string name="call_transfer_unknown_person">Pessoa desconhecida</string>
     <string name="call_transfer_transfer_to_title">Transferir para %1$s</string>
@@ -2803,7 +2803,6 @@
     <string name="spaces_no_server_support_title">Parece que seu servidorcasa não suporta Espaços ainda</string>
     <string name="spaces_feeling_experimental_subspace">Se sentindo experimental\?
 \nVocê pode adicionar espaços existentes a um espaço.</string>
-    <string name="labs_space_show_orphan_in_home">Espaço Experimental - Somente mostrar órfãos em Home</string>
     <string name="space_manage_rooms_and_spaces">Gerenciar salas e espaços</string>
     <string name="make_this_space_public">Fazer este espaço público</string>
     <string name="space_settings_manage_rooms">Gerenciar salas</string>
@@ -2828,10 +2827,10 @@
     <string name="create_space">Criar Espaço</string>
     <string name="share_space_link_message">Junte-se a meu espaço %1$s %2$s</string>
     <string name="invite_to_space_with_name_desc">Elas vão ser capazes de explorar %s</string>
-    <string name="invite_to_space_with_name">Convidar a %s</string>
+    <string name="invite_to_space_with_name">Convidar para %s</string>
     <string name="invite_people_to_your_space_desc">É só você no momento. %s vai ser ainda melhor com outras(os).</string>
-    <string name="invite_to_space">Convidar a %s</string>
-    <string name="invite_people_to_your_space">Convidar pessoas a seu espaço</string>
+    <string name="invite_to_space">Convidar para %s</string>
+    <string name="invite_people_to_your_space">Convidar pessoas para seu espaço</string>
     <string name="create_space_topic_hint">Descrição</string>
     <string name="create_spaces_loading_message">Criando Espaço…</string>
     <string name="create_spaces_default_public_random_room_name">Aleatório</string>
@@ -2864,7 +2863,7 @@
     <string name="private_space">Espaço privado</string>
     <string name="public_space">Espaço público</string>
     <string name="command_description_create_space">Criar um Espaço</string>
-    <string name="a11y_public_space">Este Espaço é público</string>
+    <string name="a11y_public_space">Espaço público</string>
     <string name="command_description_leave_room">Sair de sala com dada id (ou sala atual se nula)</string>
     <string name="directory_add_a_new_server_error_already_added">Este servidor já está presente na lista</string>
     <string name="directory_add_a_new_server_error">Não dá para encontrar este servidor ou sua lista de salas</string>
@@ -2890,7 +2889,7 @@
     <string name="upgrade_room_no_power_to_manage">Você precisa de permissão para fazer upgrade de uma sala</string>
     <string name="upgrade_room_update_parent_space">Fazer update de pai de espaço automaticamente</string>
     <string name="upgrade_room_auto_invite">Convidar usuárias(os) automaticamente</string>
-    <string name="upgrade_public_room_from_to">Você vai fazer upgrade desta sala de %s para %s.</string>
+    <string name="upgrade_public_room_from_to">Você vai fazer upgrade desta sala de %1$s para %2$s.</string>
     <string name="upgrade_room_warning">Fazer upgrade de uma sala é uma ação avançada e é geralmente recomendado quando uma sala está instável devido a bugs, funcionalidades faltando ou vulnerabilidades de segurança.
 \nIsto geralmente só afeta como a sala é processada no servidor.</string>
     <string name="upgrade_private_room">Fazer upgrade de sala privada</string>
@@ -2950,4 +2949,71 @@
     <string name="room_create_member_of_space_name_can_join">Membros de Escpaço %s podem encontrar, previsualizar e juntar-se.</string>
     <string name="room_settings_room_access_private_invite_only_title">Privada (Convite Somente)</string>
     <string name="denied_permission_voice_message">Para enviar mensagens de voz, por favor conceda a permissão Microfone.</string>
+    <string name="settings_notification_notify_me_for">Notifique-me para</string>
+    <string name="settings_room_upgrades">Upgrades de sala</string>
+    <string name="settings_messages_by_bot">Mensagens por bot</string>
+    <string name="settings_room_invitations">Convites de sala</string>
+    <string name="settings_encrypted_group_messages">Mensagens de grupo encriptadas</string>
+    <string name="settings_group_messages">Mensagens de grupo</string>
+    <string name="settings_encrypted_direct_messages">Mensagens diretas encriptadas</string>
+    <string name="settings_messages_direct_messages">Mensagens diretas</string>
+    <string name="settings_messages_containing_username">Meu nome de usuária(o)</string>
+    <string name="settings_messages_containing_display_name">Meu nome de exibição</string>
+    <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="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>
+    <string name="call_slide_to_end_conference">Deslize para terminar a chamada</string>
+    <string name="call_tap_to_return">%1$s Toque para retornar</string>
+    <string name="call_one_active">Chamada ativa (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">Chamada ativa ·</item>
+        <item quantity="other">%1$d chamadas ativas ·</item>
+    </plurals>
+    <string name="call_tile_connection_failed">Conexão falhou</string>
+    <string name="call_tile_no_answer">Sem resposta</string>
+    <string name="call_tile_video_missed">Chamada de vídeo perdida</string>
+    <string name="call_tile_voice_missed">Chamada de voz perdida</string>
+    <string name="call_tile_video_declined">Chamada de vídeo declinada</string>
+    <string name="call_tile_voice_declined">Chamada de voz declinada</string>
+    <string name="call_tile_video_call_has_ended">Chamada de vídeo terminada • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">Chamada de voz terminada • %1$s</string>
+    <string name="call_tile_video_active">Chamada de vídeo ativa</string>
+    <string name="call_tile_voice_active">Chamada de voz ativa</string>
+    <string name="call_tile_video_incoming">Chamada de vídeo entrante</string>
+    <string name="call_tile_voice_incoming">Chamada de voz entrante</string>
+    <string name="call_tile_you_declined_this_call">Você declinou esta chamada</string>
+    <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="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>
+    <string name="settings_notification_keyword_contains_invalid_character">Palavrachaves não podem conter \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">Palavrachaves não podem começar com \'.\'</string>
+    <string name="settings_notification_new_keyword">Adicionar nova palavrachave</string>
+    <string name="settings_notification_your_keywords">Suas palavachaves</string>
+    <string name="room_settings_none">Nenhuma</string>
+    <string name="room_settings_mention_and_keyword_only">Menções &amp; Palavrachaves somente</string>
+    <string name="call_remove_jitsi_widget_progress">Terminando chamada…</string>
+    <string name="call_ended_invite_timeout_title">Sem resposta</string>
+    <string name="call_ended_user_busy_description">A/o usuária(o) que você chamou está ocupada(o).</string>
+    <string name="call_ended_user_busy_title">Usuária(o) ocupada(o)</string>
+    <string name="audio_call_with_participant">Chamada de áudio com %s</string>
+    <string name="video_call_with_participant">Chamada de vídeo com %s</string>
+    <string name="call_ringing">Chamada tocando…</string>
+    <string name="spaces">Espaços</string>
+    <string name="learn_more">Saber Mais</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 20c151a9d6..9220273767 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2829,7 +2829,7 @@
     <string name="upgrade_room_no_power_to_manage">Для обновления комнаты необходимо разрешение</string>
     <string name="upgrade_room_update_parent_space">Автоматическое обновление родительского пространства</string>
     <string name="upgrade_room_auto_invite">Автоматическое приглашение пользователей</string>
-    <string name="upgrade_public_room_from_to">Вы обновили эту комнату с %s до %s.</string>
+    <string name="upgrade_public_room_from_to">Вы обновили эту комнату с %1$s до %2$s.</string>
     <string name="upgrade_room_warning">Обновление комнаты - это расширенное действие, которое обычно рекомендуется, когда комната работает нестабильно из-за ошибок, отсутствующих функций или уязвимостей безопасности.
 \nОбычно это влияет только на то, как комната обрабатывается на сервере.</string>
     <string name="upgrade_private_room">Модернизировать приватную комнату</string>
@@ -2850,7 +2850,6 @@
     <string name="spaces_no_server_support_title">Похоже, что ваш домашний сервер пока не поддерживает пространства</string>
     <string name="spaces_feeling_experimental_subspace">Чувствуете себя экспериментатором\?
 \nВы можете добавить существующие пространства в пространство.</string>
-    <string name="labs_space_show_orphan_in_home">Экспериментальное пространство - показывать в Главной только сирот</string>
     <string name="space_manage_rooms_and_spaces">Управление комнатами и пространствами</string>
     <string name="space_mark_as_not_suggested">Отметить как не рекомендуется</string>
     <string name="space_mark_as_suggested">Отметить как рекомендуется</string>
@@ -3004,4 +3003,49 @@
     <string name="missing_permissions_title">Отсутствующие разрешения</string>
     <string name="denied_permission_camera">Для выполнения этого действия, пожалуйста, предоставьте разрешение Камеры в настройках системы.</string>
     <string name="denied_permission_generic">Для выполнения этого действия отсутствуют некоторые разрешения, пожалуйста, предоставьте разрешения в настройках системы.</string>
+    <string name="upgrade_room_for_restricted_note">Обратите внимание, что при обновлении будет создана новая версия комнаты. Все текущие сообщения останутся в этой архивной комнате.</string>
+    <string name="upgrade_room_for_restricted_no_param">Любой человек в родительском пространстве сможет найти и присоединиться к этой комнате - нет необходимости вручную приглашать всех. Вы сможете изменить это в настройках комнаты в любое время.</string>
+    <string name="upgrade_room_for_restricted">Любой человек в %s сможет найти и присоединиться к этой комнате - нет необходимости вручную приглашать всех. Вы сможете изменить это в настройках комнаты в любое время.</string>
+    <string name="voice_message_reply_content">Голосовое сообщение (%1$s)</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Вы не можете отвечать или редактировать, пока активно голосовое сообщение</string>
+    <string name="error_voice_message_unable_to_record">Не удалось записать голосовое сообщение</string>
+    <string name="error_voice_message_unable_to_play">Не удалось воспроизвести это голосовое сообщение</string>
+    <string name="labs_use_voice_message">Включить голосовые сообщения</string>
+    <string name="voice_message_tap_to_stop_toast">Нажмите на запись, чтобы остановить или прослушать ее</string>
+    <string name="voice_message_n_seconds_warning_toast">%1$d осталось</string>
+    <string name="voice_message_release_to_send_toast">Удерживайте для записи, отпустите для отправки</string>
+    <string name="a11y_delete_recorded_voice_message">Удалить записанное голосовое сообщение</string>
+    <string name="a11y_recording_voice_message">Запись голосового сообщения</string>
+    <string name="a11y_pause_voice_message">Приостановить голосовое сообщение</string>
+    <string name="a11y_play_voice_message">Прослушать голосовое сообщение</string>
+    <string name="a11y_lock_voice_message">Заблокировать голосовое сообщение</string>
+    <string name="voice_message_slide_to_cancel">Проведите для отмены</string>
+    <string name="a11y_start_voice_message">Начать голосовое сообщение</string>
+    <string name="allow_anyone_in_room_to_access">Разрешить любому человеку в %s найти и получить доступ. Можно выбрать и другие пространства.</string>
+    <string name="upgrade_required">Требуется обновление</string>
+    <string name="sent_a_voice_message">Голосовое сообщение</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Другие пространства или комнаты, которые вы могли не знать</string>
+    <string name="space_you_know_that_contains_this_room">Пространство, которое вы знаете, содержит эту комнату</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_which_spaces_can_access">Определите, какие пространства могут получить доступ к этой комнате. Если пространство выбрано, его участники смогут найти и присоединиться к комнате.</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_room_upgrades">Обновлениях комнаты</string>
+    <string name="settings_messages_by_bot">Сообщениях от бота</string>
+    <string name="settings_room_invitations">Приглашениях в комнату</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_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="denied_permission_voice_message">Чтобы отправлять голосовые сообщения, предоставьте разрешение на Микрофон.</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 91d853cadb..f8d08d2c6a 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2545,7 +2545,7 @@
     <string name="call_tile_call_back">Ktheji thirrjen</string>
     <string name="call_tile_ended">Kjo thirrje ka përfunduar</string>
     <string name="call_tile_other_declined">%1$s hodhi poshtë këtë thirrje</string>
-    <string name="call_tile_you_declined">Hodhët poshtë këtë thirrje %1$s</string>
+    <string name="call_tile_you_declined">Hodhët poshtë këtë thirrje %s</string>
     <string name="call_tile_in_call">Gjendeni në këtë thirrje</string>
     <string name="call_tile_other_started_call">%1$s nisi një thirrje</string>
     <string name="call_tile_you_started_call">Filluat një thirrje</string>
@@ -2631,7 +2631,7 @@
     <string name="a11y_trust_level_default">Shkallë besimi parazgjedhje</string>
     <string name="a11y_selected">Të përzgjedhura</string>
     <string name="a11y_video">Video</string>
-    <string name="a11y_unsent_draft">Kjo dhomë ka skicë të padërguar</string>
+    <string name="a11y_unsent_draft">ka skicë të padërguar</string>
     <string name="a11y_error_some_message_not_sent">Disa nga mesazhet s’janë dërguar</string>
     <string name="a11y_delete_avatar">Fshije avatarin</string>
     <string name="a11y_change_avatar">Ndërroni avatarin</string>
@@ -2748,7 +2748,7 @@
     <string name="space_settings_manage_rooms">Administroni dhoma</string>
     <string name="looking_for_someone_not_in_space">Po kërkoni për dikë jo në %s\?</string>
     <string name="user_invites_you">%s ju fton</string>
-    <string name="a11y_public_room">Kjo dhomë është publike</string>
+    <string name="a11y_public_room">Dhomë publike</string>
     <string name="a11y_unchecked">E pakontrolluar</string>
     <string name="a11y_checked">U kontrollua</string>
     <string name="send_images_and_video_with_original_size">Dërgoje median në madhësinë origjinale</string>
@@ -2769,7 +2769,6 @@
     <string name="spaces_no_server_support_title">Duket sikur shërbyesi juaj Home nuk mbulon ende Hapësira</string>
     <string name="spaces_feeling_experimental_subspace">Ndiheni eksperimentues\?
 \nMund të shtoni te një hapësirë hapësira ekzistuese.</string>
-    <string name="labs_space_show_orphan_in_home">Hapësirë Eksperimentale - Shfaq jetimë te Kreu</string>
     <string name="space_add_rooms">Shtoni dhoma</string>
     <string name="space_leave_prompt_msg_as_admin">Jeni përgjegjës i kësaj hapësirë, sigurohuni se keni shpërngulur të drejt përgjegjësi te një anëtar tjetër, përpara braktisjes.</string>
     <string name="space_leave_prompt_msg_private">Kjo hapësirë s’është publike. S’do të jeni në gjendje të rihyni pa një ftesë.</string>
@@ -2787,7 +2786,7 @@
     <string name="unnamed_room">Dhomë e Paemërtuar</string>
     <string name="private_space">Hapësirë private</string>
     <string name="public_space">Hapësirë publike</string>
-    <string name="a11y_public_space">Kjo Hapësirë është publike</string>
+    <string name="a11y_public_space">Hapësirë publike</string>
     <string name="call_transfer_unknown_person">Person i panjohur</string>
     <string name="call_transfer_transfer_to_title">Shpërngule te %1$s</string>
     <string name="call_transfer_consulting_with">Po konsultohet me %1$s</string>
@@ -2810,7 +2809,7 @@
     <string name="upgrade_room_no_power_to_manage">Ju duhen leje për të përmirësua një dhomë</string>
     <string name="upgrade_room_update_parent_space">Përditëso automatikisht mëmë hapësire</string>
     <string name="upgrade_room_auto_invite">Fto përdorues automatikisht</string>
-    <string name="upgrade_public_room_from_to">Do ta përmirësoni këtë dhomë nga %s në %s.</string>
+    <string name="upgrade_public_room_from_to">Do ta përmirësoni këtë dhomë nga %1$s në %2$s.</string>
     <string name="upgrade_room_warning">Përmirësimi i një dhome është një veprim i thelluar dhe zakonisht i rekomanduar kur një dhomë është e paqëndrueshme për shkak të metash, veçorish që mungojnë ose cenueshmëri sigurie.
 \nZakonisht kjo prek vetëm mënyrën se si trajtohet dhoma te shërbyesi.</string>
     <string name="upgrade_private_room">Përmirësoni dhomë private</string>
@@ -2870,4 +2869,70 @@
     <string name="room_create_member_of_space_name_can_join">Anëtarë të Hapësirës %s mund ta gjejnë, parashohin dhe hyjnë në të.</string>
     <string name="room_settings_room_access_private_invite_only_title">Private (Vetëm Me Ftesa)</string>
     <string name="denied_permission_voice_message">Për të dërguar mesazhe zanorë, ju lutemi, akordoni leje Mikrofoni.</string>
+    <string name="settings_room_upgrades">Përmirësime dhome</string>
+    <string name="settings_messages_by_bot">Mesazhe nga roboti</string>
+    <string name="settings_room_invitations">Ftesa për në dhoma</string>
+    <string name="settings_encrypted_group_messages">Mesazhe të fshehtëzuar grupi</string>
+    <string name="settings_group_messages">Mesazhe grupi</string>
+    <string name="settings_encrypted_direct_messages">Mesazhe të drejtpërdrejtë të fshehtëzuar</string>
+    <string name="settings_messages_direct_messages">Mesazhe të drejtpërdrejtë</string>
+    <string name="settings_messages_containing_username">Emri im i përdoruesit</string>
+    <string name="settings_messages_containing_display_name">Emri im në ekran</string>
+    <string name="settings_notification_notify_me_for">Njoftomë për</string>
+    <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="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>
+    <string name="call_slide_to_end_conference">Rrëshqiteni, që të përfundohet thirrja</string>
+    <string name="call_tap_to_return">%1$s Prekeni që të kthehet</string>
+    <string name="call_one_active">Thirrje aktive (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">Thirrje aktive</item>
+        <item quantity="other">%1$d thirrje aktive</item>
+    </plurals>
+    <string name="call_tile_connection_failed">Lidhja dështoi</string>
+    <string name="call_tile_no_answer">S’ka përgjigje</string>
+    <string name="call_tile_video_missed">Thirrje video e humbur</string>
+    <string name="call_tile_voice_missed">Thirrje zanore e humbur</string>
+    <string name="call_tile_video_declined">Thirrja video u hodh poshtë</string>
+    <string name="call_tile_voice_declined">U hodh poshtë thirrje zanore</string>
+    <string name="call_tile_video_call_has_ended">Thirrja video përfundoi • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">Thirrja zanore përfundoi • %1$s</string>
+    <string name="call_tile_video_active">Thirrje video aktive</string>
+    <string name="call_tile_voice_active">Thirrje zanore aktive</string>
+    <string name="call_tile_video_incoming">Thirrje video ardhëse</string>
+    <string name="call_tile_voice_incoming">Thirrje zanore ardhëse</string>
+    <string name="call_tile_you_declined_this_call">Hodhët poshtë këtë thirrje</string>
+    <string name="room_settings_room_notifications_account_settings">Rregullime llogarie</string>
+    <string name="room_settings_room_notifications_manage_notifications">Njoftimet mund t’i administroni te %1$s.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Ju lutemi, kini parasysh se në celular njoftimet për përmendje &amp; fjalëkyçe nuk funksionojnë për dhoma të fshehtëzuara.</string>
+    <string name="room_settings_room_notifications_notify_me">Njoftomë për</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Në celular s’do të merrni njoftime për përmendje &amp; fjalëkyçe në dhoma të fshehtëzuara.</string>
+    <string name="settings_messages_containing_keywords">Fjalëkyçe</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Fjalëkyçet s’mund të përmbajnë \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">Fjalëkyçet s’mund të fillojnë me \'.\'</string>
+    <string name="settings_notification_new_keyword">Shtoni fjalëkyç të ri</string>
+    <string name="settings_notification_your_keywords">Fjalëkyçet tuaja</string>
+    <string name="room_settings_none">Asnjë</string>
+    <string name="room_settings_mention_and_keyword_only">Vetëm Përmendje &amp; Fjalëkyçe</string>
+    <string name="call_remove_jitsi_widget_progress">Po përfundohet thirrja…</string>
+    <string name="call_ended_invite_timeout_title">S’ka përgjigje</string>
+    <string name="call_ended_user_busy_description">Përdoruesi që thirrët është i zënë.</string>
+    <string name="call_ended_user_busy_title">Përdoruesi është i zënë</string>
+    <string name="audio_call_with_participant">Thirrje audio me %s</string>
+    <string name="video_call_with_participant">Thirrje video me %s</string>
+    <string name="call_ringing">Po i bihet ziles…</string>
+    <string name="spaces">Hapësira</string>
+    <string name="learn_more">Mësoni Më Tepër</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 900e439b07..9a560e5611 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -586,7 +586,7 @@
     <string name="list_members">Lista medlemmar</string>
     <string name="open_chat_header">Öppna rubrik</string>
     <string name="room_sync_in_progress">Synkroniserar…</string>
-    <string name="room_jump_to_first_unread">Hoppa till det första olästa meddelandet.</string>
+    <string name="room_jump_to_first_unread">Hoppa till oläst</string>
     <string name="room_preview_invitation_format">Du har blivit inbjuden till det här rummet av %s</string>
     <string name="room_preview_unlinked_email_warning">Denna inbjudan skickades till %s, vilket inte är associerat med det här kontot.
 \nDu kanske vill logga in på ett annat konto eller lägga till den här e-postadressen till det här kontot.</string>
@@ -1269,7 +1269,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 har inte behörighet 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>
@@ -1815,7 +1815,7 @@
     <string name="avatar">Avatar</string>
     <string name="dialog_user_consent_submit">Granska nu</string>
     <string name="error_empty_field_enter_user_name">Vänligen skriv in ett användarnamn.</string>
-    <string name="room_tombstone_versioned_description">Det här rummet har blivit ersatt och är inte längre tillgängligt</string>
+    <string name="room_tombstone_versioned_description">Det här rummet har blivit ersatt och är inte längre tillgängligt.</string>
     <string name="room_tombstone_continuation_link">Samtalet fortsätter här</string>
     <string name="room_tombstone_continuation_description">Det här rummet är en fortsättning av en annan konversation</string>
     <string name="room_tombstone_predecessor_link">Tryck här för att se äldre meddelanden</string>
@@ -2217,7 +2217,7 @@
     <string name="new_session_review">Tryck för att granska och verifiera</string>
     <string name="verify_new_session_was_not_me">Det var inte jag</string>
     <string name="verify_new_session_compromized">Ditt konto kan vara äventyrat</string>
-    <string name="verify_cancelled_notice">Verifiera dina enheter i inställningarna.</string>
+    <string name="verify_cancelled_notice">Verifiering har avbrutits. Du kan starta verifieringen igen.</string>
     <string name="verification_cancelled">Verifikation avbruten</string>
     <string name="recovery_passphrase">återställningslösenfras</string>
     <string name="account_password">kontolösenord</string>
@@ -2597,7 +2597,7 @@
     <string name="call_tile_call_back">Ring tillbaka</string>
     <string name="call_tile_ended">Det här samtalet har avslutats</string>
     <string name="call_tile_other_declined">%1$s avböjde det här samtalet</string>
-    <string name="call_tile_you_declined">Du avböjde det här samtalet %1$s</string>
+    <string name="call_tile_you_declined">Du avböjde det här samtalet %s</string>
     <string name="call_tile_in_call">Du är för närvarande i det här samtalet</string>
     <string name="call_tile_other_started_call">%1$s startade ett samtal</string>
     <string name="call_tile_you_started_call">Du startade ett samtal</string>
@@ -2637,7 +2637,7 @@
     <string name="a11y_trust_level_default">Förvald förtroendenivå</string>
     <string name="a11y_selected">Vald</string>
     <string name="a11y_video">Video</string>
-    <string name="a11y_unsent_draft">Det här rummet har oskickade utkast</string>
+    <string name="a11y_unsent_draft">har oskickade utkast</string>
     <string name="a11y_error_some_message_not_sent">Vissa meddelanden har inte skickats</string>
     <string name="a11y_delete_avatar">Radera avatar</string>
     <string name="a11y_change_avatar">Byt avatar</string>
@@ -2698,7 +2698,7 @@
     <string name="a11y_unchecked">Okryssad</string>
     <string name="search_hint_room_name">Sök efter namn</string>
     <string name="room_settings_room_access_restricted_description">Vem som helst i ett utrymme med det här rummet kan hitta det och gå med. Bara administratörer för det här rummet kan lägga till det till ett utrymme.</string>
-    <string name="room_settings_room_access_restricted_title">Utrymmen</string>
+    <string name="room_settings_room_access_restricted_title">Endast utrymmesmedlemmar</string>
     <string name="room_settings_room_access_public_description">Vem som helst kan hitta rummet och gå med</string>
     <string name="room_settings_room_access_public_title">Offentlig</string>
     <string name="room_settings_room_access_private_description">Bara personer som bjuds in kan hitta och gå med</string>
@@ -2760,7 +2760,7 @@
     <string name="space_settings_manage_rooms">Hantera rum</string>
     <string name="looking_for_someone_not_in_space">Letar du efter någon inte i %s\?</string>
     <string name="user_invites_you">%s bjuder in dig</string>
-    <string name="a11y_public_room">Det här rummet är offentligt</string>
+    <string name="a11y_public_room">Offentligt rum</string>
     <string name="send_images_and_video_with_original_size">Skicka media med originalstorlek</string>
     <plurals name="send_videos_with_original_size">
         <item quantity="one">Skicka video med originalstorlek</item>
@@ -2779,7 +2779,6 @@
     <string name="spaces_no_server_support_title">Det verkar som att din hemserver inte stöder utrymmen än</string>
     <string name="spaces_feeling_experimental_subspace">Känner du dig äventyrlig\?
 \nDu kan lägga till existerande utrymmen till ett utrymme.</string>
-    <string name="labs_space_show_orphan_in_home">Experimentellt utrymme - Visa bara övergivna i Hem</string>
     <string name="space_add_rooms">Lägg till rum</string>
     <string name="space_leave_prompt_msg_as_admin">Du är administratör för det här utrymmet, se till att du har överfört administratörsrättigheter till en annan medlem innan du lämnar.</string>
     <string name="space_leave_prompt_msg_private">Det här utrymmet är inte offentligt. Du kommer inte att kunna gå med igen utan en inbjudan.</string>
@@ -2797,7 +2796,7 @@
     <string name="unnamed_room">Namnlöst rum</string>
     <string name="private_space">Privat utrymme</string>
     <string name="public_space">Offentligt utrymme</string>
-    <string name="a11y_public_space">Det här utrymmet är offentligt</string>
+    <string name="a11y_public_space">Offentligt utrymme</string>
     <string name="call_transfer_unknown_person">Ökänd person</string>
     <string name="call_transfer_transfer_to_title">Överför till %1$s</string>
     <string name="call_transfer_consulting_with">Rådfrågar %1$s</string>
@@ -2813,4 +2812,138 @@
     <string name="continue_anyway">Fortsätt ändå</string>
     <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">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>
+    <string name="error_voice_message_unable_to_record">Kan inte spela in ett röstmeddelande</string>
+    <string name="error_voice_message_unable_to_play">Kan inte spela det här röstmeddelandet</string>
+    <string name="labs_use_voice_message">Aktivera röstmeddelande</string>
+    <string name="voice_message_tap_to_stop_toast">Tryck på din inspelning för att stoppa eller lyssna</string>
+    <string name="voice_message_n_seconds_warning_toast">%1$d lämnade</string>
+    <string name="voice_message_release_to_send_toast">Håll in för att spela in, släpp för att skicka</string>
+    <string name="a11y_delete_recorded_voice_message">Radera inspelat röstmeddelande</string>
+    <string name="a11y_recording_voice_message">Spelar in röstmeddelande</string>
+    <string name="a11y_pause_voice_message">Pausa röstmeddelande</string>
+    <string name="a11y_play_voice_message">Spela röstmeddelande</string>
+    <string name="a11y_lock_voice_message">Röstmeddelandelås</string>
+    <string name="voice_message_slide_to_cancel">Svep för att avbryta</string>
+    <string name="a11y_start_voice_message">Starta röstmeddelande</string>
+    <string name="error_failed_to_join_room">Tyvärr så inträffade ett fel vid försök att gå med i: %s</string>
+    <string name="room_upgrade_to_recommended_version">Uppgradera till rekommenderad rumsversion</string>
+    <string name="room_using_unstable_room_version">Det är rummet kör rumsversion %s, vilken den hör hemservern har markerat som instabil.</string>
+    <string name="allow_anyone_in_room_to_access">Låt vem som helst i %s att hitta och komma åt. Du kan välja andra utrymmen också.</string>
+    <string name="upgrade_room_no_power_to_manage">Du behöver behörighet för att uppgradera ett rum</string>
+    <string name="upgrade_room_update_parent_space">Uppdatera automatiskt utrymmesförälder</string>
+    <string name="upgrade_room_auto_invite">Bjud in användare automatiskt</string>
+    <string name="upgrade_public_room_from_to">Du kommer att uppgradera det här rummet från %1$s till %2$s.</string>
+    <string name="upgrade_room_warning">Att uppgradera ett rum är en avancerad handling och rekommenderas normal när ett rum är instabilt på grund av buggar, saknade funktioner eller säkerhetsproblem.
+\nDet här påverkar normalt bara hur ett rum hanteras på servern.</string>
+    <string name="upgrade_private_room">Uppgradera privat rum</string>
+    <string name="upgrade_public_room">Uppgradera offentligt rum</string>
+    <string name="upgrade_required">Uppgradering krävs</string>
+    <string name="upgrade">Uppgradera</string>
+    <string name="it_may_take_some_time">Var god vänta, det kan ta ett tag.</string>
+    <string name="joining_replacement_room">Gå med i ersättningsrum</string>
+    <string name="command_description_upgrade_room">Uppgraderar ett rum till en ny version</string>
+    <string name="settings_server_room_version_unstable">instabil</string>
+    <string name="settings_server_room_version_stable">stabil</string>
+    <string name="settings_server_default_room_version">Förvald version</string>
+    <string name="settings_server_room_versions">Rumsversioner 👓</string>
+    <string name="verification_scan_self_emoji_subtitle">Verifiera genom att jämföra emoji istället</string>
+    <string name="verification_scan_with_this_device">Skanna med den här enheten</string>
+    <string name="verification_scan_self_notice">Skanna koden med din andra enhet eller byt och skanna med den här enheten</string>
+    <string name="sent_a_voice_message">Röst</string>
+    <string name="create_space_alias_hint">Utrymmesadress</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Andra utrymmen eller rum du kanske inte känner till</string>
+    <string name="space_you_know_that_contains_this_room">Utrymmen du känner till som innehåller det här rummet</string>
+    <string name="decide_who_can_find_and_join">Bestäm vilka som kan hitta och gå med i det här rummet.</string>
+    <string name="tap_to_edit_spaces">Tryck för att redigera utrymmen</string>
+    <string name="select_spaces">Välj utrymmen</string>
+    <string name="decide_which_spaces_can_access">Bestäm vilka utrymmen som kan komma åt det här rummet. Om ett utrymme väljs så kan dess medlemmar hitta och gå med i rummet.</string>
+    <string name="spaces_which_can_access">Utrymmen som kan komma åt</string>
+    <string name="allow_space_member_to_find_and_access">Låt utrymmesmedlemmar hitta och komma åt.</string>
+    <string name="room_create_member_of_space_name_can_join">Medlemmar i utrymmet %s kan hitta, granska och gå med.</string>
+    <string name="room_settings_room_access_private_invite_only_title">Privat (endast inbjudan)</string>
+    <string name="space_settings_alias_subtitle">Se och hantera adresser för det här utrymmet.</string>
+    <string name="space_settings_alias_title">Utrymmsesadresser</string>
+    <string name="settings_room_upgrades">Rumsuppgraderingar</string>
+    <string name="settings_messages_by_bot">Meddelanden från bot</string>
+    <string name="settings_room_invitations">Rumsinbjudningar</string>
+    <string name="settings_encrypted_group_messages">Krypterade gruppmeddelanden</string>
+    <string name="settings_group_messages">Gruppmeddelanden</string>
+    <string name="settings_encrypted_direct_messages">Krypterade direktmeddelanden</string>
+    <string name="settings_messages_direct_messages">Direktmeddelanden</string>
+    <string name="settings_messages_containing_username">Mitt användarnamn</string>
+    <string name="settings_messages_containing_display_name">Mitt visningsnamn</string>
+    <string name="settings_notification_notify_me_for">Avisera mig för</string>
+    <string name="settings_notification_other">Andra</string>
+    <string name="settings_notification_mentions_and_keywords">Omnämnanden och nyckelord</string>
+    <string name="settings_notification_default">Förvalda aviseringar</string>
+    <plurals name="missed_video_call">
+        <item quantity="one">Missat videosamtal</item>
+        <item quantity="other">%d missade videosamtal</item>
+    </plurals>
+    <plurals name="missed_audio_call">
+        <item quantity="one">Missat ljudsamtal</item>
+        <item quantity="other">%d missade ljudsamtal</item>
+    </plurals>
+    <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="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>
+    <string name="call_slide_to_end_conference">Svep för att avsluta samtalet</string>
+    <string name="call_tap_to_return">%1$s Tryck för att återgå</string>
+    <string name="call_one_active">Aktivt samtal (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">Aktivt samtal ·</item>
+        <item quantity="other">%1$d aktiva samtal ·</item>
+    </plurals>
+    <string name="call_tile_connection_failed">Anslutning misslyckades</string>
+    <string name="call_tile_no_answer">Inget svar</string>
+    <string name="call_tile_video_missed">Missat videosamtal</string>
+    <string name="call_tile_voice_missed">Missat röstsamtal</string>
+    <string name="call_tile_video_declined">Videosamtal avböjt</string>
+    <string name="call_tile_voice_declined">Röstsamtal avböjt</string>
+    <string name="call_tile_video_call_has_ended">Videosamtal avslutat • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">Röstsamtal avslutat • %1$s</string>
+    <string name="call_tile_video_active">Aktivt videosamtal</string>
+    <string name="call_tile_voice_active">Aktivt röstsamtal</string>
+    <string name="call_tile_video_incoming">Inkommande videosamtal</string>
+    <string name="call_tile_voice_incoming">Inkommande röstsamtal</string>
+    <string name="call_tile_you_declined_this_call">Du avböjde det här samtalet</string>
+    <string name="room_settings_room_notifications_account_settings">Kontoinställningar</string>
+    <string name="room_settings_room_notifications_manage_notifications">Du kan hantera aviseringar i %1$s.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Observera att aviseringar för omnämnanden och nyckelord inte är tillgängliga i krypterade rum på mobilen.</string>
+    <string name="room_settings_room_notifications_notify_me">Avisera mig för</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Du kommer inte att får aviseringar för omnämnanden och nyckelord i krypterade rum på mobilen.</string>
+    <string name="settings_messages_containing_keywords">Nyckelord</string>
+    <string name="settings_mentions_at_room">\@rum</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Nyckelord kan inte innehålla \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">Nyckelord kan inte börja med \'.\'</string>
+    <string name="settings_notification_new_keyword">Lägg till nytt nyckelord</string>
+    <string name="settings_notification_your_keywords">Dina nyckelord</string>
+    <string name="room_settings_none">Inga</string>
+    <string name="room_settings_mention_and_keyword_only">Endast omnämnanden och nyckelord</string>
+    <string name="call_remove_jitsi_widget_progress">Avslutar samtal…</string>
+    <string name="call_ended_invite_timeout_title">Inget svar</string>
+    <string name="call_ended_user_busy_description">Användaren du ringde är upptagen.</string>
+    <string name="call_ended_user_busy_title">Användare upptagen</string>
+    <string name="audio_call_with_participant">Ljudsamtal med %s</string>
+    <string name="video_call_with_participant">Videosamtal med %s</string>
+    <string name="call_ringing">Samtal ringer…</string>
+    <string name="spaces">Utrymmen</string>
+    <string name="learn_more">Lär dig mer</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 0239932106..524fb64cda 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -79,10 +79,10 @@
     <string name="notice_power_level_changed_by_you">Ви змінили рівень доступу на %1$s.</string>
     <string name="notice_room_server_acl_updated_title_by_you">Ви змінили серверні списки контролю доступу для цієї кімнати.</string>
     <string name="notice_room_name_changed_by_you">Ви змінили назву кімнати на: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Ви змінили світлину кімнати</string>
+    <string name="notice_room_avatar_changed_by_you">Ви змінили аватар кімнати</string>
     <string name="notice_room_topic_changed_by_you">Ви змінили тему на: %1$s</string>
     <string name="notice_display_name_changed_from_by_you">Ви змінили показуване ім\'я з %1$s на %2$s</string>
-    <string name="notice_avatar_url_changed_by_you">Ви змінили світлину профілю</string>
+    <string name="notice_avatar_url_changed_by_you">Ви змінили свій аватар</string>
     <plurals name="room_displayname_four_and_more_members">
         <item quantity="one">%1$s, %2$s, %3$s та %4$d інший</item>
         <item quantity="few">%1$s, %2$s, %3$s та %4$d інші</item>
@@ -94,10 +94,10 @@
     <string name="power_level_default">Типовий</string>
     <string name="power_level_moderator">Модератор</string>
     <string name="power_level_admin">Адміністратор</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_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_invite_by_you">Ви надіслали запрошення для %1$s приєднатися до кімнати</string>
     <string name="notice_profile_change_redacted_by_you">Ви оновили свій профіль %1$s</string>
@@ -158,8 +158,8 @@
     <string name="room_displayname_empty_room_was">Порожня кімната (була %s)</string>
     <string name="power_level_custom_no_value">Не типовий</string>
     <string name="power_level_custom">Не типовий (%1$d)</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_modified_by_you">Ви змінили розширення %1$s</string>
+    <string name="notice_widget_modified">%1$s змінює розширення %2$s</string>
     <string name="notice_direct_room_update_by_you">Ви оновили кімнату.</string>
     <string name="notice_made_future_room_visibility_by_you">Ви зробили майбутню історію кімнати видимою для %1$s</string>
     <string name="notice_made_future_direct_room_visibility_by_you">Ви зробили майбутні повідомлення видимими для %1$s</string>
@@ -187,7 +187,7 @@
     <string name="title_activity_historical">Історія</string>
     <string name="title_activity_bug_report">Сповістити про помилку</string>
     <!-- button names -->
-    <string name="ok">OK</string>
+    <string name="ok">Гаразд</string>
     <string name="cancel">Скасувати</string>
     <string name="save">Зберегти</string>
     <string name="leave">Залишити</string>
@@ -344,7 +344,7 @@
     <string name="login_error_unable_register">Збій реєстрації</string>
     <string name="login_error_unable_register_mail_ownership">Збій реєстрації: не вдалося перевірити email</string>
     <string name="login_error_invalid_home_server">Введіть дійсний URL</string>
-    <string name="login_error_forbidden">Неправильне ім\'я користувача або пароль</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>
@@ -434,7 +434,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>
@@ -445,7 +445,7 @@
     <string name="room_participants_action_set_moderator">Зробити модератором</string>
     <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_action_unignore">Не нехтувати</string>
     <string name="room_participants_invite_search_another_user">ID користувача, ім\'я або email</string>
     <string name="room_participants_action_mention">Згадати</string>
     <string name="room_participants_action_devices_list">Показати Список Пристроїв</string>
@@ -472,7 +472,7 @@
     <string name="room_prompt_resend">Повторити надсилання</string>
     <string name="room_prompt_cancel">скасувати все</string>
     <string name="room_resend_unsent_messages">Надіслати ненадіслані повідомлення знову</string>
-    <string name="room_delete_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>
     <!-- unrecognized SSL certificate -->
@@ -528,17 +528,17 @@
     <!-- home room settings -->
     <string name="room_settings_favourite">Обране</string>
     <string name="room_settings_de_prioritize">Не терміново</string>
-    <string name="room_settings_direct_chat">Прямий Чат</string>
+    <string name="room_settings_direct_chat">Особиста бесіда</string>
     <string name="room_settings_leave_conversation">Залишити бесіду</string>
     <string name="room_settings_forget">Забути</string>
     <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Повідомлення</string>
     <string name="room_sliding_menu_settings">Налаштування</string>
     <string name="room_sliding_menu_version">Версія</string>
-    <string name="room_sliding_menu_term_and_conditions">Умови &amp; положення</string>
+    <string name="room_sliding_menu_term_and_conditions">Умови й положення</string>
     <string name="room_sliding_menu_third_party_notices">Примітки третіх сторін</string>
     <string name="room_sliding_menu_copyright">Copyright</string>
-    <string name="room_sliding_menu_privacy_policy">Політика конфіденційності</string>
+    <string name="room_sliding_menu_privacy_policy">Політика приватності</string>
     <!-- Vector Settings -->
     <string name="settings_profile_picture">Аватар</string>
     <string name="settings_display_name">Показуване ім\'я</string>
@@ -566,10 +566,10 @@
     <string name="settings_set_sync_delay">Інтервал між запитами синхронізації</string>
     <string name="settings_version">Версія</string>
     <string name="settings_olm_version">Версія OLM</string>
-    <string name="settings_app_term_conditions">Умови &amp; положення</string>
+    <string name="settings_app_term_conditions">Умови й положення</string>
     <string name="settings_third_party_notices">Примітки третіх сторін</string>
     <string name="settings_copyright">Copyright</string>
-    <string name="settings_privacy_policy">Політика конфіденційності</string>
+    <string name="settings_privacy_policy">Політика приватності</string>
     <string name="settings_clear_cache">Очистити кеш</string>
     <string name="settings_clear_media_cache">Очистити медіа кеш</string>
     <string name="settings_keep_media">Зберігати медіа</string>
@@ -653,14 +653,14 @@
     <string name="room_settings_tag_pref_entry_none">Жодного</string>
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Доступ та видимість</string>
-    <string name="room_settings_directory_visibility">Показувати кімнату при пошуку</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>
     <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <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_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>
     <!-- Room settings: "Who can access this room?" (access rule) -->
@@ -669,13 +669,13 @@
     <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>
     <!-- Room settings: banned users -->
-    <string name="room_settings_banned_users_title">Забанені користувачі</string>
+    <string name="room_settings_banned_users_title">Заблоковані користувачі</string>
     <!-- advanced -->
     <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>
     <string name="room_settings_labs_pref_title">Експериментальні</string>
-    <string name="room_settings_labs_warning_message">Це експериментальні функції, що можуть несподівано ламатись. Використовуйте з обережністю.</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>
@@ -683,11 +683,11 @@
     <string name="room_settings_never_send_to_unverified_devices_summary">Ніколи не надсилати зашифровані повідомлення з цього сеансу незвіреним сеансам у цій кімнаті.</string>
     <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Кімната не має локальної адреси</string>
-    <string name="room_settings_addresses_add_new_address">Нова адреса (e.g #foo:matrix.org")</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_add_new_address">Нова адреса (наприклад #foo:matrix.org)</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_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>
@@ -704,17 +704,17 @@
     <string name="encryption_information_device_info">Інформація про подію</string>
     <string name="encryption_information_user_id">ID користувача</string>
     <string name="encryption_information_curve25519_identity_key">Ключ ідентичності Curve25519</string>
-    <string name="encryption_information_claimed_ed25519_fingerprint_key">Заявлений ключ відбитка пальця Ed25519</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">Необхідний ключ відбитка Ed25519</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_device_name">Назва пристрою</string>
+    <string name="encryption_information_sender_device_information">Інформація про сеанс відправника</string>
+    <string name="encryption_information_device_name">Загальнодоступна назва</string>
     <string name="encryption_information_name">Загальнодоступна назва</string>
     <string name="encryption_information_device_id">ID сеансу</string>
     <string name="encryption_information_device_key">Ключ сеансу</string>
     <string name="encryption_information_verification">Перевірка</string>
-    <string name="encryption_information_ed25519_fingerprint">Відбиток пальця Ed25519</string>
+    <string name="encryption_information_ed25519_fingerprint">Відбиток Ed25519</string>
     <string name="encryption_export_e2e_room_keys">Експортувати E2E ключі кімнати</string>
     <string name="encryption_export_room_keys">Експортувати ключі кімнати</string>
     <string name="encryption_export_room_keys_summary">Експортувати ключі до локального файлу</string>
@@ -771,22 +771,22 @@
     <string name="largest">Найбільший</string>
     <string name="huge">Величезний</string>
     <!-- Widget-->
-    <string name="widget_no_power_to_manage">Для керування знадобами у цій кімнаті потрібен дозвіл</string>
-    <string name="widget_creation_failure">Помилка створення знадобу</string>
+    <string name="widget_no_power_to_manage">Вам потрібен дозвіл, щоб керувати розширеннями у цій кімнаті</string>
+    <string name="widget_creation_failure">Помилка створення розширення</string>
     <string name="settings_labs_create_conference_with_jitsi">Здійснювати конференц дзвінки через Jitsi</string>
-    <string name="widget_delete_message_confirmation">Ви впевнені, що бажаєте видалити знадіб з цієї кімнати\?</string>
+    <string name="widget_delete_message_confirmation">Ви впевнені, що бажаєте видалити розширення з цієї кімнати\?</string>
     <!-- Widget Integration Manager -->
-    <string name="widget_integration_unable_to_create">Не вдалося створити знадіб.</string>
+    <string name="widget_integration_unable_to_create">Не вдалося створити розширення.</string>
     <string name="widget_integration_failed_to_send_request">Не вдалося надіслати запит.</string>
-    <string name="widget_integration_positive_power_level">Рівень доступу має бути більше 0.</string>
+    <string name="widget_integration_positive_power_level">Рівень доступу має бути цілим додатним числом.</string>
     <string name="widget_integration_must_be_in_room">Ви не перебуваєте в цій кімнаті.</string>
-    <string name="widget_integration_no_permission_in_room">Ви не маєте дозволу на виконання даної дії у цій кімнаті.</string>
+    <string name="widget_integration_no_permission_in_room">Ви не маєте дозволу виконувати цю дію у цій кімнаті.</string>
     <string name="widget_integration_missing_room_id">У запиті відсутній room_id.</string>
     <string name="widget_integration_missing_user_id">У запиті відсутній user_id.</string>
     <string name="widget_integration_room_not_visible">Кімната %s невидима.</string>
     <string name="room_add_matrix_apps">Додати застосунки Matrix</string>
-    <string name="notification_noisy_notifications">Гучне повідомлення</string>
-    <string name="notification_silent_notifications">Тихі повідомлення</string>
+    <string name="notification_noisy_notifications">Гучні повідомлення</string>
+    <string name="notification_silent_notifications">Тихі сповіщення</string>
     <string name="option_take_photo">Зробити фото</string>
     <string name="option_take_video">Записати відео</string>
     <string name="call">Виклик</string>
@@ -829,8 +829,8 @@
     <string name="list_members">Список учасників</string>
     <string name="open_chat_header">Відкрити заголовок</string>
     <string name="room_sync_in_progress">Синхронізація…</string>
-    <string name="room_settings_all_messages_noisy">Всі повідомлення (гучно)</string>
-    <string name="room_settings_all_messages">Всі повідомлення</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>
@@ -860,7 +860,7 @@
         <item quantity="many">%d нових повідомлень</item>
         <item quantity="other"/>
     </plurals>
-    <string name="settings_notification_privacy_reduced">Обмежена конфіденційність</string>
+    <string name="settings_notification_privacy_reduced">Обмежена приватність</string>
     <string name="settings_notification_privacy_need_permission">Програма потребує дозвіл на роботу у фоновому режимі</string>
     <string name="settings_notification_privacy_fcm">• Сповіщення надсилаються через Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Сповіщення містять лише метадані</string>
@@ -870,21 +870,21 @@
     <string name="speak">Говорити</string>
     <string name="clear">Очистити</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="e2e_re_request_encryption_key_sent">Запит ключа надіслано.</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">Запит надіслано</string>
     <string name="settings_vibrate_on_mention">Вібрація при згадуванні користувача</string>
     <string name="settings_deactivate_account_section">Деактивація облікового запису</string>
     <string name="settings_deactivate_my_account">Деактивувати мій обліковий запис</string>
-    <string name="startup_notification_privacy_title">Конфіденційність сповіщень</string>
+    <string name="startup_notification_privacy_title">Приваиність сповіщень</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="settings_opt_in_of_analytics">Надсилання аналітичних даних</string>
     <string name="settings_opt_in_of_analytics_ok">Так, я бажаю помогти!</string>
     <string name="settings_flair">Настрій</string>
     <string name="room_settings_room_notifications_title">Сповіщення</string>
-    <string name="template_e2e_re_request_encryption_key_dialog_content">Для відправлення ключа на цей пристрій, запустіть ${app_name} на іншому пристрої, що може дешифрувати повідомлення.</string>
-    <string name="error_no_external_application_found">Вибачте, жодного стороннього застосунку не знайдено для завершення цієї дії.</string>
-    <string name="option_send_voice">Відправити голосове повідомлення</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Щоб надіслати ключ на цей пристрій, запустіть ${app_name} на іншому пристрої, що може розшифрувати повідомлення.</string>
+    <string name="error_no_external_application_found">Вибачте, жодного зовнішнього застосунку не знайдено для виконання цієї дії.</string>
+    <string name="option_send_voice">Надіслати голосове повідомлення</string>
     <string name="missing_permissions_error">Ця дія неможлива через відсутність дозволів.</string>
     <string name="dialog_title_error">Помилка</string>
     <string name="system_alerts_header">Системні сповіщення</string>
@@ -943,15 +943,15 @@
     <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_inline_url_preview">Попередній перегляд посилань</string>
-    <string name="settings_preview_media_before_sending">Попередній перегляд медіа перед відправкою</string>
+    <string name="settings_preview_media_before_sending">Попередній перегляд медіа перед надсиланням</string>
     <string name="template_startup_notification_privacy_message">${app_name} може працювати у фоновому режимі для керування безпекою та конфіденційністю ваших сповіщень. Це може вплинути на час роботи батареї.</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_without_flair">Ви наразі не є учасником жодної спільноти.</string>
     <string name="room_settings_no_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_invalid_group_format_dialog_title">Хибний ID спільноти</string>
+    <string name="room_settings_invalid_group_format_dialog_body">«%s» хибний ID спільноти</string>
     <string name="encryption_export_notice">Будь ласка, створіть пароль для шифрування ключів що експортуються. Вам знадобиться ввести такий самий пароль для імпорту цих ключів.</string>
     <string name="passphrase_create_passphrase">Створіть пароль</string>
     <string name="passphrase_passphrase_does_not_match">Паролі мають збігатися</string>
@@ -976,18 +976,18 @@
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s у %2$s</string>
     <plurals name="active_widgets">
-        <item quantity="one">%d активний знадіб</item>
-        <item quantity="few">%d активні знадоби</item>
-        <item quantity="many">%d активних знадобів</item>
-        <item quantity="other">%d активних знадобів</item>
+        <item quantity="one">%d активне розширення</item>
+        <item quantity="few">%d активні розширення</item>
+        <item quantity="many">%d активних розширень</item>
+        <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">Відправляти повідомлення клавішею Enter</string>
+    <string name="settings_labs_keyboard_options_to_send_message">Надсилати повідомлення клавішею Enter</string>
     <string name="settings_labs_enable_send_voice">Надсилати голосові повідомлення</string>
     <string name="conference_call_warning_message">Конференц-зв’язок перебуває в розробці та може бути ненадійним.</string>
-    <string name="command_description_emote">Відобразити дію</string>
-    <string name="command_description_ban_user">Блокувати користувача із вказаним ID</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>
@@ -1028,12 +1028,12 @@
     </plurals>
     <string name="group_no_long_description">Адміністратор спільноти не вказав для неї детальної інформації.</string>
     <string name="has_been_kicked">%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>
     <string name="receipt_avatar">Отримати аватар</string>
-    <string name="notice_avatar">Нотатка аватару</string>
+    <string name="notice_avatar">Примітка аватара</string>
     <string name="avatar">Аватар</string>
     <string name="dialog_user_consent_content">Щоб продовжити користуватися домашнім сервером %1$s Вам слід ознайомитись та прийняти Умови використання.</string>
     <string name="dialog_user_consent_submit">Ознайомитись зараз</string>
@@ -1081,11 +1081,11 @@
     <string name="settings_send_typing_notifs">Надсилати сповіщення про набір повідомлення</string>
     <string name="settings_send_typing_notifs_summary">Дозволити іншим користувачам бачити коли Ви набираєте повідомлення.</string>
     <string name="settings_send_markdown">Форматування Markdown</string>
-    <string name="settings_send_markdown_summary">Форматувати повідомлення з використанням синтаксису Markdown перед відправкою. Це дає можливість розгорнутого форматування, такого як використання зірочок для відображення курсивного тексту.</string>
+    <string name="settings_send_markdown_summary">Форматувати повідомлення з використанням синтаксису Markdown перед надсиланням. Це дає можливість розгорнутого форматування, як-от використання зірочок для показу курсивного тексту.</string>
     <string name="settings_show_read_receipts">Показувати підтвердження прочитання</string>
     <string name="settings_show_read_receipts_summary">Натискати на підтвердження прочитання для детального переліку.</string>
     <string name="settings_show_join_leave_messages">Показувати події приєднання та виходу</string>
-    <string name="settings_show_join_leave_messages_summary">Це не стосується запрошень, копняків та блокувань.</string>
+    <string name="settings_show_join_leave_messages_summary">Це не стосується запрошень, викидань і блокувань.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Показувати події облікових записів</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Містить зміни аватарів та імен.</string>
     <string name="settings_password">Пароль</string>
@@ -1104,16 +1104,16 @@
     <string name="notification_sync_init">Запуск сервісу</string>
     <string name="title_activity_keys_backup_setup">Резервна копія ключа</string>
     <string name="title_activity_keys_backup_restore">Використати резервну копію ключа</string>
-    <string name="room_list_people_empty_body">Тут з\'явиться список ваших прямих бесід. Торкніться + внизу праворуч щоб почати бесіду.</string>
+    <string name="room_list_people_empty_body">Тут з\'явиться список бесід з вашими особистими повідомленнями. Торкніться + внизу праворуч щоб розпочати бесіду.</string>
     <string name="event_redacted">Повідомлення видалено</string>
-    <string name="fab_menu_create_chat">Прямі чати</string>
-    <string name="bottom_action_people_x">Прямі чати</string>
-    <string name="room_filtering_footer_create_new_direct_message">Відправити нове пряме повідомлення</string>
+    <string name="fab_menu_create_chat">Особисті повідомлення</string>
+    <string name="bottom_action_people_x">Особисті повідомлення</string>
+    <string name="room_filtering_footer_create_new_direct_message">Надіслати нове особисте повідомлення</string>
     <string name="command_description_shrug">Додає ¯\\_(ツ)_/¯ перед текстовим повідомленням</string>
     <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} не підтримує повідомлення типу \'%1$s\'</string>
     <string name="command_description_rainbow">Надсилає повідомлення розмальоване веселково</string>
     <string name="settings_category_composer">Редактор повідомлень</string>
-    <string name="command_description_plain">Відправляє повідомлення як текст без інтерпретації його як Markdown</string>
+    <string name="command_description_plain">Надсилає повідомлення як текст без інтерпретації його як Markdown</string>
     <string name="room_message_placeholder">Повідомлення…</string>
     <string name="notice_crypto_unable_to_decrypt_final">Ви не маєте доступу до цього повідомлення</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Очікуємо повідомлення, це може тривати певний час</string>
@@ -1150,8 +1150,8 @@
     <string name="abort">Перервати</string>
     <string name="done">Готово</string>
     <string name="skip">Пропустити</string>
-    <string name="failed_to_remove_widget">Не вдалося видалити знадіб</string>
-    <string name="failed_to_add_widget">Не вдалося додати знадіб</string>
+    <string name="failed_to_remove_widget">Не вдалося видалити розширення</string>
+    <string name="failed_to_add_widget">Не вдалося додати розширення</string>
     <string name="cannot_call_yourself">Ви не можете здійснити дзвінок із самим собою</string>
     <string name="audio_meeting">Почати аудіо-зустріч</string>
     <string name="video_meeting">Почати відеозустріч</string>
@@ -1181,7 +1181,7 @@
     <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="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>
@@ -1189,14 +1189,14 @@
     <string name="login_error_ssl_other">Помилка SSL.</string>
     <string name="cannot_call_yourself_with_invite">Ви не можете здійснити дзвінок із самим собою, дочекайтесь, доки інші учасники приймуть ваше запрошення</string>
     <string name="uploads_files_title">ФАЙЛИ</string>
-    <string name="uploads_media_no_result">В цій кімнаті немає медіа</string>
+    <string name="uploads_media_no_result">У цій кімнаті немає медіа</string>
     <string name="uploads_media_title">МЕДІА</string>
     <string name="room_profile_section_more_uploads">Завантаження</string>
     <string name="command_description_discard_session_not_handled">Підтримується тільки в зашифрованих кімнатах</string>
     <string name="room_list_sharing_header_other_rooms">Інші кімнати</string>
     <string name="create_room_title">Нова кімната</string>
     <string name="create_new_room">Створити нову кімнату</string>
-    <string name="send_suggestion">Запропонувати</string>
+    <string name="send_suggestion">Надати пропозицію</string>
     <string name="settings_developer_mode">Режим розробника</string>
     <string name="settings_advanced_settings">Додаткові налаштування</string>
     <string name="settings_notification_advanced">Розширені налаштування сповіщень</string>
@@ -1233,11 +1233,11 @@
     <string name="send_suggestion_report_placeholder">Опишіть вашу пропозицію тут</string>
     <string name="send_suggestion_content">Залиште вашу пропозицію внизу.</string>
     <string name="settings_show_redacted">Показувати видалені повідомлення</string>
-    <string name="settings_send_message_with_enter_summary">Натискання Enter на програмній клавіатурі буде відправляти повідомлення замість додавання переносу рядку</string>
-    <string name="settings_send_message_with_enter">Відправляти повідомлення натисканням Enter</string>
+    <string name="settings_send_message_with_enter_summary">Натискання Enter на програмній клавіатурі надсилатиме повідомлення замість додавання перенесення рядка</string>
+    <string name="settings_send_message_with_enter">Надсилати повідомлення натисканням Enter</string>
     <string name="room_profile_section_more_settings">Налаштування кімнати</string>
-    <string name="room_profile_section_security_learn_more">Дізнатись більше</string>
-    <string name="uploads_files_no_result">В цій кімнаті немає файлів</string>
+    <string name="room_profile_section_security_learn_more">Докладніше</string>
+    <string name="uploads_files_no_result">У цій кімнаті немає файлів</string>
     <string name="uploads_files_subtitle">%1$s о %2$s</string>
     <string name="settings_phone_number_empty">Жодного номера телефону не додано до вашого облікового запису</string>
     <string name="settings_emails_empty">У ваш обліковий запис не додано жодної електронної адреси</string>
@@ -1290,7 +1290,7 @@
     <string name="preference_root_help_about">Довідка та опис</string>
     <string name="settings_preferences">Налаштування</string>
     <string name="settings_system_preferences_summary">Виберіть колір світлодіода, вібрацію, звук…</string>
-    <string name="settings_silent_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="notification_initial_sync">Початкова синхронізація…</string>
@@ -1317,9 +1317,9 @@
     <string name="upgrade_security">Доступне оновлення шифрування</string>
     <string name="complete_security">Довершити налаштування безпеки</string>
     <string name="login_server_other_title">Інше</string>
-    <string name="login_server_modular_learn_more">Дізнатись більше</string>
+    <string name="login_server_modular_learn_more">Докладніше</string>
     <string name="room_profile_section_security">Безпека</string>
-    <string name="settings_security_and_privacy">Безпека та приватність</string>
+    <string name="settings_security_and_privacy">Безпека й приватність</string>
     <string name="disclaimer_content">Ми раді повідомити вас, що ми змінили назву! Ваш застосунок оновлено й ви увійшли у свій обліковий запис.</string>
     <string name="login_reset_password_cancel_confirmation_content">Зміну параля ще не завершено.
 \n
@@ -1359,7 +1359,7 @@
 \nДля максимальної безпеки він повинен відрізнятися від пароля вашого облікового запису.</string>
     <string name="keys_backup_setup_step2_text_title">Захистіть свою резервну копію за допомогою парольної фрази.</string>
     <string name="keys_backup_setup_step1_manual_export">Експорт ключів вручну</string>
-    <string name="keys_backup_setup">Почніть використовувати резервне копіювання ключів</string>
+    <string name="keys_backup_setup">Почати використовувати резервне копіювання ключів</string>
     <string name="keys_backup_setup_step1_description">Повідомлення в зашифрованих кімнатах захищено наскрізним шифруванням. Тільки ви та одержувачі маєте ключі для читання цих повідомлень.
 \n
 \nБезпечно створюйте резервні копії ключів, щоб не втратити їх.</string>
@@ -1384,7 +1384,7 @@
 \nОстанні відвідини: %2$s
 \nЯкщо ви не ввійшли в інший сеанс, знехтуйте цим запитом.</string>
     <string name="widget_integration_review_terms">Для продовження потрібно прийняти Умови користування цією службою.</string>
-    <string name="room_no_active_widgets">Немає активних знадобів</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>
@@ -1392,25 +1392,25 @@
     <string name="room_widget_webview_access_camera">Використовувати камеру</string>
     <string name="room_widget_resource_decline_permission">Заблокувати все</string>
     <string name="room_widget_resource_grant_permission">Дозволити</string>
-    <string name="room_widget_resource_permission_title">Цей знадіб хоче використовувати такі ресурси:</string>
+    <string name="room_widget_resource_permission_title">Це розширення хоче використовувати такі ресурси:</string>
     <string name="error_jitsi_not_supported_on_old_device">На жаль, конференц-дзвінки з Jitsi не підтримуються на старих пристроях (пристрої з ОС Android нижче 6.0)</string>
-    <string name="room_widget_permission_room_id">Ідентифікатор кімнати</string>
-    <string name="room_widget_permission_widget_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">Ваш ідентифікатор користувача</string>
-    <string name="room_widget_permission_avatar_url">URL-адреса зображення профілю</string>
-    <string name="room_widget_permission_display_name">Ваше видиме ім\'я</string>
+    <string name="room_widget_permission_avatar_url">URL-адреса аватара</string>
+    <string name="room_widget_permission_display_name">Ваше показуване ім\'я</string>
     <string name="room_widget_revoke_access">Скасувати доступ для мене</string>
-    <string name="room_widget_open_in_browser">Відкрити в браузері</string>
-    <string name="room_widget_reload">Перезавантажити знадіб</string>
-    <string name="room_widget_failed_to_load">Не вдалося завантажити знадіб.
+    <string name="room_widget_open_in_browser">Відкрити в переглядачі</string>
+    <string name="room_widget_reload">Перезавантажити розширення</string>
+    <string name="room_widget_failed_to_load">Не вдалося завантажити розширення.
 \n%s</string>
     <string name="room_widget_permission_shared_info_title">Використання може спричинити обмін даними з %s:</string>
     <string name="room_widget_permission_webview_shared_info_title">За його використання може бути встановлено файли cookie та відбуватися обмін даними з %s:</string>
-    <string name="room_widget_permission_added_by">Цей знадіб додав:</string>
-    <string name="room_widget_permission_title">Завантажити знадіб</string>
-    <string name="room_widget_activity_title">Знадіб</string>
-    <string name="active_widgets_title">Активні знадоби</string>
+    <string name="room_widget_permission_added_by">Це розширення додає:</string>
+    <string name="room_widget_permission_title">Завантажити розширення</string>
+    <string name="room_widget_activity_title">Розширення</string>
+    <string name="active_widgets_title">Активні розширення</string>
     <string name="active_widget_view_action">ПОДАННЯ</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>
@@ -1453,10 +1453,10 @@
     <string name="device_name_warning">Загальнодоступну назву сеансу бачать люди, з якими ви спілкуєтесь</string>
     <string name="encryption_information_device_name_with_warning">Загальнодоступна назва (видима людям, з якими спілкуєтесь)</string>
     <plurals name="room_settings_banned_users_count">
-        <item quantity="one">%d заборонений користувач</item>
-        <item quantity="few">%d заборонені користувачі</item>
-        <item quantity="many">%d заборонених користувачів</item>
-        <item quantity="other">%d заборонених користувачів</item>
+        <item quantity="one">%d заблокований користувач</item>
+        <item quantity="few">%d заблоковані користувачі</item>
+        <item quantity="many">%d заблокованих користувачів</item>
+        <item quantity="other">%d заблокованих користувачів</item>
     </plurals>
     <string name="room_alias_publish_to_directory_error">Не вдалося отримати поточну видимість каталогу кімнат (%1$s).</string>
     <string name="room_alias_publish_to_directory">Опублікувати цю кімнату для всіх у каталозі кімнат %1$s\?</string>
@@ -1470,8 +1470,8 @@
     <string name="room_alias_address_empty">Інших опублікованих адрес поки що немає.</string>
     <string name="room_alias_address_empty_can_add">Інших опублікованих адрес поки що немає, додайте якусь внизу.</string>
     <string name="room_alias_publish">Опублікувати цю кімнату для всіх у каталозі кімнат %1$s\?</string>
-    <string name="room_alias_delete_confirmation">Видалити адресу \"%1$s\"\?</string>
-    <string name="room_alias_unpublish_confirmation">Скасувати публікацію адреси \"%1$s\"\?</string>
+    <string name="room_alias_delete_confirmation">Видалити адресу «%1$s»\?</string>
+    <string name="room_alias_unpublish_confirmation">Скасувати публікацію адреси «%1$s»\?</string>
     <string name="room_alias_published_alias_add_manually_submit">Опублікувати</string>
     <string name="room_alias_published_alias_add_manually">Опублікувати нову адресу вручну</string>
     <string name="room_alias_published_other">Інші опубліковані адреси:</string>
@@ -1480,7 +1480,7 @@
     <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_settings_alias_subtitle">Перегляньте та керуйте адресами цієї кімнати та їхньою видимістю у каталозі кімнат.</string>
     <string name="room_settings_alias_title">Адреси кімнат</string>
     <string name="room_settings_room_access_title">Доступ до кімнати</string>
     <string name="room_settings_room_read_history_dialog_subtitle">Зміни щодо тих, хто може читати історію, стосуватимуться лише майбутніх повідомлень у цій кімнаті. Видимість наявної історії залишиться незмінною.</string>
@@ -1496,7 +1496,7 @@
     <string name="settings_fail_to_update_password_invalid_current_password">Пароль не дійсний</string>
     <string name="settings_change_password_submit">Оновити пароль</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>
@@ -1507,17 +1507,17 @@
     <string name="startup_notification_fdroid_battery_optim_title">Фонове з’єднання</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_secure_backup_section_info">Захистіться від втрати доступу до зашифрованих повідомлень і даних створенням резервної копії ключів шифрування на своєму сервері.</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="settings_show_room_member_state_events_summary">Включає події запрошення/приєднання/виходу/видалення/заборони та зміни зображень профілю/видимих імен.</string>
+    <string name="settings_show_room_member_state_events_summary">Включає події запрошення/приєднання/виходу/викидання/блокування та зміни аватарів/показуваних імен.</string>
     <string name="settings_show_room_member_state_events">Показати стан подій учасників кімнати</string>
     <string name="settings_cryptography_manage_keys">Керування криптографічними ключами</string>
-    <string name="settings_integrations_summary">Використовуйте менеджер інтеграції для керування ботами, мостами, знадобами та пакунками наліпок.
-\nМенеджери інтеграції отримують дані конфігурації та можуть змінювати знадоби, надсилати запрошення до кімнати та надавати права від вашого імені.</string>
+    <string name="settings_integrations_summary">Використовуйте менеджер інтеграції для керування ботами, мостами, розширеннями та пакунками наліпок.
+\nМенеджери інтеграції отримують дані конфігурації та можуть змінювати розширення, надсилати запрошення до кімнати та надавати права від вашого імені.</string>
     <string name="settings_integrations">Інтеграції</string>
     <plurals name="seconds">
         <item quantity="one">%d секунда</item>
@@ -1601,7 +1601,7 @@
     <string name="settings_add_3pid_authentication_needed">Потрібна автентифікація</string>
     <string name="template_settings_add_3pid_flow_not_supported">Це неможливо зробити за допомогою ${app_name} mobile</string>
     <string name="settings_add_3pid_confirm_password_title">Підтвердити пароль</string>
-    <string name="search_banned_user_hint">Фільтрувати заборонених користувачів</string>
+    <string name="search_banned_user_hint">Фільтрувати заблокованих користувачів</string>
     <string name="room_participants_unban_prompt_msg">Скасування блокування користувача дозволить їм знову приєднатися до кімнати.</string>
     <string name="room_participants_unban_title">Розблокувати користувача</string>
     <string name="room_participants_ban_reason">Причина блокування</string>
@@ -1613,7 +1613,7 @@
     <string name="room_participants_kick_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">Нехтування цього користувача призведе до видалення його повідомлень з усіх кімнат, де ви обидва є учасниками.
 \n
@@ -1639,8 +1639,8 @@
     <string name="login_set_msisdn_mandatory_hint">Номер телефону</string>
     <string name="room_list_quick_actions_notifications_mute">Без звуку</string>
     <string name="room_list_quick_actions_notifications_mentions">Лише згадки</string>
-    <string name="room_list_quick_actions_notifications_all">Всі повідомлення</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_all_noisy">Усі повідомлення (гучно)</string>
     <string name="message_ignore_user">Нехтувати користувача</string>
     <string name="unignore">Не нехтувати</string>
     <string name="keys_backup_info_title_signature">Підпис</string>
@@ -1649,7 +1649,7 @@
     <string name="settings_setup_secure_backup">Налаштувати безпечне резервне копіювання</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Використати ключ безпеки</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Налаштувати</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">Захистіться від втрати доступу до зашифрованих повідомлень та даних створенням резервної копії ключів шифрування на своєму сервері.</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Захистіться від втрати доступу до зашифрованих повідомлень і даних створенням резервної копії ключів шифрування на своєму сервері.</string>
     <string name="login_reset_password_password_hint">Новий пароль</string>
     <string name="login_reset_password_warning_title">Увага!</string>
     <string name="login_server_url_form_other_hint">Адреса</string>
@@ -1696,11 +1696,11 @@
     <string name="please_wait">Просимо зачекати…</string>
     <string name="crosssigning_verify_session">Перевірка входу</string>
     <string name="settings_active_sessions_signout_device">Вийти з цього сеансу</string>
-    <string name="verify_new_session_was_not_me">Це був не я</string>
+    <string name="verify_new_session_was_not_me">Це не я</string>
     <string name="room_profile_not_encrypted_subtitle">Повідомлення в цій кімнаті не захищено наскрізним шифруванням.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Повідомлення тут не захищено наскрізним шифруванням.</string>
     <string name="room_settings_enable_encryption">Увімкнути наскрізне шифрування…</string>
-    <string name="direct_room_encryption_enabled_tile_description">Повідомлення в цій кімнаті наскрізно зашифровані.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Повідомлення в цій кімнаті захищені наскрізним шифруванням.</string>
     <string name="verification_verify_device">Звірити цей сеанс</string>
     <string name="sas_decimal_description">Перевірте цей сеанс, підтвердивши, що на екрані партнера з’являються такі цифри</string>
     <string name="sas_emoji_description">Перевірте цей сеанс, підтвердивши, що на екрані партнера з’являються ці емоджі</string>
@@ -1743,7 +1743,7 @@
     </plurals>
     <string name="room_profile_section_more">Більше</string>
     <string name="disclaimer_positive_button">ДОКЛАДНІШЕ</string>
-    <string name="encryption_enabled_tile_description">Повідомлення в цій кімнаті захищені наскрізним шифруванням. Дізнайтеся більше та підтвердьте користувачів у їхньому профілі.</string>
+    <string name="encryption_enabled_tile_description">Повідомлення в цій кімнаті захищені наскрізним шифруванням. Дізнайтеся більше та підтвердіть користувачів у їхньому профілі.</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</string>
@@ -1753,7 +1753,7 @@
     <string name="room_permissions_enable_room_encryption">Вмикати шифрування кімнати</string>
     <string name="room_permissions_change_main_address_for_the_room">Змінювати основну адресу кімнати</string>
     <string name="room_permissions_change_room_avatar">Змінювати аватар кімнати</string>
-    <string name="room_permissions_modify_widgets">Змінювати знадоби</string>
+    <string name="room_permissions_modify_widgets">Змінити розширення</string>
     <string name="room_permissions_notify_everyone">Сповіщати всіх</string>
     <string name="room_permissions_remove_messages_sent_by_others">Вилучати повідомлення, надіслані іншими</string>
     <string name="room_permissions_ban_users">Блокувати користувачів</string>
@@ -1781,7 +1781,7 @@
     <string name="signed_out_title">Ви вийшли</string>
     <string name="message_action_item_redact">Вилучити…</string>
     <string name="send_a_sticker">Наліпка</string>
-    <string name="terms_description_for_integration_manager">Використовувати ботів, мости, знадоби та пакунки наліпок</string>
+    <string name="terms_description_for_integration_manager">Використовувати ботів, мости, розширення та пакунки наліпок</string>
     <string name="no_connectivity_to_the_server_indicator">Зв\'язок із сервером втрачено</string>
     <string name="no_message_edits_found">Не знайдено жодної правки</string>
     <string name="message_edits">Історія правок</string>
@@ -1875,16 +1875,16 @@
     <string name="notice_room_kick_with_reason_by_you">Ви викинули %1$s. Причина: %2$s</string>
     <string name="notice_room_kick_with_reason">%1$s викидає %2$s. Причина: %3$s</string>
     <string name="call_tile_in_call">Ви берете участь в цьому виклику зараз</string>
-    <string name="this_is_the_beginning_of_dm">Це початок вашої історії листування з %s.</string>
-    <string name="room_profile_encrypted_subtitle">Повідомлення тут є наскрізно зашифрованими.
+    <string name="this_is_the_beginning_of_dm">Це початок історії вашого особистого спілкування з %s.</string>
+    <string name="room_profile_encrypted_subtitle">Повідомлення тут захищені наскрізним шифруванням.
 \n
 \nВаші повідомлення захищені замками, тож лише ви та отримувачі мають унікальні ключі для їхнього відмикання.</string>
-    <string name="direct_room_profile_encrypted_subtitle">Повідомлення тут є наскрізно зашифрованими.
+    <string name="direct_room_profile_encrypted_subtitle">Повідомлення тут захищені наскрізним шифруванням.
 \n
 \nВаші повідомлення захищені замками, тож лише ви та отримувачі мають унікальні ключі для їхнього відмикання.</string>
     <string name="this_is_the_beginning_of_room">Це початок %s.</string>
     <string name="call_tile_other_declined">%1$s відхиляє цей виклик</string>
-    <string name="call_tile_you_declined">Ви відхилили цей виклик %1$s</string>
+    <string name="call_tile_you_declined">Ви відхилили цей виклик %s</string>
     <string name="call_tile_other_started_call">%1$s розпочинає виклик</string>
     <string name="call_tile_you_started_call">Ви розпочали виклик</string>
     <string name="quick_reactions">Швидкі реакції</string>
@@ -1904,12 +1904,12 @@
         <item quantity="many">%1$d призупинених викликів</item>
         <item quantity="other">%1$d призупинених викликів</item>
     </plurals>
-    <string name="call_only_active">Поточний виклик (%1$s)</string>
+    <string name="call_only_active">Активний виклик (%1$s)</string>
     <plurals name="call_one_active_and_other_paused">
-        <item quantity="one">1 поточний виклик (%1$s) · 1 призупинений виклик</item>
-        <item quantity="few">1 поточний виклик (%1$s) · %2$d призупинені виклики</item>
-        <item quantity="many">1 поточний виклик (%1$s) · %2$d призупинених викликів</item>
-        <item quantity="other">1 поточний виклик (%1$s) · %2$d призупинених викликів</item>
+        <item quantity="one">1 активний виклик (%1$s) · 1 призупинений виклик</item>
+        <item quantity="few">1 активний виклик (%1$s) · %2$d призупинені виклики</item>
+        <item quantity="many">1 активний виклик (%1$s) · %2$d призупинених викликів</item>
+        <item quantity="other">1 активний виклик (%1$s) · %2$d призупинених викликів</item>
     </plurals>
     <string name="change_room_directory_network">Змінити мережу</string>
     <string name="action_change">Змінити</string>
@@ -2065,7 +2065,7 @@
     <string name="room_settings_enable_encryption_warning">Після увімкнення, шифрування не може бути вимкнено.</string>
     <string name="command_description_rainbow_emote">Надсилає емоджі розмальоване веселково</string>
     <string name="room_list_sharing_header_recent_rooms">Недавні кімнати</string>
-    <string name="room_member_open_or_create_dm">Безпосереднє повідомлення</string>
+    <string name="room_member_open_or_create_dm">Особисте повідомлення</string>
     <string name="room_member_power_level_custom_in">Не типовий (%1$d) у %2$s</string>
     <string name="room_member_power_level_custom">Не типовий</string>
     <string name="notice_power_level_diff">%1$s з %2$s до %3$s</string>
@@ -2086,4 +2086,427 @@
     <string name="room_member_power_level_admin_in">Адміністратор у %1$s</string>
     <string name="room_member_power_level_users">Користувачі</string>
     <string name="spaces_invited_header">Запрошення</string>
+    <string name="keys_backup_banner_update_line2">Керування резервним копіюванням ключів</string>
+    <string name="keys_backup_banner_update_line1">Нові захищені ключі повідомлень</string>
+    <string name="keys_backup_banner_recover_line2">Використати резервну копію ключа</string>
+    <string name="secure_backup_banner_setup_line1">Безпечне резервне копіювання</string>
+    <string name="keys_backup_banner_setup_line2">Почати використовувати резервне копіювання ключів</string>
+    <string name="keys_backup_banner_recover_line1">Ніколи не втрачайте зашифровані повідомлення</string>
+    <string name="keys_backup_banner_setup_line1">Ніколи не втрачайте зашифровані повідомлення</string>
+    <string name="new_recovery_method_popup_was_me">Так, це я</string>
+    <string name="new_recovery_method_popup_title">Нова резервна копія ключа</string>
+    <string name="keys_backup_settings_delete_confirm_message">Видалити резервні копії ключів шифрування з сервера\? Ви більше не зможете використовувати ключ відновлення для читання зашифрованої історії повідомлень.</string>
+    <string name="keys_backup_settings_untrusted_backup">Щоб використовувати резервну копії ключів у цьому сеансі, відновіть її за допомогою парольної фрази або ключа відновлення зараз.</string>
+    <string name="keys_backup_get_trust_error">Не вдалося отримати інформацію про довіру для резервної копії (%s).</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Резервна копія має чинний підпис цього сеансу.</string>
+    <string name="keys_backup_settings_signature_from_unknown_device">Резервна копія містить підпис невідомого сеансу з ID %s.</string>
+    <string name="keys_backup_settings_status_not_setup">Для цього сеансу не створюється резервна копія ваших ключів.</string>
+    <string name="keys_backup_settings_status_ko">Резервне копіювання ключів не активне у цьому сеансі.</string>
+    <string name="keys_backup_settings_status_ok">Резервну копію ключів було правильно налаштовано для цього сеансу.</string>
+    <string name="secure_backup_banner_setup_line2">Захистіться від втрати доступу до зашифрованих повідомлень і даних</string>
+    <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>
+    <string name="login_splash_text1">Спілкуйтеся з людьми безпосередньо або в групах</string>
+    <string name="settings_notification_configuration">Налаштування сповіщень</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_delete_confirm_title">Видалити резервну копію</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_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">До цього сеансу додано %d нових ключів.</item>
+    </plurals>
+    <plurals name="keys_backup_restore_success_description_part1">
+        <item quantity="one">Відновлено резервну копію з %d ключем.</item>
+        <item quantity="few">Відновлено резервну копію з %d ключами.</item>
+        <item quantity="many">Відновлено резервну копію з %d ключами.</item>
+        <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="notice_room_server_acl_updated_ip_literals_not_allowed">• Сервери з відповідними літералам IP тепер заблоковано.</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_set_ip_literals_not_allowed">• Сервери, що з відповідними літералам IP заблоковано.</string>
+    <string name="notice_room_server_acl_set_banned">• Відповідні сервери %s заблоковано.</string>
+    <string name="error_opening_banned_room">Неможливо відкрити кімнату, у якій вас заблоковано.</string>
+    <string name="create_room_directory_description">Опублікувати цю кімнату в каталозі кімнат</string>
+    <string name="create_room_directory_title">Каталог кімнат</string>
+    <string name="room_filtering_footer_open_room_directory">Переглянути каталог кімнат</string>
+    <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="settings_encrypted_direct_messages">Зашифровані особисті повідомлення</string>
+    <string name="settings_messages_direct_messages">Особисті повідомлення</string>
+    <string name="recovery_key_empty_error_message">Введіть ключ відновлення</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Введіть ключ відновлення</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_restore_with_key_helper">Втратили ключ відновлення\? Ви можете налаштувати новий у налаштуваннях.</string>
+    <string name="keys_backup_restore_setup_recovery_key">Відновлення повідомлень</string>
+    <string name="keys_backup_restore_key_enter_hint">Введіть ключ відновлення</string>
+    <string name="keys_backup_restore_with_recovery_key">Використайте ключ відновлення, щоб розблокувати історію зашифрованих повідомлень</string>
+    <string name="keys_backup_restore_use_recovery_key">використайте свій ключ відновлення</string>
+    <string name="keys_backup_restore_is_getting_backup_version">Отримання резервної версії…</string>
+    <string name="error_jitsi_join_conf">Перепрошуємо, під час спроби приєднатися до конференції сталася помилка</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="other_spaces_or_rooms_you_might_not_know">Інші простори чи кімнати, про які ви могли б не знати</string>
+    <string name="space_you_know_that_contains_this_room">Ви знаєте простір, що містить цю кімнату</string>
+    <string name="decide_who_can_find_and_join">Визначте, хто може знайти та приєднатися до цієї кімнати.</string>
+    <string name="decide_which_spaces_can_access">Визначте, з яких просторів можна отримати доступ до цієї кімнати. Якщо вибрано простір, його учасники зможуть знайти та приєднатися до вказаної кімнати.</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_restricted_description">Будь-хто у просторі з цією кімнатою може знайти та приєднатися до неї. Додати учасників до простору можуть лише адміністратори цієї кімнати.</string>
+    <string name="room_settings_room_access_restricted_title">Лише учасники простору</string>
+    <string name="room_settings_room_access_public_description">Кожен може знайти кімнату та приєднатися</string>
+    <string name="create_room_settings_section">Налаштування кімнати</string>
+    <string name="space_type_public_desc">Відкритий для всіх, найкраще для спільнот</string>
+    <string name="fab_menu_create_room">Кімнати</string>
+    <string name="create_room_public_title">Загальнодоступна</string>
+    <string name="space_type_public">Загальнодоступний</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_invite_only_title">Приватна (лише за запрошенням)</string>
+    <string name="room_settings_room_access_private_title">Приватна</string>
+    <string name="space_type_private">Приватний</string>
+    <string name="room_settings_room_access_entry_unknown">Невідоме налаштування доступу (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Будь-хто може попроситися до кімнати, учасники можуть прийняти або відхилити</string>
+    <string name="suggested_rooms_pills_on_empty_header">Вітаємо в %1$s, %2$s.</string>
+    <string name="join_anyway">Все одно приєднатися</string>
+    <string name="create_space">Створити Простір</string>
+    <string name="join_space">Приєднатися до Простору</string>
+    <string name="invite_by_link">Поділитися посиланням</string>
+    <string name="invite_by_mxid">Запросити за користувацьким іменем</string>
+    <string name="invite_by_email">Запросити електронним листом</string>
+    <string name="voice_message_slide_to_cancel">Проведіть пальцем, щоб скасувати</string>
+    <string name="a11y_start_voice_message">Розпочати голосове повідомлення</string>
+    <string name="call_jitsi_started">Розпочато груповий виклик</string>
+    <string name="space_leave_prompt_msg">Ви впевнені, що хочете залишити простір\?</string>
+    <string name="leave_space">Залишити простір</string>
+    <string name="space_settings_manage_rooms">Керувати кімнатами</string>
+    <string name="user_invites_you">%s запрошує вас</string>
+    <string name="you_are_invited">Вас запрошено</string>
+    <string name="spaces_beta_welcome_to_spaces">Вітаємо у Просторах!</string>
+    <string name="space_add_rooms">Додати кімнати</string>
+    <string name="space_add_child_title">Додати кімнати</string>
+    <string name="invite_to_space_with_name">Запросити до %s</string>
+    <string name="invite_to_space">Запросити до %s</string>
+    <string name="invite_people_menu">Запросити людей</string>
+    <string name="invite_people_to_your_space">Запрошуйте людей до свого простору</string>
+    <string name="create_space_topic_hint">Опис</string>
+    <string name="create_spaces_loading_message">Створення простору…</string>
+    <string name="your_private_space">Ваш приватний простір</string>
+    <string name="your_public_space">Ваш загальнодоступний простір</string>
+    <string name="add_space">Додати простір</string>
+    <string name="private_space">Приватний простір</string>
+    <string name="event_status_delete_all_failed_dialog_title">Видалити не надіслані повідомлення</string>
+    <string name="event_status_cancel_sending_dialog_message">Бажаєте скасувати надсилання повідомлення\?</string>
+    <string name="event_status_a11y_delete_all">Видалити повідомлення, які не вдалося надіслати</string>
+    <string name="event_status_a11y_failed">Не вдалося</string>
+    <string name="event_status_a11y_sent">Надіслано</string>
+    <string name="event_status_a11y_sending">Надсилання</string>
+    <string name="dev_tools_success_event">Подію надіслано!</string>
+    <string name="dev_tools_menu_name">Інструменти розробника</string>
+    <string name="room_settings_room_version_title">Версія кімнати</string>
+    <string name="tap_to_edit_spaces">Торкніться, щоб редагувати простори</string>
+    <string name="select_spaces">Вибрати простори</string>
+    <string name="settings_show_emoji_keyboard_summary">Додати кнопку до редактора повідомлень, щоб відкрити клавіатуру емоджі</string>
+    <string name="settings_show_emoji_keyboard">Показати клавіатуру емоджі</string>
+    <string name="settings_chat_effects_description">Скористайтеся командою /confetti або надсилайте повідомлення, що містить ❄️ або 🎉</string>
+    <string name="settings_chat_effects_title">Показувати ефекти бесіди</string>
+    <string name="public_space">Загальнодоступний простір</string>
+    <string name="a11y_public_space">Загальнодоступний простір</string>
+    <string name="a11y_public_room">Загальнодоступна кімната</string>
+    <string name="a11y_rule_notify_off">Не сповіщати</string>
+    <string name="a11y_rule_notify_silent">Сповіщати без звуку</string>
+    <string name="a11y_rule_notify_noisy">Сповіщати зі звуком</string>
+    <string name="a11y_error_message_not_sent">Повідомлення не надіслано через помилку</string>
+    <string name="a11y_close_emoji_picker">Закрити панель емоджі</string>
+    <string name="a11y_open_emoji_picker">Відкрити панель емоджі</string>
+    <string name="a11y_trust_level_default">Типовий рівень довіри</string>
+    <string name="a11y_selected">Вибрано</string>
+    <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>
+    <string name="a11y_image">Зображення</string>
+    <string name="a11y_import_key_from_file">Імпортувати ключі з файлу</string>
+    <string name="a11y_screenshot">Знімок екрана</string>
+    <string name="call_slide_to_end_conference">Проведіть пальцем, щоб завершити виклик</string>
+    <string name="call_transfer_unknown_person">Невідома особа</string>
+    <string name="call_transfer_transfer_to_title">Переадресувати на %1$s</string>
+    <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="few">%1$d активні виклики ·</item>
+        <item quantity="many">%1$d активних викликів ·</item>
+        <item quantity="other">%1$d активних викликів ·</item>
+    </plurals>
+    <string name="call_tile_video_missed">Пропущений відеовиклик</string>
+    <string name="call_tile_voice_missed">Пропущений голосовий виклик</string>
+    <string name="call_tile_video_declined">Відеовиклик відхилено</string>
+    <string name="call_tile_voice_declined">Голосовий виклик відхилено</string>
+    <string name="call_tile_video_call_has_ended">Відеовиклик завершено • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">Голосовий виклик завершено • %1$s</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Ви не отримуватимете сповіщення про згадки та ключові слова в зашифрованих кімнатах на мобільних пристроях.</string>
+    <string name="settings_room_upgrades">Оновлення кімнати</string>
+    <string name="settings_messages_by_bot">Повідомлення бота</string>
+    <string name="settings_room_invitations">Запрошення до кімнати</string>
+    <string name="settings_messages_containing_keywords">Ключові слова</string>
+    <string name="settings_mentions_at_room">\@room</string>
+    <string name="settings_encrypted_group_messages">Зашифровані групові повідомлення</string>
+    <string name="settings_group_messages">Групові повідомлення</string>
+    <string name="settings_messages_containing_username">Моє користувацьке ім\'я</string>
+    <string name="settings_messages_containing_display_name">Моє показуване ім\'я</string>
+    <string name="settings_messages_at_room">Повідомлення, які містять @room</string>
+    <string name="settings_when_rooms_are_upgraded">Коли кімнати оновлено</string>
+    <string name="settings_messages_in_e2e_group_chat">Зашифровані повідомлення в групових бесідах</string>
+    <string name="settings_messages_in_e2e_one_to_one">Зашифровані повідомлення в індивідуальних бесідах</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="call_tile_voice_active">Активний голосовий виклик</string>
+    <string name="call_tile_video_active">Активний відеовиклик</string>
+    <string name="call_tile_video_incoming">Вхідний відеовиклик</string>
+    <string name="call_tile_voice_incoming">Вхідний голосовий виклик</string>
+    <string name="space_settings_alias_subtitle">Переглянути й керувати адресами цього простору.</string>
+    <string name="space_settings_alias_title">Адреси просторів</string>
+    <string name="room_settings_guest_access_title">Дозволити гостям приєднуватися</string>
+    <string name="room_settings_room_notifications_account_settings">Налаштування облікового запису</string>
+    <string name="room_settings_room_notifications_manage_notifications">Ви можете керувати сповіщеннями у %1$s.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Зауважте, що згадки та сповіщення про ключові слова недоступні в зашифрованих кімнатах на мобільних пристроях.</string>
+    <string name="room_settings_room_notifications_notify_me">Сповіщати мене про</string>
+    <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="room_settings_none">Жодного</string>
+    <string name="room_settings_mention_and_keyword_only">Лише згадки та ключові слова</string>
+    <string name="continue_anyway">Усе одно продовжити</string>
+    <string name="call_tile_no_answer">Не відповідає</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="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="few">%d пропущені відеовиклики</item>
+        <item quantity="many">%d пропущених відеовикликів</item>
+        <item quantity="other">%d пропущених відеовикликів</item>
+    </plurals>
+    <plurals name="missed_audio_call">
+        <item quantity="one">Пропущено аудіовиклик</item>
+        <item quantity="few">%d пропущених аудіовиклики</item>
+        <item quantity="many">%d пропущених аудіовикликів</item>
+        <item quantity="other">%d пропущених аудіовикликів</item>
+    </plurals>
+    <string name="call_ringing">Викликається…</string>
+    <string name="error_unauthorized">Не авторизовано, відсутні дійсні облікові дані для автентифікації</string>
+    <string name="use_as_default_and_do_not_ask_again">Застосувати типовим і більше не запитувати</string>
+    <string name="option_always_ask">Завжди запитувати</string>
+    <string name="hs_client_url">URL-адреса API домашнього сервера</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_return">Повернутись</string>
+    <string name="action_switch">Перемкнути</string>
+    <string name="missing_permissions_title">Відсутні дозволи</string>
+    <string name="denied_permission_camera">Щоб виконати цю дію, надайте дозвіл камери у налаштуваннях системи.</string>
+    <string name="denied_permission_voice_message">Щоб надсилати голосові повідомлення, надайте дозвіл на мікрофон.</string>
+    <string name="denied_permission_generic">Бракує деяких дозволів для виконання цієї дії. Будь ласка, надайте дозволи у налаштуваннях системи.</string>
+    <string name="spaces_header">Простори</string>
+    <string name="spaces">Простори</string>
+    <string name="learn_more">Докладніше</string>
+    <string name="system_theme">Системна</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Ви увімкнули наскрізне шифрування (нерозпізнаний алгоритм %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s вмикає наскрізне шифрування (нерозпізнаний алгоритм %2$s).</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">%1$s змінює адреси для цієї кімнати.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s змінює основну й альтернативні адреси для цієї кімнати.</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="few">Ви вилучили альтернативні адреси %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="few">%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="few">Ви додаєте альтернативні адреси %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="few">%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="few">Ви вилучили адреси кімнати %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="few">%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="few">Ви додали %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="few">%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="event_status_sent_message">Повідомлення надіслано</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_requested_voip_conference_by_you">Ви подали запит на конференцію 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_ip_literals_allowed">• Сервери з відповідними літералам IP тепер дозволено.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Відповідні сервери %s було вилучено зі списку дозволених.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Відповідні сервери %s тепер дозволено.</string>
+    <string name="a11y_open_widget">Відкрити розширення</string>
+    <string name="notice_room_server_acl_updated_title">%s змінює ACL сервера для цієї кімнати.</string>
+    <string name="call_remove_jitsi_widget_progress">Завершення виклику…</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_title_by_you">Ви встановили ACL сервера для цієї кімнати.</string>
+    <string name="notice_room_server_acl_set_title">%s встановлює ACL сервера для цієї кімнати.</string>
+    <string name="room_list_quick_actions_room_settings">Налаштування кімнати</string>
+    <string name="attachment_viewer_item_x_of_y">%1$d з %2$d</string>
+    <string name="rotate_and_crop_screen_title">Обернути й обрізати</string>
+    <string name="error_file_too_big">Файл «%1$s» (%2$s) завеликий для вивантаження. Обмеження %3$s.</string>
+    <string name="error_file_too_big_simple">Цей файл завеликий для вивантаження.</string>
+    <string name="a11y_beta">Це бета-можливість</string>
+    <string name="a11y_hide_password">Сховати пароль</string>
+    <string name="a11y_show_password">Показати пароль</string>
+    <string name="a11y_create_room">Створити нову кімнату</string>
+    <string name="a11y_create_direct_message">Створити нову особисту бесіду</string>
+    <string name="a11y_create_menu_close">Закрити меню створення кімнати…</string>
+    <string name="a11y_create_menu_open">Відкрити меню створення кімнати</string>
+    <string name="a11y_open_drawer">Відкрити панель навігації</string>
+    <string name="send_attachment">Надіслати вкладення</string>
+    <string name="settings_text_message_sent_wrong_code">Хибний код підтвердження.</string>
+    <string name="settings_text_message_sent_hint">Код</string>
+    <string name="link_copied_to_clipboard">Посилання скопійовано в буфер обміну</string>
+    <string name="room_filtering_footer_title">Не вдалося знайти те, що ви шукаєте\?</string>
+    <string name="send_file_step_compressing_video">Стиснення відео %d%%</string>
+    <string name="send_file_step_compressing_image">Стиснення зображення…</string>
+    <string name="send_file_step_sending_thumbnail">Надсилання мініатюри (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_thumbnail">Шифрування мініатюри…</string>
+    <string name="send_file_step_idle">Очікування…</string>
+    <string name="feedback_failed">Не вдалося надіслати відгук (%s)</string>
+    <string name="feedback_sent">Спасибі, відгук успішно надіслано</string>
+    <string name="send_feedback_space_title">Відгук про Простори</string>
+    <string name="feedback">Відгук</string>
+    <string name="push_gateway_item_format">Формат:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="settings_expert">Експерт</string>
+    <string name="settings_sdk_version">Версія Matrix SDK</string>
+    <string name="create_room_federation_error">Кімнату створено, але деякі запрошення не надіслано з такої причини:
+\n
+\n%s</string>
+    <string name="create_room_public_description">Будь-хто зможе приєднатися до цієї кімнати</string>
+    <string name="event_redacted_by_admin_reason">Подія модерована адміністратором кімнати</string>
+    <string name="reactions">Реакції</string>
+    <string name="send_you_invite">Надсилає вам запрошення</string>
+    <string name="sas_error_unknown">Невідома помилка</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_user">Користувач скасовує перевірку</string>
+    <string name="sas_incoming_request_notif_content">%s хоче звірити сеанс</string>
+    <string name="sas_incoming_request_notif_title">Запит перевірки</string>
+    <string name="verification_request">Запит перевірки</string>
+    <string name="sas_verification_request_notification_channel">Інтерактивна перевірка сеансу</string>
+    <string name="sas_cancelled_by_me">Перевірку скасовано.
+\nПричина: %s</string>
+    <string name="sas_cancelled_by_other">Перевірку скасовано іншою стороною.
+\n%s</string>
+    <string name="sas_cancelled_dialog_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_waiting_for_partner">Очікування підтвердження партнером…</string>
+    <string name="sas_view_request_action">Переглянути запит</string>
+    <string name="sas_incoming_verification_request_dialog">Ви отримали вхідний запит перевірки.</string>
+    <string name="sas_incoming_request_title">Вхідний запит перевірки</string>
+    <string name="sas_verify_start_button_title">Почати перевірку</string>
+    <string name="keys_backup_info_keys_all_backup_up">Резервні копії всіх ключів створено</string>
+    <string name="keys_backup_banner_in_progress">Резервне копіювання ключів. Це може тривати кілька хвилин…</string>
+    <string name="verify_new_session_compromized">Ваш обліковий запис може бути зламано</string>
+    <string name="verification_scan_self_emoji_subtitle">Перевірити, порівнявши емоджі натомість</string>
+    <string name="verification_scan_emoji_title">Не вдалося сканувати</string>
+    <string name="verification_scan_with_this_device">Сканувати за допомогою цього пристрою</string>
+    <string name="verify_by_emoji_description">Якщо ви не можете сканувати код вгорі, перевірте, порівнявши короткий унікальний набір емоджі.</string>
+    <string name="verification_scan_their_code">Сканувати їхній код</string>
+    <string name="verification_scan_self_notice">Скануйте код за допомогою іншого пристрою або перемкніться та скануйте за допомогою цього пристрою</string>
+    <string name="verification_scan_notice">Зіскануйте код за допомогою пристрою іншого користувача, щоб надійно перевірити одне одного</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 ec2de261f7..0e83a210b3 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -280,10 +280,10 @@
     <string name="settings_discovery_category">Khám phá</string>
     <string name="settings_deactivate_my_account">Vô hiệu hoá tài khoản của tôi</string>
     <string name="settings_deactivate_account_section">Vô hiệu hoá tài khoản</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Máy chủ khớp với %s đã bị xoá khỏi danh sách được cho phép.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Máy chủ khớp với %s bây giờ sẽ được cho phép.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Máy chủ khớp với %s đã được xoá khỏi danh sách cấm.</string>
-    <string name="notice_room_server_acl_updated_banned">• Máy chủ khớp với %s bây giờ sẽ bị cấm.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Những máy chủ khớp với %s đã bị xoá khỏi danh sách được cho phép.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Những máy chủ khớp với %s bây giờ sẽ được cho phép.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Những máy chủ khớp với %s đã được xoá khỏi danh sách cấm.</string>
+    <string name="notice_room_server_acl_updated_banned">• Những máy chủ khớp với %s bây giờ sẽ bị cấm.</string>
     <string name="template_re_authentication_default_confirm_text">${app_name} yêu cầu bạn nhập thông tin của bạn để thực hiện hành động này.</string>
     <string name="re_authentication_activity_title">Cần xác thực lại</string>
     <string name="call_transfer_users_tab_title">Người dùng</string>
@@ -376,8 +376,8 @@
     <string name="notice_room_server_acl_updated_no_change">Không có thay đổi.</string>
     <string name="notice_room_server_acl_updated_title_by_you">Bạn đã thay đổi ACL máy chủ cho phòng này.</string>
     <string name="notice_room_server_acl_updated_title">%s đã thay đổi ACL máy chủ cho phòng này.</string>
-    <string name="notice_room_server_acl_set_allowed">• Máy chủ khớp với %s được cho phép.</string>
-    <string name="notice_room_server_acl_set_banned">• Máy chủ khớp với %s bị cấm.</string>
+    <string name="notice_room_server_acl_set_allowed">• Những máy chủ khớp với %s được cho phép.</string>
+    <string name="notice_room_server_acl_set_banned">• Những máy chủ khớp với %s bị cấm.</string>
     <string name="notice_room_server_acl_set_title_by_you">Bạn đã đặt ACL máy chủ cho phòng này.</string>
     <string name="notice_room_server_acl_set_title">%s đã đặt ACL máy chủ cho phòng này.</string>
     <string name="notice_direct_room_update_by_you">Bạn đã nâng cấp ở đây.</string>
@@ -579,7 +579,7 @@
     <string name="room_preview_unlinked_email_warning">Lời mời này đã được gửi đến %s, nó không được liên kết với tài khoản này.
 \nBạn có thể muốn đăng nhập bằng một tài khoản khác, hoặc thêm email này vào tài khoản của bạn.</string>
     <string name="room_preview_invitation_format">Bạn đã được %s mời tham gia phòng này</string>
-    <string name="room_jump_to_first_unread">Nhảy đến tin nhắn chưa đọc đầu tiên.</string>
+    <string name="room_jump_to_first_unread">Nhảy đến tin nhắn chưa đọc.</string>
     <string name="room_sync_in_progress">Đang đồng bộ…</string>
     <string name="open_chat_header">Mở tiêu đề</string>
     <string name="list_members">Liệt kê các thành viên</string>
@@ -619,7 +619,7 @@
     <string name="call_error_answered_elsewhere">cuộc gọi đã được trả lời ở nơi khác</string>
     <string name="call_error_camera_init_failed">Không thể khởi tạo máy ảnh</string>
     <string name="call_error_ice_failed">Kết nối phương tiện thất bại</string>
-    <string name="call_error_user_not_responding">Bên ở xa không thể nhấc máy.</string>
+    <string name="call_error_user_not_responding">Bên kia không thể nhấc máy.</string>
     <string name="call_hold_action">Giữ máy</string>
     <string name="call_held_by_you">Bạn đã giữ máy</string>
     <string name="call_held_by_user">%s đã giữ máy</string>
@@ -783,8 +783,227 @@
     <string name="room_displayname_two_members">%1$s và %2$s</string>
     <string name="room_displayname_room_invite">Lời mời vào phòng</string>
     <string name="room_displayname_invite_from">Lời mời từ %s</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Máy chủ khớp với IP bây giờ sẽ bị cấm.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Máy chủ khớp với IP bây giờ sẽ được cho phép.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Máy chủ khớp với IP bị cấm.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Máy chủ khớp với IP được cho phép.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Những máy chủ khớp với IP bây giờ sẽ bị cấm.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Những máy chủ khớp với IP bây giờ sẽ được cho phép.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Những máy chủ khớp với IP bị cấm.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Những máy chủ khớp với IP được cho phép.</string>
+    <string name="room_participants_action_unignore_title">Hủy bỏ qua người dùng</string>
+    <string name="room_participants_action_ignore">Bỏ qua</string>
+    <string name="room_participants_action_ignore_prompt_msg">Bỏ qua người dùng này sẽ xóa những tin nhắn của họ khỏi những phòng bạn chia sẻ.
+\n
+\nBạn có thể đảo ngược hành động này bất cứ lúc nào trong cài đặt chung.</string>
+    <string name="room_participants_action_ignore_title">Bỏ qua người dùng</string>
+    <string name="room_participants_power_level_demote">Giáng cấp</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Bạn sẽ không thể hoàn tác thay đổi này vì bạn đang tự giáng cấp bản thân, nếu bạn là người dùng cuối cùng có đặc quyền trong phòng, nó sẽ không thể lấy lại đặc quyền.</string>
+    <string name="room_participants_power_level_demote_warning_title">Giáng cấp bản thân\?</string>
+    <string name="room_participants_power_level_prompt">Bạn sẽ không thể hoàn tác thay đổi này vì bạn đang thăng cấp người dùng có cùng cấp quyền như của bạn.
+\nBạn có chắc không\?</string>
+    <string name="room_participants_action_devices_list">Hiển thị danh sách phiên</string>
+    <string name="room_participants_action_mention">Nhắc đến</string>
+    <string name="room_participants_invite_search_another_user">ID người dùng, Tên hoặc email</string>
+    <string name="room_participants_action_set_admin">Làm quản trị viên</string>
+    <string name="room_participants_action_set_moderator">Làm điều hành viên</string>
+    <string name="room_participants_action_set_default_power_level">Đặt lại thành người dùng bình thường</string>
+    <string name="room_participants_action_kick">Đá</string>
+    <string name="room_participants_action_unban">Bỏ cấm</string>
+    <string name="room_participants_action_ban">Cấm</string>
+    <string name="room_participants_action_remove">Xóa khỏi phòng này</string>
+    <string name="room_participants_action_leave">Rời khỏi phòng này</string>
+    <string name="room_participants_action_cancel_invite">Hủy mời</string>
+    <string name="room_participants_action_invite">Mời</string>
+    <string name="room_participants_header_devices">Phiên</string>
+    <string name="room_participants_header_direct_chats">Tin nhắn trực tiếp</string>
+    <string name="room_participants_header_call">Cuộc gọi</string>
+    <string name="room_participants_header_admin_tools">Những công cụ quản trị viên</string>
+    <string name="room_participants_ago">cách đây %1$s%2$s</string>
+    <string name="room_participants_now">%1$s bây giờ</string>
+    <string name="room_participants_idle">Nhàn rỗi</string>
+    <string name="room_participants_offline">Ngoại tuyến</string>
+    <string name="room_participants_online">Trực tuyến</string>
+    <string name="room_participants_create">Tạo</string>
+    <string name="room_participants_remove_prompt_msg">Bạn có chắc muốn xóa %s khỏi cuộc trò chuyện này\?</string>
+    <string name="room_participants_leave_private_warning">Phòng này không công khai. Bạn sẽ không thể tham gia lại nếu không có lời mời.</string>
+    <string name="continue_anyway">Vẫn tiếp tục</string>
+    <plurals name="missed_video_call">
+        <item quantity="other">%d cuộc gọi video bị nhỡ</item>
+    </plurals>
+    <plurals name="missed_audio_call">
+        <item quantity="other">%d cuộc gọi thoại bị nhỡ</item>
+    </plurals>
+    <string name="hs_client_url">URL API máy chủ nhà</string>
+    <string name="missing_permissions_title">Thiếu quyền</string>
+    <string name="denied_permission_voice_message">Để gửi những tin nhắn thoại, vui lòng cấp quyền Microphone.</string>
+    <string name="denied_permission_camera">Để thực hiện hành động này, vui lòng cấp quyền Camera từ cài đặt hệ thống.</string>
+    <string name="denied_permission_generic">Vài quyền đang thiếu để thực hiện hành vi này, vui lòng cấp quyền từ cài đặt hệ thống.</string>
+    <string name="settings_set_workmanager_delay">Tần suất đồng bộ ưu tiên</string>
+    <string name="settings_set_sync_timeout">Yêu cầu đồng bộ hết thời hạn</string>
+    <string name="settings_enable_background_sync">Bật đồng bộ ngầm</string>
+    <string name="settings_start_on_boot">Chạy khi khởi động</string>
+    <string name="settings_background_sync_update_error">Cập nhật thiết lập thất bại.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Bạn sẽ không được báo tin nhắn đến khi App đang hoạt động ngầm.</string>
+    <string name="settings_background_sync">Đồng bộ ngầm</string>
+    <string name="settings_background_fdroid_sync_mode">Chế độ đồng bộ ngầm</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Không đồng bộ ngầm</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Được tối ưu cho thời gian thực</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Được tối ưu cho pin</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Bạn sẽ không nhận được thông báo khi được đề cập tới trong phòng chat mã hóa trên mobile.</string>
+    <string name="settings_room_upgrades">Nâng cấp phòng</string>
+    <string name="settings_messages_by_bot">Tin nhắn gửi bởi bot</string>
+    <string name="settings_call_invitations">Lời mời cuộc gọi</string>
+    <string name="settings_room_invitations">Lời mời vào phòng</string>
+    <string name="settings_messages_containing_keywords">Từ khóa</string>
+    <string name="settings_mentions_at_room">\@room</string>
+    <string name="settings_encrypted_group_messages">Tin nhắn trong chat nhóm được mã hóa</string>
+    <string name="settings_group_messages">Tin nhắn trong chat nhóm</string>
+    <string name="settings_encrypted_direct_messages">Tin nhắn trực tiếp 1-1 được mã hóa</string>
+    <string name="settings_messages_direct_messages">Tin nhắn trực tiếp 1-1</string>
+    <string name="settings_messages_containing_username">Tên đăng nhập của tôi</string>
+    <string name="settings_messages_containing_display_name">Tên hiển thị của tôi</string>
+    <string name="settings_messages_at_room">Tin nhắn chứa @room</string>
+    <string name="settings_messages_sent_by_bot">Tin nhắn được gửi bởi bot</string>
+    <string name="settings_invited_to_room">Khi tôi được mời vào phòng</string>
+    <string name="settings_messages_in_group_chat">Tin nhắn trong phòng chat nhóm</string>
+    <string name="settings_messages_in_one_to_one">Tin nhắn trong phòng chat 1-1</string>
+    <string name="settings_containing_my_user_name">Tin nhắn chứa tên đăng nhập của tôi</string>
+    <string name="settings_containing_my_display_name">Tin nhắn chứa trên tôi</string>
+    <string name="settings_when_rooms_are_upgraded">Khi phòng được nâng cấp phiên bản</string>
+    <string name="settings_messages_in_e2e_group_chat">Tin nhắn mã hóa trong phòng chat nhóm</string>
+    <string name="settings_messages_in_e2e_one_to_one">Tin nhắn mã hóa trong phòng chat 1-1</string>
+    <string name="settings_system_preferences_summary">Chọn màu LED, rung, âm thanh…</string>
+    <string name="settings_silent_notifications_preferences">Cấu hình thông báo im lặng</string>
+    <string name="settings_call_notifications_preferences">Cấu hình thông báo cuộc gọi</string>
+    <string name="settings_noisy_notifications_preferences">Cấu hình thông báo ầm ĩ</string>
+    <string name="settings_turn_screen_on">Mở màn hình trong 3 giây</string>
+    <string name="settings_enable_this_device">Bật thông báo cho phiên này</string>
+    <string name="settings_enable_all_notif">Bật thông báo cho tài khoản này</string>
+    <string name="settings_notification_ringtone">Âm thanh thông báo</string>
+    <string name="settings_notification_privacy_message_content_not_shown">• Thông báo sẽ <b>không hiện nội dung tin nhắn</b></string>
+    <string name="settings_notification_privacy_nosecure_message_content">• Thông báo chứa <b>meta và dữ liệu nội dung tin nhắn</b></string>
+    <string name="settings_notification_privacy_secure_message_content">• Nội dung thông báo được <b>truy cập an toàn từ homeserver</b></string>
+    <string name="settings_notification_privacy_metadata">• Thông báo chỉ chứa dữ liệu meta</string>
+    <string name="settings_notification_privacy_fcm">• Thông báo được gửi qua Firebase Cloud Messaging</string>
+    <string name="settings_notification_privacy_no_background_sync">App <b>không cần</b> kết nối tới máy chủ khi đang ở background, điều này giúp giảm hao pin</string>
+    <string name="settings_notification_privacy_need_permission">App cần quyền để thực thi ở background</string>
+    <string name="settings_notification_privacy_reduced">Rút gọn Riêng tư</string>
+    <string name="settings_notification_privacy_normal">Bình thường</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Bỏ qua trình tối ưu pin</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} không bị ảnh hưởng bởi Trình tối ưu pin.</string>
+    <string name="settings_troubleshoot_test_battery_title">Tối ưu pin</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Hủy các giới hạn</string>
+    <string name="deactivate_account_title">Hủy tài khoản</string>
+    <string name="dialog_user_consent_submit">Xem lại ngay</string>
+    <string name="encryption_information_device_key">Chìa khóa phiên</string>
+    <string name="encryption_information_device_id">Mã phiên</string>
+    <string name="encryption_information_name">Tên công khai</string>
+    <string name="device_name_warning">Tên công khai của phiên được thấy bởi người bạn nói chuyện với</string>
+    <string name="encryption_information_device_name_with_warning">Tên công khai (người nói chuyện với bạn có thể thấy)</string>
+    <string name="encryption_information_device_name">Tên công khai</string>
+    <string name="encryption_information_sender_device_information">Thông tin phiên của người gửi</string>
+    <string name="encryption_information_decryption_error">Lỗi giải mã</string>
+    <string name="encryption_information_session_id">Mã phiên</string>
+    <string name="encryption_information_algorithm">Thuật toán</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">Chìa khóa vân tay Ed25519</string>
+    <string name="encryption_information_curve25519_identity_key">Mã định danh Curve25519</string>
+    <string name="encryption_information_user_id">Mã người dùng</string>
+    <string name="encryption_information_device_info">Thông tin sự kiện</string>
+    <string name="encryption_information_title">Thông tin mã hóa đầu cuối</string>
+    <string name="failed_to_load_timeline_position">%s đã cố tải dữ liệu ở một thời điểm cụ thể trong phòng này nhưng không thể tìm thấy.</string>
+    <string name="room_settings_no_flair">Phòng này không hiển thị ký hiệu cho bất cứ cộng đồng nào</string>
+    <string name="room_settings_addresses_add_new_address">Địa chỉ mới (ví dụ #foo:matrix.org)</string>
+    <string name="room_settings_addresses_no_local_addresses">Phòng này không có địa chỉ địa phương</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">Không bao giờ gửi các tin được mã hóa đến các phiên chưa được xác thực trong phòng này.</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Chỉ giải mã các phiên được xác thực</string>
+    <string name="room_settings_labs_end_to_end_warnings">Bạn cần đăng xuất trước khi có thể kích hoạt mã hóa đầu cuối.</string>
+    <string name="room_settings_labs_end_to_end_is_active">Mã hóa đầu cuối đang được bật</string>
+    <string name="room_settings_labs_end_to_end">Mã hoa đầu cuối</string>
+    <string name="room_settings_labs_warning_message">Những chức năng này mang tính thí nghiệm có thể còn nhiều lỗi. Lưu ý khi dùng.</string>
+    <string name="room_settings_labs_pref_title">Chức năng thí nghiệm</string>
+    <string name="room_settings_addresses_pref_title">Địa chỉ</string>
+    <string name="room_settings_room_version_title">Phiên bản phòng</string>
+    <string name="room_settings_room_internal_id">Mã nội bộ của phòng này</string>
+    <string name="room_settings_category_advanced_title">Nâng cao</string>
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="other">%d người dùng bị cấm</item>
+    </plurals>
+    <string name="room_settings_banned_users_title">Người dùng bị cấm</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Không gian hoặc phòng khác bạn có thể không biết</string>
+    <string name="space_you_know_that_contains_this_room">Không gian bạn biết chứa phòng này</string>
+    <string name="decide_who_can_find_and_join">Quyết định ai có thể tìm và tham gia phòng này.</string>
+    <string name="tap_to_edit_spaces">Chạm để sửa không gian</string>
+    <string name="select_spaces">Chọn Không gian</string>
+    <string name="decide_which_spaces_can_access">Quyết định không gian nào có thể tiếp cận phòng này. Nếu Không gian được chọn, thành viên của Không gian có thể tìm và tham gia phòng.</string>
+    <string name="spaces_which_can_access">Các Không gian có thể tiếp cận</string>
+    <string name="allow_space_member_to_find_and_access">Cho phép thành viên Không gia tìm và tham gia.</string>
+    <string name="room_create_member_of_space_name_can_join">Thành viên của Không gian %s có thể tìm, xem trước và tham gia.</string>
+    <string name="room_settings_room_access_restricted_description">Bất kỳ ai trong Không gian có phòng này đều có thể tìm và tham gia phòng. Chỉ có quản trị viên của phòng mới có quyền chấp thuận tham gia Không gian.</string>
+    <string name="room_settings_room_access_restricted_title">Chỉ dành cho thành viên của Không gian</string>
+    <string name="room_settings_room_access_public_description">Ai cũng có thể tìm và tham gia phòng</string>
+    <string name="room_settings_room_access_public_title">Công khai</string>
+    <string name="room_settings_room_access_private_description">Chỉ người được mời mới có thể tham gia</string>
+    <string name="room_settings_room_access_private_invite_only_title">Riêng tư (dành cho người được mời)</string>
+    <string name="room_settings_room_access_private_title">Riêng tư</string>
+    <string name="room_settings_room_access_entry_unknown">Thiết lập tiếp cận không được nhận dạng (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Bất kỳ ai cũng có thể gõ phòng, thành viên có thể chấp thuận hoặc từ chối</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Bất kỳ ai biết địa chỉ phòng, gồm cả khách chưa đăng nhập</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Bất kỳ ai biết được địa chỉ phòng, trừ khách chưa đăng nhập</string>
+    <string name="room_settings_room_access_entry_only_invited">Chỉ dành cho người được mời</string>
+    <string name="room_settings_room_access_warning">Để liên kết với phòng khác, phòng cần có địa chỉ.</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Chỉ dành cho thành viên (từ thời điểm tham gia)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Chỉ dành cho thành viên (từ thời điểm được mời)</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Chỉ dành cho thành viên (từ thời điểm chọn thiết lập này)</string>
+    <string name="room_settings_read_history_entry_anyone">Bất kỳ ai</string>
+    <string name="room_alias_publish_to_directory_error">Không thể lấy thiết lập truy cập của phòng hiện tại (%1$s).</string>
+    <string name="room_alias_publish_to_directory">Công khai địa chỉ này trong danh mục phỏng của %1$s\?</string>
+    <string name="room_alias_action_unpublish">Bỏ công khai địa chỉ này</string>
+    <string name="room_alias_action_publish">Công khai địa chỉ này</string>
+    <string name="room_alias_local_address_add">Thêm mới địa chỉ địa phương</string>
+    <string name="room_alias_local_address_empty">Phòng chat này không có địa chỉ địa phương</string>
+    <string name="room_alias_local_address_subtitle">Đặt địa chỉ cho phòng này để người dùng có thể tìm thấy phòng chat từ máy chủ (%1$s)</string>
+    <string name="room_alias_local_address_title">Các địa chỉ địa phương</string>
+    <string name="room_alias_address_hint">Địa chỉ không khai mới</string>
+    <string name="room_alias_address_empty">Chưa có địa chỉ công khai nào khác.</string>
+    <string name="room_alias_address_empty_can_add">Chưa có địa chỉ công khai, thêm mới địa chỉ dưới đây.</string>
+    <string name="room_alias_publish">Công khai phòng chat này trong danh mục phòng %1$s\?</string>
+    <string name="room_alias_delete_confirmation">Xóa địa chỉ \"%1$s\"\?</string>
+    <string name="room_alias_unpublish_confirmation">Bỏ công khai địa chỉ \"%1$s\"\?</string>
+    <string name="room_alias_published_alias_add_manually_submit">Công khai</string>
+    <string name="room_alias_published_alias_add_manually">Công khai một địa chỉ phòng chat</string>
+    <string name="room_alias_published_other">Các địa chỉ công khai khác:</string>
+    <string name="room_alias_main_address_hint">Địa chỉ chính</string>
+    <string name="room_alias_published_alias_main">Đây là địa chỉ chính của phòng chat</string>
+    <string name="room_alias_published_alias_subtitle">Các địa chỉ công khai có thể được sử dụng bởi bất kỳ ai để tham gia phòng chat. Để công khai một địa chỉ, phòng chat cần được thiết lập một địa chỉ địa phương trước.</string>
+    <string name="room_alias_published_alias_title">Các địa chỉ công khai</string>
+    <string name="room_alias_title">Các địa chỉ Phòng</string>
+    <string name="space_settings_alias_subtitle">Quản lý các địa chỉ của Không gian.</string>
+    <string name="space_settings_alias_title">Địa chỉ Không gian</string>
+    <string name="room_settings_alias_subtitle">Quản lý địa chỉ phòng chat này và thiết lập xem tin nhắn trong danh sách phòng.</string>
+    <string name="room_settings_alias_title">Các địa chỉ phòng chat</string>
+    <string name="room_settings_guest_access_title">Cho phép khách tham gia</string>
+    <string name="room_settings_room_access_title">Tham gia phòng chat</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Ai có thể tham gia phòng chat này\?</string>
+    <string name="room_settings_room_read_history_dialog_subtitle">Thay đổi ai có thể đọc lịch sử phòng chat chỉ được áp dụng đối với các tin nhắn từ thời điểm này.</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Ai có thể đọc lịch sử phòng chat\?</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Khả năng đọc lịch sử phòng chat</string>
+    <string name="room_settings_room_access_rules_pref_title">Tiếp cận phòng chat</string>
+    <string name="room_settings_room_notifications_account_settings">Thiết lập tài khoản</string>
+    <string name="room_settings_room_notifications_manage_notifications">Bạn có thể quản lý thông báo trong %1$s.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Lưu ý rằng đề cập và thông báo từ khóa không có sẵn trong các phòng chat mã hóa trên điện thoại.</string>
+    <string name="room_settings_room_notifications_notify_me">Gửi thông báo tới tôi cho</string>
+    <string name="room_settings_room_notifications_title">Thông báo</string>
+    <string name="room_settings_directory_visibility">Hiện phòng này trong danh sách phòng</string>
+    <string name="room_settings_category_access_visibility_title">Tiếp cận</string>
+    <string name="room_settings_tag_pref_entry_none">Không có</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Ưu tiên thấp</string>
+    <string name="room_settings_tag_pref_entry_favourite">Yêu thích</string>
+    <string name="room_settings_tag_pref_dialog_title">Được đánh thẻ:</string>
+    <string name="room_settings_room_tag">Thẻ Phòng</string>
+    <string name="room_settings_topic">Chủ đề</string>
+    <string name="room_settings_room_name">Tên Phòng</string>
+    <string name="spaces">Không gian</string>
+    <string name="learn_more">Xem thêm</string>
+    <string name="call_remove_jitsi_widget_progress">Kết thúc cuộc gọi…</string>
+    <string name="call_ended_invite_timeout_title">Không trả lời</string>
+    <string name="call_ended_user_busy_description">Người dùng bạn vừa gọi đang bận.</string>
+    <string name="call_ended_user_busy_title">Người dụng bận</string>
+    <string name="room_list_rooms_empty_body">Phòng chat của bạn được hiển thị ở đây. Bạn có thể tạo mới phòng chat hoặc tham gia các phòng cộng đồng hiện có.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 1a417db842..3e6451b3c7 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -1692,7 +1692,7 @@
     <string name="room_join_rules_invite">%1$s 将聊天室设为仅限邀请。</string>
     <string name="room_join_rules_invite_by_you">你将聊天室设为仅限邀请。</string>
     <string name="timeline_unread_messages">未读消息</string>
-    <string name="login_splash_title">这是你的对话。拥有它。</string>
+    <string name="login_splash_title">这是你的对话。它只属于你。</string>
     <string name="login_splash_text1">与人们私聊或群聊</string>
     <string name="login_splash_text2">通过加密保证对话私密</string>
     <string name="login_splash_text3">扩展 &amp; 自定义你的体验</string>
@@ -2570,7 +2570,7 @@
     <string name="a11y_rule_notify_off">关闭通知</string>
     <string name="a11y_rule_notify_silent">无声通知</string>
     <string name="a11y_rule_notify_noisy">有声通知</string>
-    <string name="a11y_unsent_draft">此聊天室有未发送的草稿</string>
+    <string name="a11y_unsent_draft">有未发送的草稿</string>
     <string name="a11y_error_some_message_not_sent">有些消息未被发送</string>
     <string name="a11y_import_key_from_file">从文件中导入密钥</string>
     <string name="a11y_error_message_not_sent">发生错误，消息未能发送</string>
@@ -2583,7 +2583,6 @@
     <string name="spaces_no_server_support_title">看来你的主服务器尚未支持空间</string>
     <string name="spaces_feeling_experimental_subspace">想要做点实验？
 \n你可以将现有的空间添加到其他空间中。</string>
-    <string name="labs_space_show_orphan_in_home">实验性空间 - 仅在首页显示无人看管的聊天室</string>
     <string name="space_manage_rooms_and_spaces">管理聊天室和空间</string>
     <string name="space_mark_as_not_suggested">标记为不建议</string>
     <string name="space_mark_as_suggested">标记为建议</string>
@@ -2661,7 +2660,7 @@
     <string name="command_description_leave_room">离开指定 id 的聊天室（如果为空值则为当前所处的聊天室）</string>
     <string name="command_description_join_space">使用指定的 id 加入空间</string>
     <string name="command_description_create_space">创建空间</string>
-    <string name="a11y_public_room">此聊天室为公开聊天室</string>
+    <string name="a11y_public_room">公开聊天室</string>
     <string name="a11y_unchecked">未检查</string>
     <string name="a11y_open_widget">开启挂件</string>
     <string name="a11y_screenshot">屏幕截图</string>
@@ -2674,7 +2673,7 @@
     <string name="call_dial_pad_lookup_error">查找电话号码时发生了错误</string>
     <string name="call_tile_ended">此通话已结束</string>
     <string name="call_tile_other_declined">%1$s 拒绝了此通话</string>
-    <string name="call_tile_you_declined">你拒绝了此通话 %1$s</string>
+    <string name="call_tile_you_declined">你拒绝了此通话 %s</string>
     <string name="call_tile_in_call">你当前正处于此通话中</string>
     <string name="warning_unsaved_change">有未保存的更改。要放弃更改吗？</string>
     <string name="warning_room_not_created_yet">聊天室尚未创建。取消创建聊天室？</string>
@@ -2754,7 +2753,7 @@
     <string name="unnamed_room">未命名的聊天室</string>
     <string name="private_space">私有空间</string>
     <string name="public_space">公开空间</string>
-    <string name="a11y_public_space">此空间为公开空间</string>
+    <string name="a11y_public_space">公开空间</string>
     <string name="call_transfer_unknown_person">陌生人</string>
     <string name="call_transfer_transfer_to_title">转移给 %1$s</string>
     <string name="call_transfer_consulting_with">与 %1$s 商量</string>
@@ -2777,7 +2776,7 @@
     <string name="upgrade_room_no_power_to_manage">您需要权限才能升级聊天室</string>
     <string name="upgrade_room_update_parent_space">自动更新空间父级</string>
     <string name="upgrade_room_auto_invite">自动邀请用户</string>
-    <string name="upgrade_public_room_from_to">你将把此聊天室从 %s 升级到 %s。</string>
+    <string name="upgrade_public_room_from_to">你将把此聊天室从 %1$s 升级到 %2$s。</string>
     <string name="upgrade_room_warning">升级聊天室是一项高级操作，通常建议在由于错误、缺少功能或安全漏洞造成聊天室不稳定时进行此操作。
 \n这通常只会影响此服务器如何处理该聊天室。</string>
     <string name="upgrade_private_room">升级私人聊天室</string>
@@ -2835,4 +2834,70 @@
     <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="denied_permission_voice_message">要发送语音消息，请授予麦克风权限。</string>
+    <string name="settings_room_upgrades">聊天室升级</string>
+    <string name="settings_messages_by_bot">机器人消息</string>
+    <string name="settings_room_invitations">聊天室邀请</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_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="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="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>
+    <string name="call_slide_to_end_conference">滑动结束通话</string>
+    <string name="call_tap_to_return">%1$s 轻按返回</string>
+    <string name="call_one_active">活跃通话 (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="other">%1$d 个活跃通话·</item>
+    </plurals>
+    <string name="call_tile_connection_failed">连接失败</string>
+    <string name="call_tile_no_answer">无应答</string>
+    <string name="call_tile_video_missed">未接视频通话</string>
+    <string name="call_tile_voice_missed">未接语音通话</string>
+    <string name="call_tile_video_declined">视频通话被拒绝</string>
+    <string name="call_tile_voice_declined">语音通话被拒绝</string>
+    <string name="call_tile_video_call_has_ended">视频通话结束了 • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">语音通话结束了 • %1$s</string>
+    <string name="call_tile_video_incoming">视频来电</string>
+    <string name="call_tile_voice_incoming">语音来电</string>
+    <string name="call_tile_you_declined_this_call">你拒绝了此通话</string>
+    <string name="room_settings_room_notifications_account_settings">账户设置</string>
+    <string name="room_settings_room_notifications_manage_notifications">你可以管理 %1$s 中的通知。</string>
+    <string name="room_settings_room_notifications_encryption_notice">请注意，提及和关键字通知在移动端的加密聊天室中不可用。</string>
+    <string name="room_settings_room_notifications_notify_me">通知事项</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">在移动端的加密房间里，你不会收到提及和关键字的通知。</string>
+    <string name="settings_messages_containing_keywords">关键词</string>
+    <string name="settings_mentions_at_room">\@聊天室</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="room_settings_none">无</string>
+    <string name="room_settings_mention_and_keyword_only">仅提及 &amp; 关键词</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="audio_call_with_participant">与 %s 音频通话</string>
+    <string name="video_call_with_participant">和 %s 视频通话</string>
+    <string name="call_ringing">来电响铃中…</string>
+    <string name="spaces">空间</string>
+    <string name="learn_more">了解更多</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 db87236cfc..e05a234dea 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2547,7 +2547,7 @@
     <string name="call_tile_call_back">回撥</string>
     <string name="call_tile_ended">此通話已結束</string>
     <string name="call_tile_other_declined">%1$s 婉拒了此通話</string>
-    <string name="call_tile_you_declined">您婉拒了此通話 %1$s</string>
+    <string name="call_tile_you_declined">您婉拒了此通話 %s</string>
     <string name="call_tile_in_call">您目前在此通話中</string>
     <string name="call_tile_other_started_call">%1$s 開始了通話</string>
     <string name="call_tile_you_started_call">您開始了通話</string>
@@ -2585,7 +2585,7 @@
     <string name="a11y_trust_level_default">預設信任等級</string>
     <string name="a11y_selected">已選取</string>
     <string name="a11y_video">視訊</string>
-    <string name="a11y_unsent_draft">此聊天室有未傳送的草稿</string>
+    <string name="a11y_unsent_draft">有未傳送的草稿</string>
     <string name="a11y_error_some_message_not_sent">部份訊息未傳送</string>
     <string name="a11y_delete_avatar">刪除大頭照</string>
     <string name="a11y_change_avatar">變更大頭照</string>
@@ -2708,7 +2708,7 @@
     <string name="space_settings_manage_rooms">管理聊天室</string>
     <string name="looking_for_someone_not_in_space">正在尋找不在 %s 中的人？</string>
     <string name="user_invites_you">%s 邀請您</string>
-    <string name="a11y_public_room">此聊天室是公開的</string>
+    <string name="a11y_public_room">公開聊天室</string>
     <string name="send_images_and_video_with_original_size">傳送原始大小的媒體</string>
     <plurals name="send_videos_with_original_size">
         <item quantity="other">傳送原始大小的影片</item>
@@ -2726,7 +2726,6 @@
     <string name="spaces_no_server_support_title">看來您的家伺服器尚未支援空間</string>
     <string name="spaces_feeling_experimental_subspace">想要做點實驗嗎？
 \n您可以將既有的空間新增至其他空間中。</string>
-    <string name="labs_space_show_orphan_in_home">實驗性空間，僅在首頁顯示無人看管的聊天室</string>
     <string name="space_add_rooms">新增聊天室</string>
     <string name="space_leave_prompt_msg_as_admin">您是此空間的管理員，請確保在您離開前已將管理權轉交給另一個成員。</string>
     <string name="space_leave_prompt_msg_private">此空間並非公開。您將無法在無邀請的狀況下重新加入。</string>
@@ -2744,7 +2743,7 @@
     <string name="unnamed_room">未命名聊天室</string>
     <string name="private_space">私人空間</string>
     <string name="public_space">公開空間</string>
-    <string name="a11y_public_space">此空間是公開的</string>
+    <string name="a11y_public_space">公開空間</string>
     <string name="call_transfer_unknown_person">未知的人</string>
     <string name="call_transfer_transfer_to_title">轉移至 %1$s</string>
     <string name="call_transfer_consulting_with">與 %1$s 進行諮詢</string>
@@ -2767,7 +2766,7 @@
     <string name="upgrade_room_no_power_to_manage">您需要升級聊天室的權限</string>
     <string name="upgrade_room_update_parent_space">自動更新空間上層</string>
     <string name="upgrade_room_auto_invite">自動邀請使用者</string>
-    <string name="upgrade_public_room_from_to">您將要把此聊天室從 %s 升級到 %s。</string>
+    <string name="upgrade_public_room_from_to">您將要把此聊天室從 %1$s 升級到 %2$s。</string>
     <string name="upgrade_room_warning">升級聊天是是一項進階動作，通常建議在聊天室因臭蟲、缺少功能或安全漏洞而不穩定時使用。
 \n這通常只會影響聊天是在伺服器上的處理方式。</string>
     <string name="upgrade_private_room">升級私人聊天室</string>
@@ -2825,4 +2824,70 @@
     <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="denied_permission_voice_message">要傳送語音訊息，請授予「麥克風」權限。</string>
+    <string name="settings_room_upgrades">聊天室升級</string>
+    <string name="settings_messages_by_bot">機器人訊息</string>
+    <string name="settings_room_invitations">聊天室邀請</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_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="link_this_email_with_your_account">設定中的 %s 可直接在 Element 中接收邀請。</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>
+    <string name="call_slide_to_end_conference">滑動結束通話</string>
+    <string name="call_tap_to_return">%1$s 點擊返回</string>
+    <string name="call_one_active">作用中的通話 (%1$s)。</string>
+    <plurals name="call_active_status">
+        <item quantity="other">%1$d 作用中的通話。</item>
+    </plurals>
+    <string name="call_tile_connection_failed">連線失敗</string>
+    <string name="call_tile_no_answer">無回應</string>
+    <string name="call_tile_video_missed">未接聽的視訊通話</string>
+    <string name="call_tile_voice_missed">未接聽的語音通話</string>
+    <string name="call_tile_video_declined">視訊通話已回絕</string>
+    <string name="call_tile_voice_declined">視訊通話已回絕</string>
+    <string name="call_tile_video_call_has_ended">視訊通話已結束 • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">語音通話已結束 • %1$s</string>
+    <string name="call_tile_video_active">作用中的視訊通話</string>
+    <string name="call_tile_voice_active">作用中的語音通話</string>
+    <string name="call_tile_video_incoming">來電視訊通話</string>
+    <string name="call_tile_voice_incoming">來電語音通話</string>
+    <string name="call_tile_you_declined_this_call">您回絕了此通話</string>
+    <string name="room_settings_room_notifications_account_settings">帳號設定</string>
+    <string name="room_settings_room_notifications_manage_notifications">您可以管理 %1$s 中的通知。</string>
+    <string name="room_settings_room_notifications_encryption_notice">請注意，行動裝置上的加密聊天室並不提供提及與關鍵字通知。</string>
+    <string name="room_settings_room_notifications_notify_me">通知我</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">您不會在行動裝置上收到在加密聊天室中的提及與關鍵字通知。</string>
+    <string name="settings_messages_containing_keywords">關鍵字</string>
+    <string name="settings_mentions_at_room">\@room</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="room_settings_none">無</string>
+    <string name="room_settings_mention_and_keyword_only">僅提及與關鍵字</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="audio_call_with_participant">使用 %s 音訊通話</string>
+    <string name="video_call_with_participant">使用 %s 視訊通話</string>
+    <string name="call_ringing">通話響鈴中……</string>
+    <string name="spaces">空間</string>
+    <string name="learn_more">取得更多資訊</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 1956a0cc01..9eb51b507f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -385,6 +385,8 @@
     <string name="dismiss">Dismiss</string>
     <string name="reset">Reset</string>
     <string name="start_chatting">Start Chatting</string>
+    <string name="learn_more">Learn More</string>
+    <string name="spaces">Spaces</string>
 
     <!-- Permissions denied forever -->
     <string name="denied_permission_generic">Some permissions are missing to perform this action, please grant the permissions from the system settings.</string>
@@ -727,6 +729,7 @@
     <string name="call">Call</string>
     <string name="call_connected">Call connected</string>
     <string name="call_connecting">Call connecting…</string>
+    <string name="call_ringing">Call ringing…</string>
     <string name="call_ended">Call ended</string>
     <plurals name="missed_audio_call">
         <item quantity="one">Missed audio call</item>
@@ -742,6 +745,8 @@
     <string name="incoming_voice_call">Incoming Voice Call</string>
     <string name="call_in_progress">Call In Progress…</string>
     <string name="video_call_in_progress">Video Call In Progress…</string>
+    <string name="video_call_with_participant">Video call with %s</string>
+    <string name="audio_call_with_participant">Audio call with %s</string>
     <string name="active_call_with_duration">Active Call (%s)</string>
     <string name="return_to_call">Return to call</string>
     <string name="call_resume_action">Resume</string>
@@ -749,11 +754,16 @@
     <string name="call_held_by_user">%s held the call</string>
     <string name="call_held_by_you">You held the call</string>
 
+    <string name="call_ended_user_busy_title">User busy</string>
+    <string name="call_ended_user_busy_description">The user you called is busy."</string>
+    <string name="call_ended_invite_timeout_title">No answer</string>
     <string name="call_error_user_not_responding">The remote side failed to pick up.</string>
     <string name="call_error_ice_failed">Media Connection Failed</string>
     <string name="call_error_camera_init_failed">Cannot initialize the camera</string>
     <string name="call_error_answered_elsewhere">call answered elsewhere</string>
 
+    <string name="call_remove_jitsi_widget_progress">Ending call…</string>
+
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Take a picture or a video"</string>
     <string name="media_picker_cannot_record_video">Cannot record video"</string>
@@ -1046,6 +1056,8 @@
     <string name="room_settings_all_messages">All messages</string>
     <string name="room_settings_mention_only">Mentions only</string>
     <string name="room_settings_mute">Mute</string>
+    <string name="room_settings_mention_and_keyword_only">Mentions &amp; Keywords only</string>
+    <string name="room_settings_none">None</string>
     <string name="room_settings_favourite">Favourite</string>
     <string name="room_settings_de_prioritize">De-prioritize</string>
     <string name="room_settings_direct_chat">Direct Chat</string>
@@ -1093,6 +1105,10 @@
     <string name="settings_notification_other">Other</string>
 
     <string name="settings_notification_notify_me_for">Notify me for</string>
+    <string name="settings_notification_your_keywords">Your keywords</string>
+    <string name="settings_notification_new_keyword">Add new keyword</string>
+    <string name="settings_notification_keyword_contains_dot">Keywords cannot start with \'.\'</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Keywords cannot contain \'%s\'</string>
 
     <string name="settings_notification_privacy">Notification privacy</string>
     <string name="settings_notification_troubleshoot">Troubleshoot Notifications</string>
@@ -1211,18 +1227,21 @@
     <string name="settings_messages_in_group_chat">Msgs in group chats</string>
     <string name="settings_invited_to_room">When I’m invited to a room</string>
     <string name="settings_messages_sent_by_bot">Messages sent by bot</string>
+    <string name="settings_messages_at_room">Messages containing @room</string>
 
-    <string name="settings_messages_containing_display_name">Messages containing my display name</string>
-    <string name="settings_messages_containing_username">Messages containing my username</string>
+    <string name="settings_messages_containing_display_name">My display name</string>
+    <string name="settings_messages_containing_username">My username</string>
     <string name="settings_messages_direct_messages">Direct messages</string>
     <string name="settings_encrypted_direct_messages">Encrypted direct messages</string>
     <string name="settings_group_messages">Group messages</string>
     <string name="settings_encrypted_group_messages">Encrypted group messages</string>
-    <string name="settings_messages_at_room">Messages containing @room</string>
+    <string name="settings_mentions_at_room">\@room</string>
+    <string name="settings_messages_containing_keywords">Keywords</string>
     <string name="settings_room_invitations">Room invitations</string>
     <string name="settings_call_invitations">Call invitations</string>
     <string name="settings_messages_by_bot">Messages by bot</string>
     <string name="settings_room_upgrades">Room upgrades</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">You won’t get notifications for mentions &amp; keywords in encrypted rooms on mobile.</string>
 
     <string name="settings_background_sync">Background synchronization</string>
     <string name="settings_background_fdroid_sync_mode">Background Sync Mode</string>
@@ -1436,6 +1455,10 @@
     <string name="room_settings_category_access_visibility_title">Access and visibility</string>
     <string name="room_settings_directory_visibility">List this room in room directory</string>
     <string name="room_settings_room_notifications_title">Notifications</string>
+    <string name="room_settings_room_notifications_notify_me">Notify me for</string>
+    <string name="room_settings_room_notifications_encryption_notice">Please note that mentions &amp; keyword notifications are not available in encrypted rooms on mobile.</string>
+    <string name="room_settings_room_notifications_manage_notifications">You can manage notifications in %1$s.</string>
+    <string name="room_settings_room_notifications_account_settings">Account settings</string>
     <string name="room_settings_room_access_rules_pref_title">Room Access</string>
     <string name="room_settings_room_read_history_rules_pref_title">Room History Readability</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Who can read history?</string>
@@ -3264,12 +3287,25 @@
     <string name="call_tile_you_started_call">You started a call</string>
     <string name="call_tile_other_started_call">%1$s started a call</string>
     <string name="call_tile_in_call">You\'re currently in this call</string>
-    <!-- Pattern can be replaced by the value of string call_tile_call_back -->
-    <string name="call_tile_you_declined">You declined this call %1$s</string>
+    <string name="call_tile_you_declined">You declined this call %s</string>
+    <string name="call_tile_you_declined_this_call">You declined this call</string>
     <string name="call_tile_other_declined">%1$s declined this call</string>
     <string name="call_tile_ended">This call has ended</string>
     <string name="call_tile_call_back">Call back</string>
 
+    <string name="call_tile_voice_incoming">Incoming voice call</string>
+    <string name="call_tile_video_incoming">Incoming video call</string>
+    <string name="call_tile_voice_active">Active voice call</string>
+    <string name="call_tile_video_active">Active video call</string>
+    <string name="call_tile_voice_call_has_ended">Voice call ended • %1$s</string>
+    <string name="call_tile_video_call_has_ended">Video call ended • %1$s</string>
+    <string name="call_tile_voice_declined">Voice call declined</string>
+    <string name="call_tile_video_declined">Video call declined</string>
+    <string name="call_tile_voice_missed">Missed voice call</string>
+    <string name="call_tile_video_missed">Missed video call</string>
+    <string name="call_tile_no_answer">No answer</string>
+    <string name="call_tile_connection_failed">Connection failed</string>
+
     <string name="call_dial_pad_title">Dial pad</string>
     <string name="call_dial_pad_lookup_error">"There was an error looking up the phone number"</string>
 
@@ -3283,6 +3319,12 @@
         <item quantity="one">1 active call (%1$s) · 1 paused call</item>
         <item quantity="other">1 active call (%1$s) · %2$d paused calls</item>
     </plurals>
+    <plurals name="call_active_status">
+        <item quantity="one">Active call ·</item>
+        <item quantity="other">%1$d active calls ·</item>
+    </plurals>
+    <string name="call_one_active">Active call (%1$s) ·</string>
+    <string name="call_tap_to_return">%1$s Tap to return</string>
 
     <string name="call_transfer_consult_first">Consult first</string>
     <string name="call_transfer_connect_action">Connect</string>
@@ -3293,6 +3335,8 @@
     <string name="call_transfer_transfer_to_title">Transfer to %1$s</string>
     <string name="call_transfer_unknown_person">Unknown person</string>
 
+    <string name="call_slide_to_end_conference">Slide to end the call</string>
+
     <string name="re_authentication_activity_title">Re-Authentication Needed</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
     <string name="template_re_authentication_default_confirm_text">${app_name} requires you to enter your credentials to perform this action.</string>
@@ -3305,7 +3349,7 @@
     <string name="a11y_change_avatar">Change avatar</string>
     <string name="a11y_delete_avatar">Delete avatar</string>
     <string name="a11y_error_some_message_not_sent">Some messages have not been sent</string>
-    <string name="a11y_unsent_draft">This room has unsent draft</string>
+    <string name="a11y_unsent_draft">has unsent draft</string>
     <string name="a11y_video">Video</string>
     <string name="a11y_selected">Selected</string>
     <string name="a11y_trust_level_default">Default trust level</string>
@@ -3320,8 +3364,8 @@
     <string name="a11y_rule_notify_silent">Notify without sound</string>
     <string name="a11y_rule_notify_off">Do not notify</string>
     <string name="a11y_view_read_receipts">View read receipts</string>
-    <string name="a11y_public_room">This room is public</string>
-    <string name="a11y_public_space">This Space is public</string>
+    <string name="a11y_public_room">Public room</string>
+    <string name="a11y_public_space">Public space</string>
 
     <string name="dev_tools_menu_name">Dev Tools</string>
     <string name="dev_tools_explore_room_state">Explore Room State</string>
@@ -3442,7 +3486,10 @@
     <string name="space_manage_rooms_and_spaces">Manage rooms and spaces</string>
 
 
-    <string name="labs_space_show_orphan_in_home">Experimental Space - Only show orphans in Home</string>
+
+    <string name="preference_show_all_rooms_in_home">Show all rooms in Home</string>
+    <string name="all_rooms_youre_in_will_be_shown_in_home">All rooms you’re in will be shown in Home.</string>
+
     <string name="spaces_feeling_experimental_subspace">Feeling experimental?\nYou can add existing spaces to a space.</string>
     <string name="spaces_no_server_support_title">It looks like your homeserver does not support Spaces yet</string>
     <string name="spaces_no_server_support_description">Please contact your homeserver admin for further information</string>
@@ -3464,7 +3511,7 @@
     <string name="upgrade_public_room">Upgrade public room</string>
     <string name="upgrade_private_room">Upgrade private room</string>
     <string name="upgrade_room_warning">Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.\nThis usually only affects how the room is processed on the server.</string>
-    <string name="upgrade_public_room_from_to">You\'ll upgrade this room from %s to %s.</string>
+    <string name="upgrade_public_room_from_to">You\'ll upgrade this room from %1$s to %2$s.</string>
     <string name="upgrade_room_auto_invite">Automatically invite users</string>
     <string name="upgrade_room_update_parent_space">Automatically update space parent</string>
     <string name="upgrade_room_no_power_to_manage">You need permission to upgrade a room</string>
@@ -3474,6 +3521,7 @@
     <string name="room_upgrade_to_recommended_version">Upgrade to the recommended room version</string>
 
     <string name="error_failed_to_join_room">Sorry, an error occurred while trying to join: %s</string>
+    <string name="call_jitsi_started">Group call started</string>
 
     <string name="a11y_start_voice_message">Start Voice Message</string>
     <string name="voice_message_slide_to_cancel">Slide to cancel</string>
@@ -3495,4 +3543,19 @@
     <string name="upgrade_room_for_restricted_no_param">Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string>
 
     <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 -->
+    <string name="this_invite_to_this_space_was_sent">This invite to this space was sent to %s which is not associated with your account</string>
+
+    <string name="link_this_email_settings_link">Link this email with your account</string>
+    <!-- %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>
 </resources>
diff --git a/vector/src/main/res/xml/vector_settings_keyword_view.xml b/vector/src/main/res/xml/vector_settings_keyword_view.xml
new file mode 100644
index 0000000000..ed6ed8e32a
--- /dev/null
+++ b/vector/src/main/res/xml/vector_settings_keyword_view.xml
@@ -0,0 +1,6 @@
+<chip
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:chipBackgroundColor="@color/keyword_background_selector"
+    app:closeIconTint="@color/keyword_foreground_selector"
+    />
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 1e0f736db2..6260f65fd9 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -52,9 +52,5 @@
         android:summary="@string/labs_use_restricted_join_rule_desc"/>
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SETTINGS_LABS_SPACES_HOME_AS_ORPHAN"
-        android:title="@string/labs_space_show_orphan_in_home"/>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml b/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
index be89c86cb1..2de189cf7f 100644
--- a/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
+++ b/vector/src/main/res/xml/vector_settings_notification_mentions_and_keywords.xml
@@ -17,7 +17,27 @@
         <im.vector.app.core.preference.VectorCheckboxPreference
             android:key="SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_AT_ROOM_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/settings_messages_at_room" />
+            android:title="@string/settings_mentions_at_room" />
+
+        <im.vector.app.core.preference.VectorCheckboxPreference
+            android:key="SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_KEYWORDS_PREFERENCE_KEY"
+            android:persistent="false"
+            android:title="@string/settings_messages_containing_keywords" />
+    </im.vector.app.core.preference.VectorPreferenceCategory>
+
+    <im.vector.app.core.preference.VectorPreferenceCategory
+        android:key="SETTINGS_YOUR_KEYWORDS"
+        android:title="@string/settings_notification_your_keywords">
+        <im.vector.app.core.preference.KeywordPreference
+            android:key="SETTINGS_KEYWORD_EDIT"
+            android:persistent="false"
+            />
+
+        <im.vector.app.core.preference.VectorPreference
+            android:key="SETTINGS_KEYWORDS_FOOTER"
+            android:focusable="false"
+            android:persistent="false"
+            android:summary="@string/settings_mentions_and_keywords_encryption_notice" />
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 1be192e0f5..1f7c347ddd 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -30,6 +30,16 @@
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/spaces">
+
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME"
+            android:title="@string/preference_show_all_rooms_in_home"
+            android:summary="@string/all_rooms_youre_in_will_be_shown_in_home" />
+
+    </im.vector.app.core.preference.VectorPreferenceCategory>
+
     <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_category_composer">
 
         <im.vector.app.core.preference.VectorSwitchPreference
diff --git a/vector/src/test/java/im/vector/app/features/call/conference/JitsiWidgetDataFactoryTest.kt b/vector/src/test/java/im/vector/app/features/call/conference/JitsiWidgetDataFactoryTest.kt
new file mode 100644
index 0000000000..f18fe32b20
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/call/conference/JitsiWidgetDataFactoryTest.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.call.conference
+
+import org.amshove.kluent.internal.assertFails
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.matrix.android.sdk.api.session.events.model.Content
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.widgets.model.Widget
+import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import org.matrix.android.sdk.api.util.appendParamToUrl
+
+private const val DOMAIN = "DOMAIN"
+private const val CONF_ID = "CONF_ID"
+private const val USER_ID = "USER_ID"
+private const val WIDGET_ID = "WIDGET_ID"
+
+class JitsiWidgetDataFactoryTest {
+
+    private val jitsiWidgetDataFactory = JitsiWidgetDataFactory(DOMAIN) { widget ->
+        // we don't need to compute here.
+        widget.widgetContent.url
+    }
+
+    @Test
+    fun jitsiWidget_V2_success() {
+        val widget = createWidgetV2()
+        val widgetData = jitsiWidgetDataFactory.create(widget)
+        assertEquals(widgetData.confId, CONF_ID)
+        assertEquals(widgetData.domain, DOMAIN)
+    }
+
+    @Test
+    fun jitsiWidget_V1_success() {
+        val widget = createWidgetV1(true)
+        val widgetData = jitsiWidgetDataFactory.create(widget)
+        assertEquals(widgetData.confId, CONF_ID)
+        assertEquals(widgetData.domain, DOMAIN)
+    }
+
+    @Test
+    fun jitsiWidget_V1_failure() {
+        val widget = createWidgetV1(false)
+        assertFails {
+            jitsiWidgetDataFactory.create(widget)
+        }
+    }
+
+    private fun createWidgetV1(successful: Boolean): Widget {
+        val url = buildString {
+            append("https://app.element.io/jitsi.html")
+            if (successful) {
+                appendParamToUrl("confId", CONF_ID)
+            }
+            append("#conferenceDomain=\$domain")
+            append("&conferenceId=\$conferenceId")
+            append("&isAudioOnly=\$isAudioOnly")
+            append("&displayName=\$matrix_display_name")
+            append("&avatarUrl=\$matrix_avatar_url")
+            append("&userId=\$matrix_user_id")
+            append("&roomId=\$matrix_room_id")
+            append("&theme=\$theme")
+        }
+        val widgetEventContent = mapOf(
+                "url" to url,
+                "type" to WidgetType.Jitsi.preferred,
+                "data" to mapOf(
+                        "widgetSessionId" to WIDGET_ID
+                ),
+                "creatorUserId" to USER_ID,
+                "id" to WIDGET_ID,
+                "name" to "jitsi"
+        )
+        return createWidgetWithContent(widgetEventContent)
+    }
+
+    private fun createWidgetV2(): Widget {
+        val widgetEventContent = mapOf(
+                // We don't care of url here because we have data field
+                "url" to "url",
+                "type" to WidgetType.Jitsi.preferred,
+                "data" to JitsiWidgetData(DOMAIN, CONF_ID, false).toContent(),
+                "creatorUserId" to USER_ID,
+                "id" to WIDGET_ID,
+                "name" to "jitsi"
+        )
+        return createWidgetWithContent(widgetEventContent)
+    }
+
+    private fun createWidgetWithContent(widgetContent: Content): Widget {
+        val event = Event(type = EventType.STATE_ROOM_WIDGET, eventId = "eventId", content = widgetContent)
+        val widgetContentModel = widgetContent.toModel<WidgetContent>()
+        return Widget(
+                widgetContent = widgetContentModel!!,
+                event = event,
+                widgetId = WIDGET_ID,
+                senderInfo = SenderInfo(USER_ID, null, false, null),
+                isAddedByMe = true,
+                type = WidgetType.Jitsi
+        )
+    }
+}