diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 77dffb43d2..34d7b40a88 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 ### Pull Request Checklist
 
-<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/riotX-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
+<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
 
 - [ ] Changes has been tested on an Android device or Android emulator with API 21
 - [ ] UI change has been tested on both light and dark themes
diff --git a/AUTHORS.md b/AUTHORS.md
index 3d9dffbef5..a85beb2d6f 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,4 +1,4 @@
-A full developer contributors list can be found [here](https://github.com/vector-im/riotX-android/graphs/contributors). 
+A full developer contributors list can be found [here](https://github.com/vector-im/element-android/graphs/contributors). 
 
 # Core team:
 
diff --git a/CHANGES.md b/CHANGES.md
index fb404b971e..4d1be71a25 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,52 @@
+Changes in Element 1.0.6 (2020-09-08)
+===================================================
+
+Features ✨:
+ - List phone numbers and emails added to the Matrix account, and add emails and phone numbers to account (#44, #45)
+
+Improvements 🙌:
+ - You can now join room through permalink and within room directory search
+ - Add long click gesture to copy userId, user display name, room name, room topic and room alias (#1774)
+ - Fix several issues when uploading big files (#1889)
+ - Do not propose to verify session if there is only one session and 4S is not configured (#1901)
+ - Call screen does not use proximity sensor (#1735)
+
+Bugfix 🐛:
+ - Display name not shown under Settings/General (#1926)
+ - Editing message forgets line breaks and markdown (#1939)
+ - Words containing my name should not trigger notifications (#1781)
+ - Fix changing language issue
+ - Fix FontSize issue (#1483, #1787)
+ - Fix bad color for settings icon on Android < 24 (#1786)
+ - Change user or room avatar: when selecting Gallery, I'm not proposed to crop the selected image (#1590)
+ - Loudspeaker is always used (#1685)
+ - Fix uploads still don't work with room v6 (#1879)
+ - Can't handle ongoing call events in background (#1992)
+ - Handle room, user and group links by the Element app (#1795)
+ - Update associated site domain (#1833)
+ - Crash / Attachment viewer: Cannot draw a recycled Bitmap #2034
+ - Login with Matrix-Id | Autodiscovery fails if identity server is invalid and Homeserver ok (#2027)
+ - Support for image compression on Android 10
+ - Verification popup won't show
+ - Android 6: App crash when read Contact permission is granted (#2064)
+ - JSON for verification events leaks in to the room list (#1246)
+ - Replies to poll appears in timeline as unsupported events during sending (#1004)
+
+Translations 🗣:
+ - The SDK is now using SAS string translations from [Weblate Matrix-doc project](https://translate.riot.im/projects/matrix-doc/) (#1909)
+ - New translation to kabyle
+
+Build 🧱:
+ - Some dependencies have been upgraded (coroutine, recyclerView, appCompat, core-ktx, firebase-messaging)
+ - Buildkite:
+    New pipeline location: https://github.com/matrix-org/pipelines/blob/master/element-android/pipeline.yml
+    New build location: https://buildkite.com/matrix-dot-org/element-android
+
+Other changes:
+ - Use File extension functions to make code more concise (#1996)
+ - Create a script to import SAS strings (#1909)
+ - Support `data-mx-[bg-]color` attributes on `<font>` tags.
+
 Changes in Element 1.0.5 (2020-08-21)
 ===================================================
 
diff --git a/README.md b/README.md
index 1ec425793f..64c6c9d04d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-[![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
+[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
 [![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/engage/element-android/?utm_source=widget)
 [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
-[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=alert_status)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
-[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riotx&metric=bugs)](https://sonarcloud.io/dashboard?id=vector.android.riotx)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
 
 # Element Android
 
@@ -14,11 +14,13 @@ It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-androi
 [<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
 [<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)
 
-Nightly build: [![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
+Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
 
 # New Android SDK
 
-Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository. We will make separate repos once the SDK is stable enough.
+Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.
+
+At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.
 
 # Roadmap
 
@@ -27,6 +29,6 @@ The team will work to add them on a regular basis.
 
 ## Contributing
 
-Please refer to [CONTRIBUTING.md](https://github.com/vector-im/riotX-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
+Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
 
 Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
index 6b7818c612..96e6c92467 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
@@ -27,4 +27,9 @@ class AnimatedImageViewHolder constructor(itemView: View) :
     val imageLoaderProgress: ProgressBar = itemView.findViewById(R.id.imageLoaderProgress)
 
     internal val target = DefaultImageLoaderTarget(this, this.touchImageView)
+
+    override fun onRecycled() {
+        super.onRecycled()
+        touchImageView.setImageDrawable(null)
+    }
 }
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
index 1e5e88d91f..9166c2ce4f 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
@@ -50,6 +50,7 @@ internal class DefaultImageLoaderTarget(val holder: AnimatedImageViewHolder, pri
     override fun onLoadFailed(uid: String, errorDrawable: Drawable?) {
         if (holder.boundResourceUid != uid) return
         holder.imageLoaderProgress.isVisible = false
+        holder.touchImageView.setImageDrawable(errorDrawable)
     }
 
     override fun onResourceCleared(uid: String, placeholder: Drawable?) {
@@ -77,11 +78,13 @@ internal class DefaultImageLoaderTarget(val holder: AnimatedImageViewHolder, pri
         override fun onResourceLoading(uid: String, placeholder: Drawable?) {
             if (holder.boundResourceUid != uid) return
             holder.imageLoaderProgress.isVisible = true
+            holder.touchImageView.setImageDrawable(placeholder)
         }
 
         override fun onLoadFailed(uid: String, errorDrawable: Drawable?) {
             if (holder.boundResourceUid != uid) return
             holder.imageLoaderProgress.isVisible = false
+            holder.touchImageView.setImageDrawable(errorDrawable)
         }
 
         override fun onResourceCleared(uid: String, placeholder: Drawable?) {
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
index 78f46a320f..d88faba110 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
@@ -35,6 +35,7 @@ interface VideoLoaderTarget {
     fun onVideoFileLoading(uid: String)
     fun onVideoFileLoadFailed(uid: String)
     fun onVideoFileReady(uid: String, file: File)
+    fun onVideoURLReady(uid: String, path: String)
 }
 
 internal class DefaultVideoLoaderTarget(val holder: VideoViewHolder, private val contextView: ImageView) : VideoLoaderTarget {
@@ -47,6 +48,8 @@ internal class DefaultVideoLoaderTarget(val holder: VideoViewHolder, private val
     }
 
     override fun onThumbnailResourceCleared(uid: String, placeholder: Drawable?) {
+        if (holder.boundResourceUid != uid) return
+        holder.thumbnailImage.setImageDrawable(placeholder)
     }
 
     override fun onThumbnailResourceReady(uid: String, resource: Drawable) {
@@ -68,9 +71,19 @@ internal class DefaultVideoLoaderTarget(val holder: VideoViewHolder, private val
 
     override fun onVideoFileReady(uid: String, file: File) {
         if (holder.boundResourceUid != uid) return
+        arrangeForVideoReady()
+        holder.videoReady(file)
+    }
+
+    override fun onVideoURLReady(uid: String, path: String) {
+        if (holder.boundResourceUid != uid) return
+        arrangeForVideoReady()
+        holder.videoReady(path)
+    }
+
+    private fun arrangeForVideoReady() {
         holder.thumbnailImage.isVisible = false
         holder.loaderProgressBar.isVisible = false
         holder.videoView.isVisible = true
-        holder.videoReady(file)
     }
 }
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
index 32f449d6fe..4d8be6468b 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
@@ -16,6 +16,7 @@
 
 package im.vector.lib.attachmentviewer
 
+import android.util.Log
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
@@ -65,6 +66,13 @@ class VideoViewHolder constructor(itemView: View) :
         }
     }
 
+    fun videoReady(path: String) {
+        mVideoPath = path
+        if (isSelected) {
+            startPlaying()
+        }
+    }
+
     fun videoFileLoadError() {
     }
 
@@ -118,8 +126,13 @@ class VideoViewHolder constructor(itemView: View) :
                         eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
                     }
         }
+        try {
+            videoView.setVideoPath(mVideoPath)
+        } catch (failure: Throwable) {
+            // Couldn't open
+            Log.v(VideoViewHolder::class.java.name, "Failed to start video")
+        }
 
-        videoView.setVideoPath(mVideoPath)
         if (!wasPaused) {
             videoView.start()
             if (progress > 0) {
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
index 019cd3202d..49378631e8 100644
--- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
+++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
@@ -39,4 +39,9 @@ class ZoomableImageViewHolder constructor(itemView: View) :
     }
 
     internal val target = DefaultImageLoaderTarget.ZoomableImageTarget(this, touchImageView)
+
+    override fun onRecycled() {
+        super.onRecycled()
+        touchImageView.setImageDrawable(null)
+    }
 }
diff --git a/build.gradle b/build.gradle
index fdaef6a2f7..f06d1859b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,15 +81,15 @@ apply plugin: 'org.sonarqube'
 
 sonarqube {
     properties {
-        property "sonar.projectName", "RiotX-Android"
-        property "sonar.projectKey", "vector.android.riotx"
+        property "sonar.projectName", "Element-Android"
+        property "sonar.projectKey", "im.vector.app.android"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
         property "sonar.sourceEncoding", "UTF-8"
-        property "sonar.links.homepage", "https://github.com/vector-im/riotX-android/"
-        property "sonar.links.ci", "https://buildkite.com/matrix-dot-org/riotx-android"
-        property "sonar.links.scm", "https://github.com/vector-im/riotX-android/"
-        property "sonar.links.issue", "https://github.com/vector-im/riotX-android/issues"
+        property "sonar.links.homepage", "https://github.com/vector-im/element-android/"
+        property "sonar.links.ci", "https://buildkite.com/matrix-dot-org/element-android"
+        property "sonar.links.scm", "https://github.com/vector-im/element-android/"
+        property "sonar.links.issue", "https://github.com/vector-im/element-android/issues"
         property "sonar.organization", "new_vector_ltd_organization"
         property "sonar.login", project.hasProperty("SONAR_LOGIN") ? SONAR_LOGIN : "invalid"
     }
@@ -100,11 +100,18 @@ project(":vector") {
         properties {
             property "sonar.sources", project(":vector").android.sourceSets.main.java.srcDirs
             // exclude source code from analyses separated by a colon (:)
-            // property "sonar.exclusions", "**/*.*"
+            // Exclude Java source
+            property "sonar.exclusions", "**/BugReporterMultipartBody.java"
         }
     }
 }
 
+project(":diff-match-patch") {
+    sonarqube {
+        skipProject = true
+    }
+}
+
 //project(":matrix-sdk-android") {
 //    sonarqube {
 //        properties {
diff --git a/docs/add_threePids.md b/docs/add_threePids.md
new file mode 100644
index 0000000000..89fc92f329
--- /dev/null
+++ b/docs/add_threePids.md
@@ -0,0 +1,285 @@
+# Adding and removing ThreePids to an account
+
+## Add email
+
+### User enter the email
+
+> POST https://homeserver.org/_matrix/client/r0/account/3pid/email/requestToken
+
+```json
+{
+  "email": "alice@email-provider.org",
+  "client_secret": "TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh",
+  "send_attempt": 1
+}
+```
+
+#### The email is already added to an account
+
+400
+
+```json
+{
+  "errcode": "M_THREEPID_IN_USE",
+  "error": "Email is already in use"
+}
+```
+
+#### The email is free
+
+Wording: "We've sent you an email to verify your address. Please follow the instructions there and then click the button below."
+
+200
+
+```json
+{
+  "sid": "bxyDHuJKsdkjMlTJ"
+}
+```
+
+## User receive an e-mail
+
+> [homeserver.org] Validate your email
+>
+> A request to add an email address to your Matrix account has been received. If this was you, please click the link below to confirm adding this email:
+  https://homeserver.org/_matrix/client/unstable/add_threepid/email/submit_token?token=WUnEhQAmJrXupdEbXgdWvnVIKaGYZFsU&client_secret=TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh&sid=bxyDHuJKsdkjMlTJ
+>  
+>  If this was not you, you can safely ignore this email. Thank you.
+
+### User clicks on the link
+
+The browser displays the following message:
+
+> Your email has now been validated, please return to your client. You may now close this window.
+
+### User returns on Element
+
+User clicks on CONTINUE
+
+> POST https://homeserver.org/_matrix/client/r0/account/3pid/add
+
+```json
+{
+  "sid": "bxyDHuJKsdkjMlTJ",
+  "client_secret": "TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh"
+}
+```
+
+401 User Interactive Authentication
+
+```json
+{
+  "session": "ppvvnozXCQZFaggUBlHJYPjA",
+  "flows": [
+    {
+      "stages": [
+        "m.login.password"
+      ]
+    }
+  ],
+  "params": {
+  }
+}
+```
+
+### User enters his password
+
+POST https://homeserver.org/_matrix/client/r0/account/3pid/add
+
+```json
+{
+  "sid": "bxyDHuJKsdkjMlTJ",
+  "client_secret": "TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh",
+  "auth": {
+    "session": "ppvvnozXCQZFaggUBlHJYPjA",
+    "type": "m.login.password",
+    "user": "@benoitx:matrix.org",
+    "password": "weak_password"
+  }
+}
+```
+
+#### The link has not been clicked
+
+400
+
+```json
+{
+  "errcode": "M_THREEPID_AUTH_FAILED",
+  "error": "No validated 3pid session found"
+}
+```
+
+#### Wrong password
+
+401
+
+```json
+{
+  "session": "fXHOvoQsPMhEebVqTnIrzZJN",
+  "flows": [
+    {
+      "stages": [
+        "m.login.password"
+      ]
+    }
+  ],
+  "params": {
+  },
+  "completed":[
+  ],
+  "error": "Invalid password",
+  "errcode": "M_FORBIDDEN"
+}
+```
+
+#### The link has been clicked and the account password is correct
+
+200
+
+```json
+{}
+```
+
+## Remove email
+
+### User want to remove an email from his account
+
+> POST https://homeserver.org/_matrix/client/r0/account/3pid/delete
+
+```json
+{
+  "medium": "email",
+  "address": "alice@email-provider.org"
+}
+```
+
+#### Email was not bound to an identity server
+
+200
+
+```json
+{
+  "id_server_unbind_result": "no-support"
+}
+```
+
+#### Email was bound to an identity server
+
+200
+
+```json
+{
+  "id_server_unbind_result": "success"
+}
+```
+
+## Add phone number
+
+> POST https://homeserver.org/_matrix/client/r0/account/3pid/msisdn/requestToken
+
+```json
+{
+  "country": "FR",
+  "phone_number": "611223344",
+  "client_secret": "f1K29wFZBEr4RZYatu7xj8nEbXiVpr7J",
+  "send_attempt": 1
+}
+```
+
+Note that the phone number is sent without `+` and without the country code
+
+#### The phone number is already added to an account
+
+400
+
+```json
+{
+  "errcode": "M_THREEPID_IN_USE",
+  "error": "MSISDN is already in use"
+}
+```
+
+#### The phone number is free
+
+Wording: "A text message has been sent to +33611223344. Please enter the verification code it contains."
+
+200
+
+```json
+{
+  "msisdn": "33651547677",
+  "intl_fmt": "+33 6 51 54 76 77",
+  "success": true,
+  "sid": "253299954",
+  "submit_url": "https://homeserver.org/_matrix/client/unstable/add_threepid/msisdn/submit_token"
+}
+```
+
+## User receive a text message
+
+> Riot
+
+> Your Riot validation code is 892541, please enter this into the app
+
+### User enter the code to the app
+
+#### Wrong code
+
+> POST https://homeserver.org/_matrix/client/unstable/add_threepid/msisdn/submit_token
+
+```json
+{
+  "sid": "253299954",
+  "client_secret": "f1K29wFZBEr4RZYatu7xj8nEbXiVpr7J",
+  "token": "111111"
+}
+```
+
+400
+
+```json
+{
+  "errcode": "M_UNKNOWN",
+  "error": "Error contacting the identity server"
+}
+```
+
+This is not an ideal, but the client will display a hint to check the entered code to the user.
+
+#### Correct code
+
+> POST https://homeserver.org/_matrix/client/unstable/add_threepid/msisdn/submit_token
+
+```json
+{
+  "sid": "253299954",
+  "client_secret": "f1K29wFZBEr4RZYatu7xj8nEbXiVpr7J",
+  "token": "892541"
+}
+```
+
+200
+
+```json
+{
+  "success": true
+}
+```
+
+Then the app call `https://homeserver.org/_matrix/client/r0/account/3pid/add` as per adding an email and follow the same UIS flow
+
+## Remove phone number
+
+### User wants to remove a phone number from his account
+
+This is the same request and response than to remove email, but with this body:
+
+```json
+{
+  "medium": "msisdn",
+  "address": "33611223344"
+}
+```
+
+Note that the phone number is provided without `+`, but with the country code.
diff --git a/docs/signin.md b/docs/signin.md
index f5ec03e708..06f715c46b 100644
--- a/docs/signin.md
+++ b/docs/signin.md
@@ -8,7 +8,9 @@ This document describes the flow of signin to a homeserver, and also the flow wh
 
 Client request the sign-in flows, once the homeserver is chosen by the user and its url is known (in the example it's `https://matrix.org`)
 
-> curl -X GET 'https://matrix.org/_matrix/client/r0/login'
+```shell script
+curl -X GET 'https://matrix.org/_matrix/client/r0/login'
+```
 
 200
 
@@ -26,7 +28,9 @@ Client request the sign-in flows, once the homeserver is chosen by the user and
 
 The user is able to connect using `m.login.password`
 
-> curl -X POST --data $'{"identifier":{"type":"m.id.user","user":"alice"},"password":"weak_password","type":"m.login.password","initial_device_display_name":"Portable"}' 'https://matrix.org/_matrix/client/r0/login'
+```shell script
+curl -X POST --data $'{"identifier":{"type":"m.id.user","user":"alice"},"password":"weak_password","type":"m.login.password","initial_device_display_name":"Portable"}' 'https://matrix.org/_matrix/client/r0/login'
+```
 
 ```json
 {
@@ -73,14 +77,16 @@ We get credential (200)
 
 If the user has associated an email with its account, he can signin using the email.
 
-> curl -X POST --data $'{"identifier":{"type":"m.id.thirdparty","medium":"email","address":"alice@yopmail.com"},"password":"weak_password","type":"m.login.password","initial_device_display_name":"Portable"}' 'https://matrix.org/_matrix/client/r0/login'
+```shell script
+curl -X POST --data $'{"identifier":{"type":"m.id.thirdparty","medium":"email","address":"alice@email-provider.org"},"password":"weak_password","type":"m.login.password","initial_device_display_name":"Portable"}' 'https://matrix.org/_matrix/client/r0/login'
+```
 
 ```json
 {
   "identifier": {
     "type": "m.id.thirdparty",
     "medium": "email",
-    "address": "alice@yopmail.com"
+    "address": "alice@email-provider.org"
   },
   "password": "weak_password",
   "type": "m.login.password",
@@ -136,7 +142,9 @@ Not supported yet in Element
 
 ### Login with SSO
 
-> curl -X GET 'https://homeserver.with.sso/_matrix/client/r0/login'
+```shell script
+curl -X GET 'https://homeserver.with.sso/_matrix/client/r0/login'
+```
 
 200
 
@@ -171,7 +179,9 @@ Once the process is finished, the web page will call the `redirectUrl` with an e
 
 This navigation is intercepted by Element by the `LoginActivity`, which will then ask the homeserver to convert this `loginToken` to an access token
 
-> curl -X POST --data $'{"type":"m.login.token","token":"MDAxOWxvY2F0aW9uIG1vemlsbGEub3JnCjAwMTNpZGVudGlmaWVy"}' 'https://homeserver.with.sso/_matrix/client/r0/login'
+```shell script
+curl -X POST --data $'{"type":"m.login.token","token":"MDAxOWxvY2F0aW9uIG1vemlsbGEub3JnCjAwMTNpZGVudGlmaWVy"}' 'https://homeserver.with.sso/_matrix/client/r0/login'
+```
 
 ```json
 {
@@ -214,7 +224,9 @@ We display a warning regarding e2e.
 
 At the first step, we do not send the password, only the email and a client secret, generated by the application
 
-> curl -X POST --data $'{"client_secret":"6c57f284-85e2-421b-8270-fb1795a120a7","send_attempt":0,"email":"user@domain.com"}' 'https://matrix.org/_matrix/client/r0/account/password/email/requestToken'
+```shell script
+curl -X POST --data $'{"client_secret":"6c57f284-85e2-421b-8270-fb1795a120a7","send_attempt":0,"email":"user@domain.com"}' 'https://matrix.org/_matrix/client/r0/account/password/email/requestToken'
+```
 
 ```json
 {
@@ -251,7 +263,9 @@ During this step, the new password is sent to the homeserver.
 
 If the user confirms before the link is clicked, we get an error:
 
-> curl -X POST --data $'{"auth":{"type":"m.login.email.identity","threepid_creds":{"client_secret":"6c57f284-85e2-421b-8270-fb1795a120a7","sid":"tQNbrREDACTEDldA"}},"new_password":"weak_password"}' 'https://matrix.org/_matrix/client/r0/account/password'
+```shell script
+curl -X POST --data $'{"auth":{"type":"m.login.email.identity","threepid_creds":{"client_secret":"6c57f284-85e2-421b-8270-fb1795a120a7","sid":"tQNbrREDACTEDldA"}},"new_password":"weak_password"}' 'https://matrix.org/_matrix/client/r0/account/password'
+```
 
 ```json
 {
@@ -285,7 +299,9 @@ It contains the client secret, a token and the sid
 
 When the user click the link, if validate his ownership and the new password can now be ent by the application (on user demand):
 
-> curl -X POST --data $'{"auth":{"type":"m.login.email.identity","threepid_creds":{"client_secret":"6c57f284-85e2-421b-8270-fb1795a120a7","sid":"tQNbrREDACTEDldA"}},"new_password":"weak_password"}' 'https://matrix.org/_matrix/client/r0/account/password'
+```shell script
+curl -X POST --data $'{"auth":{"type":"m.login.email.identity","threepid_creds":{"client_secret":"6c57f284-85e2-421b-8270-fb1795a120a7","sid":"tQNbrREDACTEDldA"}},"new_password":"weak_password"}' 'https://matrix.org/_matrix/client/r0/account/password'
+```
 
 ```json
 {
diff --git a/docs/signup.md b/docs/signup.md
index 995f5d50a6..97cd20a423 100644
--- a/docs/signup.md
+++ b/docs/signup.md
@@ -10,7 +10,9 @@ This document describes the flow of registration to a homeserver. Examples come
 
 Client request the sign-up flows, once the homeserver is chosen by the user and its url is known (in the example it's `https://matrix.org`)
 
-> curl -X POST --data $'{}' 'https://matrix.org/_matrix/client/r0/register'
+```shell script
+curl -X POST --data $'{}' 'https://matrix.org/_matrix/client/r0/register'
+```
 
 ```json
 {
@@ -70,7 +72,9 @@ If the registration is not possible, we get a 403
 
 The app is displaying a form to enter username and password.
 
-> curl -X POST --data $'{"initial_device_display_name":"Mobile device","username":"alice","password": "weak_password"}' 'https://matrix.org/_matrix/client/r0/register'
+```shell script
+curl -X POST --data $'{"initial_device_display_name":"Mobile device","username":"alice","password": "weak_password"}' 'https://matrix.org/_matrix/client/r0/register'
+```
 
 ```json
 {
@@ -133,9 +137,11 @@ We get a 400:
 
 ### Step 2: entering email
 
-User is proposed to enter an email. We skip this step.
+User is proposed to enter an email. User skips this step.
 
-> curl -X POST --data $'{"auth":{"session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.dummy"}}' 'https://matrix.org/_matrix/client/r0/register'
+```shell script
+curl -X POST --data $'{"auth":{"session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.dummy"}}' 'https://matrix.org/_matrix/client/r0/register'
+```
 
 ```json
 {
@@ -189,16 +195,18 @@ User is proposed to enter an email. We skip this step.
 }
 ```
 
-### Step 2 bis: we enter an email
+### Step 2 bis: user enters an email
 
 We request a token to the homeserver. The `client_secret` is generated by the application
 
-> curl -X POST --data $'{"client_secret":"53e679ea-oRED-ACTED-92b8-3012c49c6cfa","email":"alice@yopmail.com","send_attempt":0}' 'https://matrix.org/_matrix/client/r0/register/email/requestToken'
+```shell script
+curl -X POST --data $'{"client_secret":"53e679ea-oRED-ACTED-92b8-3012c49c6cfa","email":"alice@email-provider.org","send_attempt":0}' 'https://matrix.org/_matrix/client/r0/register/email/requestToken'
+```
 
 ```json
 {
   "client_secret": "53e679ea-oRED-ACTED-92b8-3012c49c6cfa",
-  "email": "alice@yopmail.com",
+  "email": "alice@email-provider.org",
   "send_attempt": 0
 }
 ```
@@ -213,7 +221,9 @@ We request a token to the homeserver. The `client_secret` is generated by the ap
 
 And
 
-> curl -X POST --data $'{"auth":{"threepid_creds":{"client_secret":"53e679ea-oRED-ACTED-92b8-3012c49c6cfa","sid":"qlBCREDACTEDEtgxD"},"session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.email.identity"}}' 'https://matrix.org/_matrix/client/r0/register'
+```shell script
+curl -X POST --data $'{"auth":{"threepid_creds":{"client_secret":"53e679ea-oRED-ACTED-92b8-3012c49c6cfa","sid":"qlBCREDACTEDEtgxD"},"session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.email.identity"}}' 'https://matrix.org/_matrix/client/r0/register'
+```
 
 ```json
 {
@@ -239,7 +249,9 @@ We get 401 since the email is not validated yet:
 
 The app is now polling on 
 
-> curl -X POST --data $'{"auth":{"threepid_creds":{"client_secret":"53e679ea-oRED-ACTED-92b8-3012c49c6cfa","sid":"qlBCREDACTEDEtgxD"},"session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.email.identity"}}' 'https://matrix.org/_matrix/client/r0/register'
+```shell script
+curl -X POST --data $'{"auth":{"threepid_creds":{"client_secret":"53e679ea-oRED-ACTED-92b8-3012c49c6cfa","sid":"qlBCREDACTEDEtgxD"},"session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.email.identity"}}' 'https://matrix.org/_matrix/client/r0/register'
+```
 
 ```json
 {
@@ -254,7 +266,7 @@ The app is now polling on
 }
 ```
 
-We click on the link received by email `https://matrix.org/_matrix/client/unstable/registration/email/submit_token?token=vtQjQIZfwdoREDACTEDozrmKYSWlCXsJ&client_secret=53e679ea-oRED-ACTED-92b8-3012c49c6cfa&sid=qlBCREDACTEDEtgxD` which contains:
+User clicks on the link received by email `https://matrix.org/_matrix/client/unstable/registration/email/submit_token?token=vtQjQIZfwdoREDACTEDozrmKYSWlCXsJ&client_secret=53e679ea-oRED-ACTED-92b8-3012c49c6cfa&sid=qlBCREDACTEDEtgxD` which contains:
 - A `token` vtQjQIZfwdoREDACTEDozrmKYSWlCXsJ
 - The `client_secret`: 53e679ea-oRED-ACTED-92b8-3012c49c6cfa
 - A `sid`: qlBCREDACTEDEtgxD
@@ -306,7 +318,9 @@ Once the link is clicked, the registration request (polling) returns a 401 with
 
 User is proposed to accept T&C and he accepts them
 
-> curl -X POST --data $'{"auth":{"session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.terms"}}' 'https://matrix.org/_matrix/client/r0/register'
+```shell script
+curl -X POST --data $'{"auth":{"session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.terms"}}' 'https://matrix.org/_matrix/client/r0/register'
+```
 
 ```json
 {
@@ -365,7 +379,9 @@ User is proposed to accept T&C and he accepts them
 
 User is proposed to prove he is not a robot and he does it:
 
-> curl -X POST --data $'{"auth":{"response":"03AOLTBLSiGS9GhFDpAMblJ2nlXOmHXqAYJ5OvHCPUjiVLBef3k9snOYI_BDC32-t4D2jv-tpvkaiEI_uloobFd9RUTPpJ7con2hMddbKjSCYqXqcUQFhzhbcX6kw8uBnh2sbwBe80_ihrHGXEoACXQkL0ki1Q0uEtOeW20YBRjbNABsZPpLNZhGIWC0QVXnQ4FouAtZrl3gOAiyM-oG3cgP6M9pcANIAC_7T2P2amAHbtsTlSR9CsazNyS-rtDR9b5MywdtnWN9Aw8fTJb8cXQk_j7nvugMxzofPjSOrPKcr8h5OqPlpUCyxxnFtag6cuaPSUwh43D2L0E-ZX7djzaY2Yh_U2n6HegFNPOQ22CJmfrKwDlodmAfMPvAXyq77n3HpoREDACTEDo3830RHF4BfkGXUaZjctgg-A1mvC17hmQmQpkG7IhDqyw0onU-0vF_-ehCjq_CcQEDpS_O3uiHJaG5xGf-0rhLm57v_wA3deugbsZuO4uTuxZZycN_mKxZ97jlDVBetl9hc_5REPbhcT1w3uzTCSx7Q","session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.recaptcha"}}' 'https://matrix.org/_matrix/client/r0/register'
+```shell script
+curl -X POST --data $'{"auth":{"response":"03AOLTBLSiGS9GhFDpAMblJ2nlXOmHXqAYJ5OvHCPUjiVLBef3k9snOYI_BDC32-t4D2jv-tpvkaiEI_uloobFd9RUTPpJ7con2hMddbKjSCYqXqcUQFhzhbcX6kw8uBnh2sbwBe80_ihrHGXEoACXQkL0ki1Q0uEtOeW20YBRjbNABsZPpLNZhGIWC0QVXnQ4FouAtZrl3gOAiyM-oG3cgP6M9pcANIAC_7T2P2amAHbtsTlSR9CsazNyS-rtDR9b5MywdtnWN9Aw8fTJb8cXQk_j7nvugMxzofPjSOrPKcr8h5OqPlpUCyxxnFtag6cuaPSUwh43D2L0E-ZX7djzaY2Yh_U2n6HegFNPOQ22CJmfrKwDlodmAfMPvAXyq77n3HpoREDACTEDo3830RHF4BfkGXUaZjctgg-A1mvC17hmQmQpkG7IhDqyw0onU-0vF_-ehCjq_CcQEDpS_O3uiHJaG5xGf-0rhLm57v_wA3deugbsZuO4uTuxZZycN_mKxZ97jlDVBetl9hc_5REPbhcT1w3uzTCSx7Q","session":"xptUYoREDACTEDogOWAGVnbJQ","type":"m.login.recaptcha"}}' 'https://matrix.org/_matrix/client/r0/register'
+```
 
 ```json
 {
@@ -396,9 +412,11 @@ Some homeservers may require the user to enter MSISDN.
 
 On matrix.org, it's not required, and not even optional, but it's still possible for the app to add a MSISDN during the registration.
 
-The user enter a phone number and select a country, the `client_secret` is generated by the application
+The user enters a phone number and selects a country, the `client_secret` is generated by the application
 
-> curl -X POST --data $'{"client_secret":"d3e285f6-972a-496c-9a22-7915a2db57c7","send_attempt":1,"country":"FR","phone_number":"+33611223344"}'  'https://matrix.org/_matrix/client/r0/register/msisdn/requestToken'
+```shell script
+curl -X POST --data $'{"client_secret":"d3e285f6-972a-496c-9a22-7915a2db57c7","send_attempt":1,"country":"FR","phone_number":"+33611223344"}'  'https://matrix.org/_matrix/client/r0/register/msisdn/requestToken'
+```
 
 ```json
 {
@@ -430,10 +448,11 @@ If it is not the case, the homeserver send the SMS and returns some data, especi
 }
 ```
 
-When you execute the register request, with the received `sid`, you get an error since the MSISDN is not validated yet:
-
-> curl -X POST --data $'{"auth":{"type":"m.login.msisdn","session":"xptUYoREDACTEDogOWAGVnbJQ","threepid_creds":{"client_secret":"d3e285f6-972a-496c-9a22-7915a2db57c7","sid":"1678881798"}}}' 'https://matrix.org/_matrix/client/r0/register'
+When we execute the register request, with the received `sid`, we get an error since the MSISDN is not validated yet:
 
+```shell script
+curl -X POST --data $'{"auth":{"type":"m.login.msisdn","session":"xptUYoREDACTEDogOWAGVnbJQ","threepid_creds":{"client_secret":"d3e285f6-972a-496c-9a22-7915a2db57c7","sid":"1678881798"}}}' 'https://matrix.org/_matrix/client/r0/register'
+```
 
 ```json
   "auth": {
@@ -492,7 +511,9 @@ There is an issue on Synapse, which return a 401, it sends too much data along w
 
 The user receive the SMS, he can enter the SMS code in the app, which is sent using the "submit_url" received ie the response of the `requestToken` request:
 
-> curl -X POST --data $'{"client_secret":"d3e285f6-972a-496c-9a22-7915a2db57c7","sid":"1678881798","token":"123456"}' 'https://matrix.org/_matrix/client/unstable/add_threepid/msisdn/submit_token'
+```shell script
+curl -X POST --data $'{"client_secret":"d3e285f6-972a-496c-9a22-7915a2db57c7","sid":"1678881798","token":"123456"}' 'https://matrix.org/_matrix/client/unstable/add_threepid/msisdn/submit_token'
+```
 
 ```json
 {
@@ -520,7 +541,9 @@ And if the code is correct we get a 200 with:
 
 We can now execute the registration request, to the homeserver
 
-> curl -X POST --data $'{"auth":{"type":"m.login.msisdn","session":"xptUYoREDACTEDogOWAGVnbJQ","threepid_creds":{"client_secret":"d3e285f6-972a-496c-9a22-7915a2db57c7","sid":"1678881798"}}}' 'https://matrix.org/_matrix/client/r0/register'
+```shell script
+curl -X POST --data $'{"auth":{"type":"m.login.msisdn","session":"xptUYoREDACTEDogOWAGVnbJQ","threepid_creds":{"client_secret":"d3e285f6-972a-496c-9a22-7915a2db57c7","sid":"1678881798"}}}' 'https://matrix.org/_matrix/client/r0/register'
+```
 
 ```json
 {
@@ -535,7 +558,7 @@ We can now execute the registration request, to the homeserver
 }
 ```
 
-Now the homeserver consider that the `m.login.msisdn` step is completed (401):
+Now the homeserver considers that the `m.login.msisdn` step is completed (401):
 
 ```json
 {
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 45efd125ee..55ede52c0c 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -18,9 +18,13 @@
 package org.matrix.android.sdk.rx
 
 import androidx.paging.PagedList
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.functions.Function3
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
@@ -43,10 +47,6 @@ import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
-import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.functions.Function3
 
 class RxSession(private val session: Session) {
 
@@ -110,6 +110,11 @@ class RxSession(private val session: Session) {
                 .startWithCallable { session.getThreePids() }
     }
 
+    fun livePendingThreePIds(): Observable<List<ThreePid>> {
+        return session.getPendingThreePidsLive().asObservable()
+                .startWithCallable { session.getPendingThreePids() }
+    }
+
     fun createRoom(roomParams: CreateRoomParams): Single<String> = singleBuilder {
         session.createRoom(roomParams, it)
     }
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index d98533e4bc..2c20137647 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -112,18 +112,18 @@ dependencies {
     def moshi_version = '1.8.0'
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
-    def coroutines_version = "1.3.2"
+    def coroutines_version = "1.3.8"
     def markwon_version = '3.1.0'
     def daggerVersion = '2.25.4'
-    def work_version = '2.3.3'
+    def work_version = '2.4.0'
     def retrofit_version = '2.6.2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "androidx.core:core-ktx:1.3.0"
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.core:core-ktx:1.3.1"
 
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
@@ -131,8 +131,6 @@ dependencies {
     // Network
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
-    implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version"
-
 
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.8.1"))
     implementation 'com.squareup.okhttp3:okhttp'
@@ -146,7 +144,6 @@ dependencies {
 
     // Image
     implementation 'androidx.exifinterface:exifinterface:1.3.0-alpha01'
-    implementation 'id.zelory:compressor:3.0.0'
 
     // Database
     implementation 'com.github.Zhuinden:realm-monarchy:0.5.1'
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
index df359f2adc..df26bb1227 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
@@ -23,15 +23,12 @@ import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
-import org.matrix.android.sdk.common.DaggerTestMatrixComponent
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
+import org.matrix.android.sdk.common.DaggerTestMatrixComponent
 import org.matrix.android.sdk.internal.SessionManager
-import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
-import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
 import org.matrix.android.sdk.internal.network.UserAgentHolder
 import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
 import org.matrix.olm.OlmManager
-import java.io.InputStream
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
@@ -96,9 +93,5 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         fun getSdkVersion(): String {
             return BuildConfig.VERSION_NAME + " (" + BuildConfig.GIT_SDK_REVISION + ")"
         }
-
-        fun decryptStream(inputStream: InputStream?, elementToDecrypt: ElementToDecrypt): InputStream? {
-            return MXEncryptedAttachments.decryptAttachment(inputStream, elementToDecrypt)
-        }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
index 05dbc40e1e..1e109f11ae 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
@@ -19,17 +19,17 @@ package org.matrix.android.sdk.internal.crypto
 import android.os.MemoryFile
 import android.util.Base64
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
-import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
-import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileKey
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertNotNull
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
-import java.io.ByteArrayInputStream
+import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileKey
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
+import java.io.ByteArrayOutputStream
 import java.io.InputStream
 
 /**
@@ -41,29 +41,26 @@ import java.io.InputStream
 class AttachmentEncryptionTest {
 
     private fun checkDecryption(input: String, encryptedFileInfo: EncryptedFileInfo): String {
-        val `in` = Base64.decode(input, Base64.DEFAULT)
+        val inputAsByteArray = Base64.decode(input, Base64.DEFAULT)
 
         val inputStream: InputStream
 
-        inputStream = if (`in`.isEmpty()) {
-            ByteArrayInputStream(`in`)
+        inputStream = if (inputAsByteArray.isEmpty()) {
+            inputAsByteArray.inputStream()
         } else {
-            val memoryFile = MemoryFile("file" + System.currentTimeMillis(), `in`.size)
-            memoryFile.outputStream.write(`in`)
+            val memoryFile = MemoryFile("file" + System.currentTimeMillis(), inputAsByteArray.size)
+            memoryFile.outputStream.write(inputAsByteArray)
             memoryFile.inputStream
         }
 
-        val decryptedStream = MXEncryptedAttachments.decryptAttachment(inputStream, encryptedFileInfo)
+        val decryptedStream = ByteArrayOutputStream()
+        val result = MXEncryptedAttachments.decryptAttachment(inputStream, encryptedFileInfo.toElementToDecrypt()!!, decryptedStream)
 
-        assertNotNull(decryptedStream)
+        assert(result)
 
-        val buffer = ByteArray(100)
+        val toByteArray = decryptedStream.toByteArray()
 
-        val len = decryptedStream!!.read(buffer)
-
-        decryptedStream.close()
-
-        return Base64.encodeToString(buffer, 0, len, Base64.DEFAULT).replace("\n".toRegex(), "").replace("=".toRegex(), "")
+        return Base64.encodeToString(toByteArray, 0, toByteArray.size, Base64.DEFAULT).replace("\n".toRegex(), "").replace("=".toRegex(), "")
     }
 
     @Test
@@ -74,7 +71,7 @@ class AttachmentEncryptionTest {
                 key = EncryptedFileKey(
                         alg = "A256CTR",
                         k = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                        key_ops = listOf("encrypt", "decrypt"),
+                        keyOps = listOf("encrypt", "decrypt"),
                         kty = "oct",
                         ext = true
                 ),
@@ -93,7 +90,7 @@ class AttachmentEncryptionTest {
                 key = EncryptedFileKey(
                         alg = "A256CTR",
                         k = "__________________________________________8",
-                        key_ops = listOf("encrypt", "decrypt"),
+                        keyOps = listOf("encrypt", "decrypt"),
                         kty = "oct",
                         ext = true
                 ),
@@ -112,7 +109,7 @@ class AttachmentEncryptionTest {
                 key = EncryptedFileKey(
                         alg = "A256CTR",
                         k = "__________________________________________8",
-                        key_ops = listOf("encrypt", "decrypt"),
+                        keyOps = listOf("encrypt", "decrypt"),
                         kty = "oct",
                         ext = true
                 ),
@@ -133,7 +130,7 @@ class AttachmentEncryptionTest {
                 key = EncryptedFileKey(
                         alg = "A256CTR",
                         k = "__________________________________________8",
-                        key_ops = listOf("encrypt", "decrypt"),
+                        keyOps = listOf("encrypt", "decrypt"),
                         kty = "oct",
                         ext = true
                 ),
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index 9b85310d50..eebaa93415 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -17,23 +17,22 @@
 package org.matrix.android.sdk.internal.session.room.send
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.matrix.android.sdk.InstrumentedTest
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
-import org.commonmark.renderer.text.TextContentRenderer
 import org.junit.Assert.assertEquals
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
 
 /**
  * It will not be possible to test all combinations. For the moment I add a few tests, then, depending on the problem discovered in the wild,
  * we can add more tests to cover the edge cases.
  * Some tests are suffixed with `_not_passing`, maybe one day we will fix them...
- * Riot-Web should be used as a reference for expected results, but not always. Especially Riot-Web add lots of `\n` in the
- * formatted body, which is quite useless.
- * Also Riot-Web does not provide plain text body when formatted text is provided. The body contains what the user has entered.
+ * Element Web should be used as a reference for expected results, but not always.
+ * Also Element Web does not provide plain text body when formatted text is provided. The body contains what the user has entered. We are doing
+ * the same to be able to edit messages (See #1939)
  * See https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes
  */
 @Suppress("SpellCheckingInspection")
@@ -46,8 +45,7 @@ class MarkdownParserTest : InstrumentedTest {
      */
     private val markdownParser = MarkdownParser(
             Parser.builder().build(),
-            HtmlRenderer.builder().build(),
-            TextContentRenderer.builder().build()
+            HtmlRenderer.builder().build()
     )
 
     @Test
@@ -83,6 +81,15 @@ class MarkdownParserTest : InstrumentedTest {
         )
     }
 
+    @Test
+    fun parseBoldNewLines() {
+        testTypeNewLines(
+                name = "bold",
+                markdownPattern = "**",
+                htmlExpectedTag = "strong"
+        )
+    }
+
     @Test
     fun parseItalic() {
         testType(
@@ -92,14 +99,23 @@ class MarkdownParserTest : InstrumentedTest {
         )
     }
 
+    @Test
+    fun parseItalicNewLines() {
+        testTypeNewLines(
+                name = "italic",
+                markdownPattern = "*",
+                htmlExpectedTag = "em"
+        )
+    }
+
     @Test
     fun parseItalic2() {
-        // Riot-Web format
-        "_italic_".let { markdownParser.parse(it) }.expect("italic", "<em>italic</em>")
+        // Element Web format
+        "_italic_".let { markdownParser.parse(it).expect(it, "<em>italic</em>") }
     }
 
     /**
-     * Note: the test is not passing, it does not work on Riot-Web neither
+     * Note: the test is not passing, it does not work on Element Web neither
      */
     @Test
     fun parseStrike_not_passing() {
@@ -110,14 +126,30 @@ class MarkdownParserTest : InstrumentedTest {
         )
     }
 
+    @Test
+    fun parseStrikeNewLines() {
+        testTypeNewLines(
+                name = "strike",
+                markdownPattern = "~~",
+                htmlExpectedTag = "del"
+        )
+    }
+
     @Test
     fun parseCode() {
         testType(
                 name = "code",
                 markdownPattern = "`",
-                htmlExpectedTag = "code",
-                plainTextPrefix = "\"",
-                plainTextSuffix = "\""
+                htmlExpectedTag = "code"
+        )
+    }
+
+    @Test
+    fun parseCodeNewLines() {
+        testTypeNewLines(
+                name = "code",
+                markdownPattern = "`",
+                htmlExpectedTag = "code"
         )
     }
 
@@ -126,9 +158,16 @@ class MarkdownParserTest : InstrumentedTest {
         testType(
                 name = "code",
                 markdownPattern = "``",
-                htmlExpectedTag = "code",
-                plainTextPrefix = "\"",
-                plainTextSuffix = "\""
+                htmlExpectedTag = "code"
+        )
+    }
+
+    @Test
+    fun parseCode2NewLines() {
+        testTypeNewLines(
+                name = "code",
+                markdownPattern = "``",
+                htmlExpectedTag = "code"
         )
     }
 
@@ -137,78 +176,85 @@ class MarkdownParserTest : InstrumentedTest {
         testType(
                 name = "code",
                 markdownPattern = "```",
-                htmlExpectedTag = "code",
-                plainTextPrefix = "\"",
-                plainTextSuffix = "\""
+                htmlExpectedTag = "code"
+        )
+    }
+
+    @Test
+    fun parseCode3NewLines() {
+        testTypeNewLines(
+                name = "code",
+                markdownPattern = "```",
+                htmlExpectedTag = "code"
         )
     }
 
     @Test
     fun parseUnorderedList() {
-        "- item1".let { markdownParser.parse(it).expect(it, "<ul><li>item1</li></ul>") }
-        "- item1\n- item2".let { markdownParser.parse(it).expect(it, "<ul><li>item1</li><li>item2</li></ul>") }
+        "- item1".let { markdownParser.parse(it).expect(it, "<ul>\n<li>item1</li>\n</ul>") }
+        "- item1\n- item2".let { markdownParser.parse(it).expect(it, "<ul>\n<li>item1</li>\n<li>item2</li>\n</ul>") }
     }
 
     @Test
     fun parseOrderedList() {
-        "1. item1".let { markdownParser.parse(it).expect(it, "<ol><li>item1</li></ol>") }
-        "1. item1\n2. item2".let { markdownParser.parse(it).expect(it, "<ol><li>item1</li><li>item2</li></ol>") }
+        "1. item1".let { markdownParser.parse(it).expect(it, "<ol>\n<li>item1</li>\n</ol>") }
+        "1. item1\n2. item2".let { markdownParser.parse(it).expect(it, "<ol>\n<li>item1</li>\n<li>item2</li>\n</ol>") }
     }
 
     @Test
     fun parseHorizontalLine() {
-        "---".let { markdownParser.parse(it) }.expect("***", "<hr />")
+        "---".let { markdownParser.parse(it).expect(it, "<hr />") }
     }
 
     @Test
     fun parseH2AndContent() {
-        "a\n---\nb".let { markdownParser.parse(it) }.expect("a\nb", "<h2>a</h2><p>b</p>")
+        "a\n---\nb".let { markdownParser.parse(it).expect(it, "<h2>a</h2>\n<p>b</p>") }
     }
 
     @Test
     fun parseQuote() {
-        "> quoted".let { markdownParser.parse(it) }.expect("«quoted»", "<blockquote><p>quoted</p></blockquote>")
+        "> quoted".let { markdownParser.parse(it).expect(it, "<blockquote>\n<p>quoted</p>\n</blockquote>") }
     }
 
     @Test
     fun parseQuote_not_passing() {
-        "> quoted\nline2".let { markdownParser.parse(it) }.expect("«quoted\nline2»", "<blockquote><p>quoted<br/>line2</p></blockquote>")
+        "> quoted\nline2".let { markdownParser.parse(it).expect(it, "<blockquote><p>quoted<br />line2</p></blockquote>") }
     }
 
     @Test
     fun parseBoldItalic() {
-        "*italic* **bold**".let { markdownParser.parse(it) }.expect("italic bold", "<em>italic</em> <strong>bold</strong>")
-        "**bold** *italic*".let { markdownParser.parse(it) }.expect("bold italic", "<strong>bold</strong> <em>italic</em>")
+        "*italic* **bold**".let { markdownParser.parse(it).expect(it, "<em>italic</em> <strong>bold</strong>") }
+        "**bold** *italic*".let { markdownParser.parse(it).expect(it, "<strong>bold</strong> <em>italic</em>") }
     }
 
     @Test
     fun parseHead() {
-        "# head1".let { markdownParser.parse(it) }.expect("head1", "<h1>head1</h1>")
-        "## head2".let { markdownParser.parse(it) }.expect("head2", "<h2>head2</h2>")
-        "### head3".let { markdownParser.parse(it) }.expect("head3", "<h3>head3</h3>")
-        "#### head4".let { markdownParser.parse(it) }.expect("head4", "<h4>head4</h4>")
-        "##### head5".let { markdownParser.parse(it) }.expect("head5", "<h5>head5</h5>")
-        "###### head6".let { markdownParser.parse(it) }.expect("head6", "<h6>head6</h6>")
+        "# head1".let { markdownParser.parse(it).expect(it, "<h1>head1</h1>") }
+        "## head2".let { markdownParser.parse(it).expect(it, "<h2>head2</h2>") }
+        "### head3".let { markdownParser.parse(it).expect(it, "<h3>head3</h3>") }
+        "#### head4".let { markdownParser.parse(it).expect(it, "<h4>head4</h4>") }
+        "##### head5".let { markdownParser.parse(it).expect(it, "<h5>head5</h5>") }
+        "###### head6".let { markdownParser.parse(it).expect(it, "<h6>head6</h6>") }
     }
 
     @Test
     fun parseHeads() {
-        "# head1\n# head2".let { markdownParser.parse(it) }.expect("head1\nhead2", "<h1>head1</h1><h1>head2</h1>")
+        "# head1\n# head2".let { markdownParser.parse(it).expect(it, "<h1>head1</h1>\n<h1>head2</h1>") }
     }
 
     @Test
     fun parseBoldNewLines_not_passing() {
-        "**bold**\nline2".let { markdownParser.parse(it) }.expect("bold\nline2", "<strong>bold</strong><br />line2")
+        "**bold**\nline2".let { markdownParser.parse(it).expect(it, "<strong>bold</strong><br />line2") }
     }
 
     @Test
     fun parseLinks() {
-        "[link](target)".let { markdownParser.parse(it) }.expect(""""link" (target)""", """<a href="target">link</a>""")
+        "[link](target)".let { markdownParser.parse(it).expect(it, """<a href="target">link</a>""") }
     }
 
     @Test
     fun parseParagraph() {
-        "# head\ncontent".let { markdownParser.parse(it) }.expect("head\ncontent", "<h1>head</h1><p>content</p>")
+        "# head\ncontent".let { markdownParser.parse(it).expect(it, "<h1>head</h1>\n<p>content</p>") }
     }
 
     private fun testIdentity(text: String) {
@@ -217,59 +263,93 @@ class MarkdownParserTest : InstrumentedTest {
 
     private fun testType(name: String,
                          markdownPattern: String,
-                         htmlExpectedTag: String,
-                         plainTextPrefix: String = "",
-                         plainTextSuffix: String = "") {
+                         htmlExpectedTag: String) {
         // Test simple case
         "$markdownPattern$name$markdownPattern"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$plainTextPrefix$name$plainTextSuffix",
-                        expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                }
 
         // Test twice the same tag
         "$markdownPattern$name$markdownPattern and $markdownPattern$name bis$markdownPattern"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$plainTextPrefix$name$plainTextSuffix and $plainTextPrefix$name bis$plainTextSuffix",
-                        expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> and <$htmlExpectedTag>$name bis</$htmlExpectedTag>")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> and <$htmlExpectedTag>$name bis</$htmlExpectedTag>")
+                }
 
         val textBefore = "a"
         val textAfter = "b"
 
         // With sticked text before
         "$textBefore$markdownPattern$name$markdownPattern"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$textBefore$plainTextPrefix$name$plainTextSuffix",
-                        expectedFormattedText = "$textBefore<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "$textBefore<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                }
 
         // With text before and space
         "$textBefore $markdownPattern$name$markdownPattern"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$textBefore $plainTextPrefix$name$plainTextSuffix",
-                        expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag>")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag>")
+                }
 
         // With sticked text after
         "$markdownPattern$name$markdownPattern$textAfter"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$plainTextPrefix$name$plainTextSuffix$textAfter",
-                        expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                }
 
         // With space and text after
         "$markdownPattern$name$markdownPattern $textAfter"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$plainTextPrefix$name$plainTextSuffix $textAfter",
-                        expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                }
 
         // With sticked text before and text after
         "$textBefore$markdownPattern$name$markdownPattern$textAfter"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$textBefore$plainTextPrefix$name$plainTextSuffix$textAfter",
-                        expectedFormattedText = "a<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "a<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                }
 
         // With text before and after, with spaces
         "$textBefore $markdownPattern$name$markdownPattern $textAfter"
-                .let { markdownParser.parse(it) }
-                .expect(expectedText = "$textBefore $plainTextPrefix$name$plainTextSuffix $textAfter",
-                        expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                }
+    }
+
+    private fun testTypeNewLines(name: String,
+                                 markdownPattern: String,
+                                 htmlExpectedTag: String) {
+        // With new line inside the block
+        "$markdownPattern$name\n$name$markdownPattern"
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name<br />$name</$htmlExpectedTag>")
+                }
+
+        // With new line between two blocks
+        "$markdownPattern$name$markdownPattern\n$markdownPattern$name$markdownPattern"
+                .let {
+                    markdownParser.parse(it)
+                            .expect(expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag><$htmlExpectedTag>$name</$htmlExpectedTag>")
+                }
     }
 
     private fun TextContent.expect(expectedText: String, expectedFormattedText: String?) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
index 6cd003ddae..aafefa2048 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
@@ -26,13 +26,10 @@ import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import org.matrix.android.sdk.internal.SessionManager
-import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
-import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
 import org.matrix.android.sdk.internal.di.DaggerMatrixComponent
 import org.matrix.android.sdk.internal.network.UserAgentHolder
 import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
 import org.matrix.olm.OlmManager
-import java.io.InputStream
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
@@ -97,9 +94,5 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         fun getSdkVersion(): String {
             return BuildConfig.VERSION_NAME + " (" + BuildConfig.GIT_SDK_REVISION + ")"
         }
-
-        fun decryptStream(inputStream: InputStream?, elementToDecrypt: ElementToDecrypt): InputStream? {
-            return MXEncryptedAttachments.decryptAttachment(inputStream, elementToDecrypt)
-        }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
index a736a4f1be..ec2dfd214c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
@@ -45,7 +45,7 @@ sealed class WellknownResult {
     /**
      * Inform the user that auto-discovery failed due to invalid/empty data and PROMPT for the parameter.
      */
-    object FailPrompt : WellknownResult()
+    data class FailPrompt(val homeServerUrl: String?, val wellKnown: WellKnown?) : WellknownResult()
 
     /**
      * Inform the user that auto-discovery did not return any usable URLs. Do not continue further with the current login process.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
index 7a21920e58..ff58650781 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
@@ -24,21 +24,24 @@ sealed class Action {
     object DoNotNotify : Action()
     data class Sound(val sound: String = ACTION_OBJECT_VALUE_VALUE_DEFAULT) : Action()
     data class Highlight(val highlight: Boolean) : Action()
+
+    companion object {
+        const val ACTION_NOTIFY = "notify"
+        const val ACTION_DONT_NOTIFY = "dont_notify"
+        const val ACTION_COALESCE = "coalesce"
+
+        // Ref: https://matrix.org/docs/spec/client_server/latest#tweaks
+        const val ACTION_OBJECT_SET_TWEAK_KEY = "set_tweak"
+
+        const val ACTION_OBJECT_SET_TWEAK_VALUE_SOUND = "sound"
+        const val ACTION_OBJECT_SET_TWEAK_VALUE_HIGHLIGHT = "highlight"
+
+        const val ACTION_OBJECT_VALUE_KEY = "value"
+        const val ACTION_OBJECT_VALUE_VALUE_DEFAULT = "default"
+        const val ACTION_OBJECT_VALUE_VALUE_RING = "ring"
+    }
 }
 
-private const val ACTION_NOTIFY = "notify"
-private const val ACTION_DONT_NOTIFY = "dont_notify"
-private const val ACTION_COALESCE = "coalesce"
-
-// Ref: https://matrix.org/docs/spec/client_server/latest#tweaks
-private const val ACTION_OBJECT_SET_TWEAK_KEY = "set_tweak"
-
-private const val ACTION_OBJECT_SET_TWEAK_VALUE_SOUND = "sound"
-private const val ACTION_OBJECT_SET_TWEAK_VALUE_HIGHLIGHT = "highlight"
-
-private const val ACTION_OBJECT_VALUE_KEY = "value"
-private const val ACTION_OBJECT_VALUE_VALUE_DEFAULT = "default"
-
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#actions
  *
@@ -69,18 +72,18 @@ private const val ACTION_OBJECT_VALUE_VALUE_DEFAULT = "default"
 fun List<Action>.toJson(): List<Any> {
     return map { action ->
         when (action) {
-            is Action.Notify      -> ACTION_NOTIFY
-            is Action.DoNotNotify -> ACTION_DONT_NOTIFY
-            is Action.Sound       -> {
+            is Action.Notify -> Action.ACTION_NOTIFY
+            is Action.DoNotNotify -> Action.ACTION_DONT_NOTIFY
+            is Action.Sound -> {
                 mapOf(
-                        ACTION_OBJECT_SET_TWEAK_KEY to ACTION_OBJECT_SET_TWEAK_VALUE_SOUND,
-                        ACTION_OBJECT_VALUE_KEY to action.sound
+                        Action.ACTION_OBJECT_SET_TWEAK_KEY to Action.ACTION_OBJECT_SET_TWEAK_VALUE_SOUND,
+                        Action.ACTION_OBJECT_VALUE_KEY to action.sound
                 )
             }
-            is Action.Highlight   -> {
+            is Action.Highlight -> {
                 mapOf(
-                        ACTION_OBJECT_SET_TWEAK_KEY to ACTION_OBJECT_SET_TWEAK_VALUE_HIGHLIGHT,
-                        ACTION_OBJECT_VALUE_KEY to action.highlight
+                        Action.ACTION_OBJECT_SET_TWEAK_KEY to Action.ACTION_OBJECT_SET_TWEAK_VALUE_HIGHLIGHT,
+                        Action.ACTION_OBJECT_VALUE_KEY to action.highlight
                 )
             }
         }
@@ -92,26 +95,26 @@ fun PushRule.getActions(): List<Action> {
 
     actions.forEach { actionStrOrObj ->
         when (actionStrOrObj) {
-            ACTION_NOTIFY      -> Action.Notify
-            ACTION_DONT_NOTIFY -> Action.DoNotNotify
-            is Map<*, *>       -> {
-                when (actionStrOrObj[ACTION_OBJECT_SET_TWEAK_KEY]) {
-                    ACTION_OBJECT_SET_TWEAK_VALUE_SOUND     -> {
-                        (actionStrOrObj[ACTION_OBJECT_VALUE_KEY] as? String)?.let { stringValue ->
+            Action.ACTION_NOTIFY -> Action.Notify
+            Action.ACTION_DONT_NOTIFY -> Action.DoNotNotify
+            is Map<*, *> -> {
+                when (actionStrOrObj[Action.ACTION_OBJECT_SET_TWEAK_KEY]) {
+                    Action.ACTION_OBJECT_SET_TWEAK_VALUE_SOUND     -> {
+                        (actionStrOrObj[Action.ACTION_OBJECT_VALUE_KEY] as? String)?.let { stringValue ->
                             Action.Sound(stringValue)
                         }
                         // When the value is not there, default sound (not specified by the spec)
-                                ?: Action.Sound(ACTION_OBJECT_VALUE_VALUE_DEFAULT)
+                                ?: Action.Sound(Action.ACTION_OBJECT_VALUE_VALUE_DEFAULT)
                     }
-                    ACTION_OBJECT_SET_TWEAK_VALUE_HIGHLIGHT -> {
-                        (actionStrOrObj[ACTION_OBJECT_VALUE_KEY] as? Boolean)?.let { boolValue ->
+                    Action.ACTION_OBJECT_SET_TWEAK_VALUE_HIGHLIGHT -> {
+                        (actionStrOrObj[Action.ACTION_OBJECT_VALUE_KEY] as? Boolean)?.let { boolValue ->
                             Action.Highlight(boolValue)
                         }
                         // When the value is not there, default is true, says the spec
                                 ?: Action.Highlight(true)
                     }
                     else                                    -> {
-                        Timber.w("Unsupported set_tweak value ${actionStrOrObj[ACTION_OBJECT_SET_TWEAK_KEY]}")
+                        Timber.w("Unsupported set_tweak value ${actionStrOrObj[Action.ACTION_OBJECT_SET_TWEAK_KEY]}")
                         null
                     }
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
index 50c2f8505b..3b1082ea0a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
@@ -18,32 +18,8 @@ package org.matrix.android.sdk.api.pushrules
 
 import org.matrix.android.sdk.api.session.events.model.Event
 
-abstract class Condition(val kind: Kind) {
+interface Condition {
+    fun isSatisfied(event: Event, conditionResolver: ConditionResolver): Boolean
 
-    enum class Kind(val value: String) {
-        EventMatch("event_match"),
-        ContainsDisplayName("contains_display_name"),
-        RoomMemberCount("room_member_count"),
-        SenderNotificationPermission("sender_notification_permission"),
-        Unrecognised("");
-
-        companion object {
-
-            fun fromString(value: String): Kind {
-                return when (value) {
-                    "event_match"                    -> EventMatch
-                    "contains_display_name"          -> ContainsDisplayName
-                    "room_member_count"              -> RoomMemberCount
-                    "sender_notification_permission" -> SenderNotificationPermission
-                    else                             -> Unrecognised
-                }
-            }
-        }
-    }
-
-    abstract fun isSatisfied(event: Event, conditionResolver: ConditionResolver): Boolean
-
-    open fun technicalDescription(): String {
-        return "Kind: $kind"
-    }
+    fun technicalDescription(): String
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
index a836c24c4e..72eda20679 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
@@ -20,17 +20,15 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
-import timber.log.Timber
+import org.matrix.android.sdk.internal.util.caseInsensitiveFind
 
-class ContainsDisplayNameCondition : Condition(Kind.ContainsDisplayName) {
+class ContainsDisplayNameCondition : Condition {
 
     override fun isSatisfied(event: Event, conditionResolver: ConditionResolver): Boolean {
         return conditionResolver.resolveContainsDisplayNameCondition(event, this)
     }
 
-    override fun technicalDescription(): String {
-        return "User is mentioned"
-    }
+    override fun technicalDescription() = "User is mentioned"
 
     fun isSatisfied(event: Event, displayName: String): Boolean {
         val message = when (event.type) {
@@ -45,31 +43,6 @@ class ContainsDisplayNameCondition : Condition(Kind.ContainsDisplayName) {
             else              -> null
         } ?: return false
 
-        return caseInsensitiveFind(displayName, message.body)
-    }
-
-    companion object {
-        /**
-         * Returns whether a string contains an occurrence of another, as a standalone word, regardless of case.
-         *
-         * @param subString  the string to search for
-         * @param longString the string to search in
-         * @return whether a match was found
-         */
-        fun caseInsensitiveFind(subString: String, longString: String): Boolean {
-            // add sanity checks
-            if (subString.isEmpty() || longString.isEmpty()) {
-                return false
-            }
-
-            try {
-                val regex = Regex("(\\W|^)" + Regex.escape(subString) + "(\\W|$)", RegexOption.IGNORE_CASE)
-                return regex.containsMatchIn(longString)
-            } catch (e: Exception) {
-                Timber.e(e, "## caseInsensitiveFind() : failed")
-            }
-
-            return false
-        }
+        return message.body.caseInsensitiveFind(displayName)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
index 5eed785899..c9aa0d001a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
@@ -18,6 +18,9 @@ package org.matrix.android.sdk.api.pushrules
 
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.caseInsensitiveFind
+import org.matrix.android.sdk.internal.util.hasSpecialGlobChar
+import org.matrix.android.sdk.internal.util.simpleGlobToRegExp
 import timber.log.Timber
 
 class EventMatchCondition(
@@ -29,16 +32,18 @@ class EventMatchCondition(
          * The glob-style pattern to match against. Patterns with no special glob characters should
          * be treated as having asterisks prepended and appended when testing the condition.
          */
-        val pattern: String
-) : Condition(Kind.EventMatch) {
+        val pattern: String,
+        /**
+         * true to match only words. In this case pattern will not be considered as a glob
+         */
+        val wordsOnly: Boolean
+) : Condition {
 
     override fun isSatisfied(event: Event, conditionResolver: ConditionResolver): Boolean {
         return conditionResolver.resolveEventMatchCondition(event, this)
     }
 
-    override fun technicalDescription(): String {
-        return "'$key' Matches '$pattern'"
-    }
+    override fun technicalDescription() = "'$key' matches '$pattern', words only '$wordsOnly'"
 
     fun isSatisfied(event: Event): Boolean {
         // TODO encrypted events?
@@ -48,14 +53,18 @@ class EventMatchCondition(
 
         // Patterns with no special glob characters should be treated as having asterisks prepended
         // and appended when testing the condition.
-        try {
-            val modPattern = if (hasSpecialGlobChar(pattern)) simpleGlobToRegExp(pattern) else simpleGlobToRegExp("*$pattern*")
-            val regex = Regex(modPattern, RegexOption.DOT_MATCHES_ALL)
-            return regex.containsMatchIn(value)
+        return try {
+            if (wordsOnly) {
+                value.caseInsensitiveFind(pattern)
+            } else {
+                val modPattern = if (pattern.hasSpecialGlobChar()) pattern.simpleGlobToRegExp() else "*$pattern*".simpleGlobToRegExp()
+                val regex = Regex(modPattern, RegexOption.DOT_MATCHES_ALL)
+                regex.containsMatchIn(value)
+            }
         } catch (e: Throwable) {
             // e.g PatternSyntaxException
             Timber.e(e, "Failed to evaluate push condition")
-            return false
+            false
         }
     }
 
@@ -78,27 +87,4 @@ class EventMatchCondition(
         }
         return null
     }
-
-    companion object {
-
-        private fun hasSpecialGlobChar(glob: String): Boolean {
-            return glob.contains("*") || glob.contains("?")
-        }
-
-        // Very simple glob to regexp converter
-        private fun simpleGlobToRegExp(glob: String): String {
-            var out = "" // "^"
-            for (element in glob) {
-                when (element) {
-                    '*'  -> out += ".*"
-                    '?'  -> out += '.'.toString()
-                    '.'  -> out += "\\."
-                    '\\' -> out += "\\\\"
-                    else -> out += element
-                }
-            }
-            out += "" // '$'.toString()
-            return out
-        }
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt
new file mode 100644
index 0000000000..78f3a8a156
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.pushrules
+
+enum class Kind(val value: String) {
+    EventMatch("event_match"),
+    ContainsDisplayName("contains_display_name"),
+    RoomMemberCount("room_member_count"),
+    SenderNotificationPermission("sender_notification_permission"),
+    Unrecognised("");
+
+    companion object {
+
+        fun fromString(value: String): Kind {
+            return when (value) {
+                "event_match"                    -> EventMatch
+                "contains_display_name"          -> ContainsDisplayName
+                "room_member_count"              -> RoomMemberCount
+                "sender_notification_permission" -> SenderNotificationPermission
+                else                             -> Unrecognised
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
index f97636a7bd..ba36c54fb4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
@@ -29,15 +29,13 @@ class RoomMemberCountCondition(
          * If no prefix is present, this parameter defaults to ==.
          */
         val iz: String
-) : Condition(Kind.RoomMemberCount) {
+) : Condition {
 
     override fun isSatisfied(event: Event, conditionResolver: ConditionResolver): Boolean {
         return conditionResolver.resolveRoomMemberCountCondition(event, this)
     }
 
-    override fun technicalDescription(): String {
-        return "Room member count is $iz"
-    }
+    override fun technicalDescription() = "Room member count is $iz"
 
     internal fun isSatisfied(event: Event, roomGetter: RoomGetter): Boolean {
         // sanity checks
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 eeb2577d4c..2353d06252 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
@@ -45,4 +45,6 @@ object RuleIds {
 
     // Not documented
     const val RULE_ID_FALLBACK = ".m.rule.fallback"
+
+    const val RULE_ID_REACTION = ".m.rule.reaction"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
index a8d08e5458..aeb2f01c80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
@@ -28,15 +28,13 @@ class SenderNotificationPermissionCondition(
          * type from the notifications object in the power level event content.
          */
         val key: String
-) : Condition(Kind.SenderNotificationPermission) {
+) : Condition {
 
     override fun isSatisfied(event: Event, conditionResolver: ConditionResolver): Boolean {
         return conditionResolver.resolveSenderNotificationPermissionCondition(event, this)
     }
 
-    override fun technicalDescription(): String {
-        return "User power level <$key>"
-    }
+    override fun technicalDescription() = "User power level <$key>"
 
     fun isSatisfied(event: Event, powerLevels: PowerLevelsContent): Boolean {
         val powerLevelsHelper = PowerLevelsHelper(powerLevels)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
index 9469da3ea5..29466ca33b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
@@ -21,7 +21,9 @@ import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.pushrules.Condition
 import org.matrix.android.sdk.api.pushrules.ContainsDisplayNameCondition
 import org.matrix.android.sdk.api.pushrules.EventMatchCondition
+import org.matrix.android.sdk.api.pushrules.Kind
 import org.matrix.android.sdk.api.pushrules.RoomMemberCountCondition
+import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
 import timber.log.Timber
 
@@ -58,20 +60,20 @@ data class PushCondition(
         val iz: String? = null
 ) {
 
-    fun asExecutableCondition(): Condition? {
-        return when (Condition.Kind.fromString(kind)) {
-            Condition.Kind.EventMatch                   -> {
+    fun asExecutableCondition(rule: PushRule): Condition? {
+        return when (Kind.fromString(kind)) {
+            Kind.EventMatch                   -> {
                 if (key != null && pattern != null) {
-                    EventMatchCondition(key, pattern)
+                    EventMatchCondition(key, pattern, rule.ruleId == RuleIds.RULE_ID_CONTAIN_USER_NAME)
                 } else {
                     Timber.e("Malformed Event match condition")
                     null
                 }
             }
-            Condition.Kind.ContainsDisplayName          -> {
+            Kind.ContainsDisplayName          -> {
                 ContainsDisplayNameCondition()
             }
-            Condition.Kind.RoomMemberCount              -> {
+            Kind.RoomMemberCount              -> {
                 if (iz.isNullOrEmpty()) {
                     Timber.e("Malformed ROOM_MEMBER_COUNT condition")
                     null
@@ -79,7 +81,7 @@ data class PushCondition(
                     RoomMemberCountCondition(iz)
                 }
             }
-            Condition.Kind.SenderNotificationPermission -> {
+            Kind.SenderNotificationPermission -> {
                 if (key == null) {
                     Timber.e("Malformed Sender Notification Permission condition")
                     null
@@ -87,7 +89,7 @@ data class PushCondition(
                     SenderNotificationPermissionCondition(key)
                 }
             }
-            Condition.Kind.Unrecognised                 -> {
+            Kind.Unrecognised                 -> {
                 Timber.e("Unknown kind $kind")
                 null
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
index 46d73a8aa2..bdb4f2cf29 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
@@ -63,7 +63,7 @@ data class PushRule(
      * Add the default notification sound.
      */
     fun setNotificationSound(): PushRule {
-        return setNotificationSound(ACTION_VALUE_DEFAULT)
+        return setNotificationSound(Action.ACTION_OBJECT_VALUE_VALUE_DEFAULT)
     }
 
     fun getNotificationSound(): String? {
@@ -109,13 +109,13 @@ data class PushRule(
     fun setNotify(notify: Boolean): PushRule {
         val mutableActions = actions.toMutableList()
 
-        mutableActions.remove(ACTION_DONT_NOTIFY)
-        mutableActions.remove(ACTION_NOTIFY)
+        mutableActions.remove(Action.ACTION_DONT_NOTIFY)
+        mutableActions.remove(Action.ACTION_NOTIFY)
 
         if (notify) {
-            mutableActions.add(ACTION_NOTIFY)
+            mutableActions.add(Action.ACTION_NOTIFY)
         } else {
-            mutableActions.add(ACTION_DONT_NOTIFY)
+            mutableActions.add(Action.ACTION_DONT_NOTIFY)
         }
 
         return copy(actions = mutableActions)
@@ -126,51 +126,12 @@ data class PushRule(
      *
      * @return true if the rule should play sound
      */
-    fun shouldNotify() = actions.contains(ACTION_NOTIFY)
+    fun shouldNotify() = actions.contains(Action.ACTION_NOTIFY)
 
     /**
      * Return true if the rule should not highlight the event.
      *
      * @return true if the rule should not play sound
      */
-    fun shouldNotNotify() = actions.contains(ACTION_DONT_NOTIFY)
-
-    companion object {
-        /* ==========================================================================================
-         * Rule id
-         * ========================================================================================== */
-
-        const val RULE_ID_DISABLE_ALL = ".m.rule.master"
-        const val RULE_ID_CONTAIN_USER_NAME = ".m.rule.contains_user_name"
-        const val RULE_ID_CONTAIN_DISPLAY_NAME = ".m.rule.contains_display_name"
-        const val RULE_ID_ONE_TO_ONE_ROOM = ".m.rule.room_one_to_one"
-        const val RULE_ID_INVITE_ME = ".m.rule.invite_for_me"
-        const val RULE_ID_PEOPLE_JOIN_LEAVE = ".m.rule.member_event"
-        const val RULE_ID_CALL = ".m.rule.call"
-        const val RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS = ".m.rule.suppress_notices"
-        const val RULE_ID_ALL_OTHER_MESSAGES_ROOMS = ".m.rule.message"
-        const val RULE_ID_AT_ROOMS = ".m.rule.roomnotif"
-        const val RULE_ID_TOMBSTONE = ".m.rule.tombstone"
-        const val RULE_ID_E2E_ONE_TO_ONE_ROOM = ".m.rule.encrypted_room_one_to_one"
-        const val RULE_ID_E2E_GROUP = ".m.rule.encrypted"
-        const val RULE_ID_REACTION = ".m.rule.reaction"
-        const val RULE_ID_FALLBACK = ".m.rule.fallback"
-
-        /* ==========================================================================================
-         * Actions
-         * ========================================================================================== */
-
-        const val ACTION_NOTIFY = "notify"
-        const val ACTION_DONT_NOTIFY = "dont_notify"
-        const val ACTION_COALESCE = "coalesce"
-
-        const val ACTION_SET_TWEAK_SOUND_VALUE = "sound"
-        const val ACTION_SET_TWEAK_HIGHLIGHT_VALUE = "highlight"
-
-        const val ACTION_PARAMETER_SET_TWEAK = "set_tweak"
-        const val ACTION_PARAMETER_VALUE = "value"
-
-        const val ACTION_VALUE_DEFAULT = "default"
-        const val ACTION_VALUE_RING = "ring"
-    }
+    fun shouldNotNotify() = actions.contains(Action.ACTION_DONT_NOTIFY)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
index eb813dba45..a8708819f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.api.pushrules.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.pushrules.RuleSetKey
 
 /**
@@ -51,7 +52,7 @@ data class RuleSet(
         var result: PushRuleAndKind? = null
         // sanity check
         if (null != ruleId) {
-            if (PushRule.RULE_ID_CONTAIN_USER_NAME == ruleId) {
+            if (RuleIds.RULE_ID_CONTAIN_USER_NAME == ruleId) {
                 result = findRule(content, ruleId)?.let { PushRuleAndKind(it, RuleSetKey.CONTENT) }
             } else {
                 // assume that the ruleId is unique.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
index 2962f9fac3..382ab54248 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
@@ -34,4 +34,6 @@ interface CallSignalingService {
     fun removeCallListener(listener: CallsListener)
 
     fun getCallWithId(callId: String) : MxCall?
+
+    fun isThereAnyActiveCall(): Boolean
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
index a29e7110e2..a216770939 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
@@ -33,7 +33,7 @@ interface ContentUploadStateTracker {
         object Idle : State()
         object EncryptingThumbnail : State()
         data class UploadingThumbnail(val current: Long, val total: Long) : State()
-        object Encrypting : State()
+        data class Encrypting(val current: Long, val total: Long) : State()
         data class Uploading(val current: Long, val total: Long) : State()
         object Success : State()
         data class Failure(val throwable: Throwable) : State()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index fdd3e66703..1068b92019 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -239,6 +239,14 @@ fun Event.isVideoMessage(): Boolean {
     }
 }
 
+fun Event.isAudioMessage(): Boolean {
+    return getClearType() == EventType.MESSAGE
+            && when (getClearContent()?.toModel<MessageContent>()?.msgType) {
+        MessageType.MSGTYPE_AUDIO -> true
+        else                      -> false
+    }
+}
+
 fun Event.isFileMessage(): Boolean {
     return getClearType() == EventType.MESSAGE
             && when (getClearContent()?.toModel<MessageContent>()?.msgType) {
@@ -246,6 +254,16 @@ fun Event.isFileMessage(): Boolean {
         else                     -> false
     }
 }
+fun Event.isAttachmentMessage(): Boolean {
+    return getClearType() == EventType.MESSAGE
+            && when (getClearContent()?.toModel<MessageContent>()?.msgType) {
+        MessageType.MSGTYPE_IMAGE,
+        MessageType.MSGTYPE_AUDIO,
+        MessageType.MSGTYPE_VIDEO,
+        MessageType.MSGTYPE_FILE -> true
+        else                     -> false
+    }
+}
 
 fun Event.getRelationContent(): RelationDefaultContent? {
     return if (isEncrypted()) {
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 85632d6e83..1da65b3002 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
@@ -25,7 +25,12 @@ import android.net.Uri
  */
 sealed class PermalinkData {
 
-    data class RoomLink(val roomIdOrAlias: String, val isRoomAlias: Boolean, val eventId: String?) : PermalinkData()
+    data class RoomLink(
+            val roomIdOrAlias: String,
+            val isRoomAlias: Boolean,
+            val eventId: String?,
+            val viaParameters: List<String>
+    ) : PermalinkData()
 
     data class UserLink(val userId: 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 dd6847f1e3..59e289ffd7 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
@@ -18,6 +18,7 @@
 package org.matrix.android.sdk.api.session.permalinks
 
 import android.net.Uri
+import android.net.UrlQuerySanitizer
 import org.matrix.android.sdk.api.MatrixPatterns
 
 /**
@@ -40,14 +41,13 @@ object PermalinkParser {
         if (!uri.toString().startsWith(PermalinkService.MATRIX_TO_URL_BASE)) {
             return PermalinkData.FallbackLink(uri)
         }
-
         val fragment = uri.fragment
         if (fragment.isNullOrEmpty()) {
             return PermalinkData.FallbackLink(uri)
         }
-
         val indexOfQuery = fragment.indexOf("?")
         val safeFragment = if (indexOfQuery != -1) fragment.substring(0, indexOfQuery) else fragment
+        val viaQueryParameters = fragment.getViaParameters()
 
         // we are limiting to 2 params
         val params = safeFragment
@@ -65,17 +65,29 @@ object PermalinkParser {
                 PermalinkData.RoomLink(
                         roomIdOrAlias = identifier,
                         isRoomAlias = false,
-                        eventId = extraParameter.takeIf { !it.isNullOrEmpty() && MatrixPatterns.isEventId(it) }
+                        eventId = extraParameter.takeIf { !it.isNullOrEmpty() && MatrixPatterns.isEventId(it) },
+                        viaParameters = viaQueryParameters
                 )
             }
             MatrixPatterns.isRoomAlias(identifier) -> {
                 PermalinkData.RoomLink(
                         roomIdOrAlias = identifier,
                         isRoomAlias = true,
-                        eventId = extraParameter.takeIf { !it.isNullOrEmpty() && MatrixPatterns.isEventId(it) }
+                        eventId = extraParameter.takeIf { !it.isNullOrEmpty() && MatrixPatterns.isEventId(it) },
+                        viaParameters = viaQueryParameters
                 )
             }
             else                                   -> PermalinkData.FallbackLink(uri)
         }
     }
+
+    private fun String.getViaParameters(): List<String> {
+        return UrlQuerySanitizer(this)
+                .parameterList
+                .filter {
+                    it.mParameter == "via"
+                }.map {
+                    it.mValue
+                }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index 449c670983..15066cc4a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -83,4 +83,43 @@ interface ProfileService {
      * @param refreshData set to true to fetch data from the homeserver
      */
     fun getThreePidsLive(refreshData: Boolean): LiveData<List<ThreePid>>
+
+    /**
+     * Get the pending 3Pids, i.e. ThreePids that have requested a token, but not yet validated by the user.
+     */
+    fun getPendingThreePids(): List<ThreePid>
+
+    /**
+     * Get the pending 3Pids Live
+     */
+    fun getPendingThreePidsLive(): LiveData<List<ThreePid>>
+
+    /**
+     * Add a 3Pids. This is the first step to add a ThreePid to an account. Then the threePid will be added to the pending threePid list.
+     */
+    fun addThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable
+
+    /**
+     * Validate a code received by text message
+     */
+    fun submitSmsCode(threePid: ThreePid.Msisdn, code: String, matrixCallback: MatrixCallback<Unit>): Cancelable
+
+    /**
+     * Finalize adding a 3Pids. Call this method once the user has validated that he owns the ThreePid
+     */
+    fun finalizeAddingThreePid(threePid: ThreePid,
+                               uiaSession: String?,
+                               accountPassword: String?,
+                               matrixCallback: MatrixCallback<Unit>): Cancelable
+
+    /**
+     * Cancel adding a threepid. It will remove locally stored data about this ThreePid
+     */
+    fun cancelAddingThreePid(threePid: ThreePid,
+                             matrixCallback: MatrixCallback<Unit>): Cancelable
+
+    /**
+     * Remove a 3Pid from the Matrix account.
+     */
+    fun deleteThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
index e84b75d0af..b8e536cb33 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
@@ -110,13 +110,13 @@ interface SendService {
      * Schedule this message to be resent
      * @param localEcho the unsent local echo
      */
-    fun resendTextMessage(localEcho: TimelineEvent): Cancelable?
+    fun resendTextMessage(localEcho: TimelineEvent): Cancelable
 
     /**
      * Schedule this message to be resent
      * @param localEcho the unsent local echo
      */
-    fun resendMediaMessage(localEcho: TimelineEvent): Cancelable?
+    fun resendMediaMessage(localEcho: TimelineEvent): Cancelable
 
     /**
      * Remove this failed message from the timeline
@@ -124,8 +124,16 @@ interface SendService {
      */
     fun deleteFailedEcho(localEcho: TimelineEvent)
 
+    /**
+     * Delete all the events in one of the sending states
+     */
     fun clearSendingQueue()
 
+    /**
+     * Cancel sending a specific event. It has to be in one of the sending states
+     */
+    fun cancelSend(eventId: String)
+
     /**
      * Resend all failed messages one by one (and keep order)
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
index f0dd2f3025..be8849b20e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
@@ -37,7 +37,8 @@ enum class SendState {
     internal companion object {
         val HAS_FAILED_STATES = listOf(UNDELIVERED, FAILED_UNKNOWN_DEVICES)
         val IS_SENT_STATES = listOf(SENT, SYNCED)
-        val IS_SENDING_STATES = listOf(UNSENT, ENCRYPTING, SENDING)
+        val IS_PROGRESSING_STATES = listOf(ENCRYPTING, SENDING)
+        val IS_SENDING_STATES = IS_PROGRESSING_STATES + UNSENT
         val PENDING_STATES = IS_SENDING_STATES + HAS_FAILED_STATES
     }
 
@@ -45,5 +46,7 @@ enum class SendState {
 
     fun hasFailed() = HAS_FAILED_STATES.contains(this)
 
+    fun isInProgress() = IS_PROGRESSING_STATES.contains(this)
+
     fun isSending() = IS_SENDING_STATES.contains(this)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt
index 7fbdaacb81..3e6e3054b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt
@@ -54,7 +54,7 @@ internal data class AddThreePidRegistrationParams(
          * This parameter is ignored when the homeserver handles 3PID verification.
          */
         @Json(name = "id_server")
-        val id_server: String? = null,
+        val idServer: String? = null,
 
         /* ==========================================================================================
          * For emails
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 79b71b208e..676f40a918 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -17,6 +17,9 @@
 
 package org.matrix.android.sdk.internal.auth.registration
 
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
+import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
@@ -33,9 +36,6 @@ import org.matrix.android.sdk.internal.auth.db.PendingSessionData
 import org.matrix.android.sdk.internal.network.RetrofitFactory
 import org.matrix.android.sdk.internal.task.launchToCallback
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
-import okhttp3.OkHttpClient
 
 /**
  * This class execute the registration request and is responsible to keep the session of interactive authentication
@@ -193,7 +193,7 @@ internal class DefaultRegistrationWizard(
         val registrationParams = pendingSessionData.currentThreePidData?.registrationParams
                 ?: throw IllegalStateException("developer error, no pending three pid")
         val safeCurrentData = pendingSessionData.currentThreePidData ?: throw IllegalStateException("developer error, call createAccount() method first")
-        val url = safeCurrentData.addThreePidRegistrationResponse.submitUrl ?: throw IllegalStateException("Missing url the send the code")
+        val url = safeCurrentData.addThreePidRegistrationResponse.submitUrl ?: throw IllegalStateException("Missing url to send the code")
         val validationBody = ValidationCodeBody(
                 clientSecret = pendingSessionData.clientSecret,
                 sid = safeCurrentData.addThreePidRegistrationResponse.sid,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
index 4089e280d7..ca475566f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
@@ -44,5 +44,6 @@ internal data class RegistrationParams(
 
         // Temporary flag to notify the server that we support msisdn flow. Used to prevent old app
         // versions to end up in fallback because the HS returns the msisdn flow which they don't support
-        val x_show_msisdn: Boolean? = null
+        @Json(name = "x_show_msisdn")
+        val xShowMsisdn: Boolean? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
index 4526ba8a51..85ecc540cd 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
@@ -145,7 +145,7 @@ object MXMegolmExportEncryption {
      */
     @Throws(Exception::class)
     @JvmOverloads
-    fun encryptMegolmKeyFile(data: String, password: String, kdf_rounds: Int = DEFAULT_ITERATION_COUNT): ByteArray {
+    fun encryptMegolmKeyFile(data: String, password: String, kdfRounds: Int = DEFAULT_ITERATION_COUNT): ByteArray {
         if (password.isEmpty()) {
             throw Exception("Empty password is not supported")
         }
@@ -163,7 +163,7 @@ object MXMegolmExportEncryption {
         // of a single bit of salt is a price we have to pay.
         iv[9] = iv[9] and 0x7f
 
-        val deriveKey = deriveKeys(salt, kdf_rounds, password)
+        val deriveKey = deriveKeys(salt, kdfRounds, password)
 
         val decryptCipher = Cipher.getInstance("AES/CTR/NoPadding")
 
@@ -188,10 +188,10 @@ object MXMegolmExportEncryption {
         System.arraycopy(iv, 0, resultBuffer, idx, iv.size)
         idx += iv.size
 
-        resultBuffer[idx++] = (kdf_rounds shr 24 and 0xff).toByte()
-        resultBuffer[idx++] = (kdf_rounds shr 16 and 0xff).toByte()
-        resultBuffer[idx++] = (kdf_rounds shr 8 and 0xff).toByte()
-        resultBuffer[idx++] = (kdf_rounds and 0xff).toByte()
+        resultBuffer[idx++] = (kdfRounds shr 24 and 0xff).toByte()
+        resultBuffer[idx++] = (kdfRounds shr 16 and 0xff).toByte()
+        resultBuffer[idx++] = (kdfRounds shr 8 and 0xff).toByte()
+        resultBuffer[idx++] = (kdfRounds and 0xff).toByte()
 
         System.arraycopy(cipherArray, 0, resultBuffer, idx, cipherArray.size)
         idx += cipherArray.size
@@ -320,26 +320,26 @@ object MXMegolmExportEncryption {
 
         // 512 bits key length
         val key = ByteArray(64)
-        val Uc = ByteArray(64)
+        val uc = ByteArray(64)
 
         // U1 = PRF(Password, Salt || INT_32_BE(i))
         prf.update(salt)
         val int32BE = ByteArray(4) { 0.toByte() }
         int32BE[3] = 1.toByte()
         prf.update(int32BE)
-        prf.doFinal(Uc, 0)
+        prf.doFinal(uc, 0)
 
         // copy to the key
-        System.arraycopy(Uc, 0, key, 0, Uc.size)
+        System.arraycopy(uc, 0, key, 0, uc.size)
 
         for (index in 2..iterations) {
             // Uc = PRF(Password, Uc-1)
-            prf.update(Uc)
-            prf.doFinal(Uc, 0)
+            prf.update(uc)
+            prf.doFinal(uc, 0)
 
             // F(Password, Salt, c, i) = U1 ^ U2 ^ ... ^ Uc
-            for (byteIndex in Uc.indices) {
-                key[byteIndex] = key[byteIndex] xor Uc[byteIndex]
+            for (byteIndex in uc.indices) {
+                key[byteIndex] = key[byteIndex] xor uc[byteIndex]
             }
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
index d4295e2cec..a4e3ee950d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
@@ -102,7 +102,7 @@ internal class MXOlmDecryption(
                     String.format(MXCryptoError.BAD_RECIPIENT_REASON, olmPayloadContent.recipient))
         }
 
-        val recipientKeys = olmPayloadContent.recipient_keys ?: run {
+        val recipientKeys = olmPayloadContent.recipientKeys ?: run {
             Timber.e("## decryptEvent() : Olm event (id=${event.eventId}) contains no 'recipient_keys'" +
                     " property; cannot prevent unknown-key attack")
             throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
@@ -129,10 +129,10 @@ internal class MXOlmDecryption(
                     String.format(MXCryptoError.FORWARDED_MESSAGE_REASON, olmPayloadContent.sender))
         }
 
-        if (olmPayloadContent.room_id != event.roomId) {
-            Timber.e("## decryptEvent() : Event ${event.eventId}: original room ${olmPayloadContent.room_id} does not match reported room ${event.roomId}")
+        if (olmPayloadContent.roomId != event.roomId) {
+            Timber.e("## decryptEvent() : Event ${event.eventId}: original room ${olmPayloadContent.roomId} does not match reported room ${event.roomId}")
             throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ROOM,
-                    String.format(MXCryptoError.BAD_ROOM_REASON, olmPayloadContent.room_id))
+                    String.format(MXCryptoError.BAD_ROOM_REASON, olmPayloadContent.roomId))
         }
 
         val keys = olmPayloadContent.keys ?: run {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
index cec1480d7b..11d5b4796a 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
@@ -20,10 +20,14 @@ package org.matrix.android.sdk.internal.crypto.attachments
 import android.util.Base64
 import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileKey
+import org.matrix.android.sdk.internal.util.base64ToBase64Url
+import org.matrix.android.sdk.internal.util.base64ToUnpaddedBase64
+import org.matrix.android.sdk.internal.util.base64UrlToBase64
 import timber.log.Timber
-import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
+import java.io.File
 import java.io.InputStream
+import java.io.OutputStream
 import java.security.MessageDigest
 import java.security.SecureRandom
 import javax.crypto.Cipher
@@ -36,8 +40,121 @@ internal object MXEncryptedAttachments {
     private const val SECRET_KEY_SPEC_ALGORITHM = "AES"
     private const val MESSAGE_DIGEST_ALGORITHM = "SHA-256"
 
+    fun encrypt(clearStream: InputStream, mimetype: String?, outputFile: File, progress: ((current: Int, total: Int) -> Unit)): EncryptedFileInfo {
+        val t0 = System.currentTimeMillis()
+        val secureRandom = SecureRandom()
+        val initVectorBytes = ByteArray(16) { 0.toByte() }
+
+        val ivRandomPart = ByteArray(8)
+        secureRandom.nextBytes(ivRandomPart)
+
+        System.arraycopy(ivRandomPart, 0, initVectorBytes, 0, ivRandomPart.size)
+
+        val key = ByteArray(32)
+        secureRandom.nextBytes(key)
+
+        val messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM)
+
+        outputFile.outputStream().use { outputStream ->
+            val encryptCipher = Cipher.getInstance(CIPHER_ALGORITHM)
+            val secretKeySpec = SecretKeySpec(key, SECRET_KEY_SPEC_ALGORITHM)
+            val ivParameterSpec = IvParameterSpec(initVectorBytes)
+            encryptCipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec)
+
+            val data = ByteArray(CRYPTO_BUFFER_SIZE)
+            var read: Int
+            var encodedBytes: ByteArray
+            clearStream.use { inputStream ->
+                val estimatedSize = inputStream.available()
+                progress.invoke(0, estimatedSize)
+                read = inputStream.read(data)
+                var totalRead = read
+                while (read != -1) {
+                    progress.invoke(totalRead, estimatedSize)
+                    encodedBytes = encryptCipher.update(data, 0, read)
+                    messageDigest.update(encodedBytes, 0, encodedBytes.size)
+                    outputStream.write(encodedBytes)
+                    read = inputStream.read(data)
+                    totalRead += read
+                }
+            }
+
+            // encrypt the latest chunk
+            encodedBytes = encryptCipher.doFinal()
+            messageDigest.update(encodedBytes, 0, encodedBytes.size)
+            outputStream.write(encodedBytes)
+        }
+
+        return EncryptedFileInfo(
+                url = null,
+                mimetype = mimetype,
+                key = EncryptedFileKey(
+                        alg = "A256CTR",
+                        ext = true,
+                        keyOps = listOf("encrypt", "decrypt"),
+                        kty = "oct",
+                        k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT))
+                ),
+                iv = Base64.encodeToString(initVectorBytes, Base64.DEFAULT).replace("\n", "").replace("=", ""),
+                hashes = mapOf("sha256" to base64ToUnpaddedBase64(Base64.encodeToString(messageDigest.digest(), Base64.DEFAULT))),
+                v = "v2"
+        )
+                .also { Timber.v("Encrypt in ${System.currentTimeMillis() - t0}ms") }
+    }
+
+//    fun cipherInputStream(attachmentStream: InputStream, mimetype: String?): Pair<DigestInputStream, EncryptedFileInfo> {
+//        val secureRandom = SecureRandom()
+//
+//        // generate a random iv key
+//        // Half of the IV is random, the lower order bits are zeroed
+//        // such that the counter never wraps.
+//        // See https://github.com/matrix-org/matrix-ios-kit/blob/3dc0d8e46b4deb6669ed44f72ad79be56471354c/MatrixKit/Models/Room/MXEncryptedAttachments.m#L75
+//        val initVectorBytes = ByteArray(16) { 0.toByte() }
+//
+//        val ivRandomPart = ByteArray(8)
+//        secureRandom.nextBytes(ivRandomPart)
+//
+//        System.arraycopy(ivRandomPart, 0, initVectorBytes, 0, ivRandomPart.size)
+//
+//        val key = ByteArray(32)
+//        secureRandom.nextBytes(key)
+//
+//        val encryptCipher = Cipher.getInstance(CIPHER_ALGORITHM)
+//        val secretKeySpec = SecretKeySpec(key, SECRET_KEY_SPEC_ALGORITHM)
+//        val ivParameterSpec = IvParameterSpec(initVectorBytes)
+//        encryptCipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec)
+//
+//        val cipherInputStream = CipherInputStream(attachmentStream, encryptCipher)
+//
+//        // Could it be possible to get the digest on the fly instead of
+//        val info = EncryptedFileInfo(
+//                url = null,
+//                mimetype = mimetype,
+//                key = EncryptedFileKey(
+//                        alg = "A256CTR",
+//                        ext = true,
+//                        key_ops = listOf("encrypt", "decrypt"),
+//                        kty = "oct",
+//                        k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT))
+//                ),
+//                iv = Base64.encodeToString(initVectorBytes, Base64.DEFAULT).replace("\n", "").replace("=", ""),
+//                //hashes = mapOf("sha256" to base64ToUnpaddedBase64(Base64.encodeToString(messageDigest.digest(), Base64.DEFAULT))),
+//                v = "v2"
+//        )
+//
+//        val messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM)
+//        return DigestInputStream(cipherInputStream, messageDigest) to info
+//    }
+//
+//    fun updateInfoWithDigest(digestInputStream: DigestInputStream, info: EncryptedFileInfo): EncryptedFileInfo {
+//        return info.copy(
+//                hashes = mapOf("sha256" to base64ToUnpaddedBase64(Base64.encodeToString(digestInputStream.messageDigest.digest(), Base64.DEFAULT)))
+//        )
+//    }
+
     /***
      * Encrypt an attachment stream.
+     * DO NOT USE for big files, it will load all in memory
      * @param attachmentStream the attachment stream. Will be closed after this method call.
      * @param mimetype the mime type
      * @return the encryption file info
@@ -60,14 +177,14 @@ internal object MXEncryptedAttachments {
         val key = ByteArray(32)
         secureRandom.nextBytes(key)
 
-        ByteArrayOutputStream().use { outputStream ->
+        val messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM)
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        byteArrayOutputStream.use { outputStream ->
             val encryptCipher = Cipher.getInstance(CIPHER_ALGORITHM)
             val secretKeySpec = SecretKeySpec(key, SECRET_KEY_SPEC_ALGORITHM)
             val ivParameterSpec = IvParameterSpec(initVectorBytes)
             encryptCipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec)
 
-            val messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM)
-
             val data = ByteArray(CRYPTO_BUFFER_SIZE)
             var read: Int
             var encodedBytes: ByteArray
@@ -86,44 +203,26 @@ internal object MXEncryptedAttachments {
             encodedBytes = encryptCipher.doFinal()
             messageDigest.update(encodedBytes, 0, encodedBytes.size)
             outputStream.write(encodedBytes)
-
-            return EncryptionResult(
-                    encryptedFileInfo = EncryptedFileInfo(
-                            url = null,
-                            mimetype = mimetype,
-                            key = EncryptedFileKey(
-                                    alg = "A256CTR",
-                                    ext = true,
-                                    key_ops = listOf("encrypt", "decrypt"),
-                                    kty = "oct",
-                                    k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT))
-                            ),
-                            iv = Base64.encodeToString(initVectorBytes, Base64.DEFAULT).replace("\n", "").replace("=", ""),
-                            hashes = mapOf("sha256" to base64ToUnpaddedBase64(Base64.encodeToString(messageDigest.digest(), Base64.DEFAULT))),
-                            v = "v2"
-                    ),
-                    encryptedByteArray = outputStream.toByteArray()
-            )
-                    .also { Timber.v("Encrypt in ${System.currentTimeMillis() - t0}ms") }
-        }
-    }
-
-    /**
-     * Decrypt an attachment
-     *
-     * @param attachmentStream  the attachment stream. Will be closed after this method call.
-     * @param encryptedFileInfo the encryption file info
-     * @return the decrypted attachment stream
-     */
-    fun decryptAttachment(attachmentStream: InputStream?, encryptedFileInfo: EncryptedFileInfo?): InputStream? {
-        if (encryptedFileInfo?.isValid() != true) {
-            Timber.e("## decryptAttachment() : some fields are not defined, or invalid key fields")
-            return null
         }
 
-        val elementToDecrypt = encryptedFileInfo.toElementToDecrypt()
-
-        return decryptAttachment(attachmentStream, elementToDecrypt)
+        return EncryptionResult(
+                encryptedFileInfo = EncryptedFileInfo(
+                        url = null,
+                        mimetype = mimetype,
+                        key = EncryptedFileKey(
+                                alg = "A256CTR",
+                                ext = true,
+                                keyOps = listOf("encrypt", "decrypt"),
+                                kty = "oct",
+                                k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT))
+                        ),
+                        iv = Base64.encodeToString(initVectorBytes, Base64.DEFAULT).replace("\n", "").replace("=", ""),
+                        hashes = mapOf("sha256" to base64ToUnpaddedBase64(Base64.encodeToString(messageDigest.digest(), Base64.DEFAULT))),
+                        v = "v2"
+                ),
+                encryptedByteArray = byteArrayOutputStream.toByteArray()
+        )
+                .also { Timber.v("Encrypt in ${System.currentTimeMillis() - t0}ms") }
     }
 
     /**
@@ -131,84 +230,61 @@ internal object MXEncryptedAttachments {
      *
      * @param attachmentStream the attachment stream. Will be closed after this method call.
      * @param elementToDecrypt the elementToDecrypt info
-     * @return the decrypted attachment stream
+     * @param outputStream     the outputStream where the decrypted attachment will be write.
+     * @return true in case of success, false in case of error
      */
-    fun decryptAttachment(attachmentStream: InputStream?, elementToDecrypt: ElementToDecrypt?): InputStream? {
+    fun decryptAttachment(attachmentStream: InputStream?, elementToDecrypt: ElementToDecrypt?, outputStream: OutputStream): Boolean {
         // sanity checks
         if (null == attachmentStream || elementToDecrypt == null) {
             Timber.e("## decryptAttachment() : null stream")
-            return null
+            return false
         }
 
         val t0 = System.currentTimeMillis()
 
-        ByteArrayOutputStream().use { outputStream ->
-            try {
-                val key = Base64.decode(base64UrlToBase64(elementToDecrypt.k), Base64.DEFAULT)
-                val initVectorBytes = Base64.decode(elementToDecrypt.iv, Base64.DEFAULT)
+        try {
+            val key = Base64.decode(base64UrlToBase64(elementToDecrypt.k), Base64.DEFAULT)
+            val initVectorBytes = Base64.decode(elementToDecrypt.iv, Base64.DEFAULT)
 
-                val decryptCipher = Cipher.getInstance(CIPHER_ALGORITHM)
-                val secretKeySpec = SecretKeySpec(key, SECRET_KEY_SPEC_ALGORITHM)
-                val ivParameterSpec = IvParameterSpec(initVectorBytes)
-                decryptCipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec)
+            val decryptCipher = Cipher.getInstance(CIPHER_ALGORITHM)
+            val secretKeySpec = SecretKeySpec(key, SECRET_KEY_SPEC_ALGORITHM)
+            val ivParameterSpec = IvParameterSpec(initVectorBytes)
+            decryptCipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec)
 
-                val messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM)
+            val messageDigest = MessageDigest.getInstance(MESSAGE_DIGEST_ALGORITHM)
 
-                var read: Int
-                val data = ByteArray(CRYPTO_BUFFER_SIZE)
-                var decodedBytes: ByteArray
+            var read: Int
+            val data = ByteArray(CRYPTO_BUFFER_SIZE)
+            var decodedBytes: ByteArray
 
-                attachmentStream.use { inputStream ->
+            attachmentStream.use { inputStream ->
+                read = inputStream.read(data)
+                while (read != -1) {
+                    messageDigest.update(data, 0, read)
+                    decodedBytes = decryptCipher.update(data, 0, read)
+                    outputStream.write(decodedBytes)
                     read = inputStream.read(data)
-                    while (read != -1) {
-                        messageDigest.update(data, 0, read)
-                        decodedBytes = decryptCipher.update(data, 0, read)
-                        outputStream.write(decodedBytes)
-                        read = inputStream.read(data)
-                    }
                 }
-
-                // decrypt the last chunk
-                decodedBytes = decryptCipher.doFinal()
-                outputStream.write(decodedBytes)
-
-                val currentDigestValue = base64ToUnpaddedBase64(Base64.encodeToString(messageDigest.digest(), Base64.DEFAULT))
-
-                if (elementToDecrypt.sha256 != currentDigestValue) {
-                    Timber.e("## decryptAttachment() :  Digest value mismatch")
-                    return null
-                }
-
-                return ByteArrayInputStream(outputStream.toByteArray())
-                        .also { Timber.v("Decrypt in ${System.currentTimeMillis() - t0}ms") }
-            } catch (oom: OutOfMemoryError) {
-                Timber.e(oom, "## decryptAttachment() failed: OOM")
-            } catch (e: Exception) {
-                Timber.e(e, "## decryptAttachment() failed")
             }
+
+            // decrypt the last chunk
+            decodedBytes = decryptCipher.doFinal()
+            outputStream.write(decodedBytes)
+
+            val currentDigestValue = base64ToUnpaddedBase64(Base64.encodeToString(messageDigest.digest(), Base64.DEFAULT))
+
+            if (elementToDecrypt.sha256 != currentDigestValue) {
+                Timber.e("## decryptAttachment() :  Digest value mismatch")
+                return false
+            }
+
+            return true.also { Timber.v("Decrypt in ${System.currentTimeMillis() - t0}ms") }
+        } catch (oom: OutOfMemoryError) {
+            Timber.e(oom, "## decryptAttachment() failed: OOM")
+        } catch (e: Exception) {
+            Timber.e(e, "## decryptAttachment() failed")
         }
 
-        return null
-    }
-
-    /**
-     * Base64 URL conversion methods
-     */
-
-    private fun base64UrlToBase64(base64Url: String): String {
-        return base64Url.replace('-', '+')
-                .replace('_', '/')
-    }
-
-    internal fun base64ToBase64Url(base64: String): String {
-        return base64.replace("\n".toRegex(), "")
-                .replace("\\+".toRegex(), "-")
-                .replace('/', '_')
-                .replace("=", "")
-    }
-
-    private fun base64ToUnpaddedBase64(base64: String): String {
-        return base64.replace("\n".toRegex(), "")
-                .replace("=", "")
+        return false
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MatrixDigestCheckInputStream.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MatrixDigestCheckInputStream.kt
new file mode 100644
index 0000000000..7ca5158f64
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MatrixDigestCheckInputStream.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 org.matrix.android.sdk.internal.crypto.attachments
+
+import android.util.Base64
+import org.matrix.android.sdk.internal.util.base64ToUnpaddedBase64
+import java.io.FilterInputStream
+import java.io.IOException
+import java.io.InputStream
+import java.security.MessageDigest
+
+class MatrixDigestCheckInputStream(
+        inputStream: InputStream?,
+        private val expectedDigest: String
+) : FilterInputStream(inputStream) {
+
+    private val digest = MessageDigest.getInstance("SHA-256")
+
+    @Throws(IOException::class)
+    override fun read(): Int {
+        val b = `in`.read()
+        if (b >= 0) {
+            digest.update(b.toByte())
+        }
+
+        if (b == -1) {
+            ensureDigest()
+        }
+        return b
+    }
+
+    @Throws(IOException::class)
+    override fun read(
+            b: ByteArray,
+            off: Int,
+            len: Int): Int {
+        val n = `in`.read(b, off, len)
+        if (n > 0) {
+            digest.update(b, off, n)
+        }
+
+        if (n == -1) {
+            ensureDigest()
+        }
+        return n
+    }
+
+    @Throws(IOException::class)
+    private fun ensureDigest() {
+        val currentDigestValue = base64ToUnpaddedBase64(Base64.encodeToString(digest.digest(), Base64.DEFAULT))
+        if (currentDigestValue != expectedDigest) {
+            throw IOException("Bad digest")
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt
index a3a9ee2e51..bf18cad0f4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt
@@ -16,6 +16,7 @@
  */
 package org.matrix.android.sdk.internal.crypto.model.event
 
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.internal.di.MoshiProvider
 
@@ -27,27 +28,32 @@ data class OlmPayloadContent(
         /**
          * The room id
          */
-        var room_id: String? = null,
+        @Json(name = "room_id")
+        val roomId: String? = null,
 
         /**
          * The sender
          */
-        var sender: String? = null,
+        @Json(name = "sender")
+        val sender: String? = null,
 
         /**
          * The recipient
          */
-        var recipient: String? = null,
+        @Json(name = "recipient")
+        val recipient: String? = null,
 
         /**
          * the recipient keys
          */
-        var recipient_keys: Map<String, String>? = null,
+        @Json(name = "recipient_keys")
+        val recipientKeys: Map<String, String>? = null,
 
         /**
          * The keys
          */
-        var keys: Map<String, String>? = null
+        @Json(name = "keys")
+        val keys: Map<String, String>? = null
 ) {
     fun toJsonString(): String {
         return MoshiProvider.providesMoshi().adapter(OlmPayloadContent::class.java).toJson(this)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
index 97c7c59b50..0c6d03613a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
@@ -31,7 +31,7 @@ data class DeviceInfo(
          * The owner user id (not documented and useless but the homeserver sent it. You should not need it)
          */
         @Json(name = "user_id")
-        val user_id: String? = null,
+        val userId: String? = null,
 
         /**
          * The device id
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt
index f0a680cfd3..077fd4451f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt
@@ -37,7 +37,7 @@ data class EncryptedFileKey(
          * Required. Key operations. Must at least contain "encrypt" and "decrypt".
          */
         @Json(name = "key_ops")
-        val key_ops: List<String>? = null,
+        val keyOps: List<String>? = null,
 
         /**
          * Required. Key type. Must be "oct".
@@ -63,7 +63,7 @@ data class EncryptedFileKey(
             return false
         }
 
-        if (key_ops?.contains("encrypt") != true || !key_ops.contains("decrypt")) {
+        if (keyOps?.contains("encrypt") != true || !keyOps.contains("decrypt")) {
             return false
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt
index 978c82303e..67e06b5455 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt
@@ -21,7 +21,6 @@ import android.util.Base64
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.RealmObject
-import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.ObjectOutputStream
 import java.util.zip.GZIPInputStream
@@ -96,7 +95,7 @@ fun <T> deserializeFromRealm(string: String?): T? {
     }
     val decodedB64 = Base64.decode(string.toByteArray(), Base64.DEFAULT)
 
-    val bais = ByteArrayInputStream(decodedB64)
+    val bais = decodedB64.inputStream()
     val gzis = GZIPInputStream(bais)
     val ois = SafeObjectInputStream(gzis)
     return ois.use {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt
index 17538c7cbe..3f811ed7d2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt
@@ -28,7 +28,7 @@ import java.io.ObjectStreamClass
  *
  * Ref: https://stackoverflow.com/questions/3884492/how-can-i-change-package-for-a-bunch-of-java-serializable-classes
  */
-internal class SafeObjectInputStream(`in`: InputStream) : ObjectInputStream(`in`) {
+internal class SafeObjectInputStream(inputStream: InputStream) : ObjectInputStream(inputStream) {
 
     init {
         enableResolveObject(true)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index 7ebd3b51b0..17eb33c886 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -175,8 +175,8 @@ internal abstract class SASDefaultVerificationTransaction(
                 ?.unpaddedBase64PublicKey
                 ?.let { masterPublicKey ->
                     val crossSigningKeyId = "ed25519:$masterPublicKey"
-                    macUsingAgreedMethod(masterPublicKey, baseInfo + crossSigningKeyId)?.let { MSKMacString ->
-                        keyMap[crossSigningKeyId] = MSKMacString
+                    macUsingAgreedMethod(masterPublicKey, baseInfo + crossSigningKeyId)?.let { mskMacString ->
+                        keyMap[crossSigningKeyId] = mskMacString
                     }
                 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt
index 5a55ec2a9c..ae5852452a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt
@@ -55,14 +55,14 @@ internal fun getEmojiForCode(code: Int): EmojiRepresentation {
         31            -> EmojiRepresentation("🤖", R.string.verification_emoji_robot, R.drawable.ic_verification_robot)
         32            -> EmojiRepresentation("🎩", R.string.verification_emoji_hat, R.drawable.ic_verification_hat)
         33            -> EmojiRepresentation("👓", R.string.verification_emoji_glasses, R.drawable.ic_verification_glasses)
-        34            -> EmojiRepresentation("🔧", R.string.verification_emoji_wrench, R.drawable.ic_verification_wrench)
+        34            -> EmojiRepresentation("🔧", R.string.verification_emoji_spanner, R.drawable.ic_verification_spanner)
         35            -> EmojiRepresentation("🎅", R.string.verification_emoji_santa, R.drawable.ic_verification_santa)
-        36            -> EmojiRepresentation("👍", R.string.verification_emoji_thumbsup, R.drawable.ic_verification_thumbs_up)
+        36            -> EmojiRepresentation("👍", R.string.verification_emoji_thumbs_up, R.drawable.ic_verification_thumbs_up)
         37            -> EmojiRepresentation("☂️", R.string.verification_emoji_umbrella, R.drawable.ic_verification_umbrella)
         38            -> EmojiRepresentation("⌛", R.string.verification_emoji_hourglass, R.drawable.ic_verification_hourglass)
         39            -> EmojiRepresentation("⏰", R.string.verification_emoji_clock, R.drawable.ic_verification_clock)
         40            -> EmojiRepresentation("🎁", R.string.verification_emoji_gift, R.drawable.ic_verification_gift)
-        41            -> EmojiRepresentation("💡", R.string.verification_emoji_lightbulb, R.drawable.ic_verification_light_bulb)
+        41            -> EmojiRepresentation("💡", R.string.verification_emoji_light_bulb, R.drawable.ic_verification_light_bulb)
         42            -> EmojiRepresentation("📕", R.string.verification_emoji_book, R.drawable.ic_verification_book)
         43            -> EmojiRepresentation("✏️", R.string.verification_emoji_pencil, R.drawable.ic_verification_pencil)
         44            -> EmojiRepresentation("📎", R.string.verification_emoji_paperclip, R.drawable.ic_verification_paperclip)
@@ -74,7 +74,7 @@ internal fun getEmojiForCode(code: Int): EmojiRepresentation {
         50            -> EmojiRepresentation("🏁", R.string.verification_emoji_flag, R.drawable.ic_verification_flag)
         51            -> EmojiRepresentation("🚂", R.string.verification_emoji_train, R.drawable.ic_verification_train)
         52            -> EmojiRepresentation("🚲", R.string.verification_emoji_bicycle, R.drawable.ic_verification_bicycle)
-        53            -> EmojiRepresentation("✈️", R.string.verification_emoji_airplane, R.drawable.ic_verification_airplane)
+        53            -> EmojiRepresentation("✈️", R.string.verification_emoji_aeroplane, R.drawable.ic_verification_aeroplane)
         54            -> EmojiRepresentation("🚀", R.string.verification_emoji_rocket, R.drawable.ic_verification_rocket)
         55            -> EmojiRepresentation("🏆", R.string.verification_emoji_trophy, R.drawable.ic_verification_trophy)
         56            -> EmojiRepresentation("⚽", R.string.verification_emoji_ball, R.drawable.ic_verification_ball)
@@ -82,7 +82,7 @@ internal fun getEmojiForCode(code: Int): EmojiRepresentation {
         58            -> EmojiRepresentation("🎺", R.string.verification_emoji_trumpet, R.drawable.ic_verification_trumpet)
         59            -> EmojiRepresentation("🔔", R.string.verification_emoji_bell, R.drawable.ic_verification_bell)
         60            -> EmojiRepresentation("⚓", R.string.verification_emoji_anchor, R.drawable.ic_verification_anchor)
-        61            -> EmojiRepresentation("🎧", R.string.verification_emoji_headphone, R.drawable.ic_verification_headphone)
+        61            -> EmojiRepresentation("🎧", R.string.verification_emoji_headphones, R.drawable.ic_verification_headphones)
         62            -> EmojiRepresentation("📁", R.string.verification_emoji_folder, R.drawable.ic_verification_folder)
         /* 63 */ else -> EmojiRepresentation("📌", R.string.verification_emoji_pin, R.drawable.ic_verification_pin)
     }
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 7d2a4ea581..ad05406aa0 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
@@ -20,18 +20,24 @@ package org.matrix.android.sdk.internal.database
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
 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.RoomSummaryEntityFields
 import timber.log.Timber
 import javax.inject.Inject
 
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
+    companion object {
+        const val SESSION_STORE_SCHEMA_VERSION = 4L
+    }
+
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
         Timber.v("Migrating Realm Session from $oldVersion to $newVersion")
 
         if (oldVersion <= 0) migrateTo1(realm)
         if (oldVersion <= 1) migrateTo2(realm)
         if (oldVersion <= 2) migrateTo3(realm)
+        if (oldVersion <= 3) migrateTo4(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -63,4 +69,17 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                     obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0)
                 }
     }
+
+    private fun migrateTo4(realm: DynamicRealm) {
+        Timber.d("Step 3 -> 4")
+        realm.schema.create("PendingThreePidEntity")
+                .addField(PendingThreePidEntityFields.CLIENT_SECRET, String::class.java)
+                .setRequired(PendingThreePidEntityFields.CLIENT_SECRET, true)
+                .addField(PendingThreePidEntityFields.EMAIL, String::class.java)
+                .addField(PendingThreePidEntityFields.MSISDN, String::class.java)
+                .addField(PendingThreePidEntityFields.SEND_ATTEMPT, Int::class.java)
+                .addField(PendingThreePidEntityFields.SID, String::class.java)
+                .setRequired(PendingThreePidEntityFields.SID, true)
+                .addField(PendingThreePidEntityFields.SUBMIT_URL, String::class.java)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 456eecc54a..d5c259050f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -19,13 +19,14 @@ package org.matrix.android.sdk.internal.database
 
 import android.content.Context
 import androidx.core.content.edit
+import io.realm.Realm
+import io.realm.RealmConfiguration
+import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.internal.database.model.SessionRealmModule
 import org.matrix.android.sdk.internal.di.SessionFilesDirectory
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.UserMd5
 import org.matrix.android.sdk.internal.session.SessionModule
-import io.realm.Realm
-import io.realm.RealmConfiguration
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
@@ -46,20 +47,16 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
         val migration: RealmSessionStoreMigration,
         context: Context) {
 
-    companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 3L
-    }
-
     // Keep legacy preferences name for compatibility reason
     private val sharedPreferences = context.getSharedPreferences("im.vector.matrix.android.realm", Context.MODE_PRIVATE)
 
     fun create(): RealmConfiguration {
         val shouldClearRealm = sharedPreferences.getBoolean("$REALM_SHOULD_CLEAR_FLAG_$sessionId", false)
         if (shouldClearRealm) {
-            Timber.v("************************************************************")
-            Timber.v("The realm file session was corrupted and couldn't be loaded.")
-            Timber.v("The file has been deleted to recover.")
-            Timber.v("************************************************************")
+            Timber.e("************************************************************")
+            Timber.e("The realm file session was corrupted and couldn't be loaded.")
+            Timber.e("The file has been deleted to recover.")
+            Timber.e("************************************************************")
             deleteRealmFiles()
         }
         sharedPreferences.edit {
@@ -74,7 +71,7 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
                     realmKeysUtils.configureEncryption(this, SessionModule.getKeyAlias(userMd5))
                 }
                 .modules(SessionRealmModule())
-                .schemaVersion(SESSION_STORE_SCHEMA_VERSION)
+                .schemaVersion(RealmSessionStoreMigration.SESSION_STORE_SCHEMA_VERSION)
                 .migration(migration)
                 .build()
 
@@ -90,6 +87,11 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
 
     // Delete all the realm files of the session
     private fun deleteRealmFiles() {
+        if (BuildConfig.DEBUG) {
+            Timber.e("No op because it is a debug build")
+            return
+        }
+
         listOf(REALM_NAME, "$REALM_NAME.lock", "$REALM_NAME.note", "$REALM_NAME.management").forEach { file ->
             try {
                 File(directory, file).deleteRecursively()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
index 90fc62f8f3..3bcc3d2ea7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
@@ -17,12 +17,12 @@
 package org.matrix.android.sdk.internal.database.mapper
 
 import com.squareup.moshi.Types
-import org.matrix.android.sdk.api.pushrules.Condition
+import io.realm.RealmList
+import org.matrix.android.sdk.api.pushrules.Kind
 import org.matrix.android.sdk.api.pushrules.rest.PushCondition
 import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.internal.database.model.PushRuleEntity
 import org.matrix.android.sdk.internal.di.MoshiProvider
-import io.realm.RealmList
 import timber.log.Timber
 
 internal object PushRulesMapper {
@@ -39,7 +39,7 @@ internal object PushRulesMapper {
                 enabled = pushrule.enabled,
                 ruleId = pushrule.ruleId,
                 conditions = listOf(
-                        PushCondition(Condition.Kind.EventMatch.value, "content.body", pushrule.pattern)
+                        PushCondition(Kind.EventMatch.value, "content.body", pushrule.pattern)
                 )
         )
     }
@@ -60,7 +60,7 @@ internal object PushRulesMapper {
                 enabled = pushrule.enabled,
                 ruleId = pushrule.ruleId,
                 conditions = listOf(
-                        PushCondition(Condition.Kind.EventMatch.value, "room_id", pushrule.ruleId)
+                        PushCondition(Kind.EventMatch.value, "room_id", pushrule.ruleId)
                 )
         )
     }
@@ -72,7 +72,7 @@ internal object PushRulesMapper {
                 enabled = pushrule.enabled,
                 ruleId = pushrule.ruleId,
                 conditions = listOf(
-                        PushCondition(Condition.Kind.EventMatch.value, "user_id", pushrule.ruleId)
+                        PushCondition(Kind.EventMatch.value, "user_id", pushrule.ruleId)
                 )
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
new file mode 100644
index 0000000000..2f5643d7bc
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+import io.realm.RealmObject
+
+/**
+ * This class is used to store pending threePid data, when user wants to add a threePid to his account
+ */
+internal open class PendingThreePidEntity(
+        var email: String? = null,
+        var msisdn: String? = null,
+        var clientSecret: String = "",
+        var sendAttempt: Int = 0,
+        var sid: String = "",
+        var submitUrl: String? = null
+) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index ea466db352..2c45cfcdbf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -36,6 +36,7 @@ import io.realm.annotations.RealmModule
             RoomSummaryEntity::class,
             RoomTagEntity::class,
             SyncEntity::class,
+            PendingThreePidEntity::class,
             UserEntity::class,
             IgnoredUserEntity::class,
             BreadcrumbsEntity::class,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
index 7ce260e54e..98dec301ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
@@ -24,6 +24,7 @@ import okio.BufferedSink
 import okio.ForwardingSink
 import okio.Sink
 import okio.buffer
+import org.matrix.android.sdk.api.extensions.tryThis
 import java.io.IOException
 
 internal class ProgressRequestBody(private val delegate: RequestBody,
@@ -35,15 +36,13 @@ internal class ProgressRequestBody(private val delegate: RequestBody,
         return delegate.contentType()
     }
 
-    override fun contentLength(): Long {
-        try {
-            return delegate.contentLength()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
+    override fun isOneShot() = delegate.isOneShot()
 
-        return -1
-    }
+    override fun isDuplex() = delegate.isDuplex()
+
+    val length = tryThis { delegate.contentLength() } ?: -1
+
+    override fun contentLength() = length
 
     @Throws(IOException::class)
     override fun writeTo(sink: BufferedSink) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt
index 368611dd7d..89a0ce597a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt
@@ -19,13 +19,12 @@ package org.matrix.android.sdk.internal.network
 
 import com.squareup.moshi.Moshi
 import dagger.Lazy
-import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import okhttp3.Call
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.converter.scalars.ScalarsConverterFactory
 import javax.inject.Inject
 
 internal class RetrofitFactory @Inject constructor(private val moshi: Moshi) {
@@ -50,7 +49,6 @@ internal class RetrofitFactory @Inject constructor(private val moshi: Moshi) {
                         return okHttpClient.get().newCall(request)
                     }
                 })
-                .addConverterFactory(ScalarsConverterFactory.create())
                 .addConverterFactory(UnitConverterFactory)
                 .addConverterFactory(MoshiConverterFactory.create(moshi))
                 .build()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CheckNumberType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CheckNumberType.kt
new file mode 100644
index 0000000000..d4ceca2006
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CheckNumberType.kt
@@ -0,0 +1,66 @@
+/*
+ * 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 org.matrix.android.sdk.internal.network.parsing
+
+import androidx.annotation.Nullable
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+
+import com.squareup.moshi.Moshi
+import java.io.IOException
+import java.lang.reflect.Type
+import java.math.BigDecimal
+
+/**
+ * This is used to check if NUMBER in json is integer or double, so we can preserve typing when serializing/deserializing in a row.
+ */
+interface CheckNumberType {
+
+    companion object {
+        val JSON_ADAPTER_FACTORY = object : JsonAdapter.Factory {
+            @Nullable
+            override fun create(type: Type, annotations: Set<Annotation?>?, moshi: Moshi): JsonAdapter<*>? {
+                if (type !== Any::class.java) {
+                    return null
+                }
+                val delegate: JsonAdapter<Any> = moshi.nextAdapter(this, Any::class.java, emptySet())
+                return object : JsonAdapter<Any?>() {
+                    @Nullable
+                    @Throws(IOException::class)
+                    override fun fromJson(reader: JsonReader): Any? {
+                        return if (reader.peek() !== JsonReader.Token.NUMBER) {
+                            delegate.fromJson(reader)
+                        } else {
+                            val numberAsString = reader.nextString()
+                            val decimal = BigDecimal(numberAsString)
+                            if (decimal.scale() <= 0) {
+                                decimal.intValueExact()
+                            } else {
+                                decimal.toDouble()
+                            }
+                        }
+                    }
+
+                    override fun toJson(writer: JsonWriter, value: Any?) {
+                        delegate.toJson(writer, value)
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
index 97ebe943ec..aa4114c8c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@@ -143,20 +143,22 @@ internal class DefaultFileService @Inject constructor(
                         Timber.v("Response size ${response.body?.contentLength()} - Stream available: ${!source.exhausted()}")
 
                         if (elementToDecrypt != null) {
-                            Timber.v("## decrypt file")
-                            val decryptedStream = MXEncryptedAttachments.decryptAttachment(source.inputStream(), elementToDecrypt)
+                            Timber.v("## FileService: decrypt file")
+                            val decryptSuccess = MXEncryptedAttachments.decryptAttachment(
+                                    source.inputStream(),
+                                    elementToDecrypt,
+                                    destFile.outputStream().buffered()
+                            )
                             response.close()
-                            if (decryptedStream == null) {
+                            if (!decryptSuccess) {
                                 return@flatMap Try.Failure(IllegalStateException("Decryption error"))
-                            } else {
-                                decryptedStream.use {
-                                    writeToFile(decryptedStream, destFile)
-                                }
                             }
                         } else {
                             writeToFile(source.inputStream(), destFile)
                             response.close()
                         }
+                    } else {
+                        Timber.v("## FileService: cache hit for $url")
                     }
 
                     Try.just(copyFile(destFile, downloadMode))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/ActiveCallHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/ActiveCallHandler.kt
new file mode 100644
index 0000000000..40f5a56c33
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/ActiveCallHandler.kt
@@ -0,0 +1,45 @@
+/*
+ * 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 org.matrix.android.sdk.internal.session.call
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import org.matrix.android.sdk.api.session.call.MxCall
+import org.matrix.android.sdk.internal.session.SessionScope
+import javax.inject.Inject
+
+@SessionScope
+internal class ActiveCallHandler @Inject constructor() {
+
+    private val activeCallListLiveData: MutableLiveData<MutableList<MxCall>> by lazy {
+        MutableLiveData<MutableList<MxCall>>(mutableListOf())
+    }
+
+    fun addCall(call: MxCall) {
+        activeCallListLiveData.postValue(activeCallListLiveData.value?.apply { add(call) })
+    }
+
+    fun removeCall(callId: String) {
+        activeCallListLiveData.postValue(activeCallListLiveData.value?.apply { removeAll { it.callId == callId } })
+    }
+
+    fun getCallWithId(callId: String): MxCall? {
+        return activeCallListLiveData.value?.find { it.callId == callId }
+    }
+
+    fun getActiveCallsLiveData(): LiveData<MutableList<MxCall>> = activeCallListLiveData
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt
index 6a17f0e925..d9bc66eddf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt
@@ -17,6 +17,7 @@
 
 package org.matrix.android.sdk.internal.session.call
 
+import android.os.SystemClock
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.tryThis
 import org.matrix.android.sdk.api.session.call.CallSignalingService
@@ -48,6 +49,7 @@ import javax.inject.Inject
 internal class DefaultCallSignalingService @Inject constructor(
         @UserId
         private val userId: String,
+        private val activeCallHandler: ActiveCallHandler,
         private val localEchoEventFactory: LocalEchoEventFactory,
         private val roomEventSender: RoomEventSender,
         private val taskExecutor: TaskExecutor,
@@ -56,13 +58,11 @@ internal class DefaultCallSignalingService @Inject constructor(
 
     private val callListeners = mutableSetOf<CallsListener>()
 
-    private val activeCalls = mutableListOf<MxCall>()
-
     private val cachedTurnServerResponse = object {
-
+        // Keep one minute safe to avoid considering the data is valid and then actually it is not when effectively using it.
         private val MIN_TTL = 60
 
-        private val now = { System.currentTimeMillis() / 1000 }
+        private val now = { SystemClock.elapsedRealtime() / 1000 }
 
         private var expiresAt: Long = 0
 
@@ -96,7 +96,7 @@ internal class DefaultCallSignalingService @Inject constructor(
     }
 
     override fun createOutgoingCall(roomId: String, otherUserId: String, isVideoCall: Boolean): MxCall {
-        return MxCallImpl(
+        val call = MxCallImpl(
                 callId = UUID.randomUUID().toString(),
                 isOutgoing = true,
                 roomId = roomId,
@@ -105,8 +105,9 @@ internal class DefaultCallSignalingService @Inject constructor(
                 isVideoCall = isVideoCall,
                 localEchoEventFactory = localEchoEventFactory,
                 roomEventSender = roomEventSender
-        ).also {
-            activeCalls.add(it)
+        )
+        activeCallHandler.addCall(call).also {
+            return call
         }
     }
 
@@ -119,8 +120,12 @@ internal class DefaultCallSignalingService @Inject constructor(
     }
 
     override fun getCallWithId(callId: String): MxCall? {
-        Timber.v("## VOIP getCallWithId $callId all calls ${activeCalls.map { it.callId }}")
-        return activeCalls.find { it.callId == callId }
+        Timber.v("## VOIP getCallWithId $callId all calls ${activeCallHandler.getActiveCallsLiveData().value?.map { it.callId }}")
+        return activeCallHandler.getCallWithId(callId)
+    }
+
+    override fun isThereAnyActiveCall(): Boolean {
+        return activeCallHandler.getActiveCallsLiveData().value?.isNotEmpty() == true
     }
 
     internal fun onCallEvent(event: Event) {
@@ -151,6 +156,7 @@ internal class DefaultCallSignalingService @Inject constructor(
                     // Always ignore local echos of invite
                     return
                 }
+
                 event.getClearContent().toModel<CallInviteContent>()?.let { content ->
                     val incomingCall = MxCallImpl(
                             callId = content.callId ?: return@let,
@@ -162,7 +168,7 @@ internal class DefaultCallSignalingService @Inject constructor(
                             localEchoEventFactory = localEchoEventFactory,
                             roomEventSender = roomEventSender
                     )
-                    activeCalls.add(incomingCall)
+                    activeCallHandler.addCall(incomingCall)
                     onCallInvite(incomingCall, content)
                 }
             }
@@ -184,8 +190,8 @@ internal class DefaultCallSignalingService @Inject constructor(
                         return
                     }
 
+                    activeCallHandler.removeCall(content.callId)
                     onCallHangup(content)
-                    activeCalls.removeAll { it.callId == content.callId }
                 }
             }
             EventType.CALL_CANDIDATES -> {
@@ -194,7 +200,7 @@ internal class DefaultCallSignalingService @Inject constructor(
                     return
                 }
                 event.getClearContent().toModel<CallCandidatesContent>()?.let { content ->
-                    activeCalls.firstOrNull { it.callId == content.callId }?.let {
+                    activeCallHandler.getCallWithId(content.callId)?.let {
                         onCallIceCandidate(it, content)
                     }
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
index aa8b98ae62..951c24ccb7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
@@ -74,8 +74,8 @@ internal class DefaultContentUploadStateTracker @Inject constructor() : ContentU
         updateState(key, progressData)
     }
 
-    internal fun setEncrypting(key: String) {
-        val progressData = ContentUploadStateTracker.State.Encrypting
+    internal fun setEncrypting(key: String, current: Long, total: Long) {
+        val progressData = ContentUploadStateTracker.State.Encrypting(current, total)
         updateState(key, progressData)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index 5e5380fce1..4ddf394b00 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -23,13 +23,16 @@ import com.squareup.moshi.Moshi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
+import okio.BufferedSink
+import okio.source
 import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.extensions.tryThis
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.internal.di.Authenticated
 import org.matrix.android.sdk.internal.network.ProgressRequestBody
@@ -38,6 +41,7 @@ import org.matrix.android.sdk.internal.network.toFailure
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
+import java.util.UUID
 import javax.inject.Inject
 
 internal class FileUploader @Inject constructor(@Authenticated
@@ -54,7 +58,21 @@ internal class FileUploader @Inject constructor(@Authenticated
                            filename: String?,
                            mimeType: String?,
                            progressListener: ProgressRequestBody.Listener? = null): ContentUploadResponse {
-        val uploadBody = file.asRequestBody(mimeType?.toMediaTypeOrNull())
+        val uploadBody = object : RequestBody() {
+            override fun contentLength() = file.length()
+
+            // Disable okhttp auto resend for 'large files'
+            override fun isOneShot() = contentLength() == 0L || contentLength() >= 1_000_000
+
+            override fun contentType(): MediaType? {
+                return mimeType?.toMediaTypeOrNull()
+            }
+
+            override fun writeTo(sink: BufferedSink) {
+                file.source().use { sink.writeAll(it) }
+            }
+        }
+
         return upload(uploadBody, filename, progressListener)
     }
 
@@ -70,14 +88,18 @@ internal class FileUploader @Inject constructor(@Authenticated
                               filename: String?,
                               mimeType: String?,
                               progressListener: ProgressRequestBody.Listener? = null): ContentUploadResponse {
-        return withContext(Dispatchers.IO) {
-            val inputStream = context.contentResolver.openInputStream(uri) ?: throw FileNotFoundException()
-
-            inputStream.use {
-                uploadByteArray(it.readBytes(), filename, mimeType, progressListener)
-            }
+        val inputStream = withContext(Dispatchers.IO) {
+            context.contentResolver.openInputStream(uri)
+        } ?: throw FileNotFoundException()
+        val workingFile = File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+        workingFile.outputStream().use {
+            inputStream.copyTo(it)
+        }
+        return uploadFile(workingFile, filename, mimeType, progressListener).also {
+            tryThis { workingFile.delete() }
         }
     }
+
     private suspend fun upload(uploadBody: RequestBody, filename: String?, progressListener: ProgressRequestBody.Listener?): ContentUploadResponse {
         val urlBuilder = uploadUrl.toHttpUrlOrNull()?.newBuilder() ?: throw RuntimeException()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
new file mode 100644
index 0000000000..a125c0aea4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.content
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Matrix
+import androidx.exifinterface.media.ExifInterface
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import java.util.UUID
+import javax.inject.Inject
+
+internal class ImageCompressor @Inject constructor() {
+    suspend fun compress(
+            context: Context,
+            imageFile: File,
+            desiredWidth: Int,
+            desiredHeight: Int,
+            desiredQuality: Int = 80): File {
+        return withContext(Dispatchers.IO) {
+            val compressedBitmap = BitmapFactory.Options().run {
+                inJustDecodeBounds = true
+                decodeBitmap(imageFile, this)
+                inSampleSize = calculateInSampleSize(outWidth, outHeight, desiredWidth, desiredHeight)
+                inJustDecodeBounds = false
+                decodeBitmap(imageFile, this)?.let {
+                    rotateBitmap(imageFile, it)
+                }
+            } ?: return@withContext imageFile
+
+            val destinationFile = createDestinationFile(context)
+
+            runCatching {
+                destinationFile.outputStream().use {
+                    compressedBitmap.compress(Bitmap.CompressFormat.JPEG, desiredQuality, it)
+                }
+            }
+
+            return@withContext destinationFile
+        }
+    }
+
+    private fun rotateBitmap(file: File, bitmap: Bitmap): Bitmap {
+        file.inputStream().use { inputStream ->
+            try {
+                ExifInterface(inputStream).let { exifInfo ->
+                    val orientation = exifInfo.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
+                    val matrix = Matrix()
+                    when (orientation) {
+                        ExifInterface.ORIENTATION_ROTATE_270 -> matrix.postRotate(270f)
+                        ExifInterface.ORIENTATION_ROTATE_180 -> matrix.postRotate(180f)
+                        ExifInterface.ORIENTATION_ROTATE_90 -> matrix.postRotate(90f)
+                        ExifInterface.ORIENTATION_FLIP_HORIZONTAL -> matrix.preScale(-1f, 1f)
+                        ExifInterface.ORIENTATION_FLIP_VERTICAL -> matrix.preScale(1f, -1f)
+                        ExifInterface.ORIENTATION_TRANSPOSE -> {
+                            matrix.preRotate(-90f)
+                            matrix.preScale(-1f, 1f)
+                        }
+                        ExifInterface.ORIENTATION_TRANSVERSE -> {
+                            matrix.preRotate(90f)
+                            matrix.preScale(-1f, 1f)
+                        }
+                        else                                      -> return bitmap
+                    }
+                    return Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Cannot read orientation")
+            }
+        }
+        return bitmap
+    }
+
+    // https://developer.android.com/topic/performance/graphics/load-bitmap
+    private fun calculateInSampleSize(width: Int, height: Int, desiredWidth: Int, desiredHeight: Int): Int {
+        var inSampleSize = 1
+
+        if (width > desiredWidth || height > desiredHeight) {
+            val halfHeight: Int = height / 2
+            val halfWidth: Int = width / 2
+
+            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+            // height and width larger than the requested height and width.
+            while (halfHeight / inSampleSize >= desiredHeight && halfWidth / inSampleSize >= desiredWidth) {
+                inSampleSize *= 2
+            }
+        }
+
+        return inSampleSize
+    }
+
+    private fun decodeBitmap(file: File, options: BitmapFactory.Options = BitmapFactory.Options()): Bitmap? {
+        return try {
+            file.inputStream().use { inputStream ->
+                BitmapFactory.decodeStream(inputStream, null, options)
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Cannot decode Bitmap")
+            null
+        }
+    }
+
+    private fun createDestinationFile(context: Context): File {
+        return File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 6d354cdcbe..6e70906d13 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -22,8 +22,7 @@ import android.graphics.BitmapFactory
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
-import id.zelory.compressor.Compressor
-import id.zelory.compressor.constraint.default
+import org.matrix.android.sdk.api.extensions.tryThis
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toContent
@@ -37,15 +36,13 @@ import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
 import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 import org.matrix.android.sdk.internal.network.ProgressRequestBody
 import org.matrix.android.sdk.internal.session.DefaultFileService
+import org.matrix.android.sdk.internal.session.room.send.CancelSendTracker
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import org.matrix.android.sdk.internal.worker.getSessionComponent
 import timber.log.Timber
-import java.io.ByteArrayInputStream
 import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
 import java.util.UUID
 import javax.inject.Inject
 
@@ -74,6 +71,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
     @Inject lateinit var fileUploader: FileUploader
     @Inject lateinit var contentUploadStateTracker: DefaultContentUploadStateTracker
     @Inject lateinit var fileService: DefaultFileService
+    @Inject lateinit var cancelSendTracker: CancelSendTracker
+    @Inject lateinit var imageCompressor: ImageCompressor
 
     override suspend fun doWork(): Result {
         val params = WorkerParamsFactory.fromData<Params>(inputData)
@@ -101,9 +100,15 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         val sessionComponent = getSessionComponent(params.sessionId) ?: return Result.success()
         sessionComponent.inject(this)
 
-        val attachment = params.attachment
+        val allCancelled = params.events.all { cancelSendTracker.isCancelRequestedFor(it.eventId, it.roomId) }
+        if (allCancelled) {
+            // there is no point in uploading the image!
+            return Result.success(inputData)
+                    .also { Timber.e("## Send: Work cancelled by user") }
+        }
 
-        var newImageAttributes: NewImageAttributes? = null
+        val attachment = params.attachment
+        val filesToDelete = mutableListOf<File>()
 
         try {
             val inputStream = context.contentResolver.openInputStream(attachment.queryUri)
@@ -115,124 +120,100 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                             )
                     )
 
-            inputStream.use {
-                var uploadedThumbnailUrl: String? = null
-                var uploadedThumbnailEncryptedFileInfo: EncryptedFileInfo? = null
-
-                ThumbnailExtractor.extractThumbnail(context, params.attachment)?.let { thumbnailData ->
-                    val thumbnailProgressListener = object : ProgressRequestBody.Listener {
-                        override fun onProgress(current: Long, total: Long) {
-                            notifyTracker(params) { contentUploadStateTracker.setProgressThumbnail(it, current, total) }
-                        }
-                    }
-
-                    try {
-                        val contentUploadResponse = if (params.isEncrypted) {
-                            Timber.v("Encrypt thumbnail")
-                            notifyTracker(params) { contentUploadStateTracker.setEncryptingThumbnail(it) }
-                            val encryptionResult = MXEncryptedAttachments.encryptAttachment(ByteArrayInputStream(thumbnailData.bytes), thumbnailData.mimeType)
-                            uploadedThumbnailEncryptedFileInfo = encryptionResult.encryptedFileInfo
-                            fileUploader.uploadByteArray(encryptionResult.encryptedByteArray,
-                                    "thumb_${attachment.name}",
-                                    "application/octet-stream",
-                                    thumbnailProgressListener)
-                        } else {
-                            fileUploader.uploadByteArray(thumbnailData.bytes,
-                                    "thumb_${attachment.name}",
-                                    thumbnailData.mimeType,
-                                    thumbnailProgressListener)
-                        }
-
-                        uploadedThumbnailUrl = contentUploadResponse.contentUri
-                    } catch (t: Throwable) {
-                        Timber.e(t, "Thumbnail update failed")
-                    }
-                }
-
-                val progressListener = object : ProgressRequestBody.Listener {
-                    override fun onProgress(current: Long, total: Long) {
-                        notifyTracker(params) {
-                            if (isStopped) {
-                                contentUploadStateTracker.setFailure(it, Throwable("Cancelled"))
-                            } else {
-                                contentUploadStateTracker.setProgress(it, current, total)
-                            }
-                        }
-                    }
-                }
-
-                var uploadedFileEncryptedFileInfo: EncryptedFileInfo? = null
-
-                return try {
-                    // Compressor library works with File instead of Uri for now. Since Scoped Storage doesn't allow us to access files directly, we should
-                    // copy it to a cache folder by using InputStream and OutputStream.
-                    // https://github.com/zetbaitsu/Compressor/pull/150
-                    // As soon as the above PR is merged, we can use attachment.queryUri instead of creating a cacheFile.
-                    var cacheFile = File.createTempFile(attachment.name ?: UUID.randomUUID().toString(), ".jpg", context.cacheDir)
-                    cacheFile.parentFile?.mkdirs()
-                    if (cacheFile.exists()) {
-                        cacheFile.delete()
-                    }
-                    cacheFile.createNewFile()
-                    cacheFile.deleteOnExit()
-
-                    val outputStream = FileOutputStream(cacheFile)
-                    outputStream.use {
-                        inputStream.copyTo(outputStream)
-                    }
-
-                    if (attachment.type == ContentAttachmentData.Type.IMAGE && params.compressBeforeSending) {
-                        cacheFile = Compressor.compress(context, cacheFile) {
-                            default(
-                                    width = MAX_IMAGE_SIZE,
-                                    height = MAX_IMAGE_SIZE
-                            )
-                        }.also { compressedFile ->
-                            val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-                            BitmapFactory.decodeFile(compressedFile.absolutePath, options)
-                            val fileSize = compressedFile.length().toInt()
-                            newImageAttributes = NewImageAttributes(
-                                    options.outWidth,
-                                    options.outHeight,
-                                    fileSize
-                            )
-                        }
-                    }
-
-                    val contentUploadResponse = if (params.isEncrypted) {
-                        Timber.v("Encrypt file")
-                        notifyTracker(params) { contentUploadStateTracker.setEncrypting(it) }
-
-                        val encryptionResult = MXEncryptedAttachments.encryptAttachment(FileInputStream(cacheFile), attachment.getSafeMimeType())
-                        uploadedFileEncryptedFileInfo = encryptionResult.encryptedFileInfo
-
-                        fileUploader
-                                .uploadByteArray(encryptionResult.encryptedByteArray, attachment.name, "application/octet-stream", progressListener)
-                    } else {
-                        fileUploader
-                                .uploadFile(cacheFile, attachment.name, attachment.getSafeMimeType(), progressListener)
-                    }
-
-                    // If it's a file update the file service so that it does not redownload?
-                    if (params.attachment.type == ContentAttachmentData.Type.FILE) {
-                        context.contentResolver.openInputStream(attachment.queryUri)?.let {
-                            fileService.storeDataFor(contentUploadResponse.contentUri, params.attachment.getSafeMimeType(), it)
-                        }
-                    }
-
-                    handleSuccess(params,
-                            contentUploadResponse.contentUri,
-                            uploadedFileEncryptedFileInfo,
-                            uploadedThumbnailUrl,
-                            uploadedThumbnailEncryptedFileInfo,
-                            newImageAttributes)
-                } catch (t: Throwable) {
-                    Timber.e(t)
-                    handleFailure(params, t)
+            // always use a temporary file, it guaranties that we could report progress on upload and simplifies the flows
+            val workingFile = File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+                    .also { filesToDelete.add(it) }
+            workingFile.outputStream().use { outputStream ->
+                inputStream.use { inputStream ->
+                    inputStream.copyTo(outputStream)
                 }
             }
+
+            val uploadThumbnailResult = dealWithThumbnail(params)
+
+            val progressListener = object : ProgressRequestBody.Listener {
+                override fun onProgress(current: Long, total: Long) {
+                    notifyTracker(params) {
+                        if (isStopped) {
+                            contentUploadStateTracker.setFailure(it, Throwable("Cancelled"))
+                        } else {
+                            contentUploadStateTracker.setProgress(it, current, total)
+                        }
+                    }
+                }
+            }
+
+            var uploadedFileEncryptedFileInfo: EncryptedFileInfo? = null
+
+            return try {
+                val fileToUpload: File
+                var newImageAttributes: NewImageAttributes? = null
+
+                if (attachment.type == ContentAttachmentData.Type.IMAGE && params.compressBeforeSending) {
+                    fileToUpload = imageCompressor.compress(context, workingFile, MAX_IMAGE_SIZE, MAX_IMAGE_SIZE)
+                            .also { compressedFile ->
+                                // Get new Bitmap size
+                                compressedFile.inputStream().use {
+                                    val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+                                    val bitmap = BitmapFactory.decodeStream(it, null, options)
+                                    val fileSize = bitmap?.byteCount ?: 0
+                                    newImageAttributes = NewImageAttributes(
+                                            options.outWidth,
+                                            options.outHeight,
+                                            fileSize
+                                    )
+                                }
+                            }
+                            .also { filesToDelete.add(it) }
+                } else {
+                    fileToUpload = workingFile
+                }
+
+                val contentUploadResponse = if (params.isEncrypted) {
+                    Timber.v("## FileService: Encrypt file")
+
+                    val tmpEncrypted = File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+                            .also { filesToDelete.add(it) }
+
+                    uploadedFileEncryptedFileInfo =
+                            MXEncryptedAttachments.encrypt(fileToUpload.inputStream(), attachment.getSafeMimeType(), tmpEncrypted) { read, total ->
+                                notifyTracker(params) {
+                                    contentUploadStateTracker.setEncrypting(it, read.toLong(), total.toLong())
+                                }
+                            }
+
+                    Timber.v("## FileService: Uploading file")
+
+                    fileUploader
+                            .uploadFile(tmpEncrypted, attachment.name, "application/octet-stream", progressListener)
+                } else {
+                    Timber.v("## FileService: Clear file")
+                    fileUploader
+                            .uploadFile(fileToUpload, attachment.name, attachment.getSafeMimeType(), progressListener)
+                }
+
+                Timber.v("## FileService: Update cache storage for ${contentUploadResponse.contentUri}")
+                try {
+                    context.contentResolver.openInputStream(attachment.queryUri)?.let {
+                        fileService.storeDataFor(contentUploadResponse.contentUri, params.attachment.getSafeMimeType(), it)
+                    }
+                    Timber.v("## FileService: cache storage updated")
+                } catch (failure: Throwable) {
+                    Timber.e(failure, "## FileService: Failed to update file cache")
+                }
+
+                handleSuccess(params,
+                        contentUploadResponse.contentUri,
+                        uploadedFileEncryptedFileInfo,
+                        uploadThumbnailResult?.uploadedThumbnailUrl,
+                        uploadThumbnailResult?.uploadedThumbnailEncryptedFileInfo,
+                        newImageAttributes)
+            } catch (t: Throwable) {
+                Timber.e(t, "## FileService: ERROR ${t.localizedMessage}")
+                handleFailure(params, t)
+            }
         } catch (e: Exception) {
-            Timber.e(e)
+            Timber.e(e, "## FileService: ERROR")
             notifyTracker(params) { contentUploadStateTracker.setFailure(it, e) }
             return Result.success(
                     WorkerParamsFactory.toData(
@@ -241,9 +222,61 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                             )
                     )
             )
+        } finally {
+            // Delete all temporary files
+            filesToDelete.forEach {
+                tryThis { it.delete() }
+            }
         }
     }
 
+    private data class UploadThumbnailResult(
+            val uploadedThumbnailUrl: String,
+            val uploadedThumbnailEncryptedFileInfo: EncryptedFileInfo?
+    )
+
+    /**
+     * If appropriate, it will create and upload a thumbnail
+     */
+    private suspend fun dealWithThumbnail(params: Params): UploadThumbnailResult? {
+        return ThumbnailExtractor.extractThumbnail(context, params.attachment)
+                ?.let { thumbnailData ->
+                    val thumbnailProgressListener = object : ProgressRequestBody.Listener {
+                        override fun onProgress(current: Long, total: Long) {
+                            notifyTracker(params) { contentUploadStateTracker.setProgressThumbnail(it, current, total) }
+                        }
+                    }
+
+                    try {
+                        if (params.isEncrypted) {
+                            Timber.v("Encrypt thumbnail")
+                            notifyTracker(params) { contentUploadStateTracker.setEncryptingThumbnail(it) }
+                            val encryptionResult = MXEncryptedAttachments.encryptAttachment(thumbnailData.bytes.inputStream(), thumbnailData.mimeType)
+                            val contentUploadResponse = fileUploader.uploadByteArray(encryptionResult.encryptedByteArray,
+                                    "thumb_${params.attachment.name}",
+                                    "application/octet-stream",
+                                    thumbnailProgressListener)
+                            UploadThumbnailResult(
+                                    contentUploadResponse.contentUri,
+                                    encryptionResult.encryptedFileInfo
+                            )
+                        } else {
+                            val contentUploadResponse = fileUploader.uploadByteArray(thumbnailData.bytes,
+                                    "thumb_${params.attachment.name}",
+                                    thumbnailData.mimeType,
+                                    thumbnailProgressListener)
+                            UploadThumbnailResult(
+                                    contentUploadResponse.contentUri,
+                                    null
+                            )
+                        }
+                    } catch (t: Throwable) {
+                        Timber.e(t, "Thumbnail upload failed")
+                        null
+                    }
+                }
+    }
+
     private fun handleFailure(params: Params, failure: Throwable): Result {
         notifyTracker(params) { contentUploadStateTracker.setFailure(it, failure) }
 
@@ -262,7 +295,6 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                               thumbnailUrl: String?,
                               thumbnailEncryptedFileInfo: EncryptedFileInfo?,
                               newImageAttributes: NewImageAttributes?): Result {
-        Timber.v("handleSuccess $attachmentUrl, work is stopped $isStopped")
         notifyTracker(params) { contentUploadStateTracker.setSuccess(it) }
 
         val updatedEvents = params.events
@@ -271,7 +303,9 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                 }
 
         val sendParams = MultipleEventSendingDispatcherWorker.Params(params.sessionId, updatedEvents, params.isEncrypted)
-        return Result.success(WorkerParamsFactory.toData(sendParams))
+        return Result.success(WorkerParamsFactory.toData(sendParams)).also {
+            Timber.v("## handleSuccess $attachmentUrl, work is stopped $isStopped")
+        }
     }
 
     private fun updateEvent(event: Event,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt
index 295a829b08..c4ba95af84 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt
@@ -61,19 +61,23 @@ internal class DefaultContentDownloadStateTracker @Inject constructor() : Progre
 //    private fun URL.toKey() = toString()
 
     override fun update(url: String, bytesRead: Long, contentLength: Long, done: Boolean) {
-        Timber.v("## DL Progress url:$url read:$bytesRead total:$contentLength done:$done")
-        if (done) {
-            updateState(url, ContentDownloadStateTracker.State.Success)
-        } else {
-            updateState(url, ContentDownloadStateTracker.State.Downloading(bytesRead, contentLength, contentLength == -1L))
+        mainHandler.post {
+            Timber.v("## DL Progress url:$url read:$bytesRead total:$contentLength done:$done")
+            if (done) {
+                updateState(url, ContentDownloadStateTracker.State.Success)
+            } else {
+                updateState(url, ContentDownloadStateTracker.State.Downloading(bytesRead, contentLength, contentLength == -1L))
+            }
         }
     }
 
     override fun error(url: String, errorCode: Int) {
-        Timber.v("## DL Progress Error code:$errorCode")
-        updateState(url, ContentDownloadStateTracker.State.Failure(errorCode))
-        listeners[url]?.forEach {
-            tryThis { it.onDownloadStateUpdate(ContentDownloadStateTracker.State.Failure(errorCode)) }
+        mainHandler.post {
+            Timber.v("## DL Progress Error code:$errorCode")
+            updateState(url, ContentDownloadStateTracker.State.Failure(errorCode))
+            listeners[url]?.forEach {
+                tryThis { it.onDownloadStateUpdate(ContentDownloadStateTracker.State.Failure(errorCode)) }
+            }
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
index ac33c2666f..45d7d48a18 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
@@ -23,7 +23,6 @@ import org.matrix.android.sdk.api.session.identity.FoundThreePid
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.identity.toMedium
-import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments.base64ToBase64Url
 import org.matrix.android.sdk.internal.crypto.tools.withOlmUtility
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.executeRequest
@@ -32,6 +31,7 @@ import org.matrix.android.sdk.internal.session.identity.model.IdentityHashDetail
 import org.matrix.android.sdk.internal.session.identity.model.IdentityLookUpParams
 import org.matrix.android.sdk.internal.session.identity.model.IdentityLookUpResponse
 import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.base64ToBase64Url
 import java.util.Locale
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
index 49a92acc54..a0667cc4a3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
@@ -100,7 +100,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
         return rules.firstOrNull { rule ->
             // All conditions must hold true for an event in order to apply the action for the event.
             rule.enabled && rule.conditions?.all {
-                it.asExecutableCondition()?.isSatisfied(event, conditionResolver) ?: false
+                it.asExecutableCondition(rule)?.isSatisfied(event, conditionResolver) ?: false
             } ?: false
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt
new file mode 100644
index 0000000000..ff81ad6a5c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class AddEmailBody(
+        /**
+         * Required. A unique string generated by the client, and used to identify the validation attempt.
+         * It must be a string consisting of the characters [0-9a-zA-Z.=_-]. Its length must not exceed
+         * 255 characters and it must not be empty.
+         */
+        @Json(name = "client_secret")
+        val clientSecret: String,
+
+        /**
+         * Required. The email address to validate.
+         */
+        @Json(name = "email")
+        val email: String,
+
+        /**
+         * Required. The server will only send an email if the send_attempt is a number greater than the most
+         * recent one which it has seen, scoped to that email + client_secret pair. This is to avoid repeatedly
+         * sending the same email in the case of request retries between the POSTing user and the identity server.
+         * The client should increment this value if they desire a new email (e.g. a reminder) to be sent.
+         * If they do not, the server should respond with success but not resend the email.
+         */
+        @Json(name = "send_attempt")
+        val sendAttempt: Int
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt
new file mode 100644
index 0000000000..8654d7c5ba
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class AddEmailResponse(
+        /**
+         * Required. The session ID. Session IDs are opaque strings that must consist entirely
+         * of the characters [0-9a-zA-Z.=_-]. Their length must not exceed 255 characters and they must not be empty.
+         */
+        @Json(name = "sid")
+        val sid: String
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt
new file mode 100644
index 0000000000..64c53f6729
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class AddMsisdnBody(
+        /**
+         * Required. A unique string generated by the client, and used to identify the validation attempt.
+         * It must be a string consisting of the characters [0-9a-zA-Z.=_-]. Its length must not exceed
+         * 255 characters and it must not be empty.
+         */
+        @Json(name = "client_secret")
+        val clientSecret: String,
+
+        /**
+         * Required. The two-letter uppercase ISO-3166-1 alpha-2 country code that the number in
+         * phone_number should be parsed as if it were dialled from.
+         */
+        @Json(name = "country")
+        val country: String,
+
+        /**
+         * Required. The phone number to validate.
+         */
+        @Json(name = "phone_number")
+        val phoneNumber: String,
+
+        /**
+         * Required. The server will only send an SMS if the send_attempt is a number greater than the most
+         * recent one which it has seen, scoped to that country + phone_number + client_secret triple. This
+         * is to avoid repeatedly sending the same SMS in the case of request retries between the POSTing user
+         * and the identity server. The client should increment this value if they desire a new SMS (e.g. a
+         * reminder) to be sent.
+         */
+        @Json(name = "send_attempt")
+        val sendAttempt: Int
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt
new file mode 100644
index 0000000000..b4c137b3a1
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class AddMsisdnResponse(
+        /**
+         * Required. The session ID. Session IDs are opaque strings that must consist entirely of the characters [0-9a-zA-Z.=_-].
+         * Their length must not exceed 255 characters and they must not be empty.
+         */
+        @Json(name = "sid")
+        val sid: String,
+
+        /**
+         * An optional field containing a URL where the client must submit the validation token to, with identical parameters to the Identity
+         * Service API's POST /validate/email/submitToken endpoint (without the requirement for an access token).
+         * The homeserver must send this token to the user (if applicable), who should then be prompted to provide it to the client.
+         *
+         * If this field is not present, the client can assume that verification will happen without the client's involvement provided
+         * the homeserver advertises this specification version in the /versions response (ie: r0.5.0).
+         */
+        @Json(name = "submit_url")
+        val submitUrl: String? = null,
+
+        /* ==========================================================================================
+         * It seems that the homeserver is sending more data, we may need it
+         * ========================================================================================== */
+
+        @Json(name = "msisdn")
+        val msisdn: String? = null,
+
+        @Json(name = "intl_fmt")
+        val formattedMsisdn: String? = null,
+
+        @Json(name = "success")
+        val success: Boolean? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
new file mode 100644
index 0000000000..c844c8ca6f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import com.zhuinden.monarchy.Monarchy
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import java.util.UUID
+import javax.inject.Inject
+
+internal abstract class AddThreePidTask : Task<AddThreePidTask.Params, Unit> {
+    data class Params(
+            val threePid: ThreePid
+    )
+}
+
+internal class DefaultAddThreePidTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val pendingThreePidMapper: PendingThreePidMapper,
+        private val eventBus: EventBus) : AddThreePidTask() {
+
+    override suspend fun execute(params: Params) {
+        when (params.threePid) {
+            is ThreePid.Email -> addEmail(params.threePid)
+            is ThreePid.Msisdn -> addMsisdn(params.threePid)
+        }
+    }
+
+    private suspend fun addEmail(threePid: ThreePid.Email) {
+        val clientSecret = UUID.randomUUID().toString()
+        val sendAttempt = 1
+
+        val result = executeRequest<AddEmailResponse>(eventBus) {
+            val body = AddEmailBody(
+                    clientSecret = clientSecret,
+                    email = threePid.email,
+                    sendAttempt = sendAttempt
+            )
+            apiCall = profileAPI.addEmail(body)
+        }
+
+        // Store as a pending three pid
+        monarchy.awaitTransaction { realm ->
+            PendingThreePid(
+                    threePid = threePid,
+                    clientSecret = clientSecret,
+                    sendAttempt = sendAttempt,
+                    sid = result.sid,
+                    submitUrl = null
+            )
+                    .let { pendingThreePidMapper.map(it) }
+                    .let { realm.copyToRealm(it) }
+        }
+    }
+
+    private suspend fun addMsisdn(threePid: ThreePid.Msisdn) {
+        val clientSecret = UUID.randomUUID().toString()
+        val sendAttempt = 1
+
+        // Get country code and national number from the phone number
+        val phoneNumber = threePid.msisdn
+        val phoneNumberUtil = PhoneNumberUtil.getInstance()
+        val parsedNumber = phoneNumberUtil.parse(phoneNumber, null)
+        val countryCode = parsedNumber.countryCode
+        val country = phoneNumberUtil.getRegionCodeForCountryCode(countryCode)
+
+        val result = executeRequest<AddMsisdnResponse>(eventBus) {
+            val body = AddMsisdnBody(
+                    clientSecret = clientSecret,
+                    country = country,
+                    phoneNumber = parsedNumber.nationalNumber.toString(),
+                    sendAttempt = sendAttempt
+            )
+            apiCall = profileAPI.addMsisdn(body)
+        }
+
+        // Store as a pending three pid
+        monarchy.awaitTransaction { realm ->
+            PendingThreePid(
+                    threePid = threePid,
+                    clientSecret = clientSecret,
+                    sendAttempt = sendAttempt,
+                    sid = result.sid,
+                    submitUrl = result.submitUrl
+            )
+                    .let { pendingThreePidMapper.map(it) }
+                    .let { realm.copyToRealm(it) }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index 633b047994..97212a8687 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
 import org.matrix.android.sdk.internal.database.model.UserThreePidEntity
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.content.FileUploader
@@ -44,6 +45,11 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                                                          private val getProfileInfoTask: GetProfileInfoTask,
                                                          private val setDisplayNameTask: SetDisplayNameTask,
                                                          private val setAvatarUrlTask: SetAvatarUrlTask,
+                                                         private val addThreePidTask: AddThreePidTask,
+                                                         private val validateSmsCodeTask: ValidateSmsCodeTask,
+                                                         private val finalizeAddingThreePidTask: FinalizeAddingThreePidTask,
+                                                         private val deleteThreePidTask: DeleteThreePidTask,
+                                                         private val pendingThreePidMapper: PendingThreePidMapper,
                                                          private val fileUploader: FileUploader) : ProfileService {
 
     override fun getDisplayName(userId: String, matrixCallback: MatrixCallback<Optional<String>>): Cancelable {
@@ -116,9 +122,7 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
     override fun getThreePidsLive(refreshData: Boolean): LiveData<List<ThreePid>> {
         if (refreshData) {
             // Force a refresh of the values
-            refreshUserThreePidsTask
-                    .configureWith()
-                    .executeBy(taskExecutor)
+            refreshThreePids()
         }
 
         return monarchy.findAllMappedWithChanges(
@@ -126,6 +130,95 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                 { it.asDomain() }
         )
     }
+
+    private fun refreshThreePids() {
+        refreshUserThreePidsTask
+                .configureWith()
+                .executeBy(taskExecutor)
+    }
+
+    override fun getPendingThreePids(): List<ThreePid> {
+        return monarchy.fetchAllMappedSync(
+                { it.where<PendingThreePidEntity>() },
+                { pendingThreePidMapper.map(it).threePid }
+        )
+    }
+
+    override fun getPendingThreePidsLive(): LiveData<List<ThreePid>> {
+        return monarchy.findAllMappedWithChanges(
+                { it.where<PendingThreePidEntity>() },
+                { pendingThreePidMapper.map(it).threePid }
+        )
+    }
+
+    override fun addThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return addThreePidTask
+                .configureWith(AddThreePidTask.Params(threePid)) {
+                    callback = matrixCallback
+                }
+                .executeBy(taskExecutor)
+    }
+
+    override fun submitSmsCode(threePid: ThreePid.Msisdn, code: String, matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return validateSmsCodeTask
+                .configureWith(ValidateSmsCodeTask.Params(threePid, code)) {
+                    callback = matrixCallback
+                }
+                .executeBy(taskExecutor)
+    }
+
+    override fun finalizeAddingThreePid(threePid: ThreePid,
+                                        uiaSession: String?,
+                                        accountPassword: String?,
+                                        matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return finalizeAddingThreePidTask
+                .configureWith(FinalizeAddingThreePidTask.Params(
+                        threePid = threePid,
+                        session = uiaSession,
+                        accountPassword = accountPassword,
+                        userWantsToCancel = false
+                )) {
+                    callback = alsoRefresh(matrixCallback)
+                }
+                .executeBy(taskExecutor)
+    }
+
+    override fun cancelAddingThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return finalizeAddingThreePidTask
+                .configureWith(FinalizeAddingThreePidTask.Params(
+                        threePid = threePid,
+                        session = null,
+                        accountPassword = null,
+                        userWantsToCancel = true
+                )) {
+                    callback = alsoRefresh(matrixCallback)
+                }
+                .executeBy(taskExecutor)
+    }
+
+    /**
+     * Wrap the callback to fetch 3Pids from the server in case of success
+     */
+    private fun alsoRefresh(callback: MatrixCallback<Unit>): MatrixCallback<Unit> {
+        return object : MatrixCallback<Unit> {
+            override fun onFailure(failure: Throwable) {
+                callback.onFailure(failure)
+            }
+
+            override fun onSuccess(data: Unit) {
+                refreshThreePids()
+                callback.onSuccess(data)
+            }
+        }
+    }
+
+    override fun deleteThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return deleteThreePidTask
+                .configureWith(DeleteThreePidTask.Params(threePid)) {
+                    callback = alsoRefresh(matrixCallback)
+                }
+                .executeBy(taskExecutor)
+    }
 }
 
 private fun UserThreePidEntity.asDomain(): ThreePid {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt
new file mode 100644
index 0000000000..e7d4568f8b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class DeleteThreePidBody(
+        /**
+         * Required. The medium of the third party identifier being removed. One of: ["email", "msisdn"]
+         */
+        @Json(name = "medium") val medium: String,
+        /**
+         * Required. The third party address being removed.
+         */
+        @Json(name = "address") val address: String
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt
new file mode 100644
index 0000000000..3817277a9d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class DeleteThreePidResponse(
+        /**
+         * Required. An indicator as to whether or not the homeserver was able to unbind the 3PID from
+         * the identity server. success indicates that the identity server has unbound the identifier
+         * whereas no-support indicates that the identity server refuses to support the request or the
+         * homeserver was not able to determine an identity server to unbind from. One of: ["no-support", "success"]
+         */
+        @Json(name = "id_server_unbind_result")
+        val idServerUnbindResult: String? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
new file mode 100644
index 0000000000..69ff7d82da
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.identity.toMedium
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal abstract class DeleteThreePidTask : Task<DeleteThreePidTask.Params, Unit> {
+    data class Params(
+            val threePid: ThreePid
+    )
+}
+
+internal class DefaultDeleteThreePidTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        private val eventBus: EventBus) : DeleteThreePidTask() {
+
+    override suspend fun execute(params: Params) {
+        executeRequest<DeleteThreePidResponse>(eventBus) {
+            val body = DeleteThreePidBody(
+                    medium = params.threePid.toMedium(),
+                    address = params.threePid.value
+            )
+            apiCall = profileAPI.deleteThreePid(body)
+        }
+
+        // We do not really care about the result for the moment
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt
new file mode 100644
index 0000000000..73e9b39cea
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+
+@JsonClass(generateAdapter = true)
+internal data class FinalizeAddThreePidBody(
+        /**
+         * Required. The client secret used in the session with the homeserver.
+         */
+        @Json(name = "client_secret")
+        val clientSecret: String,
+
+        /**
+         * Required. The session identifier given by the homeserver.
+         */
+        @Json(name = "sid")
+        val sid: String,
+
+        /**
+         * Additional authentication information for the user-interactive authentication API.
+         */
+        @Json(name = "auth")
+        val auth: UserPasswordAuth?
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
new file mode 100644
index 0000000000..3886b926ba
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.zhuinden.monarchy.Monarchy
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntityFields
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.awaitTransaction
+import javax.inject.Inject
+
+internal abstract class FinalizeAddingThreePidTask : Task<FinalizeAddingThreePidTask.Params, Unit> {
+    data class Params(
+            val threePid: ThreePid,
+            val session: String?,
+            val accountPassword: String?,
+            val userWantsToCancel: Boolean
+    )
+}
+
+internal class DefaultFinalizeAddingThreePidTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val pendingThreePidMapper: PendingThreePidMapper,
+        @UserId private val userId: String,
+        private val eventBus: EventBus) : FinalizeAddingThreePidTask() {
+
+    override suspend fun execute(params: Params) {
+        if (params.userWantsToCancel.not()) {
+            // Get the required pending data
+            val pendingThreePids = monarchy.fetchAllMappedSync(
+                    { it.where(PendingThreePidEntity::class.java) },
+                    { pendingThreePidMapper.map(it) }
+            )
+                    .firstOrNull { it.threePid == params.threePid }
+                    ?: throw IllegalArgumentException("unknown threepid")
+
+            try {
+                executeRequest<Unit>(eventBus) {
+                    val body = FinalizeAddThreePidBody(
+                            clientSecret = pendingThreePids.clientSecret,
+                            sid = pendingThreePids.sid,
+                            auth = if (params.session != null && params.accountPassword != null) {
+                                UserPasswordAuth(
+                                        session = params.session,
+                                        user = userId,
+                                        password = params.accountPassword
+                                )
+                            } else null
+                    )
+                    apiCall = profileAPI.finalizeAddThreePid(body)
+                }
+            } catch (throwable: Throwable) {
+                throw throwable.toRegistrationFlowResponse()
+                        ?.let { Failure.RegistrationFlowError(it) }
+                        ?: throwable
+            }
+        }
+
+        cleanupDatabase(params)
+    }
+
+    private suspend fun cleanupDatabase(params: Params) {
+        // Delete the pending three pid
+        monarchy.awaitTransaction { realm ->
+            realm.where(PendingThreePidEntity::class.java)
+                    .equalTo(PendingThreePidEntityFields.EMAIL, params.threePid.value)
+                    .or()
+                    .equalTo(PendingThreePidEntityFields.MSISDN, params.threePid.value)
+                    .findAll()
+                    .deleteAllFromRealm()
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
new file mode 100644
index 0000000000..af7e217d47
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
@@ -0,0 +1,29 @@
+/*
+ * 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 org.matrix.android.sdk.internal.session.profile
+
+import org.matrix.android.sdk.api.session.identity.ThreePid
+
+internal data class PendingThreePid(
+        val threePid: ThreePid,
+        val clientSecret: String,
+        val sendAttempt: Int,
+        // For Msisdn and Email
+        val sid: String,
+        // For Msisdn only
+        val submitUrl: String?
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
new file mode 100644
index 0000000000..b1877027ed
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
@@ -0,0 +1,47 @@
+/*
+ * 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 org.matrix.android.sdk.internal.session.profile
+
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
+import javax.inject.Inject
+
+internal class PendingThreePidMapper @Inject constructor() {
+
+    fun map(entity: PendingThreePidEntity): PendingThreePid {
+        return PendingThreePid(
+                threePid = entity.email?.let { ThreePid.Email(it) }
+                        ?: entity.msisdn?.let { ThreePid.Msisdn(it) }
+                        ?: error("Invalid data"),
+                clientSecret = entity.clientSecret,
+                sendAttempt = entity.sendAttempt,
+                sid = entity.sid,
+                submitUrl = entity.submitUrl
+        )
+    }
+
+    fun map(domain: PendingThreePid): PendingThreePidEntity {
+        return PendingThreePidEntity(
+                email = domain.threePid.takeIf { it is ThreePid.Email }?.value,
+                msisdn = domain.threePid.takeIf { it is ThreePid.Msisdn }?.value,
+                clientSecret = domain.clientSecret,
+                sendAttempt = domain.sendAttempt,
+                sid = domain.sid,
+                submitUrl = domain.submitUrl
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index 31e1f09bbd..4e2f518c5a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -19,6 +19,8 @@
 package org.matrix.android.sdk.internal.session.profile
 
 import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.auth.registration.SuccessResult
+import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
@@ -26,9 +28,9 @@ import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.PUT
 import retrofit2.http.Path
+import retrofit2.http.Url
 
 internal interface ProfileAPI {
-
     /**
      * Get the combined profile information for this user.
      * This API may be used to fetch the user's own profile information or other users; either locally or on remote homeservers.
@@ -71,4 +73,35 @@ internal interface ProfileAPI {
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "account/3pid/unbind")
     fun unbindThreePid(@Body body: UnbindThreePidBody): Call<UnbindThreePidResponse>
+
+    /**
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-email-requesttoken
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/email/requestToken")
+    fun addEmail(@Body body: AddEmailBody): Call<AddEmailResponse>
+
+    /**
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-msisdn-requesttoken
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/msisdn/requestToken")
+    fun addMsisdn(@Body body: AddMsisdnBody): Call<AddMsisdnResponse>
+
+    /**
+     * Validate Msisdn code (same model than for Identity server API)
+     */
+    @POST
+    fun validateMsisdn(@Url url: String,
+                       @Body params: ValidationCodeBody): Call<SuccessResult>
+
+    /**
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-add
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/add")
+    fun finalizeAddThreePid(@Body body: FinalizeAddThreePidBody): Call<Unit>
+
+    /**
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-delete
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/delete")
+    fun deleteThreePid(@Body body: DeleteThreePidBody): Call<DeleteThreePidResponse>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
index 57a86d03e0..ae7ae7a6f3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
@@ -58,4 +58,16 @@ internal abstract class ProfileModule {
 
     @Binds
     abstract fun bindSetAvatarUrlTask(task: DefaultSetAvatarUrlTask): SetAvatarUrlTask
+
+    @Binds
+    abstract fun bindAddThreePidTask(task: DefaultAddThreePidTask): AddThreePidTask
+
+    @Binds
+    abstract fun bindValidateSmsCodeTask(task: DefaultValidateSmsCodeTask): ValidateSmsCodeTask
+
+    @Binds
+    abstract fun bindFinalizeAddingThreePidTask(task: DefaultFinalizeAddingThreePidTask): FinalizeAddingThreePidTask
+
+    @Binds
+    abstract fun bindDeleteThreePidTask(task: DefaultDeleteThreePidTask): DeleteThreePidTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
new file mode 100644
index 0000000000..b11955b96a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.profile
+
+import com.zhuinden.monarchy.Monarchy
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.internal.auth.registration.SuccessResult
+import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
+import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface ValidateSmsCodeTask : Task<ValidateSmsCodeTask.Params, Unit> {
+    data class Params(
+            val threePid: ThreePid.Msisdn,
+            val code: String
+    )
+}
+
+internal class DefaultValidateSmsCodeTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        @SessionDatabase
+        private val monarchy: Monarchy,
+        private val pendingThreePidMapper: PendingThreePidMapper,
+        private val eventBus: EventBus
+) : ValidateSmsCodeTask {
+
+    override suspend fun execute(params: ValidateSmsCodeTask.Params) {
+        // Search the pending ThreePid
+        val pendingThreePids = monarchy.fetchAllMappedSync(
+                { it.where(PendingThreePidEntity::class.java) },
+                { pendingThreePidMapper.map(it) }
+        )
+                .firstOrNull { it.threePid == params.threePid }
+                ?: throw IllegalArgumentException("unknown threepid")
+
+        val url = pendingThreePids.submitUrl ?: throw IllegalArgumentException("invalid threepid")
+        val body = ValidationCodeBody(
+                clientSecret = pendingThreePids.clientSecret,
+                sid = pendingThreePids.sid,
+                code = params.code
+        )
+        val result = executeRequest<SuccessResult>(eventBus) {
+            apiCall = profileAPI.validateMsisdn(url, body)
+        }
+
+        if (!result.isSuccess()) {
+            throw Failure.SuccessError
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 4893947fc3..4a196193ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -347,7 +347,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                 if (userId == senderId) {
                     sumModel.myVote = optionIndex
                 }
-                Timber.v("## POLL adding vote $optionIndex for user $senderId in poll :$relatedEventId ")
+                Timber.v("## POLL adding vote $optionIndex for user $senderId in poll :$targetEventId ")
             } else {
                 Timber.v("## POLL Ignoring vote (older than known one)  eventId:$eventId ")
             }
@@ -356,7 +356,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
             if (userId == senderId) {
                 sumModel.myVote = optionIndex
             }
-            Timber.v("## POLL adding vote $optionIndex for user $senderId in poll :$relatedEventId ")
+            Timber.v("## POLL adding vote $optionIndex for user $senderId in poll :$targetEventId ")
         }
         sumModel.votes = votes
         if (isLocalEcho) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 25dcc69fa8..35c20cf5cb 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
@@ -130,21 +130,6 @@ internal interface RoomAPI {
              @Body content: Content?
     ): Call<SendResponse>
 
-    /**
-     * Send an event to a room.
-     *
-     * @param txId      the transaction Id
-     * @param roomId    the room id
-     * @param eventType the event type
-     * @param content   the event content as string
-     */
-    @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/send/{eventType}/{txId}")
-    fun send(@Path("txId") txId: String,
-             @Path("roomId") roomId: String,
-             @Path("eventType") eventType: String,
-             @Body content: String?
-    ): Call<SendResponse>
-
     /**
      * Get the context surrounding an event.
      *
@@ -235,9 +220,9 @@ internal interface RoomAPI {
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/send_relation/{parent_id}/{relation_type}/{event_type}")
     fun sendRelation(@Path("roomId") roomId: String,
-                     @Path("parentId") parent_id: String,
+                     @Path("parent_id") parentId: String,
                      @Path("relation_type") relationType: String,
-                     @Path("eventType") eventType: String,
+                     @Path("event_type") eventType: String,
                      @Body content: Content?
     ): Call<SendResponse>
 
@@ -311,16 +296,16 @@ internal interface RoomAPI {
      * This cannot be undone.
      * Users may redact their own events, and any user with a power level greater than or equal to the redact power level of the room may redact events there.
      *
-     * @param txId      the transaction Id
-     * @param roomId    the room id
-     * @param eventId   the event to delete
+     * @param txId     the transaction Id
+     * @param roomId   the room id
+     * @param eventId  the event to delete
      * @param reason   json containing reason key {"reason": "Indecent material"}
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/redact/{eventId}/{txnId}")
     fun redactEvent(
             @Path("txnId") txId: String,
             @Path("roomId") roomId: String,
-            @Path("eventId") parent_id: String,
+            @Path("eventId") eventId: String,
             @Body reason: Map<String, String>
     ): Call<SendResponse>
 
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 7f21ee84f6..700507735b 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
@@ -20,6 +20,8 @@ package org.matrix.android.sdk.internal.session.room
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
+import org.commonmark.parser.Parser
+import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.RoomService
@@ -75,9 +77,6 @@ import org.matrix.android.sdk.internal.session.room.typing.DefaultSendTypingTask
 import org.matrix.android.sdk.internal.session.room.typing.SendTypingTask
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultGetUploadsTask
 import org.matrix.android.sdk.internal.session.room.uploads.GetUploadsTask
-import org.commonmark.parser.Parser
-import org.commonmark.renderer.html.HtmlRenderer
-import org.commonmark.renderer.text.TextContentRenderer
 import retrofit2.Retrofit
 
 @Module
@@ -105,14 +104,6 @@ internal abstract class RoomModule {
                     .builder()
                     .build()
         }
-
-        @Provides
-        @JvmStatic
-        fun providesTextContentRenderer(): TextContentRenderer {
-            return TextContentRenderer
-                    .builder()
-                    .build()
-        }
     }
 
     @Binds
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 6e450e5428..0a814a4c93 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -57,8 +57,8 @@ internal class CreateRoomBodyBuilder @Inject constructor(
 
                     invites.map {
                         ThreePidInviteBody(
-                                id_server = identityServerUrlWithoutProtocol,
-                                id_access_token = identityServerAccessToken,
+                                idServer = identityServerUrlWithoutProtocol,
+                                idAccessToken = identityServerAccessToken,
                                 medium = it.toMedium(),
                                 address = it.value
                         )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index d11226bdb1..942da9995e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -17,7 +17,7 @@
 
 package org.matrix.android.sdk.internal.session.room.membership
 
-import android.content.Context
+import io.realm.Realm
 import org.matrix.android.sdk.R
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -34,14 +34,15 @@ import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.query.getOrNull
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.UserId
-import io.realm.Realm
+import org.matrix.android.sdk.internal.util.StringProvider
 import javax.inject.Inject
 
 /**
  * This class computes room display name
  */
-internal class RoomDisplayNameResolver @Inject constructor(private val context: Context,
-                                                           @UserId private val userId: String
+internal class RoomDisplayNameResolver @Inject constructor(
+        private val stringProvider: StringProvider,
+        @UserId private val userId: String
 ) {
 
     /**
@@ -89,7 +90,7 @@ internal class RoomDisplayNameResolver @Inject constructor(private val context:
                         .findFirst()
                         ?.displayName
             } else {
-                context.getString(R.string.room_displayname_room_invite)
+                stringProvider.getString(R.string.room_displayname_room_invite)
             }
         } else if (roomEntity?.membership == Membership.JOIN) {
             val roomSummary = RoomSummaryEntity.where(realm, roomId).findFirst()
@@ -108,13 +109,13 @@ internal class RoomDisplayNameResolver @Inject constructor(private val context:
             }
             val otherMembersCount = otherMembersSubset.count()
             name = when (otherMembersCount) {
-                0    -> context.getString(R.string.room_displayname_empty_room)
-                1    -> resolveRoomMemberName(otherMembersSubset[0], roomMembers)
-                2    -> context.getString(R.string.room_displayname_two_members,
+                0 -> stringProvider.getString(R.string.room_displayname_empty_room)
+                1 -> resolveRoomMemberName(otherMembersSubset[0], roomMembers)
+                2 -> stringProvider.getString(R.string.room_displayname_two_members,
                         resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                         resolveRoomMemberName(otherMembersSubset[1], roomMembers)
                 )
-                else -> context.resources.getQuantityString(R.plurals.room_displayname_three_and_more_members,
+                else -> stringProvider.getQuantityString(R.plurals.room_displayname_three_and_more_members,
                         roomMembers.getNumberOfJoinedMembers() - 1,
                         resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                         roomMembers.getNumberOfJoinedMembers() - 1)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
index b18e44360d..88809fec13 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
@@ -17,6 +17,7 @@
 
 package org.matrix.android.sdk.internal.session.room.membership.threepid
 
+import org.greenrobot.eventbus.EventBus
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.identity.toMedium
@@ -28,7 +29,6 @@ import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
 import org.matrix.android.sdk.internal.session.identity.data.getIdentityServerUrlWithoutProtocol
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.task.Task
-import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
 internal interface InviteThreePidTask : Task<InviteThreePidTask.Params, Unit> {
@@ -55,8 +55,8 @@ internal class DefaultInviteThreePidTask @Inject constructor(
 
         return executeRequest(eventBus) {
             val body = ThreePidInviteBody(
-                    id_server = identityServerUrlWithoutProtocol,
-                    id_access_token = identityServerAccessToken,
+                    idServer = identityServerUrlWithoutProtocol,
+                    idAccessToken = identityServerAccessToken,
                     medium = params.threePid.toMedium(),
                     address = params.threePid.value
             )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
index 93b5c577fc..5b0098dc9b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
@@ -25,18 +25,22 @@ internal data class ThreePidInviteBody(
         /**
          * Required. The hostname+port of the identity server which should be used for third party identifier lookups.
          */
-        @Json(name = "id_server") val id_server: String,
+        @Json(name = "id_server")
+        val idServer: String,
         /**
          * Required. An access token previously registered with the identity server. Servers can treat this as optional
          * to distinguish between r0.5-compatible clients and this specification version.
          */
-        @Json(name = "id_access_token") val id_access_token: String,
+        @Json(name = "id_access_token")
+        val idAccessToken: String,
         /**
          * Required. The kind of address being passed in the address field, for example email.
          */
-        @Json(name = "medium") val medium: String,
+        @Json(name = "medium")
+        val medium: String,
         /**
          * Required. The invitee's third party identifier.
          */
-        @Json(name = "address") val address: String
+        @Json(name = "address")
+        val address: String
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
index 1a19a40602..86a9500339 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
@@ -18,7 +18,7 @@
 package org.matrix.android.sdk.internal.session.room.notification
 
 import org.matrix.android.sdk.api.pushrules.Action
-import org.matrix.android.sdk.api.pushrules.Condition
+import org.matrix.android.sdk.api.pushrules.Kind
 import org.matrix.android.sdk.api.pushrules.RuleSetKey
 import org.matrix.android.sdk.api.pushrules.getActions
 import org.matrix.android.sdk.api.pushrules.rest.PushCondition
@@ -59,7 +59,7 @@ internal fun RoomNotificationState.toRoomPushRule(roomId: String): RoomPushRule?
         }
         else                                             -> {
             val condition = PushCondition(
-                    kind = Condition.Kind.EventMatch.value,
+                    kind = Kind.EventMatch.value,
                     key = "room_id",
                     pattern = roomId
             )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index 2199193de0..111551d66d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -208,7 +208,7 @@ internal class DefaultRelationService @AssistedInject constructor(
     }
 
     private fun createSendEventWork(event: Event, startChain: Boolean): OneTimeWorkRequest {
-        val sendContentWorkerParams = SendEventWorker.Params(sessionId, event)
+        val sendContentWorkerParams = SendEventWorker.Params(sessionId = sessionId, event = event)
         val sendWorkData = WorkerParamsFactory.toData(sendContentWorkerParams)
         return timeLineSendEventWorkCommon.createWork<SendEventWorker>(sendWorkData, startChain)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
index dc72c3b96b..fc7f712629 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
+import org.greenrobot.eventbus.EventBus
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -31,7 +32,6 @@ import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import org.matrix.android.sdk.internal.worker.getSessionComponent
-import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -92,7 +92,7 @@ internal class SendRelationWorker(context: Context, params: WorkerParameters) :
         executeRequest<SendResponse>(eventBus) {
             apiCall = roomAPI.sendRelation(
                     roomId = roomId,
-                    parent_id = relatedEventId,
+                    parentId = relatedEventId,
                     relationType = relationType,
                     eventType = localEvent.type,
                     content = localEvent.content
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/CancelSendTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/CancelSendTracker.kt
new file mode 100644
index 0000000000..0b79b93cf6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/CancelSendTracker.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.send
+
+import org.matrix.android.sdk.internal.session.SessionScope
+import javax.inject.Inject
+
+/**
+ * We cannot use work manager cancellation mechanism because cancelling a work will just ignore
+ * any follow up send that was already queued.
+ * We use this class to track cancel requests, the workers will look for this to check for cancellation request
+ * and just ignore the work request and continue by returning success.
+ *
+ * Known limitation, for now requests are not persisted
+ */
+@SessionScope
+internal class CancelSendTracker @Inject constructor() {
+
+    data class Request(
+            val localId: String,
+            val roomId: String
+    )
+
+    private val cancellingRequests = ArrayList<Request>()
+
+    fun markLocalEchoForCancel(eventId: String, roomId: String) {
+        synchronized(cancellingRequests) {
+            cancellingRequests.add(Request(eventId, roomId))
+        }
+    }
+
+    fun isCancelRequestedFor(eventId: String?, roomId: String?): Boolean {
+        val index = synchronized(cancellingRequests) {
+            cancellingRequests.indexOfFirst { it.localId == eventId && it.roomId == roomId }
+        }
+        return index != -1
+    }
+
+    fun markCancelled(eventId: String, roomId: String) {
+        synchronized(cancellingRequests) {
+            val index = cancellingRequests.indexOfFirst { it.localId == eventId && it.roomId == roomId }
+            if (index != -1) {
+                cancellingRequests.removeAt(index)
+            }
+        }
+    }
+}
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 d6fa6775ee..95cd1c699c 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
@@ -17,24 +17,35 @@
 
 package org.matrix.android.sdk.internal.session.room.send
 
+import android.net.Uri
 import androidx.work.BackoffPolicy
 import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.Operation
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.events.model.isImageMessage
+import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFileContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
 import org.matrix.android.sdk.api.session.room.model.message.OptionItem
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
 import org.matrix.android.sdk.api.session.room.send.SendService
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.CancelableBag
 import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.api.util.NoOpCancellable
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.content.UploadContentWorker
@@ -44,7 +55,6 @@ import org.matrix.android.sdk.internal.util.CancelableWork
 import org.matrix.android.sdk.internal.worker.AlwaysSuccessfulWorker
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import org.matrix.android.sdk.internal.worker.startChain
-import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
@@ -60,7 +70,8 @@ internal class DefaultSendService @AssistedInject constructor(
         private val cryptoService: CryptoService,
         private val taskExecutor: TaskExecutor,
         private val localEchoRepository: LocalEchoRepository,
-        private val roomEventSender: RoomEventSender
+        private val roomEventSender: RoomEventSender,
+        private val cancelSendTracker: CancelSendTracker
 ) : SendService {
 
     @AssistedInject.Factory
@@ -127,48 +138,83 @@ internal class DefaultSendService @AssistedInject constructor(
                 .let { timelineSendEventWorkCommon.postWork(roomId, it) }
     }
 
-    override fun resendTextMessage(localEcho: TimelineEvent): Cancelable? {
+    override fun resendTextMessage(localEcho: TimelineEvent): Cancelable {
         if (localEcho.root.isTextMessage() && localEcho.root.sendState.hasFailed()) {
             localEchoRepository.updateSendState(localEcho.eventId, SendState.UNSENT)
             return sendEvent(localEcho.root)
         }
-        return null
+        return NoOpCancellable
     }
 
-    override fun resendMediaMessage(localEcho: TimelineEvent): Cancelable? {
-        if (localEcho.root.isImageMessage() && localEcho.root.sendState.hasFailed()) {
-            // TODO this need a refactoring of attachement sending
-//        val clearContent = localEcho.root.getClearContent()
-//        val messageContent = clearContent?.toModel<MessageContent>() ?: return null
-//        when (messageContent.type) {
-//            MessageType.MSGTYPE_IMAGE -> {
-//                val imageContent = clearContent.toModel<MessageImageContent>() ?: return null
-//                val url = imageContent.url ?: return null
-//                if (url.startsWith("mxc://")) {
-//                    //TODO
-//                } else {
-//                    //The image has not yet been sent
-//                    val attachmentData = ContentAttachmentData(
-//                            size = imageContent.info!!.size.toLong(),
-//                            mimeType = imageContent.info.mimeType!!,
-//                            width = imageContent.info.width.toLong(),
-//                            height = imageContent.info.height.toLong(),
-//                            name = imageContent.body,
-//                            path = imageContent.url,
-//                            type = ContentAttachmentData.Type.IMAGE
-//                    )
-//                    monarchy.runTransactionSync {
-//                        EventEntity.where(it,eventId = localEcho.root.eventId ?: "").findFirst()?.let {
-//                            it.sendState = SendState.UNSENT
-//                        }
-//                    }
-//                    return internalSendMedia(localEcho.root,attachmentData)
-//                }
-//            }
-//        }
-            return null
+    override fun resendMediaMessage(localEcho: TimelineEvent): Cancelable {
+        if (localEcho.root.sendState.hasFailed()) {
+            val clearContent = localEcho.root.getClearContent()
+            val messageContent = clearContent?.toModel<MessageContent>() as? MessageWithAttachmentContent ?: return NoOpCancellable
+
+            val url = messageContent.getFileUrl() ?: return NoOpCancellable
+            if (url.startsWith("mxc://")) {
+                // We need to resend only the message as the attachment is ok
+                localEchoRepository.updateSendState(localEcho.eventId, SendState.UNSENT)
+                return sendEvent(localEcho.root)
+            }
+
+            // we need to resend the media
+            return when (messageContent) {
+                is MessageImageContent -> {
+                    // The image has not yet been sent
+                    val attachmentData = ContentAttachmentData(
+                            size = messageContent.info!!.size.toLong(),
+                            mimeType = messageContent.info.mimeType!!,
+                            width = messageContent.info.width.toLong(),
+                            height = messageContent.info.height.toLong(),
+                            name = messageContent.body,
+                            queryUri = Uri.parse(messageContent.url),
+                            type = ContentAttachmentData.Type.IMAGE
+                    )
+                    localEchoRepository.updateSendState(localEcho.eventId, SendState.UNSENT)
+                    internalSendMedia(listOf(localEcho.root), attachmentData, true)
+                }
+                is MessageVideoContent -> {
+                    val attachmentData = ContentAttachmentData(
+                            size = messageContent.videoInfo?.size ?: 0L,
+                            mimeType = messageContent.mimeType,
+                            width = messageContent.videoInfo?.width?.toLong(),
+                            height = messageContent.videoInfo?.height?.toLong(),
+                            duration = messageContent.videoInfo?.duration?.toLong(),
+                            name = messageContent.body,
+                            queryUri = Uri.parse(messageContent.url),
+                            type = ContentAttachmentData.Type.VIDEO
+                    )
+                    localEchoRepository.updateSendState(localEcho.eventId, SendState.UNSENT)
+                    internalSendMedia(listOf(localEcho.root), attachmentData, true)
+                }
+                is MessageFileContent -> {
+                    val attachmentData = ContentAttachmentData(
+                            size = messageContent.info!!.size,
+                            mimeType = messageContent.info.mimeType!!,
+                            name = messageContent.body,
+                            queryUri = Uri.parse(messageContent.url),
+                            type = ContentAttachmentData.Type.FILE
+                    )
+                    localEchoRepository.updateSendState(localEcho.eventId, SendState.UNSENT)
+                    internalSendMedia(listOf(localEcho.root), attachmentData, true)
+                }
+                is MessageAudioContent -> {
+                    val attachmentData = ContentAttachmentData(
+                            size = messageContent.audioInfo?.size ?: 0,
+                            duration = messageContent.audioInfo?.duration?.toLong() ?: 0L,
+                            mimeType = messageContent.audioInfo?.mimeType,
+                            name = messageContent.body,
+                            queryUri = Uri.parse(messageContent.url),
+                            type = ContentAttachmentData.Type.AUDIO
+                    )
+                    localEchoRepository.updateSendState(localEcho.eventId, SendState.UNSENT)
+                    internalSendMedia(listOf(localEcho.root), attachmentData, true)
+                }
+                else                   -> NoOpCancellable
+            }
         }
-        return null
+        return NoOpCancellable
     }
 
     override fun deleteFailedEcho(localEcho: TimelineEvent) {
@@ -196,16 +242,34 @@ internal class DefaultSendService @AssistedInject constructor(
         }
     }
 
+    override fun cancelSend(eventId: String) {
+        cancelSendTracker.markLocalEchoForCancel(eventId, roomId)
+        taskExecutor.executorScope.launch {
+            localEchoRepository.deleteFailedEcho(roomId, eventId)
+        }
+    }
+
     override fun resendAllFailedMessages() {
         taskExecutor.executorScope.launch {
             val eventsToResend = localEchoRepository.getAllFailedEventsToResend(roomId)
             eventsToResend.forEach {
-                sendEvent(it)
+                if (it.root.isTextMessage()) {
+                    resendTextMessage(it)
+                } else if (it.root.isAttachmentMessage()) {
+                    resendMediaMessage(it)
+                }
             }
-            localEchoRepository.updateSendState(roomId, eventsToResend.mapNotNull { it.eventId }, SendState.UNSENT)
+            localEchoRepository.updateSendState(roomId, eventsToResend.map { it.eventId }, SendState.UNSENT)
         }
     }
 
+//    override fun failAllPendingMessages() {
+//        taskExecutor.executorScope.launch {
+//            val eventsToResend = localEchoRepository.getAllEventsWithStates(roomId, SendState.PENDING_STATES)
+//            localEchoRepository.updateSendState(roomId, eventsToResend.map { it.eventId }, SendState.UNDELIVERED)
+//        }
+//    }
+
     override fun sendMedia(attachment: ContentAttachmentData,
                            compressBeforeSending: Boolean,
                            roomIds: Set<String>): Cancelable {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt
index d23835e838..6b2a2ab115 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt
@@ -54,6 +54,7 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters)
 
     @Inject lateinit var crypto: CryptoService
     @Inject lateinit var localEchoRepository: LocalEchoRepository
+    @Inject lateinit var cancelSendTracker: CancelSendTracker
 
     override suspend fun doWork(): Result {
         Timber.v("Start Encrypt work")
@@ -61,7 +62,7 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters)
                 ?: return Result.success()
                         .also { Timber.e("Unable to parse work parameters") }
 
-        Timber.v("Start Encrypt work for event ${params.event.eventId}")
+        Timber.v("## SendEvent: Start Encrypt work for event ${params.event.eventId}")
         if (params.lastFailureMessage != null) {
             // Transmit the error
             return Result.success(inputData)
@@ -75,6 +76,12 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters)
         if (localEvent.eventId == null) {
             return Result.success()
         }
+
+        if (cancelSendTracker.isCancelRequestedFor(localEvent.eventId, localEvent.roomId)) {
+            return Result.success()
+                    .also { Timber.e("## SendEvent: Event sending has been cancelled ${localEvent.eventId}") }
+        }
+
         localEchoRepository.updateSendState(localEvent.eventId, SendState.ENCRYPTING)
 
         val localMutableContent = localEvent.content?.toMutableMap() ?: mutableMapOf()
@@ -120,7 +127,7 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters)
                 localEchoRepository.updateEncryptedEcho(localEvent.eventId, safeResult.eventContent, decryptionLocalEcho)
             }
 
-            val nextWorkerParams = SendEventWorker.Params(params.sessionId, encryptedEvent)
+            val nextWorkerParams = SendEventWorker.Params(sessionId = params.sessionId, event = encryptedEvent)
             return Result.success(WorkerParamsFactory.toData(nextWorkerParams))
         } else {
             val sendState = when (error) {
@@ -129,8 +136,11 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters)
             }
             localEchoRepository.updateSendState(localEvent.eventId, sendState)
             // always return success, or the chain will be stuck for ever!
-            val nextWorkerParams = SendEventWorker.Params(params.sessionId, localEvent, error?.localizedMessage
-                    ?: "Error")
+            val nextWorkerParams = SendEventWorker.Params(
+                    sessionId = params.sessionId,
+                    event = localEvent,
+                    lastFailureMessage = error?.localizedMessage ?: "Error"
+            )
             return Result.success(WorkerParamsFactory.toData(nextWorkerParams))
         }
     }
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 a9859136ad..b3188883c0 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
@@ -30,7 +30,6 @@ import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
 import org.matrix.android.sdk.internal.database.helper.nextId
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
-import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.mapper.toEntity
 import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.EventInsertEntity
@@ -88,7 +87,7 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
     }
 
     fun updateSendState(eventId: String, sendState: SendState) {
-        Timber.v("Update local state of $eventId to ${sendState.name}")
+        Timber.v("## SendEvent: [${System.currentTimeMillis()}] Update local state of $eventId to ${sendState.name}")
         monarchy.writeAsync { realm ->
             val sendingEventEntity = EventEntity.where(realm, eventId).findFirst()
             if (sendingEventEntity != null) {
@@ -114,9 +113,13 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
     }
 
     suspend fun deleteFailedEcho(roomId: String, localEcho: TimelineEvent) {
+        deleteFailedEcho(roomId, localEcho.eventId)
+    }
+
+    suspend fun deleteFailedEcho(roomId: String, eventId: String?) {
         monarchy.awaitTransaction { realm ->
-            TimelineEventEntity.where(realm, roomId = roomId, eventId = localEcho.root.eventId ?: "").findFirst()?.deleteFromRealm()
-            EventEntity.where(realm, eventId = localEcho.root.eventId ?: "").findFirst()?.deleteFromRealm()
+            TimelineEventEntity.where(realm, roomId = roomId, eventId = eventId ?: "").findFirst()?.deleteFromRealm()
+            EventEntity.where(realm, eventId = eventId ?: "").findFirst()?.deleteFromRealm()
             roomSummaryUpdater.updateSendingInformation(realm, roomId)
         }
     }
@@ -142,45 +145,47 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
         }
     }
 
-    fun getAllFailedEventsToResend(roomId: String): List<Event> {
+    fun getAllFailedEventsToResend(roomId: String): List<TimelineEvent> {
+        return getAllEventsWithStates(roomId, SendState.HAS_FAILED_STATES)
+    }
+
+    fun getAllEventsWithStates(roomId: String, states : List<SendState>): List<TimelineEvent> {
         return Realm.getInstance(monarchy.realmConfiguration).use { realm ->
             TimelineEventEntity
-                    .findAllInRoomWithSendStates(realm, roomId, SendState.HAS_FAILED_STATES)
+                    .findAllInRoomWithSendStates(realm, roomId, states)
                     .sortedByDescending { it.displayIndex }
-                    .mapNotNull { it.root?.asDomain() }
+                    .mapNotNull { it?.let { timelineEventMapper.map(it) } }
                     .filter { event ->
-                        when (event.getClearType()) {
+                        when (event.root.getClearType()) {
                             EventType.MESSAGE,
                             EventType.REDACTION,
                             EventType.REACTION -> {
-                                val content = event.getClearContent().toModel<MessageContent>()
+                                val content = event.root.getClearContent().toModel<MessageContent>()
                                 if (content != null) {
                                     when (content.msgType) {
                                         MessageType.MSGTYPE_EMOTE,
                                         MessageType.MSGTYPE_NOTICE,
                                         MessageType.MSGTYPE_LOCATION,
-                                        MessageType.MSGTYPE_TEXT  -> {
-                                            true
-                                        }
+                                        MessageType.MSGTYPE_TEXT,
                                         MessageType.MSGTYPE_FILE,
                                         MessageType.MSGTYPE_VIDEO,
                                         MessageType.MSGTYPE_IMAGE,
                                         MessageType.MSGTYPE_AUDIO -> {
                                             // need to resend the attachment
-                                            false
+                                            true
                                         }
                                         else                      -> {
-                                            Timber.e("Cannot resend message ${event.type} / ${content.msgType}")
+                                            Timber.e("Cannot resend message ${event.root.getClearType()} / ${content.msgType}")
                                             false
                                         }
                                     }
                                 } else {
-                                    Timber.e("Unsupported message to resend ${event.type}")
+                                    Timber.e("Unsupported message to resend ${event.root.getClearType()}")
                                     false
                                 }
                             }
                             else               -> {
-                                Timber.e("Unsupported message to resend ${event.type}")
+                                Timber.e("Unsupported message to resend ${event.root.getClearType()}")
                                 false
                             }
                         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index 3390d9dc79..f80285574e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.room.send
 
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
-import org.commonmark.renderer.text.TextContentRenderer
 import javax.inject.Inject
 
 /**
@@ -29,11 +28,10 @@ import javax.inject.Inject
  */
 internal class MarkdownParser @Inject constructor(
         private val parser: Parser,
-        private val htmlRenderer: HtmlRenderer,
-        private val textContentRenderer: TextContentRenderer
+        private val htmlRenderer: HtmlRenderer
 ) {
 
-    private val mdSpecialChars = "[`_\\-\\*>\\.\\[\\]#~]".toRegex()
+    private val mdSpecialChars = "[`_\\-*>.\\[\\]#~]".toRegex()
 
     fun parse(text: String): TextContent {
         // If no special char are detected, just return plain text
@@ -54,8 +52,8 @@ internal class MarkdownParser @Inject constructor(
         return if (isFormattedTextPertinent(text, cleanHtmlText)) {
             // According to https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes:
             // The plain text version of the HTML should be provided in the body.
-            val plainText = textContentRenderer.render(document)
-            TextContent(plainText, cleanHtmlText.postTreatment())
+            // But it caused too many problems so it has been removed in #2002
+            TextContent(text, cleanHtmlText.postTreatment())
         } else {
             TextContent(text)
         }
@@ -72,6 +70,7 @@ internal class MarkdownParser @Inject constructor(
                 // Remove extra space before and after the content
                 .trim()
                 // There is no need to include new line in an html-like source
-                .replace("\n", "")
+                // But new line can be in embedded code block, so do not remove them
+                // .replace("\n", "")
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
index 73791e8412..8e8d24c227 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
@@ -58,7 +58,7 @@ internal class MultipleEventSendingDispatcherWorker(context: Context, params: Wo
     @Inject lateinit var localEchoRepository: LocalEchoRepository
 
     override suspend fun doWork(): Result {
-        Timber.v("Start dispatch sending multiple event work")
+        Timber.v("## SendEvent: Start dispatch sending multiple event work")
         val params = WorkerParamsFactory.fromData<Params>(inputData)
                 ?: return Result.success()
                         .also { Timber.e("Unable to parse work parameters") }
@@ -72,18 +72,21 @@ internal class MultipleEventSendingDispatcherWorker(context: Context, params: Wo
             }
             // Transmit the error if needed?
             return Result.success(inputData)
-                    .also { Timber.e("Work cancelled due to input error from parent") }
+                    .also { Timber.e("## SendEvent: Work cancelled due to input error from parent ${params.lastFailureMessage}") }
         }
 
         // Create a work for every event
         params.events.forEach { event ->
             if (params.isEncrypted) {
-                Timber.v("Send event in encrypted room")
+                localEchoRepository.updateSendState(event.eventId ?: "", SendState.ENCRYPTING)
+                Timber.v("## SendEvent: [${System.currentTimeMillis()}] Schedule encrypt and send event ${event.eventId}")
                 val encryptWork = createEncryptEventWork(params.sessionId, event, true)
                 // Note that event will be replaced by the result of the previous work
                 val sendWork = createSendEventWork(params.sessionId, event, false)
                 timelineSendEventWorkCommon.postSequentialWorks(event.roomId!!, encryptWork, sendWork)
             } else {
+                localEchoRepository.updateSendState(event.eventId ?: "", SendState.SENDING)
+                Timber.v("## SendEvent: [${System.currentTimeMillis()}] Schedule send event ${event.eventId}")
                 val sendWork = createSendEventWork(params.sessionId, event, true)
                 timelineSendEventWorkCommon.postWork(event.roomId!!, sendWork)
             }
@@ -105,7 +108,7 @@ internal class MultipleEventSendingDispatcherWorker(context: Context, params: Wo
     }
 
     private fun createSendEventWork(sessionId: String, event: Event, startChain: Boolean): OneTimeWorkRequest {
-        val sendContentWorkerParams = SendEventWorker.Params(sessionId, event)
+        val sendContentWorkerParams = SendEventWorker.Params(sessionId = sessionId, event = event)
         val sendWorkData = WorkerParamsFactory.toData(sendContentWorkerParams)
 
         return timelineSendEventWorkCommon.createWork<SendEventWorker>(sendWorkData, startChain)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt
index 65c692f42e..6085459a08 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt
@@ -39,13 +39,16 @@ internal class RoomEventSender @Inject constructor(
 ) {
     fun sendEvent(event: Event): Cancelable {
         // Encrypted room handling
-        return if (cryptoService.isRoomEncrypted(event.roomId ?: "")) {
-            Timber.v("Send event in encrypted room")
+        return if (cryptoService.isRoomEncrypted(event.roomId ?: "")
+                && !event.isEncrypted() // In case of resend where it's already encrypted so skip to send
+        ) {
+            Timber.v("## SendEvent: [${System.currentTimeMillis()}] Schedule encrypt and send event ${event.eventId}")
             val encryptWork = createEncryptEventWork(event, true)
             // Note that event will be replaced by the result of the previous work
             val sendWork = createSendEventWork(event, false)
             timelineSendEventWorkCommon.postSequentialWorks(event.roomId ?: "", encryptWork, sendWork)
         } else {
+            Timber.v("## SendEvent: [${System.currentTimeMillis()}] Schedule send event ${event.eventId}")
             val sendWork = createSendEventWork(event, true)
             timelineSendEventWorkCommon.postWork(event.roomId ?: "", sendWork)
         }
@@ -65,7 +68,7 @@ internal class RoomEventSender @Inject constructor(
     }
 
     private fun createSendEventWork(event: Event, startChain: Boolean): OneTimeWorkRequest {
-        val sendContentWorkerParams = SendEventWorker.Params(sessionId, event)
+        val sendContentWorkerParams = SendEventWorker.Params(sessionId = sessionId, event = event)
         val sendWorkData = WorkerParamsFactory.toData(sendContentWorkerParams)
 
         return timelineSendEventWorkCommon.createWork<SendEventWorker>(sendWorkData, startChain)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
index 2868ce29c1..16acde7d16 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
@@ -21,20 +21,20 @@ import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
+import org.greenrobot.eventbus.EventBus
 import org.matrix.android.sdk.api.failure.shouldBeRetried
+import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.send.SendState
-import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import org.matrix.android.sdk.internal.worker.getSessionComponent
-import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
 
-private const val MAX_NUMBER_OF_RETRY_BEFORE_FAILING = 3
+// private const val MAX_NUMBER_OF_RETRY_BEFORE_FAILING = 3
 
 /**
  * Possible previous worker: [EncryptEventWorker] or first worker
@@ -47,68 +47,69 @@ internal class SendEventWorker(context: Context,
     @JsonClass(generateAdapter = true)
     internal data class Params(
             override val sessionId: String,
-            // TODO remove after some time, it's used for compat
+            override val lastFailureMessage: String? = null,
             val event: Event? = null,
-            val eventId: String? = null,
-            val roomId: String? = null,
-            val type: String? = null,
-            val contentStr: String? = null,
-            override val lastFailureMessage: String? = null
-    ) : SessionWorkerParams {
-
-        constructor(sessionId: String, event: Event, lastFailureMessage: String? = null) : this(
-                sessionId = sessionId,
-                eventId = event.eventId,
-                roomId = event.roomId,
-                type = event.type,
-                contentStr = ContentMapper.map(event.content),
-                lastFailureMessage = lastFailureMessage
-        )
-    }
+            // Keep for compat at the moment, will be removed later
+            val eventId: String? = null
+    ) : SessionWorkerParams
 
     @Inject lateinit var localEchoRepository: LocalEchoRepository
     @Inject lateinit var roomAPI: RoomAPI
     @Inject lateinit var eventBus: EventBus
+    @Inject lateinit var cancelSendTracker: CancelSendTracker
 
     override suspend fun doWork(): Result {
         val params = WorkerParamsFactory.fromData<Params>(inputData)
                 ?: return Result.success()
-                        .also { Timber.e("Unable to parse work parameters") }
-
+                        .also { Timber.e("## SendEvent: Unable to parse work parameters") }
         val sessionComponent = getSessionComponent(params.sessionId) ?: return Result.success()
         sessionComponent.inject(this)
-        if (params.eventId == null || params.roomId == null || params.type == null) {
-            // compat with old params, make it fail if any
-            if (params.event?.eventId != null) {
-                localEchoRepository.updateSendState(params.event.eventId, SendState.UNDELIVERED)
+
+        val event = params.event
+        if (event?.eventId == null || event.roomId == null) {
+            // Old way of sending
+            if (params.eventId != null) {
+                localEchoRepository.updateSendState(params.eventId, SendState.UNDELIVERED)
             }
             return Result.success()
+                    .also { Timber.e("Work cancelled due to bad input data") }
         }
+
+        if (cancelSendTracker.isCancelRequestedFor(params.eventId, event.roomId)) {
+            return Result.success()
+                    .also {
+                        cancelSendTracker.markCancelled(event.eventId, event.roomId)
+                        Timber.e("## SendEvent: Event sending has been cancelled ${params.eventId}")
+                    }
+        }
+
         if (params.lastFailureMessage != null) {
-            localEchoRepository.updateSendState(params.eventId, SendState.UNDELIVERED)
+            localEchoRepository.updateSendState(event.eventId, SendState.UNDELIVERED)
             // Transmit the error
             return Result.success(inputData)
                     .also { Timber.e("Work cancelled due to input error from parent") }
         }
+
+        Timber.v("## SendEvent: [${System.currentTimeMillis()}] Send event ${params.eventId}")
         return try {
-            sendEvent(params.eventId, params.roomId, params.type, params.contentStr)
+            sendEvent(event.eventId, event.roomId, event.type, event.content)
             Result.success()
         } catch (exception: Throwable) {
-            // It does start from 0, we want it to stop if it fails the third time
-            val currentAttemptCount = runAttemptCount + 1
-            if (currentAttemptCount >= MAX_NUMBER_OF_RETRY_BEFORE_FAILING || !exception.shouldBeRetried()) {
-                localEchoRepository.updateSendState(params.eventId, SendState.UNDELIVERED)
+            if (/*currentAttemptCount >= MAX_NUMBER_OF_RETRY_BEFORE_FAILING ||**/ !exception.shouldBeRetried()) {
+                Timber.e("## SendEvent: [${System.currentTimeMillis()}]  Send event Failed cannot retry ${params.eventId} > ${exception.localizedMessage}")
+                localEchoRepository.updateSendState(event.eventId, SendState.UNDELIVERED)
                 return Result.success()
             } else {
+                Timber.e("## SendEvent: [${System.currentTimeMillis()}]  Send event Failed schedule retry ${params.eventId} > ${exception.localizedMessage}")
                 Result.retry()
             }
         }
     }
 
-    private suspend fun sendEvent(eventId: String, roomId: String, type: String, contentStr: String?) {
+    private suspend fun sendEvent(eventId: String, roomId: String, type: String, content: Content?) {
         localEchoRepository.updateSendState(eventId, SendState.SENDING)
         executeRequest<SendResponse>(eventBus) {
-            apiCall = roomAPI.send(eventId, roomId, type, contentStr)
+            apiCall = roomAPI.send(eventId, roomId, type, content)
         }
         localEchoRepository.updateSendState(eventId, SendState.SENT)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index b4c32c045e..421cd1b063 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -17,6 +17,16 @@
 
 package org.matrix.android.sdk.internal.session.room.timeline
 
+import io.realm.OrderedCollectionChangeSet
+import io.realm.OrderedRealmCollectionChangeListener
+import io.realm.Realm
+import io.realm.RealmConfiguration
+import io.realm.RealmQuery
+import io.realm.RealmResults
+import io.realm.Sort
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -44,16 +54,6 @@ import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.Debouncer
 import org.matrix.android.sdk.internal.util.createBackgroundHandler
 import org.matrix.android.sdk.internal.util.createUIHandler
-import io.realm.OrderedCollectionChangeSet
-import io.realm.OrderedRealmCollectionChangeListener
-import io.realm.Realm
-import io.realm.RealmConfiguration
-import io.realm.RealmQuery
-import io.realm.RealmResults
-import io.realm.Sort
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
 import timber.log.Timber
 import java.util.Collections
 import java.util.UUID
@@ -115,6 +115,7 @@ internal class DefaultTimeline(
         if (!results.isLoaded || !results.isValid) {
             return@OrderedRealmCollectionChangeListener
         }
+        Timber.v("## SendEvent: [${System.currentTimeMillis()}] DB update for room $roomId")
         handleUpdates(results, changeSet)
     }
 
@@ -316,12 +317,15 @@ internal class DefaultTimeline(
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onLocalEchoCreated(onLocalEchoCreated: OnLocalEchoCreated) {
         if (isLive && onLocalEchoCreated.roomId == roomId) {
-            listeners.forEach {
-                it.onNewTimelineEvents(listOf(onLocalEchoCreated.timelineEvent.eventId))
+            // do not add events that would have been filtered
+            if (listOf(onLocalEchoCreated.timelineEvent).filterEventsWithSettings().isNotEmpty()) {
+                listeners.forEach {
+                    it.onNewTimelineEvents(listOf(onLocalEchoCreated.timelineEvent.eventId))
+                }
+                Timber.v("On local echo created: ${onLocalEchoCreated.timelineEvent.eventId}")
+                inMemorySendingEvents.add(0, onLocalEchoCreated.timelineEvent)
+                postSnapshot()
             }
-            Timber.v("On local echo created: $onLocalEchoCreated")
-            inMemorySendingEvents.add(0, onLocalEchoCreated.timelineEvent)
-            postSnapshot()
         }
     }
 
@@ -777,7 +781,7 @@ internal class DefaultTimeline(
 
             val filterEdits = if (settings.filterEdits && it.root.type == EventType.MESSAGE) {
                 val messageContent = it.root.content.toModel<MessageContent>()
-                messageContent?.relatesTo?.type != RelationType.REPLACE
+                messageContent?.relatesTo?.type != RelationType.REPLACE && messageContent?.relatesTo?.type != RelationType.RESPONSE
             } else {
                 true
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
index d3124b68ca..3bc6a85cfb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
@@ -57,7 +57,7 @@ internal class TimelineSendEventWorkCommon @Inject constructor(
         }
     }
 
-    fun postWork(roomId: String, workRequest: OneTimeWorkRequest, policy: ExistingWorkPolicy = ExistingWorkPolicy.APPEND): Cancelable {
+    fun postWork(roomId: String, workRequest: OneTimeWorkRequest, policy: ExistingWorkPolicy = ExistingWorkPolicy.APPEND_OR_REPLACE): Cancelable {
         workManagerProvider.workManager
                 .beginUniqueWork(buildWorkName(roomId), policy, workRequest)
                 .enqueue()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
index 2ae115f325..8eab44366c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
@@ -219,7 +219,7 @@ internal class SecretStoringUtils @Inject constructor(private val context: Conte
 
     @RequiresApi(Build.VERSION_CODES.M)
     private fun decryptStringM(encryptedChunk: ByteArray, keyAlias: String): String {
-        val (iv, encryptedText) = formatMExtract(ByteArrayInputStream(encryptedChunk))
+        val (iv, encryptedText) = formatMExtract(encryptedChunk.inputStream())
 
         val secretKey = getOrGenerateSymmetricKeyForAliasM(keyAlias)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
index 1a2d6b1fd3..9fd9c313db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.session.sync.job
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import com.squareup.moshi.JsonEncodingException
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.isTokenError
@@ -30,11 +31,14 @@ import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
 import org.matrix.android.sdk.internal.util.Debouncer
 import org.matrix.android.sdk.internal.util.createUIHandler
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import org.matrix.android.sdk.api.session.call.MxCall
+import org.matrix.android.sdk.internal.session.call.ActiveCallHandler
 import timber.log.Timber
 import java.net.SocketTimeoutException
 import java.util.Timer
@@ -48,8 +52,9 @@ private const val DEFAULT_LONG_POOL_TIMEOUT = 30_000L
 internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
                                               private val typingUsersTracker: DefaultTypingUsersTracker,
                                               private val networkConnectivityChecker: NetworkConnectivityChecker,
-                                              private val backgroundDetectionObserver: BackgroundDetectionObserver)
-    : Thread(), NetworkConnectivityChecker.Listener, BackgroundDetectionObserver.Listener {
+                                              private val backgroundDetectionObserver: BackgroundDetectionObserver,
+                                              private val activeCallHandler: ActiveCallHandler
+) : Thread(), NetworkConnectivityChecker.Listener, BackgroundDetectionObserver.Listener {
 
     private var state: SyncState = SyncState.Idle
     private var liveState = MutableLiveData<SyncState>(state)
@@ -62,6 +67,12 @@ internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
     private var isTokenValid = true
     private var retryNoNetworkTask: TimerTask? = null
 
+    private val activeCallListObserver = Observer<MutableList<MxCall>> { activeCalls ->
+        if (activeCalls.isEmpty() && backgroundDetectionObserver.isInBackground) {
+            pause()
+        }
+    }
+
     init {
         updateStateTo(SyncState.Idle)
     }
@@ -115,9 +126,11 @@ internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
 
     override fun run() {
         Timber.v("Start syncing...")
+
         isStarted = true
         networkConnectivityChecker.register(this)
         backgroundDetectionObserver.register(this)
+        registerActiveCallsObserver()
         while (state != SyncState.Killing) {
             Timber.v("Entering loop, state: $state")
             if (!isStarted) {
@@ -163,6 +176,19 @@ internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
         updateStateTo(SyncState.Killed)
         backgroundDetectionObserver.unregister(this)
         networkConnectivityChecker.unregister(this)
+        unregisterActiveCallsObserver()
+    }
+
+    private fun registerActiveCallsObserver() {
+        syncScope.launch(Dispatchers.Main) {
+            activeCallHandler.getActiveCallsLiveData().observeForever(activeCallListObserver)
+        }
+    }
+
+    private fun unregisterActiveCallsObserver() {
+        syncScope.launch(Dispatchers.Main) {
+            activeCallHandler.getActiveCallsLiveData().removeObserver(activeCallListObserver)
+        }
     }
 
     private suspend fun doSync(params: SyncTask.Params) {
@@ -215,6 +241,8 @@ internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
     }
 
     override fun onMoveToBackground() {
-        pause()
+        if (activeCallHandler.getActiveCallsLiveData().value.isNullOrEmpty()) {
+            pause()
+        }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt
index 226486596e..0e7fbf492f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt
@@ -16,6 +16,7 @@
  */
 package org.matrix.android.sdk.internal.session.sync.model
 
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /**
@@ -26,26 +27,30 @@ internal data class DeviceInfo(
         /**
          * The owner user id
          */
-        val user_id: String? = null,
+        @Json(name = "user_id")
+        val userId: String? = null,
 
         /**
          * The device id
          */
-        val device_id: String? = null,
+        @Json(name = "device_id")
+        val deviceId: String? = null,
 
         /**
          * The device display name
          */
-        val display_name: String? = null,
+        @Json(name = "display_name")
+        val displayName: String? = null,
 
         /**
          * The last time this device has been seen.
          */
-        val last_seen_ts: Long = 0,
+        @Json(name = "last_seen_ts")
+        val lastSeenTs: Long = 0,
 
         /**
          * The last ip address
          */
-        val last_seen_ip: String? = null
-
+        @Json(name = "last_seen_ip")
+        val lastSeenIp: String? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Base64.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Base64.kt
new file mode 100644
index 0000000000..76e24c4e31
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Base64.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.util
+
+/**
+ * Base64 URL conversion methods
+ */
+
+internal fun base64UrlToBase64(base64Url: String): String {
+    return base64Url.replace('-', '+')
+            .replace('_', '/')
+}
+
+internal fun base64ToBase64Url(base64: String): String {
+    return base64.replace("\n".toRegex(), "")
+            .replace("\\+".toRegex(), "-")
+            .replace('/', '_')
+            .replace("=", "")
+}
+
+internal fun base64ToUnpaddedBase64(base64: String): String {
+    return base64.replace("\n".toRegex(), "")
+            .replace("=", "")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt
index 6583dc89ea..6a5cfec095 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt
@@ -257,12 +257,11 @@ object CompatUtil {
 
     /**
      * Create a CipherInputStream instance.
-     * Before Kitkat, this method will return `in` because local storage encryption is not implemented for devices before KitKat.
-     * Warning, if `in` is not an encrypted stream, it's up to the caller to close and reopen `in`, because the stream has been read.
+     * Warning, if inputStream is not an encrypted stream, it's up to the caller to close and reopen inputStream, because the stream has been read.
      *
-     * @param in      the input stream
-     * @param context the context holding the application shared preferences
-     * @return in, or the created InputStream, or null if the InputStream `in`  does not contain encrypted data
+     * @param inputStream the input stream
+     * @param context     the context holding the application shared preferences
+     * @return inputStream, or the created InputStream, or null if the InputStream inputStream does not contain encrypted data
      */
     @Throws(NoSuchPaddingException::class,
             NoSuchAlgorithmException::class,
@@ -274,15 +273,15 @@ object CompatUtil {
             NoSuchProviderException::class,
             InvalidAlgorithmParameterException::class,
             IOException::class)
-    fun createCipherInputStream(`in`: InputStream, context: Context): InputStream? {
-        val iv_len = `in`.read()
-        if (iv_len != AES_GCM_IV_LENGTH) {
-            Timber.e(TAG, "Invalid IV length $iv_len")
+    fun createCipherInputStream(inputStream: InputStream, context: Context): InputStream? {
+        val ivLen = inputStream.read()
+        if (ivLen != AES_GCM_IV_LENGTH) {
+            Timber.e(TAG, "Invalid IV length $ivLen")
             return null
         }
 
         val iv = ByteArray(AES_GCM_IV_LENGTH)
-        `in`.read(iv)
+        inputStream.read(iv)
 
         val cipher = Cipher.getInstance(AES_GCM_CIPHER_TYPE)
 
@@ -296,6 +295,6 @@ object CompatUtil {
 
         cipher.init(Cipher.DECRYPT_MODE, keyAndVersion.secretKey, spec)
 
-        return CipherInputStream(`in`, cipher)
+        return CipherInputStream(inputStream, cipher)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt
index 27625d90bc..da524cc1b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.util
 
 import androidx.annotation.WorkerThread
 import java.io.File
-import java.io.FileOutputStream
 import java.io.InputStream
 
 /**
@@ -27,7 +26,7 @@ import java.io.InputStream
  */
 @WorkerThread
 fun writeToFile(inputStream: InputStream, outputFile: File) {
-    FileOutputStream(outputFile).use {
+    outputFile.outputStream().use {
         inputStream.copyTo(it)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Glob.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Glob.kt
new file mode 100644
index 0000000000..129bf0dec4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Glob.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.util
+
+internal fun String.hasSpecialGlobChar(): Boolean {
+    return contains("*") || contains("?")
+}
+
+// Very simple glob to regexp converter
+internal fun String.simpleGlobToRegExp(): String {
+    val string = this
+    return buildString {
+        // append("^")
+        string.forEach { char ->
+            when (char) {
+                '*'  -> append(".*")
+                '?'  -> append(".")
+                '.'  -> append("\\.")
+                '\\' -> append("\\\\")
+                else -> append(char)
+            }
+        }
+        // append("$")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
index 902d7d3316..9233b2b807 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
@@ -18,8 +18,8 @@
 package org.matrix.android.sdk.internal.util
 
 import android.content.res.Resources
-import androidx.annotation.ArrayRes
 import androidx.annotation.NonNull
+import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 import dagger.Reusable
 import javax.inject.Inject
@@ -56,8 +56,8 @@ internal class StringProvider @Inject constructor(private val resources: Resourc
         return resources.getString(resId, *formatArgs)
     }
 
-    @Throws(Resources.NotFoundException::class)
-    fun getStringArray(@ArrayRes id: Int): Array<String> {
-        return resources.getStringArray(id)
+    @NonNull
+    fun getQuantityString(@PluralsRes resId: Int, quantity: Int, vararg formatArgs: Any?): String {
+        return resources.getQuantityString(resId, quantity, *formatArgs)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
index a236771cd6..681e7e5fed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
@@ -52,3 +52,25 @@ fun convertFromUTF8(s: String): String {
 }
 
 fun String.withoutPrefix(prefix: String) = if (startsWith(prefix)) substringAfter(prefix) else this
+
+/**
+ * Returns whether a string contains an occurrence of another, as a standalone word, regardless of case.
+ *
+ * @param subString  the string to search for
+ * @return whether a match was found
+ */
+fun String.caseInsensitiveFind(subString: String): Boolean {
+    // add sanity checks
+    if (subString.isEmpty() || isEmpty()) {
+        return false
+    }
+
+    try {
+        val regex = Regex("(\\W|^)" + Regex.escape(subString) + "(\\W|$)", RegexOption.IGNORE_CASE)
+        return regex.containsMatchIn(this)
+    } catch (e: Exception) {
+        Timber.e(e, "## caseInsensitiveFind() : failed")
+    }
+
+    return false
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
index e20fe9a304..80ede5e884 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
@@ -97,7 +97,7 @@ internal class DefaultGetWellknownTask @Inject constructor(
             // Success
             val homeServerBaseUrl = wellKnown.homeServer?.baseURL
             if (homeServerBaseUrl.isNullOrBlank()) {
-                WellknownResult.FailPrompt
+                WellknownResult.FailPrompt(null, null)
             } else {
                 if (homeServerBaseUrl.isValidUrl()) {
                     // Check that HS is a real one
@@ -120,11 +120,11 @@ internal class DefaultGetWellknownTask @Inject constructor(
                 is Failure.OtherServerError                -> {
                     when (throwable.httpCode) {
                         HttpsURLConnection.HTTP_NOT_FOUND -> WellknownResult.Ignore
-                        else                              -> WellknownResult.FailPrompt
+                        else                              -> WellknownResult.FailPrompt(null, null)
                     }
                 }
                 is MalformedJsonException, is EOFException -> {
-                    WellknownResult.FailPrompt
+                    WellknownResult.FailPrompt(null, null)
                 }
                 else                                       -> {
                     throw throwable
@@ -162,7 +162,7 @@ internal class DefaultGetWellknownTask @Inject constructor(
                         // All is ok
                         WellknownResult.Prompt(homeServerBaseUrl, identityServerBaseUrl, wellKnown)
                     } else {
-                        WellknownResult.FailError
+                        WellknownResult.FailPrompt(homeServerBaseUrl, wellKnown)
                     }
                 } else {
                     WellknownResult.FailError
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
index 2b7cba0b0c..b162566403 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
@@ -19,13 +19,23 @@ package org.matrix.android.sdk.internal.worker
 
 import androidx.work.Data
 import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.network.parsing.CheckNumberType
 
-object WorkerParamsFactory {
+internal object WorkerParamsFactory {
+
+    val moshi by lazy {
+        // We are adding the CheckNumberType as we are serializing/deserializing multiple time in a row
+        // and we lost typing information doing so.
+        // We don't want this check to be done on all adapters, so we just add it here.
+        MoshiProvider.providesMoshi()
+                .newBuilder()
+                .add(CheckNumberType.JSON_ADAPTER_FACTORY)
+                .build()
+    }
 
     const val KEY = "WORKER_PARAMS_JSON"
 
     inline fun <reified T> toData(params: T): Data {
-        val moshi = MoshiProvider.providesMoshi()
         val adapter = moshi.adapter(T::class.java)
         val json = adapter.toJson(params)
         return Data.Builder().putString(KEY, json).build()
@@ -36,7 +46,6 @@ object WorkerParamsFactory {
         return if (json == null) {
             null
         } else {
-            val moshi = MoshiProvider.providesMoshi()
             val adapter = moshi.adapter(T::class.java)
             adapter.fromJson(json)
         }
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_verification_airplane.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_aeroplane.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_verification_airplane.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_aeroplane.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_verification_headphone.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_headphones.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_verification_headphone.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_headphones.xml
diff --git a/matrix-sdk-android/src/main/res/drawable/ic_verification_wrench.xml b/matrix-sdk-android/src/main/res/drawable/ic_verification_spanner.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/drawable/ic_verification_wrench.xml
rename to matrix-sdk-android/src/main/res/drawable/ic_verification_spanner.xml
diff --git a/matrix-sdk-android/src/main/res/values-az/strings.xml b/matrix-sdk-android/src/main/res/values-az/strings.xml
index 9c60dfafa7..1f366c647f 100644
--- a/matrix-sdk-android/src/main/res/values-az/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-az/strings.xml
@@ -79,72 +79,6 @@
 
     <string name="room_displayname_empty_room">Boş otaq</string>
 
-
-    <string name="verification_emoji_dog">It</string>
-    <string name="verification_emoji_cat">Pişik</string>
-    <string name="verification_emoji_lion">Aslan</string>
-    <string name="verification_emoji_horse">At</string>
-    <string name="verification_emoji_unicorn">Kərgədan</string>
-    <string name="verification_emoji_pig">Donuz</string>
-    <string name="verification_emoji_elephant">Fil</string>
-    <string name="verification_emoji_rabbit">Dovşan</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Xoruz</string>
-    <string name="verification_emoji_penguin">Pinqvin</string>
-    <string name="verification_emoji_turtle">Tısbağa</string>
-    <string name="verification_emoji_fish">Balıq</string>
-    <string name="verification_emoji_octopus">Ahtapot</string>
-    <string name="verification_emoji_butterfly">Kəpənək</string>
-    <string name="verification_emoji_flower">Çiçək</string>
-    <string name="verification_emoji_tree">Ağac</string>
-    <string name="verification_emoji_cactus">Kaktus</string>
-    <string name="verification_emoji_mushroom">Göbələk</string>
-    <string name="verification_emoji_globe">Qlobus</string>
-    <string name="verification_emoji_moon">Ay</string>
-    <string name="verification_emoji_cloud">Bulud</string>
-    <string name="verification_emoji_fire">Atəş</string>
-    <string name="verification_emoji_banana">Banan</string>
-    <string name="verification_emoji_apple">Alma</string>
-    <string name="verification_emoji_strawberry">Çiyələk</string>
-    <string name="verification_emoji_corn">Qarğıdalı</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Tort</string>
-    <string name="verification_emoji_heart">Ürək</string>
-    <string name="verification_emoji_smiley">Təbəssüm</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Papaq</string>
-    <string name="verification_emoji_glasses">Eynəklər</string>
-    <string name="verification_emoji_wrench">Açar</string>
-    <string name="verification_emoji_santa">Santa</string>
-    <string name="verification_emoji_thumbsup">Baş barmaqlar yuxarı</string>
-    <string name="verification_emoji_umbrella">Çətir</string>
-    <string name="verification_emoji_hourglass">Qum saatı</string>
-    <string name="verification_emoji_clock">Saat</string>
-    <string name="verification_emoji_gift">Hədiyyə</string>
-    <string name="verification_emoji_lightbulb">Lampa</string>
-    <string name="verification_emoji_book">Kitab</string>
-    <string name="verification_emoji_pencil">Qələm</string>
-    <string name="verification_emoji_paperclip">Kağız sancağı</string>
-    <string name="verification_emoji_scissors">Qayçı</string>
-    <string name="verification_emoji_lock">Qıfıl</string>
-    <string name="verification_emoji_key">Açar</string>
-    <string name="verification_emoji_hammer">Çəkic</string>
-    <string name="verification_emoji_telephone">Telefon</string>
-    <string name="verification_emoji_flag">Bayraq</string>
-    <string name="verification_emoji_train">Qatar</string>
-    <string name="verification_emoji_bicycle">Velosiped</string>
-    <string name="verification_emoji_airplane">Təyyarə</string>
-    <string name="verification_emoji_rocket">Raket</string>
-    <string name="verification_emoji_trophy">Kubok</string>
-    <string name="verification_emoji_ball">Top</string>
-    <string name="verification_emoji_guitar">Gitara</string>
-    <string name="verification_emoji_trumpet">Saz</string>
-    <string name="verification_emoji_bell">Zəng</string>
-    <string name="verification_emoji_anchor">Anker</string>
-    <string name="verification_emoji_headphone">Qulaqlıqlar</string>
-    <string name="verification_emoji_folder">Qovluq</string>
-    <string name="verification_emoji_pin">Sancaq</string>
-
     <string name="initial_sync_start_importing_account">İlkin sinxronizasiya:
 \nHesab idxal olunur…</string>
     <string name="initial_sync_start_importing_account_crypto">İlkin sinxronizasiya:
diff --git a/matrix-sdk-android/src/main/res/values-bg/strings.xml b/matrix-sdk-android/src/main/res/values-bg/strings.xml
index 07d59852f3..9654fd00b5 100644
--- a/matrix-sdk-android/src/main/res/values-bg/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bg/strings.xml
@@ -78,70 +78,6 @@
     <string name="notice_event_redacted_by">Съобщение премахнато от %1$s</string>
     <string name="notice_event_redacted_with_reason">Премахнато съобщение [причина: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Съобщение премахнато от %1$s [причина: %2$s]</string>
-    <string name="verification_emoji_dog">Куче</string>
-    <string name="verification_emoji_cat">Котка</string>
-    <string name="verification_emoji_lion">Лъв</string>
-    <string name="verification_emoji_horse">Кон</string>
-    <string name="verification_emoji_unicorn">Еднорог</string>
-    <string name="verification_emoji_pig">Прасе</string>
-    <string name="verification_emoji_elephant">Слон</string>
-    <string name="verification_emoji_rabbit">Заек</string>
-    <string name="verification_emoji_panda">Панда</string>
-    <string name="verification_emoji_rooster">Петел</string>
-    <string name="verification_emoji_penguin">Пингвин</string>
-    <string name="verification_emoji_turtle">Костенурка</string>
-    <string name="verification_emoji_fish">Риба</string>
-    <string name="verification_emoji_octopus">Октопод</string>
-    <string name="verification_emoji_butterfly">Пеперуда</string>
-    <string name="verification_emoji_flower">Цвете</string>
-    <string name="verification_emoji_tree">Дърво</string>
-    <string name="verification_emoji_cactus">Кактус</string>
-    <string name="verification_emoji_mushroom">Гъба</string>
-    <string name="verification_emoji_globe">Глобус</string>
-    <string name="verification_emoji_moon">Луна</string>
-    <string name="verification_emoji_cloud">Облак</string>
-    <string name="verification_emoji_fire">Огън</string>
-    <string name="verification_emoji_banana">Банан</string>
-    <string name="verification_emoji_apple">Ябълка</string>
-    <string name="verification_emoji_strawberry">Ягода</string>
-    <string name="verification_emoji_corn">Царевица</string>
-    <string name="verification_emoji_pizza">Пица</string>
-    <string name="verification_emoji_cake">Торта</string>
-    <string name="verification_emoji_heart">Сърце</string>
-    <string name="verification_emoji_smiley">Усмивка</string>
-    <string name="verification_emoji_robot">Робот</string>
-    <string name="verification_emoji_hat">Шапка</string>
-    <string name="verification_emoji_glasses">Очила</string>
-    <string name="verification_emoji_wrench">Гаечен ключ</string>
-    <string name="verification_emoji_santa">Дядо Коледа</string>
-    <string name="verification_emoji_thumbsup">Палец нагоре</string>
-    <string name="verification_emoji_umbrella">Чадър</string>
-    <string name="verification_emoji_hourglass">Пясъчен часовник</string>
-    <string name="verification_emoji_clock">Часовник</string>
-    <string name="verification_emoji_gift">Подарък</string>
-    <string name="verification_emoji_lightbulb">Лампа</string>
-    <string name="verification_emoji_book">Книга</string>
-    <string name="verification_emoji_pencil">Молив</string>
-    <string name="verification_emoji_paperclip">Кламер</string>
-    <string name="verification_emoji_scissors">Ножици</string>
-    <string name="verification_emoji_lock">Катинар</string>
-    <string name="verification_emoji_key">Ключ</string>
-    <string name="verification_emoji_hammer">Чук</string>
-    <string name="verification_emoji_telephone">Телефон</string>
-    <string name="verification_emoji_flag">Знаме</string>
-    <string name="verification_emoji_train">Влак</string>
-    <string name="verification_emoji_bicycle">Колело</string>
-    <string name="verification_emoji_airplane">Самолет</string>
-    <string name="verification_emoji_rocket">Ракета</string>
-    <string name="verification_emoji_trophy">Трофей</string>
-    <string name="verification_emoji_ball">Топка</string>
-    <string name="verification_emoji_guitar">Китара</string>
-    <string name="verification_emoji_trumpet">Тромпет</string>
-    <string name="verification_emoji_bell">Звънец</string>
-    <string name="verification_emoji_anchor">Котва</string>
-    <string name="verification_emoji_headphone">Слушалки</string>
-    <string name="verification_emoji_folder">Папка</string>
-    <string name="verification_emoji_pin">Карфица</string>
 
     <string name="initial_sync_start_importing_account">Начална синхронизация:
 \nИмпортиране на профил…</string>
@@ -204,4 +140,16 @@
     <string name="key_verification_request_fallback_message">%s изпрати запитване за потвърждение на ключа ви, но клиентът ви не поддържа верифициране посредством чат. Ще трябва да използвате стария метод за верифициране на ключове.</string>
 
     <string name="notice_room_created">%1$s създаде стаята</string>
+    <string name="summary_you_sent_image">Изпратихте снимка.</string>
+    <string name="summary_you_sent_sticker">Изпратихте стикер.</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">Ваша покана</string>
+    <string name="notice_room_created_by_you">Създадохте стаята</string>
+    <string name="notice_room_invite_by_you">Поканихте %1$s</string>
+    <string name="notice_room_join_by_you">Присъединихте се в стаята</string>
+    <string name="notice_room_leave_by_you">Напуснахте стаята</string>
+    <string name="notice_room_reject_by_you">Отхвърлихте поканата</string>
+    <string name="notice_room_kick_by_you">Изгонихте %1$s</string>
+    <string name="notice_room_unban_by_you">Отблокирахте %1$s</string>
+    <string name="notice_room_ban_by_you">Блокирахте %1$s</string>
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
index c8e70a9b20..5d38f0b3ee 100644
--- a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
@@ -136,72 +136,6 @@
 
     <string name="room_displayname_empty_room">খালি কক্ষ</string>
 
-
-    <string name="verification_emoji_dog">কুকুর</string>
-    <string name="verification_emoji_cat">বেড়াল</string>
-    <string name="verification_emoji_lion">সিংহ</string>
-    <string name="verification_emoji_horse">ঘোড়া</string>
-    <string name="verification_emoji_unicorn">ইউনিকর্ন</string>
-    <string name="verification_emoji_pig">শূকর</string>
-    <string name="verification_emoji_elephant">হাতি</string>
-    <string name="verification_emoji_rabbit">খরগোশ</string>
-    <string name="verification_emoji_panda">পান্ডা</string>
-    <string name="verification_emoji_rooster">গৃহপালিত মোরগ</string>
-    <string name="verification_emoji_penguin">পেংগুইন</string>
-    <string name="verification_emoji_turtle">কচ্ছপ</string>
-    <string name="verification_emoji_fish">মাছ</string>
-    <string name="verification_emoji_octopus">অক্টোপাস</string>
-    <string name="verification_emoji_butterfly">প্রজাপতি</string>
-    <string name="verification_emoji_flower">ফুল</string>
-    <string name="verification_emoji_tree">গাছ</string>
-    <string name="verification_emoji_cactus">ফণীমনসা</string>
-    <string name="verification_emoji_mushroom">মাশরুম</string>
-    <string name="verification_emoji_globe">পৃথিবী</string>
-    <string name="verification_emoji_moon">চন্দ্র</string>
-    <string name="verification_emoji_cloud">মেঘ</string>
-    <string name="verification_emoji_fire">আগুন</string>
-    <string name="verification_emoji_banana">কলা</string>
-    <string name="verification_emoji_apple">আপেল</string>
-    <string name="verification_emoji_strawberry">স্ট্রবেরি</string>
-    <string name="verification_emoji_corn">ভূট্টা</string>
-    <string name="verification_emoji_pizza">পিজা</string>
-    <string name="verification_emoji_cake">কেক</string>
-    <string name="verification_emoji_heart">হৃদয়</string>
-    <string name="verification_emoji_smiley">স্মাইলি</string>
-    <string name="verification_emoji_robot">রোবট</string>
-    <string name="verification_emoji_hat">টুপি</string>
-    <string name="verification_emoji_glasses">চশমা</string>
-    <string name="verification_emoji_wrench">রেঞ্চ</string>
-    <string name="verification_emoji_santa">সান্তা</string>
-    <string name="verification_emoji_thumbsup">থাম্বস আপ</string>
-    <string name="verification_emoji_umbrella">ছাতা</string>
-    <string name="verification_emoji_hourglass">বালিঘড়ি</string>
-    <string name="verification_emoji_clock">ঘড়ি</string>
-    <string name="verification_emoji_gift">উপহার</string>
-    <string name="verification_emoji_lightbulb">আলো বালব</string>
-    <string name="verification_emoji_book">বই</string>
-    <string name="verification_emoji_pencil">পেন্সিল</string>
-    <string name="verification_emoji_paperclip">পেপার ক্লিপ</string>
-    <string name="verification_emoji_scissors">কাঁচি</string>
-    <string name="verification_emoji_lock">লক</string>
-    <string name="verification_emoji_key">চাবি</string>
-    <string name="verification_emoji_hammer">হাতুড়ি</string>
-    <string name="verification_emoji_telephone">টেলিফোন</string>
-    <string name="verification_emoji_flag">পতাকা</string>
-    <string name="verification_emoji_train">রেলগাড়ি</string>
-    <string name="verification_emoji_bicycle">সাইকেল</string>
-    <string name="verification_emoji_airplane">বিমান</string>
-    <string name="verification_emoji_rocket">রকেট</string>
-    <string name="verification_emoji_trophy">ট্রফি</string>
-    <string name="verification_emoji_ball">বল</string>
-    <string name="verification_emoji_guitar">গিটার</string>
-    <string name="verification_emoji_trumpet">ট্রাম্পেট</string>
-    <string name="verification_emoji_bell">ঘণ্টা</string>
-    <string name="verification_emoji_anchor">নোঙ্গর</string>
-    <string name="verification_emoji_headphone">হেডফোন</string>
-    <string name="verification_emoji_folder">ফোল্ডার</string>
-    <string name="verification_emoji_pin">পিন</string>
-
     <string name="initial_sync_start_importing_account">প্রাথমিক সিঙ্ক:
 \nঅ্যাকাউন্ট আমদানি করা হচ্ছে…</string>
     <string name="initial_sync_start_importing_account_crypto">প্রাথমিক সিঙ্ক:
@@ -288,8 +222,4 @@
 
     <string name="key_verification_request_fallback_message">%s আপনার কীটি যাচাই করার জন্য অনুরোধ করছে, তবে আপনার ক্লায়েন্ট ইন-চ্যাট কী যাচাইকরণ সমর্থন করে না। কীগুলি যাচাই করতে আপনাকে লিগ্যাসি কী যাচাইকরণ ব্যবহার করতে হবে।</string>
 
-    <string name="call_notification_answer">গ্রহণ</string>
-    <string name="call_notification_reject">পতন</string>
-    <string name="call_notification_hangup">বন্ধ করুন</string>
-
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-cs/strings.xml b/matrix-sdk-android/src/main/res/values-cs/strings.xml
index 44908c38f7..9e208f812a 100644
--- a/matrix-sdk-android/src/main/res/values-cs/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-cs/strings.xml
@@ -79,68 +79,7 @@
     <string name="notice_event_redacted_with_reason">Zpráva byla smazána [důvod: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Zpráva smazána uživatelem %1$s [důvod: %2$s]</string>
     <string name="notice_room_third_party_revoked_invite">Uživatel %1$s obnovil pozvánku do místnosti pro uživatele %2$s</string>
-    <string name="verification_emoji_cat">Kočka</string>
-    <string name="verification_emoji_lion">Lev</string>
-    <string name="verification_emoji_horse">Kůň</string>
-    <string name="verification_emoji_unicorn">Jednorožec</string>
-    <string name="verification_emoji_pig">Prase</string>
-    <string name="verification_emoji_elephant">Slon</string>
-    <string name="verification_emoji_rabbit">Králík</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Kohout</string>
-    <string name="verification_emoji_penguin">Tučňák</string>
-    <string name="verification_emoji_turtle">Želva</string>
-    <string name="verification_emoji_fish">Ryba</string>
-    <string name="verification_emoji_octopus">Chobotnice</string>
-    <string name="verification_emoji_butterfly">Motýl</string>
-    <string name="verification_emoji_flower">Květina</string>
-    <string name="verification_emoji_tree">Strom</string>
-    <string name="verification_emoji_cactus">Kaktus</string>
-    <string name="verification_emoji_mushroom">Houba</string>
-    <string name="verification_emoji_globe">Zeměkoule</string>
-    <string name="verification_emoji_moon">Měsíc</string>
-    <string name="verification_emoji_cloud">Mrak</string>
-    <string name="verification_emoji_fire">Oheň</string>
-    <string name="verification_emoji_banana">Banán</string>
-    <string name="verification_emoji_apple">Jablko</string>
-    <string name="verification_emoji_strawberry">Jahoda</string>
-    <string name="verification_emoji_corn">Kukuřice</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Dort</string>
-    <string name="verification_emoji_heart">Srdce</string>
-    <string name="verification_emoji_smiley">Smajlík</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Klobouk</string>
-    <string name="verification_emoji_glasses">Brýle</string>
-    <string name="verification_emoji_santa">Santa Klaus</string>
-    <string name="verification_emoji_thumbsup">Zvednutý palec</string>
-    <string name="verification_emoji_umbrella">Deštník</string>
-    <string name="verification_emoji_hourglass">Přesípací hodiny</string>
-    <string name="verification_emoji_clock">Hodiny</string>
-    <string name="verification_emoji_gift">Dárek</string>
-    <string name="verification_emoji_lightbulb">Žárovka</string>
-    <string name="verification_emoji_book">Kniha</string>
-    <string name="verification_emoji_pencil">Tužka</string>
-    <string name="verification_emoji_paperclip">Sponka</string>
-    <string name="verification_emoji_scissors">Nůžky</string>
-    <string name="verification_emoji_lock">Zámek</string>
-    <string name="verification_emoji_key">Klíč</string>
-    <string name="verification_emoji_hammer">Kladivo</string>
-    <string name="verification_emoji_telephone">Telefon</string>
-    <string name="verification_emoji_flag">Vlajka</string>
-    <string name="verification_emoji_train">Vlak</string>
-    <string name="verification_emoji_bicycle">Jízdní kolo</string>
-    <string name="verification_emoji_airplane">Letadlo</string>
-    <string name="verification_emoji_rocket">Raketa</string>
-    <string name="verification_emoji_trophy">Trofej</string>
-    <string name="verification_emoji_ball">Míč</string>
-    <string name="verification_emoji_guitar">Kytara</string>
-    <string name="verification_emoji_trumpet">Trumpeta</string>
-    <string name="verification_emoji_bell">Zvon</string>
-    <string name="verification_emoji_anchor">Kotva</string>
-    <string name="verification_emoji_headphone">Sluchátka</string>
-    <string name="verification_emoji_folder">Desky</string>
-    <string name="initial_sync_start_importing_account">Úvodní synchronizace: 
+    <string name="initial_sync_start_importing_account">Úvodní synchronizace:
 \nImport účtu…</string>
     <string name="initial_sync_start_importing_account_crypto">Úvodní synchronizace: 
 \nImport klíčů</string>
@@ -156,8 +95,6 @@
 \nImport dat účtu</string>
 
     <string name="event_status_sending_message">Odesílání zprávy…</string>
-    <string name="verification_emoji_wrench">Maticový klíč</string>
-    <string name="verification_emoji_pin">Připínáček</string>
 
     <string name="initial_sync_start_importing_account_invited_rooms">Úvodní synchronizace:
 \nImport pozvánek</string>
diff --git a/matrix-sdk-android/src/main/res/values-de/strings.xml b/matrix-sdk-android/src/main/res/values-de/strings.xml
index 0c857e78ee..ae80edb47f 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings.xml
@@ -89,73 +89,8 @@
     <string name="notice_event_redacted_by">Nachricht entfernt von %1$s</string>
     <string name="notice_event_redacted_with_reason">Nachricht entfernt [Grund: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Nachricht entfernt von %1$s [Grund: %2$s]</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_dog">Hund</string>
-    <string name="verification_emoji_cat">Katze</string>
-    <string name="verification_emoji_lion">Löwe</string>
-    <string name="verification_emoji_horse">Pferd</string>
-    <string name="verification_emoji_unicorn">Einhorn</string>
-    <string name="verification_emoji_pig">Schwein</string>
-    <string name="verification_emoji_elephant">Elefant</string>
-    <string name="verification_emoji_rabbit">Kaninchen</string>
     <string name="notice_room_update">%s hat diesen Raum aufgewertet.</string>
 
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Hahn</string>
-    <string name="verification_emoji_penguin">Pinguin</string>
-    <string name="verification_emoji_turtle">Schildkröte</string>
-    <string name="verification_emoji_fish">Fisch</string>
-    <string name="verification_emoji_octopus">Oktopus</string>
-    <string name="verification_emoji_butterfly">Schmetterling</string>
-    <string name="verification_emoji_flower">Blume</string>
-    <string name="verification_emoji_tree">Baum</string>
-    <string name="verification_emoji_cactus">Kaktus</string>
-    <string name="verification_emoji_mushroom">Pilz</string>
-    <string name="verification_emoji_globe">Globus</string>
-    <string name="verification_emoji_moon">Mond</string>
-    <string name="verification_emoji_cloud">Wolke</string>
-    <string name="verification_emoji_fire">Feuer</string>
-    <string name="verification_emoji_banana">Banane</string>
-    <string name="verification_emoji_apple">Apfel</string>
-    <string name="verification_emoji_strawberry">Erdbeere</string>
-    <string name="verification_emoji_corn">Mais</string>
-    <string name="verification_emoji_cake">Kuchen</string>
-    <string name="verification_emoji_heart">Herz</string>
-    <string name="verification_emoji_smiley">Smiley</string>
-    <string name="verification_emoji_robot">Roboter</string>
-    <string name="verification_emoji_hat">Hut</string>
-    <string name="verification_emoji_glasses">Brille</string>
-    <string name="verification_emoji_wrench">Schraubenschlüssel</string>
-    <string name="verification_emoji_santa">Weihnachtsmann</string>
-    <string name="verification_emoji_thumbsup">Daumen hoch</string>
-    <string name="verification_emoji_umbrella">Regenschirm</string>
-    <string name="verification_emoji_hourglass">Sanduhr</string>
-    <string name="verification_emoji_clock">Uhr</string>
-    <string name="verification_emoji_gift">Geschenk</string>
-    <string name="verification_emoji_lightbulb">Glühbirne</string>
-    <string name="verification_emoji_book">Buch</string>
-    <string name="verification_emoji_pencil">Bleistift</string>
-    <string name="verification_emoji_paperclip">Büroklammer</string>
-    <string name="verification_emoji_scissors">Schere</string>
-    <string name="verification_emoji_lock">Schloss</string>
-    <string name="verification_emoji_key">Schlüssel</string>
-    <string name="verification_emoji_hammer">Hammer</string>
-    <string name="verification_emoji_telephone">Telefon</string>
-    <string name="verification_emoji_flag">Flagge</string>
-    <string name="verification_emoji_train">Zug</string>
-    <string name="verification_emoji_bicycle">Fahrrad</string>
-    <string name="verification_emoji_airplane">Flugzeug</string>
-    <string name="verification_emoji_rocket">Rakete</string>
-    <string name="verification_emoji_trophy">Pokal</string>
-    <string name="verification_emoji_ball">Ball</string>
-    <string name="verification_emoji_guitar">Gitarre</string>
-    <string name="verification_emoji_trumpet">Trompete</string>
-    <string name="verification_emoji_bell">Glocke</string>
-    <string name="verification_emoji_anchor">Anker</string>
-    <string name="verification_emoji_headphone">Kopfhörer</string>
-    <string name="verification_emoji_folder">Ordner</string>
-    <string name="verification_emoji_pin">Stecknadel</string>
-
     <string name="event_status_sending_message">Sende eine Nachricht…</string>
     <string name="clear_timeline_send_queue">Sendewarteschlange leeren</string>
 
@@ -297,10 +232,6 @@
     <string name="notice_end_to_end_ok_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert (unbekannter Algorithmus %1$s).</string>
 
-    <string name="call_notification_answer">Akzeptiere</string>
-    <string name="call_notification_reject">Ablehnen</string>
-    <string name="call_notification_hangup">Anruf beenden</string>
-
     <string name="notice_call_candidates">%s hat Daten gesendet, um einen Anruf zu starten.</string>
     <string name="notice_call_candidates_by_you">Du hast Daten geschickt, um eine Anruf zu starten.</string>
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-de/strings_sas.xml b/matrix-sdk-android/src/main/res/values-de/strings_sas.xml
new file mode 100644
index 0000000000..108dedd1a5
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-de/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Hund</string>
+    <string name="verification_emoji_cat">Katze</string>
+    <string name="verification_emoji_lion">Löwe</string>
+    <string name="verification_emoji_horse">Pferd</string>
+    <string name="verification_emoji_unicorn">Einhorn</string>
+    <string name="verification_emoji_pig">Schwein</string>
+    <string name="verification_emoji_elephant">Elefant</string>
+    <string name="verification_emoji_rabbit">Hase</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Hahn</string>
+    <string name="verification_emoji_penguin">Pinguin</string>
+    <string name="verification_emoji_turtle">Schildkröte</string>
+    <string name="verification_emoji_fish">Fisch</string>
+    <string name="verification_emoji_octopus">Oktopus</string>
+    <string name="verification_emoji_butterfly">Schmetterling</string>
+    <string name="verification_emoji_flower">Blume</string>
+    <string name="verification_emoji_tree">Baum</string>
+    <string name="verification_emoji_cactus">Kaktus</string>
+    <string name="verification_emoji_mushroom">Pilz</string>
+    <string name="verification_emoji_globe">Globus</string>
+    <string name="verification_emoji_moon">Mond</string>
+    <string name="verification_emoji_cloud">Wolke</string>
+    <string name="verification_emoji_fire">Feuer</string>
+    <string name="verification_emoji_banana">Banane</string>
+    <string name="verification_emoji_apple">Apfel</string>
+    <string name="verification_emoji_strawberry">Erdbeere</string>
+    <string name="verification_emoji_corn">Korn</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Kuchen</string>
+    <string name="verification_emoji_heart">Herz</string>
+    <string name="verification_emoji_smiley">Smiley</string>
+    <string name="verification_emoji_robot">Roboter</string>
+    <string name="verification_emoji_hat">Hut</string>
+    <string name="verification_emoji_glasses">Brille</string>
+    <string name="verification_emoji_spanner">Schraubenschlüssel</string>
+    <string name="verification_emoji_santa">Nikolaus</string>
+    <string name="verification_emoji_thumbs_up">Daumen Hoch</string>
+    <string name="verification_emoji_umbrella">Regenschirm</string>
+    <string name="verification_emoji_hourglass">Sanduhr</string>
+    <string name="verification_emoji_clock">Wecker</string>
+    <string name="verification_emoji_gift">Geschenk</string>
+    <string name="verification_emoji_light_bulb">Glühbirne</string>
+    <string name="verification_emoji_book">Buch</string>
+    <string name="verification_emoji_pencil">Bleistift</string>
+    <string name="verification_emoji_paperclip">Büroklammer</string>
+    <string name="verification_emoji_scissors">Schere</string>
+    <string name="verification_emoji_lock">Schloss</string>
+    <string name="verification_emoji_key">Schlüssel</string>
+    <string name="verification_emoji_hammer">Hammer</string>
+    <string name="verification_emoji_telephone">Telefon</string>
+    <string name="verification_emoji_flag">Flagge</string>
+    <string name="verification_emoji_train">Zug</string>
+    <string name="verification_emoji_bicycle">Fahrrad</string>
+    <string name="verification_emoji_aeroplane">Flugzeug</string>
+    <string name="verification_emoji_rocket">Rakete</string>
+    <string name="verification_emoji_trophy">Trophäe</string>
+    <string name="verification_emoji_ball">Ball</string>
+    <string name="verification_emoji_guitar">Gitarre</string>
+    <string name="verification_emoji_trumpet">Trompete</string>
+    <string name="verification_emoji_bell">Glocke</string>
+    <string name="verification_emoji_anchor">Anker</string>
+    <string name="verification_emoji_headphones">Kopfhörer</string>
+    <string name="verification_emoji_folder">Ordner</string>
+    <string name="verification_emoji_pin">Stecknadel</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-en-rGB/strings.xml b/matrix-sdk-android/src/main/res/values-en-rGB/strings.xml
deleted file mode 100644
index f457e30ed0..0000000000
--- a/matrix-sdk-android/src/main/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="verification_emoji_wrench">Spanner</string>
-    <string name="verification_emoji_airplane">Aeroplane</string>
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-eo/strings.xml b/matrix-sdk-android/src/main/res/values-eo/strings.xml
index 4a1e2c4c65..69b009ca7e 100644
--- a/matrix-sdk-android/src/main/res/values-eo/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eo/strings.xml
@@ -72,72 +72,6 @@
 
     <string name="room_displayname_empty_room">Malplena ĉambro</string>
 
-
-    <string name="verification_emoji_dog">Hundo</string>
-    <string name="verification_emoji_cat">Kato</string>
-    <string name="verification_emoji_lion">Leono</string>
-    <string name="verification_emoji_horse">Ĉevalo</string>
-    <string name="verification_emoji_unicorn">Unukorno</string>
-    <string name="verification_emoji_pig">Porko</string>
-    <string name="verification_emoji_elephant">Elefanto</string>
-    <string name="verification_emoji_rabbit">Kuniklo</string>
-    <string name="verification_emoji_panda">Pando</string>
-    <string name="verification_emoji_rooster">Koko</string>
-    <string name="verification_emoji_penguin">Pingveno</string>
-    <string name="verification_emoji_turtle">Testudo</string>
-    <string name="verification_emoji_fish">Fiŝo</string>
-    <string name="verification_emoji_octopus">Polpo</string>
-    <string name="verification_emoji_butterfly">Papilio</string>
-    <string name="verification_emoji_flower">Floro</string>
-    <string name="verification_emoji_tree">Arbo</string>
-    <string name="verification_emoji_cactus">Kakto</string>
-    <string name="verification_emoji_mushroom">Fungo</string>
-    <string name="verification_emoji_globe">Globo</string>
-    <string name="verification_emoji_moon">Luno</string>
-    <string name="verification_emoji_cloud">Nubo</string>
-    <string name="verification_emoji_fire">Fajro</string>
-    <string name="verification_emoji_banana">Banano</string>
-    <string name="verification_emoji_apple">Pomo</string>
-    <string name="verification_emoji_strawberry">Frago</string>
-    <string name="verification_emoji_corn">Maizo</string>
-    <string name="verification_emoji_pizza">Pico</string>
-    <string name="verification_emoji_cake">Kuko</string>
-    <string name="verification_emoji_heart">Koro</string>
-    <string name="verification_emoji_smiley">Mieneto</string>
-    <string name="verification_emoji_robot">Roboto</string>
-    <string name="verification_emoji_hat">Ĉapelo</string>
-    <string name="verification_emoji_glasses">Okulvitroj</string>
-    <string name="verification_emoji_wrench">Boltilo</string>
-    <string name="verification_emoji_santa">Kristnaska viro</string>
-    <string name="verification_emoji_thumbsup">Dikfingro supren</string>
-    <string name="verification_emoji_umbrella">Ombrelo</string>
-    <string name="verification_emoji_hourglass">Sablohorloĝo</string>
-    <string name="verification_emoji_clock">Horloĝo</string>
-    <string name="verification_emoji_gift">Donaco</string>
-    <string name="verification_emoji_lightbulb">Lampo</string>
-    <string name="verification_emoji_book">Libro</string>
-    <string name="verification_emoji_pencil">Grifelo</string>
-    <string name="verification_emoji_paperclip">Paperkuntenilo</string>
-    <string name="verification_emoji_scissors">Tondilo</string>
-    <string name="verification_emoji_lock">Seruro</string>
-    <string name="verification_emoji_key">Ŝlosilo</string>
-    <string name="verification_emoji_hammer">Martelo</string>
-    <string name="verification_emoji_telephone">Telefono</string>
-    <string name="verification_emoji_flag">Flago</string>
-    <string name="verification_emoji_train">Vagonaro</string>
-    <string name="verification_emoji_bicycle">Biciklo</string>
-    <string name="verification_emoji_airplane">Aviadilo</string>
-    <string name="verification_emoji_rocket">Raketo</string>
-    <string name="verification_emoji_trophy">Trofeo</string>
-    <string name="verification_emoji_ball">Pilko</string>
-    <string name="verification_emoji_guitar">Gitaro</string>
-    <string name="verification_emoji_trumpet">Trumpeto</string>
-    <string name="verification_emoji_bell">Sonorilo</string>
-    <string name="verification_emoji_anchor">Ankro</string>
-    <string name="verification_emoji_headphone">Kapaŭdilo</string>
-    <string name="verification_emoji_folder">Dosierujo</string>
-    <string name="verification_emoji_pin">Pinglo</string>
-
     <string name="initial_sync_start_importing_account">Komenca spegulado:
 \nEnportante konton…</string>
     <string name="initial_sync_start_importing_account_crypto">Komenca spegulado:
diff --git a/matrix-sdk-android/src/main/res/values-eo/strings_sas.xml b/matrix-sdk-android/src/main/res/values-eo/strings_sas.xml
new file mode 100644
index 0000000000..16f762e362
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-eo/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Hundo</string>
+    <string name="verification_emoji_cat">Kato</string>
+    <string name="verification_emoji_lion">Leono</string>
+    <string name="verification_emoji_horse">Ĉevalo</string>
+    <string name="verification_emoji_unicorn">Unukorno</string>
+    <string name="verification_emoji_pig">Porko</string>
+    <string name="verification_emoji_elephant">Elefanto</string>
+    <string name="verification_emoji_rabbit">Kuniklo</string>
+    <string name="verification_emoji_panda">Pando</string>
+    <string name="verification_emoji_rooster">Virkoko</string>
+    <string name="verification_emoji_penguin">Pingveno</string>
+    <string name="verification_emoji_turtle">Testudo</string>
+    <string name="verification_emoji_fish">Fiŝo</string>
+    <string name="verification_emoji_octopus">Polpo</string>
+    <string name="verification_emoji_butterfly">Papilio</string>
+    <string name="verification_emoji_flower">Floro</string>
+    <string name="verification_emoji_tree">Arbo</string>
+    <string name="verification_emoji_cactus">Kakto</string>
+    <string name="verification_emoji_mushroom">Fungo</string>
+    <string name="verification_emoji_globe">Globo</string>
+    <string name="verification_emoji_moon">Luno</string>
+    <string name="verification_emoji_cloud">Nubo</string>
+    <string name="verification_emoji_fire">Fajro</string>
+    <string name="verification_emoji_banana">Banano</string>
+    <string name="verification_emoji_apple">Pomo</string>
+    <string name="verification_emoji_strawberry">Frago</string>
+    <string name="verification_emoji_corn">Maizo</string>
+    <string name="verification_emoji_pizza">Pico</string>
+    <string name="verification_emoji_cake">Torto</string>
+    <string name="verification_emoji_heart">Koro</string>
+    <string name="verification_emoji_smiley">Rideto</string>
+    <string name="verification_emoji_robot">Roboto</string>
+    <string name="verification_emoji_hat">Ĉapelo</string>
+    <string name="verification_emoji_glasses">Okulvitroj</string>
+    <string name="verification_emoji_spanner">Ŝraŭbŝlosilo</string>
+    <string name="verification_emoji_santa">Kristnaska viro</string>
+    <string name="verification_emoji_thumbs_up">Dikfingro supren</string>
+    <string name="verification_emoji_umbrella">Ombrelo</string>
+    <string name="verification_emoji_hourglass">Sablohorloĝo</string>
+    <string name="verification_emoji_clock">Horloĝo</string>
+    <string name="verification_emoji_gift">Donaco</string>
+    <string name="verification_emoji_light_bulb">Lampo</string>
+    <string name="verification_emoji_book">Libro</string>
+    <string name="verification_emoji_pencil">Krajono</string>
+    <string name="verification_emoji_paperclip">Paperkuntenilo</string>
+    <string name="verification_emoji_scissors">Tondilo</string>
+    <string name="verification_emoji_lock">Seruro</string>
+    <string name="verification_emoji_key">Ŝlosilo</string>
+    <string name="verification_emoji_hammer">Martelo</string>
+    <string name="verification_emoji_telephone">Telefono</string>
+    <string name="verification_emoji_flag">Flago</string>
+    <string name="verification_emoji_train">Vagonaro</string>
+    <string name="verification_emoji_bicycle">Biciklo</string>
+    <string name="verification_emoji_aeroplane">Aviadilo</string>
+    <string name="verification_emoji_rocket">Raketo</string>
+    <string name="verification_emoji_trophy">Trofeo</string>
+    <string name="verification_emoji_ball">Pilko</string>
+    <string name="verification_emoji_guitar">Gitaro</string>
+    <string name="verification_emoji_trumpet">Trumpeto</string>
+    <string name="verification_emoji_bell">Sonorilo</string>
+    <string name="verification_emoji_anchor">Ankro</string>
+    <string name="verification_emoji_headphones">Kapaŭdilo</string>
+    <string name="verification_emoji_folder">Dosierujo</string>
+    <string name="verification_emoji_pin">Pinglo</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml b/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
index 35b7bfc829..a8e8477005 100644
--- a/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
@@ -89,8 +89,4 @@
     <string name="notice_event_redacted_by">Mensaje eliminado por %1$s</string>
     <string name="notice_event_redacted_with_reason">Mensaje eliminado [motivo: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Mensaje eliminado por %1$s [motivo: %2$s]</string>
-    <string name="verification_emoji_dog">Perro</string>
-    <string name="verification_emoji_cat">Gato</string>
-    <string name="verification_emoji_lion">León</string>
-    <string name="verification_emoji_horse">Caballo</string>
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-es/strings.xml b/matrix-sdk-android/src/main/res/values-es/strings.xml
index 3c019b3b80..ae1f5633bf 100644
--- a/matrix-sdk-android/src/main/res/values-es/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-es/strings.xml
@@ -90,65 +90,6 @@
     <string name="notice_event_redacted_with_reason">Mensaje eliminado [motivo: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Mensaje eliminado por %1$s [motivo: %2$s]</string>
     <string name="notice_room_third_party_revoked_invite">%1$s ha revocado la invitación a unirse a la sala para %2$s</string>
-    <string name="verification_emoji_dog">Perro</string>
-    <string name="verification_emoji_cat">Gato</string>
-    <string name="verification_emoji_lion">León</string>
-    <string name="verification_emoji_horse">Caballo</string>
-    <string name="verification_emoji_unicorn">Unicornio</string>
-    <string name="verification_emoji_pig">Cerdo</string>
-    <string name="verification_emoji_elephant">Elefante</string>
-    <string name="verification_emoji_rabbit">Conejo</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Gallo</string>
-    <string name="verification_emoji_penguin">Pingüino</string>
-    <string name="verification_emoji_turtle">Tortuga</string>
-    <string name="verification_emoji_fish">Pez</string>
-    <string name="verification_emoji_octopus">Pulpo</string>
-    <string name="verification_emoji_butterfly">Mariposa</string>
-    <string name="verification_emoji_flower">Flor</string>
-    <string name="verification_emoji_tree">Árbol</string>
-    <string name="verification_emoji_cactus">Cactus</string>
-    <string name="verification_emoji_mushroom">Seta</string>
-    <string name="verification_emoji_moon">Luna</string>
-    <string name="verification_emoji_cloud">Nube</string>
-    <string name="verification_emoji_fire">Fuego</string>
-    <string name="verification_emoji_banana">Plátano</string>
-    <string name="verification_emoji_apple">Manzana</string>
-    <string name="verification_emoji_strawberry">Fresa</string>
-    <string name="verification_emoji_corn">Maíz</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Pastel</string>
-    <string name="verification_emoji_heart">Corazón</string>
-    <string name="verification_emoji_hat">Sombrero</string>
-    <string name="verification_emoji_glasses">Gafas</string>
-    <string name="verification_emoji_wrench">Llave inglesa</string>
-    <string name="verification_emoji_thumbsup">Pulgares arriba</string>
-    <string name="verification_emoji_umbrella">Paraguas</string>
-    <string name="verification_emoji_hourglass">Reloj de arena</string>
-    <string name="verification_emoji_clock">Reloj</string>
-    <string name="verification_emoji_gift">Regalo</string>
-    <string name="verification_emoji_lightbulb">Bombilla</string>
-    <string name="verification_emoji_book">Libro</string>
-    <string name="verification_emoji_pencil">Lápiz</string>
-    <string name="verification_emoji_paperclip">Clip</string>
-    <string name="verification_emoji_scissors">Tijeras</string>
-    <string name="verification_emoji_lock">Candado</string>
-    <string name="verification_emoji_key">Llave</string>
-    <string name="verification_emoji_hammer">Martillo</string>
-    <string name="verification_emoji_telephone">Teléfono</string>
-    <string name="verification_emoji_flag">Bandera</string>
-    <string name="verification_emoji_train">Tren</string>
-    <string name="verification_emoji_bicycle">Bicicleta</string>
-    <string name="verification_emoji_airplane">Avión</string>
-    <string name="verification_emoji_rocket">Cohete</string>
-    <string name="verification_emoji_trophy">Trofeo</string>
-    <string name="verification_emoji_ball">Pelota</string>
-    <string name="verification_emoji_guitar">Guitarra</string>
-    <string name="verification_emoji_trumpet">Trompeta</string>
-    <string name="verification_emoji_bell">Campana</string>
-    <string name="verification_emoji_anchor">Ancla</string>
-    <string name="verification_emoji_headphone">Auriculares</string>
-    <string name="verification_emoji_folder">Carpeta</string>
     <string name="initial_sync_start_importing_account">Sincronización Inicial
 \nImportando cuenta…</string>
     <string name="initial_sync_start_importing_account_rooms">Sincronización Inicial:
@@ -173,12 +114,6 @@
 
     <string name="notice_room_update">%s ha actualizado la sala.</string>
 
-    <string name="verification_emoji_globe">Globo Terráqueo</string>
-    <string name="verification_emoji_smiley">Cara sonriente</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_santa">Papá Noel</string>
-    <string name="verification_emoji_pin">Pin</string>
-
     <string name="initial_sync_start_importing_account_crypto">Sincronización Inicial:
 \nImportando criptografía</string>
     <string name="initial_sync_start_importing_account_joined_rooms">Sincronización Inicial:
diff --git a/matrix-sdk-android/src/main/res/values-es/strings_sas.xml b/matrix-sdk-android/src/main/res/values-es/strings_sas.xml
new file mode 100644
index 0000000000..fd396c1778
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-es/strings_sas.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Perro</string>
+    <string name="verification_emoji_cat">Gato</string>
+    <string name="verification_emoji_lion">León</string>
+    <string name="verification_emoji_horse">Caballo</string>
+    <string name="verification_emoji_unicorn">Unicornio</string>
+    <string name="verification_emoji_pig">Cerdo</string>
+    <string name="verification_emoji_elephant">Elefante</string>
+    <string name="verification_emoji_rabbit">Conejo</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Gallo</string>
+    <string name="verification_emoji_penguin">Pingüino</string>
+    <string name="verification_emoji_turtle">Tortuga</string>
+    <string name="verification_emoji_fish">Pez</string>
+    <string name="verification_emoji_octopus">Pulpo</string>
+    <string name="verification_emoji_butterfly">Mariposa</string>
+    <string name="verification_emoji_flower">Flor</string>
+    <string name="verification_emoji_tree">Árbol</string>
+    <string name="verification_emoji_cactus">Cactus</string>
+    <string name="verification_emoji_mushroom">Seta</string>
+    <string name="verification_emoji_globe">Globo</string>
+    <string name="verification_emoji_moon">Luna</string>
+    <string name="verification_emoji_cloud">Nube</string>
+    <string name="verification_emoji_fire">Fuego</string>
+    <string name="verification_emoji_banana">Plátano</string>
+    <string name="verification_emoji_apple">Manzana</string>
+    <string name="verification_emoji_strawberry">Fresa</string>
+    <string name="verification_emoji_corn">Maíz</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Tarta</string>
+    <string name="verification_emoji_heart">Corazón</string>
+    <string name="verification_emoji_smiley">Emoticono</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Sombrero</string>
+    <string name="verification_emoji_glasses">Gafas</string>
+    <string name="verification_emoji_spanner">Llave inglesa</string>
+    <string name="verification_emoji_clock">Reloj</string>
+    <string name="verification_emoji_gift">Regalo</string>
+    <string name="verification_emoji_book">Libro</string>
+    <string name="verification_emoji_pencil">Lápiz</string>
+    <string name="verification_emoji_key">Llave</string>
+    <string name="verification_emoji_hammer">Martillo</string>
+    <string name="verification_emoji_telephone">Telefono</string>
+    <string name="verification_emoji_train">Tren</string>
+    <string name="verification_emoji_bicycle">Bicicleta</string>
+    <string name="verification_emoji_ball">Bola</string>
+    <string name="verification_emoji_guitar">Guitarra</string>
+    <string name="verification_emoji_trumpet">Trompeta</string>
+    <string name="verification_emoji_bell">Campana</string>
+    <string name="verification_emoji_pin">Alfiler</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-et/strings.xml b/matrix-sdk-android/src/main/res/values-et/strings.xml
index b7cd202063..2fbe263464 100644
--- a/matrix-sdk-android/src/main/res/values-et/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-et/strings.xml
@@ -77,72 +77,6 @@
 
     <string name="room_displayname_empty_room">Tühi jututuba</string>
 
-
-    <string name="verification_emoji_dog">Koer</string>
-    <string name="verification_emoji_cat">Kass</string>
-    <string name="verification_emoji_lion">Lõvi</string>
-    <string name="verification_emoji_horse">Hobune</string>
-    <string name="verification_emoji_unicorn">Ükssarvik</string>
-    <string name="verification_emoji_pig">Siga</string>
-    <string name="verification_emoji_elephant">Elevant</string>
-    <string name="verification_emoji_rabbit">Jänes</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Kukk</string>
-    <string name="verification_emoji_penguin">Pingviin</string>
-    <string name="verification_emoji_turtle">Kilpkonn</string>
-    <string name="verification_emoji_fish">Kala</string>
-    <string name="verification_emoji_octopus">Kaheksajalg</string>
-    <string name="verification_emoji_butterfly">Liblikas</string>
-    <string name="verification_emoji_flower">Lill</string>
-    <string name="verification_emoji_tree">Puu</string>
-    <string name="verification_emoji_cactus">Kaktus</string>
-    <string name="verification_emoji_mushroom">Seen</string>
-    <string name="verification_emoji_globe">Maakera</string>
-    <string name="verification_emoji_moon">Kuu</string>
-    <string name="verification_emoji_cloud">Pilv</string>
-    <string name="verification_emoji_fire">Tuli</string>
-    <string name="verification_emoji_banana">Banaan</string>
-    <string name="verification_emoji_apple">Õun</string>
-    <string name="verification_emoji_strawberry">Maasikas</string>
-    <string name="verification_emoji_corn">Mais</string>
-    <string name="verification_emoji_pizza">Pitsa</string>
-    <string name="verification_emoji_cake">Kook</string>
-    <string name="verification_emoji_heart">Süda</string>
-    <string name="verification_emoji_smiley">Smaili</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Kübar</string>
-    <string name="verification_emoji_glasses">Prillid</string>
-    <string name="verification_emoji_wrench">Mutrivõti</string>
-    <string name="verification_emoji_santa">Jõuluvana</string>
-    <string name="verification_emoji_thumbsup">Pöidlad püsti</string>
-    <string name="verification_emoji_umbrella">Vihmavari</string>
-    <string name="verification_emoji_hourglass">Liivakell</string>
-    <string name="verification_emoji_clock">Kell</string>
-    <string name="verification_emoji_gift">Kingitus</string>
-    <string name="verification_emoji_lightbulb">Lambipirn</string>
-    <string name="verification_emoji_book">Raamat</string>
-    <string name="verification_emoji_pencil">Pliiats</string>
-    <string name="verification_emoji_paperclip">Kirjaklamber</string>
-    <string name="verification_emoji_scissors">Käärid</string>
-    <string name="verification_emoji_lock">Lukk</string>
-    <string name="verification_emoji_key">Võti</string>
-    <string name="verification_emoji_hammer">Haamer</string>
-    <string name="verification_emoji_telephone">Telefon</string>
-    <string name="verification_emoji_flag">Lipp</string>
-    <string name="verification_emoji_train">Rong</string>
-    <string name="verification_emoji_bicycle">Jalgratas</string>
-    <string name="verification_emoji_airplane">Lennuk</string>
-    <string name="verification_emoji_rocket">Rakett</string>
-    <string name="verification_emoji_trophy">Auhind</string>
-    <string name="verification_emoji_ball">Pall</string>
-    <string name="verification_emoji_guitar">Kitarr</string>
-    <string name="verification_emoji_trumpet">Trompet</string>
-    <string name="verification_emoji_bell">Kelluke</string>
-    <string name="verification_emoji_anchor">Ankur</string>
-    <string name="verification_emoji_headphone">Kõrvaklapid</string>
-    <string name="verification_emoji_folder">Kaust</string>
-    <string name="verification_emoji_pin">Nööpnõel</string>
-
     <string name="initial_sync_start_importing_account">Alglaadimine:
 \nImpordin kontot…</string>
     <string name="initial_sync_start_importing_account_crypto">Alglaadimine:
@@ -295,8 +229,4 @@
     <string name="notice_end_to_end_ok_by_you">Sa lülitasid sisse läbiva krüptimise.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Sa lülitasid sisse läbiva krüptimise (kasutusel on tundmatu algoritm %1$s).</string>
 
-    <string name="call_notification_answer">Võta vastu</string>
-    <string name="call_notification_reject">Keeldu</string>
-    <string name="call_notification_hangup">Lõpeta kõne</string>
-
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-et/strings_sas.xml b/matrix-sdk-android/src/main/res/values-et/strings_sas.xml
new file mode 100644
index 0000000000..60df725eaa
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-et/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Koer</string>
+    <string name="verification_emoji_cat">Kass</string>
+    <string name="verification_emoji_lion">Lõvi</string>
+    <string name="verification_emoji_horse">Hobune</string>
+    <string name="verification_emoji_unicorn">Ükssarvik</string>
+    <string name="verification_emoji_pig">Siga</string>
+    <string name="verification_emoji_elephant">Elevant</string>
+    <string name="verification_emoji_rabbit">Jänes</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Kukk</string>
+    <string name="verification_emoji_penguin">Pingviin</string>
+    <string name="verification_emoji_turtle">Kilpkonn</string>
+    <string name="verification_emoji_fish">Kala</string>
+    <string name="verification_emoji_octopus">Kaheksajalg</string>
+    <string name="verification_emoji_butterfly">Liblikas</string>
+    <string name="verification_emoji_flower">Lill</string>
+    <string name="verification_emoji_tree">Puu</string>
+    <string name="verification_emoji_cactus">Kaktus</string>
+    <string name="verification_emoji_mushroom">Seen</string>
+    <string name="verification_emoji_globe">Maakera</string>
+    <string name="verification_emoji_moon">Kuu</string>
+    <string name="verification_emoji_cloud">Pilv</string>
+    <string name="verification_emoji_fire">Tuli</string>
+    <string name="verification_emoji_banana">Banaan</string>
+    <string name="verification_emoji_apple">Õun</string>
+    <string name="verification_emoji_strawberry">Maasikas</string>
+    <string name="verification_emoji_corn">Mais</string>
+    <string name="verification_emoji_pizza">Pitsa</string>
+    <string name="verification_emoji_cake">Kook</string>
+    <string name="verification_emoji_heart">Süda</string>
+    <string name="verification_emoji_smiley">Smaili</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Kübar</string>
+    <string name="verification_emoji_glasses">Prillid</string>
+    <string name="verification_emoji_spanner">Mutrivõti</string>
+    <string name="verification_emoji_santa">Jõuluvana</string>
+    <string name="verification_emoji_thumbs_up">Pöidlad püsti</string>
+    <string name="verification_emoji_umbrella">Vihmavari</string>
+    <string name="verification_emoji_hourglass">Liivakell</string>
+    <string name="verification_emoji_clock">Kell</string>
+    <string name="verification_emoji_gift">Kingitus</string>
+    <string name="verification_emoji_light_bulb">Lambipirn</string>
+    <string name="verification_emoji_book">Raamat</string>
+    <string name="verification_emoji_pencil">Pliiats</string>
+    <string name="verification_emoji_paperclip">Kirjaklamber</string>
+    <string name="verification_emoji_scissors">Käärid</string>
+    <string name="verification_emoji_lock">Lukk</string>
+    <string name="verification_emoji_key">Võti</string>
+    <string name="verification_emoji_hammer">Haamer</string>
+    <string name="verification_emoji_telephone">Telefon</string>
+    <string name="verification_emoji_flag">Lipp</string>
+    <string name="verification_emoji_train">Rong</string>
+    <string name="verification_emoji_bicycle">Jalgratas</string>
+    <string name="verification_emoji_aeroplane">Lennuk</string>
+    <string name="verification_emoji_rocket">Rakett</string>
+    <string name="verification_emoji_trophy">Auhind</string>
+    <string name="verification_emoji_ball">Pall</string>
+    <string name="verification_emoji_guitar">Kitarr</string>
+    <string name="verification_emoji_trumpet">Trompet</string>
+    <string name="verification_emoji_bell">Kelluke</string>
+    <string name="verification_emoji_anchor">Ankur</string>
+    <string name="verification_emoji_headphones">Kõrvaklapid</string>
+    <string name="verification_emoji_folder">Kaust</string>
+    <string name="verification_emoji_pin">Nööpnõel</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-eu/strings.xml b/matrix-sdk-android/src/main/res/values-eu/strings.xml
index 1a5c81fe5e..bc61035c24 100644
--- a/matrix-sdk-android/src/main/res/values-eu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eu/strings.xml
@@ -78,70 +78,6 @@
     <string name="notice_event_redacted_by">%1$s erabiltzaileak mezua kendu du</string>
     <string name="notice_event_redacted_with_reason">Mezua kendu da [arrazoia: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">%1$s erabiltzaileak mezua kendu du [arrazoia: %2$s]</string>
-    <string name="verification_emoji_dog">Txakurra</string>
-    <string name="verification_emoji_cat">Katua</string>
-    <string name="verification_emoji_lion">Lehoia</string>
-    <string name="verification_emoji_horse">Zaldia</string>
-    <string name="verification_emoji_unicorn">Unikornioa</string>
-    <string name="verification_emoji_pig">Zerria</string>
-    <string name="verification_emoji_elephant">Elefantea</string>
-    <string name="verification_emoji_rabbit">Untxia</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Oilarra</string>
-    <string name="verification_emoji_penguin">Pinguinoa</string>
-    <string name="verification_emoji_turtle">Dortoka</string>
-    <string name="verification_emoji_fish">Arraina</string>
-    <string name="verification_emoji_octopus">Olagarroa</string>
-    <string name="verification_emoji_butterfly">Tximeleta</string>
-    <string name="verification_emoji_flower">Lorea</string>
-    <string name="verification_emoji_tree">Zuhaitza</string>
-    <string name="verification_emoji_cactus">Kaktusa</string>
-    <string name="verification_emoji_mushroom">Perretxikoa</string>
-    <string name="verification_emoji_globe">Lurra</string>
-    <string name="verification_emoji_moon">Ilargia</string>
-    <string name="verification_emoji_cloud">Hodeia</string>
-    <string name="verification_emoji_fire">Sua</string>
-    <string name="verification_emoji_banana">Banana</string>
-    <string name="verification_emoji_apple">Sagarra</string>
-    <string name="verification_emoji_strawberry">Marrubia</string>
-    <string name="verification_emoji_corn">Artoa</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Pastela</string>
-    <string name="verification_emoji_heart">Bihotza</string>
-    <string name="verification_emoji_smiley">Irrifartxoa</string>
-    <string name="verification_emoji_robot">Robota</string>
-    <string name="verification_emoji_hat">Txanoa</string>
-    <string name="verification_emoji_glasses">Betaurrekoak</string>
-    <string name="verification_emoji_wrench">Giltza</string>
-    <string name="verification_emoji_santa">Santa</string>
-    <string name="verification_emoji_thumbsup">Ederto</string>
-    <string name="verification_emoji_umbrella">Aterkia</string>
-    <string name="verification_emoji_hourglass">Harea-erlojua</string>
-    <string name="verification_emoji_clock">Erlojua</string>
-    <string name="verification_emoji_gift">Oparia</string>
-    <string name="verification_emoji_lightbulb">Bonbilla</string>
-    <string name="verification_emoji_book">Liburua</string>
-    <string name="verification_emoji_pencil">Arkatza</string>
-    <string name="verification_emoji_paperclip">Klipa</string>
-    <string name="verification_emoji_scissors">Artaziak</string>
-    <string name="verification_emoji_lock">Giltzarrapoa</string>
-    <string name="verification_emoji_key">Giltza</string>
-    <string name="verification_emoji_hammer">Mailua</string>
-    <string name="verification_emoji_telephone">Telefonoa</string>
-    <string name="verification_emoji_flag">Bandera</string>
-    <string name="verification_emoji_train">Trena</string>
-    <string name="verification_emoji_bicycle">Bizikleta</string>
-    <string name="verification_emoji_airplane">Hegazkina</string>
-    <string name="verification_emoji_rocket">Kohetea</string>
-    <string name="verification_emoji_trophy">Saria</string>
-    <string name="verification_emoji_ball">Baloia</string>
-    <string name="verification_emoji_guitar">Gitarra</string>
-    <string name="verification_emoji_trumpet">Tronpeta</string>
-    <string name="verification_emoji_bell">Kanpaia</string>
-    <string name="verification_emoji_anchor">Aingura</string>
-    <string name="verification_emoji_headphone">Aurikularrak</string>
-    <string name="verification_emoji_folder">Karpeta</string>
-    <string name="verification_emoji_pin">Txintxeta</string>
 
     <string name="initial_sync_start_importing_account">Hasierako sinkronizazioa:
 \nKontua inportatzen…</string>
diff --git a/matrix-sdk-android/src/main/res/values-fa/strings.xml b/matrix-sdk-android/src/main/res/values-fa/strings.xml
index 18d8578e54..b88a98459d 100644
--- a/matrix-sdk-android/src/main/res/values-fa/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fa/strings.xml
@@ -77,72 +77,6 @@
 
     <string name="room_displayname_empty_room">اتاق خالی</string>
 
-
-    <string name="verification_emoji_dog">سگ</string>
-    <string name="verification_emoji_cat">گربه</string>
-    <string name="verification_emoji_lion">شیر</string>
-    <string name="verification_emoji_horse">اسب</string>
-    <string name="verification_emoji_unicorn">تک‌شاخ</string>
-    <string name="verification_emoji_pig">خوک</string>
-    <string name="verification_emoji_elephant">فیل</string>
-    <string name="verification_emoji_rabbit">خرگوش</string>
-    <string name="verification_emoji_panda">پاندا</string>
-    <string name="verification_emoji_rooster">خروس</string>
-    <string name="verification_emoji_penguin">پنگوئن</string>
-    <string name="verification_emoji_turtle">لاک‌پشت</string>
-    <string name="verification_emoji_fish">ماهی</string>
-    <string name="verification_emoji_octopus">هشت‌پا</string>
-    <string name="verification_emoji_butterfly">پروانه</string>
-    <string name="verification_emoji_flower">گل</string>
-    <string name="verification_emoji_tree">درخت</string>
-    <string name="verification_emoji_cactus">کاکتوس</string>
-    <string name="verification_emoji_mushroom">قارچ</string>
-    <string name="verification_emoji_globe">جهان</string>
-    <string name="verification_emoji_moon">ماه</string>
-    <string name="verification_emoji_cloud">ابر</string>
-    <string name="verification_emoji_fire">آتش</string>
-    <string name="verification_emoji_banana">موز</string>
-    <string name="verification_emoji_apple">سیب</string>
-    <string name="verification_emoji_strawberry">توت‌فرنگی</string>
-    <string name="verification_emoji_corn">بلال</string>
-    <string name="verification_emoji_pizza">پیتزا</string>
-    <string name="verification_emoji_cake">کیک</string>
-    <string name="verification_emoji_heart">قلب</string>
-    <string name="verification_emoji_smiley">لبخند</string>
-    <string name="verification_emoji_robot">آدم‌آهنی</string>
-    <string name="verification_emoji_hat">کلاه</string>
-    <string name="verification_emoji_glasses">عینک</string>
-    <string name="verification_emoji_wrench">آچار</string>
-    <string name="verification_emoji_santa">بابانوئل</string>
-    <string name="verification_emoji_thumbsup">شست</string>
-    <string name="verification_emoji_umbrella">چتر</string>
-    <string name="verification_emoji_hourglass">ساعت شنی</string>
-    <string name="verification_emoji_clock">ساعت</string>
-    <string name="verification_emoji_gift">هدیه</string>
-    <string name="verification_emoji_lightbulb">لامپ</string>
-    <string name="verification_emoji_book">کتاب</string>
-    <string name="verification_emoji_pencil">مداد</string>
-    <string name="verification_emoji_paperclip">گیره کاغذ</string>
-    <string name="verification_emoji_scissors">قیچی</string>
-    <string name="verification_emoji_lock">قفل</string>
-    <string name="verification_emoji_key">کلید</string>
-    <string name="verification_emoji_hammer">چکّش</string>
-    <string name="verification_emoji_telephone">تلفن</string>
-    <string name="verification_emoji_flag">پرچم</string>
-    <string name="verification_emoji_train">قطار</string>
-    <string name="verification_emoji_bicycle">دوچرخه</string>
-    <string name="verification_emoji_airplane">هواپیما</string>
-    <string name="verification_emoji_rocket">موشک</string>
-    <string name="verification_emoji_trophy">جام</string>
-    <string name="verification_emoji_ball">توپ</string>
-    <string name="verification_emoji_guitar">گیتار</string>
-    <string name="verification_emoji_trumpet">ترومپت</string>
-    <string name="verification_emoji_bell">زنگ</string>
-    <string name="verification_emoji_anchor">لنگر</string>
-    <string name="verification_emoji_headphone">هدفون</string>
-    <string name="verification_emoji_folder">پوشه</string>
-    <string name="verification_emoji_pin">پونز</string>
-
     <string name="initial_sync_start_importing_account">همگام‌سازی نخستین:
 \nدر حال درون‌ریزی حساب…</string>
     <string name="initial_sync_start_importing_account_crypto">همگام‌سازی نخستین:
diff --git a/matrix-sdk-android/src/main/res/values-fi/strings.xml b/matrix-sdk-android/src/main/res/values-fi/strings.xml
index 078769942c..fccd22d3b6 100644
--- a/matrix-sdk-android/src/main/res/values-fi/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fi/strings.xml
@@ -79,70 +79,6 @@
     <string name="notice_event_redacted_by">%1$s poisti viestin</string>
     <string name="notice_event_redacted_with_reason">Viesti poistettu [syy: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">%1$s poisti viestin [syy: %2$s]</string>
-    <string name="verification_emoji_dog">Koira</string>
-    <string name="verification_emoji_cat">Kissa</string>
-    <string name="verification_emoji_lion">Leijona</string>
-    <string name="verification_emoji_horse">Hevonen</string>
-    <string name="verification_emoji_unicorn">Yksisarvinen</string>
-    <string name="verification_emoji_pig">Sika</string>
-    <string name="verification_emoji_elephant">Norsu</string>
-    <string name="verification_emoji_rabbit">Kani</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Kukko</string>
-    <string name="verification_emoji_penguin">Pingviini</string>
-    <string name="verification_emoji_turtle">Kilpikonna</string>
-    <string name="verification_emoji_fish">Kala</string>
-    <string name="verification_emoji_octopus">Tursas</string>
-    <string name="verification_emoji_butterfly">Perhonen</string>
-    <string name="verification_emoji_flower">Kukka</string>
-    <string name="verification_emoji_tree">Puu</string>
-    <string name="verification_emoji_cactus">Kaktus</string>
-    <string name="verification_emoji_mushroom">Sieni</string>
-    <string name="verification_emoji_globe">Maapallo</string>
-    <string name="verification_emoji_moon">Kuu</string>
-    <string name="verification_emoji_cloud">Pilvi</string>
-    <string name="verification_emoji_fire">Tuli</string>
-    <string name="verification_emoji_banana">Banaani</string>
-    <string name="verification_emoji_apple">Omena</string>
-    <string name="verification_emoji_strawberry">Mansikka</string>
-    <string name="verification_emoji_corn">Maissi</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Kakku</string>
-    <string name="verification_emoji_heart">Sydän</string>
-    <string name="verification_emoji_smiley">Hymiö</string>
-    <string name="verification_emoji_robot">Robotti</string>
-    <string name="verification_emoji_hat">Hattu</string>
-    <string name="verification_emoji_glasses">Silmälasit</string>
-    <string name="verification_emoji_wrench">Jakoavain</string>
-    <string name="verification_emoji_santa">Joulupukki</string>
-    <string name="verification_emoji_thumbsup">Peukut ylös</string>
-    <string name="verification_emoji_umbrella">Sateenvarjo</string>
-    <string name="verification_emoji_hourglass">Tiimalasi</string>
-    <string name="verification_emoji_clock">Kello</string>
-    <string name="verification_emoji_gift">Lahja</string>
-    <string name="verification_emoji_lightbulb">Hehkulamppu</string>
-    <string name="verification_emoji_book">Kirja</string>
-    <string name="verification_emoji_pencil">Lyijykynä</string>
-    <string name="verification_emoji_paperclip">Klemmari</string>
-    <string name="verification_emoji_scissors">Sakset</string>
-    <string name="verification_emoji_lock">Lukko</string>
-    <string name="verification_emoji_key">Avain</string>
-    <string name="verification_emoji_hammer">Vasara</string>
-    <string name="verification_emoji_telephone">Puhelin</string>
-    <string name="verification_emoji_flag">Lippu</string>
-    <string name="verification_emoji_train">Juna</string>
-    <string name="verification_emoji_bicycle">Polkupyörä</string>
-    <string name="verification_emoji_airplane">Lentokone</string>
-    <string name="verification_emoji_rocket">Raketti</string>
-    <string name="verification_emoji_trophy">Palkinto</string>
-    <string name="verification_emoji_ball">Pallo</string>
-    <string name="verification_emoji_guitar">Kitara</string>
-    <string name="verification_emoji_trumpet">Trumpetti</string>
-    <string name="verification_emoji_bell">Soittokello</string>
-    <string name="verification_emoji_anchor">Ankkuri</string>
-    <string name="verification_emoji_headphone">Kuulokkeet</string>
-    <string name="verification_emoji_folder">Kansio</string>
-    <string name="verification_emoji_pin">Nuppineula</string>
 
     <string name="initial_sync_start_importing_account">Alkusynkronointi:
 \nTuodaan tiliä…</string>
diff --git a/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml b/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml
new file mode 100644
index 0000000000..b690fee4ed
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Koira</string>
+    <string name="verification_emoji_cat">Kissa</string>
+    <string name="verification_emoji_lion">Leijona</string>
+    <string name="verification_emoji_horse">Hevonen</string>
+    <string name="verification_emoji_unicorn">Yksisarvinen</string>
+    <string name="verification_emoji_pig">Sika</string>
+    <string name="verification_emoji_elephant">Norsu</string>
+    <string name="verification_emoji_rabbit">Kani</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Kukko</string>
+    <string name="verification_emoji_penguin">Pingviini</string>
+    <string name="verification_emoji_turtle">Kilpikonna</string>
+    <string name="verification_emoji_fish">Kala</string>
+    <string name="verification_emoji_octopus">Tursas</string>
+    <string name="verification_emoji_butterfly">Perhonen</string>
+    <string name="verification_emoji_flower">Kukka</string>
+    <string name="verification_emoji_tree">Puu</string>
+    <string name="verification_emoji_cactus">Kaktus</string>
+    <string name="verification_emoji_mushroom">Sieni</string>
+    <string name="verification_emoji_globe">Maapallo</string>
+    <string name="verification_emoji_moon">Kuu</string>
+    <string name="verification_emoji_cloud">Pilvi</string>
+    <string name="verification_emoji_fire">Tuli</string>
+    <string name="verification_emoji_banana">Banaani</string>
+    <string name="verification_emoji_apple">Omena</string>
+    <string name="verification_emoji_strawberry">Mansikka</string>
+    <string name="verification_emoji_corn">Maissi</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Kakku</string>
+    <string name="verification_emoji_heart">Sydän</string>
+    <string name="verification_emoji_smiley">Hymynaama</string>
+    <string name="verification_emoji_robot">Robotti</string>
+    <string name="verification_emoji_hat">Hattu</string>
+    <string name="verification_emoji_glasses">Silmälasit</string>
+    <string name="verification_emoji_spanner">Mutteriavain</string>
+    <string name="verification_emoji_santa">Joulupukki</string>
+    <string name="verification_emoji_thumbs_up">Peukalo ylös</string>
+    <string name="verification_emoji_umbrella">Sateenvarjo</string>
+    <string name="verification_emoji_hourglass">Tiimalasi</string>
+    <string name="verification_emoji_clock">Pöytäkello</string>
+    <string name="verification_emoji_gift">Lahja</string>
+    <string name="verification_emoji_light_bulb">Hehkulamppu</string>
+    <string name="verification_emoji_book">Kirja</string>
+    <string name="verification_emoji_pencil">Lyijykynä</string>
+    <string name="verification_emoji_paperclip">Paperiliitin</string>
+    <string name="verification_emoji_scissors">Sakset</string>
+    <string name="verification_emoji_lock">Lukko</string>
+    <string name="verification_emoji_key">Avain</string>
+    <string name="verification_emoji_hammer">Vasara</string>
+    <string name="verification_emoji_telephone">Puhelin</string>
+    <string name="verification_emoji_flag">Lippu</string>
+    <string name="verification_emoji_train">Juna</string>
+    <string name="verification_emoji_bicycle">Polkupyörä</string>
+    <string name="verification_emoji_aeroplane">Lentokone</string>
+    <string name="verification_emoji_rocket">Raketti</string>
+    <string name="verification_emoji_trophy">Palkinto</string>
+    <string name="verification_emoji_ball">Pallo</string>
+    <string name="verification_emoji_guitar">Kitara</string>
+    <string name="verification_emoji_trumpet">Trumpetti</string>
+    <string name="verification_emoji_bell">Soittokello</string>
+    <string name="verification_emoji_anchor">Ankkuri</string>
+    <string name="verification_emoji_headphones">Kuulokkeet</string>
+    <string name="verification_emoji_folder">Kansio</string>
+    <string name="verification_emoji_pin">Nuppineula</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-fr/strings.xml b/matrix-sdk-android/src/main/res/values-fr/strings.xml
index aad3bd1afb..71b956a7e7 100644
--- a/matrix-sdk-android/src/main/res/values-fr/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fr/strings.xml
@@ -78,70 +78,6 @@
     <string name="notice_event_redacted_by">Message supprimé par %1$s</string>
     <string name="notice_event_redacted_with_reason">Message supprimé [motif : %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Message supprimé par %1$s [motif : %2$s]</string>
-    <string name="verification_emoji_dog">Chien</string>
-    <string name="verification_emoji_cat">Chat</string>
-    <string name="verification_emoji_lion">Lion</string>
-    <string name="verification_emoji_horse">Cheval</string>
-    <string name="verification_emoji_unicorn">Licorne</string>
-    <string name="verification_emoji_pig">Cochon</string>
-    <string name="verification_emoji_elephant">Éléphant</string>
-    <string name="verification_emoji_rabbit">Lapin</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Coq</string>
-    <string name="verification_emoji_penguin">Manchot</string>
-    <string name="verification_emoji_turtle">Tortue</string>
-    <string name="verification_emoji_fish">Poisson</string>
-    <string name="verification_emoji_octopus">Pieuvre</string>
-    <string name="verification_emoji_butterfly">Papillon</string>
-    <string name="verification_emoji_flower">Fleur</string>
-    <string name="verification_emoji_tree">Arbre</string>
-    <string name="verification_emoji_cactus">Cactus</string>
-    <string name="verification_emoji_mushroom">Champignon</string>
-    <string name="verification_emoji_globe">Terre</string>
-    <string name="verification_emoji_moon">Lune</string>
-    <string name="verification_emoji_cloud">Nuage</string>
-    <string name="verification_emoji_fire">Feu</string>
-    <string name="verification_emoji_banana">Banane</string>
-    <string name="verification_emoji_apple">Pomme</string>
-    <string name="verification_emoji_strawberry">Fraise</string>
-    <string name="verification_emoji_corn">Maïs</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Gâteau</string>
-    <string name="verification_emoji_heart">Cœur</string>
-    <string name="verification_emoji_smiley">Smiley</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Chapeau</string>
-    <string name="verification_emoji_glasses">Lunettes</string>
-    <string name="verification_emoji_wrench">Clé plate</string>
-    <string name="verification_emoji_santa">Père Noël</string>
-    <string name="verification_emoji_thumbsup">Pouce levé</string>
-    <string name="verification_emoji_umbrella">Parapluie</string>
-    <string name="verification_emoji_hourglass">Sablier</string>
-    <string name="verification_emoji_clock">Horloge</string>
-    <string name="verification_emoji_gift">Cadeau</string>
-    <string name="verification_emoji_lightbulb">Ampoule</string>
-    <string name="verification_emoji_book">Livre</string>
-    <string name="verification_emoji_pencil">Crayon</string>
-    <string name="verification_emoji_paperclip">Trombone</string>
-    <string name="verification_emoji_scissors">Ciseaux</string>
-    <string name="verification_emoji_lock">Cadenas</string>
-    <string name="verification_emoji_key">Clé</string>
-    <string name="verification_emoji_hammer">Marteau</string>
-    <string name="verification_emoji_telephone">Téléphone</string>
-    <string name="verification_emoji_flag">Drapeau</string>
-    <string name="verification_emoji_train">Train</string>
-    <string name="verification_emoji_bicycle">Vélo</string>
-    <string name="verification_emoji_airplane">Avion</string>
-    <string name="verification_emoji_rocket">Fusée</string>
-    <string name="verification_emoji_trophy">Trophée</string>
-    <string name="verification_emoji_ball">Balle</string>
-    <string name="verification_emoji_guitar">Guitare</string>
-    <string name="verification_emoji_trumpet">Trompette</string>
-    <string name="verification_emoji_bell">Cloche</string>
-    <string name="verification_emoji_anchor">Ancre</string>
-    <string name="verification_emoji_headphone">Écouteurs</string>
-    <string name="verification_emoji_folder">Dossier</string>
-    <string name="verification_emoji_pin">Épingle</string>
 
     <string name="initial_sync_start_importing_account">Synchronisation initiale :
 \nImportation du compte…</string>
diff --git a/matrix-sdk-android/src/main/res/values-fr/strings_sas.xml b/matrix-sdk-android/src/main/res/values-fr/strings_sas.xml
new file mode 100644
index 0000000000..af9d797542
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-fr/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Chien</string>
+    <string name="verification_emoji_cat">Chat</string>
+    <string name="verification_emoji_lion">Lion</string>
+    <string name="verification_emoji_horse">Cheval</string>
+    <string name="verification_emoji_unicorn">Licorne</string>
+    <string name="verification_emoji_pig">Cochon</string>
+    <string name="verification_emoji_elephant">Éléphant</string>
+    <string name="verification_emoji_rabbit">Lapin</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Coq</string>
+    <string name="verification_emoji_penguin">Manchot</string>
+    <string name="verification_emoji_turtle">Tortue</string>
+    <string name="verification_emoji_fish">Poisson</string>
+    <string name="verification_emoji_octopus">Poulpe</string>
+    <string name="verification_emoji_butterfly">Papillon</string>
+    <string name="verification_emoji_flower">Fleur</string>
+    <string name="verification_emoji_tree">Arbre</string>
+    <string name="verification_emoji_cactus">Cactus</string>
+    <string name="verification_emoji_mushroom">Champignon</string>
+    <string name="verification_emoji_globe">Globe</string>
+    <string name="verification_emoji_moon">Lune</string>
+    <string name="verification_emoji_cloud">Nuage</string>
+    <string name="verification_emoji_fire">Feu</string>
+    <string name="verification_emoji_banana">Banane</string>
+    <string name="verification_emoji_apple">Pomme</string>
+    <string name="verification_emoji_strawberry">Fraise</string>
+    <string name="verification_emoji_corn">Maïs</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Gâteau</string>
+    <string name="verification_emoji_heart">Cœur</string>
+    <string name="verification_emoji_smiley">Sourire</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Châpeau</string>
+    <string name="verification_emoji_glasses">Lunettes</string>
+    <string name="verification_emoji_spanner">Clé à molette</string>
+    <string name="verification_emoji_santa">Père Noël</string>
+    <string name="verification_emoji_thumbs_up">Pouce en l\'air</string>
+    <string name="verification_emoji_umbrella">Parapluie</string>
+    <string name="verification_emoji_hourglass">Sablier</string>
+    <string name="verification_emoji_clock">Réveil</string>
+    <string name="verification_emoji_gift">Cadeau</string>
+    <string name="verification_emoji_light_bulb">Ampoule</string>
+    <string name="verification_emoji_book">Livre</string>
+    <string name="verification_emoji_pencil">Crayon</string>
+    <string name="verification_emoji_paperclip">Trombone</string>
+    <string name="verification_emoji_scissors">Ciseaux</string>
+    <string name="verification_emoji_lock">Cadenas</string>
+    <string name="verification_emoji_key">Clé</string>
+    <string name="verification_emoji_hammer">Marteau</string>
+    <string name="verification_emoji_telephone">Téléphone</string>
+    <string name="verification_emoji_flag">Drapeau</string>
+    <string name="verification_emoji_train">Train</string>
+    <string name="verification_emoji_bicycle">Vélo</string>
+    <string name="verification_emoji_aeroplane">Avion</string>
+    <string name="verification_emoji_rocket">Fusée</string>
+    <string name="verification_emoji_trophy">Trophée</string>
+    <string name="verification_emoji_ball">Ballon</string>
+    <string name="verification_emoji_guitar">Guitare</string>
+    <string name="verification_emoji_trumpet">Trompette</string>
+    <string name="verification_emoji_bell">Cloche</string>
+    <string name="verification_emoji_anchor">Ancre</string>
+    <string name="verification_emoji_headphones">Casque audio</string>
+    <string name="verification_emoji_folder">Dossier</string>
+    <string name="verification_emoji_pin">Punaise</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-hu/strings.xml b/matrix-sdk-android/src/main/res/values-hu/strings.xml
index 35f35eaecd..896a97b023 100644
--- a/matrix-sdk-android/src/main/res/values-hu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-hu/strings.xml
@@ -77,70 +77,6 @@
     <string name="notice_event_redacted_by">Üzenetet eltávolította: %1$s</string>
     <string name="notice_event_redacted_with_reason">Üzenet eltávolítva [ok: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Üzenetet eltávolította: %1$s [ok: %2$s]</string>
-    <string name="verification_emoji_dog">Kutya</string>
-    <string name="verification_emoji_cat">Macska</string>
-    <string name="verification_emoji_lion">Oroszlán</string>
-    <string name="verification_emoji_horse">Ló</string>
-    <string name="verification_emoji_unicorn">Egyszarvú</string>
-    <string name="verification_emoji_pig">Malac</string>
-    <string name="verification_emoji_elephant">Elefánt</string>
-    <string name="verification_emoji_rabbit">Nyúl</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Kakas</string>
-    <string name="verification_emoji_penguin">Pingvin</string>
-    <string name="verification_emoji_turtle">Teknős</string>
-    <string name="verification_emoji_fish">Hal</string>
-    <string name="verification_emoji_octopus">Polip</string>
-    <string name="verification_emoji_butterfly">Pillangó</string>
-    <string name="verification_emoji_flower">Virág</string>
-    <string name="verification_emoji_tree">Fa</string>
-    <string name="verification_emoji_cactus">Kaktusz</string>
-    <string name="verification_emoji_mushroom">Gomba</string>
-    <string name="verification_emoji_globe">Föld</string>
-    <string name="verification_emoji_moon">Hold</string>
-    <string name="verification_emoji_cloud">Felhő</string>
-    <string name="verification_emoji_fire">Tűz</string>
-    <string name="verification_emoji_banana">Banán</string>
-    <string name="verification_emoji_apple">Alma</string>
-    <string name="verification_emoji_strawberry">Eper</string>
-    <string name="verification_emoji_corn">Kukorica</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Süti</string>
-    <string name="verification_emoji_heart">Szív</string>
-    <string name="verification_emoji_smiley">Smiley</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Kalap</string>
-    <string name="verification_emoji_glasses">Szemüveg</string>
-    <string name="verification_emoji_wrench">Csavarkulcs</string>
-    <string name="verification_emoji_santa">Télapó</string>
-    <string name="verification_emoji_thumbsup">Hüvelykujj fel</string>
-    <string name="verification_emoji_umbrella">Esernyő</string>
-    <string name="verification_emoji_hourglass">Homokóra</string>
-    <string name="verification_emoji_clock">Óra</string>
-    <string name="verification_emoji_gift">Ajándék</string>
-    <string name="verification_emoji_lightbulb">Égő</string>
-    <string name="verification_emoji_book">Könyv</string>
-    <string name="verification_emoji_pencil">Ceruza</string>
-    <string name="verification_emoji_paperclip">Gémkapocs</string>
-    <string name="verification_emoji_scissors">Olló</string>
-    <string name="verification_emoji_lock">Zár</string>
-    <string name="verification_emoji_key">Kulcs</string>
-    <string name="verification_emoji_hammer">Kalapács</string>
-    <string name="verification_emoji_telephone">Telefon</string>
-    <string name="verification_emoji_flag">Zászló</string>
-    <string name="verification_emoji_train">Vonat</string>
-    <string name="verification_emoji_bicycle">Kerékpár</string>
-    <string name="verification_emoji_airplane">Repülő</string>
-    <string name="verification_emoji_rocket">Rakéta</string>
-    <string name="verification_emoji_trophy">Trófea</string>
-    <string name="verification_emoji_ball">Labda</string>
-    <string name="verification_emoji_guitar">Gitár</string>
-    <string name="verification_emoji_trumpet">Trombita</string>
-    <string name="verification_emoji_bell">Harang</string>
-    <string name="verification_emoji_anchor">Vasmacska</string>
-    <string name="verification_emoji_headphone">Fejhallgató</string>
-    <string name="verification_emoji_folder">Mappa</string>
-    <string name="verification_emoji_pin">Tű</string>
 
     <string name="initial_sync_start_importing_account">Induló szinkronizáció:
 \nFiók betöltése…</string>
diff --git a/matrix-sdk-android/src/main/res/values-it/strings.xml b/matrix-sdk-android/src/main/res/values-it/strings.xml
index 2b2a097f13..cf081752a2 100644
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-it/strings.xml
@@ -78,70 +78,6 @@
     <string name="notice_event_redacted_by">Messaggio rimosso da %1$s</string>
     <string name="notice_event_redacted_with_reason">Messaggio rimosso [motivo: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Messaggio rimosso da %1$s [motivo: %2$s]</string>
-    <string name="verification_emoji_dog">Cane</string>
-    <string name="verification_emoji_cat">Gatto</string>
-    <string name="verification_emoji_lion">Leone</string>
-    <string name="verification_emoji_horse">Cavallo</string>
-    <string name="verification_emoji_unicorn">Unicorno</string>
-    <string name="verification_emoji_pig">Maiale</string>
-    <string name="verification_emoji_elephant">Elefante</string>
-    <string name="verification_emoji_rabbit">Coniglio</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Gallo</string>
-    <string name="verification_emoji_penguin">Pinguino</string>
-    <string name="verification_emoji_turtle">Tartaruga</string>
-    <string name="verification_emoji_fish">Pesce</string>
-    <string name="verification_emoji_octopus">Piovra</string>
-    <string name="verification_emoji_butterfly">Farfalla</string>
-    <string name="verification_emoji_flower">Fiore</string>
-    <string name="verification_emoji_tree">Albero</string>
-    <string name="verification_emoji_cactus">Cactus</string>
-    <string name="verification_emoji_mushroom">Fungo</string>
-    <string name="verification_emoji_globe">Globo</string>
-    <string name="verification_emoji_moon">Luna</string>
-    <string name="verification_emoji_cloud">Nuvola</string>
-    <string name="verification_emoji_fire">Fuoco</string>
-    <string name="verification_emoji_banana">Banana</string>
-    <string name="verification_emoji_apple">Mela</string>
-    <string name="verification_emoji_strawberry">Fragola</string>
-    <string name="verification_emoji_corn">Mais</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Torta</string>
-    <string name="verification_emoji_heart">Cuore</string>
-    <string name="verification_emoji_smiley">Sorriso</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Cappello</string>
-    <string name="verification_emoji_glasses">Occhiali</string>
-    <string name="verification_emoji_wrench">Chiave inglese</string>
-    <string name="verification_emoji_santa">Babbo Natale</string>
-    <string name="verification_emoji_thumbsup">Pollice in su</string>
-    <string name="verification_emoji_umbrella">Ombrello</string>
-    <string name="verification_emoji_hourglass">Clessidra</string>
-    <string name="verification_emoji_clock">Orologio</string>
-    <string name="verification_emoji_gift">Regalo</string>
-    <string name="verification_emoji_lightbulb">Lampadina</string>
-    <string name="verification_emoji_book">Libro</string>
-    <string name="verification_emoji_pencil">Matita</string>
-    <string name="verification_emoji_paperclip">Graffetta</string>
-    <string name="verification_emoji_scissors">Forbici</string>
-    <string name="verification_emoji_lock">Lucchetto</string>
-    <string name="verification_emoji_key">Chiave</string>
-    <string name="verification_emoji_hammer">Martello</string>
-    <string name="verification_emoji_telephone">Telefono</string>
-    <string name="verification_emoji_flag">Bandiera</string>
-    <string name="verification_emoji_train">Treno</string>
-    <string name="verification_emoji_bicycle">Bicicletta</string>
-    <string name="verification_emoji_airplane">Aeroplano</string>
-    <string name="verification_emoji_rocket">Razzo</string>
-    <string name="verification_emoji_trophy">Trofeo</string>
-    <string name="verification_emoji_ball">Palla</string>
-    <string name="verification_emoji_guitar">Chitarra</string>
-    <string name="verification_emoji_trumpet">Tromba</string>
-    <string name="verification_emoji_bell">Campana</string>
-    <string name="verification_emoji_anchor">Ancora</string>
-    <string name="verification_emoji_headphone">Cuffie</string>
-    <string name="verification_emoji_folder">Cartella</string>
-    <string name="verification_emoji_pin">Spillo</string>
 
     <string name="initial_sync_start_importing_account">Sync iniziale:
 \nImportazione account…</string>
@@ -296,8 +232,4 @@
     <string name="notice_end_to_end_ok_by_you">Hai attivato la crittografia end-to-end.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Hai attivato la crittografia end-to-end (algoritmo %1$s sconosciuto).</string>
 
-    <string name="call_notification_answer">Accetta</string>
-    <string name="call_notification_reject">Rifiuta</string>
-    <string name="call_notification_hangup">Riaggancia</string>
-
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml b/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml
new file mode 100644
index 0000000000..618302eb4f
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">犬</string>
+    <string name="verification_emoji_cat">猫</string>
+    <string name="verification_emoji_horse">馬</string>
+    <string name="verification_emoji_octopus">たこ</string>
+    <string name="verification_emoji_flower">花</string>
+    <string name="verification_emoji_tree">木</string>
+    <string name="verification_emoji_mushroom">きのこ</string>
+    <string name="verification_emoji_moon">月</string>
+    <string name="verification_emoji_apple">リンゴ</string>
+    <string name="verification_emoji_cake">ケーキ</string>
+    <string name="verification_emoji_robot">ロボと</string>
+    <string name="verification_emoji_glasses">めがね</string>
+    <string name="verification_emoji_book">本</string>
+    <string name="verification_emoji_telephone">電話機</string>
+    <string name="verification_emoji_train">電車</string>
+    <string name="verification_emoji_bicycle">自転車</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-kab/strings.xml b/matrix-sdk-android/src/main/res/values-kab/strings.xml
new file mode 100644
index 0000000000..0d1cad6550
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-kab/strings.xml
@@ -0,0 +1,225 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s t.yuzen tugna.</string>
+    <string name="summary_you_sent_image">Tuzneḍ tugna.</string>
+    <string name="notice_room_invite_no_invitee">Tinubga n %s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Tinubga-k•m</string>
+    <string name="notice_room_created">%1$s yesnulfa-d taxxamt</string>
+    <string name="notice_room_created_by_you">Tesnulfaḍ-d taxxamt-a</string>
+    <string name="notice_room_invite">%1$s inced-d %2$s</string>
+    <string name="notice_room_invite_by_you">Tnecdeḍ-d %1$s</string>
+    <string name="notice_room_invite_you">%1$s inced-ik-id</string>
+    <string name="notice_room_join">%1$s yedda ɣer texxamt</string>
+    <string name="notice_room_join_by_you">Teddiḍ ɣer texxamt</string>
+    <string name="notice_room_leave">%1$s yeǧǧa taxxamt</string>
+    <string name="notice_room_leave_by_you">Teǧǧiḍ taxxamt</string>
+    <string name="notice_room_reject">%1$s yugi/tugi tinubga</string>
+    <string name="notice_room_reject_by_you">Tufiḍ tinubga</string>
+    <string name="notice_room_kick">%1$s yessufeɣ %2$s</string>
+    <string name="notice_room_kick_by_you">Tessufɣeḍ %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Tbeddleḍ avatar-inek·inem</string>
+    <string name="power_level_admin">Anedbal</string>
+    <string name="power_level_moderator">Aseɣyad</string>
+    <string name="power_level_default">Amezwer</string>
+    <string name="power_level_custom_no_value">Sagen</string>
+
+    <string name="notice_power_level_diff">%1$s seg %2$s ɣer %3$s</string>
+
+    <string name="message_failed_to_upload">Tegguma ad d-tali tugna</string>
+
+    <string name="medium_email">Tansa n yimayl</string>
+
+    <string name="summary_user_sent_sticker">%1$s azen astiker.</string>
+    <string name="summary_you_sent_sticker">Tuzneḍ amenṭaḍ.</string>
+
+    <string name="notice_room_unban">%1$s yekkes agdal i %2$s</string>
+    <string name="notice_room_unban_by_you">Tekkseḍ agdal i %1$s</string>
+    <string name="notice_room_ban">%1$s igdel %2$s</string>
+    <string name="notice_room_ban_by_you">Tgedleḍ %1$s</string>
+    <string name="notice_room_withdraw">%1$s issefsex tinubga n %2$s</string>
+    <string name="notice_room_withdraw_by_you">Tesfesxeḍ tinubga n %1$s</string>
+    <string name="notice_avatar_url_changed">%1$s ibeddel avatar-is</string>
+    <string name="notice_display_name_set">%1$s isbadu isem-is i d-ittuseknen ɣer %2$s</string>
+    <string name="notice_display_name_set_by_you">Tesbaduḍ isem-ik•im i d-ittuseknen ɣer %1$s</string>
+    <string name="notice_display_name_changed_from">%1$s ibeddel isem-is i d-ittuseknen seg %2$s ɣer %3$s</string>
+    <string name="notice_display_name_changed_from_by_you">Tbeddleḍ isem-ik•im i d-ittuseknen seg %1$s ɣer %2$s</string>
+    <string name="notice_display_name_removed">%1$s yekkes isem-is i d-ittuseknen (yella %2$s)</string>
+    <string name="notice_display_name_removed_by_you">Tekkseḍ isem-ik·im yettwaskanen (d %1$s)</string>
+    <string name="notice_room_topic_changed">%1$S isnifel asentel s: %2$S</string>
+    <string name="notice_room_topic_changed_by_you">Tesnifleḍ asentel s: %2$S</string>
+    <string name="notice_room_avatar_changed">%1$s ibeddel avaṭar n texxamt</string>
+    <string name="notice_room_avatar_changed_by_you">Tbeddleḍ avaṭar n texxamt</string>
+    <string name="notice_room_name_changed">%1$s ibeddel isem n texxamt s: %2$s</string>
+    <string name="notice_room_name_changed_by_you">Tbeddleḍ isem n texxamt s: %2$s</string>
+    <string name="notice_placed_video_call">%s isɛedda siwel s tvidyut.</string>
+    <string name="notice_placed_video_call_by_you">Tesɛeddaḍ siwel s tvidyut.</string>
+    <string name="notice_placed_voice_call">%s isɛedda asiwel s taɣect.</string>
+    <string name="notice_placed_voice_call_by_you">Tesɛeddaḍ siwel s taɣect.</string>
+    <string name="notice_call_candidates">%s yuzen isefka i usbadu n usiwel.</string>
+    <string name="notice_call_candidates_by_you">Tuzneḍ isefka i usbadu n usiwel.</string>
+    <string name="notice_answered_call">%s yerra ɣef usiwel.</string>
+    <string name="notice_answered_call_by_you">Terriḍ ɣef usiwel.</string>
+    <string name="notice_ended_call">%s iḥbes asiwel.</string>
+    <string name="notice_ended_call_by_you">Tḥebseḍ asiwel.</string>
+    <string name="notice_room_visibility_invited">meṛṛa iɛeggalen n texxamt, segmi ara d-ttwanecden.</string>
+    <string name="notice_room_visibility_joined">meṛṛa iɛeggalen n texamt, segmi ara d-rnun.</string>
+    <string name="notice_room_visibility_shared">meṛṛa iɛeggalen n texxamt.</string>
+    <string name="notice_room_visibility_world_readable">yal yiwen.</string>
+    <string name="notice_room_visibility_unknown">arussin (%s).</string>
+    <string name="notice_end_to_end">%1$s isermed awgelhen seg yixef ɣer yixef (%2$s)</string>
+    <string name="notice_end_to_end_by_you">Tesremdeḍ awgelhen seg yixef ɣer yixef (%2$s)</string>
+    <string name="notice_room_update">%s ileqqem taxxamt-a.</string>
+    <string name="notice_room_update_by_you">Tleqqmeḍ taxxamt-a.</string>
+
+    <string name="notice_requested_voip_conference">%1$s isuter-d asarag VoIP</string>
+    <string name="notice_requested_voip_conference_by_you">Tsutreḍ-d asarag VoIP</string>
+    <string name="notice_voip_started">Asarag VoIP yebda</string>
+    <string name="notice_voip_finished">Asarag VoIP yekfa</string>
+
+    <string name="notice_avatar_changed_too">(avatar daɣen ibeddel)</string>
+    <string name="notice_room_name_removed">%1$s yekkes isem n texxamt</string>
+    <string name="notice_room_name_removed_by_you">Tekkseḍ isem n texxamt</string>
+    <string name="notice_room_topic_removed">%1$s yekkes asentel n texxamt</string>
+    <string name="notice_room_topic_removed_by_you">Tekkseḍ asentel n texxamt</string>
+    <string name="notice_room_avatar_removed">%1$s yekkes avatar n texxamt</string>
+    <string name="notice_room_avatar_removed_by_you">Tekkseḍ avatar n texxamt</string>
+    <string name="notice_event_redacted">Izen ittwakkes</string>
+    <string name="notice_event_redacted_by">Izen ittwakkes sɣur %1$s</string>
+    <string name="notice_event_redacted_with_reason">Izen ittwakkes [tamentilt: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Izen ittwakkes sɣur %1$s [tamentilt: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s ileqqem amaɣnu-ines %2$s</string>
+    <string name="notice_profile_change_redacted_by_you">Tleqqmeḍ amaɣnu-inek•inem %1$s</string>
+    <string name="notice_room_third_party_invite">%1$s yuzen tinubga i %2$s akken ad yeddu ɣer texxamt</string>
+    <string name="notice_room_third_party_invite_by_you">Tuzneḍ tinubga i %1$s akken ad yeddu ɣer texxamt</string>
+    <string name="notice_room_third_party_registered_invite">%1$s iqbel tinubga i %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Tqebleḍ tinubga i %1$s</string>
+
+    <string name="notice_widget_added">%1$s yerna awiǧit %2$s</string>
+    <string name="notice_widget_added_by_you">Terniḍ awiǧit %1$s</string>
+    <string name="notice_widget_removed">%1$s yekkes awiǧit %2$s</string>
+    <string name="notice_widget_removed_by_you">Tekkseḍ awiǧit %1$s</string>
+    <string name="notice_widget_modified">%1$s ibeddel awiǧit %2$s</string>
+    <string name="notice_widget_modified_by_you">Tbeddleḍ awiǧit %1$s</string>
+
+    <string name="power_level_custom">Sagen (%1$)</string>
+    <string name="notice_power_level_changed_by_you">Tbeddleḍ aswir n tezmert n %1$s.</string>
+    <string name="notice_power_level_changed">%1$s ibeddel aswir n tezmert n %2$s.</string>
+    <string name="notice_crypto_unable_to_decrypt">** Awgelhen d awezɣi: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Ibenk n umazan ur aɣ-d-yuzin ara tisura i yizen-a.</string>
+
+    <string name="unable_to_send_message">Tuzna n yizen d tawezɣit</string>
+
+    <string name="network_error">Tuccḍa deg uẓeṭṭa</string>
+    <string name="matrix_error">Tuccḍa deg Matrix</string>
+
+    <string name="notice_made_future_room_visibility">%1$s iga amazray n texxamyt i d-iteddun yettban i %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Tgiḍ amazray n texxamyt i d-iteddun yettban i %1$s</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s issefsax tinubga i %2$s i wakken ad d-yekcem ɣer texxamt</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Tesfesxeḍ tinubga i %1$s i wakken ad d-yernu ɣer texxamt</string>
+    <string name="room_error_join_failed_empty_room">D awezɣi tura ad nales ad nuɣal ɣer texxamt tilemt.</string>
+
+    <string name="encrypted_message">Izen yettwawgelhen</string>
+
+    <string name="medium_phone_number">Uṭṭun n tiliɣri</string>
+
+    <string name="room_displayname_invite_from">Tinubga sɣur %s</string>
+    <string name="room_displayname_room_invite">Tinubga ɣer texxamt</string>
+
+    <string name="room_displayname_two_members">%1$s d %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s d 1 wayeḍ</item>
+        <item quantity="other">%1$s d %2$d wiyaḍ</item>
+    </plurals>
+
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Tremdeḍ awgelhen seg yixef ɣer yixef (alguritm %1$s ur yettwassen ara).</string>
+
+    <string name="key_verification_request_fallback_message">%s isuter-d ad isenqed tasarut-ik·im, maca amsaɣ-ik·im ur issefrak ara asenqed n tsura deg yidiwenniyen. Ilaq-ak·am useqdec asenqed iqdim n tsura i usenqed n tsura.</string>
+
+    <string name="room_displayname_empty_room">Taxxamt tilemt</string>
+
+    <string name="initial_sync_start_importing_account">Amtawi n tazwara:
+\nAktar n umiḍan…</string>
+    <string name="initial_sync_start_importing_account_crypto">Amtawi n tazwara:
+\nAktar n uwgelhen</string>
+    <string name="initial_sync_start_importing_account_rooms">Amtawi n tazwara:
+\nAktar n texxamin</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Amtawi n tazwara:
+\nAktar n texxamin iɣer terniḍ</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Amtawi n tazwara:
+\nAktar n texxamin iɣer tettwanecdeḍ</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Amtawi n tazwara:
+\nAktar n texxamin i teǧǧiḍ</string>
+    <string name="initial_sync_start_importing_account_groups">Amtawi n tazwara:
+\nAktar n tmezdagnutin</string>
+    <string name="initial_sync_start_importing_account_data">Amtawi n tazwara:
+\nAktar n yisefka n umiḍan</string>
+
+    <string name="event_status_sending_message">Tuzzna n yizen…</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Tinubga n %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Tinubga-k•m. Tamentilt: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s inced %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Tnecdeḍ %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s inced-ik•ikem. Tamentilt: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s yedda ɣer texxamt. Tamentilt: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Teddiḍ ɣer texxamt. Tamentilt: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s yeǧǧa taxxamt. Tamentilt: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Teǧǧiḍ taxxamt. Tamentilt: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s yugi tinubga. Tamentilt: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Tugiḍ tinubga. Tamentilt: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s yessufeɣ %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Tessufɣeḍ %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s yekkes agdal i %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Tekkseḍ agdal i %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s igdel %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Tgedleḍ %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s yuzen tinubga i %2$s akken ad yeddu ɣer texxamt. Tamentilt: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Tuzneḍ tinubga i %1$s iwakken ad yeddu ɣer texxamt. Tamentilt: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s iqbel tinubga i %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Tqebleḍ tinubga i %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s issefsex tinubga n %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Tesfesxeḍ tinubga n %1$s. Tamentilt: %2$s</string>
+
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s yerna %2$s d tansa i texxamt-a.</item>
+        <item quantity="other">%1$s yerna %2$s d tansiwin i texxamt-a.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Terniḍ %1$s d tansa i texxamt-a.</item>
+        <item quantity="other">Terniḍ %1$s d tansiwin i texxamt-a.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s yekkes %2$s am tansa i texxamt-a.</item>
+        <item quantity="other">%1$s yekkes %3$s am tansiwin i texxamt-a.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Tekkseḍ %1$s am tansa i texxamt-a.</item>
+        <item quantity="other">Tekkseḍ %2$s am tansiwin i texxamt-a.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed">%1$s yerna %2$s terniḍ tekkseḍ %3s am tansiwin i texxamt-a.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Terniḍ %1$s terniḍ tekkseḍ %2$s am tansiwin i texxamt-a.</string>
+
+    <string name="notice_room_canonical_alias_set">%1$s isbadu %2$s am tansa tagejdant i texxamt-a.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Tesbaduḍ %1$s am tansa tagejdant i texxamt-a.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s yekkes tansa tagejdant i texxamt-a.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Tekkseḍ tansa tagejdant i texxamt-a.</string>
+
+    <string name="notice_room_guest_access_can_join">%1$s isireg inebgawen ad ddun ɣer texxamt.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Tsirgeḍ inebgawen ad ddun ɣer texxamt.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s issewḥel inebgawen iwakken ur tteddun ara ɣer texxamt.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Tesweḥleḍ inebgawen iwakken ur tteddun ara ɣer texxamt.</string>
+
+    <string name="notice_end_to_end_ok">%1$s yermed awgelhen seg yixef ɣer yixef.</string>
+    <string name="notice_end_to_end_ok_by_you">Tremdeḍ awgelhen seg yixef ɣer yixef.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s yermed awgelhen seg yixef ɣer yixef (alguritm %2$s ur yettwassen ara).</string>
+    <string name="clear_timeline_send_queue">Sfeḍ tabdart n uraǧu n tuzzna</string>
+
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s issefsex tinubga n %2$s i tmerniwt ɣer texxamt. Tamentilt: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Tesfesxeḍ tinubga n %1$s i tmerna ɣer texxamt. Tamentilt: %2$s</string>
+    <string name="could_not_redact">Yegguma ad yaru</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-ko/strings.xml b/matrix-sdk-android/src/main/res/values-ko/strings.xml
index 88c5e7d618..eee67628eb 100644
--- a/matrix-sdk-android/src/main/res/values-ko/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ko/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="notice_room_invite_no_invitee">%s님의 초대</string>
-    <string name="verification_emoji_headphone">헤드폰</string>
     <string name="summary_user_sent_image">%1$s님이 사진을 보냈습니다.</string>
     <string name="summary_user_sent_sticker">%1$s님이 스티커를 보냈습니다.</string>
 
@@ -78,71 +77,6 @@
 
     <string name="room_displayname_empty_room">빈 방</string>
 
-
-    <string name="verification_emoji_dog">개</string>
-    <string name="verification_emoji_cat">고양이</string>
-    <string name="verification_emoji_lion">사자</string>
-    <string name="verification_emoji_horse">말</string>
-    <string name="verification_emoji_unicorn">유니콘</string>
-    <string name="verification_emoji_pig">돼지</string>
-    <string name="verification_emoji_elephant">코끼리</string>
-    <string name="verification_emoji_rabbit">토끼</string>
-    <string name="verification_emoji_panda">판다</string>
-    <string name="verification_emoji_rooster">수탉</string>
-    <string name="verification_emoji_penguin">펭귄</string>
-    <string name="verification_emoji_turtle">거북</string>
-    <string name="verification_emoji_fish">물고기</string>
-    <string name="verification_emoji_octopus">문어</string>
-    <string name="verification_emoji_butterfly">나비</string>
-    <string name="verification_emoji_flower">꽃</string>
-    <string name="verification_emoji_tree">나무</string>
-    <string name="verification_emoji_cactus">선인장</string>
-    <string name="verification_emoji_mushroom">버섯</string>
-    <string name="verification_emoji_globe">지구본</string>
-    <string name="verification_emoji_moon">달</string>
-    <string name="verification_emoji_cloud">구름</string>
-    <string name="verification_emoji_fire">불</string>
-    <string name="verification_emoji_banana">바나나</string>
-    <string name="verification_emoji_apple">사과</string>
-    <string name="verification_emoji_strawberry">딸기</string>
-    <string name="verification_emoji_corn">옥수수</string>
-    <string name="verification_emoji_pizza">피자</string>
-    <string name="verification_emoji_cake">케이크</string>
-    <string name="verification_emoji_heart">하트</string>
-    <string name="verification_emoji_smiley">웃음</string>
-    <string name="verification_emoji_robot">로봇</string>
-    <string name="verification_emoji_hat">모자</string>
-    <string name="verification_emoji_glasses">안경</string>
-    <string name="verification_emoji_wrench">스패너</string>
-    <string name="verification_emoji_santa">산타클로스</string>
-    <string name="verification_emoji_thumbsup">좋아요</string>
-    <string name="verification_emoji_umbrella">우산</string>
-    <string name="verification_emoji_hourglass">모래시계</string>
-    <string name="verification_emoji_clock">시계</string>
-    <string name="verification_emoji_gift">선물</string>
-    <string name="verification_emoji_lightbulb">전구</string>
-    <string name="verification_emoji_book">책</string>
-    <string name="verification_emoji_pencil">연필</string>
-    <string name="verification_emoji_paperclip">클립</string>
-    <string name="verification_emoji_scissors">가위</string>
-    <string name="verification_emoji_lock">자물쇠</string>
-    <string name="verification_emoji_key">열쇠</string>
-    <string name="verification_emoji_hammer">망치</string>
-    <string name="verification_emoji_telephone">전화기</string>
-    <string name="verification_emoji_flag">깃발</string>
-    <string name="verification_emoji_train">기차</string>
-    <string name="verification_emoji_bicycle">자전거</string>
-    <string name="verification_emoji_airplane">비행기</string>
-    <string name="verification_emoji_rocket">로켓</string>
-    <string name="verification_emoji_trophy">트로피</string>
-    <string name="verification_emoji_ball">공</string>
-    <string name="verification_emoji_guitar">기타</string>
-    <string name="verification_emoji_trumpet">트럼펫</string>
-    <string name="verification_emoji_bell">종</string>
-    <string name="verification_emoji_anchor">닻</string>
-    <string name="verification_emoji_folder">폴더</string>
-    <string name="verification_emoji_pin">핀</string>
-
     <string name="initial_sync_start_importing_account">초기 동기화:
 \n계정 가져오는 중…</string>
     <string name="initial_sync_start_importing_account_crypto">초기 동기화:
diff --git a/matrix-sdk-android/src/main/res/values-nb-rNO/strings_sas.xml b/matrix-sdk-android/src/main/res/values-nb-rNO/strings_sas.xml
new file mode 100644
index 0000000000..c348b5bfbb
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-nb-rNO/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Hund</string>
+    <string name="verification_emoji_cat">Katt</string>
+    <string name="verification_emoji_lion">Løve</string>
+    <string name="verification_emoji_horse">Hest</string>
+    <string name="verification_emoji_unicorn">Enhjørning</string>
+    <string name="verification_emoji_pig">Gris</string>
+    <string name="verification_emoji_elephant">Elefant</string>
+    <string name="verification_emoji_rabbit">Kanin</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Hane</string>
+    <string name="verification_emoji_penguin">Pingvin</string>
+    <string name="verification_emoji_turtle">Skilpadde</string>
+    <string name="verification_emoji_fish">Fisk</string>
+    <string name="verification_emoji_octopus">Blekksprut</string>
+    <string name="verification_emoji_butterfly">Sommerfugl</string>
+    <string name="verification_emoji_flower">Blomst</string>
+    <string name="verification_emoji_tree">Tre</string>
+    <string name="verification_emoji_cactus">Kaktus</string>
+    <string name="verification_emoji_mushroom">Sopp</string>
+    <string name="verification_emoji_globe">Globus</string>
+    <string name="verification_emoji_moon">Måne</string>
+    <string name="verification_emoji_cloud">Sky</string>
+    <string name="verification_emoji_fire">Flamme</string>
+    <string name="verification_emoji_banana">Banan</string>
+    <string name="verification_emoji_apple">Eple</string>
+    <string name="verification_emoji_strawberry">Jordbær</string>
+    <string name="verification_emoji_corn">Mais</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Kake</string>
+    <string name="verification_emoji_heart">Hjerte</string>
+    <string name="verification_emoji_smiley">Smilefjes</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Hatt</string>
+    <string name="verification_emoji_glasses">Briller</string>
+    <string name="verification_emoji_spanner">Fastnøkkel</string>
+    <string name="verification_emoji_santa">Julenisse</string>
+    <string name="verification_emoji_thumbs_up">Tommel Opp</string>
+    <string name="verification_emoji_umbrella">Paraply</string>
+    <string name="verification_emoji_hourglass">Timeglass</string>
+    <string name="verification_emoji_clock">Klokke</string>
+    <string name="verification_emoji_gift">Gave</string>
+    <string name="verification_emoji_light_bulb">Lyspære</string>
+    <string name="verification_emoji_book">Bok</string>
+    <string name="verification_emoji_pencil">Blyant</string>
+    <string name="verification_emoji_paperclip">BInders</string>
+    <string name="verification_emoji_scissors">Saks</string>
+    <string name="verification_emoji_lock">Lås</string>
+    <string name="verification_emoji_key">Nøkkel</string>
+    <string name="verification_emoji_hammer">Hammer</string>
+    <string name="verification_emoji_telephone">Telefon</string>
+    <string name="verification_emoji_flag">Flagg</string>
+    <string name="verification_emoji_train">Tog</string>
+    <string name="verification_emoji_bicycle">Sykkel</string>
+    <string name="verification_emoji_aeroplane">Fly</string>
+    <string name="verification_emoji_rocket">Rakett</string>
+    <string name="verification_emoji_trophy">Pokal</string>
+    <string name="verification_emoji_ball">Ball</string>
+    <string name="verification_emoji_guitar">Gitar</string>
+    <string name="verification_emoji_trumpet">Trompet</string>
+    <string name="verification_emoji_bell">Bjelle</string>
+    <string name="verification_emoji_anchor">Anker</string>
+    <string name="verification_emoji_headphones">Hodetelefoner</string>
+    <string name="verification_emoji_folder">Mappe</string>
+    <string name="verification_emoji_pin">Tegnestift</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-nl/strings.xml b/matrix-sdk-android/src/main/res/values-nl/strings.xml
index 22eb61f109..1b05052ba6 100644
--- a/matrix-sdk-android/src/main/res/values-nl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nl/strings.xml
@@ -87,70 +87,6 @@
     <string name="notice_event_redacted_by">Bericht verwijderd door %1$s</string>
     <string name="notice_event_redacted_with_reason">Bericht verwijderd [reden: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Bericht verwijderd door %1$s [reden: %2$s]</string>
-    <string name="verification_emoji_dog">Hond</string>
-    <string name="verification_emoji_cat">Kat</string>
-    <string name="verification_emoji_lion">Leeuw</string>
-    <string name="verification_emoji_horse">Paard</string>
-    <string name="verification_emoji_unicorn">Eenhoorn</string>
-    <string name="verification_emoji_pig">Varken</string>
-    <string name="verification_emoji_elephant">Olifant</string>
-    <string name="verification_emoji_rabbit">Konijn</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Haan</string>
-    <string name="verification_emoji_penguin">Pinguïn</string>
-    <string name="verification_emoji_turtle">Schildpad</string>
-    <string name="verification_emoji_fish">Vis</string>
-    <string name="verification_emoji_octopus">Octopus</string>
-    <string name="verification_emoji_butterfly">Vlinder</string>
-    <string name="verification_emoji_flower">Bloem</string>
-    <string name="verification_emoji_tree">Boom</string>
-    <string name="verification_emoji_cactus">Cactus</string>
-    <string name="verification_emoji_mushroom">Paddenstoel</string>
-    <string name="verification_emoji_globe">Aardbol</string>
-    <string name="verification_emoji_moon">Maan</string>
-    <string name="verification_emoji_cloud">Wolk</string>
-    <string name="verification_emoji_fire">Vuur</string>
-    <string name="verification_emoji_banana">Banaan</string>
-    <string name="verification_emoji_apple">Appel</string>
-    <string name="verification_emoji_strawberry">Aardbei</string>
-    <string name="verification_emoji_corn">Maïs</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Taart</string>
-    <string name="verification_emoji_heart">Hart</string>
-    <string name="verification_emoji_smiley">Smiley</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Hoed</string>
-    <string name="verification_emoji_glasses">Bril</string>
-    <string name="verification_emoji_wrench">Moersleutel</string>
-    <string name="verification_emoji_santa">Kerstman</string>
-    <string name="verification_emoji_thumbsup">Duim omhoog</string>
-    <string name="verification_emoji_umbrella">Paraplu</string>
-    <string name="verification_emoji_hourglass">Zandloper</string>
-    <string name="verification_emoji_clock">Klok</string>
-    <string name="verification_emoji_gift">Cadeau</string>
-    <string name="verification_emoji_lightbulb">Gloeilamp</string>
-    <string name="verification_emoji_book">Boek</string>
-    <string name="verification_emoji_pencil">Potlood</string>
-    <string name="verification_emoji_paperclip">Paperclip</string>
-    <string name="verification_emoji_scissors">Schaar</string>
-    <string name="verification_emoji_lock">Slot</string>
-    <string name="verification_emoji_key">Sleutel</string>
-    <string name="verification_emoji_hammer">Hamer</string>
-    <string name="verification_emoji_telephone">Telefoon</string>
-    <string name="verification_emoji_flag">Vlag</string>
-    <string name="verification_emoji_train">Trein</string>
-    <string name="verification_emoji_bicycle">Fiets</string>
-    <string name="verification_emoji_airplane">Vliegtuig</string>
-    <string name="verification_emoji_rocket">Raket</string>
-    <string name="verification_emoji_trophy">Trofee</string>
-    <string name="verification_emoji_ball">Bal</string>
-    <string name="verification_emoji_guitar">Gitaar</string>
-    <string name="verification_emoji_trumpet">Trompet</string>
-    <string name="verification_emoji_bell">Bel</string>
-    <string name="verification_emoji_anchor">Anker</string>
-    <string name="verification_emoji_headphone">Koptelefoon</string>
-    <string name="verification_emoji_folder">Map</string>
-    <string name="verification_emoji_pin">Speld</string>
 
     <string name="initial_sync_start_importing_account">Initiële synchronisatie:
 \nAccount wordt geïmporteerd…</string>
diff --git a/matrix-sdk-android/src/main/res/values-nl/strings_sas.xml b/matrix-sdk-android/src/main/res/values-nl/strings_sas.xml
new file mode 100644
index 0000000000..077244232a
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-nl/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Hond</string>
+    <string name="verification_emoji_cat">Kat</string>
+    <string name="verification_emoji_lion">Leeuw</string>
+    <string name="verification_emoji_horse">Paard</string>
+    <string name="verification_emoji_unicorn">Eenhoorn</string>
+    <string name="verification_emoji_pig">Varken</string>
+    <string name="verification_emoji_elephant">Olifant</string>
+    <string name="verification_emoji_rabbit">Konijn</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Haan</string>
+    <string name="verification_emoji_penguin">Pinguïn</string>
+    <string name="verification_emoji_turtle">Schildpad</string>
+    <string name="verification_emoji_fish">Vis</string>
+    <string name="verification_emoji_octopus">Octopus</string>
+    <string name="verification_emoji_butterfly">Vlinder</string>
+    <string name="verification_emoji_flower">Bloem</string>
+    <string name="verification_emoji_tree">Boom</string>
+    <string name="verification_emoji_cactus">Cactus</string>
+    <string name="verification_emoji_mushroom">Paddenstoel</string>
+    <string name="verification_emoji_globe">Wereldbol</string>
+    <string name="verification_emoji_moon">Maan</string>
+    <string name="verification_emoji_cloud">Wolk</string>
+    <string name="verification_emoji_fire">Vuur</string>
+    <string name="verification_emoji_banana">Banaan</string>
+    <string name="verification_emoji_apple">Appel</string>
+    <string name="verification_emoji_strawberry">Aardbei</string>
+    <string name="verification_emoji_corn">Maïs</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Taart</string>
+    <string name="verification_emoji_heart">Hart</string>
+    <string name="verification_emoji_smiley">Smiley</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Hoed</string>
+    <string name="verification_emoji_glasses">Bril</string>
+    <string name="verification_emoji_spanner">Moersleutel</string>
+    <string name="verification_emoji_santa">Kerstman</string>
+    <string name="verification_emoji_thumbs_up">Duim omhoog</string>
+    <string name="verification_emoji_umbrella">Paraplu</string>
+    <string name="verification_emoji_hourglass">Zandloper</string>
+    <string name="verification_emoji_clock">Wekker</string>
+    <string name="verification_emoji_gift">Geschenk</string>
+    <string name="verification_emoji_light_bulb">Gloeilamp</string>
+    <string name="verification_emoji_book">Boek</string>
+    <string name="verification_emoji_pencil">Potlood</string>
+    <string name="verification_emoji_paperclip">Papierklemmetje</string>
+    <string name="verification_emoji_scissors">Schaar</string>
+    <string name="verification_emoji_lock">Slot</string>
+    <string name="verification_emoji_key">Sleutel</string>
+    <string name="verification_emoji_hammer">Hamer</string>
+    <string name="verification_emoji_telephone">Telefoon</string>
+    <string name="verification_emoji_flag">Vlag</string>
+    <string name="verification_emoji_train">Trein</string>
+    <string name="verification_emoji_bicycle">Fiets</string>
+    <string name="verification_emoji_aeroplane">Vliegtuig</string>
+    <string name="verification_emoji_rocket">Raket</string>
+    <string name="verification_emoji_trophy">Trofee</string>
+    <string name="verification_emoji_ball">Bal</string>
+    <string name="verification_emoji_guitar">Gitaar</string>
+    <string name="verification_emoji_trumpet">Trompet</string>
+    <string name="verification_emoji_bell">Bel</string>
+    <string name="verification_emoji_anchor">Anker</string>
+    <string name="verification_emoji_headphones">Koptelefoon</string>
+    <string name="verification_emoji_folder">Map</string>
+    <string name="verification_emoji_pin">Duimspijker</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-nn/strings.xml b/matrix-sdk-android/src/main/res/values-nn/strings.xml
index 601cf4c9df..d986e697ad 100644
--- a/matrix-sdk-android/src/main/res/values-nn/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nn/strings.xml
@@ -77,70 +77,6 @@
     <string name="notice_event_redacted_by">%1$s strauk meldingi</string>
     <string name="notice_event_redacted_with_reason">Meldingi vart stroki [av di: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">%1$s strauk meldingi [av di: %2$s]</string>
-    <string name="verification_emoji_dog">Hund</string>
-    <string name="verification_emoji_cat">Katt</string>
-    <string name="verification_emoji_lion">Løva</string>
-    <string name="verification_emoji_horse">Hest</string>
-    <string name="verification_emoji_unicorn">Einhyrning</string>
-    <string name="verification_emoji_pig">Gris</string>
-    <string name="verification_emoji_elephant">Elefant</string>
-    <string name="verification_emoji_rabbit">Hare</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Hane</string>
-    <string name="verification_emoji_penguin">Pingvin</string>
-    <string name="verification_emoji_turtle">Skjoldpadda</string>
-    <string name="verification_emoji_fish">Fisk</string>
-    <string name="verification_emoji_octopus">Blekksprut</string>
-    <string name="verification_emoji_butterfly">Fivrelde</string>
-    <string name="verification_emoji_flower">Blome</string>
-    <string name="verification_emoji_tree">Tre</string>
-    <string name="verification_emoji_cactus">Kaktus</string>
-    <string name="verification_emoji_mushroom">Sopp</string>
-    <string name="verification_emoji_globe">Klote</string>
-    <string name="verification_emoji_moon">Måne</string>
-    <string name="verification_emoji_cloud">Sky</string>
-    <string name="verification_emoji_fire">Eld</string>
-    <string name="verification_emoji_banana">Banan</string>
-    <string name="verification_emoji_apple">Eple</string>
-    <string name="verification_emoji_strawberry">Jordbær</string>
-    <string name="verification_emoji_corn">Mais</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Kaka</string>
-    <string name="verification_emoji_heart">Hjarta</string>
-    <string name="verification_emoji_smiley">Smilandlit</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Hatt</string>
-    <string name="verification_emoji_glasses">Brillor</string>
-    <string name="verification_emoji_wrench">Skiftenykel</string>
-    <string name="verification_emoji_santa">Nissen</string>
-    <string name="verification_emoji_thumbsup">Tumalen Upp</string>
-    <string name="verification_emoji_umbrella">Regnskjold</string>
-    <string name="verification_emoji_hourglass">Timeglas</string>
-    <string name="verification_emoji_clock">Ur</string>
-    <string name="verification_emoji_gift">Gåva</string>
-    <string name="verification_emoji_lightbulb">Ljospera</string>
-    <string name="verification_emoji_book">Bok</string>
-    <string name="verification_emoji_pencil">Blyant</string>
-    <string name="verification_emoji_paperclip">Binders</string>
-    <string name="verification_emoji_scissors">Saks</string>
-    <string name="verification_emoji_lock">Lås</string>
-    <string name="verification_emoji_key">Nykel</string>
-    <string name="verification_emoji_hammer">Hamar</string>
-    <string name="verification_emoji_telephone">Telefon</string>
-    <string name="verification_emoji_flag">Flagg</string>
-    <string name="verification_emoji_train">Tog</string>
-    <string name="verification_emoji_bicycle">Sykkel</string>
-    <string name="verification_emoji_airplane">Flyg</string>
-    <string name="verification_emoji_rocket">Rakett</string>
-    <string name="verification_emoji_trophy">Pokal</string>
-    <string name="verification_emoji_ball">Ball</string>
-    <string name="verification_emoji_guitar">Gitar</string>
-    <string name="verification_emoji_trumpet">Trompet</string>
-    <string name="verification_emoji_bell">Klokka</string>
-    <string name="verification_emoji_anchor">Ankar</string>
-    <string name="verification_emoji_headphone">Hodetelefon</string>
-    <string name="verification_emoji_folder">Mappa</string>
-    <string name="verification_emoji_pin">Nål</string>
 
     <string name="notice_room_update">%s oppgraderte rommet.</string>
 
diff --git a/matrix-sdk-android/src/main/res/values-pl/strings.xml b/matrix-sdk-android/src/main/res/values-pl/strings.xml
index dc380516b7..0d79edc658 100644
--- a/matrix-sdk-android/src/main/res/values-pl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pl/strings.xml
@@ -79,73 +79,8 @@
     <string name="notice_event_redacted_by">Wiadomość usunięta przez %1$s</string>
     <string name="notice_event_redacted_with_reason">Wiadomość usunięta [powód: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Wiadomość usunięta przez %1$s [powód: %2$s]</string>
-    <string name="verification_emoji_dog">Pies</string>
-    <string name="verification_emoji_cat">Kot</string>
-    <string name="verification_emoji_lion">Lew</string>
-    <string name="verification_emoji_horse">Koń</string>
-    <string name="verification_emoji_unicorn">Jednorożec</string>
-    <string name="verification_emoji_pig">Świnia</string>
-    <string name="verification_emoji_elephant">Słoń</string>
-    <string name="verification_emoji_rabbit">Królik</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Kogut</string>
-    <string name="verification_emoji_penguin">Pingwin</string>
-    <string name="verification_emoji_turtle">Żółw</string>
-    <string name="verification_emoji_fish">Ryba</string>
-    <string name="verification_emoji_octopus">Ośmiornica</string>
-    <string name="verification_emoji_butterfly">Motyl</string>
-    <string name="verification_emoji_flower">Kwiat</string>
-    <string name="verification_emoji_tree">Drzewo</string>
-    <string name="verification_emoji_cactus">Kaktus</string>
-    <string name="verification_emoji_mushroom">Grzyb</string>
-    <string name="verification_emoji_moon">Księżyc</string>
-    <string name="verification_emoji_cloud">Chmura</string>
-    <string name="verification_emoji_fire">Ogień</string>
-    <string name="verification_emoji_banana">Banan</string>
-    <string name="verification_emoji_apple">Jabłko</string>
-    <string name="verification_emoji_strawberry">Truskawka</string>
-    <string name="verification_emoji_corn">Kukurydza</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Ciasto</string>
-    <string name="verification_emoji_heart">Serce</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Kapelusz</string>
-    <string name="verification_emoji_glasses">Okulary</string>
-    <string name="verification_emoji_umbrella">Parasol</string>
-    <string name="verification_emoji_hourglass">Klepsydra</string>
-    <string name="verification_emoji_clock">Zegar</string>
-    <string name="verification_emoji_lightbulb">Żarówka</string>
-    <string name="verification_emoji_book">Książka</string>
-    <string name="verification_emoji_pencil">Ołówek</string>
-    <string name="verification_emoji_paperclip">Spinacz</string>
-    <string name="verification_emoji_scissors">Nożyczki</string>
-    <string name="verification_emoji_key">Klucz</string>
-    <string name="verification_emoji_telephone">Telefon</string>
-    <string name="verification_emoji_flag">Flaga</string>
-    <string name="verification_emoji_train">Pociąg</string>
-    <string name="verification_emoji_bicycle">Rower</string>
-    <string name="verification_emoji_airplane">Samolot</string>
-    <string name="verification_emoji_rocket">Rakieta</string>
-    <string name="verification_emoji_trophy">Trofeum</string>
-    <string name="verification_emoji_guitar">Gitara</string>
-    <string name="verification_emoji_trumpet">Trąbka</string>
-    <string name="verification_emoji_bell">Dzwonek</string>
-    <string name="verification_emoji_anchor">Kotwica</string>
-    <string name="verification_emoji_headphone">Słuchawki</string>
-    <string name="verification_emoji_folder">Folder</string>
-    <string name="verification_emoji_pin">Pinezka</string>
-
-    <string name="verification_emoji_globe">Ziemia</string>
-    <string name="verification_emoji_smiley">Uśmiech</string>
-    <string name="verification_emoji_wrench">Klucz francuski</string>
-    <string name="verification_emoji_santa">Mikołaj</string>
-    <string name="verification_emoji_gift">Prezent</string>
-    <string name="verification_emoji_hammer">Młotek</string>
     <string name="notice_room_update">%s zakutalizował(a) ten pokój.</string>
 
-    <string name="verification_emoji_thumbsup">Kciuk w górę</string>
-    <string name="verification_emoji_lock">Zamek</string>
-    <string name="verification_emoji_ball">Piłka</string>
     <string name="initial_sync_start_importing_account">Synchronizacja początkowa:
 \nImportowanie konta…</string>
     <string name="initial_sync_start_importing_account_crypto">Synchronizacja początkowa:
diff --git a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
index e1b99506c8..2ba369b93a 100644
--- a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
@@ -25,9 +25,9 @@
     <string name="notice_answered_call">%s aceitou a chamada.</string>
     <string name="notice_ended_call">%s encerrou a chamada.</string>
     <string name="notice_made_future_room_visibility">%1$s deixou o histórico futuro da sala visível para %2$s</string>
-    <string name="notice_room_visibility_invited">todos os membros da sala, a partir do momento em que foram convidados.</string>
-    <string name="notice_room_visibility_joined">todos os membros da sala, a partir do momento em que entraram nela.</string>
-    <string name="notice_room_visibility_shared">todos os membros da sala.</string>
+    <string name="notice_room_visibility_invited">todos os participantes da sala, a partir do momento em que foram convidados.</string>
+    <string name="notice_room_visibility_joined">todos os participantes da sala, a partir do momento em que entraram nela.</string>
+    <string name="notice_room_visibility_shared">todos os participantes da sala.</string>
     <string name="notice_room_visibility_world_readable">qualquer pessoa.</string>
     <string name="notice_room_visibility_unknown">desconhecido (%s).</string>
     <string name="notice_end_to_end">%1$s ativou a criptografia de ponta a ponta (%2$s)</string>
@@ -124,10 +124,10 @@
     <string name="notice_room_topic_removed_by_you">Você removeu a descrição da sala</string>
     <string name="notice_room_avatar_removed">%1$s removeu a foto da sala</string>
     <string name="notice_room_avatar_removed_by_you">Você removeu a foto da sala</string>
-    <string name="notice_event_redacted">Mensagem removida</string>
-    <string name="notice_event_redacted_by">Mensagem removida por %1$s</string>
-    <string name="notice_event_redacted_with_reason">Mensagem removida [motivo: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Mensagem removida por %1$s [motivo: %2$s]</string>
+    <string name="notice_event_redacted">Mensagem apagada</string>
+    <string name="notice_event_redacted_by">Mensagem apagada por %1$s</string>
+    <string name="notice_event_redacted_with_reason">Mensagem apagada [motivo: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Mensagem apagada por %1$s [motivo: %2$s]</string>
     <string name="notice_profile_change_redacted_by_you">Você atualizou o seu perfil %1$s</string>
     <string name="notice_room_third_party_invite_by_you">Você enviou um convite para %1$s entrar na sala</string>
     <string name="notice_room_third_party_revoked_invite">%1$s cancelou o convite a %2$s para entrar na sala</string>
@@ -151,71 +151,6 @@
     <string name="notice_power_level_changed">%1$s alterou o nível de permissão de %2$s.</string>
     <string name="notice_power_level_diff">%1$s de %2$s para %3$s</string>
 
-    <string name="verification_emoji_dog">Cachorro</string>
-    <string name="verification_emoji_cat">Gato</string>
-    <string name="verification_emoji_lion">Leão</string>
-    <string name="verification_emoji_horse">Cavalo</string>
-    <string name="verification_emoji_unicorn">Unicórnio</string>
-    <string name="verification_emoji_pig">Porco</string>
-    <string name="verification_emoji_elephant">Elefante</string>
-    <string name="verification_emoji_rabbit">Coelho</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Galo</string>
-    <string name="verification_emoji_penguin">Pinguim</string>
-    <string name="verification_emoji_turtle">Tartaruga</string>
-    <string name="verification_emoji_fish">Peixe</string>
-    <string name="verification_emoji_octopus">Polvo</string>
-    <string name="verification_emoji_butterfly">Borboleta</string>
-    <string name="verification_emoji_flower">Flor</string>
-    <string name="verification_emoji_tree">Árvore</string>
-    <string name="verification_emoji_cactus">Cacto</string>
-    <string name="verification_emoji_mushroom">Cogumelo</string>
-    <string name="verification_emoji_globe">Globo</string>
-    <string name="verification_emoji_moon">Lua</string>
-    <string name="verification_emoji_cloud">Nuvem</string>
-    <string name="verification_emoji_fire">Fogo</string>
-    <string name="verification_emoji_banana">Banana</string>
-    <string name="verification_emoji_apple">Maçã</string>
-    <string name="verification_emoji_strawberry">Morango</string>
-    <string name="verification_emoji_corn">Milho</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Bolo</string>
-    <string name="verification_emoji_heart">Coração</string>
-    <string name="verification_emoji_smiley">Sorriso</string>
-    <string name="verification_emoji_robot">Robô</string>
-    <string name="verification_emoji_hat">Chapéu</string>
-    <string name="verification_emoji_glasses">Óculos</string>
-    <string name="verification_emoji_wrench">Chave inglesa</string>
-    <string name="verification_emoji_santa">Papai-noel</string>
-    <string name="verification_emoji_thumbsup">Joinha</string>
-    <string name="verification_emoji_umbrella">Guarda-chuva</string>
-    <string name="verification_emoji_hourglass">Ampulheta</string>
-    <string name="verification_emoji_clock">Relógio</string>
-    <string name="verification_emoji_gift">Presente</string>
-    <string name="verification_emoji_lightbulb">Lâmpada</string>
-    <string name="verification_emoji_book">Livro</string>
-    <string name="verification_emoji_pencil">Lápis</string>
-    <string name="verification_emoji_paperclip">Clipe de papel</string>
-    <string name="verification_emoji_scissors">Tesoura</string>
-    <string name="verification_emoji_lock">Cadeado</string>
-    <string name="verification_emoji_key">Chave</string>
-    <string name="verification_emoji_hammer">Martelo</string>
-    <string name="verification_emoji_telephone">Telefone</string>
-    <string name="verification_emoji_flag">Bandeira</string>
-    <string name="verification_emoji_train">Trem</string>
-    <string name="verification_emoji_bicycle">Bicicleta</string>
-    <string name="verification_emoji_airplane">Avião</string>
-    <string name="verification_emoji_rocket">Foguete</string>
-    <string name="verification_emoji_trophy">Troféu</string>
-    <string name="verification_emoji_ball">Bola</string>
-    <string name="verification_emoji_guitar">Guitarra</string>
-    <string name="verification_emoji_trumpet">Trombeta</string>
-    <string name="verification_emoji_bell">Sino</string>
-    <string name="verification_emoji_anchor">Âncora</string>
-    <string name="verification_emoji_headphone">Fones de ouvido</string>
-    <string name="verification_emoji_folder">Pasta</string>
-    <string name="verification_emoji_pin">Alfinete</string>
-
     <string name="initial_sync_start_importing_account">Primeira sincronização:↵
 \nImportando a conta…</string>
     <string name="initial_sync_start_importing_account_crypto">Primeira sincronização:↵
@@ -302,8 +237,4 @@
 
     <string name="key_verification_request_fallback_message">%s deseja confirmar a sua chave, mas o seu aplicativo não suporta a confirmação da chave da conversa. Você precisará usar a confirmação tradicional de chaves para confirmar chaves.</string>
 
-    <string name="call_notification_answer">Aceitar</string>
-    <string name="call_notification_reject">Recusar</string>
-    <string name="call_notification_hangup">Encerrar</string>
-
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-ru/strings.xml b/matrix-sdk-android/src/main/res/values-ru/strings.xml
index 1657d80f1c..a4d752782e 100644
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml
@@ -91,70 +91,6 @@
     <string name="notice_event_redacted_by">%1$s удалил(а) сообщение</string>
     <string name="notice_event_redacted_with_reason">Сообщение удалено [причина: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">%1$s удалил(а) сообщение [причина: %2$s]</string>
-    <string name="verification_emoji_dog">Собака</string>
-    <string name="verification_emoji_cat">Кошка</string>
-    <string name="verification_emoji_lion">Лев</string>
-    <string name="verification_emoji_horse">Лошадь</string>
-    <string name="verification_emoji_unicorn">Единорог</string>
-    <string name="verification_emoji_pig">Поросёнок</string>
-    <string name="verification_emoji_elephant">Слон</string>
-    <string name="verification_emoji_rabbit">Кролик</string>
-    <string name="verification_emoji_panda">Панда</string>
-    <string name="verification_emoji_rooster">Петух</string>
-    <string name="verification_emoji_penguin">Пингвин</string>
-    <string name="verification_emoji_turtle">Черепаха</string>
-    <string name="verification_emoji_fish">Рыба</string>
-    <string name="verification_emoji_octopus">Осьминог</string>
-    <string name="verification_emoji_butterfly">Бабочка</string>
-    <string name="verification_emoji_flower">Цветок</string>
-    <string name="verification_emoji_tree">Дерево</string>
-    <string name="verification_emoji_cactus">Кактус</string>
-    <string name="verification_emoji_mushroom">Гриб</string>
-    <string name="verification_emoji_globe">Земля</string>
-    <string name="verification_emoji_moon">Луна</string>
-    <string name="verification_emoji_cloud">Облако</string>
-    <string name="verification_emoji_fire">Огонь</string>
-    <string name="verification_emoji_banana">Банан</string>
-    <string name="verification_emoji_apple">Яблоко</string>
-    <string name="verification_emoji_strawberry">Клубника</string>
-    <string name="verification_emoji_corn">Кукуруза</string>
-    <string name="verification_emoji_pizza">Пицца</string>
-    <string name="verification_emoji_cake">Пирожное</string>
-    <string name="verification_emoji_heart">Сердце</string>
-    <string name="verification_emoji_smiley">Смайлик</string>
-    <string name="verification_emoji_robot">Робот</string>
-    <string name="verification_emoji_hat">Шляпа</string>
-    <string name="verification_emoji_glasses">Очки</string>
-    <string name="verification_emoji_wrench">Гаечный ключ</string>
-    <string name="verification_emoji_santa">Санта</string>
-    <string name="verification_emoji_thumbsup">Большой палец вверх</string>
-    <string name="verification_emoji_umbrella">Зонтик</string>
-    <string name="verification_emoji_hourglass">Песочные часы</string>
-    <string name="verification_emoji_clock">Часы</string>
-    <string name="verification_emoji_gift">Подарок</string>
-    <string name="verification_emoji_lightbulb">Лампочка</string>
-    <string name="verification_emoji_book">Книга</string>
-    <string name="verification_emoji_pencil">Карандаш</string>
-    <string name="verification_emoji_paperclip">Скрепка для бумаг</string>
-    <string name="verification_emoji_scissors">Ножницы</string>
-    <string name="verification_emoji_lock">Замок</string>
-    <string name="verification_emoji_key">Ключ</string>
-    <string name="verification_emoji_hammer">Молоток</string>
-    <string name="verification_emoji_telephone">Телефон</string>
-    <string name="verification_emoji_flag">Флаг</string>
-    <string name="verification_emoji_train">Поезд</string>
-    <string name="verification_emoji_bicycle">Велосипед</string>
-    <string name="verification_emoji_airplane">Самолёт</string>
-    <string name="verification_emoji_rocket">Ракета</string>
-    <string name="verification_emoji_trophy">Трофей</string>
-    <string name="verification_emoji_ball">Мяч</string>
-    <string name="verification_emoji_guitar">Гитара</string>
-    <string name="verification_emoji_trumpet">Труба</string>
-    <string name="verification_emoji_bell">Колокол</string>
-    <string name="verification_emoji_anchor">Якорь</string>
-    <string name="verification_emoji_headphone">Наушники</string>
-    <string name="verification_emoji_folder">Папка</string>
-    <string name="verification_emoji_pin">Булавка</string>
 
     <string name="initial_sync_start_importing_account">Начальная синхронизация:
 \nИмпорт учетной записи…</string>
@@ -313,8 +249,5 @@
     <string name="notice_call_candidates_by_you">Вы отправили данные для начала звонка.</string>
     <string name="notice_room_avatar_removed">%1$s удалил(а) аватар комнаты</string>
     <string name="notice_room_avatar_removed_by_you">Вы удалили аватар комнаты</string>
-    <string name="call_notification_answer">Принять</string>
-    <string name="call_notification_reject">Отклонить</string>
-    <string name="call_notification_hangup">Завершить звонок</string>
 
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-ru/strings_sas.xml b/matrix-sdk-android/src/main/res/values-ru/strings_sas.xml
new file mode 100644
index 0000000000..f60d7026b6
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-ru/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Собака</string>
+    <string name="verification_emoji_cat">Кошка</string>
+    <string name="verification_emoji_lion">Лев</string>
+    <string name="verification_emoji_horse">Лошадь</string>
+    <string name="verification_emoji_unicorn">Единорог</string>
+    <string name="verification_emoji_pig">Свинья</string>
+    <string name="verification_emoji_elephant">Слон</string>
+    <string name="verification_emoji_rabbit">Кролик</string>
+    <string name="verification_emoji_panda">Панда</string>
+    <string name="verification_emoji_rooster">Петух</string>
+    <string name="verification_emoji_penguin">Пингвин</string>
+    <string name="verification_emoji_turtle">Черепаха</string>
+    <string name="verification_emoji_fish">Рыба</string>
+    <string name="verification_emoji_octopus">Осьминог</string>
+    <string name="verification_emoji_butterfly">Бабочка</string>
+    <string name="verification_emoji_flower">Цветок</string>
+    <string name="verification_emoji_tree">Дерево</string>
+    <string name="verification_emoji_cactus">Кактус</string>
+    <string name="verification_emoji_mushroom">Гриб</string>
+    <string name="verification_emoji_globe">Глобус</string>
+    <string name="verification_emoji_moon">Луна</string>
+    <string name="verification_emoji_cloud">Облако</string>
+    <string name="verification_emoji_fire">Огонь</string>
+    <string name="verification_emoji_banana">Банан</string>
+    <string name="verification_emoji_apple">Яблоко</string>
+    <string name="verification_emoji_strawberry">Клубника</string>
+    <string name="verification_emoji_corn">Кукуруза</string>
+    <string name="verification_emoji_pizza">Пицца</string>
+    <string name="verification_emoji_cake">Торт</string>
+    <string name="verification_emoji_heart">Сердце</string>
+    <string name="verification_emoji_smiley">Улыбка</string>
+    <string name="verification_emoji_robot">Робот</string>
+    <string name="verification_emoji_hat">Шляпа</string>
+    <string name="verification_emoji_glasses">Очки</string>
+    <string name="verification_emoji_spanner">Ключ</string>
+    <string name="verification_emoji_santa">Санта</string>
+    <string name="verification_emoji_thumbs_up">Большой палец вверх</string>
+    <string name="verification_emoji_umbrella">Зонт</string>
+    <string name="verification_emoji_hourglass">Песочные часы</string>
+    <string name="verification_emoji_clock">Часы</string>
+    <string name="verification_emoji_gift">Подарок</string>
+    <string name="verification_emoji_light_bulb">Лампочка</string>
+    <string name="verification_emoji_book">Книга</string>
+    <string name="verification_emoji_pencil">Карандаш</string>
+    <string name="verification_emoji_paperclip">Скрепка</string>
+    <string name="verification_emoji_scissors">Ножницы</string>
+    <string name="verification_emoji_lock">Замок</string>
+    <string name="verification_emoji_key">Ключ</string>
+    <string name="verification_emoji_hammer">Молоток</string>
+    <string name="verification_emoji_telephone">Телефон</string>
+    <string name="verification_emoji_flag">Флаг</string>
+    <string name="verification_emoji_train">Поезд</string>
+    <string name="verification_emoji_bicycle">Велосипед</string>
+    <string name="verification_emoji_aeroplane">Самолет</string>
+    <string name="verification_emoji_rocket">Ракета</string>
+    <string name="verification_emoji_trophy">Кубок</string>
+    <string name="verification_emoji_ball">Мяч</string>
+    <string name="verification_emoji_guitar">Гитара</string>
+    <string name="verification_emoji_trumpet">Труба</string>
+    <string name="verification_emoji_bell">Колокол</string>
+    <string name="verification_emoji_anchor">Якорь</string>
+    <string name="verification_emoji_headphones">Наушники</string>
+    <string name="verification_emoji_folder">Папка</string>
+    <string name="verification_emoji_pin">Булавка</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-sk/strings.xml b/matrix-sdk-android/src/main/res/values-sk/strings.xml
index 70e3a6ebd0..da869eacc2 100644
--- a/matrix-sdk-android/src/main/res/values-sk/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sk/strings.xml
@@ -81,70 +81,6 @@
     <string name="notice_event_redacted_by">Odstránená správa používateľom %1$s</string>
     <string name="notice_event_redacted_with_reason">Odstránená správa [dôvod: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Odstránená správa používateľom %1$s [dôvod: %2$s]</string>
-    <string name="verification_emoji_dog">Hlava psa</string>
-    <string name="verification_emoji_cat">Hlava mačky</string>
-    <string name="verification_emoji_lion">Hlava leva</string>
-    <string name="verification_emoji_horse">Kôň</string>
-    <string name="verification_emoji_unicorn">Hlava jednorožca</string>
-    <string name="verification_emoji_pig">Hlava prasaťa</string>
-    <string name="verification_emoji_elephant">Slon</string>
-    <string name="verification_emoji_rabbit">Hlava zajaca</string>
-    <string name="verification_emoji_panda">Hlava pandy</string>
-    <string name="verification_emoji_rooster">Kohút</string>
-    <string name="verification_emoji_penguin">Tučniak</string>
-    <string name="verification_emoji_turtle">Korytnačka</string>
-    <string name="verification_emoji_fish">Ryba</string>
-    <string name="verification_emoji_octopus">Chobotnica</string>
-    <string name="verification_emoji_butterfly">Motýľ</string>
-    <string name="verification_emoji_flower">Tulipán</string>
-    <string name="verification_emoji_tree">Listnatý strom</string>
-    <string name="verification_emoji_cactus">Kaktus</string>
-    <string name="verification_emoji_mushroom">Huba</string>
-    <string name="verification_emoji_globe">Zemeguľa</string>
-    <string name="verification_emoji_moon">Polmesiac</string>
-    <string name="verification_emoji_cloud">Oblak</string>
-    <string name="verification_emoji_fire">Oheň</string>
-    <string name="verification_emoji_banana">Banán</string>
-    <string name="verification_emoji_apple">Červené jablko</string>
-    <string name="verification_emoji_strawberry">Jahoda</string>
-    <string name="verification_emoji_corn">Kukuričný klas</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Narodeninová torta</string>
-    <string name="verification_emoji_heart">Červené srdce</string>
-    <string name="verification_emoji_smiley">Škeriaca sa tvár</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Cylinder</string>
-    <string name="verification_emoji_glasses">Okuliare</string>
-    <string name="verification_emoji_wrench">Francúzsky kľúč</string>
-    <string name="verification_emoji_santa">Santa Claus</string>
-    <string name="verification_emoji_thumbsup">Palec nahor</string>
-    <string name="verification_emoji_umbrella">Dáždnik</string>
-    <string name="verification_emoji_hourglass">Presýpacie hodiny</string>
-    <string name="verification_emoji_clock">Budík</string>
-    <string name="verification_emoji_gift">Zabalený darček</string>
-    <string name="verification_emoji_lightbulb">Žiarovka</string>
-    <string name="verification_emoji_book">Zatvorená kniha</string>
-    <string name="verification_emoji_pencil">Ceruzka</string>
-    <string name="verification_emoji_paperclip">Sponka na papier</string>
-    <string name="verification_emoji_scissors">Nožnice</string>
-    <string name="verification_emoji_lock">Zatvorená zámka</string>
-    <string name="verification_emoji_key">Kľúč</string>
-    <string name="verification_emoji_hammer">Kladivo</string>
-    <string name="verification_emoji_telephone">Telefón</string>
-    <string name="verification_emoji_flag">Kockovaná zástava</string>
-    <string name="verification_emoji_train">Rušeň</string>
-    <string name="verification_emoji_bicycle">Bicykel</string>
-    <string name="verification_emoji_airplane">Lietadlo</string>
-    <string name="verification_emoji_rocket">Raketa</string>
-    <string name="verification_emoji_trophy">Trofej</string>
-    <string name="verification_emoji_ball">Futbal</string>
-    <string name="verification_emoji_guitar">Gitara</string>
-    <string name="verification_emoji_trumpet">Trúbka</string>
-    <string name="verification_emoji_bell">Zvon</string>
-    <string name="verification_emoji_anchor">Kotva</string>
-    <string name="verification_emoji_headphone">Slúchadlá</string>
-    <string name="verification_emoji_folder">Fascikel</string>
-    <string name="verification_emoji_pin">Špendlík</string>
 
     <string name="initial_sync_start_importing_account">Úvodná synchronizácia:
 \nPrebieha import účtu…</string>
@@ -299,8 +235,4 @@
 
     <string name="key_verification_request_fallback_message">%s požaduje overenie vašich šifrovacích kľúčov, ale váš klient nepodporuje overenie kľúčov v konverzácii. Budete musieť použiť zastaralú metódu overenia.</string>
 
-    <string name="call_notification_answer">Prijať</string>
-    <string name="call_notification_reject">Odmietnuť</string>
-    <string name="call_notification_hangup">Zavesiť</string>
-
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-sk/strings_sas.xml b/matrix-sdk-android/src/main/res/values-sk/strings_sas.xml
new file mode 100644
index 0000000000..72fd9cc2a3
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-sk/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Hlava psa</string>
+    <string name="verification_emoji_cat">Hlava mačky</string>
+    <string name="verification_emoji_lion">Hlava leva</string>
+    <string name="verification_emoji_horse">Kôň</string>
+    <string name="verification_emoji_unicorn">Hlava jednorožca</string>
+    <string name="verification_emoji_pig">Hlava prasaťa</string>
+    <string name="verification_emoji_elephant">Slon</string>
+    <string name="verification_emoji_rabbit">Hlava zajaca</string>
+    <string name="verification_emoji_panda">Hlava pandy</string>
+    <string name="verification_emoji_rooster">Kohút</string>
+    <string name="verification_emoji_penguin">Tučniak</string>
+    <string name="verification_emoji_turtle">Korytnačka</string>
+    <string name="verification_emoji_fish">Ryba</string>
+    <string name="verification_emoji_octopus">Chobotnica</string>
+    <string name="verification_emoji_butterfly">Motýľ</string>
+    <string name="verification_emoji_flower">Tulipán</string>
+    <string name="verification_emoji_tree">Listnatý strom</string>
+    <string name="verification_emoji_cactus">Kaktus</string>
+    <string name="verification_emoji_mushroom">Huba</string>
+    <string name="verification_emoji_globe">Zemeguľa</string>
+    <string name="verification_emoji_moon">Polmesiac</string>
+    <string name="verification_emoji_cloud">Oblak</string>
+    <string name="verification_emoji_fire">Oheň</string>
+    <string name="verification_emoji_banana">Banán</string>
+    <string name="verification_emoji_apple">Červené jablko</string>
+    <string name="verification_emoji_strawberry">Jahoda</string>
+    <string name="verification_emoji_corn">Kukuričný klas</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Narodeninová torta</string>
+    <string name="verification_emoji_heart">červené srdce</string>
+    <string name="verification_emoji_smiley">Škeriaca sa tvár</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Cilinder</string>
+    <string name="verification_emoji_glasses">Okuliare</string>
+    <string name="verification_emoji_spanner">Francúzsky kľúč</string>
+    <string name="verification_emoji_santa">Santa Claus</string>
+    <string name="verification_emoji_thumbs_up">Palec nahor</string>
+    <string name="verification_emoji_umbrella">Dáždnik</string>
+    <string name="verification_emoji_hourglass">Presýpacie hodiny</string>
+    <string name="verification_emoji_clock">Budík</string>
+    <string name="verification_emoji_gift">Zabalený darček</string>
+    <string name="verification_emoji_light_bulb">Žiarovka</string>
+    <string name="verification_emoji_book">Zatvorená kniha</string>
+    <string name="verification_emoji_pencil">Ceruzka</string>
+    <string name="verification_emoji_paperclip">Sponka na papier</string>
+    <string name="verification_emoji_scissors">Nožnice</string>
+    <string name="verification_emoji_lock">Zatvorená zámka</string>
+    <string name="verification_emoji_key">Kľúč</string>
+    <string name="verification_emoji_hammer">Kladivo</string>
+    <string name="verification_emoji_telephone">Telefón</string>
+    <string name="verification_emoji_flag">Kockovaná zástava</string>
+    <string name="verification_emoji_train">Rušeň</string>
+    <string name="verification_emoji_bicycle">Bicykel</string>
+    <string name="verification_emoji_aeroplane">Lietadlo</string>
+    <string name="verification_emoji_rocket">Raketa</string>
+    <string name="verification_emoji_trophy">Trofej</string>
+    <string name="verification_emoji_ball">Futbal</string>
+    <string name="verification_emoji_guitar">Gitara</string>
+    <string name="verification_emoji_trumpet">Trúbka</string>
+    <string name="verification_emoji_bell">Zvon</string>
+    <string name="verification_emoji_anchor">Kotva</string>
+    <string name="verification_emoji_headphones">Slúchadlá</string>
+    <string name="verification_emoji_folder">Fascikel</string>
+    <string name="verification_emoji_pin">Špendlík</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-sq/strings.xml b/matrix-sdk-android/src/main/res/values-sq/strings.xml
index e63e28288f..14a7c61bbc 100644
--- a/matrix-sdk-android/src/main/res/values-sq/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sq/strings.xml
@@ -77,68 +77,6 @@
     <string name="notice_event_redacted_by">Mesazhi u hoq nga %1$s</string>
     <string name="notice_event_redacted_with_reason">Mesazh i hequr [arsye: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Mesazh i hequr nga %1$s [arsye: %2$s]</string>
-    <string name="verification_emoji_dog">Qen</string>
-    <string name="verification_emoji_cat">Mace</string>
-    <string name="verification_emoji_lion">Luan</string>
-    <string name="verification_emoji_horse">Kalë</string>
-    <string name="verification_emoji_unicorn">Njëbrirësh</string>
-    <string name="verification_emoji_pig">Derr</string>
-    <string name="verification_emoji_elephant">Elefant</string>
-    <string name="verification_emoji_rabbit">Lepur</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Këndes</string>
-    <string name="verification_emoji_penguin">Pinguin</string>
-    <string name="verification_emoji_turtle">Breshkë</string>
-    <string name="verification_emoji_fish">Peshk</string>
-    <string name="verification_emoji_octopus">Oktapod</string>
-    <string name="verification_emoji_butterfly">Flutur</string>
-    <string name="verification_emoji_flower">Lule</string>
-    <string name="verification_emoji_tree">Pemë</string>
-    <string name="verification_emoji_cactus">Kaktus</string>
-    <string name="verification_emoji_mushroom">Kërpudhë</string>
-    <string name="verification_emoji_globe">Rruzull</string>
-    <string name="verification_emoji_moon">Hëna</string>
-    <string name="verification_emoji_cloud">Re</string>
-    <string name="verification_emoji_fire">Zjarr</string>
-    <string name="verification_emoji_banana">Banane</string>
-    <string name="verification_emoji_apple">Mollë</string>
-    <string name="verification_emoji_strawberry">Luleshtrydhe</string>
-    <string name="verification_emoji_corn">Misër</string>
-    <string name="verification_emoji_pizza">Picë</string>
-    <string name="verification_emoji_cake">Tortë</string>
-    <string name="verification_emoji_heart">Zemër</string>
-    <string name="verification_emoji_smiley">Emotikon</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Kapë</string>
-    <string name="verification_emoji_glasses">Syze</string>
-    <string name="verification_emoji_wrench">Çelës</string>
-    <string name="verification_emoji_santa">Babagjyshi i Vitit të Ri</string>
-    <string name="verification_emoji_umbrella">Ombrellë</string>
-    <string name="verification_emoji_hourglass">Klepsidër</string>
-    <string name="verification_emoji_clock">Sahat</string>
-    <string name="verification_emoji_gift">Dhuratë</string>
-    <string name="verification_emoji_lightbulb">Llambë</string>
-    <string name="verification_emoji_book">Libër</string>
-    <string name="verification_emoji_pencil">Laps</string>
-    <string name="verification_emoji_paperclip">Kapëse</string>
-    <string name="verification_emoji_scissors">Gërshërë</string>
-    <string name="verification_emoji_lock">Dry</string>
-    <string name="verification_emoji_key">Kyç</string>
-    <string name="verification_emoji_hammer">Çekiç</string>
-    <string name="verification_emoji_telephone">Telefon</string>
-    <string name="verification_emoji_flag">Flamur</string>
-    <string name="verification_emoji_train">Tren</string>
-    <string name="verification_emoji_bicycle">Biçikletë</string>
-    <string name="verification_emoji_airplane">Aeroplan</string>
-    <string name="verification_emoji_rocket">Raketë</string>
-    <string name="verification_emoji_trophy">Trofe</string>
-    <string name="verification_emoji_ball">Top</string>
-    <string name="verification_emoji_guitar">Kitarë</string>
-    <string name="verification_emoji_trumpet">Trombë</string>
-    <string name="verification_emoji_bell">Kambanë</string>
-    <string name="verification_emoji_anchor">Spirancë</string>
-    <string name="verification_emoji_headphone">Kufje</string>
-    <string name="verification_emoji_folder">Dosje</string>
     <string name="notice_room_update">%s e përmirësoi këtë dhomë.</string>
 
     <string name="initial_sync_start_importing_account">Njëkohësimi Fillestar:
@@ -200,6 +138,4 @@
     <string name="key_verification_request_fallback_message">%s po kërkon të verifikojë kyçin tuaj, por klienti juaj nuk mbulon verifikim kyçesh brenda fjalosjeje. Që të verifikoni kyça, do t’ju duhet të përdorni verifikim të dikurshëm kyçesh.</string>
 
     <string name="notice_room_created">%1$s krijo dhomën</string>
-    <string name="verification_emoji_pin">Fiksoje</string>
-
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-sv/strings.xml b/matrix-sdk-android/src/main/res/values-sv/strings.xml
new file mode 100644
index 0000000000..491eb0bc49
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-sv/strings.xml
@@ -0,0 +1,224 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s skickade en bild.</string>
+    <string name="summary_you_sent_image">Du skickade en bild.</string>
+    <string name="summary_user_sent_sticker">%1$s skickade en dekal.</string>
+    <string name="summary_you_sent_sticker">Du skickade en dekal.</string>
+
+    <string name="notice_room_invite_no_invitee">Inbjudan från %s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Inbjudan från dig</string>
+    <string name="notice_room_created">%1$s skapade rummet</string>
+    <string name="notice_room_created_by_you">Du skapade rummet</string>
+    <string name="notice_room_invite">%1$s bjöd in %2$s</string>
+    <string name="notice_room_invite_by_you">Du bjöd in %1$s</string>
+    <string name="notice_room_invite_you">%1$s bjöd in dig</string>
+    <string name="notice_room_join">%1$s gick med i rummet</string>
+    <string name="notice_room_join_by_you">Du gick med i rummet</string>
+    <string name="notice_room_leave">%1$s lämnade rummet</string>
+    <string name="notice_room_leave_by_you">Du lämnade rummet</string>
+    <string name="notice_room_reject">%1$s avböjde inbjudan</string>
+    <string name="notice_room_reject_by_you">Du avböjde inbjudan</string>
+    <string name="notice_room_kick">%1$s kickade %2$s</string>
+    <string name="notice_room_kick_by_you">Du kickade %1$s</string>
+    <string name="notice_room_unban">%1$s avbannade %2$s</string>
+    <string name="notice_room_unban_by_you">Du avbannade %1$s</string>
+    <string name="notice_room_ban">%1$s avbannade %2$s</string>
+    <string name="notice_room_ban_by_you">Du bannade %1$s</string>
+    <string name="notice_room_withdraw">%1$s drog tillbaka inbjudan för %2$s</string>
+    <string name="notice_room_withdraw_by_you">Du drog tillbaka inbjudan för %1$s</string>
+    <string name="notice_avatar_url_changed">%1$s ändrade sin avatar</string>
+    <string name="notice_avatar_url_changed_by_you">Du ändrade din avatar</string>
+    <string name="notice_display_name_set">%1$s satte sitt visningsnamn till %2$s</string>
+    <string name="notice_display_name_set_by_you">Du satte ditt visningsnamn till %1$s</string>
+    <string name="notice_display_name_changed_from">%1$s bytte sitt visningsnamn från %2$s till %3$s</string>
+    <string name="notice_display_name_changed_from_by_you">Du bytte ditt visningsnamn från %1$s till %2$s</string>
+    <string name="notice_display_name_removed">%1$s tog bort sitt visningsnamn (det var %2$s)</string>
+    <string name="notice_display_name_removed_by_you">Du tog bort ditt visningsnamn (det var %1$s)</string>
+    <string name="notice_room_topic_changed">%1$s bytte ämnet till: %2$s</string>
+    <string name="notice_room_topic_changed_by_you">Du bytte ämnet till: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s bytte rummets avatar</string>
+    <string name="notice_room_avatar_changed_by_you">Du bytte rummets avatar</string>
+    <string name="notice_room_name_changed">%1$s bytte rummets namn till: %2$s</string>
+    <string name="notice_room_name_changed_by_you">Du bytte rummets namnet till: %1$s</string>
+    <string name="notice_placed_video_call">%s startade ett videosamtal.</string>
+    <string name="notice_placed_video_call_by_you">Du startade ett videosamtal.</string>
+    <string name="notice_placed_voice_call">%s startade ett röstsamtal.</string>
+    <string name="notice_placed_voice_call_by_you">Du startade ett röstsamtal.</string>
+    <string name="notice_call_candidates">%s skickade data för att sätta upp samtalet.</string>
+    <string name="notice_call_candidates_by_you">Du skickade data för att sätta upp samtalet.</string>
+    <string name="notice_answered_call">%s svarade på samtalet.</string>
+    <string name="notice_answered_call_by_you">Du svarade på samtalet.</string>
+    <string name="notice_ended_call">%s avslutade samtalet.</string>
+    <string name="notice_ended_call_by_you">Du avslutade samtalet.</string>
+    <string name="notice_made_future_room_visibility">%1$s gjorde framtida rumshistorik synlig för %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Du gjorde framtida rumshistorik synlig för %1$s</string>
+    <string name="notice_room_visibility_invited">alla rumsmedlemmar, från tiden de bjöds in.</string>
+    <string name="notice_room_visibility_joined">alla rumsmedlemmar, från tiden de gick med.</string>
+    <string name="notice_room_visibility_shared">alla rumsmedlemmar.</string>
+    <string name="notice_room_visibility_world_readable">vem som helst.</string>
+    <string name="notice_room_visibility_unknown">okänt (%s).</string>
+    <string name="notice_end_to_end">%1$s aktiverade totalsträckskryptering (%2$s)</string>
+    <string name="notice_end_to_end_by_you">Du aktiverade totalsträckskryptering (%1$s)</string>
+    <string name="notice_room_update">%s uppgraderade det här rummet.</string>
+    <string name="notice_room_update_by_you">Du uppgraderade det här rummet.</string>
+
+    <string name="notice_requested_voip_conference">%1$s begärde ett VoIP-gruppsamtal</string>
+    <string name="notice_requested_voip_conference_by_you">Du begärde ett VoIP-gruppsamtal</string>
+    <string name="notice_voip_started">VoIP-gruppsamtal startat</string>
+    <string name="notice_voip_finished">VoIP-gruppsamtal avslutat</string>
+
+    <string name="notice_avatar_changed_too">(avataren blev även bytt)</string>
+    <string name="notice_room_name_removed">%1$s tog bort rummets namn</string>
+    <string name="notice_room_name_removed_by_you">Du tog bort rummets namn</string>
+    <string name="notice_room_topic_removed">%1$s tog bort rummets ämne</string>
+    <string name="notice_room_topic_removed_by_you">Du tog bort rummets ämne</string>
+    <string name="notice_room_avatar_removed">%1$s tog bort rummets avatar</string>
+    <string name="notice_room_avatar_removed_by_you">Du tog bort rummets avatar</string>
+    <string name="notice_event_redacted">Meddelande borttaget</string>
+    <string name="notice_event_redacted_by">Meddelande borttaget av %1$s</string>
+    <string name="notice_event_redacted_with_reason">Meddelande borttaget [anledning: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Meddelande borttaget av %1$s [anledning: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s uppdaterade sim profil %2$s</string>
+    <string name="notice_profile_change_redacted_by_you">Du uppdaterade din profil %1$s</string>
+    <string name="notice_room_third_party_invite">%1$s bjöd in %2$s att gå med i rummet</string>
+    <string name="notice_room_third_party_invite_by_you">Du bjöd in %1$s att gå med i rummet</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s drog tillbaka inbjudan för %2$s att gå med i rummet</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Du drog tillbaka inbjudan för %1$s att gå med i rummet</string>
+    <string name="notice_room_third_party_registered_invite">%1$s accepterade inbjudan för %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Du accepterade inbjudan för %1$s</string>
+
+    <string name="notice_widget_added">%1$s lade till %2$s-widget</string>
+    <string name="notice_widget_added_by_you">Du lade till %1$s-widget</string>
+    <string name="notice_widget_removed">%1$s tog bort %2$s-widget</string>
+    <string name="notice_widget_removed_by_you">Du tog bort %1$s-widget</string>
+    <string name="notice_widget_modified">%1$s modifierade %2$s-widget</string>
+    <string name="notice_widget_modified_by_you">Du modifierade %1$s-widget</string>
+
+    <string name="power_level_admin">Admin</string>
+    <string name="power_level_moderator">Moderator</string>
+    <string name="power_level_default">Standard</string>
+    <string name="power_level_custom">Anpassad (%1$d)</string>
+    <string name="power_level_custom_no_value">Anpassad</string>
+
+    <string name="notice_power_level_changed_by_you">Du ändrade behörighetsnivå för %1$s.</string>
+    <string name="notice_power_level_changed">%1$s ändrade behörighetsnivå för %2$s.</string>
+    <string name="notice_power_level_diff">%1$s från %2$s till %3$s</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Kan inte avkryptera: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Avsändarens enhet har inte gett oss nycklarna för det här meddelandet.</string>
+
+    <string name="could_not_redact">Kunde inte dölja</string>
+    <string name="unable_to_send_message">Kunde inte skicka meddelandet</string>
+
+    <string name="message_failed_to_upload">Misslyckades att ladda upp bilden</string>
+
+    <string name="network_error">Nätverksfel</string>
+    <string name="matrix_error">Matrixfel</string>
+
+    <string name="room_error_join_failed_empty_room">Det går för närvarande inte att gå med i ett tomt rum igen.</string>
+
+    <string name="encrypted_message">Krypterat meddelande</string>
+
+    <string name="medium_email">E-postadress</string>
+    <string name="medium_phone_number">Telefonnummer</string>
+
+    <string name="room_displayname_invite_from">Inbjudan från %s</string>
+    <string name="room_displayname_room_invite">Rumsinbjudan</string>
+
+    <string name="room_displayname_two_members">%1$s och %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s och en till</item>
+        <item quantity="other">%1$s och %2$d till</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Tomt rum</string>
+
+    <string name="initial_sync_start_importing_account">Inledande synk:
+\nImporterar konto…</string>
+    <string name="initial_sync_start_importing_account_crypto">Inledande synk:
+\nImporterar krypto</string>
+    <string name="initial_sync_start_importing_account_rooms">Inledande synk:
+\nImporterar rum</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Inledande synk:
+\nImporterar anslutna rum</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Inledande synk:
+\nImporterar inbjudna rum</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Inledande synk:
+\nImporterar lämnade rum</string>
+    <string name="initial_sync_start_importing_account_groups">Inledande synk:
+\nImporterar gemenskaper</string>
+    <string name="initial_sync_start_importing_account_data">Inledande synk:
+\nImporterar kontodata</string>
+
+    <string name="event_status_sending_message">Skickar meddelande…</string>
+    <string name="clear_timeline_send_queue">Rensa sändningskö</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason">Inbjudan från %1$s. Anledning: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Inbjudan från dig. Anledning: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s bjöd in %2$s. Anledning: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Du bjöd in %1$s. Anledning: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s bjöd in dig. Anledning: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s gick med i rummet. Anledning: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Du gick med i rummet. Anledning: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s lämnade rummet. Anledning: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Du lämnade rummet. Anledning: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s avböjde inbjudan. Anledning: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Du avböjde inbjudan. Anledning: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s kickade %2$s. Anledning: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Du kickade %1$s. Anledning: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s avbannade %2$s. Anledning: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Du avbannade %1$s. Anledning: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s bannade %2$s. Anledning: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Du bannade %1$s. Anledning: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s bjöd in %2$s att gå med i rummet. Anledning: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Du bjöd in %1$s att gå med i rummet. Anledning: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s drog tillbaka inbjudan för %2$s att gå med i rummet. Anledning: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Du drog tillbaka inbjudan för %1$s att gå med i rummet. Anledning: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s accepterade inbjudan för %2$s. Anledning: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Du accepterade inbjudan för %1$s. Anledning: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s drog tillbaka inbjudan för %2$s. Anledning: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Du drog tillbaka inbjudan för %1$s. Anledning: %2$s</string>
+
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s lade till %2$s som en adress för det här rummet.</item>
+        <item quantity="other">%1$s lade till %2$s som adresser för det här rummet.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Du lade till %1$s som en adress för det här rummet.</item>
+        <item quantity="other">Du lade till %1$s som adresser för det här rummet.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s tog bort %2$s som en adress för det här rummet.</item>
+        <item quantity="other">%1$s tog bort %2$s som adresser för det här rummet.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Du tog bort %1$s som en adress för det här rummet.</item>
+        <item quantity="other">Du tog bort %2$s som adresser för det här rummet.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed">%1$s lade till %2$s och tog bort %3$s som adresser för det här rummet.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Du lade till %1$s och tog bort %2$s som adresser för det här rummet.</string>
+
+    <string name="notice_room_canonical_alias_set">%1$s satta huvudadressen för det här rummet till %2$s.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Du satta huvudadressen för det här rummet till %1$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s tog bort huvudadressen för det här rummet.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Du tog bort huvudadressen för det här rummet.</string>
+
+    <string name="notice_room_guest_access_can_join">%1$s tillät gäster att gå med i rummet.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Du tillät gäster att gå med i rummet.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s hindrade gäster från att gå med i rummet.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Du hindrade gäster från att gå med i rummet.</string>
+
+    <string name="notice_end_to_end_ok">%1$s aktiverade totalsträckskryptering.</string>
+    <string name="notice_end_to_end_ok_by_you">Du aktiverade totalsträckskryptering.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s aktiverade totalsträckskryptering (okänd algoritm %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Du aktiverade totalsträckskryptering (okänd algoritm %1$s).</string>
+
+    <string name="key_verification_request_fallback_message">%s begär att verifiera din nyckel, men din klient stöder inte nyckelverifiering i chatten. Du behöver använda legacynyckelverifiering för att verifiera nycklar.</string>
+
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-sv/strings_sas.xml b/matrix-sdk-android/src/main/res/values-sv/strings_sas.xml
new file mode 100644
index 0000000000..1e06452ba5
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-sv/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Hund</string>
+    <string name="verification_emoji_cat">Katt</string>
+    <string name="verification_emoji_lion">Lejon</string>
+    <string name="verification_emoji_horse">Häst</string>
+    <string name="verification_emoji_unicorn">Enhörning</string>
+    <string name="verification_emoji_pig">Gris</string>
+    <string name="verification_emoji_elephant">Elefant</string>
+    <string name="verification_emoji_rabbit">Kanin</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Tupp</string>
+    <string name="verification_emoji_penguin">Pingvin</string>
+    <string name="verification_emoji_turtle">Sköldpadda</string>
+    <string name="verification_emoji_fish">Fisk</string>
+    <string name="verification_emoji_octopus">Bläckfisk</string>
+    <string name="verification_emoji_butterfly">Fjäril</string>
+    <string name="verification_emoji_flower">Blomma</string>
+    <string name="verification_emoji_tree">Träd</string>
+    <string name="verification_emoji_cactus">Kaktus</string>
+    <string name="verification_emoji_mushroom">Svamp</string>
+    <string name="verification_emoji_globe">Jordklot</string>
+    <string name="verification_emoji_moon">Måne</string>
+    <string name="verification_emoji_cloud">Moln</string>
+    <string name="verification_emoji_fire">Eld</string>
+    <string name="verification_emoji_banana">Banan</string>
+    <string name="verification_emoji_apple">Äpple</string>
+    <string name="verification_emoji_strawberry">Jordgubbe</string>
+    <string name="verification_emoji_corn">Majskolv</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Tårta</string>
+    <string name="verification_emoji_heart">Hjärta</string>
+    <string name="verification_emoji_smiley">Smiley</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Hatt</string>
+    <string name="verification_emoji_glasses">Glasögon</string>
+    <string name="verification_emoji_spanner">Skruvnyckel</string>
+    <string name="verification_emoji_santa">Tomte</string>
+    <string name="verification_emoji_thumbs_up">Tummen upp</string>
+    <string name="verification_emoji_umbrella">Paraply</string>
+    <string name="verification_emoji_hourglass">Timglas</string>
+    <string name="verification_emoji_clock">Klocka</string>
+    <string name="verification_emoji_gift">Paket</string>
+    <string name="verification_emoji_light_bulb">Lampa</string>
+    <string name="verification_emoji_book">Bok</string>
+    <string name="verification_emoji_pencil">Penna</string>
+    <string name="verification_emoji_paperclip">Gem</string>
+    <string name="verification_emoji_scissors">Sax</string>
+    <string name="verification_emoji_lock">Lås</string>
+    <string name="verification_emoji_key">Nyckel</string>
+    <string name="verification_emoji_hammer">Hammare</string>
+    <string name="verification_emoji_telephone">Telefon</string>
+    <string name="verification_emoji_flag">Flagga</string>
+    <string name="verification_emoji_train">Ånglok</string>
+    <string name="verification_emoji_bicycle">Cykel</string>
+    <string name="verification_emoji_aeroplane">Flygplan</string>
+    <string name="verification_emoji_rocket">Raket</string>
+    <string name="verification_emoji_trophy">Trofé</string>
+    <string name="verification_emoji_ball">Boll</string>
+    <string name="verification_emoji_guitar">Gitarr</string>
+    <string name="verification_emoji_trumpet">Trumpet</string>
+    <string name="verification_emoji_bell">Bjällra</string>
+    <string name="verification_emoji_anchor">Ankare</string>
+    <string name="verification_emoji_headphones">Hörlurar</string>
+    <string name="verification_emoji_folder">Mapp</string>
+    <string name="verification_emoji_pin">Häftstift</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-uk/strings_sas.xml b/matrix-sdk-android/src/main/res/values-uk/strings_sas.xml
new file mode 100644
index 0000000000..f979f77250
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-uk/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Пес</string>
+    <string name="verification_emoji_cat">Кіт</string>
+    <string name="verification_emoji_lion">Лев</string>
+    <string name="verification_emoji_horse">Кінь</string>
+    <string name="verification_emoji_unicorn">Єдиноріг</string>
+    <string name="verification_emoji_pig">Свиня</string>
+    <string name="verification_emoji_elephant">Слон</string>
+    <string name="verification_emoji_rabbit">Кріль</string>
+    <string name="verification_emoji_panda">Панда</string>
+    <string name="verification_emoji_rooster">Когут</string>
+    <string name="verification_emoji_penguin">Пінгвін</string>
+    <string name="verification_emoji_turtle">Черепаха</string>
+    <string name="verification_emoji_fish">Риба</string>
+    <string name="verification_emoji_octopus">Восьминіг</string>
+    <string name="verification_emoji_butterfly">Метелик</string>
+    <string name="verification_emoji_flower">Квітка</string>
+    <string name="verification_emoji_tree">Дерево</string>
+    <string name="verification_emoji_cactus">Кактус</string>
+    <string name="verification_emoji_mushroom">Гриб</string>
+    <string name="verification_emoji_globe">Глобус</string>
+    <string name="verification_emoji_moon">Місяць</string>
+    <string name="verification_emoji_cloud">Хмара</string>
+    <string name="verification_emoji_fire">Вогонь</string>
+    <string name="verification_emoji_banana">Банан</string>
+    <string name="verification_emoji_apple">Яблуко</string>
+    <string name="verification_emoji_strawberry">Полуниця</string>
+    <string name="verification_emoji_corn">Кукурудза</string>
+    <string name="verification_emoji_pizza">Піца</string>
+    <string name="verification_emoji_cake">Пиріг</string>
+    <string name="verification_emoji_heart">Серце</string>
+    <string name="verification_emoji_smiley">Посмішка</string>
+    <string name="verification_emoji_robot">Робот</string>
+    <string name="verification_emoji_hat">Капелюх</string>
+    <string name="verification_emoji_glasses">Окуляри</string>
+    <string name="verification_emoji_spanner">Гайковий ключ</string>
+    <string name="verification_emoji_santa">Санта Клаус</string>
+    <string name="verification_emoji_thumbs_up">Великий палець вгору</string>
+    <string name="verification_emoji_umbrella">Парасолька</string>
+    <string name="verification_emoji_hourglass">Пісковий годинник</string>
+    <string name="verification_emoji_clock">Годинник</string>
+    <string name="verification_emoji_gift">Подарунок</string>
+    <string name="verification_emoji_light_bulb">Лампочка</string>
+    <string name="verification_emoji_book">Книга</string>
+    <string name="verification_emoji_pencil">Олівець</string>
+    <string name="verification_emoji_paperclip">Спиначка</string>
+    <string name="verification_emoji_scissors">Ножиці</string>
+    <string name="verification_emoji_lock">Замок</string>
+    <string name="verification_emoji_key">Ключ</string>
+    <string name="verification_emoji_hammer">Молоток</string>
+    <string name="verification_emoji_telephone">Телефон</string>
+    <string name="verification_emoji_flag">Прапор</string>
+    <string name="verification_emoji_train">Потяг</string>
+    <string name="verification_emoji_bicycle">Велосипед</string>
+    <string name="verification_emoji_aeroplane">Літак</string>
+    <string name="verification_emoji_rocket">Ракета</string>
+    <string name="verification_emoji_trophy">Приз</string>
+    <string name="verification_emoji_ball">М\'яч</string>
+    <string name="verification_emoji_guitar">Гітара</string>
+    <string name="verification_emoji_trumpet">Труба</string>
+    <string name="verification_emoji_bell">Дзвін</string>
+    <string name="verification_emoji_anchor">Якір</string>
+    <string name="verification_emoji_headphones">Навушники</string>
+    <string name="verification_emoji_folder">Тека</string>
+    <string name="verification_emoji_pin">Кнопка</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-vls/strings.xml b/matrix-sdk-android/src/main/res/values-vls/strings.xml
index 5c9132ed35..f0f2287a8d 100644
--- a/matrix-sdk-android/src/main/res/values-vls/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-vls/strings.xml
@@ -77,73 +77,7 @@
 
     <string name="room_displayname_empty_room">Leeg gesprek</string>
 
-
-    <string name="verification_emoji_dog">Hound</string>
-    <string name="verification_emoji_cat">Katte</string>
-    <string name="verification_emoji_lion">Leeuw</string>
-    <string name="verification_emoji_horse">Peird</string>
-    <string name="verification_emoji_unicorn">Eenhoorn</string>
-    <string name="verification_emoji_pig">Zwyn</string>
-    <string name="verification_emoji_elephant">Olifant</string>
-    <string name="verification_emoji_rabbit">Keun</string>
-    <string name="verification_emoji_panda">Panda</string>
-    <string name="verification_emoji_rooster">Hoane</string>
-    <string name="verification_emoji_penguin">Pinguin</string>
-    <string name="verification_emoji_turtle">Schildpadde</string>
-    <string name="verification_emoji_fish">Vis</string>
-    <string name="verification_emoji_octopus">Octopus</string>
-    <string name="verification_emoji_butterfly">Beutervlieg</string>
-    <string name="verification_emoji_flower">Bloem</string>
-    <string name="verification_emoji_tree">Boom</string>
-    <string name="verification_emoji_cactus">Cactus</string>
-    <string name="verification_emoji_mushroom">Paddestoel</string>
-    <string name="verification_emoji_globe">Eirdbol</string>
-    <string name="verification_emoji_moon">Moane</string>
-    <string name="verification_emoji_cloud">Wolk</string>
-    <string name="verification_emoji_fire">Vier</string>
-    <string name="verification_emoji_banana">Banoan</string>
-    <string name="verification_emoji_apple">Appel</string>
-    <string name="verification_emoji_strawberry">Freize</string>
-    <string name="verification_emoji_corn">Mais</string>
-    <string name="verification_emoji_pizza">Pizza</string>
-    <string name="verification_emoji_cake">Toarte</string>
-    <string name="verification_emoji_heart">Erte</string>
-    <string name="verification_emoji_smiley">Smiley</string>
-    <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Hoed</string>
-    <string name="verification_emoji_glasses">Bril</string>
-    <string name="verification_emoji_wrench">Moersleutel</string>
-    <string name="verification_emoji_santa">Kestman</string>
-    <string name="verification_emoji_thumbsup">Duum omhooge</string>
-    <string name="verification_emoji_umbrella">Paraplu</string>
-    <string name="verification_emoji_hourglass">Zandloper</string>
-    <string name="verification_emoji_clock">Klok</string>
-    <string name="verification_emoji_gift">Cadeau</string>
-    <string name="verification_emoji_lightbulb">Gloeilampe</string>
-    <string name="verification_emoji_book">Boek</string>
-    <string name="verification_emoji_pencil">Potlood</string>
-    <string name="verification_emoji_paperclip">Paperclip</string>
-    <string name="verification_emoji_scissors">Schoar</string>
-    <string name="verification_emoji_lock">Hangslot</string>
-    <string name="verification_emoji_key">Sleutel</string>
-    <string name="verification_emoji_hammer">Oamer</string>
-    <string name="verification_emoji_telephone">Telefong</string>
-    <string name="verification_emoji_flag">Vlagge</string>
-    <string name="verification_emoji_train">Tring</string>
-    <string name="verification_emoji_bicycle">Veloo</string>
-    <string name="verification_emoji_airplane">Vlieger</string>
-    <string name="verification_emoji_rocket">Rakette</string>
-    <string name="verification_emoji_trophy">Trofee</string>
-    <string name="verification_emoji_ball">Bolle</string>
-    <string name="verification_emoji_guitar">Gitoar</string>
-    <string name="verification_emoji_trumpet">Trompette</string>
-    <string name="verification_emoji_bell">Belle</string>
-    <string name="verification_emoji_anchor">Anker</string>
-    <string name="verification_emoji_headphone">Koptelefong</string>
-    <string name="verification_emoji_folder">Mappe</string>
-    <string name="verification_emoji_pin">Pinne</string>
-
-    <string name="initial_sync_start_importing_account">Initiële synchronisoasje: 
+    <string name="initial_sync_start_importing_account">Initiële synchronisoasje:
 \nAccount wor geïmporteerd…</string>
     <string name="initial_sync_start_importing_account_crypto">Initiële synchronisoasje: 
 \nCrypto wor geïmporteerd</string>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
index ef080e8357..60322821d4 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
@@ -75,69 +75,6 @@
     <string name="notice_event_redacted_by">消息已被 %1$s 移除</string>
     <string name="notice_event_redacted_with_reason">消息已被移除 [原因: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">消息已被 %1$s 移除 [原因: %2$s]</string>
-    <string name="verification_emoji_dog">狗</string>
-    <string name="verification_emoji_cat">猫</string>
-    <string name="verification_emoji_lion">狮子</string>
-    <string name="verification_emoji_horse">马</string>
-    <string name="verification_emoji_unicorn">独角兽</string>
-    <string name="verification_emoji_pig">猪</string>
-    <string name="verification_emoji_elephant">大象</string>
-    <string name="verification_emoji_rabbit">兔子</string>
-    <string name="verification_emoji_panda">熊猫</string>
-    <string name="verification_emoji_rooster">公鸡</string>
-    <string name="verification_emoji_penguin">企鹅</string>
-    <string name="verification_emoji_turtle">乌龟</string>
-    <string name="verification_emoji_fish">鱼</string>
-    <string name="verification_emoji_octopus">章鱼</string>
-    <string name="verification_emoji_butterfly">蝴蝶</string>
-    <string name="verification_emoji_flower">花</string>
-    <string name="verification_emoji_tree">树</string>
-    <string name="verification_emoji_cactus">仙人掌</string>
-    <string name="verification_emoji_mushroom">蘑菇</string>
-    <string name="verification_emoji_globe">地球</string>
-    <string name="verification_emoji_moon">月亮</string>
-    <string name="verification_emoji_cloud">云</string>
-    <string name="verification_emoji_fire">火</string>
-    <string name="verification_emoji_banana">香蕉</string>
-    <string name="verification_emoji_apple">苹果</string>
-    <string name="verification_emoji_strawberry">草莓</string>
-    <string name="verification_emoji_corn">玉米</string>
-    <string name="verification_emoji_pizza">披萨</string>
-    <string name="verification_emoji_cake">蛋糕</string>
-    <string name="verification_emoji_heart">心</string>
-    <string name="verification_emoji_smiley">微笑</string>
-    <string name="verification_emoji_robot">机器人</string>
-    <string name="verification_emoji_hat">帽子</string>
-    <string name="verification_emoji_glasses">眼镜</string>
-    <string name="verification_emoji_wrench">扳手</string>
-    <string name="verification_emoji_santa">圣诞老人</string>
-    <string name="verification_emoji_thumbsup">点赞</string>
-    <string name="verification_emoji_umbrella">雨伞</string>
-    <string name="verification_emoji_hourglass">沙漏</string>
-    <string name="verification_emoji_clock">钟</string>
-    <string name="verification_emoji_gift">礼物</string>
-    <string name="verification_emoji_lightbulb">灯泡</string>
-    <string name="verification_emoji_book">书</string>
-    <string name="verification_emoji_pencil">铅笔</string>
-    <string name="verification_emoji_paperclip">回形针</string>
-    <string name="verification_emoji_scissors">剪刀</string>
-    <string name="verification_emoji_lock">锁</string>
-    <string name="verification_emoji_key">钥匙</string>
-    <string name="verification_emoji_hammer">锤子</string>
-    <string name="verification_emoji_telephone">电话</string>
-    <string name="verification_emoji_flag">旗子</string>
-    <string name="verification_emoji_train">火车</string>
-    <string name="verification_emoji_bicycle">自行车</string>
-    <string name="verification_emoji_airplane">飞机</string>
-    <string name="verification_emoji_rocket">火箭</string>
-    <string name="verification_emoji_trophy">奖杯</string>
-    <string name="verification_emoji_ball">球</string>
-    <string name="verification_emoji_guitar">吉他</string>
-    <string name="verification_emoji_trumpet">喇叭</string>
-    <string name="verification_emoji_bell">铃铛</string>
-    <string name="verification_emoji_anchor">锚</string>
-    <string name="verification_emoji_headphone">耳机</string>
-    <string name="verification_emoji_folder">文件夹</string>
     <string name="initial_sync_start_importing_account">初始化同步：
 \n正在导入账号…</string>
     <string name="initial_sync_start_importing_account_crypto">初始化同步：
@@ -161,7 +98,6 @@
     <string name="clear_timeline_send_queue">清除正在发送队列</string>
 
     <string name="notice_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 加入聊天室的邀请</string>
-    <string name="verification_emoji_pin">置顶</string>
 
     <string name="notice_room_invite_no_invitee_with_reason">%1$s 的邀请。理由：%2$s</string>
     <string name="notice_room_invite_with_reason">%1$s 邀请了 %2$s。理由：%3$s</string>
@@ -289,8 +225,4 @@
     <string name="notice_end_to_end_ok_by_you">您已开启端到端加密。</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">您已开启端到端加密（无法识别的算法 %1$s）。</string>
 
-    <string name="call_notification_answer">接受</string>
-    <string name="call_notification_reject">拒绝</string>
-    <string name="call_notification_hangup">挂断</string>
-
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rCN/strings_sas.xml b/matrix-sdk-android/src/main/res/values-zh-rCN/strings_sas.xml
new file mode 100644
index 0000000000..439615735a
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-zh-rCN/strings_sas.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">狗</string>
+    <string name="verification_emoji_cat">猫</string>
+    <string name="verification_emoji_lion">狮子</string>
+    <string name="verification_emoji_horse">马</string>
+    <string name="verification_emoji_unicorn">独角兽</string>
+    <string name="verification_emoji_pig">猪</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
index ee2662f143..355890923c 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
@@ -71,75 +71,10 @@
         <item quantity="other">%1$s 和 和其他 %2$d 個人</item>
     </plurals>
 
-
     <string name="notice_event_redacted">訊息已移除</string>
     <string name="notice_event_redacted_by">訊息已被 %1$s 移除</string>
     <string name="notice_event_redacted_with_reason">訊息已移除 [理由：%1$s]</string>
     <string name="notice_event_redacted_by_with_reason">訊息已被 %1$s 移除 [理由：%2$s]</string>
-    <string name="verification_emoji_dog">狗</string>
-    <string name="verification_emoji_cat">貓</string>
-    <string name="verification_emoji_lion">獅</string>
-    <string name="verification_emoji_horse">馬</string>
-    <string name="verification_emoji_unicorn">獨角獸</string>
-    <string name="verification_emoji_pig">豬</string>
-    <string name="verification_emoji_elephant">象</string>
-    <string name="verification_emoji_rabbit">兔</string>
-    <string name="verification_emoji_panda">貓熊</string>
-    <string name="verification_emoji_rooster">公雞</string>
-    <string name="verification_emoji_penguin">企鵝</string>
-    <string name="verification_emoji_turtle">龜</string>
-    <string name="verification_emoji_fish">魚</string>
-    <string name="verification_emoji_octopus">章魚</string>
-    <string name="verification_emoji_butterfly">蝶</string>
-    <string name="verification_emoji_flower">花</string>
-    <string name="verification_emoji_tree">樹</string>
-    <string name="verification_emoji_cactus">仙人掌</string>
-    <string name="verification_emoji_mushroom">蘑菇</string>
-    <string name="verification_emoji_globe">地球</string>
-    <string name="verification_emoji_moon">月亮</string>
-    <string name="verification_emoji_cloud">雲</string>
-    <string name="verification_emoji_fire">火</string>
-    <string name="verification_emoji_banana">香蕉</string>
-    <string name="verification_emoji_apple">蘋果</string>
-    <string name="verification_emoji_strawberry">草莓</string>
-    <string name="verification_emoji_corn">玉米</string>
-    <string name="verification_emoji_pizza">披薩</string>
-    <string name="verification_emoji_cake">蛋糕</string>
-    <string name="verification_emoji_heart">心</string>
-    <string name="verification_emoji_smiley">微笑</string>
-    <string name="verification_emoji_robot">機器人</string>
-    <string name="verification_emoji_hat">帽子</string>
-    <string name="verification_emoji_glasses">眼鏡</string>
-    <string name="verification_emoji_wrench">扳手</string>
-    <string name="verification_emoji_santa">聖誕老人</string>
-    <string name="verification_emoji_thumbsup">讚</string>
-    <string name="verification_emoji_umbrella">雨傘</string>
-    <string name="verification_emoji_hourglass">沙漏</string>
-    <string name="verification_emoji_clock">時鐘</string>
-    <string name="verification_emoji_gift">禮物</string>
-    <string name="verification_emoji_lightbulb">燈泡</string>
-    <string name="verification_emoji_book">書</string>
-    <string name="verification_emoji_pencil">鉛筆</string>
-    <string name="verification_emoji_paperclip">迴紋針</string>
-    <string name="verification_emoji_scissors">剪刀</string>
-    <string name="verification_emoji_lock">鎖</string>
-    <string name="verification_emoji_key">鑰匙</string>
-    <string name="verification_emoji_hammer">鎚子</string>
-    <string name="verification_emoji_telephone">電話</string>
-    <string name="verification_emoji_flag">旗子</string>
-    <string name="verification_emoji_train">火車</string>
-    <string name="verification_emoji_bicycle">腳踏車</string>
-    <string name="verification_emoji_airplane">飛機</string>
-    <string name="verification_emoji_rocket">火箭</string>
-    <string name="verification_emoji_trophy">獎盃</string>
-    <string name="verification_emoji_ball">球</string>
-    <string name="verification_emoji_guitar">吉他</string>
-    <string name="verification_emoji_trumpet">喇叭</string>
-    <string name="verification_emoji_bell">鈴</string>
-    <string name="verification_emoji_anchor">錨</string>
-    <string name="verification_emoji_headphone">耳機</string>
-    <string name="verification_emoji_folder">資料夾</string>
-    <string name="verification_emoji_pin">別針</string>
 
     <string name="initial_sync_start_importing_account">初始化同步：
 \n正在匯入帳號……</string>
@@ -290,8 +225,4 @@
     <string name="notice_end_to_end_ok_by_you">您開啟了端到端加密。</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">您開啟了端到端加密（無法識別的演算法 %1$s）。</string>
 
-    <string name="call_notification_answer">接受</string>
-    <string name="call_notification_reject">拒絕</string>
-    <string name="call_notification_hangup">掛斷</string>
-
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index 0dc64c1b4b..f64ec9926e 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -152,137 +152,6 @@
 
     <string name="room_displayname_empty_room">Empty room</string>
 
-
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_dog">Dog</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_cat">Cat</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_lion">Lion</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_horse">Horse</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_unicorn">Unicorn</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_pig">Pig</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_elephant">Elephant</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_rabbit">Rabbit</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_panda">Panda</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_rooster">Rooster</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_penguin">Penguin</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_turtle">Turtle</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_fish">Fish</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_octopus">Octopus</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_butterfly">Butterfly</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_flower">Flower</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_tree">Tree</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_cactus">Cactus</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_mushroom">Mushroom</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_globe">Globe</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_moon">Moon</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_cloud">Cloud</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_fire">Fire</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_banana">Banana</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_apple">Apple</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_strawberry">Strawberry</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_corn">Corn</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_pizza">Pizza</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_cake">Cake</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_heart">Heart</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_smiley">Smiley</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_robot">Robot</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_hat">Hat</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_glasses">Glasses</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_wrench">Wrench</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_santa">Santa</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_thumbsup">Thumbs Up</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_umbrella">Umbrella</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_hourglass">Hourglass</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_clock">Clock</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_gift">Gift</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_lightbulb">Light Bulb</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_book">Book</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_pencil">Pencil</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_paperclip">Paperclip</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_scissors">Scissors</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_lock">Lock</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_key">Key</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_hammer">Hammer</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_telephone">Telephone</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_flag">Flag</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_train">Train</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_bicycle">Bicycle</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_airplane">Airplane</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_rocket">Rocket</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_trophy">Trophy</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_ball">Ball</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_guitar">Guitar</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_trumpet">Trumpet</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_bell">Bell</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_anchor">Anchor</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_headphone">Headphones</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_folder">Folder</string>
-    <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
-    <string name="verification_emoji_pin">Pin</string>
-
-    <!-- Strings for RiotX -->
     <string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
     <string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
     <string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
@@ -361,8 +230,4 @@
 
     <string name="key_verification_request_fallback_message">%s is requesting to verify your key, but your client does not support in-chat key verification. You will need to use legacy key verification to verify keys.</string>
 
-    <string name="call_notification_answer">Accept</string>
-    <string name="call_notification_reject">Decline</string>
-    <string name="call_notification_hangup">Hang Up</string>
-
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values/strings_sas.xml b/matrix-sdk-android/src/main/res/values/strings_sas.xml
new file mode 100644
index 0000000000..8a366a22e5
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Dog</string>
+    <string name="verification_emoji_cat">Cat</string>
+    <string name="verification_emoji_lion">Lion</string>
+    <string name="verification_emoji_horse">Horse</string>
+    <string name="verification_emoji_unicorn">Unicorn</string>
+    <string name="verification_emoji_pig">Pig</string>
+    <string name="verification_emoji_elephant">Elephant</string>
+    <string name="verification_emoji_rabbit">Rabbit</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Rooster</string>
+    <string name="verification_emoji_penguin">Penguin</string>
+    <string name="verification_emoji_turtle">Turtle</string>
+    <string name="verification_emoji_fish">Fish</string>
+    <string name="verification_emoji_octopus">Octopus</string>
+    <string name="verification_emoji_butterfly">Butterfly</string>
+    <string name="verification_emoji_flower">Flower</string>
+    <string name="verification_emoji_tree">Tree</string>
+    <string name="verification_emoji_cactus">Cactus</string>
+    <string name="verification_emoji_mushroom">Mushroom</string>
+    <string name="verification_emoji_globe">Globe</string>
+    <string name="verification_emoji_moon">Moon</string>
+    <string name="verification_emoji_cloud">Cloud</string>
+    <string name="verification_emoji_fire">Fire</string>
+    <string name="verification_emoji_banana">Banana</string>
+    <string name="verification_emoji_apple">Apple</string>
+    <string name="verification_emoji_strawberry">Strawberry</string>
+    <string name="verification_emoji_corn">Corn</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Cake</string>
+    <string name="verification_emoji_heart">Heart</string>
+    <string name="verification_emoji_smiley">Smiley</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Hat</string>
+    <string name="verification_emoji_glasses">Glasses</string>
+    <string name="verification_emoji_spanner">Spanner</string>
+    <string name="verification_emoji_santa">Santa</string>
+    <string name="verification_emoji_thumbs_up">Thumbs Up</string>
+    <string name="verification_emoji_umbrella">Umbrella</string>
+    <string name="verification_emoji_hourglass">Hourglass</string>
+    <string name="verification_emoji_clock">Clock</string>
+    <string name="verification_emoji_gift">Gift</string>
+    <string name="verification_emoji_light_bulb">Light Bulb</string>
+    <string name="verification_emoji_book">Book</string>
+    <string name="verification_emoji_pencil">Pencil</string>
+    <string name="verification_emoji_paperclip">Paperclip</string>
+    <string name="verification_emoji_scissors">Scissors</string>
+    <string name="verification_emoji_lock">Lock</string>
+    <string name="verification_emoji_key">Key</string>
+    <string name="verification_emoji_hammer">Hammer</string>
+    <string name="verification_emoji_telephone">Telephone</string>
+    <string name="verification_emoji_flag">Flag</string>
+    <string name="verification_emoji_train">Train</string>
+    <string name="verification_emoji_bicycle">Bicycle</string>
+    <string name="verification_emoji_aeroplane">Aeroplane</string>
+    <string name="verification_emoji_rocket">Rocket</string>
+    <string name="verification_emoji_trophy">Trophy</string>
+    <string name="verification_emoji_ball">Ball</string>
+    <string name="verification_emoji_guitar">Guitar</string>
+    <string name="verification_emoji_trumpet">Trumpet</string>
+    <string name="verification_emoji_bell">Bell</string>
+    <string name="verification_emoji_anchor">Anchor</string>
+    <string name="verification_emoji_headphones">Headphones</string>
+    <string name="verification_emoji_folder">Folder</string>
+    <string name="verification_emoji_pin">Pin</string>
+</resources>
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushrulesConditionTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt
similarity index 82%
rename from matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushrulesConditionTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt
index be5aeaaf0f..b2c8d3bda8 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushrulesConditionTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt
@@ -16,6 +16,12 @@
 
 package org.matrix.android.sdk.api.pushrules
 
+import io.mockk.every
+import io.mockk.mockk
+import org.amshove.kluent.shouldBe
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
 import org.matrix.android.sdk.MatrixTest
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toContent
@@ -24,28 +30,26 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
 import org.matrix.android.sdk.internal.session.room.RoomGetter
-import io.mockk.every
-import io.mockk.mockk
-import org.amshove.kluent.shouldBe
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
 
-class PushrulesConditionTest: MatrixTest {
+class PushRulesConditionTest : MatrixTest {
 
     /* ==========================================================================================
      * Test EventMatchCondition
      * ========================================================================================== */
 
-    @Test
-    fun test_eventmatch_type_condition() {
-        val condition = EventMatchCondition("type", "m.room.message")
-
-        val simpleTextEvent = Event(
+    private fun createSimpleTextEvent(text: String): Event {
+        return Event(
                 type = "m.room.message",
                 eventId = "mx0",
-                content = MessageTextContent("m.text", "Yo wtf?").toContent(),
+                content = MessageTextContent("m.text", text).toContent(),
                 originServerTs = 0)
+    }
+
+    @Test
+    fun test_eventmatch_type_condition() {
+        val condition = EventMatchCondition("type", "m.room.message", false)
+
+        val simpleTextEvent = createSimpleTextEvent("Yo wtf?")
 
         val rm = RoomMemberContent(
                 Membership.INVITE,
@@ -65,13 +69,9 @@ class PushrulesConditionTest: MatrixTest {
 
     @Test
     fun test_eventmatch_path_condition() {
-        val condition = EventMatchCondition("content.msgtype", "m.text")
+        val condition = EventMatchCondition("content.msgtype", "m.text", false)
 
-        val simpleTextEvent = Event(
-                type = "m.room.message",
-                eventId = "mx0",
-                content = MessageTextContent("m.text", "Yo wtf?").toContent(),
-                originServerTs = 0)
+        val simpleTextEvent = createSimpleTextEvent("Yo wtf?")
 
         assert(condition.isSatisfied(simpleTextEvent))
 
@@ -86,49 +86,44 @@ class PushrulesConditionTest: MatrixTest {
                 ).toContent(),
                 originServerTs = 0
         ).apply {
-            assert(EventMatchCondition("content.membership", "invite").isSatisfied(this))
+            assert(EventMatchCondition("content.membership", "invite", false).isSatisfied(this))
         }
     }
 
     @Test
     fun test_eventmatch_cake_condition() {
-        val condition = EventMatchCondition("content.body", "cake")
+        val condition = EventMatchCondition("content.body", "cake", false)
 
-        Event(
-                type = "m.room.message",
-                eventId = "mx0",
-                content = MessageTextContent("m.text", "How was the cake?").toContent(),
-                originServerTs = 0
-        ).apply {
-            assert(condition.isSatisfied(this))
-        }
-
-        Event(
-                type = "m.room.message",
-                eventId = "mx0",
-                content = MessageTextContent("m.text", "Howwasthecake?").toContent(),
-                originServerTs = 0
-        ).apply {
-            assert(condition.isSatisfied(this))
-        }
+        assert(condition.isSatisfied(createSimpleTextEvent("How was the cake?")))
+        assert(condition.isSatisfied(createSimpleTextEvent("Howwasthecake?")))
     }
 
     @Test
     fun test_eventmatch_cakelie_condition() {
-        val condition = EventMatchCondition("content.body", "cake*lie")
+        val condition = EventMatchCondition("content.body", "cake*lie", false)
 
-        val simpleTextEvent = Event(
-                type = "m.room.message",
-                eventId = "mx0",
-                content = MessageTextContent("m.text", "How was the cakeisalie?").toContent(),
-                originServerTs = 0)
+        assert(condition.isSatisfied(createSimpleTextEvent("How was the cakeisalie?")))
+    }
 
-        assert(condition.isSatisfied(simpleTextEvent))
+    @Test
+    fun test_eventmatch_words_only_condition() {
+        val condition = EventMatchCondition("content.body", "ben", true)
+
+        assertFalse(condition.isSatisfied(createSimpleTextEvent("benoit")))
+        assertFalse(condition.isSatisfied(createSimpleTextEvent("Hello benoit")))
+        assertFalse(condition.isSatisfied(createSimpleTextEvent("superben")))
+
+        assert(condition.isSatisfied(createSimpleTextEvent("ben")))
+        assert(condition.isSatisfied(createSimpleTextEvent("hello ben")))
+        assert(condition.isSatisfied(createSimpleTextEvent("ben is there")))
+        assert(condition.isSatisfied(createSimpleTextEvent("hello ben!")))
+        assert(condition.isSatisfied(createSimpleTextEvent("hello Ben!")))
+        assert(condition.isSatisfied(createSimpleTextEvent("BEN")))
     }
 
     @Test
     fun test_notice_condition() {
-        val conditionEqual = EventMatchCondition("content.msgtype", "m.notice")
+        val conditionEqual = EventMatchCondition("content.msgtype", "m.notice", false)
 
         Event(
                 type = "m.room.message",
diff --git a/tools/import_sas_strings.py b/tools/import_sas_strings.py
new file mode 100755
index 0000000000..faf4ed7080
--- /dev/null
+++ b/tools/import_sas_strings.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python3
+
+#  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.
+
+import argparse
+import json
+import os
+import os.path
+# Run `pip3 install requests` if not installed yet
+import requests
+
+### Arguments
+
+parser = argparse.ArgumentParser(description='Download sas string from matrix-doc.')
+parser.add_argument('-v',
+                    '--verbose',
+                    help="increase output verbosity.",
+                    action="store_true")
+
+args = parser.parse_args()
+
+if args.verbose:
+    print("Argument:")
+    print(args)
+
+base_url = "https://raw.githubusercontent.com/matrix-org/matrix-doc/master/data-definitions/sas-emoji.json"
+
+print("Downloading " + base_url + "…")
+
+r0 = requests.get(base_url)
+data0 = json.loads(r0.content.decode())
+
+if args.verbose:
+    print("Json data:")
+    print(data0)
+
+print()
+
+# emoji -> translation
+default = dict()
+# Language -> emoji -> translation
+cumul = dict()
+
+for emoji in data0:
+    description = emoji["description"]
+    if args.verbose:
+        print("Description: " + description)
+    default[description] = description
+
+    for lang in emoji["translated_descriptions"]:
+        if args.verbose:
+            print("Lang: " + lang)
+        if not (lang in cumul):
+            cumul[lang] = dict()
+        cumul[lang][description] = emoji["translated_descriptions"][lang]
+
+if args.verbose:
+    print(default)
+    print(cumul)
+
+def write_file(file, dict):
+    print("Writing file " + file)
+    if args.verbose:
+        print("With")
+        print(dict)
+    os.makedirs(os.path.dirname(file), exist_ok=True)
+    with open(file, mode="w", encoding="utf8") as o:
+        o.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
+        o.write("<resources>\n")
+        o.write("    <!-- Generated file, do not edit -->\n")
+        for key in dict:
+            if dict[key] is None:
+                continue
+            o.write("    <string name=\"verification_emoji_" + key.lower().replace(" ", "_") + "\">" + dict[key].replace("'", "\\'") + "</string>\n")
+        o.write("</resources>\n")
+
+scripts_dir = os.path.dirname(os.path.abspath(__file__))
+data_defs_dir = os.path.join(scripts_dir, "../matrix-sdk-android/src/main/res")
+
+# Write default file
+write_file(os.path.join(data_defs_dir, "values/strings_sas.xml"), default)
+
+# Write each language file
+for lang in cumul:
+    androidLang = lang\
+        .replace("_", "-r")\
+        .replace("zh-rHans", "zh-rCN")
+    write_file(os.path.join(data_defs_dir, "values-" + androidLang + "/strings_sas.xml"), cumul[lang])
+
+print()
+print("Success!")
diff --git a/tools/release/download_buildkite_artifacts.py b/tools/release/download_buildkite_artifacts.py
index ef4251a14f..4439c2fb8c 100755
--- a/tools/release/download_buildkite_artifacts.py
+++ b/tools/release/download_buildkite_artifacts.py
@@ -25,9 +25,9 @@ import requests
 # This script downloads artifacts from buildkite.
 # Ref: https://buildkite.com/docs/apis/rest-api/artifacts#download-an-artifact
 
-# Those two variable are specific to the RiotX project
+# Those two variables are specific to the Element Android project
 ORG_SLUG = "matrix-dot-org"
-PIPELINE_SLUG = "riotx-android"
+PIPELINE_SLUG = "element-android"
 
 ### Arguments
 
diff --git a/tools/templates/RiotXFeature/globals.xml.ftl b/tools/templates/ElementFeature/globals.xml.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/globals.xml.ftl
rename to tools/templates/ElementFeature/globals.xml.ftl
diff --git a/tools/templates/RiotXFeature/recipe.xml.ftl b/tools/templates/ElementFeature/recipe.xml.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/recipe.xml.ftl
rename to tools/templates/ElementFeature/recipe.xml.ftl
diff --git a/tools/templates/RiotXFeature/root/res/layout/fragment.xml.ftl b/tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/res/layout/fragment.xml.ftl
rename to tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/Action.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/Action.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/Fragment.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/ViewEvents.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/ViewEvents.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/ViewModel.kt.ftl
diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewState.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/ViewState.kt.ftl
similarity index 100%
rename from tools/templates/RiotXFeature/root/src/app_package/ViewState.kt.ftl
rename to tools/templates/ElementFeature/root/src/app_package/ViewState.kt.ftl
diff --git a/tools/templates/RiotXFeature/template.xml b/tools/templates/ElementFeature/template.xml
similarity index 99%
rename from tools/templates/RiotXFeature/template.xml
rename to tools/templates/ElementFeature/template.xml
index 33d2edfc70..14c718c993 100644
--- a/tools/templates/RiotXFeature/template.xml
+++ b/tools/templates/ElementFeature/template.xml
@@ -2,7 +2,7 @@
 <template
     format="5"
     revision="1"
-    name="RiotX Feature"
+    name="Element Feature"
     minApi="19"
     minBuildApi="19"
     description="Creates a new activity and a fragment with view model, view state and actions">
diff --git a/tools/templates/configure.sh b/tools/templates/configure.sh
index de7fe7da81..0669ab1312 100755
--- a/tools/templates/configure.sh
+++ b/tools/templates/configure.sh
@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-echo "Configure RiotX Template..."
+echo "Configure Element Template..."
 if [ -z ${ANDROID_STUDIO+x} ]; then ANDROID_STUDIO="/Applications/Android Studio.app/Contents"; fi
 {
-ln -s $(pwd)/RiotXFeature "${ANDROID_STUDIO%/}/plugins/android/lib/templates/other"
+ln -s $(pwd)/ElementFeature "${ANDROID_STUDIO%/}/plugins/android/lib/templates/other"
 } && {
   echo "Please restart Android Studio."
 }
diff --git a/tools/tests/test_configuration_link.sh b/tools/tests/test_configuration_link.sh
index 33b1699e70..d0a5e38e6a 100755
--- a/tools/tests/test_configuration_link.sh
+++ b/tools/tests/test_configuration_link.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am start -a android.intent.action.VIEW -d "https://riot.im/config/config?hs_url=https%3A%2F%2Fmozilla-test.modular.im"
+adb shell am start -a android.intent.action.VIEW -d "https://mobile.element.io?hs_url=https%3A%2F%2Fmozilla-test.modular.im"
diff --git a/vector/build.gradle b/vector/build.gradle
index 57fd0cc51a..52ff0dd23c 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -17,7 +17,7 @@ androidExtensions {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 0
-ext.versionPatch = 5
+ext.versionPatch = 6
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -122,6 +122,9 @@ android {
         // Other branches (master, features, etc.) will have version code based on application version.
         versionCode project.getVersionCode()
 
+        // Required for sonar analysis
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar"
+
         buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
         resValue "string", "git_revision", "\"${gitRevision()}\""
 
@@ -264,14 +267,14 @@ dependencies {
     def epoxy_version = '3.11.0'
     def fragment_version = '1.2.5'
     def arrow_version = "0.8.2"
-    def coroutines_version = "1.3.2"
+    def coroutines_version = "1.3.8"
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.6.2'
     def glide_version = '4.11.0'
     def moshi_version = '1.8.0'
     def daggerVersion = '2.25.4'
     def autofill_version = "1.0.0"
-    def work_version = '2.3.4'
+    def work_version = '2.4.0'
     def arch_version = '2.1.0'
     def lifecycle_version = '2.2.0'
 
@@ -286,13 +289,13 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
-    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha04"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha05"
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment:$fragment_version"
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     // Keep at 2.0.0-beta4 at the moment, as updating is breaking some UI
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
-    implementation 'androidx.core:core-ktx:1.3.0'
+    implementation 'androidx.core:core-ktx:1.3.1'
 
     implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
     implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.7.0"
@@ -378,7 +381,7 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$glide_version"
     kapt "com.github.bumptech.glide:compiler:$glide_version"
     implementation 'com.danikula:videocache:2.7.1'
-    implementation 'com.github.yalantis:ucrop:2.2.4'
+    implementation 'com.github.yalantis:ucrop:2.2.6'
 
     // Badge for compatibility
     implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
@@ -390,9 +393,7 @@ dependencies {
     kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.5.0'
 
     // gplay flavor only
-    // Warning: due to the exclude, Android Studio does not propose to upgrade. Uncomment next line to be proposed to upgrade
-    // implementation 'com.google.firebase:firebase-messaging:20.0.0'
-    gplayImplementation('com.google.firebase:firebase-messaging:20.2.1') {
+    gplayImplementation('com.google.firebase:firebase-messaging:20.2.4') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 855333d96b..5590e19c10 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -68,7 +68,7 @@ class DebugMenuActivity : VectorBaseActivity() {
     }
 
     private fun renderQrCode(text: String) {
-        debug_qr_code.setData(text, true)
+        debug_qr_code.setData(text)
     }
 
     @OnClick(R.id.debug_test_text_view_link)
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 617e40225d..be0ce86326 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -25,9 +25,6 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ProcessLifecycleOwner
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.events.model.Event
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
@@ -40,6 +37,9 @@ import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.notifications.SimpleNotifiableEvent
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.push.fcm.FcmHelper
+import org.matrix.android.sdk.api.pushrules.Action
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.Event
 import timber.log.Timber
 
 /**
@@ -196,7 +196,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
                     description = "",
                     type = null,
                     timestamp = System.currentTimeMillis(),
-                    soundName = PushRule.ACTION_VALUE_DEFAULT,
+                    soundName = Action.ACTION_OBJECT_VALUE_VALUE_DEFAULT,
                     isPushGatewayEvent = true
             )
             notificationDrawerManager.onNotifiableEventReceived(simpleNotifiableEvent)
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index f07d992726..6865da3470 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -144,8 +144,10 @@
 
                 <data android:scheme="https" />
                 <data android:host="riot.im" />
-                <data android:host="element.io" />
-                <data android:pathPrefix="/config/" />
+                <data android:host="app.element.io" />
+                <data android:host="mobile.element.io" />
+                <data android:host="develop.element.io" />
+                <data android:host="staging.element.io" />
             </intent-filter>
         </activity>
 
diff --git a/vector/src/main/assets/open_source_licenses.html b/vector/src/main/assets/open_source_licenses.html
index 17557b7eb3..376745e6f7 100755
--- a/vector/src/main/assets/open_source_licenses.html
+++ b/vector/src/main/assets/open_source_licenses.html
@@ -313,11 +313,6 @@ SOFTWARE.
         <br/>
         Copyright (c) 2012-2016 Dan Wheeler and Dropbox, Inc.
     </li>
-    <li>
-        <b>Compressor</b>
-        <br/>
-        Copyright (c) 2016 Zetra.
-    </li>
     <li>
         <b>com.otaliastudios:autocomplete</b>
         <br/>
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index 303b9d585a..f64ebf9245 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -32,10 +32,6 @@ import com.airbnb.epoxy.EpoxyAsyncUtil
 import com.airbnb.epoxy.EpoxyController
 import com.facebook.stetho.Stetho
 import com.gabrielittner.threetenbp.LazyThreeTen
-import org.matrix.android.sdk.api.Matrix
-import org.matrix.android.sdk.api.MatrixConfiguration
-import org.matrix.android.sdk.api.auth.AuthenticationService
-import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.DaggerVectorComponent
 import im.vector.app.core.di.HasVectorInjector
@@ -50,16 +46,21 @@ import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.pin.PinLocker
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.version.VersionProvider
 import im.vector.app.push.fcm.FcmHelper
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import java.util.concurrent.Executors
 import javax.inject.Inject
-
 import androidx.work.Configuration as WorkConfiguration
 
 class VectorApplication :
@@ -119,7 +120,9 @@ class VectorApplication :
                 R.array.com_google_android_gms_fonts_certs
         )
         FontsContractCompat.requestFont(this, fontRequest, emojiCompatFontProvider, getFontThreadHandler())
-        vectorConfiguration.initConfiguration()
+        VectorLocale.init(this)
+        ThemeUtils.init(this)
+        vectorConfiguration.applyToApplicationContext()
 
         emojiCompatWrapper.init(fontRequest)
 
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 1aa9902137..d0e4c938cd 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
@@ -102,6 +102,8 @@ import im.vector.app.features.settings.devtools.OutgoingKeyRequestListFragment
 import im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment
 import im.vector.app.features.settings.locale.LocalePickerFragment
 import im.vector.app.features.settings.push.PushGatewaysFragment
+import im.vector.app.features.settings.push.PushRulesFragment
+import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
 import im.vector.app.features.share.IncomingShareFragment
 import im.vector.app.features.signout.soft.SoftLogoutFragment
 import im.vector.app.features.terms.ReviewTermsFragment
@@ -282,6 +284,11 @@ interface FragmentModule {
     @FragmentKey(VectorSettingsLabsFragment::class)
     fun bindVectorSettingsLabsFragment(fragment: VectorSettingsLabsFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(PushRulesFragment::class)
+    fun bindPushRulesFragment(fragment: PushRulesFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(VectorSettingsPreferencesFragment::class)
@@ -307,6 +314,11 @@ interface FragmentModule {
     @FragmentKey(VectorSettingsDevicesFragment::class)
     fun bindVectorSettingsDevicesFragment(fragment: VectorSettingsDevicesFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(ThreePidsSettingsFragment::class)
+    fun bindThreePidsSettingsFragment(fragment: ThreePidsSettingsFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(PublicRoomsFragment::class)
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index 051847321a..43395b97f7 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -59,35 +59,46 @@ class DefaultErrorFormatter @Inject constructor(
             }
             is Failure.ServerError       -> {
                 when {
-                    throwable.error.code == MatrixError.M_CONSENT_NOT_GIVEN  -> {
+                    throwable.error.code == MatrixError.M_CONSENT_NOT_GIVEN         -> {
                         // Special case for terms and conditions
                         stringProvider.getString(R.string.error_terms_not_accepted)
                     }
-                    throwable.isInvalidPassword()                            -> {
+                    throwable.isInvalidPassword()                                   -> {
                         stringProvider.getString(R.string.auth_invalid_login_param)
                     }
-                    throwable.error.code == MatrixError.M_USER_IN_USE        -> {
+                    throwable.error.code == MatrixError.M_USER_IN_USE               -> {
                         stringProvider.getString(R.string.login_signup_error_user_in_use)
                     }
-                    throwable.error.code == MatrixError.M_BAD_JSON           -> {
+                    throwable.error.code == MatrixError.M_BAD_JSON                  -> {
                         stringProvider.getString(R.string.login_error_bad_json)
                     }
-                    throwable.error.code == MatrixError.M_NOT_JSON           -> {
+                    throwable.error.code == MatrixError.M_NOT_JSON                  -> {
                         stringProvider.getString(R.string.login_error_not_json)
                     }
-                    throwable.error.code == MatrixError.M_THREEPID_DENIED    -> {
+                    throwable.error.code == MatrixError.M_THREEPID_DENIED           -> {
                         stringProvider.getString(R.string.login_error_threepid_denied)
                     }
-                    throwable.error.code == MatrixError.M_LIMIT_EXCEEDED     -> {
+                    throwable.error.code == MatrixError.M_LIMIT_EXCEEDED            -> {
                         limitExceededError(throwable.error)
                     }
-                    throwable.error.code == MatrixError.M_THREEPID_NOT_FOUND -> {
+                    throwable.error.code == MatrixError.M_THREEPID_NOT_FOUND        -> {
                         stringProvider.getString(R.string.login_reset_password_error_not_found)
                     }
-                    throwable.error.code == MatrixError.M_USER_DEACTIVATED   -> {
+                    throwable.error.code == MatrixError.M_USER_DEACTIVATED          -> {
                         stringProvider.getString(R.string.auth_invalid_login_deactivated_account)
                     }
-                    else                                                     -> {
+                    throwable.error.code == MatrixError.M_THREEPID_IN_USE
+                            && throwable.error.message == "Email is already in use" -> {
+                        stringProvider.getString(R.string.account_email_already_used_error)
+                    }
+                    throwable.error.code == MatrixError.M_THREEPID_IN_USE
+                            && throwable.error.message == "MSISDN is already in use" -> {
+                        stringProvider.getString(R.string.account_phone_number_already_used_error)
+                    }
+                    throwable.error.code == MatrixError.M_THREEPID_AUTH_FAILED      -> {
+                        stringProvider.getString(R.string.error_threepid_auth_failed)
+                    }
+                    else                                                            -> {
                         throwable.error.message.takeIf { it.isNotEmpty() }
                                 ?: throwable.error.code.takeIf { it.isNotEmpty() }
                     }
@@ -102,6 +113,7 @@ class DefaultErrorFormatter @Inject constructor(
                         throwable.localizedMessage
                 }
             }
+            is SsoFlowNotSupportedYet    -> stringProvider.getString(R.string.error_sso_flow_not_supported_yet)
             else                         -> throwable.localizedMessage
         }
                 ?: stringProvider.getString(R.string.unknown_error)
diff --git a/vector/src/main/java/im/vector/app/core/error/SsoFlowNotSupportedYet.kt b/vector/src/main/java/im/vector/app/core/error/SsoFlowNotSupportedYet.kt
new file mode 100644
index 0000000000..7b22072c34
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/error/SsoFlowNotSupportedYet.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.error
+
+class SsoFlowNotSupportedYet : Throwable()
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 cafcf6d1d8..44b85df93a 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
@@ -24,7 +24,9 @@ import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
+import com.google.android.material.snackbar.Snackbar
 import im.vector.app.R
+import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.features.themes.ThemeUtils
 
 /**
@@ -68,3 +70,18 @@ fun TextView.setTextWithColoredPart(@StringRes fullTextRes: Int,
                 }
             }
 }
+
+/**
+ * Set long click listener to copy the current text of the TextView to the clipboard and show a Snackbar
+ */
+fun TextView.copyOnLongClick() {
+    setOnLongClickListener { view ->
+        (view as? TextView)
+                ?.text
+                ?.let { text ->
+                    copyToClipboard(view.context, text, false)
+                    Snackbar.make(view, view.resources.getString(R.string.copied_to_clipboard), Snackbar.LENGTH_SHORT).show()
+                }
+        true
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt b/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt
new file mode 100644
index 0000000000..5d91370963
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/extensions/ThreePid.kt
@@ -0,0 +1,37 @@
+/*
+ * 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.extensions
+
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import org.matrix.android.sdk.api.extensions.ensurePrefix
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.session.identity.ThreePid
+
+fun ThreePid.getFormattedValue(): String {
+    return when (this) {
+        is ThreePid.Email  -> email
+        is ThreePid.Msisdn -> {
+            tryThis(message = "Unable to parse the phone number") {
+                PhoneNumberUtil.getInstance().parse(msisdn.ensurePrefix("+"), null)
+            }
+                    ?.let {
+                        PhoneNumberUtil.getInstance().format(it, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)
+                    }
+                    ?: msisdn
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index 295609548f..2a17c2ca1b 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -26,14 +26,15 @@ import com.bumptech.glide.load.model.MultiModelLoaderFactory
 import com.bumptech.glide.signature.ObjectKey
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.features.media.ImageContentRenderer
-import org.matrix.android.sdk.api.Matrix
 import okhttp3.OkHttpClient
-import okhttp3.Request
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.file.FileService
 import timber.log.Timber
 import java.io.File
-import java.io.FileInputStream
 import java.io.IOException
 import java.io.InputStream
+import java.lang.Exception
+import java.lang.IllegalArgumentException
 
 class VectorGlideModelLoaderFactory(private val activeSessionHolder: ActiveSessionHolder)
     : ModelLoaderFactory<ImageContentRenderer.Data, InputStream> {
@@ -85,10 +86,14 @@ class VectorGlideDataFetcher(private val activeSessionHolder: ActiveSessionHolde
     override fun cancel() {
         if (stream != null) {
             try {
+                // This is often called on main thread, and this could be a network Stream..
+                // on close will throw android.os.NetworkOnMainThreadException, so we catch throwable
                 stream?.close() // interrupts decode if any
                 stream = null
-            } catch (ignore: IOException) {
-                Timber.e(ignore)
+            } catch (ignore: Throwable) {
+                Timber.e("Failed to close stream ${ignore.localizedMessage}")
+            } finally {
+                stream = null
             }
         }
     }
@@ -97,29 +102,51 @@ class VectorGlideDataFetcher(private val activeSessionHolder: ActiveSessionHolde
         Timber.v("Load data: $data")
         if (data.isLocalFile() && data.url != null) {
             val initialFile = File(data.url)
-            callback.onDataReady(FileInputStream(initialFile))
+            callback.onDataReady(initialFile.inputStream())
             return
         }
-        val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
-        val url = contentUrlResolver.resolveFullSize(data.url)
-                ?: return
+//        val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
 
-        val request = Request.Builder()
-                .url(url)
-                .build()
+        val fileService = activeSessionHolder.getSafeActiveSession()?.fileService() ?: return Unit.also {
+            callback.onLoadFailed(IllegalArgumentException("No File service"))
+        }
+        // Use the file vector service, will avoid flickering and redownload after upload
+        fileService.downloadFile(
+                downloadMode = FileService.DownloadMode.FOR_INTERNAL_USE,
+                mimeType = data.mimeType,
+                id = data.eventId,
+                url = data.url,
+                fileName = data.filename,
+                elementToDecrypt = data.elementToDecrypt,
+                callback = object: MatrixCallback<File> {
+                    override fun onSuccess(data: File) {
+                        callback.onDataReady(data.inputStream())
+                    }
 
-        val response = client.newCall(request).execute()
-        val inputStream = response.body?.byteStream()
-        Timber.v("Response size ${response.body?.contentLength()} - Stream available: ${inputStream?.available()}")
-        if (!response.isSuccessful) {
-            callback.onLoadFailed(IOException("Unexpected code $response"))
-            return
-        }
-        stream = if (data.elementToDecrypt != null && data.elementToDecrypt.k.isNotBlank()) {
-            Matrix.decryptStream(inputStream, data.elementToDecrypt)
-        } else {
-            inputStream
-        }
-        callback.onDataReady(stream)
+                    override fun onFailure(failure: Throwable) {
+                        callback.onLoadFailed(failure as? Exception ?: IOException(failure.localizedMessage))
+                    }
+                }
+        )
+//        val url = contentUrlResolver.resolveFullSize(data.url)
+//                ?: return
+//
+//        val request = Request.Builder()
+//                .url(url)
+//                .build()
+//
+//        val response = client.newCall(request).execute()
+//        val inputStream = response.body?.byteStream()
+//        Timber.v("Response size ${response.body?.contentLength()} - Stream available: ${inputStream?.available()}")
+//        if (!response.isSuccessful) {
+//            callback.onLoadFailed(IOException("Unexpected code $response"))
+//            return
+//        }
+//        stream = if (data.elementToDecrypt != null && data.elementToDecrypt.k.isNotBlank()) {
+//            Matrix.decryptStream(inputStream, data.elementToDecrypt)
+//        } else {
+//            inputStream
+//        }
+//        callback.onDataReady(stream)
     }
 }
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 11a6e326ac..4835ce5af5 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
@@ -60,6 +60,7 @@ import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.observeEvent
 import im.vector.app.core.extensions.observeNotNull
+import im.vector.app.core.extensions.restart
 import im.vector.app.core.extensions.vectorComponent
 import im.vector.app.core.utils.toast
 import im.vector.app.features.MainActivity
@@ -75,14 +76,16 @@ import im.vector.app.features.rageshake.BugReportActivity
 import im.vector.app.features.rageshake.BugReporter
 import im.vector.app.features.rageshake.RageShake
 import im.vector.app.features.session.SessionListener
+import im.vector.app.features.settings.FontScale
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.themes.ActivityOtherThemes
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.receivers.DebugReceiver
-import org.matrix.android.sdk.api.failure.GlobalError
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.failure.GlobalError
 import timber.log.Timber
 import kotlin.system.measureTimeMillis
 
@@ -198,8 +201,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
         configurationViewModel.activityRestarter.observe(this, Observer {
             if (!it.hasBeenHandled) {
                 // Recreate the Activity because configuration has changed
-                startActivity(intent)
-                finish()
+                restart()
             }
         })
         pinLocker.getLiveState().observeNotNull(this) {
@@ -219,6 +221,9 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
         doBeforeSetContentView()
 
+        // Hack for font size
+        applyFontSize()
+
         if (getLayoutRes() != -1) {
             setContentView(getLayoutRes())
         }
@@ -239,6 +244,16 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
         }
     }
 
+    /**
+     * This method has to be called for the font size setting be supported correctly.
+     */
+    private fun applyFontSize() {
+        resources.configuration.fontScale = FontScale.getFontScaleValue(this).scale
+
+        @Suppress("DEPRECATION")
+        resources.updateConfiguration(resources.configuration, resources.displayMetrics)
+    }
+
     private fun handleGlobalError(globalError: GlobalError) {
         when (globalError) {
             is GlobalError.InvalidToken         ->
@@ -302,10 +317,10 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == PinActivity.PIN_REQUEST_CODE) {
             when (resultCode) {
-                Activity.RESULT_OK                 -> {
+                Activity.RESULT_OK -> {
                     pinLocker.unlock()
                 }
-                else                               -> {
+                else               -> {
                     pinLocker.block()
                     moveTaskToBack(true)
                 }
@@ -331,6 +346,28 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
                 }
     }
 
+    private val postResumeScheduledActions = mutableListOf<() -> Unit>()
+
+    /**
+     * Schedule action to be done in the next call of onPostResume()
+     * It fixes bug observed on Android 6 (API 23)
+     */
+    protected fun doOnPostResume(action: () -> Unit) {
+        synchronized(postResumeScheduledActions) {
+            postResumeScheduledActions.add(action)
+        }
+    }
+
+    override fun onPostResume() {
+        super.onPostResume()
+        synchronized(postResumeScheduledActions) {
+            postResumeScheduledActions.forEach {
+                tryThis { it.invoke() }
+            }
+            postResumeScheduledActions.clear()
+        }
+    }
+
     override fun onPause() {
         super.onPause()
         Timber.i("onPause Activity ${this.javaClass.simpleName}")
diff --git a/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
index 87584a9db0..c3e324b64a 100755
--- a/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
@@ -20,9 +20,10 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.RadioGroup
-import android.widget.TextView
 import androidx.preference.PreferenceViewHolder
 import im.vector.app.R
+import org.matrix.android.sdk.api.pushrules.Action
+import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.pushrules.RuleSetKey
 import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.api.pushrules.rest.PushRuleAndKind
@@ -52,7 +53,7 @@ class PushRulePreference : VectorPreference {
         get() {
             val safeRule = ruleAndKind?.pushRule ?: return NOTIFICATION_OFF_INDEX
 
-            if (safeRule.ruleId == PushRule.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS) {
+            if (safeRule.ruleId == RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS) {
                 if (safeRule.shouldNotNotify()) {
                     return if (safeRule.enabled) {
                         NOTIFICATION_OFF_INDEX
@@ -109,7 +110,7 @@ class PushRulePreference : VectorPreference {
         val safeKind = ruleAndKind?.kind ?: return null
 
         return if (index != ruleStatusIndex) {
-            if (safeRule.ruleId == PushRule.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS) {
+            if (safeRule.ruleId == RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS) {
                 when (index) {
                     NOTIFICATION_OFF_INDEX    -> {
                         safeRule.copy(enabled = true)
@@ -129,7 +130,7 @@ class PushRulePreference : VectorPreference {
                 }
             } else {
                 if (NOTIFICATION_OFF_INDEX == index) {
-                    if (safeKind == RuleSetKey.UNDERRIDE || safeRule.ruleId == PushRule.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS) {
+                    if (safeKind == RuleSetKey.UNDERRIDE || safeRule.ruleId == RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS) {
                         safeRule.setNotify(false)
                     } else {
                         safeRule.copy(enabled = false)
@@ -138,15 +139,15 @@ class PushRulePreference : VectorPreference {
                     val newRule = safeRule.copy(enabled = true)
                             .setNotify(true)
                             .setHighlight(safeKind != RuleSetKey.UNDERRIDE
-                                    && safeRule.ruleId != PushRule.RULE_ID_INVITE_ME
+                                    && safeRule.ruleId != RuleIds.RULE_ID_INVITE_ME
                                     && NOTIFICATION_NOISY_INDEX == index)
 
                     if (NOTIFICATION_NOISY_INDEX == index) {
                         newRule.setNotificationSound(
-                                if (safeRule.ruleId == PushRule.RULE_ID_CALL) {
-                                    PushRule.ACTION_VALUE_RING
+                                if (safeRule.ruleId == RuleIds.RULE_ID_CALL) {
+                                    Action.ACTION_OBJECT_VALUE_VALUE_RING
                                 } else {
-                                    PushRule.ACTION_VALUE_DEFAULT
+                                    Action.ACTION_OBJECT_VALUE_VALUE_DEFAULT
                                 }
                         )
                     } else {
@@ -162,7 +163,7 @@ class PushRulePreference : VectorPreference {
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
 
-        holder.itemView.findViewById<TextView>(android.R.id.summary)?.visibility = View.GONE
+        holder.findViewById(android.R.id.summary)?.visibility = View.GONE
         holder.itemView.setOnClickListener(null)
         holder.itemView.setOnLongClickListener(null)
 
diff --git a/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
index e3b4430fe0..3bb50c6284 100755
--- a/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
@@ -26,6 +26,7 @@ import im.vector.app.R
 import im.vector.app.core.extensions.vectorComponent
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 
 class UserAvatarPreference : Preference {
@@ -34,6 +35,8 @@ class UserAvatarPreference : Preference {
 
     private var avatarRenderer: AvatarRenderer = context.vectorComponent().avatarRenderer()
 
+    private var userItem: MatrixItem.UserItem? = null
+
     constructor(context: Context) : super(context)
 
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
@@ -50,9 +53,16 @@ class UserAvatarPreference : Preference {
         super.onBindViewHolder(holder)
         mAvatarView = holder.itemView.findViewById(R.id.settings_avatar)
         mLoadingProgressBar = holder.itemView.findViewById(R.id.avatar_update_progress_bar)
+        refreshUi()
     }
 
     fun refreshAvatar(user: User) {
-        mAvatarView?.let { avatarRenderer.render(user.toMatrixItem(), it) }
+        userItem = user.toMatrixItem()
+        refreshUi()
+    }
+
+    private fun refreshUi() {
+        val safeUserItem = userItem ?: return
+        mAvatarView?.let { avatarRenderer.render(safeUserItem, it) }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt
index 840e5fa510..348fcffc9b 100644
--- a/vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt
@@ -45,7 +45,7 @@ class VectorEditTextPreference : EditTextPreference {
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         // display the title in multi-line to avoid ellipsis.
         try {
-            holder.itemView.findViewById<TextView>(android.R.id.title)?.isSingleLine = false
+            (holder.findViewById(android.R.id.title) as? TextView)?.isSingleLine = false
         } catch (e: Exception) {
             Timber.e(e, "onBindView")
         }
diff --git a/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt
index 4a9bb6a6f5..a40ddef6ab 100755
--- a/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt
@@ -20,12 +20,15 @@ import android.animation.Animator
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.Typeface
 import android.util.AttributeSet
 import android.view.View
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.animation.doOnEnd
+import androidx.core.widget.ImageViewCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import im.vector.app.R
@@ -76,6 +79,12 @@ open class VectorPreference : Preference {
             notifyChanged()
         }
 
+    var tintIcon = false
+        set(value) {
+            field = value
+            notifyChanged()
+        }
+
     var currentHighlightAnimator: Animator? = null
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
@@ -84,15 +93,23 @@ open class VectorPreference : Preference {
 
         // display the title in multi-line to avoid ellipsis.
         try {
-            val title = itemView.findViewById<TextView>(android.R.id.title)
-            val summary = itemView.findViewById<TextView>(android.R.id.summary)
+            val title = holder.findViewById(android.R.id.title) as? TextView
+            val summary = holder.findViewById(android.R.id.summary) as? TextView
             if (title != null) {
                 title.isSingleLine = false
                 title.setTypeface(null, mTypeface)
             }
 
-            if (title !== summary) {
-                summary.setTypeface(null, mTypeface)
+            summary?.setTypeface(null, mTypeface)
+
+            if (tintIcon) {
+                // Tint icons (See #1786)
+                val icon = holder.findViewById(android.R.id.icon) as? ImageView
+
+                icon?.let {
+                    val color = ThemeUtils.getColor(context, R.attr.riotx_header_panel_text_secondary)
+                    ImageViewCompat.setImageTintList(it, ColorStateList.valueOf(color))
+                }
             }
 
             // cancel existing animation (find a way to resume if happens during anim?)
diff --git a/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt b/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt
index e61cde8ebd..eb59da640d 100644
--- a/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt
@@ -45,7 +45,7 @@ class VectorPreferenceCategory : PreferenceCategory {
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
 
-        val titleTextView = holder.itemView.findViewById<TextView>(android.R.id.title)
+        val titleTextView = holder.findViewById(android.R.id.title) as? TextView
 
         titleTextView?.setTypeface(null, Typeface.BOLD)
         titleTextView?.setTextColor(ThemeUtils.getColor(context, R.attr.riotx_text_primary))
diff --git a/vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt
index c97991bfcb..346e8488b9 100644
--- a/vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt
@@ -58,7 +58,7 @@ class VectorSwitchPreference : SwitchPreference {
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         // display the title in multi-line to avoid ellipsis.
-        holder.itemView.findViewById<TextView>(android.R.id.title)?.isSingleLine = false
+        (holder.findViewById(android.R.id.title) as? TextView)?.isSingleLine = false
 
         // cancel existing animation (find a way to resume if happens during anim?)
         currentHighlightAnimator?.cancel()
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
index 832250fab4..492df9eb00 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
@@ -70,6 +70,9 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
     @EpoxyAttribute
     var buttonAction: Action? = null
 
+    @EpoxyAttribute
+    var destructiveButtonAction: Action? = null
+
     @EpoxyAttribute
     var itemClickAction: Action? = null
 
@@ -109,6 +112,11 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
             buttonAction?.perform?.run()
         }
 
+        holder.destructiveButton.setTextOrHide(destructiveButtonAction?.title)
+        holder.destructiveButton.setOnClickListener {
+            destructiveButtonAction?.perform?.run()
+        }
+
         holder.root.setOnClickListener {
             itemClickAction?.perform?.run()
         }
@@ -122,5 +130,6 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
         val accessoryImage by bind<ImageView>(R.id.item_generic_accessory_image)
         val progressBar by bind<ProgressBar>(R.id.item_generic_progress_bar)
         val actionButton by bind<Button>(R.id.item_generic_action_button)
+        val destructiveButton by bind<Button>(R.id.item_generic_destructive_action_button)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt
index 11e319ab78..f4b371bc52 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt
@@ -18,28 +18,23 @@ package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.graphics.Color
-import android.graphics.drawable.AnimationDrawable
-import android.graphics.drawable.BitmapDrawable
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
 import im.vector.app.core.qrcode.toBitMatrix
 import im.vector.app.core.qrcode.toBitmap
-import kotlin.random.Random
 
 class QrCodeImageView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : AppCompatImageView(context, attrs, defStyleAttr) {
 
     private var data: String? = null
-    private var animate = false
 
     init {
         setBackgroundColor(Color.WHITE)
     }
 
-    fun setData(data: String, animate: Boolean) {
+    fun setData(data: String) {
         this.data = data
-        this.animate = animate
 
         render()
     }
@@ -53,47 +48,8 @@ class QrCodeImageView @JvmOverloads constructor(
         data
                 ?.takeIf { height > 0 }
                 ?.let {
-                    if (animate) {
-                        // NOT SUPPORTED YET val anim = createAnimation(it)
-                        // NOT SUPPORTED YET setImageDrawable(anim)
-                        // NOT SUPPORTED YET anim.start()
-                        // NOT SUPPORTED YET setImageDrawable(BitmapDrawable(resources, it.toBitMatrix(height).toBitmap()))
-                        val bitmap = it.toBitMatrix(height).toBitmap()
-                        post { setImageBitmap(bitmap) }
-                    } else {
-                        val bitmap = it.toBitMatrix(height).toBitmap()
-                        post { setImageBitmap(bitmap) }
-                    }
+                    val bitmap = it.toBitMatrix(height).toBitmap()
+                    post { setImageBitmap(bitmap) }
                 }
     }
-
-    private fun createAnimation(data: String): AnimationDrawable {
-        val finalQr = data.toBitMatrix(height)
-
-        val list = mutableListOf(finalQr)
-
-        val random = Random(System.currentTimeMillis())
-        val repeatTime = 8
-        repeat(repeatTime) { index ->
-            val alteredQr = finalQr.clone()
-            for (x in 0 until alteredQr.width) {
-                for (y in 0 until alteredQr.height) {
-                    if (random.nextInt(repeatTime - index) == 0) {
-                        // Pb is that it does not toggle a whole black square, but only a pixel
-                        alteredQr.unset(x, y)
-                    }
-                }
-            }
-            list.add(alteredQr)
-        }
-
-        val animDrawable = AnimationDrawable()
-
-        list.asReversed()
-                .forEach {
-                    animDrawable.addFrame(BitmapDrawable(resources, it.toBitmap()), 150)
-                }
-
-        return animDrawable
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
index 2ce3396d0c..b1ef746ee7 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
@@ -23,7 +23,6 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.core.view.isVisible
 import im.vector.app.R
-import im.vector.app.core.glide.GlideApp
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.toMatrixItem
@@ -113,9 +112,9 @@ class ReadReceiptsView @JvmOverloads constructor(
         }
     }
 
-    fun unbind() {
+    fun unbind(avatarRenderer: AvatarRenderer?) {
         receiptAvatars.forEach {
-            GlideApp.with(context.applicationContext).clear(it)
+            avatarRenderer?.clear(it)
         }
         isVisible = false
     }
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 b314401138..b1c63a406a 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
@@ -518,8 +518,8 @@ fun saveFileIntoLegacy(sourceFile: File, dstDirPath: File, outputFilename: Strin
     var outputStream: FileOutputStream? = null
     try {
         dstFile.createNewFile()
-        inputStream = FileInputStream(sourceFile)
-        outputStream = FileOutputStream(dstFile)
+        inputStream = sourceFile.inputStream()
+        outputStream = dstFile.outputStream()
         val buffer = ByteArray(1024 * 10)
         var len: Int
         while (inputStream.read(buffer).also { len = it } != -1) {
diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
index 38c97830ca..7bb060f075 100644
--- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
@@ -272,29 +272,29 @@ private fun checkPermissions(permissionsToBeGrantedBitMap: Int,
 
 /**
  * Helper method used in [.checkPermissions] to populate the list of the
- * permissions to be granted (permissionsListToBeGranted_out) and the list of the permissions already denied (permissionAlreadyDeniedList_out).
+ * permissions to be granted (permissionsListToBeGrantedOut) and the list of the permissions already denied (permissionAlreadyDeniedListOut).
  *
- * @param activity                        calling activity
- * @param permissionAlreadyDeniedList_out list to be updated with the permissions already denied by the user
- * @param permissionsListToBeGranted_out  list to be updated with the permissions to be granted
- * @param permissionType                  the permission to be checked
+ * @param activity                       calling activity
+ * @param permissionAlreadyDeniedListOut list to be updated with the permissions already denied by the user
+ * @param permissionsListToBeGrantedOut  list to be updated with the permissions to be granted
+ * @param permissionType                 the permission to be checked
  * @return true if the permission requires to be granted, false otherwise
  */
 private fun updatePermissionsToBeGranted(activity: Activity,
-                                         permissionAlreadyDeniedList_out: MutableList<String>,
-                                         permissionsListToBeGranted_out: MutableList<String>,
+                                         permissionAlreadyDeniedListOut: MutableList<String>,
+                                         permissionsListToBeGrantedOut: MutableList<String>,
                                          permissionType: String): Boolean {
     var isRequestPermissionRequested = false
 
     // add permission to be granted
-    permissionsListToBeGranted_out.add(permissionType)
+    permissionsListToBeGrantedOut.add(permissionType)
 
     if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(activity.applicationContext, permissionType)) {
         isRequestPermissionRequested = true
 
         // add permission to the ones that were already asked to the user
         if (ActivityCompat.shouldShowRequestPermissionRationale(activity, permissionType)) {
-            permissionAlreadyDeniedList_out.add(permissionType)
+            permissionAlreadyDeniedListOut.add(permissionType)
         }
     }
     return isRequestPermissionRequested
diff --git a/vector/src/main/java/im/vector/app/core/utils/ReadOnce.kt b/vector/src/main/java/im/vector/app/core/utils/ReadOnce.kt
new file mode 100644
index 0000000000..4283ecefab
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/utils/ReadOnce.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.utils
+
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Use this container to read a value only once
+ */
+class ReadOnce<T>(
+        private val value: T
+) {
+    private val valueHasBeenRead = AtomicBoolean(false)
+
+    fun get(): T? {
+        return if (valueHasBeenRead.getAndSet(true)) {
+            null
+        } else {
+            value
+        }
+    }
+}
+
+/**
+ * Only the first call to isTrue() will return true
+ */
+class ReadOnceTrue {
+    private val readOnce = ReadOnce(true)
+
+    fun isTrue() = readOnce.get() == true
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
index b2e46b1abf..bd13c0dac4 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
@@ -19,7 +19,9 @@ package im.vector.app.features.attachments
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 
 fun ContentAttachmentData.isPreviewable(): Boolean {
-    return type == ContentAttachmentData.Type.IMAGE || type == ContentAttachmentData.Type.VIDEO
+    // For now the preview only supports still image
+    return type == ContentAttachmentData.Type.IMAGE
+            && listOf("image/jpeg", "image/png", "image/jpg").contains(getSafeMimeType() ?: "")
 }
 
 data class GroupedContentAttachmentData(
diff --git a/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt b/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt
index fde562ee63..2a773c2f9b 100644
--- a/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt
@@ -125,7 +125,7 @@ class CallAudioManager(
             } else {
                 // if a wired headset is plugged, sound will be directed to it
                 // (can't really force earpiece when headset is plugged)
-                if (isBluetoothHeadsetOn()) {
+                if (isBluetoothHeadsetConnected(audioManager)) {
                     Timber.v("##VOIP: AudioManager default to WIRELESS_HEADSET ")
                     setCurrentSoundDevice(SoundDevice.WIRELESS_HEADSET)
                     // try now in case already connected?
@@ -246,7 +246,7 @@ class CallAudioManager(
     }
 
     private fun isHeadsetOn(): Boolean {
-        return isWiredHeadsetOn() || isBluetoothHeadsetOn()
+        return isWiredHeadsetOn() || (audioManager?.let { isBluetoothHeadsetConnected(it) } ?: false)
     }
 
     private fun isWiredHeadsetOn(): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt b/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt
new file mode 100644
index 0000000000..74e6c40783
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/CallProximityManager.kt
@@ -0,0 +1,104 @@
+/*
+ * 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.content.Context
+import android.hardware.Sensor
+import android.hardware.SensorEvent
+import android.hardware.SensorEventListener
+import android.hardware.SensorManager
+import android.os.PowerManager
+import androidx.core.content.getSystemService
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import javax.inject.Inject
+
+/**
+ * Manages the proximity sensor and turns the screen off when the proximity sensor activates.
+ */
+class CallProximityManager @Inject constructor(
+        context: Context,
+        private val stringProvider: StringProvider
+) : SensorEventListener {
+
+    companion object {
+        private const val PROXIMITY_WAKE_LOCK_TAG = "PROXIMITY_WAKE_LOCK_TAG"
+
+        // 1 hour
+        private const val WAKE_LOCK_TIMEOUT_MILLIS = 3_600_000L
+    }
+
+    private val powerManager = context.getSystemService<PowerManager>()!!
+    private val sensorManager = context.getSystemService<SensorManager>()!!
+
+    private var wakeLock: PowerManager.WakeLock? = null
+    private val sensor: Sensor? = sensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY)
+
+    private val isSupported = sensor != null && powerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)
+
+    /**
+     * Start listening the proximity sensor. [stop] function should be called to release the sensor and the WakeLock.
+     */
+    fun start() {
+        if (isSupported) {
+            sensorManager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_NORMAL)
+        }
+    }
+
+    /**
+     * Stop listening proximity sensor changes and release the WakeLock.
+     */
+    fun stop() {
+        if (isSupported) {
+            sensorManager.unregisterListener(this)
+            wakeLock
+                    ?.takeIf { it.isHeld }
+                    ?.release()
+        }
+    }
+
+    override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {
+        // NOOP
+    }
+
+    override fun onSensorChanged(event: SensorEvent) {
+        val distanceInCentimeters = event.values[0]
+        if (distanceInCentimeters < sensor?.maximumRange ?: 20f) {
+            onProximityNear()
+        } else {
+            onProximityFar()
+        }
+    }
+
+    /**
+     * Recommending naming convention for WakeLock tags is "app:tag"
+     */
+    private fun generateWakeLockTag() = "${stringProvider.getString(R.string.app_name)}:$PROXIMITY_WAKE_LOCK_TAG"
+
+    private fun onProximityNear() {
+        if (wakeLock == null) {
+            wakeLock = powerManager.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, generateWakeLockTag())
+        }
+        wakeLock?.acquire(WAKE_LOCK_TIMEOUT_MILLIS)
+    }
+
+    private fun onProximityFar() {
+        wakeLock
+                ?.takeIf { it.isHeld }
+                ?.release()
+    }
+}
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 8ad1b1a267..cee67cd818 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
@@ -87,7 +87,8 @@ class VectorCallViewModel @AssistedInject constructor(
         @Assisted initialState: VectorCallViewState,
         @Assisted val args: CallArgs,
         val session: Session,
-        val webRtcPeerConnectionManager: WebRtcPeerConnectionManager
+        val webRtcPeerConnectionManager: WebRtcPeerConnectionManager,
+        val proximityManager: CallProximityManager
 ) : VectorViewModel<VectorCallViewState, VectorCallViewActions, VectorCallViewEvents>(initialState) {
 
     var call: MxCall? = null
@@ -145,10 +146,17 @@ class VectorCallViewModel @AssistedInject constructor(
         }
 
         override fun onAudioDevicesChange(mgr: WebRtcPeerConnectionManager) {
+            val currentSoundDevice = mgr.audioManager.getCurrentSoundDevice()
+            if (currentSoundDevice == CallAudioManager.SoundDevice.PHONE) {
+                proximityManager.start()
+            } else {
+                proximityManager.stop()
+            }
+
             setState {
                 copy(
                         availableSoundDevices = mgr.audioManager.getAvailableSoundDevices(),
-                        soundDevice = mgr.audioManager.getCurrentSoundDevice()
+                        soundDevice = currentSoundDevice
                 )
             }
         }
@@ -164,9 +172,7 @@ class VectorCallViewModel @AssistedInject constructor(
     }
 
     init {
-
         initialState.callId?.let {
-
             webRtcPeerConnectionManager.addCurrentCallListener(currentCallListener)
 
             session.callSignalingService().getCallWithId(it)?.let { mxCall ->
@@ -175,12 +181,18 @@ class VectorCallViewModel @AssistedInject constructor(
                 val item: MatrixItem? = session.getUser(mxCall.otherUserId)?.toMatrixItem()
 
                 mxCall.addListener(callStateListener)
+
+                val currentSoundDevice = webRtcPeerConnectionManager.audioManager.getCurrentSoundDevice()
+                if (currentSoundDevice == CallAudioManager.SoundDevice.PHONE) {
+                    proximityManager.start()
+                }
+
                 setState {
                     copy(
                             isVideoCall = mxCall.isVideoCall,
                             callState = Success(mxCall.state),
                             otherUserMatrixItem = item?.let { Success(it) } ?: Uninitialized,
-                            soundDevice = webRtcPeerConnectionManager.audioManager.getCurrentSoundDevice(),
+                            soundDevice = currentSoundDevice,
                             availableSoundDevices = webRtcPeerConnectionManager.audioManager.getAvailableSoundDevices(),
                             isFrontCamera = webRtcPeerConnectionManager.currentCameraType() == CameraType.FRONT,
                             canSwitchCamera = webRtcPeerConnectionManager.canSwitchCamera(),
@@ -201,6 +213,7 @@ class VectorCallViewModel @AssistedInject constructor(
         // session.callService().removeCallListener(callServiceListener)
         webRtcPeerConnectionManager.removeCurrentCallListener(currentCallListener)
         this.call?.removeListener(callStateListener)
+        proximityManager.stop()
         super.onCleared()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt b/vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt
index 179ba288eb..04e7401e6c 100644
--- a/vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt
@@ -21,8 +21,6 @@ import android.content.Context
 import android.content.Intent
 import im.vector.app.core.di.HasVectorInjector
 import im.vector.app.features.call.WebRtcPeerConnectionManager
-import im.vector.app.features.notifications.NotificationUtils
-import im.vector.app.features.settings.VectorLocale.context
 import timber.log.Timber
 
 class CallHeadsUpActionReceiver : BroadcastReceiver() {
@@ -32,20 +30,14 @@ class CallHeadsUpActionReceiver : BroadcastReceiver() {
         const val CALL_ACTION_REJECT = 0
     }
 
-    private lateinit var peerConnectionManager: WebRtcPeerConnectionManager
-    private lateinit var notificationUtils: NotificationUtils
-
-    init {
-        val appContext = context.applicationContext
-        if (appContext is HasVectorInjector) {
-            peerConnectionManager = appContext.injector().webRtcPeerConnectionManager()
-            notificationUtils = appContext.injector().notificationUtils()
-        }
-    }
-
     override fun onReceive(context: Context, intent: Intent?) {
+        val peerConnectionManager = (context.applicationContext as? HasVectorInjector)
+                ?.injector()
+                ?.webRtcPeerConnectionManager()
+                ?: return
+
         when (intent?.getIntExtra(EXTRA_CALL_ACTION_KEY, 0)) {
-            CALL_ACTION_REJECT -> onCallRejectClicked()
+            CALL_ACTION_REJECT -> onCallRejectClicked(peerConnectionManager)
         }
 
         // Not sure why this should be needed
@@ -56,7 +48,7 @@ class CallHeadsUpActionReceiver : BroadcastReceiver() {
 //        context.stopService(Intent(context, CallHeadsUpService::class.java))
     }
 
-    private fun onCallRejectClicked() {
+    private fun onCallRejectClicked(peerConnectionManager: WebRtcPeerConnectionManager) {
         Timber.d("onCallRejectClicked")
         peerConnectionManager.endCall()
     }
diff --git a/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
index 5567a138de..394eca030b 100644
--- a/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
+++ b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
@@ -16,10 +16,11 @@
 
 package im.vector.app.features.configuration
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
+import android.os.LocaleList
+import androidx.annotation.RequiresApi
 import im.vector.app.features.settings.FontScale
 import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.themes.ThemeUtils
@@ -40,14 +41,9 @@ class VectorConfiguration @Inject constructor(private val context: Context) {
         }
     }
 
-    /**
-     * Init the configuration from the saved one
-     */
-    fun initConfiguration() {
-        VectorLocale.init(context)
+    fun applyToApplicationContext() {
         val locale = VectorLocale.applicationLocale
         val fontScale = FontScale.getFontScaleValue(context)
-        val theme = ThemeUtils.getApplicationTheme(context)
 
         Locale.setDefault(locale)
         val config = Configuration(context.resources.configuration)
@@ -56,9 +52,6 @@ class VectorConfiguration @Inject constructor(private val context: Context) {
         config.fontScale = fontScale.scale
         @Suppress("DEPRECATION")
         context.resources.updateConfiguration(config, context.resources.displayMetrics)
-
-        // init the theme
-        ThemeUtils.setApplicationTheme(context, theme)
     }
 
     /**
@@ -67,26 +60,22 @@ class VectorConfiguration @Inject constructor(private val context: Context) {
      * @param context the context
      * @return the localised context
      */
-    @SuppressLint("NewApi")
     fun getLocalisedContext(context: Context): Context {
         try {
-            val resources = context.resources
             val locale = VectorLocale.applicationLocale
-            val configuration = resources.configuration
+
+            // create new configuration passing old configuration from original Context
+            val configuration = Configuration(context.resources.configuration)
+
             configuration.fontScale = FontScale.getFontScaleValue(context).scale
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                configuration.setLocale(locale)
-                configuration.setLayoutDirection(locale)
-                return context.createConfigurationContext(configuration)
+                setLocaleForApi24(configuration, locale)
             } else {
-                @Suppress("DEPRECATION")
-                configuration.locale = locale
-                configuration.setLayoutDirection(locale)
-                @Suppress("DEPRECATION")
-                resources.updateConfiguration(configuration, resources.displayMetrics)
-                return context
+                configuration.setLocale(locale)
             }
+            configuration.setLayoutDirection(locale)
+            return context.createConfigurationContext(configuration)
         } catch (e: Exception) {
             Timber.e(e, "## getLocalisedContext() failed")
         }
@@ -94,6 +83,20 @@ class VectorConfiguration @Inject constructor(private val context: Context) {
         return context
     }
 
+    @RequiresApi(Build.VERSION_CODES.N)
+    private fun setLocaleForApi24(config: Configuration, locale: Locale) {
+        val set: MutableSet<Locale> = LinkedHashSet()
+        // bring the user locale to the front of the list
+        set.add(locale)
+        val all = LocaleList.getDefault()
+        for (i in 0 until all.size()) {
+            // append other locales supported by the user
+            set.add(all[i])
+        }
+        val locales = set.toTypedArray()
+        config.setLocales(LocaleList(*locales))
+    }
+
     /**
      * Compute the locale status value
      * @return the local status value
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
index 41260b06c8..27ca636142 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
@@ -113,7 +113,7 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
         if (allGranted(grantResults)) {
             if (requestCode == PERMISSION_REQUEST_CODE_READ_CONTACTS) {
-                addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java)
+                doOnPostResume {  addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index fb8ef1f114..0a1b631344 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -69,17 +69,17 @@ class IncomingVerificationRequestHandler @Inject constructor(
                         R.drawable.ic_shield_black,
                         shouldBeDisplayedIn = { activity ->
                             if (activity is VectorBaseActivity) {
-                                // TODO a bit too hugly :/
+                                // TODO a bit too ugly :/
                                 activity.supportFragmentManager.findFragmentByTag(VerificationBottomSheet.WAITING_SELF_VERIF_TAG)?.let {
                                     false.also {
                                         popupAlertManager.cancelAlert(uid)
                                     }
                                 } ?: true
                             } else true
-                        })
+                        },
+                        matrixItem = session?.getUser(tx.otherUserId)?.toMatrixItem()
+                )
                         .apply {
-                            matrixItem = session?.getUser(tx.otherUserId)?.toMatrixItem()
-
                             contentAction = Runnable {
                                 (weakCurrentActivity?.get() as? VectorBaseActivity)?.let {
                                     it.navigator.performDeviceVerification(it, tx.otherUserId, tx.transactionId)
@@ -132,10 +132,10 @@ class IncomingVerificationRequestHandler @Inject constructor(
                                 it.roomId != pr.roomId
                             } ?: true
                         } else true
-                    })
+                    },
+                    matrixItem = session?.getUser(pr.otherUserId)?.toMatrixItem()
+            )
                     .apply {
-                        matrixItem = session?.getUser(pr.otherUserId)?.toMatrixItem()
-
                         contentAction = Runnable {
                             (weakCurrentActivity?.get() as? VectorBaseActivity)?.let {
                                 val roomId = pr.roomId
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt
index 953b20cb0c..ed3bdc5825 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt
@@ -53,7 +53,6 @@ class VerificationChooseMethodController @Inject constructor(
                 bottomSheetVerificationQrCodeItem {
                     id("qr")
                     data(state.qrCodeText)
-                    animate(false)
                 }
 
                 dividerItem {
@@ -85,7 +84,7 @@ class VerificationChooseMethodController @Inject constructor(
                 iconColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
                 listener { listener?.doVerifyBySas() }
             }
-        } else if (state.SASModeAvailable) {
+        } else if (state.sasModeAvailable) {
             bottomSheetVerificationActionItem {
                 id("openEmoji")
                 title(stringProvider.getString(R.string.verification_no_scan_emoji_title))
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
index c2e367d8d5..e309869479 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
@@ -39,7 +39,7 @@ data class VerificationChooseMethodViewState(
         val otherCanShowQrCode: Boolean = false,
         val otherCanScanQrCode: Boolean = false,
         val qrCodeText: String? = null,
-        val SASModeAvailable: Boolean = false,
+        val sasModeAvailable: Boolean = false,
         val isMe: Boolean = false,
         val canCrossSign: Boolean = false
 ) : MvRxState
@@ -74,7 +74,7 @@ class VerificationChooseMethodViewModel @AssistedInject constructor(
             copy(
                     otherCanShowQrCode = pvr?.otherCanShowQrCode().orFalse(),
                     otherCanScanQrCode = pvr?.otherCanScanQrCode().orFalse(),
-                    SASModeAvailable = pvr?.isSasSupported().orFalse()
+                    sasModeAvailable = pvr?.isSasSupported().orFalse()
             )
         }
     }
@@ -115,7 +115,7 @@ class VerificationChooseMethodViewModel @AssistedInject constructor(
                     otherCanShowQrCode = pvr?.otherCanShowQrCode().orFalse(),
                     otherCanScanQrCode = pvr?.otherCanScanQrCode().orFalse(),
                     qrCodeText = (qrCodeVerificationTransaction as? QrCodeVerificationTransaction)?.qrCodeText,
-                    SASModeAvailable = pvr?.isSasSupported().orFalse()
+                    sasModeAvailable = pvr?.isSasSupported().orFalse()
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
index 8d78c1c9d6..41c92fa76f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
@@ -32,12 +32,9 @@ abstract class BottomSheetVerificationQrCodeItem : VectorEpoxyModel<BottomSheetV
     @EpoxyAttribute
     lateinit var data: String
 
-    @EpoxyAttribute
-    var animate = false
-
     override fun bind(holder: Holder) {
         super.bind(holder)
-        holder.qsrCodeImage.setData(data, animate)
+        holder.qsrCodeImage.setData(data)
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
index 6e1b5a5f57..306d9bffd1 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt
@@ -23,19 +23,18 @@ import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import com.google.i18n.phonenumbers.PhoneNumberUtil
 import im.vector.app.R
 import im.vector.app.core.epoxy.attributes.ButtonStyle
 import im.vector.app.core.epoxy.attributes.ButtonType
 import im.vector.app.core.epoxy.attributes.IconMode
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.getFormattedValue
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.identity.SharedState
 import org.matrix.android.sdk.api.session.identity.ThreePid
-import timber.log.Timber
 import javax.inject.Inject
 import javax.net.ssl.HttpsURLConnection
 
@@ -235,16 +234,7 @@ class DiscoverySettingsController @Inject constructor(
     }
 
     private fun buildMsisdn(pidInfo: PidInfo) {
-        val phoneNumber = try {
-            PhoneNumberUtil.getInstance().parse("+${pidInfo.threePid.value}", null)
-        } catch (t: Throwable) {
-            Timber.e(t, "Unable to parse the phone number")
-            null
-        }
-                ?.let {
-                    PhoneNumberUtil.getInstance().format(it, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)
-                }
-                ?: pidInfo.threePid.value
+        val phoneNumber = pidInfo.threePid.getFormattedValue()
 
         buildThreePid(pidInfo, phoneNumber)
 
@@ -277,8 +267,8 @@ class DiscoverySettingsController @Inject constructor(
                         }
                     }
 
-                    override fun onCodeChange(code: String) {
-                        codes[pidInfo.threePid] = code
+                    override fun onTextChange(text: String) {
+                        codes[pidInfo.threePid] = text
                     }
                 })
             }
@@ -341,25 +331,22 @@ class DiscoverySettingsController @Inject constructor(
     private fun buildContinueCancel(threePid: ThreePid) {
         settingsContinueCancelItem {
             id("bottom${threePid.value}")
-            interactionListener(object : SettingsContinueCancelItem.Listener {
-                override fun onContinue() {
-                    when (threePid) {
-                        is ThreePid.Email  -> {
-                            listener?.checkEmailVerification(threePid)
-                        }
-                        is ThreePid.Msisdn -> {
-                            val code = codes[threePid]
-                            if (code != null) {
-                                listener?.sendMsisdnVerificationCode(threePid, code)
-                            }
+            continueOnClick {
+                when (threePid) {
+                    is ThreePid.Email  -> {
+                        listener?.checkEmailVerification(threePid)
+                    }
+                    is ThreePid.Msisdn -> {
+                        val code = codes[threePid]
+                        if (code != null) {
+                            listener?.sendMsisdnVerificationCode(threePid, code)
                         }
                     }
                 }
-
-                override fun onCancel() {
-                    listener?.cancelBinding(threePid)
-                }
-            })
+            }
+            cancelOnClick {
+                listener?.cancelBinding(threePid)
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt
index bb225f4ef4..c9ad23f1a9 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt
@@ -20,33 +20,28 @@ import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
 import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.onClick
 
 @EpoxyModelClass(layout = R.layout.item_settings_continue_cancel)
 abstract class SettingsContinueCancelItem : EpoxyModelWithHolder<SettingsContinueCancelItem.Holder>() {
 
     @EpoxyAttribute
-    var interactionListener: Listener? = null
+    var continueOnClick: ClickListener? = null
+
+    @EpoxyAttribute
+    var cancelOnClick: ClickListener? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
 
-        holder.cancelButton.setOnClickListener {
-            interactionListener?.onCancel()
-        }
-
-        holder.continueButton.setOnClickListener {
-            interactionListener?.onContinue()
-        }
+        holder.cancelButton.onClick(cancelOnClick)
+        holder.continueButton.onClick(continueOnClick)
     }
 
     class Holder : VectorEpoxyHolder() {
         val cancelButton by bind<Button>(R.id.settings_item_cancel_button)
         val continueButton by bind<Button>(R.id.settings_item_continue_button)
     }
-
-    interface Listener {
-        fun onContinue()
-        fun onCancel()
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
index 81d46373a2..ad139309ac 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt
@@ -27,19 +27,24 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.extensions.showKeyboard
 
 @EpoxyModelClass(layout = R.layout.item_settings_edit_text)
 abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.Holder>() {
 
+    @EpoxyAttribute var hint: String? = null
+    @EpoxyAttribute var value: String? = null
+    @EpoxyAttribute var requestFocus = false
     @EpoxyAttribute var descriptionText: String? = null
     @EpoxyAttribute var errorText: String? = null
     @EpoxyAttribute var inProgress: Boolean = false
+    @EpoxyAttribute var inputType: Int? = null
 
     @EpoxyAttribute
     var interactionListener: Listener? = null
 
-    private val textChangeListener: (text: CharSequence?, start: Int, count: Int, after: Int) -> Unit = { code, _, _, _ ->
-        code?.let { interactionListener?.onCodeChange(it.toString()) }
+    private val textChangeListener: (text: CharSequence?, start: Int, count: Int, after: Int) -> Unit = { text, _, _, _ ->
+        text?.let { interactionListener?.onTextChange(it.toString()) }
     }
 
     private val editorActionListener = object : TextView.OnEditorActionListener {
@@ -63,9 +68,17 @@ abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.
         } else {
             holder.textInputLayout.error = errorText
         }
+        holder.textInputLayout.hint = hint
+        inputType?.let { holder.editText.inputType = it }
 
         holder.editText.doOnTextChanged(textChangeListener)
         holder.editText.setOnEditorActionListener(editorActionListener)
+        if (value != null) {
+            holder.editText.setText(value)
+        }
+        if (requestFocus) {
+            holder.editText.showKeyboard(andRequestFocus = true)
+        }
     }
 
     class Holder : VectorEpoxyHolder() {
@@ -76,6 +89,6 @@ abstract class SettingsEditTextItem : EpoxyModelWithHolder<SettingsEditTextItem.
 
     interface Listener {
         fun onValidate()
-        fun onCodeChange(code: String)
+        fun onTextChange(text: String)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt
index 53bf7e64d6..3471a3ab56 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt
@@ -16,13 +16,13 @@
 package im.vector.app.features.discovery
 
 import android.view.View
-import android.widget.Switch
 import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
+import com.google.android.material.switchmaterial.SwitchMaterial
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.extensions.setTextOrHide
@@ -69,6 +69,6 @@ abstract class SettingsItem : EpoxyModelWithHolder<SettingsItem.Holder>() {
     class Holder : VectorEpoxyHolder() {
         val titleText by bind<TextView>(R.id.settings_item_title)
         val descriptionText by bind<TextView>(R.id.settings_item_description)
-        val switchButton by bind<Switch>(R.id.settings_item_switch)
+        val switchButton by bind<SwitchMaterial>(R.id.settings_item_switch)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt
index b7d9997d46..9f64a68d4f 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.discovery
 import android.widget.Button
 import android.widget.CompoundButton
 import android.widget.ProgressBar
-import android.widget.Switch
 import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
@@ -27,6 +26,7 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
+import com.google.android.material.switchmaterial.SwitchMaterial
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
@@ -160,7 +160,7 @@ abstract class SettingsTextButtonSingleLineItem : EpoxyModelWithHolder<SettingsT
     class Holder : VectorEpoxyHolder() {
         val textView by bind<TextView>(R.id.settings_item_text)
         val mainButton by bind<Button>(R.id.settings_item_button)
-        val switchButton by bind<Switch>(R.id.settings_item_switch)
+        val switchButton by bind<SwitchMaterial>(R.id.settings_item_switch)
         val progress by bind<ProgressBar>(R.id.settings_item_progress)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index f0c43228c1..12538d314a 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -17,6 +17,8 @@
 package im.vector.app.features.form
 
 import android.text.Editable
+import android.view.View
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.textfield.TextInputEditText
@@ -35,9 +37,18 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     @EpoxyAttribute
     var value: String? = null
 
+    @EpoxyAttribute
+    var showBottomSeparator: Boolean = true
+
+    @EpoxyAttribute
+    var errorMessage: String? = null
+
     @EpoxyAttribute
     var enabled: Boolean = true
 
+    @EpoxyAttribute
+    var inputType: Int? = null
+
     @EpoxyAttribute
     var onTextChange: ((String) -> Unit)? = null
 
@@ -51,14 +62,17 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         super.bind(holder)
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.hint = hint
+        holder.textInputLayout.error = errorMessage
 
-        // Update only if text is different
-        if (holder.textInputEditText.text.toString() != value) {
+        // Update only if text is different and value is not null
+        if (value != null && holder.textInputEditText.text.toString() != value) {
             holder.textInputEditText.setText(value)
         }
         holder.textInputEditText.isEnabled = enabled
+        inputType?.let { holder.textInputEditText.inputType = it }
 
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
+        holder.bottomSeparator.isVisible = showBottomSeparator
     }
 
     override fun shouldSaveViewState(): Boolean {
@@ -73,5 +87,6 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     class Holder : VectorEpoxyHolder() {
         val textInputLayout by bind<TextInputLayout>(R.id.formTextInputTextInputLayout)
         val textInputEditText by bind<TextInputEditText>(R.id.formTextInputTextInputEditText)
+        val bottomSeparator by bind<View>(R.id.formTextInputDivider)
     }
 }
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 f53fa77791..e15f1e90cb 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
@@ -34,6 +34,7 @@ import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.glide.GlideRequest
 import im.vector.app.core.glide.GlideRequests
 import im.vector.app.core.utils.getColorFromUserId
+import org.matrix.android.sdk.api.extensions.tryThis
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.api.util.MatrixItem
 import javax.inject.Inject
@@ -56,6 +57,11 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
                 DrawableImageViewTarget(imageView))
     }
 
+    fun clear(imageView: ImageView) {
+        // It can be called after recycler view is destroyed, just silently catch
+        tryThis { GlideApp.with(imageView).clear(imageView) }
+    }
+
     @UiThread
     fun render(matrixItem: MatrixItem, imageView: ImageView, glideRequests: GlideRequests) {
         render(imageView.context,
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 62ae0bfc2c..76de2daf54 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
@@ -50,11 +50,11 @@ import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
 import im.vector.app.push.fcm.FcmHelper
-import org.matrix.android.sdk.api.session.InitialSyncProgressService
-import org.matrix.android.sdk.api.util.MatrixItem
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.activity_home.*
 import kotlinx.android.synthetic.main.merge_overlay_waiting_view.*
+import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.util.MatrixItem
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -239,9 +239,9 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable, UnknownDeviceDet
                         uid = "upgradeSecurity",
                         title = getString(titleRes),
                         description = getString(descRes),
-                        iconId = R.drawable.ic_shield_warning
+                        iconId = R.drawable.ic_shield_warning,
+                        matrixItem = userItem
                 ).apply {
-                    matrixItem = userItem
                     colorInt = ContextCompat.getColor(this@HomeActivity, R.color.riotx_positive_accent)
                     contentAction = Runnable {
                         (weakCurrentActivity?.get() as? VectorBaseActivity)?.let {
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 7b8f1148c9..1c63d63ae0 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
@@ -46,10 +46,10 @@ import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.BannerState
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
+import kotlinx.android.synthetic.main.fragment_home_detail.*
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
-import kotlinx.android.synthetic.main.fragment_home_detail.*
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -151,9 +151,9 @@ class HomeDetailFragment @Inject constructor(
                         uid = uid,
                         title = getString(R.string.new_session),
                         description = getString(R.string.verify_this_session, newest.displayName ?: newest.deviceId ?: ""),
-                        iconId = R.drawable.ic_shield_warning
+                        iconId = R.drawable.ic_shield_warning,
+                        matrixItem = user
                 ).apply {
-                    matrixItem = user
                     colorInt = ContextCompat.getColor(requireActivity(), R.color.riotx_accent)
                     contentAction = Runnable {
                         (weakCurrentActivity?.get() as? VectorBaseActivity)
@@ -179,9 +179,9 @@ class HomeDetailFragment @Inject constructor(
                         uid = uid,
                         title = getString(R.string.review_logins),
                         description = getString(R.string.verify_other_sessions),
-                        iconId = R.drawable.ic_shield_warning
+                        iconId = R.drawable.ic_shield_warning,
+                        matrixItem = user
                 ).apply {
-                    matrixItem = user
                     colorInt = ContextCompat.getColor(requireActivity(), R.color.riotx_accent)
                     contentAction = Runnable {
                         (weakCurrentActivity?.get() as? VectorBaseActivity)?.let {
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 f287017b02..4bdf2e7e57 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
@@ -40,7 +40,7 @@ sealed class RoomDetailAction : VectorViewModelAction {
     data class UpdateQuickReactAction(val targetEventId: String, val selectedReaction: String, val add: Boolean) : RoomDetailAction()
     data class NavigateToEvent(val eventId: String, val highlight: Boolean) : RoomDetailAction()
     object MarkAllAsRead : RoomDetailAction()
-    data class DownloadOrOpen(val eventId: String, val messageFileContent: MessageWithAttachmentContent) : RoomDetailAction()
+    data class DownloadOrOpen(val eventId: String, val senderId: String?, val messageFileContent: MessageWithAttachmentContent) : RoomDetailAction()
     data class HandleTombstoneEvent(val event: Event) : RoomDetailAction()
     object AcceptInvite : RoomDetailAction()
     object RejectInvite : RoomDetailAction()
@@ -55,6 +55,7 @@ sealed class RoomDetailAction : VectorViewModelAction {
 
     data class ResendMessage(val eventId: String) : RoomDetailAction()
     data class RemoveFailedEcho(val eventId: String) : RoomDetailAction()
+    data class CancelSend(val eventId: String) : RoomDetailAction()
 
     data class ReplyToOptions(val eventId: String, val optionIndex: Int, val optionValue: String) : RoomDetailAction()
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
index aa608ef4ef..de82689303 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
@@ -77,16 +77,15 @@ class RoomDetailActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         waitingView = waiting_view
+        val roomDetailArgs: RoomDetailArgs? = if (intent?.action == ACTION_ROOM_DETAILS_FROM_SHORTCUT) {
+            RoomDetailArgs(roomId = intent?.extras?.getString(EXTRA_ROOM_ID)!!)
+        } else {
+            intent?.extras?.getParcelable(EXTRA_ROOM_DETAIL_ARGS)
+        }
+        if (roomDetailArgs == null) return
+        currentRoomId = roomDetailArgs.roomId
+
         if (isFirstCreation()) {
-            val roomDetailArgs: RoomDetailArgs? = if (intent?.action == ACTION_ROOM_DETAILS_FROM_SHORTCUT) {
-                RoomDetailArgs(roomId = intent?.extras?.getString(EXTRA_ROOM_ID)!!)
-            } else {
-                intent?.extras?.getParcelable(EXTRA_ROOM_DETAIL_ARGS)
-            }
-
-            if (roomDetailArgs == null) return
-
-            currentRoomId = roomDetailArgs.roomId
             replaceFragment(R.id.roomDetailContainer, RoomDetailFragment::class.java, roomDetailArgs)
             replaceFragment(R.id.roomDetailDrawerContainer, BreadcrumbsFragment::class.java)
         }
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 040a5191e4..7635c3042d 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
@@ -1423,7 +1423,7 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.ResumeVerification(informationData.eventId, null))
             }
             is MessageWithAttachmentContent      -> {
-                val action = RoomDetailAction.DownloadOrOpen(informationData.eventId, messageContent)
+                val action = RoomDetailAction.DownloadOrOpen(informationData.eventId, informationData.senderId, messageContent)
                 roomDetailViewModel.handle(action)
             }
             is EncryptedEventContent             -> {
@@ -1617,6 +1617,9 @@ class RoomDetailFragment @Inject constructor(
             is EventSharedAction.Remove                     -> {
                 roomDetailViewModel.handle(RoomDetailAction.RemoveFailedEcho(action.eventId))
             }
+            is EventSharedAction.Cancel                     -> {
+                roomDetailViewModel.handle(RoomDetailAction.CancelSend(action.eventId))
+            }
             is EventSharedAction.ReportContentSpam          -> {
                 roomDetailViewModel.handle(RoomDetailAction.ReportContent(
                         action.eventId, action.senderId, "This message is spam", spam = true))
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 4bad9c6ed0..eab0007080 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
@@ -57,11 +57,13 @@ import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.extensions.tryThis
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.isImageMessage
+import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -282,6 +284,7 @@ class RoomDetailViewModel @AssistedInject constructor(
             is RoomDetailAction.AddJitsiWidget                   -> handleAddJitsiConference(action)
             is RoomDetailAction.RemoveWidget                     -> handleDeleteWidget(action.widgetId)
             is RoomDetailAction.EnsureNativeWidgetAllowed        -> handleCheckWidgetAllowed(action)
+            is RoomDetailAction.CancelSend                       -> handleCancel(action)
         }.exhaustive
     }
 
@@ -989,8 +992,18 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     private fun handleOpenOrDownloadFile(action: RoomDetailAction.DownloadOrOpen) {
         val mxcUrl = action.messageFileContent.getFileUrl()
+        val isLocalSendingFile = action.senderId == session.myUserId
+                && mxcUrl?.startsWith("content://") ?: false
         val isDownloaded = mxcUrl?.let { session.fileService().isFileInCache(it, action.messageFileContent.mimeType) } ?: false
-        if (isDownloaded) {
+        if (isLocalSendingFile) {
+            tryThis { Uri.parse(mxcUrl) }?.let {
+                _viewEvents.post(RoomDetailViewEvents.OpenFile(
+                        action.messageFileContent.mimeType,
+                        it,
+                        null
+                ))
+            }
+        } else if (isDownloaded) {
             // we can open it
             session.fileService().getTemporarySharableURI(mxcUrl!!, action.messageFileContent.mimeType)?.let { uri ->
                 _viewEvents.post(RoomDetailViewEvents.OpenFile(
@@ -1051,9 +1064,9 @@ class RoomDetailViewModel @AssistedInject constructor(
                 return
             }
             when {
-                it.root.isTextMessage()  -> room.resendTextMessage(it)
-                it.root.isImageMessage() -> room.resendMediaMessage(it)
-                else                     -> {
+                it.root.isTextMessage()       -> room.resendTextMessage(it)
+                it.root.isAttachmentMessage() -> room.resendMediaMessage(it)
+                else                          -> {
                     // TODO
                 }
             }
@@ -1072,6 +1085,18 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleCancel(action: RoomDetailAction.CancelSend) {
+        val targetEventId = action.eventId
+        room.getTimeLineEvent(targetEventId)?.let {
+            // State must be in one of the sending states
+            if (!it.root.sendState.isSending()) {
+                Timber.e("Cannot cancel message, it is not sending")
+                return
+            }
+            room.cancelSend(targetEventId)
+        }
+    }
+
     private fun handleClearSendQueue() {
         room.clearSendingQueue()
     }
@@ -1194,6 +1219,8 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleReplyToOptions(action: RoomDetailAction.ReplyToOptions) {
+        // Do not allow to reply to unsent local echo
+        if (LocalEcho.isLocalEchoId(action.eventId)) return
         room.sendOptionsReply(action.eventId, action.optionIndex, action.optionValue)
     }
 
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 b51f41d573..a49b74c243 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
@@ -35,6 +35,7 @@ import im.vector.app.features.settings.VectorPreferences
 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
+import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
@@ -50,6 +51,7 @@ import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.hasBeenEdited
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
+import java.util.ArrayList
 
 /**
  * Information related to an event and used to display preview in contextual bottom sheet.
@@ -230,6 +232,9 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                     add(EventSharedAction.Resend(eventId))
                 }
                 add(EventSharedAction.Remove(eventId))
+                if (vectorPreferences.developerMode()) {
+                    addViewSourceItems(timelineEvent)
+                }
             } else if (timelineEvent.root.sendState.isSending()) {
                 // TODO is uploading attachment?
                 if (canCancel(timelineEvent)) {
@@ -298,13 +303,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                             add(EventSharedAction.ReRequestKey(timelineEvent.eventId))
                         }
                     }
-
-                    add(EventSharedAction.ViewSource(timelineEvent.root.toContentStringWithIndent()))
-                    if (timelineEvent.isEncrypted() && timelineEvent.root.mxDecryptionResult != null) {
-                        val decryptedContent = timelineEvent.root.toClearContentStringWithIndent()
-                                ?: stringProvider.getString(R.string.encryption_information_decryption_error)
-                        add(EventSharedAction.ViewDecryptedSource(decryptedContent))
-                    }
+                    addViewSourceItems(timelineEvent)
                 }
                 add(EventSharedAction.CopyPermalink(eventId))
                 if (session.myUserId != timelineEvent.root.senderId) {
@@ -320,8 +319,17 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
         }
     }
 
+    private fun ArrayList<EventSharedAction>.addViewSourceItems(timelineEvent: TimelineEvent) {
+        add(EventSharedAction.ViewSource(timelineEvent.root.toContentStringWithIndent()))
+        if (timelineEvent.isEncrypted() && timelineEvent.root.mxDecryptionResult != null) {
+            val decryptedContent = timelineEvent.root.toClearContentStringWithIndent()
+                    ?: stringProvider.getString(R.string.encryption_information_decryption_error)
+            add(EventSharedAction.ViewDecryptedSource(decryptedContent))
+        }
+    }
+
     private fun canCancel(@Suppress("UNUSED_PARAMETER") event: TimelineEvent): Boolean {
-        return false
+        return true
     }
 
     private fun canReply(event: TimelineEvent, messageContent: MessageContent?, actionPermissions: ActionPermissions): Boolean {
@@ -365,7 +373,9 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun canRetry(event: TimelineEvent, actionPermissions: ActionPermissions): Boolean {
-        return event.root.sendState.hasFailed() && event.root.isTextMessage() && actionPermissions.canSendMessage
+        return event.root.sendState.hasFailed()
+                && actionPermissions.canSendMessage
+                && (event.root.isAttachmentMessage() || event.root.isTextMessage())
     }
 
     private fun canViewReactions(event: TimelineEvent): Boolean {
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 cce3248551..97bc693f26 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
@@ -187,10 +187,18 @@ class MessageItemFactory @Inject constructor(
                                       informationData: MessageInformationData,
                                       highlight: Boolean,
                                       attributes: AbsMessageItem.Attributes): MessageFileItem? {
+        val fileUrl = messageContent.getFileUrl()?.let {
+            if (informationData.sentByMe && !informationData.sendState.isSent()) {
+                it
+            } else {
+                it.takeIf { it.startsWith("mxc://") }
+            }
+        } ?: ""
         return MessageFileItem_()
                 .attributes(attributes)
-                .izLocalFile(messageContent.getFileUrl().isLocalFile())
-                .mxcUrl(messageContent.getFileUrl() ?: "")
+                .izLocalFile(fileUrl.isLocalFile())
+                .izDownloaded(session.fileService().isFileInCache(fileUrl, messageContent.mimeType))
+                .mxcUrl(fileUrl)
                 .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
                 .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder)
                 .highlighted(highlight)
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 bf333b0417..cb9f583a2a 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
@@ -20,15 +20,17 @@ import im.vector.app.EmojiCompatWrapper
 import im.vector.app.R
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
+import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageOptionsContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_BUTTONS
 import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
 import org.matrix.android.sdk.api.session.room.timeline.isReply
-import me.gujun.android.span.span
 import javax.inject.Inject
 
 class DisplayableEventFormatter @Inject constructor(
@@ -51,16 +53,16 @@ class DisplayableEventFormatter @Inject constructor(
         val senderName = timelineEvent.senderInfo.disambiguatedDisplayName
 
         when (timelineEvent.root.getClearType()) {
-            EventType.STICKER  -> {
+            EventType.STICKER         -> {
                 return simpleFormat(senderName, stringProvider.getString(R.string.send_a_sticker), appendAuthor)
             }
-            EventType.REACTION -> {
+            EventType.REACTION        -> {
                 timelineEvent.root.getClearContent().toModel<ReactionContent>()?.relatesTo?.let {
-                    val emojiSpanned = emojiCompatWrapper.safeEmojiSpanify(it.key)
+                    val emojiSpanned = emojiCompatWrapper.safeEmojiSpanify(stringProvider.getString(R.string.sent_a_reaction, it.key))
                     return simpleFormat(senderName, emojiSpanned, appendAuthor)
                 }
             }
-            EventType.MESSAGE  -> {
+            EventType.MESSAGE         -> {
                 timelineEvent.getLastMessageContent()?.let { messageContent ->
                     when (messageContent.msgType) {
                         MessageType.MSGTYPE_VERIFICATION_REQUEST -> {
@@ -88,13 +90,45 @@ class DisplayableEventFormatter @Inject constructor(
                                 simpleFormat(senderName, messageContent.body, appendAuthor)
                             }
                         }
+                        MessageType.MSGTYPE_RESPONSE             -> {
+                            // do not show that?
+                            return span { }
+                        }
+                        MessageType.MSGTYPE_OPTIONS              -> {
+                            return when (messageContent) {
+                                is MessageOptionsContent -> {
+                                    val previewText = if (messageContent.optionType == OPTION_TYPE_BUTTONS) {
+                                        stringProvider.getString(R.string.sent_a_bot_buttons)
+                                    } else {
+                                        stringProvider.getString(R.string.sent_a_poll)
+                                    }
+                                    simpleFormat(senderName, previewText, appendAuthor)
+                                }
+                                else                     -> {
+                                    span { }
+                                }
+                            }
+                        }
                         else                                     -> {
                             return simpleFormat(senderName, messageContent.body, appendAuthor)
                         }
                     }
                 }
             }
-            else               -> {
+            EventType.KEY_VERIFICATION_CANCEL,
+            EventType.KEY_VERIFICATION_DONE -> {
+                // cancel and done can appear in timeline, so should have representation
+                return simpleFormat(senderName, stringProvider.getString(R.string.sent_verification_conclusion), appendAuthor)
+            }
+            EventType.KEY_VERIFICATION_START,
+            EventType.KEY_VERIFICATION_ACCEPT,
+            EventType.KEY_VERIFICATION_MAC,
+            EventType.KEY_VERIFICATION_KEY,
+            EventType.KEY_VERIFICATION_READY,
+            EventType.CALL_CANDIDATES -> {
+                return span { }
+            }
+            else                      -> {
                 return span {
                     text = noticeEventFormatter.format(timelineEvent) ?: ""
                     textStyle = "italic"
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
index f149b440e0..8216d36ac9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
@@ -75,9 +75,9 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
             is ContentUploadStateTracker.State.Idle                -> handleIdle()
             is ContentUploadStateTracker.State.EncryptingThumbnail -> handleEncryptingThumbnail()
             is ContentUploadStateTracker.State.UploadingThumbnail  -> handleProgressThumbnail(state)
-            is ContentUploadStateTracker.State.Encrypting          -> handleEncrypting()
+            is ContentUploadStateTracker.State.Encrypting          -> handleEncrypting(state)
             is ContentUploadStateTracker.State.Uploading           -> handleProgress(state)
-            is ContentUploadStateTracker.State.Failure             -> handleFailure(state)
+            is ContentUploadStateTracker.State.Failure             -> handleFailure(/*state*/)
             is ContentUploadStateTracker.State.Success             -> handleSuccess()
         }
     }
@@ -98,26 +98,29 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
     }
 
     private fun handleEncryptingThumbnail() {
-        doHandleEncrypting(R.string.send_file_step_encrypting_thumbnail)
+        doHandleEncrypting(R.string.send_file_step_encrypting_thumbnail, 0, 0)
     }
 
     private fun handleProgressThumbnail(state: ContentUploadStateTracker.State.UploadingThumbnail) {
         doHandleProgress(R.string.send_file_step_sending_thumbnail, state.current, state.total)
     }
 
-    private fun handleEncrypting() {
-        doHandleEncrypting(R.string.send_file_step_encrypting_file)
+    private fun handleEncrypting(state: ContentUploadStateTracker.State.Encrypting) {
+        doHandleEncrypting(R.string.send_file_step_encrypting_file, state.current, state.total)
     }
 
     private fun handleProgress(state: ContentUploadStateTracker.State.Uploading) {
         doHandleProgress(R.string.send_file_step_sending_file, state.current, state.total)
     }
 
-    private fun doHandleEncrypting(resId: Int) {
+    private fun doHandleEncrypting(resId: Int, current: Long, total: Long) {
         progressLayout.visibility = View.VISIBLE
+        val percent = if (total > 0) (100L * (current.toFloat() / total.toFloat())) else 0f
         val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
         val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView)
-        progressBar?.isIndeterminate = true
+        progressBar?.isIndeterminate = false
+        progressBar?.progress = percent.toInt()
+        progressTextView.isVisible = true
         progressTextView?.text = progressLayout.context.getString(resId)
         progressTextView?.setTextColor(messageColorProvider.getMessageTextColor(SendState.ENCRYPTING))
     }
@@ -130,19 +133,23 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
         progressBar?.isVisible = true
         progressBar?.isIndeterminate = false
         progressBar?.progress = percent.toInt()
+        progressTextView.isVisible = true
         progressTextView?.text = progressLayout.context.getString(resId,
                 TextUtils.formatFileSize(progressLayout.context, current, true),
                 TextUtils.formatFileSize(progressLayout.context, total, true))
         progressTextView?.setTextColor(messageColorProvider.getMessageTextColor(SendState.SENDING))
     }
 
-    private fun handleFailure(state: ContentUploadStateTracker.State.Failure) {
+    private fun handleFailure(/*state: ContentUploadStateTracker.State.Failure*/) {
         progressLayout.visibility = View.VISIBLE
         val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
         val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView)
         progressBar?.isVisible = false
-        progressTextView?.text = errorFormatter.toHumanReadable(state.throwable)
-        progressTextView?.setTextColor(messageColorProvider.getMessageTextColor(SendState.UNDELIVERED))
+        // Do not show the message it's too technical for users, and unfortunate when upload is cancelled
+        // in the middle by turning airplane mode for example
+        progressTextView.isVisible = false
+//        progressTextView?.text = errorFormatter.toHumanReadable(state.throwable)
+//        progressTextView?.setTextColor(messageColorProvider.getMessageTextColor(SendState.UNDELIVERED))
     }
 
     private fun handleSuccess() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
index 1aec2db9a4..631cd9ff66 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
@@ -110,7 +110,7 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder> : BaseEventItem
 
     override fun unbind(holder: H) {
         holder.reactionsContainer.setOnLongClickListener(null)
-        holder.readReceiptsView.unbind()
+        holder.readReceiptsView.unbind(baseAttributes.avatarRenderer)
         super.unbind(holder)
     }
 
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 fa216c15a4..7c2a6286b9 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
@@ -77,6 +77,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
     }
 
     override fun unbind(holder: H) {
+        attributes.avatarRenderer.clear(holder.avatarImageView)
         holder.avatarImageView.setOnClickListener(null)
         holder.avatarImageView.setOnLongClickListener(null)
         holder.memberNameView.setOnClickListener(null)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
index e82c4191b9..8cd3c95141 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
@@ -44,6 +44,12 @@ abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
         holder.readReceiptsView.render(attributes.informationData.readReceipts, attributes.avatarRenderer, _readReceiptsClickListener)
     }
 
+    override fun unbind(holder: Holder) {
+        attributes.avatarRenderer.clear(holder.avatarImageView)
+        holder.readReceiptsView.unbind(attributes.avatarRenderer)
+        super.unbind(holder)
+    }
+
     override fun getEventIds(): List<String> {
         return listOf(attributes.informationData.eventId)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
index b215fa5dd5..5160a7cd84 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
@@ -28,6 +28,7 @@ import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import org.matrix.android.sdk.api.session.room.send.SendState
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
@@ -86,6 +87,13 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
         holder.fileImageWrapper.setOnClickListener(attributes.itemClickListener)
         holder.fileImageWrapper.setOnLongClickListener(attributes.itemLongClickListener)
         holder.filenameView.paintFlags = (holder.filenameView.paintFlags or Paint.UNDERLINE_TEXT_FLAG)
+
+        holder.eventSendingIndicator.isVisible = when (attributes.informationData.sendState) {
+            SendState.UNSENT,
+            SendState.ENCRYPTING,
+            SendState.SENDING -> true
+            else              -> false
+        }
     }
 
     override fun unbind(holder: Holder) {
@@ -103,6 +111,7 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
         val fileImageWrapper by bind<ViewGroup>(R.id.messageFileImageView)
         val fileDownloadProgress by bind<ProgressBar>(R.id.messageFileProgressbar)
         val filenameView by bind<TextView>(R.id.messageFilenameView)
+        val eventSendingIndicator by bind<ProgressBar>(R.id.eventSendingIndicator)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
index e8a840918f..9ada087207 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.home.room.detail.timeline.item
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.ProgressBar
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
@@ -27,6 +28,7 @@ import im.vector.app.R
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
 import im.vector.app.features.media.ImageContentRenderer
+import org.matrix.android.sdk.api.session.room.send.SendState
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Holder>() {
@@ -60,10 +62,18 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
         // The sending state color will be apply to the progress text
         renderSendState(holder.imageView, null, holder.failedToSendIndicator)
         holder.playContentView.visibility = if (playable) View.VISIBLE else View.GONE
+
+        holder.eventSendingIndicator.isVisible = when (attributes.informationData.sendState) {
+            SendState.UNSENT,
+            SendState.ENCRYPTING,
+            SendState.SENDING -> true
+            else              -> false
+        }
     }
 
     override fun unbind(holder: Holder) {
         GlideApp.with(holder.view.context.applicationContext).clear(holder.imageView)
+        imageContentRenderer.clear(holder.imageView)
         contentUploadStateTrackerBinder.unbind(attributes.informationData.eventId)
         holder.imageView.setOnClickListener(null)
         holder.imageView.setOnLongClickListener(null)
@@ -79,6 +89,7 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
 
         val mediaContentView by bind<ViewGroup>(R.id.messageContentMedia)
         val failedToSendIndicator by bind<ImageView>(R.id.messageFailToSendIndicator)
+        val eventSendingIndicator by bind<ProgressBar>(R.id.eventSendingIndicator)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt
index 8bc0e7d478..9d500b99b0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt
@@ -75,6 +75,8 @@ abstract class MessagePollItem : AbsMessageItem<MessagePollItem.Holder>() {
             optionsContent?.options?.forEachIndexed { index, item ->
                 if (index < buttons.size) {
                     buttons[index].let {
+                        // current limitation, have to wait for event to be sent in order to reply
+                        it.isEnabled = informationData?.sendState?.isSent() ?: false
                         it.text = item.label
                         it.isVisible = true
                     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
index 7205ea278b..34ee8c69fa 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
@@ -60,6 +60,12 @@ abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>() {
         }
     }
 
+    override fun unbind(holder: Holder) {
+        attributes.avatarRenderer.clear(holder.avatarImageView)
+        holder.readReceiptsView.unbind(attributes.avatarRenderer)
+        super.unbind(holder)
+    }
+
     override fun getEventIds(): List<String> {
         return listOf(attributes.informationData.eventId)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
index ce572ed96d..4cac11af21 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
@@ -82,6 +82,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
     override fun unbind(holder: Holder) {
         holder.rootView.setOnClickListener(null)
         holder.rootView.setOnLongClickListener(null)
+        avatarRenderer.clear(holder.avatarImageView)
         super.unbind(holder)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt b/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
index 362c8279e1..72e337b48f 100644
--- a/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
@@ -17,6 +17,7 @@ package im.vector.app.features.html
 
 import android.graphics.Color
 import android.text.style.ForegroundColorSpan
+import android.text.style.BackgroundColorSpan
 import io.noties.markwon.MarkwonConfiguration
 import io.noties.markwon.RenderProps
 import io.noties.markwon.html.HtmlTag
@@ -30,16 +31,26 @@ class FontTagHandler : SimpleTagHandler() {
     override fun supportedTags() = listOf("font")
 
     override fun getSpans(configuration: MarkwonConfiguration, renderProps: RenderProps, tag: HtmlTag): Any? {
-        val colorString = tag.attributes()["color"]?.let { parseColor(it) } ?: Color.BLACK
-        return ForegroundColorSpan(colorString)
+        val mxColorString = tag.attributes()["data-mx-color"]
+        val colorString = tag.attributes()["color"]
+        val mxBgColorString = tag.attributes()["data-mx-bg-color"]
+
+        val foregroundColor = mxColorString?.let { parseColor(it, Color.BLACK) } ?: colorString?.let { parseColor(it, Color.BLACK) } ?: Color.BLACK
+
+        if (mxBgColorString != null) {
+            val backgroundColor = parseColor(mxBgColorString, Color.TRANSPARENT)
+            return arrayOf(ForegroundColorSpan(foregroundColor), BackgroundColorSpan(backgroundColor))
+        } else {
+            return ForegroundColorSpan(foregroundColor)
+        }
     }
 
-    private fun parseColor(color_name: String): Int {
+    private fun parseColor(colorName: String, failResult: Int): Int {
         try {
-            return Color.parseColor(color_name)
+            return Color.parseColor(colorName)
         } catch (e: Exception) {
             // try other w3c colors?
-            return when (color_name) {
+            return when (colorName) {
                 "white"   -> Color.WHITE
                 "yellow"  -> Color.YELLOW
                 "fuchsia" -> Color.parseColor("#FF00FF")
@@ -56,7 +67,7 @@ class FontTagHandler : SimpleTagHandler() {
                 "blue"    -> Color.BLUE
                 "orange"  -> Color.parseColor("#FFA500")
                 "navy"    -> Color.parseColor("#000080")
-                else      -> Color.BLACK
+                else      -> failResult
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
index 096579091f..b4f0aabea5 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
@@ -45,9 +45,9 @@ import im.vector.app.features.userdirectory.UserDirectoryFragment
 import im.vector.app.features.userdirectory.UserDirectorySharedAction
 import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel
 import im.vector.app.features.userdirectory.UserDirectoryViewModel
-import org.matrix.android.sdk.api.failure.Failure
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.activity.*
+import org.matrix.android.sdk.api.failure.Failure
 import java.net.HttpURLConnection
 import javax.inject.Inject
 
@@ -114,7 +114,7 @@ class InviteUsersToRoomActivity : SimpleFragmentActivity() {
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
         if (allGranted(grantResults)) {
             if (requestCode == PERMISSION_REQUEST_CODE_READ_CONTACTS) {
-                addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java)
+                doOnPostResume {  addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
index 71a372f039..78cf2d9a62 100644
--- a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
@@ -24,10 +24,15 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.toast
 import im.vector.app.features.login.LoginActivity
 import im.vector.app.features.login.LoginConfig
+import im.vector.app.features.permalink.PermalinkHandler
+import io.reactivex.android.schedulers.AndroidSchedulers
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 /**
@@ -37,6 +42,7 @@ class LinkHandlerActivity : VectorBaseActivity() {
 
     @Inject lateinit var sessionHolder: ActiveSessionHolder
     @Inject lateinit var errorFormatter: ErrorFormatter
+    @Inject lateinit var permalinkHandler: PermalinkHandler
 
     override fun injectWith(injector: ScreenComponent) {
         injector.inject(this)
@@ -54,20 +60,66 @@ class LinkHandlerActivity : VectorBaseActivity() {
             return
         }
 
-        if (uri.path == PATH_CONFIG) {
-            if (sessionHolder.hasActiveSession()) {
-                displayAlreadyLoginPopup(uri)
-            } else {
-                // user is not yet logged in, this is the nominal case
-                startLoginActivity(uri)
-            }
+        if (uri.getQueryParameter(LoginConfig.CONFIG_HS_PARAMETER) != null) {
+            handleConfigUrl(uri)
+        } else if (SUPPORTED_HOSTS.contains(uri.host)) {
+            handleSupportedHostUrl(uri)
         } else {
-            // Other link are not yet handled, but should not comes here (manifest configuration error?)
-            Timber.w("Unable to handle this uir: $uri")
+            // Other links are not yet handled, but should not come here (manifest configuration error?)
+            toast(R.string.universal_link_malformed)
             finish()
         }
     }
 
+    private fun handleConfigUrl(uri: Uri) {
+        if (sessionHolder.hasActiveSession()) {
+            displayAlreadyLoginPopup(uri)
+        } else {
+            // user is not yet logged in, this is the nominal case
+            startLoginActivity(uri)
+        }
+    }
+
+    private fun handleSupportedHostUrl(uri: Uri) {
+        if (!sessionHolder.hasActiveSession()) {
+            startLoginActivity(uri)
+            finish()
+        } else {
+            convertUriToPermalink(uri)?.let { permalink ->
+                startPermalinkHandler(permalink)
+            } ?: run {
+                // Host is correct but we do not recognize path
+                Timber.w("Unable to handle this uri: $uri")
+                finish()
+            }
+        }
+    }
+
+    /**
+     * Convert a URL of element web instance to a matrix.to url
+     * Examples:
+     * - https://riot.im/develop/#/room/#element-android:matrix.org ->  https://matrix.to/#/#element-android:matrix.org
+     * - https://app.element.io/#/room/#element-android:matrix.org  ->  https://matrix.to/#/#element-android:matrix.org
+     */
+    private fun convertUriToPermalink(uri: Uri): String? {
+        val uriString = uri.toString()
+        val path = SUPPORTED_PATHS.find { it in uriString } ?: return null
+        return PermalinkService.MATRIX_TO_URL_BASE + uriString.substringAfter(path)
+    }
+
+    private fun startPermalinkHandler(permalink: String) {
+        permalinkHandler.launch(this, permalink, buildTask = true)
+                .delay(500, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { isHandled ->
+                    if (!isHandled) {
+                        toast(R.string.universal_link_malformed)
+                    }
+                    finish()
+                }
+                .disposeOnDestroy()
+    }
+
     /**
      * Start the login screen with identity server and home server pre-filled
      */
@@ -113,6 +165,19 @@ class LinkHandlerActivity : VectorBaseActivity() {
     }
 
     companion object {
-        private const val PATH_CONFIG = "/config/config"
+        private val SUPPORTED_HOSTS = listOf(
+                // Regular Element Web instance
+                "app.element.io",
+                // Other known instances of Element Web
+                "develop.element.io",
+                "staging.element.io",
+                // Previous Web instance, kept for compatibility reason
+                "riot.im"
+        )
+        private val SUPPORTED_PATHS = listOf(
+                "/#/room/",
+                "/#/user/",
+                "/#/group/"
+        )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginConfig.kt b/vector/src/main/java/im/vector/app/features/login/LoginConfig.kt
index 701335af6b..47ce99754f 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginConfig.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginConfig.kt
@@ -22,7 +22,7 @@ import kotlinx.android.parcel.Parcelize
 
 /**
  * Parameters extracted from a configuration url
- * Ex: https://riot.im/config/config?hs_url=https%3A%2F%2Fexample.modular.im&is_url=https%3A%2F%2Fcustom.identity.org
+ * Ex: https://mobile.element.io?hs_url=https%3A%2F%2Fexample.modular.im&is_url=https%3A%2F%2Fcustom.identity.org
  *
  * Note: On RiotX, identityServerUrl will never be used, so is declared private. Keep it for compatibility reason.
  */
@@ -33,10 +33,13 @@ data class LoginConfig(
 ) : Parcelable {
 
     companion object {
+        const val CONFIG_HS_PARAMETER = "hs_url"
+        private const val CONFIG_IS_PARAMETER = "is_url"
+
         fun parse(from: Uri): LoginConfig {
             return LoginConfig(
-                    homeServerUrl = from.getQueryParameter("hs_url"),
-                    identityServerUrl = from.getQueryParameter("is_url")
+                    homeServerUrl = from.getQueryParameter(CONFIG_HS_PARAMETER),
+                    identityServerUrl = from.getQueryParameter(CONFIG_IS_PARAMETER)
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index 93f8f7a45c..aed186bcd6 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -522,6 +522,13 @@ class LoginViewModel @AssistedInject constructor(
                 when (data) {
                     is WellknownResult.Prompt          ->
                         onWellknownSuccess(action, data, homeServerConnectionConfig)
+                    is WellknownResult.FailPrompt      ->
+                        // Relax on IS discovery if home server is valid
+                        if (data.homeServerUrl != null && data.wellKnown != null) {
+                            onWellknownSuccess(action, WellknownResult.Prompt(data.homeServerUrl!!, null, data.wellKnown!!), homeServerConnectionConfig)
+                        } else {
+                            onWellKnownError()
+                        }
                     is WellknownResult.InvalidMatrixId -> {
                         setState {
                             copy(
@@ -531,12 +538,7 @@ class LoginViewModel @AssistedInject constructor(
                         _viewEvents.post(LoginViewEvents.Failure(Exception(stringProvider.getString(R.string.login_signin_matrix_id_error_invalid_matrix_id))))
                     }
                     else                               -> {
-                        setState {
-                            copy(
-                                    asyncLoginAction = Uninitialized
-                            )
-                        }
-                        _viewEvents.post(LoginViewEvents.Failure(Exception(stringProvider.getString(R.string.autodiscover_well_known_error))))
+                        onWellKnownError()
                     }
                 }.exhaustive
             }
@@ -547,6 +549,15 @@ class LoginViewModel @AssistedInject constructor(
         })
     }
 
+    private fun onWellKnownError() {
+        setState {
+            copy(
+                    asyncLoginAction = Uninitialized
+            )
+        }
+        _viewEvents.post(LoginViewEvents.Failure(Exception(stringProvider.getString(R.string.autodiscover_well_known_error))))
+    }
+
     private fun onWellknownSuccess(action: LoginAction.LoginOrRegister,
                                    wellKnownPrompt: WellknownResult.Prompt,
                                    homeServerConnectionConfig: HomeServerConnectionConfig?) {
diff --git a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
index 966ee985f0..3846e56ecf 100644
--- a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
@@ -101,11 +101,7 @@ abstract class BaseAttachmentProvider(val imageContentRenderer: ImageContentRend
 
     override fun loadVideo(target: VideoLoaderTarget, info: AttachmentInfo.Video) {
         val data = info.data as? VideoContentRenderer.Data ?: return
-//        videoContentRenderer.render(data,
-//                holder.thumbnailImage,
-//                holder.loaderProgressBar,
-//                holder.videoView,
-//                holder.errorTextView)
+
         imageContentRenderer.render(data.thumbnailMediaData, target.contextView(), object : CustomViewTarget<ImageView, Drawable>(target.contextView()) {
             override fun onLoadFailed(errorDrawable: Drawable?) {
                 target.onThumbnailLoadFailed(info.uid, errorDrawable)
@@ -120,24 +116,28 @@ abstract class BaseAttachmentProvider(val imageContentRenderer: ImageContentRend
             }
         })
 
-        target.onVideoFileLoading(info.uid)
-        fileService.downloadFile(
-                downloadMode = FileService.DownloadMode.FOR_INTERNAL_USE,
-                id = data.eventId,
-                mimeType = data.mimeType,
-                elementToDecrypt = data.elementToDecrypt,
-                fileName = data.filename,
-                url = data.url,
-                callback = object : MatrixCallback<File> {
-                    override fun onSuccess(data: File) {
-                        target.onVideoFileReady(info.uid, data)
-                    }
+        if (data.url?.startsWith("content://") == true && data.allowNonMxcUrls) {
+            target.onVideoURLReady(info.uid, data.url)
+        } else {
+            target.onVideoFileLoading(info.uid)
+            fileService.downloadFile(
+                    downloadMode = FileService.DownloadMode.FOR_INTERNAL_USE,
+                    id = data.eventId,
+                    mimeType = data.mimeType,
+                    elementToDecrypt = data.elementToDecrypt,
+                    fileName = data.filename,
+                    url = data.url,
+                    callback = object : MatrixCallback<File> {
+                        override fun onSuccess(data: File) {
+                            target.onVideoFileReady(info.uid, data)
+                        }
 
-                    override fun onFailure(failure: Throwable) {
-                        target.onVideoFileLoadFailed(info.uid)
+                        override fun onFailure(failure: Throwable) {
+                            target.onVideoFileLoadFailed(info.uid)
+                        }
                     }
-                }
-        )
+            )
+        }
     }
 
     override fun clear(id: String) {
diff --git a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
index 9d0a931a32..c619b4aa92 100644
--- a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
@@ -144,9 +144,7 @@ class BigImageViewerActivity : VectorBaseActivity() {
                             .get(MultiPicker.IMAGE)
                             .getSelectedFiles(this, requestCode, resultCode, data)
                             .firstOrNull()?.let {
-                                // TODO. UCrop library cannot read from Gallery. For now, we will set avatar as it is.
-                                // onRoomAvatarSelected(it)
-                                onAvatarCropped(it.contentUri)
+                                onRoomAvatarSelected(it)
                             }
                 }
                 UCrop.REQUEST_CROP                  -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
diff --git a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
index 2976f4b4b1..5c43b25d51 100644
--- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
@@ -39,6 +39,7 @@ import im.vector.app.core.utils.isLocalFile
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 import kotlinx.android.parcel.Parcelize
+import org.matrix.android.sdk.api.extensions.tryThis
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
@@ -50,6 +51,8 @@ interface AttachmentData : Parcelable {
     val mimeType: String?
     val url: String?
     val elementToDecrypt: ElementToDecrypt?
+    // If true will load non mxc url, be careful to set it only for attachments sent by you
+    val allowNonMxcUrls: Boolean
 }
 
 class ImageContentRenderer @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
@@ -65,7 +68,9 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
             val height: Int?,
             val maxHeight: Int,
             val width: Int?,
-            val maxWidth: Int
+            val maxWidth: Int,
+            // If true will load non mxc url, be careful to set it only for images sent by you
+            override val allowNonMxcUrls: Boolean = false
     ) : AttachmentData {
 
         fun isLocalFile() = url.isLocalFile()
@@ -103,6 +108,15 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
                 .into(imageView)
     }
 
+    fun clear(imageView: ImageView) {
+        // It can be called after recycler view is destroyed, just silently catch
+        // We'd better keep ref to requestManager, but we don't have it
+        tryThis {
+            GlideApp
+                    .with(imageView).clear(imageView)
+        }
+    }
+
     fun render(data: Data, contextView: View, target: CustomViewTarget<*, Drawable>) {
         val req = if (data.elementToDecrypt != null) {
             // Encrypted image
@@ -111,7 +125,7 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
                     .load(data)
         } else {
             // Clear image
-            val resolvedUrl = activeSessionHolder.getActiveSession().contentUrlResolver().resolveFullSize(data.url)
+            val resolvedUrl = resolveUrl(data)
             GlideApp
                     .with(contextView)
                     .load(resolvedUrl)
@@ -165,7 +179,7 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
                     .load(data)
         } else {
             // Clear image
-            val resolvedUrl = activeSessionHolder.getActiveSession().contentUrlResolver().resolveFullSize(data.url)
+            val resolvedUrl = resolveUrl(data)
             GlideApp
                     .with(imageView)
                     .load(resolvedUrl)
@@ -205,7 +219,7 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
             val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
             val resolvedUrl = when (mode) {
                 Mode.FULL_SIZE,
-                Mode.STICKER   -> contentUrlResolver.resolveFullSize(data.url)
+                Mode.STICKER   -> resolveUrl(data)
                 Mode.THUMBNAIL -> contentUrlResolver.resolveThumbnail(data.url, size.width, size.height, ContentUrlResolver.ThumbnailMethod.SCALE)
             }
             // Fallback to base url
@@ -219,7 +233,7 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
                             error(
                                     GlideApp
                                             .with(imageView)
-                                            .load(contentUrlResolver.resolveFullSize(data.url))
+                                            .load(resolveUrl(data))
                             )
                         }
                     }
@@ -232,7 +246,7 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
 
         val (width, height) = processSize(data, Mode.THUMBNAIL)
         val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
-        val fullSize = contentUrlResolver.resolveFullSize(data.url)
+        val fullSize = resolveUrl(data)
         val thumbnail = contentUrlResolver.resolveThumbnail(data.url, width, height, ContentUrlResolver.ThumbnailMethod.SCALE)
 
         if (fullSize.isNullOrBlank() || thumbnail.isNullOrBlank()) {
@@ -252,6 +266,10 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
         )
     }
 
+    private fun resolveUrl(data: Data) =
+            (activeSessionHolder.getActiveSession().contentUrlResolver().resolveFullSize(data.url)
+                    ?: data.url?.takeIf { data.isLocalFile() && data.allowNonMxcUrls })
+
     private fun processSize(data: Data, mode: Mode): Size {
         val maxImageWidth = data.maxWidth
         val maxImageHeight = data.maxHeight
diff --git a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
index b4fa38eefc..e5f0f481bf 100644
--- a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
@@ -63,7 +63,9 @@ class RoomEventsAttachmentProvider(
                         maxHeight = -1,
                         maxWidth = -1,
                         width = null,
-                        height = null
+                        height = null,
+                        allowNonMxcUrls = it.root.sendState.isSending()
+
                 )
                 if (content.mimeType == "image/gif") {
                     AttachmentInfo.AnimatedImage(
@@ -89,7 +91,8 @@ class RoomEventsAttachmentProvider(
                         height = content.videoInfo?.height,
                         maxHeight = -1,
                         width = content.videoInfo?.width,
-                        maxWidth = -1
+                        maxWidth = -1,
+                        allowNonMxcUrls = it.root.sendState.isSending()
                 )
                 val data = VideoContentRenderer.Data(
                         eventId = it.eventId,
@@ -97,7 +100,8 @@ class RoomEventsAttachmentProvider(
                         mimeType = content.mimeType,
                         url = content.getFileUrl(),
                         elementToDecrypt = content.encryptedFileInfo?.toElementToDecrypt(),
-                        thumbnailMediaData = thumbnailData
+                        thumbnailMediaData = thumbnailData,
+                        allowNonMxcUrls = it.root.sendState.isSending()
                 )
                 AttachmentInfo.Video(
                         uid = it.eventId,
diff --git a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
index 45fc238e93..4eb14592e0 100644
--- a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
@@ -24,12 +24,14 @@ import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.utils.isLocalFile
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 import kotlinx.android.parcel.Parcelize
 import timber.log.Timber
 import java.io.File
+import java.net.URLEncoder
 import javax.inject.Inject
 
 class VideoContentRenderer @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
@@ -42,7 +44,9 @@ class VideoContentRenderer @Inject constructor(private val activeSessionHolder:
             override val mimeType: String?,
             override val url: String?,
             override val elementToDecrypt: ElementToDecrypt?,
-            val thumbnailMediaData: ImageContentRenderer.Data
+            val thumbnailMediaData: ImageContentRenderer.Data,
+            // If true will load non mxc url, be careful to set it only for video sent by you
+            override val allowNonMxcUrls: Boolean = false
     ) : AttachmentData
 
     fun render(data: Data,
@@ -60,6 +64,12 @@ class VideoContentRenderer @Inject constructor(private val activeSessionHolder:
                 loadingView.isVisible = false
                 errorView.isVisible = true
                 errorView.setText(R.string.unknown_error)
+            } else if (data.url.isLocalFile() && data.allowNonMxcUrls) {
+                thumbnailView.isVisible = false
+                loadingView.isVisible = false
+                videoView.isVisible = true
+                videoView.setVideoPath(URLEncoder.encode(data.url, Charsets.US_ASCII.displayName()))
+                videoView.start()
             } else {
                 thumbnailView.isVisible = true
                 loadingView.isVisible = true
@@ -91,6 +101,7 @@ class VideoContentRenderer @Inject constructor(private val activeSessionHolder:
             }
         } else {
             val resolvedUrl = contentUrlResolver.resolveFullSize(data.url)
+                    ?: data.url?.takeIf { data.url.isLocalFile() && data.allowNonMxcUrls }
 
             if (resolvedUrl == null) {
                 thumbnailView.isVisible = false
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 3da6a7257a..5de8796c06 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
@@ -54,6 +54,7 @@ import im.vector.app.features.pin.PinMode
 import im.vector.app.features.roomdirectory.RoomDirectoryActivity
 import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity
 import im.vector.app.features.roomdirectory.roompreview.RoomPreviewActivity
+import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
 import im.vector.app.features.roommemberprofile.RoomMemberProfileActivity
 import im.vector.app.features.roommemberprofile.RoomMemberProfileArgs
 import im.vector.app.features.roomprofile.RoomProfileActivity
@@ -156,14 +157,6 @@ class DefaultNavigator @Inject constructor(
         }
     }
 
-    override fun openNotJoinedRoom(context: Context, roomIdOrAlias: String?, eventId: String?, buildTask: Boolean) {
-        if (context is VectorBaseActivity) {
-            context.notImplemented("Open not joined room")
-        } else {
-            context.toast(R.string.not_implemented)
-        }
-    }
-
     override fun openGroupDetail(groupId: String, context: Context, buildTask: Boolean) {
         if (context is VectorBaseActivity) {
             context.notImplemented("Open group detail")
@@ -186,7 +179,12 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openRoomPreview(context: Context, publicRoom: PublicRoom, roomDirectoryData: RoomDirectoryData) {
-        val intent = RoomPreviewActivity.getIntent(context, publicRoom, roomDirectoryData)
+        val intent = RoomPreviewActivity.newIntent(context, publicRoom, roomDirectoryData)
+        context.startActivity(intent)
+    }
+
+    override fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData) {
+        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 ee64c5fc75..ed710a124f 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -25,6 +25,7 @@ import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
 import im.vector.app.features.media.AttachmentData
 import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.pin.PinMode
+import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
 import im.vector.app.features.terms.ReviewTermsActivity
@@ -50,10 +51,10 @@ interface Navigator {
 
     fun openRoomForSharingAndFinish(activity: Activity, roomId: String, sharedData: SharedData)
 
-    fun openNotJoinedRoom(context: Context, roomIdOrAlias: String?, eventId: String? = null, buildTask: Boolean = false)
-
     fun openRoomPreview(context: Context, publicRoom: PublicRoom, roomDirectoryData: RoomDirectoryData)
 
+    fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData)
+
     fun openCreateRoom(context: Context, initialName: String = "")
 
     fun openCreateDirectRoom(context: Context)
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 98d35dc764..e689f9df3f 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
@@ -32,7 +32,6 @@ import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import me.gujun.android.span.span
 import timber.log.Timber
 import java.io.File
-import java.io.FileInputStream
 import java.io.FileOutputStream
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -494,7 +493,7 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
         try {
             val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
             if (file.exists()) {
-                FileInputStream(file).use {
+                file.inputStream().use {
                     val events: ArrayList<NotifiableEvent>? = currentSession?.loadSecureSecret(it, KEY_ALIAS_SECRET_STORAGE)
                     if (events != null) {
                         return events.toMutableList()
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 87d114c01b..11c55f6a73 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
@@ -18,13 +18,18 @@ package im.vector.app.features.permalink
 
 import android.content.Context
 import android.net.Uri
+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
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.rx.rx
 import javax.inject.Inject
@@ -51,14 +56,37 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
         if (deepLink == null) {
             return Single.just(false)
         }
-        return when (val permalinkData = PermalinkParser.parse(deepLink)) {
+        return Single
+                .fromCallable {
+                    PermalinkParser.parse(deepLink)
+                }
+                .subscribeOn(Schedulers.computation())
+                .observeOn(AndroidSchedulers.mainThread())
+                .flatMap { permalinkData ->
+                    handlePermalink(permalinkData, context, navigationInterceptor, buildTask)
+                }
+                .onErrorReturnItem(false)
+    }
+
+    private fun handlePermalink(
+            permalinkData: PermalinkData,
+            context: Context,
+            navigationInterceptor: NavigationInterceptor?,
+            buildTask: Boolean
+    ): Single<Boolean> {
+        return when (permalinkData) {
             is PermalinkData.RoomLink     -> {
                 permalinkData.getRoomId()
                         .observeOn(AndroidSchedulers.mainThread())
                         .map {
                             val roomId = it.getOrNull()
                             if (navigationInterceptor?.navToRoom(roomId, permalinkData.eventId) != true) {
-                                openRoom(context, roomId, permalinkData.eventId, buildTask)
+                                openRoom(
+                                        context = context,
+                                        roomId = roomId,
+                                        permalinkData = permalinkData,
+                                        buildTask = buildTask
+                                )
                             }
                             true
                         }
@@ -82,22 +110,55 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
     private fun PermalinkData.RoomLink.getRoomId(): Single<Optional<String>> {
         val session = activeSessionHolder.getSafeActiveSession()
         return if (isRoomAlias && session != null) {
-            // At the moment we are not fetching on the server as we don't handle not join room
-            session.rx().getRoomIdByAlias(roomIdOrAlias, false).subscribeOn(Schedulers.io())
+            session.rx().getRoomIdByAlias(roomIdOrAlias, true).subscribeOn(Schedulers.io())
         } else {
             Single.just(Optional.from(roomIdOrAlias))
         }
     }
 
+    private fun PermalinkData.RoomLink.getRoomAliasOrNull(): String? {
+        return if (isRoomAlias) {
+            roomIdOrAlias
+        } else {
+            null
+        }
+    }
+
     /**
      * Open room either joined, or not
      */
-    private fun openRoom(context: Context, roomId: String?, eventId: String?, buildTask: Boolean) {
+    private fun openRoom(
+            context: Context,
+            roomId: String?,
+            permalinkData: PermalinkData.RoomLink,
+            buildTask: Boolean
+    ) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
-        return if (roomId != null && session.getRoom(roomId) != null) {
-            navigator.openRoom(context, roomId, eventId, buildTask)
-        } else {
-            navigator.openNotJoinedRoom(context, roomId, eventId, buildTask)
+        if (roomId == null) {
+            context.toast(R.string.room_error_not_found)
+            return
+        }
+        val roomSummary = session.getRoomSummary(roomId)
+        val membership = roomSummary?.membership
+        val eventId = permalinkData.eventId
+        val roomAlias = permalinkData.getRoomAliasOrNull()
+        return when {
+            membership == Membership.BAN     -> context.toast(R.string.error_opening_banned_room)
+            membership?.isActive().orFalse() -> {
+                navigator.openRoom(context, roomId, eventId, buildTask)
+            }
+            else                             -> {
+                val roomPreviewData = RoomPreviewData(
+                        roomId = roomId,
+                        eventId = eventId,
+                        roomAlias = roomAlias ?: roomSummary?.canonicalAlias,
+                        roomName = roomSummary?.displayName,
+                        avatarUrl = roomSummary?.avatarUrl,
+                        buildTask = buildTask,
+                        homeServers = permalinkData.viaParameters
+                )
+                navigator.openRoomPreview(context, roomPreviewData)
+            }
         }
     }
 }
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 c52b586eb4..593527448b 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
@@ -254,6 +254,6 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
         return alert != null
                 && activity !is PinActivity
                 && activity is VectorBaseActivity
-                && alert.shouldBeDisplayedIn?.invoke(activity) == true
+                && alert.shouldBeDisplayedIn.invoke(activity)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt b/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt
index ccf9d765fd..00f80240c5 100644
--- a/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt
@@ -28,7 +28,7 @@ interface VectorAlert {
     val title: String
     val description: String
     val iconId: Int?
-    val shouldBeDisplayedIn: ((Activity) -> Boolean)?
+    val shouldBeDisplayedIn: ((Activity) -> Boolean)
 
     data class Button(val title: String, val action: Runnable, val autoClose: Boolean)
 
@@ -59,7 +59,11 @@ open class DefaultVectorAlert(override val uid: String,
                               override val title: String,
                               override val description: String,
                               @DrawableRes override val iconId: Int?,
-                              override val shouldBeDisplayedIn: ((Activity) -> Boolean)? = null) : VectorAlert {
+                              /**
+                               * Alert are displayed by default, but let this lambda return false to prevent displaying
+                               */
+                              override val shouldBeDisplayedIn: ((Activity) -> Boolean) = { true }
+) : VectorAlert {
 
     // will be set by manager, and accessible by actions at runtime
     override var weakCurrentActivity: WeakReference<Activity>? = null
@@ -87,9 +91,11 @@ class VerificationVectorAlert(uid: String,
                               title: String,
                               override val description: String,
                               @DrawableRes override val iconId: Int?,
-                              override val shouldBeDisplayedIn: ((Activity) -> Boolean)? = null
+                              /**
+                               * Alert are displayed by default, but let this lambda return false to prevent displaying
+                               */
+                              override val shouldBeDisplayedIn: ((Activity) -> Boolean) = { true },
+                              val matrixItem: MatrixItem?
 ) : DefaultVectorAlert(
         uid, title, description, iconId, shouldBeDisplayedIn
-) {
-    var matrixItem: MatrixItem? = null
-}
+)
diff --git a/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt
index e44ce8ee10..d2ada9e7cf 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt
@@ -108,25 +108,25 @@ class CircleView @JvmOverloads constructor(context: Context, attrs: AttributeSet
     companion object {
 
         val INNER_CIRCLE_RADIUS_PROGRESS: Property<CircleView, Float> = object : Property<CircleView, Float>(Float::class.java, "innerCircleRadiusProgress") {
-            override operator fun get(`object`: CircleView): Float? {
-                return `object`.innerCircleRadiusProgress
+            override operator fun get(o: CircleView): Float? {
+                return o.innerCircleRadiusProgress
             }
 
-            override operator fun set(`object`: CircleView, value: Float?) {
+            override operator fun set(o: CircleView, value: Float?) {
                 value?.let {
-                    `object`.innerCircleRadiusProgress = it
+                    o.innerCircleRadiusProgress = it
                 }
             }
         }
 
         val OUTER_CIRCLE_RADIUS_PROGRESS: Property<CircleView, Float> = object : Property<CircleView, Float>(Float::class.java, "outerCircleRadiusProgress") {
-            override operator fun get(`object`: CircleView): Float? {
-                return `object`.outerCircleRadiusProgress
+            override operator fun get(o: CircleView): Float? {
+                return o.outerCircleRadiusProgress
             }
 
-            override operator fun set(`object`: CircleView, value: Float?) {
+            override operator fun set(o: CircleView, value: Float?) {
                 value?.let {
-                    `object`.outerCircleRadiusProgress = it
+                    o.outerCircleRadiusProgress = it
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
index 5430bc60fd..c9283c663a 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
@@ -186,12 +186,12 @@ class DotsView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
         private const val OUTER_DOTS_POSITION_ANGLE = 360 / DOTS_COUNT
 
         val DOTS_PROGRESS: Property<DotsView, Float> = object : Property<DotsView, Float>(Float::class.java, "dotsProgress") {
-            override operator fun get(`object`: DotsView): Float? {
-                return `object`.currentProgress
+            override operator fun get(o: DotsView): Float? {
+                return o.currentProgress
             }
 
-            override operator fun set(`object`: DotsView, value: Float?) {
-                `object`.currentProgress = value!!
+            override operator fun set(o: DotsView, value: Float?) {
+                o.currentProgress = value!!
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
index c60336c1af..b71b494948 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
@@ -28,8 +28,10 @@ import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
+import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -42,8 +44,10 @@ class PublicRoomsController @Inject constructor(private val stringProvider: Stri
     override fun buildModels(viewState: PublicRoomsViewState) {
         val publicRooms = viewState.publicRooms
 
-        if (publicRooms.isEmpty()
-                && viewState.asyncPublicRoomsRequest is Success) {
+        val unknownRoomItem = viewState.buildUnknownRoomIfNeeded()
+
+        val noResult = publicRooms.isEmpty() && viewState.asyncPublicRoomsRequest is Success && unknownRoomItem == null
+        if (noResult) {
             // No result
             noResultItem {
                 id("noResult")
@@ -54,6 +58,8 @@ class PublicRoomsController @Inject constructor(private val stringProvider: Stri
                 buildPublicRoom(it, viewState)
             }
 
+            unknownRoomItem?.addTo(this)
+
             if ((viewState.hasMore && viewState.asyncPublicRoomsRequest is Success)
                     || viewState.asyncPublicRoomsRequest is Incomplete) {
                 loadingItem {
@@ -109,7 +115,29 @@ class PublicRoomsController @Inject constructor(private val stringProvider: Stri
         }
     }
 
+    private fun PublicRoomsViewState.buildUnknownRoomIfNeeded(): UnknownRoomItem? {
+        val roomIdOrAlias = currentFilter.trim()
+        val isAlias = MatrixPatterns.isRoomAlias(roomIdOrAlias) && !publicRooms.any { it.canonicalAlias == roomIdOrAlias }
+        val isRoomId = !isAlias && MatrixPatterns.isRoomId(roomIdOrAlias) && !publicRooms.any { it.roomId == roomIdOrAlias }
+        val roomItem = when {
+            isAlias  -> MatrixItem.RoomAliasItem(roomIdOrAlias, roomIdOrAlias)
+            isRoomId -> MatrixItem.RoomItem(roomIdOrAlias)
+            else     -> null
+        }
+        return roomItem?.let {
+            UnknownRoomItem_().apply {
+                id(roomIdOrAlias)
+                matrixItem(it)
+                avatarRenderer(this@PublicRoomsController.avatarRenderer)
+                globalListener {
+                    callback?.onUnknownRoomClicked(roomIdOrAlias)
+                }
+            }
+        }
+    }
+
     interface Callback {
+        fun onUnknownRoomClicked(roomIdOrAlias: String)
         fun onPublicRoomClicked(publicRoom: PublicRoom, joinState: JoinState)
         fun onPublicRoomJoin(publicRoom: PublicRoom)
         fun loadMore()
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
index 57006af6f1..b180018480 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
@@ -29,9 +29,13 @@ import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.trackItemsVisibilityChange
 import im.vector.app.core.platform.VectorBaseFragment
-import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
+import im.vector.app.core.utils.toast
+import im.vector.app.features.permalink.NavigationInterceptor
+import im.vector.app.features.permalink.PermalinkHandler
 import io.reactivex.rxkotlin.subscribeBy
 import kotlinx.android.synthetic.main.fragment_public_rooms.*
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -41,7 +45,9 @@ import javax.inject.Inject
  * - When filtering more (when entering new chars), we could filter on result we already have, during the new server request, to avoid empty screen effect
  */
 class PublicRoomsFragment @Inject constructor(
-        private val publicRoomsController: PublicRoomsController
+        private val publicRoomsController: PublicRoomsController,
+        private val permalinkHandler: PermalinkHandler,
+        private val session: Session
 ) : VectorBaseFragment(), PublicRoomsController.Callback {
 
     private val viewModel: RoomDirectoryViewModel by activityViewModel()
@@ -112,6 +118,23 @@ class PublicRoomsFragment @Inject constructor(
         publicRoomsController.callback = this
     }
 
+    override fun onUnknownRoomClicked(roomIdOrAlias: String) {
+        val permalink = session.permalinkService().createPermalink(roomIdOrAlias)
+        permalinkHandler
+                .launch(requireContext(), permalink, object : NavigationInterceptor {
+                    override fun navToRoom(roomId: String?, eventId: String?): Boolean {
+                        requireActivity().finish()
+                        return false
+                    }
+                })
+                .subscribe { isSuccessful ->
+                    if (!isSuccessful) {
+                        requireContext().toast(R.string.room_error_not_found)
+                    }
+                }
+                .disposeOnDestroyView()
+    }
+
     override fun onPublicRoomClicked(publicRoom: PublicRoom, joinState: JoinState) {
         Timber.v("PublicRoomClicked: $publicRoom")
         withState(viewModel) { state ->
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/UnknownRoomItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/UnknownRoomItem.kt
new file mode 100644
index 0000000000..084f518405
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/UnknownRoomItem.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.roomdirectory
+
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_unknown_room)
+abstract class UnknownRoomItem : VectorEpoxyModel<UnknownRoomItem.Holder>() {
+
+    @EpoxyAttribute
+    lateinit var avatarRenderer: AvatarRenderer
+
+    @EpoxyAttribute
+    lateinit var matrixItem: MatrixItem
+
+    @EpoxyAttribute
+    var globalListener: (() -> Unit)? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.rootView.setOnClickListener { globalListener?.invoke() }
+        avatarRenderer.render(matrixItem, holder.avatarView)
+        holder.nameView.text = matrixItem.displayName
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val rootView by bind<ViewGroup>(R.id.itemUnknownRoomLayout)
+        val avatarView by bind<ImageView>(R.id.itemUnknownRoomAvatar)
+        val nameView by bind<TextView>(R.id.itemUnknownRoomName)
+    }
+}
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 0a25d93de2..4876bd7f98 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
@@ -24,20 +24,23 @@ import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.ToolbarConfigurable
 import im.vector.app.core.platform.VectorBaseActivity
+import kotlinx.android.parcel.Parcelize
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 import org.matrix.android.sdk.api.util.MatrixItem
-import kotlinx.android.parcel.Parcelize
+import timber.log.Timber
 
 @Parcelize
 data class RoomPreviewData(
         val roomId: String,
-        val roomName: String?,
-        val roomAlias: String?,
-        val topic: String?,
-        val worldReadable: Boolean,
-        val avatarUrl: String?,
-        val homeServer: String?
+        val eventId: String? = null,
+        val roomName: String? = null,
+        val roomAlias: String? = null,
+        val topic: String? = null,
+        val worldReadable: Boolean = false,
+        val avatarUrl: String? = null,
+        val homeServers: List<String> = emptyList(),
+        val buildTask: Boolean = false
 ) : Parcelable {
     val matrixItem: MatrixItem
         get() = MatrixItem.RoomItem(roomId, roomName ?: roomAlias, avatarUrl)
@@ -48,19 +51,24 @@ class RoomPreviewActivity : VectorBaseActivity(), ToolbarConfigurable {
     companion object {
         private const val ARG = "ARG"
 
-        fun getIntent(context: Context, publicRoom: PublicRoom, roomDirectoryData: RoomDirectoryData): Intent {
+        fun newIntent(context: Context, roomPreviewData: RoomPreviewData): Intent {
             return Intent(context, RoomPreviewActivity::class.java).apply {
-                putExtra(ARG, RoomPreviewData(
-                        roomId = publicRoom.roomId,
-                        roomName = publicRoom.name,
-                        roomAlias = publicRoom.getPrimaryAlias(),
-                        topic = publicRoom.topic,
-                        worldReadable = publicRoom.worldReadable,
-                        avatarUrl = publicRoom.avatarUrl,
-                        homeServer = roomDirectoryData.homeServer
-                ))
+                putExtra(ARG, roomPreviewData)
             }
         }
+
+        fun newIntent(context: Context, publicRoom: PublicRoom, roomDirectoryData: RoomDirectoryData): Intent {
+            val roomPreviewData = RoomPreviewData(
+                    roomId = publicRoom.roomId,
+                    roomName = publicRoom.name,
+                    roomAlias = publicRoom.getPrimaryAlias(),
+                    topic = publicRoom.topic,
+                    worldReadable = publicRoom.worldReadable,
+                    avatarUrl = publicRoom.avatarUrl,
+                    homeServers = listOfNotNull(roomDirectoryData.homeServer)
+            )
+            return newIntent(context, roomPreviewData)
+        }
     }
 
     override fun getLayoutRes() = R.layout.activity_simple
@@ -76,6 +84,7 @@ class RoomPreviewActivity : VectorBaseActivity(), ToolbarConfigurable {
             if (args?.worldReadable == true) {
                 // TODO Room preview: Note: M does not recommend to use /events anymore, so for now we just display the room preview
                 // TODO the same way if it was not world readable
+                Timber.d("just display the room preview the same way if it was not world readable")
                 addFragment(R.id.simpleFragmentContainer, RoomPreviewNoPreviewFragment::class.java, args)
             } else {
                 addFragment(R.id.simpleFragmentContainer, RoomPreviewNoPreviewFragment::class.java, args)
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 5d13d3d9fe..108c3bacf1 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
@@ -48,13 +48,15 @@ class RoomPreviewNoPreviewFragment @Inject constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar(roomPreviewNoPreviewToolbar)
+        val titleText = roomPreviewData.roomName ?: roomPreviewData.roomAlias ?: roomPreviewData.roomId
+
         // Toolbar
         avatarRenderer.render(roomPreviewData.matrixItem, roomPreviewNoPreviewToolbarAvatar)
-        roomPreviewNoPreviewToolbarTitle.text = roomPreviewData.roomName ?: roomPreviewData.roomAlias
+        roomPreviewNoPreviewToolbarTitle.text = titleText
 
         // Screen
         avatarRenderer.render(roomPreviewData.matrixItem, roomPreviewNoPreviewAvatar)
-        roomPreviewNoPreviewName.text = roomPreviewData.roomName ?: roomPreviewData.roomAlias
+        roomPreviewNoPreviewName.text = titleText
         roomPreviewNoPreviewTopic.setTextOrHide(roomPreviewData.topic)
 
         if (roomPreviewData.worldReadable) {
@@ -98,7 +100,7 @@ class RoomPreviewNoPreviewFragment @Inject constructor(
             // Quit this screen
             requireActivity().finish()
             // Open room
-            navigator.openRoom(requireActivity(), roomPreviewData.roomId)
+            navigator.openRoom(requireActivity(), roomPreviewData.roomId, roomPreviewData.eventId, roomPreviewData.buildTask)
         }
     }
 }
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 04b7c33fb2..900ba537b5 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
@@ -106,10 +106,7 @@ class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val ini
             Timber.w("Try to join an already joining room. Should not happen")
             return@withState
         }
-        val viaServers = state.homeServer?.let {
-            listOf(it)
-        } ?: emptyList()
-        session.joinRoom(state.roomId, viaServers = viaServers, callback = object : MatrixCallback<Unit> {
+        session.joinRoom(state.roomId, viaServers = state.homeServers, callback = object : MatrixCallback<Unit> {
             override fun onSuccess(data: Unit) {
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
                 // Instead, we wait for the room to be joined
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 f461225e2d..6816e54481 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
@@ -24,10 +24,9 @@ data class RoomPreviewViewState(
         val roomId: String = "",
         val roomAlias: String? = null,
         /**
-         * The server name (might be null)
-         * Set null when the server is the current user's home server.
+         * Can be empty when the server is the current user's home server.
          */
-        val homeServer: String? = null,
+        val homeServers: List<String> = emptyList(),
         // Current state of the room in preview
         val roomJoinState: JoinState = JoinState.NOT_JOINED,
         // Last error of join room request
@@ -37,6 +36,6 @@ data class RoomPreviewViewState(
     constructor(args: RoomPreviewData) : this(
             roomId = args.roomId,
             roomAlias = args.roomAlias,
-            homeServer = args.homeServer
+            homeServers = args.homeServers
     )
 }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index 9c6e813f0b..cda2d83e3d 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -35,6 +35,7 @@ import im.vector.app.core.animations.MatrixItemAppBarStateChangeListener
 import im.vector.app.core.dialogs.ConfirmationDialogBuilder
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.copyOnLongClick
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.StateView
@@ -44,11 +45,11 @@ import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
 import im.vector.app.features.roommemberprofile.powerlevel.EditPowerLevelDialogs
-import org.matrix.android.sdk.api.session.room.powerlevels.Role
-import org.matrix.android.sdk.api.util.MatrixItem
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_matrix_profile.*
 import kotlinx.android.synthetic.main.view_stub_room_member_profile_header.*
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
+import org.matrix.android.sdk.api.util.MatrixItem
 import javax.inject.Inject
 
 @Parcelize
@@ -110,6 +111,12 @@ class RoomMemberProfileFragment @Inject constructor(
                 is RoomMemberProfileViewEvents.OnInviteActionSuccess       -> Unit
             }.exhaustive
         }
+        setupLongClicks()
+    }
+
+    private fun setupLongClicks() {
+        memberProfileNameView.copyOnLongClick()
+        memberProfileIdView.copyOnLongClick()
     }
 
     private fun handleShowPowerLevelDemoteWarning(event: RoomMemberProfileViewEvents.ShowPowerLevelDemoteWarning) {
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 2722d54950..d94a326ba9 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
@@ -34,16 +34,12 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.yalantis.ucrop.UCrop
-import im.vector.lib.multipicker.MultiPicker
-import im.vector.lib.multipicker.entity.MultiPickerImageType
-import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
-import org.matrix.android.sdk.api.util.MatrixItem
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.animations.AppBarStateChangeListener
 import im.vector.app.core.animations.MatrixItemAppBarStateChangeListener
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.copyOnLongClick
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.intent.getFilenameFromUri
@@ -62,9 +58,14 @@ import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedA
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
 import im.vector.app.features.media.BigImageViewerActivity
 import im.vector.app.features.media.createUCropWithDefaultSettings
+import im.vector.lib.multipicker.MultiPicker
+import im.vector.lib.multipicker.entity.MultiPickerImageType
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_matrix_profile.*
 import kotlinx.android.synthetic.main.view_stub_room_profile_header.*
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
@@ -120,6 +121,13 @@ class RoomProfileFragment @Inject constructor(
                 .observe()
                 .subscribe { handleQuickActions(it) }
                 .disposeOnDestroyView()
+        setupLongClicks()
+    }
+
+    private fun setupLongClicks() {
+        roomProfileNameView.copyOnLongClick()
+        roomProfileAliasView.copyOnLongClick()
+        roomProfileTopicView.copyOnLongClick()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -301,9 +309,7 @@ class RoomProfileFragment @Inject constructor(
                             .get(MultiPicker.IMAGE)
                             .getSelectedFiles(requireContext(), requestCode, resultCode, data)
                             .firstOrNull()?.let {
-                                // TODO. UCrop library cannot read from Gallery. For now, we will set avatar as it is.
-                                // onRoomAvatarSelected(it)
-                                onAvatarCropped(it.contentUri)
+                                onRoomAvatarSelected(it)
                             }
                 }
                 UCrop.REQUEST_CROP                  -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
index d2f92e300e..b9d81ab005 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
@@ -52,7 +52,7 @@ object VectorLocale {
     var applicationLocale = defaultLocale
         private set
 
-    lateinit var context: Context
+    private lateinit var context: Context
 
     /**
      * Init this object
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
index 27160ba234..67b5c03638 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
@@ -16,13 +16,13 @@
 package im.vector.app.features.settings
 
 import androidx.preference.Preference
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
-import org.matrix.android.sdk.api.pushrules.rest.PushRuleAndKind
 import im.vector.app.R
 import im.vector.app.core.preference.PushRulePreference
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.utils.toast
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.pushrules.rest.PushRuleAndKind
 import javax.inject.Inject
 
 class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor()
@@ -92,17 +92,17 @@ class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor()
     companion object {
         //  preference name <-> rule Id
         private val prefKeyToPushRuleId = mapOf(
-                "SETTINGS_PUSH_RULE_CONTAINING_MY_DISPLAY_NAME_PREFERENCE_KEY" to PushRule.RULE_ID_CONTAIN_DISPLAY_NAME,
-                "SETTINGS_PUSH_RULE_CONTAINING_MY_USER_NAME_PREFERENCE_KEY" to PushRule.RULE_ID_CONTAIN_USER_NAME,
-                "SETTINGS_PUSH_RULE_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY" to PushRule.RULE_ID_ONE_TO_ONE_ROOM,
-                "SETTINGS_PUSH_RULE_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY" to PushRule.RULE_ID_ALL_OTHER_MESSAGES_ROOMS,
-                "SETTINGS_PUSH_RULE_INVITED_TO_ROOM_PREFERENCE_KEY" to PushRule.RULE_ID_INVITE_ME,
-                "SETTINGS_PUSH_RULE_CALL_INVITATIONS_PREFERENCE_KEY" to PushRule.RULE_ID_CALL,
-                "SETTINGS_PUSH_RULE_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY" to PushRule.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS,
-                "SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_AT_ROOM_PREFERENCE_KEY" to PushRule.RULE_ID_AT_ROOMS,
-                "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_ONE_ONE_CHAT_PREFERENCE_KEY" to PushRule.RULE_ID_E2E_ONE_TO_ONE_ROOM,
-                "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY" to PushRule.RULE_ID_E2E_GROUP,
-                "SETTINGS_PUSH_RULE_ROOMS_UPGRADED_KEY" to PushRule.RULE_ID_TOMBSTONE
+                "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,
+                "SETTINGS_PUSH_RULE_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY" to RuleIds.RULE_ID_ONE_TO_ONE_ROOM,
+                "SETTINGS_PUSH_RULE_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ALL_OTHER_MESSAGES_ROOMS,
+                "SETTINGS_PUSH_RULE_INVITED_TO_ROOM_PREFERENCE_KEY" to RuleIds.RULE_ID_INVITE_ME,
+                "SETTINGS_PUSH_RULE_CALL_INVITATIONS_PREFERENCE_KEY" to RuleIds.RULE_ID_CALL,
+                "SETTINGS_PUSH_RULE_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY" to RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS,
+                "SETTINGS_PUSH_RULE_MESSAGES_CONTAINING_AT_ROOM_PREFERENCE_KEY" to RuleIds.RULE_ID_ROOM_NOTIF,
+                "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,
+                "SETTINGS_PUSH_RULE_ROOMS_UPGRADED_KEY" to RuleIds.RULE_ID_TOMBSTONE
         )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index fbeb5b954d..c4df3a8d6e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -23,13 +23,11 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.Editable
-import android.util.Patterns
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.core.view.isVisible
 import androidx.preference.EditTextPreference
@@ -54,13 +52,11 @@ import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
 import im.vector.app.core.utils.TextUtils
 import im.vector.app.core.utils.allGranted
 import im.vector.app.core.utils.checkPermissions
-import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.getSizeOfFiles
 import im.vector.app.core.utils.toast
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.media.createUCropWithDefaultSettings
-import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.SignOutUiWorker
 import im.vector.lib.multipicker.MultiPicker
 import im.vector.lib.multipicker.entity.MultiPickerImageType
@@ -128,6 +124,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         observeUserAvatar()
+        observeUserDisplayName()
     }
 
     private fun observeUserAvatar() {
@@ -140,6 +137,22 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
                 .disposeOnDestroyView()
     }
 
+    private fun observeUserDisplayName() {
+        session.rx()
+                .liveUser(session.myUserId)
+                .unwrap()
+                .map { it.displayName ?: "" }
+                .distinctUntilChanged()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { displayName ->
+                    mDisplayNamePreference.let {
+                        it.summary = displayName
+                        it.text = displayName
+                    }
+                }
+                .disposeOnDestroyView()
+    }
+
     override fun bindPref() {
         // Avatar
         mUserAvatarPreference.let {
@@ -151,8 +164,6 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
 
         // Display name
         mDisplayNamePreference.let {
-            it.summary = session.getUser(session.myUserId)?.displayName ?: ""
-            it.text = it.summary.toString()
             it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
                 newValue
                         ?.let { value -> (value as? String)?.trim() }
@@ -172,44 +183,6 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
             mPasswordPreference.isVisible = false
         }
 
-        // Add Email
-        findPreference<EditTextPreference>(ADD_EMAIL_PREFERENCE_KEY)!!.let {
-            // It does not work on XML, do it here
-            it.icon = activity?.let {
-                ThemeUtils.tintDrawable(it,
-                        ContextCompat.getDrawable(it, R.drawable.ic_material_add)!!, R.attr.colorAccent)
-            }
-
-            // Unfortunately, this is not supported in lib v7
-            // it.editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
-            it.setOnPreferenceClickListener {
-                notImplemented()
-                true
-            }
-
-            it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                notImplemented()
-                // addEmail((newValue as String).trim())
-                false
-            }
-        }
-
-        // Add phone number
-        findPreference<VectorPreference>(ADD_PHONE_NUMBER_PREFERENCE_KEY)!!.let {
-            // It does not work on XML, do it here
-            it.icon = activity?.let {
-                ThemeUtils.tintDrawable(it,
-                        ContextCompat.getDrawable(it, R.drawable.ic_material_add)!!, R.attr.colorAccent)
-            }
-
-            it.setOnPreferenceClickListener {
-                notImplemented()
-                // TODO val intent = PhoneNumberAdditionActivity.getIntent(activity, session.credentials.userId)
-                // startActivityForResult(intent, REQUEST_NEW_PHONE_NUMBER)
-                true
-            }
-        }
-
         // Advanced settings
 
         // user account
@@ -220,8 +193,6 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_HOME_SERVER_PREFERENCE_KEY)!!
                 .summary = session.sessionParams.homeServerUrl
 
-        refreshEmailsList()
-        refreshPhoneNumbersList()
         // Contacts
         setContactsPreferences()
 
@@ -268,7 +239,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
                     Glide.get(requireContext()).clearMemory()
                     session.fileService().clearCache()
 
-                    var newSize = 0
+                    var newSize: Int
 
                     withContext(Dispatchers.IO) {
                         // On BG thread
@@ -341,8 +312,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
                             .get(MultiPicker.IMAGE)
                             .getSelectedFiles(requireContext(), requestCode, resultCode, data)
                             .firstOrNull()?.let {
-                                // TODO. UCrop library cannot read from Gallery. For now, we will set avatar as it is.
-                                onAvatarCropped(it.contentUri)
+                                onAvatarSelected(it)
                             }
                 }
                 UCrop.REQUEST_CROP                  -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
@@ -519,295 +489,6 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
      * Refresh phone number list
      */
     private fun refreshPhoneNumbersList() {
-        /* TODO
-        val currentPhoneNumber3PID = ArrayList(session.myUser.getlinkedPhoneNumbers())
-
-        val phoneNumberList = ArrayList<String>()
-        for (identifier in currentPhoneNumber3PID) {
-            phoneNumberList.add(identifier.address)
-        }
-
-        // check first if there is an update
-        var isNewList = true
-        if (phoneNumberList.size == mDisplayedPhoneNumber.size) {
-            isNewList = !mDisplayedPhoneNumber.containsAll(phoneNumberList)
-        }
-
-        if (isNewList) {
-            // remove the displayed one
-            run {
-                var index = 0
-                while (true) {
-                    val preference = mUserSettingsCategory.findPreference(PHONE_NUMBER_PREFERENCE_KEY_BASE + index)
-
-                    if (null != preference) {
-                        mUserSettingsCategory.removePreference(preference)
-                    } else {
-                        break
-                    }
-                    index++
-                }
-            }
-
-            // add new phone number list
-            mDisplayedPhoneNumber = phoneNumberList
-
-            val addPhoneBtn = mUserSettingsCategory.findPreference(ADD_PHONE_NUMBER_PREFERENCE_KEY)
-                    ?: return
-
-            var order = addPhoneBtn.order
-
-            for ((index, phoneNumber3PID) in currentPhoneNumber3PID.withIndex()) {
-                val preference = VectorPreference(activity!!)
-
-                preference.title = getString(R.string.settings_phone_number)
-                var phoneNumberFormatted = phoneNumber3PID.address
-                try {
-                    // Attempt to format phone number
-                    val phoneNumber = PhoneNumberUtil.getInstance().parse("+$phoneNumberFormatted", null)
-                    phoneNumberFormatted = PhoneNumberUtil.getInstance().format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)
-                } catch (e: NumberParseException) {
-                    // Do nothing, we will display raw version
-                }
-
-                preference.summary = phoneNumberFormatted
-                preference.key = PHONE_NUMBER_PREFERENCE_KEY_BASE + index
-                preference.order = order
-
-                preference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    displayDelete3PIDConfirmationDialog(phoneNumber3PID, preference.summary)
-                    true
-                }
-
-                preference.onPreferenceLongClickListener = object : VectorPreference.OnPreferenceLongClickListener {
-                    override fun onPreferenceLongClick(preference: Preference): Boolean {
-                        activity?.let { copyToClipboard(it, phoneNumber3PID.address) }
-                        return true
-                    }
-                }
-
-                order++
-                mUserSettingsCategory.addPreference(preference)
-            }
-
-            addPhoneBtn.order = order
-        }    */
-    }
-
-// ==============================================================================================================
-// Email management
-// ==============================================================================================================
-
-    /**
-     * Refresh the emails list
-     */
-    private fun refreshEmailsList() {
-        val currentEmail3PID = emptyList<String>() // TODO ArrayList(session.myUser.getlinkedEmails())
-
-        val newEmailsList = ArrayList<String>()
-        for (identifier in currentEmail3PID) {
-            // TODO newEmailsList.add(identifier.address)
-        }
-
-        // check first if there is an update
-        var isNewList = true
-        if (newEmailsList.size == mDisplayedEmails.size) {
-            isNewList = !mDisplayedEmails.containsAll(newEmailsList)
-        }
-
-        if (isNewList) {
-            // remove the displayed one
-            run {
-                var index = 0
-                while (true) {
-                    val preference = mUserSettingsCategory.findPreference<VectorPreference>(EMAIL_PREFERENCE_KEY_BASE + index)
-
-                    if (null != preference) {
-                        mUserSettingsCategory.removePreference(preference)
-                    } else {
-                        break
-                    }
-                    index++
-                }
-            }
-
-            // add new emails list
-            mDisplayedEmails = newEmailsList
-
-            val addEmailBtn = mUserSettingsCategory.findPreference<VectorPreference>(ADD_EMAIL_PREFERENCE_KEY) ?: return
-
-            var order = addEmailBtn.order
-
-            for ((index, email3PID) in currentEmail3PID.withIndex()) {
-                val preference = VectorPreference(requireActivity())
-
-                preference.title = getString(R.string.settings_email_address)
-                preference.summary = "TODO" // email3PID.address
-                preference.key = EMAIL_PREFERENCE_KEY_BASE + index
-                preference.order = order
-
-                preference.onPreferenceClickListener = Preference.OnPreferenceClickListener { pref ->
-                    displayDelete3PIDConfirmationDialog(/* TODO email3PID, */ pref.summary)
-                    true
-                }
-
-                preference.onPreferenceLongClickListener = object : VectorPreference.OnPreferenceLongClickListener {
-                    override fun onPreferenceLongClick(preference: Preference): Boolean {
-                        activity?.let { copyToClipboard(it, "TODO") } // email3PID.address) }
-                        return true
-                    }
-                }
-
-                mUserSettingsCategory.addPreference(preference)
-
-                order++
-            }
-
-            addEmailBtn.order = order
-        }
-    }
-
-    /**
-     * Attempt to add a new email to the account
-     *
-     * @param email the email to add.
-     */
-    private fun addEmail(email: String) {
-        // check first if the email syntax is valid
-        // if email is null , then also its invalid email
-        if (email.isBlank() || !Patterns.EMAIL_ADDRESS.matcher(email).matches()) {
-            activity?.toast(R.string.auth_invalid_email)
-            return
-        }
-
-        // check first if the email syntax is valid
-        if (mDisplayedEmails.indexOf(email) >= 0) {
-            activity?.toast(R.string.auth_email_already_defined)
-            return
-        }
-
-        notImplemented()
-        /* TODO
-        val pid = ThreePid(email, ThreePid.MEDIUM_EMAIL)
-
-        displayLoadingView()
-
-        session.myUser.requestEmailValidationToken(pid, object : MatrixCallback<Unit> {
-            override fun onSuccess(info: Void?) {
-                activity?.runOnUiThread { showEmailValidationDialog(pid) }
-            }
-
-            override fun onNetworkError(e: Exception) {
-                onCommonDone(e.localizedMessage)
-            }
-
-            override fun onMatrixError(e: MatrixError) {
-                if (TextUtils.equals(MatrixError.THREEPID_IN_USE, e.errcode)) {
-                    onCommonDone(getString(R.string.account_email_already_used_error))
-                } else {
-                    onCommonDone(e.localizedMessage)
-                }
-            }
-
-            override fun onUnexpectedError(e: Exception) {
-                onCommonDone(e.localizedMessage)
-            }
-        })
-        */
-    }
-
-    /**
-     * Show an email validation dialog to warn the user tho valid his email link.
-     *
-     * @param pid the used pid.
-     */
-/* TODO
-private fun showEmailValidationDialog(pid: ThreePid) {
-    activity?.let {
-        AlertDialog.Builder(it)
-                .setTitle(R.string.account_email_validation_title)
-                .setMessage(R.string.account_email_validation_message)
-                .setPositiveButton(R.string._continue) { _, _ ->
-                    session.myUser.add3Pid(pid, true, object : MatrixCallback<Unit> {
-                        override fun onSuccess(info: Void?) {
-                            it.runOnUiThread {
-                                hideLoadingView()
-                                refreshEmailsList()
-                            }
-                        }
-
-                        override fun onNetworkError(e: Exception) {
-                            onCommonDone(e.localizedMessage)
-                        }
-
-                        override fun onMatrixError(e: MatrixError) {
-                            if (TextUtils.equals(e.errcode, MatrixError.THREEPID_AUTH_FAILED)) {
-                                it.runOnUiThread {
-                                    hideLoadingView()
-                                    it.toast(R.string.account_email_validation_error)
-                                }
-                            } else {
-                                onCommonDone(e.localizedMessage)
-                            }
-                        }
-
-                        override fun onUnexpectedError(e: Exception) {
-                            onCommonDone(e.localizedMessage)
-                        }
-                    })
-                }
-                .setNegativeButton(R.string.cancel) { _, _ ->
-                    hideLoadingView()
-                }
-                .show()
-    }
-}    */
-
-    /**
-     * Display a dialog which asks confirmation for the deletion of a 3pid
-     *
-     * @param pid               the 3pid to delete
-     * @param preferenceSummary the displayed 3pid
-     */
-    private fun displayDelete3PIDConfirmationDialog(/* TODO pid: ThirdPartyIdentifier,*/ preferenceSummary: CharSequence) {
-        val mediumFriendlyName = "TODO" // ThreePid.getMediumFriendlyName(pid.medium, activity).toLowerCase(VectorLocale.applicationLocale)
-        val dialogMessage = getString(R.string.settings_delete_threepid_confirmation, mediumFriendlyName, preferenceSummary)
-
-        activity?.let {
-            AlertDialog.Builder(it)
-                    .setTitle(R.string.dialog_title_confirmation)
-                    .setMessage(dialogMessage)
-                    .setPositiveButton(R.string.remove) { _, _ ->
-                        notImplemented()
-                        /* TODO
-                        displayLoadingView()
-
-                        session.myUser.delete3Pid(pid, object : MatrixCallback<Unit> {
-                            override fun onSuccess(info: Void?) {
-                                when (pid.medium) {
-                                    ThreePid.MEDIUM_EMAIL -> refreshEmailsList()
-                                    ThreePid.MEDIUM_MSISDN -> refreshPhoneNumbersList()
-                                }
-                                onCommonDone(null)
-                            }
-
-                            override fun onNetworkError(e: Exception) {
-                                onCommonDone(e.localizedMessage)
-                            }
-
-                            override fun onMatrixError(e: MatrixError) {
-                                onCommonDone(e.localizedMessage)
-                            }
-
-                            override fun onUnexpectedError(e: Exception) {
-                                onCommonDone(e.localizedMessage)
-                            }
-                        })
-                        */
-                    }
-                    .setNegativeButton(R.string.cancel, null)
-                    .show()
-        }
     }
 
     /**
@@ -971,12 +652,6 @@ private fun showEmailValidationDialog(pid: ThreePid) {
     }
 
     companion object {
-        private const val ADD_EMAIL_PREFERENCE_KEY = "ADD_EMAIL_PREFERENCE_KEY"
-        private const val ADD_PHONE_NUMBER_PREFERENCE_KEY = "ADD_PHONE_NUMBER_PREFERENCE_KEY"
-
-        private const val EMAIL_PREFERENCE_KEY_BASE = "EMAIL_PREFERENCE_KEY_BASE"
-        private const val PHONE_NUMBER_PREFERENCE_KEY_BASE = "PHONE_NUMBER_PREFERENCE_KEY_BASE"
-
         private const val REQUEST_NEW_PHONE_NUMBER = 456
         private const val REQUEST_PHONEBOOK_COUNTRY = 789
     }
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 c8cf44778c..6a4ea83d68 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,7 +17,6 @@
 package im.vector.app.features.settings
 
 import im.vector.app.R
-import im.vector.app.core.preference.VectorSwitchPreference
 import javax.inject.Inject
 
 class VectorSettingsLabsFragment @Inject constructor(
@@ -28,103 +27,6 @@ class VectorSettingsLabsFragment @Inject constructor(
     override val preferenceXmlRes = R.xml.vector_settings_labs
 
     override fun bindPref() {
-        // Lab
-
-        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_ALLOW_EXTENDED_LOGS)?.let {
-            it.isChecked = vectorPreferences.labAllowedExtendedLogging()
-        }
-
-        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB)?.let {
-            it.isChecked = vectorPreferences.labAddNotificationTab()
-        }
-
-//        val useCryptoPref = findPreference(VectorPreferences.SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_PREFERENCE_KEY) as SwitchPreference
-//        val cryptoIsEnabledPref = findPreference(VectorPreferences.SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_IS_ACTIVE_PREFERENCE_KEY)
-
-        if (session.cryptoService().isCryptoEnabled()) {
-//            mLabsCategory.removePreference(useCryptoPref)
-//
-//            cryptoIsEnabledPref.isEnabled = false
-        } else {
-//            mLabsCategory.removePreference(cryptoIsEnabledPref)
-//
-//            useCryptoPref.isChecked = false
-//
-//            useCryptoPref.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValueAsVoid ->
-//                if (TextUtils.isEmpty(mSession.sessionParams.deviceId)) {
-//                    activity?.let { activity ->
-//                        AlertDialog.Builder(activity)
-//                                .setMessage(R.string.room_settings_labs_end_to_end_warnings)
-//                                .setPositiveButton(R.string.logout) { _, _ ->
-//                                    notImplemented()
-//                                    // TODO CommonActivityUtils.logout(activity)
-//                                }
-//                                .setNegativeButton(R.string.cancel) { _, _ ->
-//                                    useCryptoPref.isChecked = false
-//                                }
-//                                .setOnCancelListener {
-//                                    useCryptoPref.isChecked = false
-//                                }
-//                                .show()
-//                    }
-//                } else {
-//                    val newValue = newValueAsVoid as Boolean
-//
-//                    if (mSession.isCryptoEnabled() != newValue) {
-//                        notImplemented()
-//                        /* TODO
-//                        displayLoadingView()
-//
-//                        session.enableCrypto(newValue, object : MatrixCallback<Unit> {
-//                            private fun refresh() {
-//                                activity?.runOnUiThread {
-//                                    hideLoadingView()
-//                                    useCryptoPref.isChecked = session.isCryptoEnabled
-//
-//                                    if (session.isCryptoEnabled) {
-//                                        mLabsCategory.removePreference(useCryptoPref)
-//                                        mLabsCategory.addPreference(cryptoIsEnabledPref)
-//                                    }
-//                                }
-//                            }
-//
-//                            override fun onSuccess(info: Void?) {
-//                                useCryptoPref.isEnabled = false
-//                                refresh()
-//                            }
-//
-//                            override fun onNetworkError(e: Exception) {
-//                                useCryptoPref.isChecked = false
-//                            }
-//
-//                            override fun onMatrixError(e: MatrixError) {
-//                                useCryptoPref.isChecked = false
-//                            }
-//
-//                            override fun onUnexpectedError(e: Exception) {
-//                                useCryptoPref.isChecked = false
-//                            }
-//                        })
-//                        */
-//                    }
-//                }
-//
-//                true
-//            }
-        }
-
-        // SaveMode Management
-//        findPreference(VectorPreferences.SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY)
-//                .onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-//            notImplemented()
-//            /* TODO
-//            val sessions = Matrix.getMXSessions(activity)
-//            for (session in sessions) {
-//                session.setUseDataSaveMode(newValue as Boolean)
-//            }
-//            */
-//
-//            true
-//        }
+        // Nothing to do
     }
 }
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 0d29137289..a84a10f74c 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
@@ -168,6 +168,7 @@ class VectorSettingsPreferencesFragment @Inject constructor(
                 v.setOnClickListener {
                     dialog.dismiss()
                     FontScale.updateFontScale(activity, i)
+                    vectorConfiguration.applyToApplicationContext()
                     activity.restart()
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
index d2ec1a1543..3f3811ce76 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
@@ -16,7 +16,9 @@
 
 package im.vector.app.features.settings
 
+import android.os.Build
 import im.vector.app.R
+import im.vector.app.core.preference.VectorPreference
 import javax.inject.Inject
 
 class VectorSettingsRootFragment @Inject constructor() : VectorSettingsBaseFragment() {
@@ -25,6 +27,15 @@ class VectorSettingsRootFragment @Inject constructor() : VectorSettingsBaseFragm
     override val preferenceXmlRes = R.xml.vector_settings_root
 
     override fun bindPref() {
-        // Nothing to do
+        // Tint icon on API < 24
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            tintIcons()
+        }
+    }
+
+    private fun tintIcons() {
+        for (i in 0 until preferenceScreen.preferenceCount) {
+            (preferenceScreen.getPreference(i) as? VectorPreference)?.let { it.tintIcon = true }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index 7f6dd7b05f..2dc35fb653 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -563,7 +563,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
     private fun refreshMyDevice() {
         session.cryptoService().getUserDevices(session.myUserId).map {
             DeviceInfo(
-                    user_id = session.myUserId,
+                    userId = session.myUserId,
                     deviceId = it.deviceId,
                     displayName = it.displayName()
             )
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
index 6a334898c0..c8b12e26a5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
@@ -39,7 +39,7 @@ data class DeviceVerificationInfoArgs(
         val deviceId: String
 ) : Parcelable
 
-class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(), DeviceVerificationInfoEpoxyController.Callback {
+class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(), DeviceVerificationInfoBottomSheetController.Callback {
 
     private val viewModel: DeviceVerificationInfoBottomSheetViewModel by fragmentViewModel(DeviceVerificationInfoBottomSheetViewModel::class)
 
@@ -54,17 +54,17 @@ class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(),
         injector.inject(this)
     }
 
-    @Inject lateinit var epoxyController: DeviceVerificationInfoEpoxyController
+    @Inject lateinit var controller: DeviceVerificationInfoBottomSheetController
 
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list_with_title
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         recyclerView.configureWith(
-                epoxyController,
+                controller,
                 showDivider = false,
                 hasFixedSize = false)
-        epoxyController.callback = this
+        controller.callback = this
         bottomSheetTitle.isVisible = false
     }
 
@@ -74,7 +74,7 @@ class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(),
     }
 
     override fun invalidate() = withState(viewModel) {
-        epoxyController.setData(it)
+        controller.setData(it)
         super.invalidate()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
similarity index 89%
rename from vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt
rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index bae31124ed..25a98bb4b5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -16,9 +16,6 @@
 package im.vector.app.features.settings.devices
 
 import com.airbnb.epoxy.TypedEpoxyController
-import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import im.vector.app.R
 import im.vector.app.core.epoxy.dividerItem
 import im.vector.app.core.epoxy.loadingItem
@@ -28,12 +25,14 @@ import im.vector.app.core.ui.list.GenericItem
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItem
 import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import timber.log.Timber
 import javax.inject.Inject
 
-class DeviceVerificationInfoEpoxyController @Inject constructor(private val stringProvider: StringProvider,
-                                                                private val colorProvider: ColorProvider,
-                                                                private val session: Session)
+class DeviceVerificationInfoBottomSheetController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider)
     : TypedEpoxyController<DeviceVerificationInfoBottomSheetViewState>() {
 
     var callback: Callback? = null
@@ -67,16 +66,18 @@ class DeviceVerificationInfoEpoxyController @Inject constructor(private val stri
 
         if (data.hasAccountCrossSigning) {
             // Cross Signing is enabled
-            handleE2EWithCrossSigning(data.isMine, data.accountCrossSigningIsTrusted, cryptoDeviceInfo, shield)
+            handleE2EWithCrossSigning(data, cryptoDeviceInfo, shield)
         } else {
-            handleE2EInLegacy(data.isMine, cryptoDeviceInfo, shield)
+            handleE2EInLegacy(data, cryptoDeviceInfo, shield)
         }
 
         // COMMON ACTIONS (Rename / signout)
         addGenericDeviceManageActions(data, cryptoDeviceInfo.deviceId)
     }
 
-    private fun handleE2EWithCrossSigning(isMine: Boolean, currentSessionIsTrusted: Boolean, cryptoDeviceInfo: CryptoDeviceInfo, shield: Int) {
+    private fun handleE2EWithCrossSigning(data: DeviceVerificationInfoBottomSheetViewState, cryptoDeviceInfo: CryptoDeviceInfo, shield: Int) {
+        val isMine = data.isMine
+        val currentSessionIsTrusted = data.accountCrossSigningIsTrusted
         Timber.v("handleE2EWithCrossSigning $isMine, $cryptoDeviceInfo, $shield")
 
         if (isMine) {
@@ -88,14 +89,18 @@ class DeviceVerificationInfoEpoxyController @Inject constructor(private val stri
                     title(stringProvider.getString(R.string.encryption_information_verified))
                     description(stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
                 }
-            } else {
-                // You need to complete security
+            } else if (data.canVerifySession) {
+                // You need to complete security, only if there are other session(s) available, or if 4S contains secrets
                 genericItem {
                     id("trust${cryptoDeviceInfo.deviceId}")
                     style(GenericItem.STYLE.BIG_TEXT)
                     titleIconResourceId(shield)
                     title(stringProvider.getString(R.string.crosssigning_verify_this_session))
-                    description(stringProvider.getString(R.string.confirm_your_identity))
+                    if (data.hasOtherSessions) {
+                        description(stringProvider.getString(R.string.confirm_your_identity))
+                    } else {
+                        description(stringProvider.getString(R.string.confirm_your_identity_quad_s))
+                    }
                 }
             }
         } else {
@@ -132,7 +137,7 @@ class DeviceVerificationInfoEpoxyController @Inject constructor(private val stri
             description("(${cryptoDeviceInfo.deviceId})")
         }
 
-        if (isMine && !currentSessionIsTrusted) {
+        if (isMine && !currentSessionIsTrusted && data.canVerifySession) {
             // Add complete security
             dividerItem {
                 id("completeSecurityDiv")
@@ -158,8 +163,9 @@ class DeviceVerificationInfoEpoxyController @Inject constructor(private val stri
         }
     }
 
-    private fun handleE2EInLegacy(isMine: Boolean, cryptoDeviceInfo: CryptoDeviceInfo, shield: Int) {
+    private fun handleE2EInLegacy(data: DeviceVerificationInfoBottomSheetViewState, cryptoDeviceInfo: CryptoDeviceInfo, shield: Int) {
         // ==== Legacy
+        val isMine = data.isMine
 
         // TRUST INFO SECTION
         if (cryptoDeviceInfo.trustLevel?.isLocallyVerified() == true) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
index 6f5bd909c7..ad840d2efb 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
@@ -15,31 +15,19 @@
  */
 package im.vector.app.features.settings.devices
 
-import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
-import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
-import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 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.internal.crypto.model.rest.DeviceInfo
 import org.matrix.android.sdk.rx.rx
 
-data class DeviceVerificationInfoBottomSheetViewState(
-        val cryptoDeviceInfo: Async<CryptoDeviceInfo?> = Uninitialized,
-        val deviceInfo: Async<DeviceInfo> = Uninitialized,
-        val hasAccountCrossSigning: Boolean = false,
-        val accountCrossSigningIsTrusted: Boolean = false,
-        val isMine: Boolean = false
-) : MvRxState
-
 class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@Assisted initialState: DeviceVerificationInfoBottomSheetViewState,
                                                                              @Assisted val deviceId: String,
                                                                              val session: Session
@@ -55,7 +43,8 @@ class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@As
         setState {
             copy(
                     hasAccountCrossSigning = session.cryptoService().crossSigningService().isCrossSigningInitialized(),
-                    accountCrossSigningIsTrusted = session.cryptoService().crossSigningService().isCrossSigningVerified()
+                    accountCrossSigningIsTrusted = session.cryptoService().crossSigningService().isCrossSigningVerified(),
+                    isRecoverySetup = session.sharedSecretStorageService.isRecoverySetup()
             )
         }
         session.rx().liveCrossSigningInfo(session.myUserId)
@@ -77,6 +66,14 @@ class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@As
                     )
                 }
 
+        session.rx().liveUserCryptoDevices(session.myUserId)
+                .map { it.size }
+                .execute {
+                    copy(
+                            hasOtherSessions = it.invoke() ?: 0 > 1
+                    )
+                }
+
         setState {
             copy(deviceInfo = Loading())
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
new file mode 100644
index 0000000000..a736b0442c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.devices
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
+
+data class DeviceVerificationInfoBottomSheetViewState(
+        val cryptoDeviceInfo: Async<CryptoDeviceInfo?> = Uninitialized,
+        val deviceInfo: Async<DeviceInfo> = Uninitialized,
+        val hasAccountCrossSigning: Boolean = false,
+        val accountCrossSigningIsTrusted: Boolean = false,
+        val isMine: Boolean = false,
+        val hasOtherSessions: Boolean = false,
+        val isRecoverySetup: Boolean = false
+) : MvRxState {
+
+    val canVerifySession: Boolean
+        get() = hasOtherSessions || isRecoverySetup
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 237c8c218d..8c5762afce 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -28,6 +28,12 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.error.SsoFlowNotSupportedYet
+import im.vector.app.core.platform.VectorViewModel
+import io.reactivex.Observable
+import io.reactivex.functions.BiFunction
+import io.reactivex.subjects.PublishSubject
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
@@ -41,11 +47,6 @@ import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import org.matrix.android.sdk.internal.util.awaitCallback
-import im.vector.app.core.platform.VectorViewModel
-import io.reactivex.Observable
-import io.reactivex.functions.BiFunction
-import io.reactivex.subjects.PublishSubject
-import kotlinx.coroutines.launch
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
@@ -309,14 +310,14 @@ class DevicesViewModel @AssistedInject constructor(
                 }
 
                 if (!isPasswordRequestFound) {
-                    // LoginFlowTypes.PASSWORD not supported, and this is the only one RiotX supports so far...
+                    // LoginFlowTypes.PASSWORD not supported, and this is the only one Element supports so far...
                     setState {
                         copy(
                                 request = Fail(failure)
                         )
                     }
 
-                    _viewEvents.post(DevicesViewEvents.Failure(failure))
+                    _viewEvents.post(DevicesViewEvents.Failure(SsoFlowNotSupportedYet()))
                 }
             }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
index b33a0cb5d8..ae45989a81 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
@@ -25,7 +25,6 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import im.vector.app.R
 import im.vector.app.core.dialogs.ManuallyVerifyDialog
 import im.vector.app.core.dialogs.PromptPasswordDialog
@@ -37,6 +36,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import kotlinx.android.synthetic.main.merge_overlay_waiting_view.*
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import javax.inject.Inject
 
 /**
@@ -48,7 +48,8 @@ class VectorSettingsDevicesFragment @Inject constructor(
 ) : VectorBaseFragment(), DevicesController.Callback {
 
     // used to avoid requesting to enter the password for each deletion
-    private var mAccountPassword: String = ""
+    // Note: Sonar does not like to use password for member name.
+    private var mAccountPass: String = ""
 
     override fun getLayoutResId() = R.layout.fragment_generic_recycler
 
@@ -91,7 +92,7 @@ class VectorSettingsDevicesFragment @Inject constructor(
         super.showFailure(throwable)
 
         // Password is maybe not good, for safety measure, reset it here
-        mAccountPassword = ""
+        mAccountPass = ""
     }
 
     override fun onDestroyView() {
@@ -107,7 +108,7 @@ class VectorSettingsDevicesFragment @Inject constructor(
     }
 
     override fun onDeviceClicked(deviceInfo: DeviceInfo) {
-        DeviceVerificationInfoBottomSheet.newInstance(deviceInfo.user_id ?: "", deviceInfo.deviceId ?: "").show(
+        DeviceVerificationInfoBottomSheet.newInstance(deviceInfo.userId ?: "", deviceInfo.deviceId ?: "").show(
                 childFragmentManager,
                 "VERIF_INFO"
         )
@@ -153,12 +154,12 @@ class VectorSettingsDevicesFragment @Inject constructor(
      * Show a dialog to ask for user password, or use a previously entered password.
      */
     private fun maybeShowDeleteDeviceWithPasswordDialog() {
-        if (mAccountPassword.isNotEmpty()) {
-            viewModel.handle(DevicesAction.Password(mAccountPassword))
+        if (mAccountPass.isNotEmpty()) {
+            viewModel.handle(DevicesAction.Password(mAccountPass))
         } else {
             PromptPasswordDialog().show(requireActivity()) { password ->
-                mAccountPassword = password
-                viewModel.handle(DevicesAction.Password(mAccountPassword))
+                mAccountPass = password
+                viewModel.handle(DevicesAction.Password(mAccountPass))
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt
index fd20007c99..df7cc4ba84 100644
--- a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt
@@ -26,11 +26,13 @@ import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.configuration.VectorConfiguration
 import im.vector.app.features.settings.VectorLocale
 import kotlinx.coroutines.launch
 
 class LocalePickerViewModel @AssistedInject constructor(
-        @Assisted initialState: LocalePickerViewState
+        @Assisted initialState: LocalePickerViewState,
+        private val vectorConfiguration: VectorConfiguration
 ) : VectorViewModel<LocalePickerViewState, LocalePickerAction, LocalePickerViewEvents>(initialState) {
 
     @AssistedInject.Factory
@@ -70,6 +72,7 @@ class LocalePickerViewModel @AssistedInject constructor(
 
     private fun handleSelectLocale(action: LocalePickerAction.SelectLocale) {
         VectorLocale.saveApplicationLocale(action.locale)
+        vectorConfiguration.applyToApplicationContext()
         _viewEvents.post(LocalePickerViewEvents.RestartActivity)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
index 9799b32c38..0144b162e9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
@@ -26,11 +26,11 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import org.matrix.android.sdk.api.pushrules.getActions
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.features.notifications.toNotificationAction
+import org.matrix.android.sdk.api.pushrules.getActions
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
 
 @EpoxyModelClass(layout = R.layout.item_pushrule_raw)
 abstract class PushRuleItem : EpoxyModelWithHolder<PushRuleItem.Holder>() {
@@ -68,7 +68,7 @@ abstract class PushRuleItem : EpoxyModelWithHolder<PushRuleItem.Holder>() {
             val description = StringBuffer()
             pushRule.conditions?.forEachIndexed { i, condition ->
                 if (i > 0) description.append("\n")
-                description.append(condition.asExecutableCondition()?.technicalDescription()
+                description.append(condition.asExecutableCondition(pushRule)?.technicalDescription()
                         ?: "UNSUPPORTED")
             }
             if (description.isBlank()) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt
new file mode 100644
index 0000000000..a8a1ab2e17
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.push
+
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import javax.inject.Inject
+
+class PushRulesController @Inject constructor(
+        private val stringProvider: StringProvider
+) : TypedEpoxyController<PushRulesViewState>() {
+
+    override fun buildModels(data: PushRulesViewState?) {
+        data?.let {
+            it.rules.forEach {
+                pushRuleItem {
+                    id(it.ruleId)
+                    pushRule(it)
+                }
+            }
+        } ?: run {
+            genericFooterItem {
+                id("footer")
+                text(stringProvider.getString(R.string.settings_push_rules_no_rules))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt
index 44cb5d8ea2..c361e21254 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt
@@ -17,7 +17,6 @@ package im.vector.app.features.settings.push
 
 import android.os.Bundle
 import android.view.View
-import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
@@ -25,19 +24,18 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.genericFooterItem
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
+import javax.inject.Inject
 
 // Referenced in vector_settings_notifications.xml
-class PushRulesFragment : VectorBaseFragment() {
+class PushRulesFragment @Inject constructor(
+        private val epoxyController: PushRulesController
+) : VectorBaseFragment() {
 
     override fun getLayoutResId() = R.layout.fragment_generic_recycler
 
     private val viewModel: PushRulesViewModel by fragmentViewModel(PushRulesViewModel::class)
 
-    private val epoxyController by lazy { PushRulesController(StringProvider(requireContext().resources)) }
-
     override fun onResume() {
         super.onResume()
         (activity as? VectorBaseActivity)?.supportActionBar?.setTitle(R.string.settings_push_rules)
@@ -56,23 +54,4 @@ class PushRulesFragment : VectorBaseFragment() {
     override fun invalidate() = withState(viewModel) { state ->
         epoxyController.setData(state)
     }
-
-    class PushRulesController(private val stringProvider: StringProvider) : TypedEpoxyController<PushRulesViewState>() {
-
-        override fun buildModels(data: PushRulesViewState?) {
-            data?.let {
-                it.rules.forEach {
-                    pushRuleItem {
-                        id(it.ruleId)
-                        pushRule(it)
-                    }
-                }
-            } ?: run {
-                genericFooterItem {
-                    id("footer")
-                    text(stringProvider.getString(R.string.settings_push_rules_no_rules))
-                }
-            }
-        }
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidItem.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidItem.kt
new file mode 100644
index 0000000000..6b05c9f96e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidItem.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.app.features.settings.threepids
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import com.airbnb.epoxy.EpoxyModelWithHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.onClick
+
+@EpoxyModelClass(layout = R.layout.item_settings_three_pid)
+abstract class ThreePidItem : EpoxyModelWithHolder<ThreePidItem.Holder>() {
+
+    @EpoxyAttribute
+    var title: String? = null
+
+    @EpoxyAttribute
+    @DrawableRes
+    var iconResId: Int? = null
+
+    @EpoxyAttribute
+    var deleteClickListener: ClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        val safeIconResId = iconResId
+        if (safeIconResId != null) {
+            holder.icon.isVisible = true
+            holder.icon.setImageResource(safeIconResId)
+        } else {
+            holder.icon.isVisible = false
+        }
+
+        holder.title.text = title
+        holder.delete.onClick { deleteClickListener?.invoke() }
+        holder.delete.isVisible = deleteClickListener != null
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val icon by bind<ImageView>(R.id.item_settings_three_pid_icon)
+        val title by bind<TextView>(R.id.item_settings_three_pid_title)
+        val delete by bind<View>(R.id.item_settings_three_pid_delete)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
new file mode 100644
index 0000000000..0be3c6a198
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsAction.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.identity.ThreePid
+
+sealed class ThreePidsSettingsAction : VectorViewModelAction {
+    data class ChangeUiState(val newUiState: ThreePidsSettingsUiState) : ThreePidsSettingsAction()
+    data class AddThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
+    data class SubmitCode(val threePid: ThreePid.Msisdn, val code: String) : ThreePidsSettingsAction()
+    data class ContinueThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
+    data class CancelThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
+    data class AccountPassword(val password: String) : ThreePidsSettingsAction()
+    data class DeleteThreePid(val threePid: ThreePid) : ThreePidsSettingsAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
new file mode 100644
index 0000000000..f07e31bb2e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import android.text.InputType
+import android.view.View
+import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import im.vector.app.R
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.noResultItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.getFormattedValue
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericButtonItem
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.features.discovery.SettingsEditTextItem
+import im.vector.app.features.discovery.settingsContinueCancelItem
+import im.vector.app.features.discovery.settingsEditTextItem
+import im.vector.app.features.discovery.settingsInfoItem
+import im.vector.app.features.discovery.settingsInformationItem
+import im.vector.app.features.discovery.settingsSectionTitleItem
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import javax.inject.Inject
+
+class ThreePidsSettingsController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider,
+        private val errorFormatter: ErrorFormatter
+) : TypedEpoxyController<ThreePidsSettingsViewState>() {
+
+    interface InteractionListener {
+        fun addEmail()
+        fun addMsisdn()
+        fun cancelAdding()
+        fun doAddEmail(email: String)
+        fun doAddMsisdn(msisdn: String)
+        fun submitCode(threePid: ThreePid.Msisdn, code: String)
+        fun continueThreePid(threePid: ThreePid)
+        fun cancelThreePid(threePid: ThreePid)
+        fun deleteThreePid(threePid: ThreePid)
+    }
+
+    var interactionListener: InteractionListener? = null
+
+    // For phone number or email (exclusive)
+    private var currentInputValue = ""
+
+    // For validation code
+    private val currentCodes = mutableMapOf<ThreePid, String>()
+
+    override fun buildModels(data: ThreePidsSettingsViewState?) {
+        if (data == null) return
+
+        if (data.uiState is ThreePidsSettingsUiState.Idle) {
+            currentInputValue = ""
+        }
+
+        when (data.threePids) {
+            is Loading -> {
+                loadingItem {
+                    id("loading")
+                    loadingText(stringProvider.getString(R.string.loading))
+                }
+            }
+            is Fail -> {
+                genericFooterItem {
+                    id("fail")
+                    text(data.threePids.error.localizedMessage)
+                }
+            }
+            is Success -> {
+                val dataList = data.threePids.invoke()
+                buildThreePids(dataList, data)
+            }
+        }
+    }
+
+    private fun buildThreePids(list: List<ThreePid>, data: ThreePidsSettingsViewState) {
+        val splited = list.groupBy { it is ThreePid.Email }
+        val emails = splited[true].orEmpty()
+        val msisdn = splited[false].orEmpty()
+
+        settingsSectionTitleItem {
+            id("email")
+            title(stringProvider.getString(R.string.settings_emails))
+        }
+
+        emails.forEach { buildThreePid("email ", it) }
+
+        // Pending emails
+        data.pendingThreePids.invoke()
+                ?.filterIsInstance(ThreePid.Email::class.java)
+                .orEmpty()
+                .let { pendingList ->
+                    if (pendingList.isEmpty() && emails.isEmpty()) {
+                        noResultItem {
+                            id("noEmail")
+                            text(stringProvider.getString(R.string.settings_emails_empty))
+                        }
+                    }
+
+                    pendingList.forEach { buildPendingThreePid(data, "p_email ", it) }
+                }
+
+        when (data.uiState) {
+            ThreePidsSettingsUiState.Idle                 ->
+                genericButtonItem {
+                    id("addEmail")
+                    text(stringProvider.getString(R.string.settings_add_email_address))
+                    textColor(colorProvider.getColor(R.color.riotx_accent))
+                    buttonClickAction(View.OnClickListener { interactionListener?.addEmail() })
+                }
+            is ThreePidsSettingsUiState.AddingEmail       -> {
+                settingsEditTextItem {
+                    id("addingEmail")
+                    inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
+                    hint(stringProvider.getString(R.string.medium_email))
+                    if (data.editTextReinitiator.isTrue()) {
+                        value("")
+                        requestFocus(true)
+                    }
+                    errorText(data.uiState.error)
+                    interactionListener(object : SettingsEditTextItem.Listener {
+                        override fun onValidate() {
+                            interactionListener?.doAddEmail(currentInputValue)
+                        }
+
+                        override fun onTextChange(text: String) {
+                            currentInputValue = text
+                        }
+                    })
+                }
+                settingsContinueCancelItem {
+                    id("contAddingEmail")
+                    continueOnClick { interactionListener?.doAddEmail(currentInputValue) }
+                    cancelOnClick { interactionListener?.cancelAdding() }
+                }
+            }
+            is ThreePidsSettingsUiState.AddingPhoneNumber -> Unit
+        }.exhaustive
+
+        settingsSectionTitleItem {
+            id("msisdn")
+            title(stringProvider.getString(R.string.settings_phone_numbers))
+        }
+
+        msisdn.forEach { buildThreePid("msisdn ", it) }
+
+        // Pending msisdn
+        data.pendingThreePids.invoke()
+                ?.filterIsInstance(ThreePid.Msisdn::class.java)
+                .orEmpty()
+                .let { pendingList ->
+                    if (pendingList.isEmpty() && msisdn.isEmpty()) {
+                        noResultItem {
+                            id("noMsisdn")
+                            text(stringProvider.getString(R.string.settings_phone_number_empty))
+                        }
+                    }
+
+                    pendingList.forEach { buildPendingThreePid(data, "p_msisdn ", it) }
+                }
+
+        when (data.uiState) {
+            ThreePidsSettingsUiState.Idle                 ->
+                genericButtonItem {
+                    id("addMsisdn")
+                    text(stringProvider.getString(R.string.settings_add_phone_number))
+                    textColor(colorProvider.getColor(R.color.riotx_accent))
+                    buttonClickAction(View.OnClickListener { interactionListener?.addMsisdn() })
+                }
+            is ThreePidsSettingsUiState.AddingEmail       -> Unit
+            is ThreePidsSettingsUiState.AddingPhoneNumber -> {
+                settingsInfoItem {
+                    id("addingMsisdnInfo")
+                    helperText(stringProvider.getString(R.string.login_msisdn_notice))
+                }
+                settingsEditTextItem {
+                    id("addingMsisdn")
+                    inputType(InputType.TYPE_CLASS_PHONE)
+                    hint(stringProvider.getString(R.string.medium_phone_number))
+                    if (data.editTextReinitiator.isTrue()) {
+                        value("")
+                        requestFocus(true)
+                    }
+                    errorText(data.uiState.error)
+                    interactionListener(object : SettingsEditTextItem.Listener {
+                        override fun onValidate() {
+                            interactionListener?.doAddMsisdn(currentInputValue)
+                        }
+
+                        override fun onTextChange(text: String) {
+                            currentInputValue = text
+                        }
+                    })
+                }
+                settingsContinueCancelItem {
+                    id("contAddingMsisdn")
+                    continueOnClick { interactionListener?.doAddMsisdn(currentInputValue) }
+                    cancelOnClick { interactionListener?.cancelAdding() }
+                }
+            }
+        }.exhaustive
+    }
+
+    private fun buildThreePid(idPrefix: String, threePid: ThreePid) {
+        threePidItem {
+            id(idPrefix + threePid.value)
+            // TODO Add an icon for emails
+            // iconResId(if (threePid is ThreePid.Msisdn) R.drawable.ic_phone else null)
+            title(threePid.getFormattedValue())
+            deleteClickListener { interactionListener?.deleteThreePid(threePid) }
+        }
+    }
+
+    private fun buildPendingThreePid(data: ThreePidsSettingsViewState, idPrefix: String, threePid: ThreePid) {
+        threePidItem {
+            id(idPrefix + threePid.value)
+            // TODO Add an icon for emails
+            // iconResId(if (threePid is ThreePid.Msisdn) R.drawable.ic_phone else null)
+            title(threePid.getFormattedValue())
+        }
+
+        when (threePid) {
+            is ThreePid.Email -> {
+                settingsInformationItem {
+                    id("info" + idPrefix + threePid.value)
+                    message(stringProvider.getString(R.string.account_email_validation_message))
+                    colorProvider(colorProvider)
+                }
+                settingsContinueCancelItem {
+                    id("cont" + idPrefix + threePid.value)
+                    continueOnClick { interactionListener?.continueThreePid(threePid) }
+                    cancelOnClick { interactionListener?.cancelThreePid(threePid) }
+                }
+            }
+            is ThreePid.Msisdn -> {
+                settingsInformationItem {
+                    id("info" + idPrefix + threePid.value)
+                    message(stringProvider.getString(R.string.settings_text_message_sent, threePid.getFormattedValue()))
+                    colorProvider(colorProvider)
+                }
+                settingsEditTextItem {
+                    id("msisdnVerification${threePid.value}")
+                    inputType(InputType.TYPE_CLASS_NUMBER)
+                    hint(stringProvider.getString(R.string.settings_text_message_sent_hint))
+                    if (data.msisdnValidationReinitiator[threePid]?.isTrue() == true) {
+                        value("")
+                    }
+                    errorText(getCodeError(data, threePid))
+                    interactionListener(object : SettingsEditTextItem.Listener {
+                        override fun onValidate() {
+                            interactionListener?.submitCode(threePid, currentCodes[threePid] ?: "")
+                        }
+
+                        override fun onTextChange(text: String) {
+                            currentCodes[threePid] = text
+                        }
+                    })
+                }
+                settingsContinueCancelItem {
+                    id("cont" + idPrefix + threePid.value)
+                    continueOnClick { interactionListener?.submitCode(threePid, currentCodes[threePid] ?: "") }
+                    cancelOnClick { interactionListener?.cancelThreePid(threePid) }
+                }
+            }
+        }
+    }
+
+    private fun getCodeError(data: ThreePidsSettingsViewState, threePid: ThreePid.Msisdn): String? {
+        val failure = (data.msisdnValidationRequests[threePid.value] as? Fail)?.error ?: return null
+        // Wrong code?
+        // See https://github.com/matrix-org/synapse/issues/8218
+        return if (failure is Failure.ServerError
+                && failure.httpCode == 400
+                && failure.error.code == MatrixError.M_UNKNOWN) {
+            stringProvider.getString(R.string.settings_text_message_sent_wrong_code)
+        } else {
+            errorFormatter.toHumanReadable(failure)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
new file mode 100644
index 0000000000..519b7132bf
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.dialogs.PromptPasswordDialog
+import im.vector.app.core.dialogs.withColoredButton
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.getFormattedValue
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.isEmail
+import im.vector.app.core.extensions.isMsisdn
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import kotlinx.android.synthetic.main.fragment_generic_recycler.*
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import javax.inject.Inject
+
+class ThreePidsSettingsFragment @Inject constructor(
+        private val viewModelFactory: ThreePidsSettingsViewModel.Factory,
+        private val epoxyController: ThreePidsSettingsController
+) :
+        VectorBaseFragment(),
+        OnBackPressed,
+        ThreePidsSettingsViewModel.Factory by viewModelFactory,
+        ThreePidsSettingsController.InteractionListener {
+
+    private val viewModel: ThreePidsSettingsViewModel by fragmentViewModel()
+
+    override fun getLayoutResId() = R.layout.fragment_generic_recycler
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        recyclerView.configureWith(epoxyController)
+        epoxyController.interactionListener = this
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is ThreePidsSettingsViewEvents.Failure -> displayErrorDialog(it.throwable)
+                ThreePidsSettingsViewEvents.RequestPassword -> askUserPassword()
+            }.exhaustive
+        }
+    }
+
+    private fun askUserPassword() {
+        PromptPasswordDialog().show(requireActivity()) { password ->
+            viewModel.handle(ThreePidsSettingsAction.AccountPassword(password))
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        recyclerView.cleanup()
+        epoxyController.interactionListener = null
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? VectorBaseActivity)?.supportActionBar?.setTitle(R.string.settings_emails_and_phone_numbers_title)
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        if (state.isLoading) {
+            showLoadingDialog()
+        } else {
+            dismissLoadingDialog()
+        }
+        epoxyController.setData(state)
+    }
+
+    override fun addEmail() {
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingEmail(null)))
+    }
+
+    override fun doAddEmail(email: String) {
+        // Sanity
+        val safeEmail = email.trim().replace(" ", "")
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingEmail(null)))
+
+        // Check that email is valid
+        if (!safeEmail.isEmail()) {
+            viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingEmail(getString(R.string.auth_invalid_email))))
+            return
+        }
+
+        viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Email(safeEmail)))
+    }
+
+    override fun addMsisdn() {
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingPhoneNumber(null)))
+    }
+
+    override fun doAddMsisdn(msisdn: String) {
+        // Sanity
+        val safeMsisdn = msisdn.trim().replace(" ", "")
+
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingPhoneNumber(null)))
+
+        // Check that phone number is valid
+        if (!msisdn.startsWith("+")) {
+            viewModel.handle(
+                    ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingPhoneNumber(getString(R.string.login_msisdn_error_not_international)))
+            )
+            return
+        }
+
+        if (!msisdn.isMsisdn()) {
+            viewModel.handle(
+                    ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.AddingPhoneNumber(getString(R.string.login_msisdn_error_other)))
+            )
+            return
+        }
+
+        viewModel.handle(ThreePidsSettingsAction.AddThreePid(ThreePid.Msisdn(safeMsisdn)))
+    }
+
+    override fun submitCode(threePid: ThreePid.Msisdn, code: String) {
+        viewModel.handle(ThreePidsSettingsAction.SubmitCode(threePid, code))
+        // Hide the keyboard
+        view?.hideKeyboard()
+    }
+
+    override fun cancelAdding() {
+        viewModel.handle(ThreePidsSettingsAction.ChangeUiState(ThreePidsSettingsUiState.Idle))
+        // Hide the keyboard
+        view?.hideKeyboard()
+    }
+
+    override fun continueThreePid(threePid: ThreePid) {
+        viewModel.handle(ThreePidsSettingsAction.ContinueThreePid(threePid))
+    }
+
+    override fun cancelThreePid(threePid: ThreePid) {
+        viewModel.handle(ThreePidsSettingsAction.CancelThreePid(threePid))
+    }
+
+    override fun deleteThreePid(threePid: ThreePid) {
+        AlertDialog.Builder(requireActivity())
+                .setMessage(getString(R.string.settings_remove_three_pid_confirmation_content, threePid.getFormattedValue()))
+                .setPositiveButton(R.string.remove) { _, _ ->
+                    viewModel.handle(ThreePidsSettingsAction.DeleteThreePid(threePid))
+                }
+                .setNegativeButton(R.string.cancel, null)
+                .show()
+                .withColoredButton(DialogInterface.BUTTON_POSITIVE)
+    }
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        return withState(viewModel) {
+            if (it.uiState is ThreePidsSettingsUiState.Idle) {
+                false
+            } else {
+                cancelAdding()
+                true
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsUiState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsUiState.kt
new file mode 100644
index 0000000000..d7e427acf3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsUiState.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+sealed class ThreePidsSettingsUiState {
+    object Idle : ThreePidsSettingsUiState()
+    data class AddingEmail(val error: String?) : ThreePidsSettingsUiState()
+    data class AddingPhoneNumber(val error: String?) : ThreePidsSettingsUiState()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt
new file mode 100644
index 0000000000..1ac2d10458
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class ThreePidsSettingsViewEvents : VectorViewEvents {
+    data class Failure(val throwable: Throwable) : ThreePidsSettingsViewEvents()
+    object RequestPassword : ThreePidsSettingsViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
new file mode 100644
index 0000000000..2001c85a2e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+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
+import com.airbnb.mvrx.ViewModelContext
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.R
+import im.vector.app.core.error.SsoFlowNotSupportedYet
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.ReadOnceTrue
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.rx.rx
+
+class ThreePidsSettingsViewModel @AssistedInject constructor(
+        @Assisted initialState: ThreePidsSettingsViewState,
+        private val session: Session,
+        private val stringProvider: StringProvider
+) : VectorViewModel<ThreePidsSettingsViewState, ThreePidsSettingsAction, ThreePidsSettingsViewEvents>(initialState) {
+
+    // UIA session
+    private var pendingThreePid: ThreePid? = null
+    private var pendingSession: String? = null
+
+    private val loadingCallback: MatrixCallback<Unit> = object : MatrixCallback<Unit> {
+        override fun onFailure(failure: Throwable) {
+            isLoading(false)
+
+            if (failure is Failure.RegistrationFlowError) {
+                var isPasswordRequestFound = false
+
+                // We only support LoginFlowTypes.PASSWORD
+                // Check if we can provide the user password
+                failure.registrationFlowResponse.flows?.forEach { interactiveAuthenticationFlow ->
+                    isPasswordRequestFound = isPasswordRequestFound || interactiveAuthenticationFlow.stages?.any { it == LoginFlowTypes.PASSWORD } == true
+                }
+
+                if (isPasswordRequestFound) {
+                    pendingSession = failure.registrationFlowResponse.session
+                    _viewEvents.post(ThreePidsSettingsViewEvents.RequestPassword)
+                } else {
+                    // LoginFlowTypes.PASSWORD not supported, and this is the only one Element supports so far...
+                    _viewEvents.post(ThreePidsSettingsViewEvents.Failure(SsoFlowNotSupportedYet()))
+                }
+            } else {
+                _viewEvents.post(ThreePidsSettingsViewEvents.Failure(failure))
+            }
+        }
+
+        override fun onSuccess(data: Unit) {
+            pendingThreePid = null
+            pendingSession = null
+            isLoading(false)
+        }
+    }
+
+    private fun isLoading(isLoading: Boolean) {
+        setState {
+            copy(
+                    isLoading = isLoading
+            )
+        }
+    }
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(initialState: ThreePidsSettingsViewState): ThreePidsSettingsViewModel
+    }
+
+    companion object : MvRxViewModelFactory<ThreePidsSettingsViewModel, ThreePidsSettingsViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: ThreePidsSettingsViewState): ThreePidsSettingsViewModel? {
+            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")
+        }
+    }
+
+    init {
+        observeThreePids()
+        observePendingThreePids()
+    }
+
+    private fun observeThreePids() {
+        session.rx()
+                .liveThreePIds(true)
+                .execute {
+                    copy(
+                            threePids = it
+                    )
+                }
+    }
+
+    private fun observePendingThreePids() {
+        session.rx()
+                .livePendingThreePIds()
+                .execute {
+                    copy(
+                            pendingThreePids = it,
+                            // Ensure the editText for code will be reset
+                            msisdnValidationReinitiator = msisdnValidationReinitiator.toMutableMap().apply {
+                                it.invoke()
+                                        ?.filterIsInstance(ThreePid.Msisdn::class.java)
+                                        ?.forEach { threePid ->
+                                            getOrPut(threePid) { ReadOnceTrue() }
+                                        }
+                            }
+                    )
+                }
+    }
+
+    override fun handle(action: ThreePidsSettingsAction) {
+        when (action) {
+            is ThreePidsSettingsAction.AddThreePid -> handleAddThreePid(action)
+            is ThreePidsSettingsAction.ContinueThreePid -> handleContinueThreePid(action)
+            is ThreePidsSettingsAction.SubmitCode -> handleSubmitCode(action)
+            is ThreePidsSettingsAction.CancelThreePid -> handleCancelThreePid(action)
+            is ThreePidsSettingsAction.AccountPassword -> handleAccountPassword(action)
+            is ThreePidsSettingsAction.DeleteThreePid -> handleDeleteThreePid(action)
+            is ThreePidsSettingsAction.ChangeUiState -> handleChangeUiState(action)
+        }.exhaustive
+    }
+
+    private fun handleSubmitCode(action: ThreePidsSettingsAction.SubmitCode) {
+        isLoading(true)
+        setState {
+            copy(
+                    msisdnValidationRequests = msisdnValidationRequests.toMutableMap().apply {
+                        put(action.threePid.value, Loading())
+                    }
+            )
+        }
+
+        viewModelScope.launch {
+            // First submit the code
+            session.submitSmsCode(action.threePid, action.code, object : MatrixCallback<Unit> {
+                override fun onSuccess(data: Unit) {
+                    // then finalize
+                    pendingThreePid = action.threePid
+                    session.finalizeAddingThreePid(action.threePid, null, null, loadingCallback)
+                }
+
+                override fun onFailure(failure: Throwable) {
+                    isLoading(false)
+                    setState {
+                        copy(
+                                msisdnValidationRequests = msisdnValidationRequests.toMutableMap().apply {
+                                    put(action.threePid.value, Fail(failure))
+                                }
+                        )
+                    }
+                }
+            })
+        }
+    }
+
+    private fun handleChangeUiState(action: ThreePidsSettingsAction.ChangeUiState) {
+        setState {
+            copy(
+                    uiState = action.newUiState,
+                    editTextReinitiator = ReadOnceTrue()
+            )
+        }
+    }
+
+    private fun handleAddThreePid(action: ThreePidsSettingsAction.AddThreePid) {
+        isLoading(true)
+
+        withState { state ->
+            val allThreePids = state.threePids.invoke().orEmpty() + state.pendingThreePids.invoke().orEmpty()
+            if (allThreePids.any { it.value == action.threePid.value }) {
+                _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalArgumentException(stringProvider.getString(
+                        when (action.threePid) {
+                            is ThreePid.Email  -> R.string.auth_email_already_defined
+                            is ThreePid.Msisdn -> R.string.auth_msisdn_already_defined
+                        }
+                ))))
+            } else {
+                viewModelScope.launch {
+                    session.addThreePid(action.threePid, object : MatrixCallback<Unit> {
+                        override fun onSuccess(data: Unit) {
+                            // Also reset the state
+                            setState {
+                                copy(
+                                        uiState = ThreePidsSettingsUiState.Idle
+                                )
+                            }
+                            loadingCallback.onSuccess(data)
+                        }
+
+                        override fun onFailure(failure: Throwable) {
+                            loadingCallback.onFailure(failure)
+                        }
+                    })
+                }
+            }
+        }
+    }
+
+    private fun handleContinueThreePid(action: ThreePidsSettingsAction.ContinueThreePid) {
+        isLoading(true)
+        pendingThreePid = action.threePid
+        viewModelScope.launch {
+            session.finalizeAddingThreePid(action.threePid, null, null, loadingCallback)
+        }
+    }
+
+    private fun handleCancelThreePid(action: ThreePidsSettingsAction.CancelThreePid) {
+        isLoading(true)
+        viewModelScope.launch {
+            session.cancelAddingThreePid(action.threePid, loadingCallback)
+        }
+    }
+
+    private fun handleAccountPassword(action: ThreePidsSettingsAction.AccountPassword) {
+        val safeSession = pendingSession ?: return Unit
+                .also { _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalStateException("No pending session"))) }
+        val safeThreePid = pendingThreePid ?: return Unit
+                .also { _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalStateException("No pending threePid"))) }
+        isLoading(true)
+        viewModelScope.launch {
+            session.finalizeAddingThreePid(safeThreePid, safeSession, action.password, loadingCallback)
+        }
+    }
+
+    private fun handleDeleteThreePid(action: ThreePidsSettingsAction.DeleteThreePid) {
+        isLoading(true)
+        viewModelScope.launch {
+            session.deleteThreePid(action.threePid, loadingCallback)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
new file mode 100644
index 0000000000..b080c06cbd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewState.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.threepids
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import im.vector.app.core.utils.ReadOnceTrue
+import org.matrix.android.sdk.api.session.identity.ThreePid
+
+data class ThreePidsSettingsViewState(
+        val uiState: ThreePidsSettingsUiState = ThreePidsSettingsUiState.Idle,
+        val isLoading: Boolean = false,
+        val threePids: Async<List<ThreePid>> = Uninitialized,
+        val pendingThreePids: Async<List<ThreePid>> = Uninitialized,
+        val msisdnValidationRequests: Map<String, Async<Unit>> = emptyMap(),
+        val editTextReinitiator: ReadOnceTrue = ReadOnceTrue(),
+        val msisdnValidationReinitiator: Map<ThreePid, ReadOnceTrue> = emptyMap()
+) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index ef806b55b4..d337b790a3 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -44,6 +44,12 @@ object ThemeUtils {
 
     private val mColorByAttr = HashMap<Int, Int>()
 
+    // init the theme
+    fun init(context: Context) {
+        val theme = getApplicationTheme(context)
+        setApplicationTheme(context, theme)
+    }
+
     /**
      * @return true if current theme is Light or Status
      */
diff --git a/vector/src/main/play/listings/en-US/full_description.txt b/vector/src/main/play/listings/en-US/full_description.txt
index e2164a786f..e939b75bb7 100644
--- a/vector/src/main/play/listings/en-US/full_description.txt
+++ b/vector/src/main/play/listings/en-US/full_description.txt
@@ -13,7 +13,7 @@ Element is able to do all this because it operates on Matrix - the standard for
 
 Element puts you in control by letting you choose who hosts your conversations. From the Element app, you can choose to host in different ways:
 
-1. Get a free account on the matrix.org public server
+1. Get a free account on the matrix.org public server hosted by the Matrix developers, or choose from thousands of public servers hosted by volunteers
 2. Self-host your account by running a server on your own hardware
 3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
 
@@ -27,4 +27,4 @@ Element puts you in control by letting you choose who hosts your conversations.
 
 <b>COMPLETE COMMUNICATION</b>: Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
 
-<b>EVERYWHERE YOU ARE</b>: Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io.
\ No newline at end of file
+<b>EVERYWHERE YOU ARE</b>: Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io.
diff --git a/vector/src/main/play/listings/kab/full_description.txt b/vector/src/main/play/listings/kab/full_description.txt
new file mode 100644
index 0000000000..019294e869
--- /dev/null
+++ b/vector/src/main/play/listings/kab/full_description.txt
@@ -0,0 +1,30 @@
+Element d anaw amaynut n usnas n tirawt d uttekki ara:
+
+1. Ad ak•am-yefken tazmert n usenqed akken ad tḥerzeḍ tabaḍnit-ik•im
+2. Ad k•kem-yeǧǧ ad temmeslayeḍ d yal yiwen deg neɣ akkin i uẓeṭṭa n Matrix s usekcem n yisnasen am Slack
+3. Ad k•kem-immesten seg udellel, asekyed n yisefka d tebḥirin tufrigin
+4. Ad k•kem-iɣelles s uwgelhen seg yixef ɣer yixef, s uzmal anmidag i usenqed n wiyaḍ
+
+Element yemgarad aṭas ɣef yisnasen-nniḍen n tirawt d uttekki acku mačči d aslammas yerna d aɣbalu yeldin.
+
+Element ad k•kem-yeǧǧ ad tsennefɣeḍ iman-ik•im - neɣ ad tferneḍ asenneftaɣ - akken ad tesɛuḍ tabaḍnit, ad tesneqdeḍ isefka-k•m d yidiwenniyen-ik•im. Ad ak•am-yefk tasiregt ad tkecmeḍ ɣer uẓeṭṭa yeldin, akken ur tettɣimiḍ ara tettmeslayeḍ d yiseqdacen n Element kan. Yerna d aɣellsan nezzeh.
+
+Element yezmer ad yeg akk aya acku yetteddu deg Matrix - alugen i teɣwalt yeldin ur nelli d taslammast.
+
+Element ad ak•am-yefk tazmert ad tferneḍ asenneftaɣ i yidiwenniyen-ik•im. Seg usnas n Element, tzemreḍ ad tferneḍ ad tsennefɣeḍ s yiberdan yemgaraden:
+
+1. Ldi amiḍan baṭel deg uqeddac azayez n Matrix.org
+2. Sennefteɣ amiḍan-ik•im s yiman-ik•im s usenker n uqeddac deg warrum-ik•im
+3. Jerred i umiḍan deg uqeddac yugnen s umulteɣ ɣer tɣerɣert n usennefteɣ n Element Matrix Services
+
+<b>Iwacu ara tferneḍ Element?</b>
+
+<b>SƐU ISEFKA-INEK•INEM</b>: D kečč/kemm ara ifernen anda ara tḥerzeḍ isefka-k•m d yiznan-ik•im. D ayla-k•m, d kečč/kemm ara t-isneqden, mačči d kra n MEGACORP ara yamden isefka-k•m neɣ ara yefken tasiregt n unekcum i wis tlata.
+
+<b>TIRAWT YELDIN D UTTEKKI</b>: Tzemreḍ ad temmeslayeḍ d yal yiwen deg uẓeṭṭa n Matrix, ɣas seqdacen Element neɣ asnas-nniḍen n Matrix, ulamma daɣen seqdacen anagraw n tirawt yemgaraden am Slack, IRC neɣ XMPP.
+
+<b>D AƔELLSAN NEZZEH</b>: Awgelhen seg yixef ɣer yixef n tidet (anagar wid/tid i yellan deg udiwenni i izemren ad zemken iznan), d uzmal anmidag i usenqed n yibenken n yimettekkiyen deg udiwenni.
+
+<b>TAƔWALT TUMMIDT</b>: Tirawt, isawalen s taɣect neɣ s tvidyut, beṭṭu n yifuyla, beṭṭu n ugdil d waṭas n yimsidaf, ibuṭen d yiwiǧiten. Bnu tixxamin, timezdagnutin, ḍfer amaynut tfakkeḍ timahilin.
+
+<b>ANDA TEBƔUḌ TILIḌ</b>: Ḍfer amaynut anda tebɣuḍ tiliḍ s umazray ummid n yiznan yemtawan deg akk ibenken-ik•im, daɣen deg web deg https://app.element.io.
diff --git a/vector/src/main/play/listings/kab/short_description.txt b/vector/src/main/play/listings/kab/short_description.txt
new file mode 100644
index 0000000000..bee72ea427
--- /dev/null
+++ b/vector/src/main/play/listings/kab/short_description.txt
@@ -0,0 +1 @@
+Adiwenni aɣellsan ur nelli  aslammas & VoIP. Ḥrez isefra-k•m seg tama tis tlata.
diff --git a/vector/src/main/play/listings/kab/title.txt b/vector/src/main/play/listings/kab/title.txt
new file mode 100644
index 0000000000..d854e8f975
--- /dev/null
+++ b/vector/src/main/play/listings/kab/title.txt
@@ -0,0 +1 @@
+Element (Riot.im zik)
diff --git a/vector/src/main/play/listings/pt_BR/full_description.txt b/vector/src/main/play/listings/pt_BR/full_description.txt
index a3b5dda311..82b38b473c 100644
--- a/vector/src/main/play/listings/pt_BR/full_description.txt
+++ b/vector/src/main/play/listings/pt_BR/full_description.txt
@@ -3,7 +3,7 @@ Element é um novo tipo de aplicativo de mensagens e colaboração que:
 1. Coloca você no controle de sua privacidade;
 2. Permite que você se comunique com qualquer pessoa na rede Matrix e, através de integrações, outros aplicativos como o Slack;
 3. Protege você de anúncios, mineração de dados e de ecossistemas fechados;
-4. Faz uso da criptografia de ponta-a-ponta, com assinatura cruzada para verificar outros.
+4. Faz uso da criptografia de ponta a ponta, com autoverificação para confirmar outras pessoas.
 
 Element é completamente diferente de outros aplicativos de mensagem e colaboração porque é descentralizado e código aberto.
 
@@ -19,12 +19,12 @@ Element coloca você no controle ao permitir quem hospeda suas conversas. Neste
 
 <b>Por que escolher o Element?</b>
 
-<b>SEJA O DONO DE SEUS DADOS</b>: Você decide onde manter seus dados e mensagens. Você é o dono deles e também os controla, não alguma mega corporação que minera os seus dados ou compartilha eles com terceiros.
+<b>SEJA O DONO DE SEUS DADOS</b>: você decide onde manter seus dados e mensagens. Você é o dono deles e também os controla, não alguma mega corporação que minera os seus dados ou compartilha eles com terceiros.
 
-<b>COLABORAÇÃO E MENSAGENS ABERTAS</b>: Você pode falar com qualquer outra pessoa na rede Matrix, não importa se ela está usando o Element ou algum outro aplicativo Matrix, ou até mesmo se ela está utilizando um sistema de mensagens diferente como o Slack, IRC ou XMPP.
+<b>COLABORAÇÃO E MENSAGENS ABERTAS</b>: você pode falar com qualquer outra pessoa na rede Matrix, não importa se ela está usando o Element ou algum outro aplicativo Matrix, ou até mesmo se ela está utilizando um sistema de mensagens diferente como o Slack, IRC ou XMPP.
 
-<b>SUPER-SEGURO</b>: Criptografia de ponta-a-ponta verdadeira (apenas aqueles na conversa podem descriptografar mensagens), e assinatura cruzada para verificar os dispositivos de participantes de conversas.
+<b>SUPER-SEGURO</b>: criptografia de ponta a ponta verdadeira (apenas aqueles na conversa podem descriptografar mensagens), e assinatura cruzada para verificar os dispositivos de participantes de conversas.
 
-<b>COMUNICAÇÃO COMPLETA</b>: Mensagens, chamadas de voz, chamadas de vídeo, compartilhamento de arquivos, compartilhamento de tela e um monte de integrações, robôs e widgets. Construa salas, comunidades, mantenha contato e faça seus projetos.
+<b>COMUNICAÇÃO COMPLETA</b>: mensagens, chamadas de voz, chamadas de vídeo, compartilhamento de arquivos, compartilhamento de tela e um monte de integrações, robôs e widgets. Construa salas, comunidades, mantenha contato e faça seus projetos.
 
-<b>NÃO IMPORTA ONDE VOCÊ ESTEJA</b>: Mantenha contato não importa onde você esteja com o histórico sincronizado de mensagens em todos os seus dispositivos e no navegador em https://app.element.io.
+<b>NÃO IMPORTA ONDE VOCÊ ESTEJA</b>: mantenha contato não importa onde você esteja com o histórico sincronizado de mensagens em todos os seus dispositivos e no navegador em https://app.element.io.
diff --git a/vector/src/main/play/listings/pt_BR/short_description.txt b/vector/src/main/play/listings/pt_BR/short_description.txt
index 7dd54cd2fd..853f629c30 100644
--- a/vector/src/main/play/listings/pt_BR/short_description.txt
+++ b/vector/src/main/play/listings/pt_BR/short_description.txt
@@ -1 +1 @@
-Bate-papo seguro descentralizado e voz sobre IP. Mantenha seus dados seguros.
+Conversas e chamadas seguras e descentralizadas. Mantenha seus dados protegidos.
diff --git a/vector/src/main/play/listings/th/short_description.txt b/vector/src/main/play/listings/th/short_description.txt
new file mode 100644
index 0000000000..75cda9eb59
--- /dev/null
+++ b/vector/src/main/play/listings/th/short_description.txt
@@ -0,0 +1 @@
+การแชทและ VoIP แบบกระจายศูนย์ที่ปลอดภัย ปกป้องข้อมูลของคุณจากบุคคลที่สาม
diff --git a/vector/src/main/play/listings/th/title.txt b/vector/src/main/play/listings/th/title.txt
new file mode 100644
index 0000000000..1d44c84928
--- /dev/null
+++ b/vector/src/main/play/listings/th/title.txt
@@ -0,0 +1 @@
+Element (ชื่อเดิม Riot.im)
diff --git a/vector/src/main/play/listings/uk/full_description.txt b/vector/src/main/play/listings/uk/full_description.txt
index f0e53e4a0f..ca6b4c2ae1 100644
--- a/vector/src/main/play/listings/uk/full_description.txt
+++ b/vector/src/main/play/listings/uk/full_description.txt
@@ -9,7 +9,7 @@ Element ґрунтовно відрізняється від інших заст
 
 Element дозволяє вам розміщувати сервер в себе або обирати будь-якого з надавачів послуг, таким чином забезпечуючи вам конфіденційність і  можливість володіти власними даними й бесідами та контролювати їх. Він надає вам доступ до відкритої мережі, тож ви не є обмеженими спілкуванням виключно з користувачами Element. І він є дуже надійним та безпечним.
 
-Element здатен забезпечити усе завдяки тому, що він заснований на протоколі Matrix — стандарті для відкритого та децентралізованого спілкування.
+Element здатен забезпечити усе це завдяки тому, що він заснований на протоколі Matrix — стандарті для відкритого та децентралізованого спілкування.
 
 Element надає вам повний контроль, дозволяючи обирати з-поміж надавачів послуг, що обслуговують сервери з вашими бесідами. Ви вільні обрати будь-який спосіб розміщення прямо з застосунку Element:
 
diff --git a/vector/src/main/res/drawable/disclaimer_top_banner_foreground.xml b/vector/src/main/res/drawable/disclaimer_top_banner_foreground.xml
deleted file mode 100644
index c031da1e5b..0000000000
--- a/vector/src/main/res/drawable/disclaimer_top_banner_foreground.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="163dp"
-    android:height="127dp"
-    android:viewportWidth="163"
-    android:viewportHeight="127">
-  <path
-      android:pathData="M113.569,169.348C129.753,185.532 153.161,188.363 165.853,175.671C178.545,162.979 175.715,139.57 159.531,123.386C143.347,107.203 44.653,8.372 44.653,8.372L35.819,18.975C35.819,18.975 39.221,27.764 37.204,30.186C35.186,32.608 24.684,32.34 24.684,32.34L6.34,54.358C6.34,54.358 4.89,60.67 6.106,61.885C41.927,97.706 77.748,133.527 113.569,169.348Z"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
-      android:fillAlpha="0.147508741"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M19.447,19.068L19.447,27.722L28.202,27.713C28.313,27.713 28.415,27.71 28.515,27.703C30.818,27.551 32.617,25.656 32.617,23.391C32.617,21.007 30.641,19.068 28.211,19.068L19.447,19.068ZM10.788,61.81C6.006,61.81 2.129,58.007 2.129,53.316L2.129,37.127C2.097,36.833 2.08,36.535 2.08,36.232C2.08,35.925 2.096,35.621 2.129,35.322L2.129,10.574C2.129,5.882 6.006,2.079 10.788,2.079L28.211,2.079C40.19,2.079 49.935,11.639 49.935,23.391C49.935,34.563 41.04,43.902 29.684,44.652C29.201,44.685 28.704,44.702 28.211,44.702L19.447,44.71L19.447,53.316C19.447,58.007 15.57,61.81 10.788,61.81L10.788,61.81Z"
-      android:strokeWidth="1"
-      android:fillColor="#A2DDEF"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M19.447,19.068L19.447,27.722L28.202,27.713C28.313,27.713 28.415,27.71 28.515,27.703C30.818,27.551 32.617,25.656 32.617,23.391C32.617,21.007 30.641,19.068 28.211,19.068L19.447,19.068ZM10.788,61.81C6.006,61.81 2.129,58.007 2.129,53.316L2.129,10.574C2.129,5.882 6.006,2.079 10.788,2.079L28.211,2.079C40.19,2.079 49.935,11.639 49.935,23.391C49.935,34.563 41.04,43.902 29.684,44.652C29.201,44.685 28.704,44.702 28.211,44.702L19.447,44.71L19.447,53.316C19.447,58.007 15.57,61.81 10.788,61.81Z"
-      android:strokeWidth="1.52445396"
-      android:fillColor="#00000000"
-      android:strokeColor="#368BD6"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M10.788,53.315L10.788,10.574L28.211,10.574C35.426,10.574 41.276,16.312 41.276,23.39C41.276,30.175 35.902,35.729 29.102,36.178C28.807,36.197 28.51,36.207 28.211,36.207L10.788,36.207"
-      android:strokeWidth="1.52445396"
-      android:fillColor="#00000000"
-      android:strokeColor="#368BD6"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M17.923,5.702C19.25,7.56 19.76,9.815 19.358,12.048C18.956,14.283 17.691,16.229 15.795,17.531C11.881,20.217 6.467,19.282 3.726,15.445C2.399,13.587 1.889,11.333 2.291,9.099C2.693,6.864 3.958,4.917 5.854,3.617C9.768,0.93 15.182,1.865 17.923,5.702ZM41.347,61.805C38.618,61.805 35.934,60.543 34.248,58.185L22.011,41.052C19.266,37.21 20.217,31.913 24.133,29.222C28.049,26.528 33.449,27.461 36.193,31.303L48.431,48.435C51.175,52.277 50.225,57.574 46.309,60.266C44.797,61.306 43.063,61.805 41.347,61.805Z"
-      android:strokeWidth="1"
-      android:fillColor="#368BD6"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-</vector>
diff --git a/vector/src/main/res/layout/item_device.xml b/vector/src/main/res/layout/item_device.xml
index 9917cc0e94..6d63b1c3a7 100644
--- a/vector/src/main/res/layout/item_device.xml
+++ b/vector/src/main/res/layout/item_device.xml
@@ -27,7 +27,7 @@
             tools:text="Riot X" />
 
         <!---
-            The following detailed informations are displayed in developper mode
+            The following detailed data are displayed in developer mode
         -->
         <TextView
             android:id="@+id/itemDeviceDisplayNameLabel"
diff --git a/vector/src/main/res/layout/item_form_text_input.xml b/vector/src/main/res/layout/item_form_text_input.xml
index 775489c5d9..594bfc1788 100644
--- a/vector/src/main/res/layout/item_form_text_input.xml
+++ b/vector/src/main/res/layout/item_form_text_input.xml
@@ -14,6 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        app:errorEnabled="true"
         app:layout_constraintBottom_toTopOf="@+id/formTextInputDivider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index 4b206c352d..f89413f15f 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -91,7 +91,7 @@
         app:layout_constraintTop_toTopOf="@+id/item_generic_title_text"
         tools:visibility="visible" />
 
-    <!-- Set a maw width because the text can be long -->
+    <!-- Set a max width because the text can be long -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/item_generic_action_button"
         style="@style/VectorButtonStyle"
@@ -102,10 +102,26 @@
         android:layout_marginBottom="16dp"
         android:maxWidth="@dimen/button_max_width"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/item_generic_destructive_action_button"
         app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
         app:layout_constraintTop_toBottomOf="@+id/item_generic_description_text"
         tools:text="@string/settings_troubleshoot_test_device_settings_quickfix"
         tools:visibility="visible" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/item_generic_destructive_action_button"
+        style="@style/VectorButtonStyleDestructive"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:maxWidth="@dimen/button_max_width"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
+        app:layout_constraintTop_toBottomOf="@+id/item_generic_action_button"
+        tools:text="@string/delete"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_settings_button.xml b/vector/src/main/res/layout/item_settings_button.xml
index d994a7fe99..9070eb37b7 100644
--- a/vector/src/main/res/layout/item_settings_button.xml
+++ b/vector/src/main/res/layout/item_settings_button.xml
@@ -9,7 +9,7 @@
     <Button
         android:id="@+id/settings_item_button"
         style="@style/VectorButtonStyleText"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         tools:text="@string/action_change" />
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index 592eb6dd96..583ed541ca 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -51,7 +51,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
-    <Switch
+    <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/settings_item_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index 2aeda8c295..7fe7937da6 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -21,7 +21,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            android:orientation="vertical"
             android:textColor="?android:textColorPrimary"
             android:textSize="15sp"
             android:textStyle="bold"
@@ -38,7 +37,7 @@
             tools:text="Description / Value" />
     </LinearLayout>
 
-    <Switch
+    <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/settings_item_switch"
         android:layout_width="50dp"
         android:layout_height="50dp"
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
new file mode 100644
index 0000000000..fd3443ac17
--- /dev/null
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -0,0 +1,47 @@
+<?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:minHeight="64dp"
+    android:paddingStart="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin">
+
+    <ImageView
+        android:id="@+id/item_settings_three_pid_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:scaleType="center"
+        android:tint="?riotx_text_secondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_phone" />
+
+    <TextView
+        android:id="@+id/item_settings_three_pid_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="4dp"
+        android:textColor="?riotx_text_primary"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/item_settings_three_pid_delete"
+        app:layout_constraintStart_toEndOf="@+id/item_settings_three_pid_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="alice@email-provider.org" />
+
+    <ImageView
+        android:id="@+id/item_settings_three_pid_delete"
+        android:layout_width="@dimen/layout_touch_size"
+        android:layout_height="@dimen/layout_touch_size"
+        android:scaleType="center"
+        android:src="@drawable/ic_trash_24"
+        android:tint="@color/riotx_destructive_accent"
+        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/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index a67d14168b..72a6cd6ec6 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -42,18 +42,31 @@
     <!-- the media -->
     <TextView
         android:id="@+id/messageFilenameView"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="32dp"
         android:autoLink="none"
         android:gravity="center_vertical"
         android:minHeight="@dimen/chat_avatar_size"
+        app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@+id/messageFileImageView"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="A filename here" />
 
+    <ProgressBar
+        android:id="@+id/eventSendingIndicator"
+        style="?android:attr/progressBarStyleSmall"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:visibility="gone"
+        app:layout_constraintStart_toEndOf="@id/messageFilenameView"
+        app:layout_constraintTop_toTopOf="@id/messageFilenameView"
+        tools:visibility="visible" />
+
+
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/horizontalBarrier"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
index ad3b036a4d..ba4b4f64d7 100644
--- a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
@@ -28,6 +28,15 @@
         app:layout_constraintTop_toTopOf="@id/messageThumbnailView"
         tools:visibility="visible" />
 
+    <ProgressBar
+        android:id="@+id/eventSendingIndicator"
+        style="?android:attr/progressBarStyleSmall"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:visibility="gone"
+        app:layout_constraintStart_toEndOf="@id/messageThumbnailView"
+        app:layout_constraintTop_toBottomOf="@id/messageFailToSendIndicator" />
+
     <ImageView
         android:id="@+id/messageMediaPlayView"
         android:layout_width="40dp"
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
new file mode 100644
index 0000000000..a097767e63
--- /dev/null
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemUnknownRoomLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    android:minHeight="64dp">
+
+    <ImageView
+        android:id="@+id/itemUnknownRoomAvatar"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_marginStart="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/itemUnknownRoomName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="17dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/itemUnknownRoomAvatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@sample/matrix.json/data/roomName" />
+
+    <View
+        android:id="@+id/itemPublicRoomBottomSeparator"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?riotx_header_panel_border_mobile"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 30689751d6..fd2a5d09ee 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -1926,4 +1926,6 @@
     <string name="event_redacted">Съобщението беше изтрито</string>
     <string name="settings_show_redacted">Показвай премахнатите съобщения</string>
     <string name="settings_show_redacted_summary">Показвай индикатор на мястото на премахнатите съобщения</string>
+    <string name="play_video">Възпроизведи</string>
+    <string name="pause_video">Пауза</string>
 </resources>
diff --git a/vector/src/main/res/values-bn-rBD/strings.xml b/vector/src/main/res/values-bn-rBD/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/vector/src/main/res/values-bn-rBD/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index 10c0b793f7..e00ba760e6 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -1406,4 +1406,8 @@
     <string name="keys_backup_restore_is_getting_backup_version">ব্যাকআপ সংস্করণ আনছে…</string>
     <string name="keys_backup_restore_with_passphrase">আপনার এনক্রিপ্ট করা বার্তাগুলির ইতিহাস আনলক করতে আপনার পুনরুদ্ধার পাসফ্রেজটি ব্যবহার করুন</string>
     <string name="keys_backup_restore_use_recovery_key">আপনার পুনরুদ্ধার কী ব্যবহার করুন</string>
+
+    <string name="call_notification_answer">গ্রহণ</string>
+    <string name="call_notification_reject">পতন</string>
+    <string name="call_notification_hangup">বন্ধ করুন</string>
 </resources>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 2579effd9c..f7037c11fc 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -12,6 +12,10 @@
     <string name="title_activity_member_details">Benutzerdetails</string>
     <string name="title_activity_historical">Historisch</string>
 
+    <string name="call_notification_answer">Akzeptiere</string>
+    <string name="call_notification_reject">Ablehnen</string>
+    <string name="call_notification_hangup">Anruf beenden</string>
+
     <!-- button names -->
     <string name="ok">OK</string>
     <string name="cancel">Abbrechen</string>
@@ -608,7 +612,7 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="encryption_information_sender_device_information">Informationen der Absendersitzung</string>
     <string name="encryption_information_device_name">Öffentlicher Name</string>
     <string name="encryption_information_name">Öffentlicher Name</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="encryption_information_device_id">Sitzungs-ID</string>
     <string name="encryption_information_device_key">Sitzungsschlüssel</string>
     <string name="encryption_information_verification">Verifizierungsstatus</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519-Fingerabdruck</string>
@@ -785,7 +789,7 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="settings_vibrate_on_mention">Vibriere beim Erwähnen eines Nutzers</string>
 
     <string name="room_settings_room_notifications_title">Benachrichtigungen</string>
-    <string name="room_settings_no_flair">Dieser Raum zeigt für keine Communities die Abzeichen an</string>
+    <string name="room_settings_no_flair">Dieser Raum zeigt für keine Community Avatare an</string>
     <string name="room_settings_add_new_group">Neue Community-ID (z.B. +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">Ungültige Community-ID</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' ist keine valide Community-ID</string>
@@ -819,7 +823,7 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="forget_room">Raum vergessen</string>
     <string name="room_settings_add_homescreen_shortcut">Startbildschirm-Verknüpfung hinzufügen</string>
 
-    <string name="settings_flair">Abzeichen</string>
+    <string name="settings_flair">Community Avatare</string>
 
     <string name="send_bug_report_rage_shake">Schüttele, um einen Fehler zu melden</string>
 
@@ -1623,7 +1627,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
 
     <string name="settings_set_workmanager_delay">Bevorzugtes Synchronisationsintervall</string>
-    <string name="settings_discovery_category">Fund</string>
+    <string name="settings_discovery_category">Auffindbarkeit</string>
     <string name="encryption_information_device_name_with_warning">Öffentlicher Name (sichtbar für Personen, mit denen du kommunizierst)</string>
     <string name="device_name_warning">Der öffentliche Name der Sitzung ist für Personen sichtbar, mit denen du kommunizierst</string>
     <string name="widget_integration_review_terms">Um fortzufahren, musst du die Nutzungsbedingungen akzeptieren.</string>
@@ -1763,7 +1767,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="report_content_custom_title">Diesen Inhalt melden</string>
     <string name="report_content_custom_hint">Meldegrund</string>
     <string name="report_content_custom_submit">MELDEN</string>
-    <string name="block_user">NUTZER BLOCKIEREN</string>
+    <string name="block_user">NUTZER IGNORIEREN</string>
 
     <string name="content_reported_title">Inhalt gemeldet</string>
     <string name="content_reported_content">Dieser Inhalt wurde gemeldet.
@@ -1784,7 +1788,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="no_network_indicator">Aktuell besteht keine Netzwerkverbindung</string>
 
-    <string name="message_ignore_user">Nutzer blockieren</string>
+    <string name="message_ignore_user">Nutzer ignorieren</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">Alle Nachrichten (laut)</string>
     <string name="room_list_quick_actions_notifications_all">Alle Nachrichten</string>
@@ -1891,7 +1895,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="reaction_search_type_hint">Beginne zu Tippen um eine Reaktion zu finden.</string>
 
     <string name="room_join_rules_invite">%1$s hat den Raum auf \"nur-einladen\" gestellt.</string>
-    <string name="login_splash_title">Es ist dein Gespräch. Besitze es.</string>
+    <string name="login_splash_title">Es ist deine Konversation. Mache sie dir zu eigen.</string>
     <string name="login_server_url_form_modular_text">Premium-Hosting für Organisationen</string>
     <string name="login_server_url_form_modular_notice">Gib die Adresse des Modular Element oder Servers ein, den du verwenden möchtest</string>
     <string name="login_server_url_form_other_notice">Gibt die Adresse eines Servers oder eines Element ein, zu dem du dich verbinden möchtest</string>
@@ -2620,8 +2624,38 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_security_pin_code_title">Aktiviere PIN</string>
     <string name="settings_security_pin_code_summary">Wenn du deine PIN zurücksetzen möchtest, tippe \"PIN vergessen\" um dich abzumelden und sie anschließend zurückzusetzen.</string>
     <string name="auth_pin_confirm_to_disable_title">Bestätige PIN um die PIN zu deaktivieren</string>
-    <string name="labs_merge_e2e_in_timeline">Übertragung von Schlüsseln zur Entschlüsselung in Nachrichtenverlauf fehlgeschlagen</string>
+    <string name="labs_merge_e2e_in_timeline">Fasse \"unable to decrypt\"-Fehler im Chatverlauf zu Hinweisen zusammen</string>
     <string name="settings_call_show_confirmation_dialog_title">Verhindern Sie versehentliche Anrufe</string>
     <string name="settings_call_show_confirmation_dialog_summary">Bitten Sie um Bestätigung, bevor Sie einen Anruf tätigen</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Konfiguration</string>
+    <string name="no_permissions_to_start_conf_call">Dir fehlt die Berechtigung in diesem Raum eine Konferenz zu starten</string>
+    <string name="conference_call_in_progress">Es ist bereits eine Konferenz aktiv!</string>
+    <string name="video_meeting">Starte eine Videokonferenz</string>
+    <string name="audio_meeting">Starte eine Audiokonferenz</string>
+    <string name="audio_video_meeting_description">Konferenzen nutzen die Jitsi Sicherheits- und Berechtigungsrichtlinien. Alle im Raum Anwessenden können während der Konferenz beitreten.</string>
+    <string name="cannot_call_yourself">Du kannst dich nicht selbst anrufen</string>
+    <string name="cannot_call_yourself_with_invite">Du kannst dich nicht selbst anrufen, warte bis Teilnehmer die Einladung annehmen</string>
+    <string name="failed_to_add_widget">Hinzufügen des Widgets fehlgeschlagen</string>
+    <string name="failed_to_remove_widget">Entfernen des Widgets fehlgeschlagen</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d Schlüssel erfolgreich importiert.</item>
+        <item quantity="other">%1$d/%2$d Schlüssel erfolgreich importiert.</item>
+    </plurals>
+
+    <string name="room_manage_integrations">Verwalte Integrationen</string>
+    <string name="room_no_active_widgets">Keine aktiven Widgets</string>
+    <string name="create_room_federation_error">Der Raum wurde erstellt, aber manche Einladungen wurden aus folgendem Grund nicht versendet:
+\n
+\n%s</string>
+
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">Von %1$s, %2$s und %3$d anderem gelesen</item>
+        <item quantity="other">Von %1$s, %2$s und %3$d anderen gelesen</item>
+    </plurals>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Falscher code, %d verbleibender Versuch</item>
+        <item quantity="other">Falscher code, %d verbleibende Versuche</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Warnung! Letzter Versuch bevor du ausgeloggt wirst!</string>
+    <string name="too_many_pin_failures">Zu viele Fehler, du bist ausgeloggt worden</string>
 </resources>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 0e4c464b9c..1800e756d8 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -42,7 +42,7 @@
     <string name="view_source">Vidi fonton</string>
     <string name="view_decrypted_source">Vidi malĉifritan fonton</string>
     <string name="delete">Forigi</string>
-    <string name="rename">Renomi</string>
+    <string name="rename">Alinomi</string>
     <string name="title_activity_member_details">Detaloj pri ano</string>
     <string name="title_activity_historical">Historia</string>
     <string name="report_content">Raporti enhavon</string>
@@ -105,14 +105,14 @@
 
     <string name="keys_backup_is_not_finished_please_wait">Savkopio de ŝlosiloj ne finiĝis; bonvolu atendi…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Vi perdos viajn ĉifritajn mesaĝojn se vi nun adiaŭos</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">Savkopio de ŝlosiloj progresas. Se vi nun adiaŭos, vi perdos aliron al viaj ĉifritaj mesaĝoj.</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Progresas savkopio de ŝlosiloj. Se vi nun adiaŭos, vi perdos aliron al viaj ĉifritaj mesaĝoj.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Sekura savkopiado de ŝlosiloj devus esti aktiva en ĉiuj viaj salutaĵoj por eviti perdon de aliro al viaj ĉifritaj mesaĝoj.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Mi ne volas miajn ĉifritajn mesaĝojn</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Savkopiante ŝlosilojn…</string>
     <string name="keys_backup_activate">Uzi savkopiadon de ŝolsiloj</string>
     <string name="are_you_sure">Ĉu vi certas\?</string>
     <string name="backup">Savkopii</string>
-    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Vi perdos aliron al viaj ĉifritaj mesaĝoj malse vi savkopios viajn ŝlosilojn antaŭ adiaŭo.</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Vi perdos aliron al viaj ĉifritaj mesaĝoj, se vi ne savkopios viajn ŝlosilojn antaŭ adiaŭo.</string>
 
     <string name="stay">Resti</string>
     <string name="none">Neniu</string>
@@ -598,8 +598,15 @@
     <string name="settings_troubleshoot_test_account_settings_title">Agordoj de konto.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Sciigoj estas ŝaltitaj por via konto.</string>
     <string name="play_video">Ludi</string>
-    <string name="pause_video">Paûzi</string>
+    <string name="pause_video">Paŭzi</string>
     <string name="dismiss">Eksigi</string>
 
 
+    <string name="no_permissions_to_start_conf_call">Vi ne havas permeson ekigi grupan vokon en ĉi tiu ĉambro</string>
+    <string name="conference_call_in_progress">Grupa voko jam daŭras!</string>
+    <string name="video_meeting">Komenci grupan vidvokon</string>
+    <string name="audio_meeting">Komenci grupan voĉvokon</string>
+    <string name="audio_video_meeting_description">Grupaj vokoj uzas la politikon de Jitsi pri permesoj kaj sekureco. Ĉiuj personoj en la ĉambro vidos aliĝilon dum la voko daŭros.</string>
+    <string name="cannot_call_yourself">Vi ne povas voki sola</string>
+    <string name="cannot_call_yourself_with_invite">Vi ne povas voki sola; atendu aliajn partoprenantojn</string>
 </resources>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 84ea53d685..d3128f9e54 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -40,7 +40,7 @@
     <string name="missing_permissions_warning">Debido a que faltan permisos, pueden faltar algunas características…</string>
     <string name="missing_permissions_to_start_conf_call">Necesitas permiso para invitar a iniciar una conferencia en esta sala</string>
     <string name="missing_permissions_title_to_start_conf_call">No se puede iniciar la llamada</string>
-    <string name="device_information">Información de la sesión</string>
+    <string name="device_information">Detalles de la sesión</string>
     <string name="room_no_conference_call_in_encrypted_rooms">No se admiten llamadas de conferencia en salas cifradas</string>
     <string name="send_anyway">Enviar de Todos Modos</string>
     <string name="or">o</string>
@@ -1916,4 +1916,217 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="search_in_my_contacts">Buscar en mis contactos</string>
     <string name="three_pid_revoke_invite_dialog_title">Rechazar invitación</string>
     <string name="auth_pin_confirm_to_disable_title">Confirma PIN para desabilitarlo</string>
+    <string name="no_permissions_to_start_conf_call">No posee permisos para iniciar una conferencia en esta sala</string>
+    <string name="conference_call_in_progress">Conferencia en progreso!</string>
+    <string name="video_meeting">Iniciar Video Conferencia</string>
+    <string name="audio_meeting">Iniciar Audio Conferencia</string>
+    <string name="cannot_call_yourself">No puedes hacer una llamada contigo mismo</string>
+    <string name="cannot_call_yourself_with_invite">No puedes hacer una llamada contigo mismo, espera a que los participantes acepten la invitación</string>
+    <string name="failed_to_add_widget">Fallo al adicionar Widget</string>
+    <string name="failed_to_remove_widget">Fallo al eliminar Widget</string>
+    <string name="settings_call_show_confirmation_dialog_title">Prevenir llamadas por accidente</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Pedir confirmacion antes de iniciar una llamda</string>
+    <string name="room_participants_kick_reason">Rason de expulsion</string>
+    <string name="room_participants_ban_title">Banear usuario</string>
+    <string name="room_participants_ban_reason">Rason de baneo</string>
+    <string name="room_participants_unban_title">Desbanear usuario</string>
+    <string name="room_participants_unban_prompt_msg">Desbanear usuario y permitir entrar a la sala nuevamente.</string>
+
+    <string name="push_gateway_item_device_name">nombre_session:</string>
+    <string name="labs_merge_e2e_in_timeline">Error al descifrar el mensaje en la línea de tiempo</string>
+    <string name="labs_show_unread_notifications_as_tab">Adicionar pestaña dedicada para notificaciones no leidas en la pantalla principal.</string>
+
+    <string name="bug_report_error_too_short">Descripcion muy corta</string>
+
+    <string name="notification_initial_sync">Sincronización inicial…</string>
+
+    <string name="settings_show_devices_list">Mostrar todas mis sessiones</string>
+    <string name="settings_advanced_settings">Opciones Avanzadas</string>
+    <string name="settings_developer_mode">Modo Desarrollador</string>
+    <string name="settings_rageshake">Agitar</string>
+    <string name="settings_rageshake_detection_threshold">Sensibilidad</string>
+    <string name="settings_rageshake_detection_threshold_summary">Agite su dispositivo para probar la sensibilidad</string>
+    <string name="rageshake_detected">Sacudida detectada!</string>
+    <string name="settings">Ajustes</string>
+    <string name="devices_current_device">Sesión Actual</string>
+    <string name="devices_other_devices">Otras Sesiones</string>
+
+    <string name="autocomplete_limited_results">Mostrando solo el primer resultado, agregue mas letras…</string>
+
+    <string name="settings_developer_mode_fail_fast_title">Fallar rapido (Test)</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element puede fallar con más frecuencia cuando ocurre un error inesperado</string>
+
+    <string name="command_description_shrug">Antepone ¯\\_(ツ)_/¯ a un mensaje de texto sin formato</string>
+
+    <string name="create_room_encryption_title">Habilitar encriptacion</string>
+    <string name="create_room_encryption_description">Una vez habilitada, el cifrado no se puede deshabilitar.</string>
+
+    <string name="login_error_threepid_denied">Su dominio de correo electrónico no está autorizado para registrarse en este servidor</string>
+
+    <string name="verification_conclusion_warning">Inicio de sesión no confiable</string>
+    <string name="verification_sas_match">Coinciden</string>
+    <string name="verification_sas_do_not_match">No coinciden</string>
+    <string name="verify_user_sas_emoji_help_text">Verifique a este usuario confirmando que el siguiente emoji único aparece en su pantalla, en el mismo orden.</string>
+    <string name="verify_user_sas_emoji_security_tip">Para mayor seguridad, use otro medio de comunicación confiable o hágalo en persona.</string>
+    <string name="verification_green_shield">Busque el escudo verde para asegurarse de que se confía en un usuario. Confíe en todos los usuarios de una sala para asegurarse de que la sala sea segura.</string>
+
+    <string name="verification_conclusion_not_secure">No seguro</string>
+    <string name="sent_a_video">Video.</string>
+    <string name="sent_an_image">Imagen.</string>
+    <string name="sent_an_audio_file">Audio</string>
+    <string name="sent_a_file">Archivo</string>
+    <string name="send_a_sticker">Sticker</string>
+
+    <string name="verification_request_waiting">Esperando…</string>
+    <string name="verification_request_other_cancelled">%s cancelada</string>
+    <string name="verification_request_you_cancelled">Cancelado por usted</string>
+    <string name="verification_request_other_accepted">%s aceptada</string>
+    <string name="verification_request_you_accepted">Aceptado por usted</string>
+    <string name="verification_sent">Verificacion enviada</string>
+    <string name="verification_request">Solicitud de verificación</string>
+    <string name="verification_verify_device">Verifica esta Sesion</string>
+    <string name="verification_verify_device_manually">Verificar manualmente</string>
+
+    <string name="you">Usted</string>
+
+    <string name="verification_scan_notice">Escanee el código con el dispositivo del otro usuario para verificarse mutuamente de forma segura</string>
+    <string name="verification_scan_their_code">Escanear código</string>
+    <string name="verification_scan_emoji_title">Error al escanear</string>
+    <string name="verification_scan_emoji_subtitle">Si no estás en persona, compara los emojis</string>
+
+    <string name="verification_no_scan_emoji_title">Verificar comparando emojis</string>
+
+    <string name="verify_by_emoji_title">Verificar por emojis</string>
+    <string name="verify_by_emoji_description">Si no puede escanear el código anterior, verifique comparando una selección breve y única de emoji.</string>
+
+    <string name="a13n_qr_code_description">Imagen de código QR</string>
+
+    <string name="verification_verify_user">Verificar %s</string>
+    <string name="verification_verified_user">Verificado %s</string>
+    <string name="verification_request_waiting_for">Esperando por %s…</string>
+    <string name="room_profile_not_encrypted_subtitle">Los mensages en esta sala no estan encriptados punto a punto.</string>
+    <string name="room_profile_section_security">Seguridad</string>
+    <string name="room_profile_section_security_learn_more">Saber mas</string>
+    <string name="room_profile_section_more">Mas</string>
+    <string name="room_profile_section_admin">Acciones Administrativas</string>
+    <string name="room_profile_section_more_settings">Ajustes de Sala</string>
+    <string name="room_profile_section_more_notifications">Notificaciones</string>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="one">Una persona</item>
+        <item quantity="other">%1$d personas</item>
+    </plurals>
+    <string name="room_profile_section_more_uploads">Archivos, Medias y Documentos</string>
+    <string name="room_profile_section_more_leave">Abandonar Sala</string>
+    <string name="room_profile_leaving_room">Saliendo de la sala…</string>
+
+    <string name="room_member_power_level_admins">Administradores</string>
+    <string name="room_member_power_level_moderators">Moderadores</string>
+    <string name="room_member_power_level_custom">Nivel Personalizado</string>
+    <string name="room_member_power_level_invites">Invitados</string>
+    <string name="room_member_power_level_users">Usuarios</string>
+
+    <string name="room_member_power_level_admin_in">Administrador en %1$s</string>
+    <string name="room_member_power_level_moderator_in">Moderador en %1$s</string>
+    <string name="room_member_power_level_default_in">Nivel Personalizado en %1$s</string>
+    <string name="room_member_power_level_custom_in">Nivel Personalizado (%1$d) en %2$s</string>
+
+    <string name="room_member_jump_to_read_receipt">Saltar para leer el recibo</string>
+
+    <string name="rendering_event_error_type_of_event_not_handled">Element no maneja eventos de tipo \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element no maneja el mensaje de tipo \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element encontró un problema al representar el contenido del evento con el ID \'%1$s\'</string>
+
+    <string name="unignore">Dejar de ignorar</string>
+
+    <string name="room_list_sharing_header_recent_rooms">Salas recientes</string>
+    <string name="room_list_sharing_header_other_rooms">Otras salas</string>
+
+    <string name="command_description_rainbow">Envía el mensaje dado en colores</string>
+    <string name="settings_category_timeline">Linea de tiempo</string>
+
+    <string name="settings_category_composer">Editor de mensage</string>
+
+    <string name="room_settings_enable_encryption">Encriptar (end-to-end)</string>
+    <string name="room_settings_enable_encryption_warning">Una vez habilitado, el cifrado no se puede deshabilitar.</string>
+
+    <string name="room_settings_enable_encryption_dialog_title">Encriptar \?</string>
+    <string name="room_settings_enable_encryption_dialog_submit">Habilitar el cifrado</string>
+
+    <string name="encryption_information_cross_signing_state">Firma cruzada</string>
+    <string name="encryption_information_dg_xsigning_disabled">Firma cruzada no habilitada</string>
+
+    <string name="settings_active_sessions_list">Sesiones Activas</string>
+    <string name="settings_active_sessions_show_all">Mostrar todas las Sesiones</string>
+    <string name="settings_active_sessions_manage">Administrar Sesiones</string>
+    <string name="settings_active_sessions_signout_device">Cerrar Sesión</string>
+
+    <string name="crosssigning_verify_this_session">Verificar este inicio de sesión</string>
+    <string name="crosssigning_other_user_not_trust">Otros usuarios pueden no confiar en la sesion</string>
+    <string name="complete_security">Completar Seguridad</string>
+
+    <string name="verification_profile_verify">Verificar</string>
+    <string name="verification_profile_verified">Verificada</string>
+    <string name="verification_profile_warning">Precaucion</string>
+
+    <string name="room_member_profile_failed_to_get_devices">Error al obtener sesiones</string>
+    <string name="room_member_profile_sessions_section_title">Sesiones</string>
+    <string name="trusted">Confirmado</string>
+    <string name="not_trusted">No es confiable</string>
+
+    <string name="initialize_cross_signing">Inicializar Firmas Cruzadas</string>
+    <string name="reset_cross_signing">Restablecer claves</string>
+
+    <string name="a11y_qr_code_for_verification">Codigo QR</string>
+
+    <string name="qr_code_scanned_by_other_yes">Correcto</string>
+    <string name="qr_code_scanned_by_other_no">No</string>
+
+    <string name="no_connectivity_to_the_server_indicator">Sin conexión</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">Modo Avion Activado</string>
+
+    <string name="settings_dev_tools">Herramientas de desarrollo</string>
+    <string name="settings_account_data">Datos de cuenta</string>
+    <string name="poll_item_selected_aria">Seleccionar Opcion</string>
+    <string name="new_signin">Nuevo inicio de sesión</string>
+
+    <string name="enter_secret_storage_passphrase_warning">Advertencia:</string>
+    <string name="message_action_item_redact">Remover…</string>
+    <string name="delete_event_dialog_reason_checkbox">Razón</string>
+    <string name="delete_event_dialog_reason_hint">Razón para redactar</string>
+
+    <string name="login_default_session_public_name">Element Android</string>
+
+    <string name="refresh">Refrescar</string>
+
+    <string name="new_session">Nuevo inicio de sesión detectado . ¿Fue usted\?</string>
+    <string name="new_session_review">Toca para revisar y verificar</string>
+    <string name="verify_new_session_was_not_me">Este no era yo</string>
+    <string name="verify_new_session_compromized">Su cuenta puede estar comprometida</string>
+
+    <string name="verification_cancelled">Verificación cancelada</string>
+
+    <string name="recovery_passphrase">Frase de contraseña de recuperación</string>
+    <string name="message_key">Clave de mensaje</string>
+    <string name="account_password">Contraseña de la cuenta</string>
+
+    <string name="bootstrap_finish_title">¡Listo!</string>
+    <string name="encryption_enabled">Cifrado habilitado</string>
+    <string name="room_created_summary_item_by_you">Sala creada y configurada por usted.</string>
+
+    <string name="qr_code_scanned_verif_waiting">Esperando por %s…</string>
+
+    <string name="settings_notification_configuration">Ajuste de Notificaciones</string>
+    <string name="room_message_placeholder">Mensaje…</string>
+
+    <string name="bootstrap_enter_recovery">Introduza su %s para continuar</string>
+    <string name="use_file">Usar archivo</string>
+
+    <string name="error_saving_media_file">No se pudo guardar el archivo multimedia</string>
+    <string name="crosssigning_verify_session">Verificar Sesión</string>
+    <string name="create_pin_confirm_title">Confirmar PIN</string>
+    <string name="auth_pin_reset_title">Resetear PIN</string>
+    <string name="auth_pin_new_pin_action">Nuevo PIN</string>
+    <string name="auth_pin_reset_content">Para resetear su PIN, debe iniciar seccion y crear uno nuevo</string>
+    <string name="settings_security_pin_code_title">Establecer PIN</string>
+    <string name="settings_security_pin_code_summary">Si decea resetear su PIN, toque Olvidé PIN para cerrar sesión y restablecer.</string>
 </resources>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index b5dea7d957..6bd85ad42e 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -842,7 +842,7 @@
     <string name="encryption_information_device_name_with_warning">Avalik nimi (nähtav neile, kellega sa suhtled)</string>
     <string name="device_name_warning">Sessiooni avalik nimi on nähtav neile, kellega sa suhtled</string>
     <string name="encryption_information_name">Avalik nimi</string>
-    <string name="encryption_information_device_id">Seadme tunnus</string>
+    <string name="encryption_information_device_id">Sessiooni tunnus</string>
     <string name="encryption_information_device_key">Sessiooni võti</string>
     <string name="encryption_information_verification">Verifitseerimine</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 sõrmejälg</string>
@@ -2200,4 +2200,330 @@
 
     <string name="command_description_plain">Saadab sõnumi vormindamata tekstina ega tõlgenda seda markdown-vormindusena</string>
 
+    <string name="no_permissions_to_start_conf_call">Sul ei ole õigusi siin jututoas rühmakõne algatamiseks</string>
+    <string name="conference_call_in_progress">Rühmakõne on hetkel käimas!</string>
+    <string name="video_meeting">Alusta videokoosolekut</string>
+    <string name="audio_meeting">Alusta koosolekut</string>
+    <string name="audio_video_meeting_description">Koosolekud kasutavad Jitsi turvaloogikat ja õigusi. Kõik hetkel jututoas olijad näevad kutset koosolekuga liitumiseks.</string>
+    <string name="cannot_call_yourself">Sa ei saa iseendale helistada</string>
+    <string name="cannot_call_yourself_with_invite">Sa ei saa iseendale helistada, palun oota ei teised osalejad kutsele vastaksid</string>
+    <string name="failed_to_add_widget">Vidina lisamine ei õnnestunud</string>
+    <string name="failed_to_remove_widget">Vidina eemaldamine ei õnnestunud</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d võtme importimine õnnestus.</item>
+        <item quantity="other">%1$d/%2$d võtme importimine õnnestus.</item>
+    </plurals>
+
+    <string name="room_manage_integrations">Halda lõiminguid</string>
+    <string name="room_no_active_widgets">Aktiivseid vidinaid ei leidu</string>
+    <string name="create_room_federation_error">Jututuba on loodud, kuid mõned kutsed on saatmata järgmistel põhjustel:
+\n
+\n%s</string>
+
+    <string name="labs_merge_e2e_in_timeline">Ei õnnestunud dekrüptida ajajoonel leiduvat sõnumit</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Sa parasjagu jagad oma e-posti aadressi ja telefoninumbrit isikutuvastusserveriga %1$s. Selleks, et lõpetada see jagamine, pead uuesti looma ühenduse isikutuvastusserveriga %2$s.</string>
+    <string name="labs_allow_extended_logging_summary">Detailne logimine võimaldab arendajatel saada rohkem teadet kui sa peale nutiseadme tõsist raputamist saadad veateate. Kui ka detailne logimine on kasutusel, siis rakendus ei logi sõnumite sisu ega isiklikke andmeid.</string>
+
+
+    <string name="error_terms_not_accepted">Kui sa oled nõustunud koduserveri kasutustingimustega, siis palun proovi uuesti.</string>
+
+    <string name="error_network_timeout">Tundub, et server ei suuda päringule mõistliku ajaga vastata ning see võib olla seotud kas vigase ühendusega või serveri veaga. Palun proovi mõne aja pärast uuesti.</string>
+
+    <string name="a11y_open_drawer">Ava navigatsioonivalik</string>
+    <string name="a11y_create_menu_open">Ava menüüvalik jututoa loomiseks</string>
+    <string name="a11y_create_menu_close">Sulge menüüvalik jututoa loomiseks…</string>
+    <string name="a11y_close_keys_backup_banner">Sulge võtmete varunduse teade</string>
+    <string name="a11y_show_password">Näita salasõna</string>
+    <string name="a11y_hide_password">Peida salasõna</string>
+    <string name="a11y_jump_to_bottom">Mine lõppu</string>
+
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s ja %3$d muu loevad</item>
+        <item quantity="other">%1$s, %2$s ja %3$d muud loevad</item>
+    </plurals>
+    <string name="three_users_read">%1$s, %2$s ja %3$s lugesid</string>
+    <string name="two_users_read">%1$s ja %2$s lugesid</string>
+    <string name="one_user_read">%s luges</string>
+    <plurals name="fallback_users_read">
+        <item quantity="one">1 kasutaja luges</item>
+        <item quantity="other">%d kasutajat lugesid</item>
+    </plurals>
+
+    <string name="error_file_too_big">See fail „%1$s“ (%2$s) on üleslaadimiseks liiga suur. Failisuuruse ülempiir on %3$s.</string>
+
+    <string name="error_attachment">Manuse laadimisel tekkis viga.</string>
+    <string name="attachment_type_file">Fail</string>
+    <string name="attachment_type_contact">Kontakt</string>
+    <string name="attachment_type_camera">Kaamera</string>
+    <string name="attachment_type_audio">Heli</string>
+    <string name="attachment_type_gallery">Meediagalerii</string>
+    <string name="attachment_type_sticker">Kleeps</string>
+    <string name="error_handling_incoming_share">Jagatud andmete töötlemine ei õnnestunud</string>
+
+    <string name="uploads_media_title">MEEDIA</string>
+    <string name="block_user">EIRA KASUTAJAT</string>
+
+    <string name="content_reported_title">Teatasin sisust</string>
+    <string name="content_reported_content">Selle sisu kohta on nüüd teade saadetud.
+\n
+\nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutaja blokeerida</string>
+    <string name="content_reported_as_spam_title">See on rämpssõnum</string>
+    <string name="content_reported_as_spam_content">Haldaja sai nüüd teate, et see sisu on rämpssõnum.
+\n
+\nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutaja blokeerida</string>
+    <string name="content_reported_as_inappropriate_title">See sõnum ei ole sobilik</string>
+    <string name="content_reported_as_inappropriate_content">Haldaja sai nüüd teate, et see sisu ei ole sobilik.
+\n
+\nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutaja blokeerida</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Läbiva krüptograafia jaoks vajalike võtmete salvestamiseks kohalikule andmekandjale vaajab Element sinu luba.
+\n
+\nSelleks et saaksid võtmed käsitsi eksportida, siis palun anna selleks järgmises vaates luba.</string>
+
+    <string name="no_network_indicator">Hetkel puudub võrguühendus</string>
+
+    <string name="message_ignore_user">Eira kasutajat</string>
+
+    <string name="room_list_quick_actions_notifications_all_noisy">Kõik sõnumid (lärmakas)</string>
+    <string name="room_list_quick_actions_notifications_all">Kõik sõnumid</string>
+    <string name="room_list_quick_actions_notifications_mentions">Ainult mainimised</string>
+    <string name="room_list_quick_actions_notifications_mute">Summuta</string>
+    <string name="room_list_quick_actions_settings">Seadistused</string>
+    <string name="room_list_quick_actions_favorite_add">Lisa lemmikuks</string>
+    <string name="room_list_quick_actions_favorite_remove">Eemalda lemmikute hulgast</string>
+    <string name="room_list_quick_actions_leave">Lahku sellest jututoast</string>
+    <string name="notice_member_no_changes">%1$s ei teinud muudatusi</string>
+    <string name="notice_member_no_changes_by_you">Sina ei teinud muudatusi</string>
+    <string name="command_description_spoiler">Saadab selle sõnumi rõõmurikkujana</string>
+    <string name="spoiler">Rõõmurikkuja</string>
+    <string name="reaction_search_type_hint">Reageerimiste leidmiseks sisesta otsingusõnad.</string>
+
+    <string name="login_splash_title">See on sinu vestlus, mida sa ka tegelikult kontrollid.</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Salasõna kinnitamiseks klõpsi kirjas olnud linki. Kui oled avanud selles kirjas leidunud lingi, siis palun vajuta järgnevat nuppu.</string>
+    <string name="login_connect_using_matrix_id_notice">Kui sul juba on kasutajakonto ning sa tead oma Matrix\'i kasutajatunnust ja salasõna, siis alternatiivina sa võid kasutada seda meetodit:</string>
+    <string name="login_connect_using_matrix_id_submit">Logi sisse Matrix\'i kasutajatunnusega</string>
+    <string name="login_signin_matrix_id_title">Logi sisse oma Matrix\'i kasutajatunnusega</string>
+    <string name="login_signin_matrix_id_notice">Kui sa võtad kasutusele konto koduserveris, siis sisesta alljärgnevalt oma Matrix\'i kasutajatunnus (näiteks @torekasutaja:domeen.ee) ja salasõna.</string>
+    <string name="login_signin_matrix_id_hint">Matrix\'i kasutajatunnus</string>
+    <string name="login_signin_matrix_id_password_notice">Kui sa ei tea oma salasṍna, siis mine tagasi ja loo uus salasõna.</string>
+    <string name="seen_by">Nähtud kasutaja poolt</string>
+
+    <string name="signed_out_title">Sa oled loginud välja</string>
+    <string name="signed_out_notice">See võib juhtuda eri põhjustel:
+\n
+\n• Sa oled muutnud oma salasõna mõnes teises sessioonis.
+\n
+\n• Sa oled selle sessiooni kustutanud mõnest teisest sessioonist.
+\n
+\n• Sinu koduserveri haldaja on turvakaalutlustel keelanud sinu ligipääsu.</string>
+    <string name="signed_out_submit">Logi uuesti sisse</string>
+
+    <string name="soft_logout_title">Sa oled loginud välja</string>
+    <string name="soft_logout_sso_not_same_user_error">Praegune sessioon kuulub kasutajale %1$s, kuid sina üritad siseneda kasutaajaga %2$s. Sellist võimalust Element hetkel ei toeta.
+\nPalun eemalda kõik andmed ning siis logi sisse muu kontoga.</string>
+
+    <string name="verification_conclusion_compromised">Mõni järgnevatest võib olla sattunud valedesse kätesse:
+\n 
+\n - Sinu koduserver
+\n - Selle osapoole koduserver, keda sa üritad verifitseerida
+\n - Sinu või teise osapoole internetiühendus
+\n - Sinu või teise osapoole seade</string>
+
+    <string name="sent_a_video">Video.</string>
+    <string name="sent_an_image">Pilt.</string>
+    <string name="sent_an_audio_file">Helifail</string>
+    <string name="sent_a_file">Fail</string>
+    <string name="room_profile_not_encrypted_subtitle">Sõnumid siin jututoas on läbivalt krüptitud.</string>
+    <string name="room_profile_encrypted_subtitle">Sõnumid siis jututoas kasutavad läbivat krüptimist.
+\n
+\nSinu sõnumid on turvatud ning ainult sinul ja saaja(te)l on unikaalsed võtmed selliste sõnumite lugemiseks.</string>
+    <string name="room_profile_section_security">Turvalisus</string>
+    <string name="room_profile_section_security_learn_more">Lisateave</string>
+    <string name="room_profile_section_more">Veel</string>
+    <string name="room_profile_section_admin">Haldustegevused</string>
+    <string name="room_profile_section_more_settings">Jututubade seadistused</string>
+    <string name="room_profile_section_more_notifications">Teavitused</string>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="one">Üks inimene</item>
+        <item quantity="other">%1$d inimest</item>
+    </plurals>
+    <string name="room_profile_section_more_uploads">Üleslaetud failid</string>
+    <string name="room_profile_section_more_leave">Lahku jututoast</string>
+    <string name="room_profile_leaving_room">Lahkun jututoast…</string>
+
+    <string name="room_member_power_level_admins">Haldajad</string>
+    <string name="room_member_power_level_moderators">Moderaatorid</string>
+    <string name="room_member_power_level_custom">Kohandatud õigused</string>
+    <string name="room_member_power_level_invites">Kutsed</string>
+    <string name="room_member_power_level_users">Kasutajad</string>
+
+    <string name="room_member_power_level_admin_in">Peakasutaja jututoas %1$s</string>
+    <string name="room_member_power_level_moderator_in">Moderaator jututoas %1$s</string>
+    <string name="room_member_power_level_default_in">Vaikimisi õigused jututoas %1$s</string>
+    <string name="room_member_power_level_custom_in">Kohandatud õigused (%1$d) jututoas %2$s</string>
+
+    <string name="room_member_jump_to_read_receipt">Hüppa lugemisteatise juurde</string>
+
+    <string name="rendering_event_error_type_of_event_not_handled">Element ei oska käsitleda %1$s-tüüpi sündmusi</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element ei oska käsitleda %1$s-tüüpi sünumeid</string>
+    <string name="rendering_event_error_exception">Tekkis viga, kui Element üritas töödelda sõnumi %1$s sisu</string>
+
+    <string name="call_notification_answer">Võta vastu</string>
+    <string name="call_notification_reject">Keeldu</string>
+    <string name="call_notification_hangup">Lõpeta kõne</string>
+
+    <string name="unignore">Lõpeta eiramine</string>
+
+    <string name="verify_cannot_cross_sign">See sessioon ei oska jagada verifitseerimisteavet sinu teiste sessioonidega.
+\nSeni salvestatakse verifitseerimisteave kohalikus seadmes ja jagatakse rakenduse tulevases versioonis.</string>
+
+    <string name="room_list_sharing_header_recent_rooms">Hiljutised jututoad</string>
+    <string name="verification_profile_device_untrust_info">Kuni antud kasutaja seda sessiooni ei usalda, on ta märgitud hoiatussildiga. Alternatiivina on sul võimalus verifiseerimist ka käsitsi teha.</string>
+
+
+    <string name="initialize_cross_signing">Käivita risttunnustamine</string>
+    <string name="reset_cross_signing">Lähtesta krüptovõtmed</string>
+
+    <string name="a11y_qr_code_for_verification">QR-kood</string>
+
+    <string name="qr_code_scanned_by_other_notice">Peaaegu valmis! Kas %s kuvab sama kilpi\?</string>
+    <string name="qr_code_scanned_by_other_yes">Jah</string>
+    <string name="qr_code_scanned_by_other_no">Ei</string>
+
+    <string name="no_connectivity_to_the_server_indicator">Ühendus sinu serveriga on katkenud</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">Lennurežiim on kasutusel</string>
+
+    <string name="settings_dev_tools">Arendaja töövahendid</string>
+    <string name="settings_account_data">Kasutajakonto andmed</string>
+    <plurals name="poll_info">
+        <item quantity="one">%d hääl</item>
+        <item quantity="other">%d häält</item>
+    </plurals>
+    <plurals name="poll_info_final">
+        <item quantity="one">%d hääl - lõplikud tulemused</item>
+        <item quantity="other">%d häält - lõplikud tulemused</item>
+    </plurals>
+    <string name="poll_item_selected_aria">Tehtud valik</string>
+    <string name="command_description_poll">Loob lihtsa hääletuse</string>
+    <string name="verification_cannot_access_other_session">Kasuta taastamiseks mõeldud paroolifraasi või võtit</string>
+    <string name="verification_use_passphrase">Kui sa ei pääse ligi olemasolevale sessioonile</string>
+
+    <string name="new_signin">Uus sisselogimine</string>
+
+    <string name="enter_secret_storage_invalid">Ei leia turvahoidlast vajalikke andmeid</string>
+    <string name="enter_secret_storage_passphrase">Sisesta turvahoidla paroolifraas</string>
+    <string name="enter_secret_storage_passphrase_warning">Hoiatus:</string>
+    <string name="enter_secret_storage_passphrase_warning_text">Sa peaksid turvahoidlat kasutama vaid usaldusväärsest seadmest</string>
+
+    <string name="message_action_item_redact">Eemalda…</string>
+    <string name="share_confirm_room">Kas sa soovid seda manust saata kasutajale %1$s\?</string>
+    <plurals name="send_images_with_original_size">
+        <item quantity="one">Saada pilt algupärases suuruses</item>
+        <item quantity="other">Saada pildid algupärases suuruses</item>
+    </plurals>
+
+    <string name="delete_event_dialog_title">Kinnita eemaldamine</string>
+    <string name="delete_event_dialog_content">Kas sa oled kindel et soovid eemaldada (kustutada) seda sündmust\? Pane tähele, et see muutus võib tagasi pöörduda, kui muudad hiljem jututoa nime või teema nime.</string>
+    <string name="delete_event_dialog_reason_checkbox">Lisa põhjus</string>
+    <string name="delete_event_dialog_reason_hint">Kustutamise põhjus</string>
+
+    <string name="event_redacted_by_user_reason_with_reason">Kasutaja kustutas sündmuse, põhjusena %1$s</string>
+    <string name="event_redacted_by_admin_reason_with_reason">Jututoa haldur on sündmust modereerinud, põhjusena %1$s</string>
+
+    <string name="keys_backup_restore_success_title_already_up_to_date">Krüptovõtmed on juba uuendatud!</string>
+
+    <string name="login_default_session_public_name">Element Android</string>
+
+    <string name="settings_key_requests">Päringud võtmete laadimiseks</string>
+
+    <string name="e2e_use_keybackup">Võta krüptitud sõnumite ajalugu lukust lahti</string>
+
+    <string name="refresh">Värskenda</string>
+
+    <string name="new_session">Uus sisselogimine. Kas see olid sina\?</string>
+    <string name="new_session_review">Kontrollimiseks ja verifitseerimiseks klõpsi</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Kui sa katkestad, siis sa ei saa selles seadmes lugeda krüptitud sõnumeid ning muud kasutajad ei usalda seda</string>
+    <string name="verify_cancel_self_verification_from_trusted">Kui sa katkestad, siis sa ei saa oma uues seadmes lugeda krüptitud sõnumeid ning muud kasutajad ei usalda seda</string>
+    <string name="verify_cancel_other">Kui sa nüüd katkestad, siis sa ei verifitseeri seadet %1$s (%2$s). Alusta uuesti sealsest profiilist.</string>
+
+    <string name="verify_not_me_self_verification">Mõni järgnevatest võib olla sattunud valedesse kätesse:
+\n 
+\n - Sinu salasõna
+\n - Sinu koduserver
+\n - Sinu või teise osapoole seade
+\n - Sinu või teise osapoole internetiühendus
+\n
+\nPalun vaheta seadistuste lehelt koheselt oma kasutajakonto salasõna ja taastevõti.</string>
+
+    <string name="verify_cancelled_notice">Seadistuste lehelt verifitseeri oma seade.</string>
+    <string name="verification_cancelled">Verifitseerimine on tühistatud</string>
+
+    <string name="recovery_passphrase">Taastamiseks mõeldud paroolifraas</string>
+    <string name="message_key">Sõnumite krüptovõti</string>
+    <string name="account_password">Kasutajakonto salasõna</string>
+
+    <string name="set_recovery_passphrase">Seadista %s</string>
+    <string name="generate_message_key">Loo sõnumite krüptovõti</string>
+
+    <string name="confirm_recovery_passphrase">Kinnita %s</string>
+
+    <string name="bootstrap_cross_signing_success">Sinu %2$s ja %1$s on seadistatud.
+\n
+\nHoia neid turvaliselt! Kui sa oled oma rakendustes kõik sessioonid sulgenud, siis sa vajad neid ligipääsu taastamiseks oma krüptitud sõnumitele ja turvalistele andmetele.</string>
+
+    <string name="auth_invalid_login_param_space_in_password">Vigane salasõna ja/või kasutajanimi. Palun vaata, kas mitte sisestatud salasõna ei alga või lõppe tühikutega.</string>
+    <string name="auth_invalid_login_deactivated_account">See kasutajakonto on deaktiveeritud.</string>
+
+    <string name="room_message_placeholder">Sõnum…</string>
+
+    <string name="upgrade_security">Krüptimise uuendus on saadaval</string>
+    <string name="setup_cross_signing">Võta risttunnustamine kasutusele</string>
+    <string name="security_prompt_text">Selleks et sinu vestlused oleks turvatud, verifitseeri end ja teisi</string>
+
+    <string name="bootstrap_enter_recovery">Jätkamaks sisesta oma %s</string>
+    <string name="use_file">Kasuta faili</string>
+
+    <string name="enter_backup_passphrase">Sisesta %s</string>
+    <string name="backup_recovery_passphrase">Taastamiseks mõeldud paroolifraas</string>
+    <string name="bootstrap_invalid_recovery_key">See ei ole sobilik taastevõti</string>
+    <string name="recovery_key_empty_error_message">Palun sisesta taastevõti</string>
+
+    <string name="bootstrap_progress_checking_backup">Kontrollin varukoopia võtmeid</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Kontrollin varukoopia võtit (%s)</string>
+    <string name="bootstrap_progress_compute_curve_key">Arvutan elliptilise joone võtit</string>
+    <string name="bootstrap_progress_generating_ssss">Loon paroolifraasi alusel SSSS\'i</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Loon paroolifraasi alusel SSSS\'i (%s)</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Loon taastevõtme alusel SSSS\'i</string>
+    <string name="bootstrap_progress_storing_in_sss">Salvestan võtmete varunduse andmed SSSS\'is</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="bootstrap_migration_enter_backup_password">Jätkamiseks sisesta oma võtmete varunduse paroolifraas.</string>
+    <string name="bootstrap_migration_use_recovery_key">või kasuta oma võtmete varukoopia taastevõtit</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Kui sa ei tea oma võtmete varunduse paroolifraasi, siis sa võid %s.</string>
+    <string name="bootstrap_migration_backup_recovery_key">Võtmete varukoopia taastevõti</string>
+
+    <string name="settings_security_prevent_screenshots_title">Ära luba sel rakendusel teha ekraanitõmmiseid</string>
+    <string name="settings_security_prevent_screenshots_summary">Selle seadistusega määratakse FLAG_SECURE märge kõikidele tegevustele. Muutuse jõustamiseks vajab rakendus uuesti käivitamist.</string>
+
+    <string name="media_file_added_to_gallery">Lisasime meediafaili galeriisse</string>
+    <string name="error_adding_media_file_to_gallery">Meediafaili galeriisse lisamine ei õnnestunud</string>
+    <string name="error_saving_media_file">Meediafaili salvestamine ei õnnestunud</string>
+    <string name="change_password_summary">Määra kontole uus salasõna…</string>
+
+    <string name="use_other_session_content_description">Kasuta kõige uuemat Element\'i versioon mõnes muus seadmes, nagu näiteks Element Web, Element Desktop, Element iOS, Element Android. Samuti sobib mõni muu Matrix\'i klient, mis oskab risttunnustamist</string>
+    <string name="app_desktop_web">Element Web
+\nElement Desktop</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
+    <string name="or_other_mx_capabale_client">või mõnda teist Matrix\'i klienti, mis oskab risttunnustamist</string>
+    <string name="use_latest_app">Kasuta oma muus seadmes kõige uuemat Element\'i versiooni:</string>
+    <string name="command_description_discard_session">Sunnib loobuma praeguse krüptitud jututoa rühmavestluse seansist</string>
+    <string name="command_description_discard_session_not_handled">Funktsionaalsus on toetatud ainult krüptitud jututubades</string>
+    <string name="enter_secret_storage_passphrase_or_key">Jätkamiseks kasuta kas oma %1$s või %2$s.</string>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Vale PIN-kood, jäänud on %d katse</item>
+        <item quantity="other">Vale PIN-kood, jäänud on %d katset</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Hoiatus! Viimane katse enne väljalogimist!</string>
+    <string name="too_many_pin_failures">Liiga palju vigu PIN-koodi sisestamisel ning sa oled nüüd välja logitud</string>
 </resources>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index a2dcd0ea22..1b5fb84870 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -30,11 +30,11 @@
     <string name="active_call">Aktív hívás</string>
     <string name="ongoing_conference_call">Folyamatban lévő konferenciahívás.
 \nCsatlakozás: %1$s vagy %2$s</string>
-    <string name="ongoing_conference_call_voice">hanghívás</string>
-    <string name="ongoing_conference_call_video">videóhívás</string>
+    <string name="ongoing_conference_call_voice">Hang</string>
+    <string name="ongoing_conference_call_video">Videó</string>
     <string name="cannot_start_call">Nem sikerült hívást indítani, próbáld meg később</string>
-    <string name="missing_permissions_warning">A hiányzó engedélyek miatt egyes funkciók lehet, hogy nem érhetőek el…</string>
-    <string name="missing_permissions_to_start_conf_call">Engedély szükséges, hogy a szobában konferenciahívást indíthasson</string>
+    <string name="missing_permissions_warning">A hiányzó engedélyek miatt egyes funkciók lehet, hogy nem érhetők el…</string>
+    <string name="missing_permissions_to_start_conf_call">Engedély szükséges, hogy a szobában konferenciahívást indíthass</string>
     <string name="missing_permissions_title_to_start_conf_call">Nem sikerült hívást indítani</string>
     <string name="device_information">Munkamenet információk</string>
     <string name="room_no_conference_call_in_encrypted_rooms">A titkosított szobákban nem támogatott a konferenciahívás</string>
@@ -44,9 +44,9 @@
 
     <string name="action_sign_out">Kijelentkezés</string>
     <string name="action_voice_call">Hanghívás</string>
-    <string name="action_video_call">Videóhívás</string>
+    <string name="action_video_call">Videohívás</string>
     <string name="action_global_search">Globális keresés</string>
-    <string name="action_mark_all_as_read">Mindent olvasottnak jelöl</string>
+    <string name="action_mark_all_as_read">Mind olvasottnak jelölése</string>
     <string name="action_historical">Előzmények</string>
     <string name="action_quick_reply">Gyors válasz</string>
     <string name="action_open">Megnyitás</string>
@@ -74,7 +74,7 @@
     <string name="local_address_book_header">Helyi címjegyzék</string>
     <string name="matrix_only_filter">Csak Matrix névjegyek</string>
     <string name="no_conversation_placeholder">Nincsenek beszélgetések</string>
-    <string name="no_contact_access_placeholder">Nem adtál hozzáférést a Elementnak a helyi névjegyeidhez</string>
+    <string name="no_contact_access_placeholder">Nem adtál hozzáférést a Elementnek a helyi névjegyeidhez</string>
     <string name="no_result_placeholder">Nincs találat</string>
 
     <string name="rooms_header">Szobák</string>
@@ -86,13 +86,13 @@
         <item quantity="other">%d felhasználó</item>
     </plurals>
 
-    <string name="send_bug_report_include_logs">Naplófájl küldése</string>
-    <string name="send_bug_report_include_crash_logs">Hibanapló küldése</string>
+    <string name="send_bug_report_include_logs">Naplófájlok küldése</string>
+    <string name="send_bug_report_include_crash_logs">Összeomlásnaplók küldése</string>
     <string name="send_bug_report_include_screenshot">Képernyőkép küldése</string>
     <string name="send_bug_report">Hibajelentés</string>
-    <string name="send_bug_report_description">Kérünk, írd le a hibát! Mit csináltál? Mit vártál, hogy történni fog? Mi történt valójában?</string>
-    <string name="send_bug_report_placeholder">Írd le itt a problémádat</string>
-    <string name="send_bug_report_logs_description">A problémák kielemzése érdekében a naplók erről a kliensről a hibabejelentővel elküldésre kerülnek. Ha inkább csak a fenti szöveget szeretnéd elküldeni, szedd ki a pipát:</string>
+    <string name="send_bug_report_description">Íd le a hibát! Mit csináltál\? Mit vártál, hogy mi fog történni\? Mi történt valójában\?</string>
+    <string name="send_bug_report_placeholder">Ide írd le a problémádat</string>
+    <string name="send_bug_report_logs_description">A problémák elemzése érdekében a kliens naplói is elküldésre kerülnek a hibajelentéssel. A hibajelentés, beleértve a naplókat és a képernyőképek nem lesznek nyilvánosan láthatók. Ha inkább csak a fenti szöveget szeretnéd elküldeni, szedd ki a pipát:</string>
     <string name="send_bug_report_alert_message">Úgy tűnik, mintha mérgedben ráznád a telefont. Szeretnél hibajelentést beküldeni?</string>
     <string name="send_bug_report_app_crashed">Az alkalmazás legutóbb összeomlott. Megnyitod a hibabejelentő képernyőt?</string>
 
@@ -103,20 +103,20 @@
     <string name="send_files_in">Küldés ide:</string>
     <string name="read_receipt">Elolvasta</string>
 
-    <string name="join_room">Belépés a szobába</string>
+    <string name="join_room">Csatlakozás a szobához</string>
     <string name="username">Felhasználónév</string>
-    <string name="create_account">Fiók készítés</string>
+    <string name="create_account">Fiók létrehozása</string>
     <string name="login">Bejelentkezés</string>
     <string name="logout">Kijelentkezés</string>
-    <string name="hs_url">Matrix szerver URL</string>
-    <string name="identity_url">Identitás szerver URL</string>
+    <string name="hs_url">Matrix-kiszolgáló URL-je</string>
+    <string name="identity_url">Azonosítási kiszolgáló URL-je</string>
     <string name="search">Keresés</string>
 
     <string name="start_new_chat">Új csevegés indítása</string>
     <string name="start_voice_call">Hanghívás indítása</string>
-    <string name="start_video_call">Videóhívás indítása</string>
+    <string name="start_video_call">Videohívás indítása</string>
 
-    <string name="option_send_files">Fájlküldés</string>
+    <string name="option_send_files">Fájlok küldése</string>
     <string name="option_take_photo_video">Kép- vagy videókészítés</string>
 
     <string name="auth_login">Bejelentkezés</string>
@@ -135,7 +135,7 @@
     <string name="auth_opt_phone_number_placeholder">Telefonszám (nem kötelező)</string>
     <string name="auth_repeat_password_placeholder">Jelszó ismétlése</string>
     <string name="auth_repeat_new_password_placeholder">Erősítsd meg az új jelszavadat</string>
-    <string name="auth_invalid_login_param">Hibás felhasználónév és/vagy jelszó</string>
+    <string name="auth_invalid_login_param">Hibás felhasználónév vagy jelszó</string>
     <string name="auth_invalid_user_name">A felhasználónévben csak betűk, számok, pontok, kötőjelek és aláhúzásjelek lehetnek</string>
     <string name="auth_invalid_password">A jelszó túl rövid (min. 6)</string>
     <string name="auth_missing_password">Hiányzó jelszó</string>
@@ -145,43 +145,45 @@
     <string name="auth_missing_email">Hiányzó e-mail cím</string>
     <string name="auth_missing_phone">Hiányzó telefonszám</string>
     <string name="auth_missing_email_or_phone">Hiányzó e-mail cím vagy telefonszám</string>
-    <string name="auth_invalid_token">Érvénytelen kód</string>
+    <string name="auth_invalid_token">Érvénytelen token</string>
     <string name="auth_password_dont_match">A jelszók nem egyeznek</string>
     <string name="auth_forgot_password">Elfelejtetted a jelszavad?</string>
-    <string name="auth_use_server_options">Személyre szabott szerver beállítások (haladó)</string>
+    <string name="auth_use_server_options">Egyéni kiszolgálóbeállítások (haladó)</string>
     <string name="auth_email_validation_message">A regisztráció folytatásához nézd meg az e-mailjeidet</string>
-    <string name="auth_threepid_warning_message">Nem támogatott a regisztráció e-mail címmel és telefonszámmal egyszerre, amíg az api el nem készül. Most csak a telefonszámot használjuk.
-
-Az e-mail címed a beállításoknál adhatod a profilodhoz.</string>
-    <string name="auth_recaptcha_message">A Matrix szerver szeretné ellenőrizni, hogy nem vagy robot</string>
+    <string name="auth_threepid_warning_message">Az egyszerre e-mail-címmel és telefonszámmal történő regisztráció még nem támogatott, amíg az API el nem készül. Csak a telefonszám lesz figyelembe véve.
+\n
+\nAz e-mail-címedet a beállításokban adhatod hozzá a profilodhoz.</string>
+    <string name="auth_recaptcha_message">A Matrix-kiszolgáló szeretné ellenőrizni, hogy nem vagy robot</string>
     <string name="auth_username_in_use">A felhasználónév foglalt</string>
-    <string name="auth_home_server">Matrix szerver:</string>
-    <string name="auth_identity_server">Identitásszerver:</string>
+    <string name="auth_home_server">Matrix-kiszolgáló:</string>
+    <string name="auth_identity_server">Azonosítási kiszolgáló:</string>
     <string name="auth_reset_password_next_step_button">Ellenőriztem az e-mail címemet</string>
-    <string name="auth_reset_password_message">A jelszavad visszaállításához add meg a fiókodhoz tartozó e-mail címet:</string>
-    <string name="auth_reset_password_missing_email">Meg kell adnod a fiókodhoz tartozó e-mail címet.</string>
+    <string name="auth_reset_password_message">A jelszavad visszaállításához add meg a fiókodhoz tartozó e-mail-címet:</string>
+    <string name="auth_reset_password_missing_email">Meg kell adnod a fiókodhoz tartozó e-mail-címet.</string>
     <string name="auth_reset_password_missing_password">Meg kell adnod egy új jelszót.</string>
-    <string name="auth_reset_password_email_validation_message">Küldtünk egy e-mailt erre a címre: %s . A benne lévő link használata után kattints.</string>
-    <string name="auth_reset_password_error_unauthorized">Nem sikerült az e-mail címet ellenőrizni: rákattintottál az e-mailben található linkre</string>
-    <string name="auth_reset_password_success_message">A jelszavad visszaállítottuk. Kiléptettünk az összes munkamenetedből, nem érkezik rájuk új értesítés. Az értesítések visszakapcsolásához minden készüléken lépj be újra.</string>
+    <string name="auth_reset_password_email_validation_message">Küldtünk egy e-mailt erre a címre: %s. A benne lévő hivatkozás használata után kattints lentebb.</string>
+    <string name="auth_reset_password_error_unauthorized">Az e-mail-címed ellenőrzés sikertelen: győződj meg róla, hogy rákattintottál az e-mailben található hivatkozásra</string>
+    <string name="auth_reset_password_success_message">A jelszavad visszaállítottuk.
+\n
+\nKiléptettünk az összes munkamenetedből, nem és többé nem fogsz leküldéses értesítéseket kapni. Az értesítések visszakapcsolásához lépj be újra az összes eszközön.</string>
 
     <string name="login_error_must_start_http">Az URL így kezdődjön: http[s]://</string>
     <string name="login_error_network_error">Sikertelen bejelentkezés: Hálózati hiba</string>
-    <string name="login_error_unable_login">Sikertelen belépés</string>
+    <string name="login_error_unable_login">Sikertelen bejelentkezés</string>
     <string name="login_error_registration_network_error">Sikertelen regisztráció: Hálózati hiba</string>
-    <string name="login_error_unable_register">Regisztráció sikertelen</string>
-    <string name="login_error_unable_register_mail_ownership">Regisztráció sikertelen: e-mail tulajdonjog hiba</string>
-    <string name="login_error_invalid_home_server">Kérlek adj meg érvényes URL-t</string>
+    <string name="login_error_unable_register">Sikertelen regisztráció</string>
+    <string name="login_error_unable_register_mail_ownership">Sikertelen regisztráció: e-mail tulajdonjogi hiba</string>
+    <string name="login_error_invalid_home_server">Adj meg egy érvényes URL-t</string>
 
     <string name="login_error_forbidden">Helytelen felhasználónév/jelszó</string>
-    <string name="login_error_unknown_token">A megadott hozzáférési kódot nem sikerült felismerni</string>
+    <string name="login_error_unknown_token">A megadott hozzáférési tokent nem sikerült felismerni</string>
     <string name="login_error_bad_json">Hibás JSON</string>
     <string name="login_error_not_json">Nem tartalmazott érvényes JSON-t</string>
     <string name="login_error_limit_exceeded">Túl sok kérés lett elküldve</string>
     <string name="login_error_user_in_use">Ez a felhasználónév már foglalt</string>
-    <string name="login_error_login_email_not_yet">Az e-mailban található linkre még nem kattintottak</string>
+    <string name="login_error_login_email_not_yet">Az e-mailban található hivatkozásra még nem kattintottak</string>
 
-    <string name="read_receipts_list">Lista azokról akik elolvasták</string>
+    <string name="read_receipts_list">Lista azokról, akik elolvasták</string>
 
     <string name="compression_options">Küldés mint</string>
     <string name="compression_opt_list_original">Eredeti</string>
@@ -205,33 +207,33 @@ Az e-mail címed a beállításoknál adhatod a profilodhoz.</string>
     <string name="call_ended">Hívás vége</string>
     <string name="call_ring">Hívás…</string>
     <string name="incoming_call">Bejövő hívás</string>
-    <string name="incoming_video_call">Bejövő videóhívás</string>
+    <string name="incoming_video_call">Bejövő videohívás</string>
     <string name="incoming_voice_call">Bejövő hanghívás</string>
     <string name="call_in_progress">Hívás folyamatban…</string>
 
     <string name="call_error_user_not_responding">A hívott fél nem vette fel.</string>
-    <string name="call_error_ice_failed">A médiacsatlakozás nem sikerült</string>
-    <string name="call_error_camera_init_failed">A kamera nem használható</string>
-    <string name="call_error_answered_elsewhere">hívást máshol vették fel</string>
+    <string name="call_error_ice_failed">Médiacsatlakozás sikertelen</string>
+    <string name="call_error_camera_init_failed">A kamera nem készíthető elő</string>
+    <string name="call_error_answered_elsewhere">a hívást máshol vették fel</string>
 
-    <string name="media_picker_both_capture_title">Készíts képet vagy videót</string>
-    <string name="media_picker_cannot_record_video">Videórögzítés sikertelen</string>
+    <string name="media_picker_both_capture_title">Kép vagy videó készítése</string>
+    <string name="media_picker_cannot_record_video">Videorögzítés sikertelen</string>
 
     <string name="permissions_rationale_popup_title">Információ</string>
-    <string name="permissions_rationale_msg_storage">A Element-nak szüksége van a fotó és videó könyvtáradnak elérési engedélyéhez a csatolmányok küldéséhez.
+    <string name="permissions_rationale_msg_storage">A Elementnek szüksége van a fénykép- és videótárad elérési engedélyéhez a mellékletek küldéséhez és mentéséhez.
 \n
-\nKérlek engedélyezd a hozzáférést a következő felugró ablakban, hogy tudj fájlokat küldeni a telefonodról.</string>
-    <string name="permissions_rationale_msg_camera">Element-nak engedély szükséges a kamerád eléréséhez, hogy tudj képeket készíteni és videó hívásokat.</string>
+\nEngedélyezd a hozzáférést a következő felugró ablakon, hogy fájlokat tudj küldeni a telefonodról.</string>
+    <string name="permissions_rationale_msg_camera">Az Elementnek engedélyre van szüksége a kamera eléréséhez, hogy képeket tudj készítsen és videóhívást tudj indítani.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nEngedélyezd a hozzáférést a következő felugró ablakon, hogy hívást tudj indítani."</string>
-    <string name="permissions_rationale_msg_record_audio">A Element-nak engedély szükséges a mikrofonod eléréséhez, hogy tudj hanghívást kezdeményezni.</string>
+    <string name="permissions_rationale_msg_record_audio">A Elementnek engedélyre van szüksége a mikrofon eléréséhez, hogy hanghívás tudjon indítani.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nEngedélyezd a hozzáférést a következő felugró ablakon, hogy hívást tudj indítani."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">"A Element-nak engedély szükséges a mikrofonod  és kamerád eléréséhez, hogy tudj videóhívást kezdeményezni.
-
-Kérlek engedélyezd a hozzáférést a következő felugró ablakban, hogy tudj hívást kezdeményezni."</string>
+    <string name="permissions_rationale_msg_camera_and_audio">A Elementnek engedélyre van szüksége a mikrofonod és kamerád eléréséhez, hogy videohívást tudj indítani.
+\n
+\nEngedélyezd a hozzáférést a következő felugró ablakon, hogy hívást tudj indítani.</string>
     <string name="permissions_rationale_msg_contacts">A Element a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókar. Ha egyetértesz a névjegyek ilyen célú megosztásával, kérlek engedélyezd a hozzáférést a következő felugró üzenetben.</string>
     <string name="permissions_msg_contacts_warning_other_androids">A Element a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókar.
 \n
@@ -553,7 +555,7 @@ Vedd figyelembe, hogy az alkalmazás újraindul  ami sok időt vehet igénybe."<
     <string name="encryption_information_sender_device_information">A küldő munkamenet információi</string>
     <string name="encryption_information_device_name">Nyilvános név</string>
     <string name="encryption_information_name">Nyilvános név</string>
-    <string name="encryption_information_device_id">Azonosító</string>
+    <string name="encryption_information_device_id">Munkamenet-azonosító</string>
     <string name="encryption_information_device_key">Munkamenet kulcs</string>
     <string name="encryption_information_verification">Hitelesítés</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 ujjlenyomat</string>
@@ -642,7 +644,7 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="huge">Óriási</string>
     <string name="offline">Offline</string>
 
-    <string name="user_directory_header">Felhasználójegyzék</string>
+    <string name="user_directory_header">Felhasználói címjegyzék</string>
     <string name="light_theme">Világos téma</string>
     <string name="dark_theme">Sötét téma</string>
     <string name="black_them">Fekete téma</string>
@@ -681,7 +683,7 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="notification_silent_notifications">Csendes értesítések</string>
 
     <string name="option_take_photo">Fényképezés</string>
-    <string name="option_take_video">Videófelvétel</string>
+    <string name="option_take_video">Videofelvétel</string>
 
     <string name="settings_analytics">Elemzés</string>
 
@@ -703,7 +705,7 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
 
     <string name="encrypted_message">Titkosított üzenet</string>
 
-    <string name="title_activity_group_details">A közösség adatai</string>
+    <string name="title_activity_group_details">Közösség adatai</string>
 
     <string name="loading">Betöltés…</string>
 
@@ -717,12 +719,12 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="no_group_placeholder">Nincsenek csoportok</string>
 
     <string name="start_new_chat_prompt_msg">Biztos, hogy új beszélgetést akarsz kezdeni vele: %s?</string>
-    <string name="start_voice_call_prompt_msg">Biztos, hogy hanghívást akarsz kezdeményezni?</string>
-    <string name="start_video_call_prompt_msg">Biztos, hogy videóhívást akarsz kezdeményezni?</string>
+    <string name="start_voice_call_prompt_msg">Biztos, hogy hanghívást akarsz indítani\?</string>
+    <string name="start_video_call_prompt_msg">Biztos, hogy videóhívást akarsz indítani\?</string>
 
     <string name="groups_list">Csoportok listája</string>
 
-    <string name="room_participants_ban_prompt_msg">Biztos, hogy ki akarod tiltani ezt az illetőt ebből a beszélgetésből?</string>
+    <string name="room_participants_ban_prompt_msg">A felhasználó kitiltása kirúgja őt a szobából, és megakadályozza, hogy újra csatlakozhasson.</string>
 
     <string name="room_settings_all_messages_noisy">Összes üzenet (hangos)</string>
     <string name="room_settings_all_messages">Összes üzenet</string>
@@ -769,7 +771,7 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="room_settings_no_flair">"Ez a szoba nem mutatja  a közösségek kitűzőit"</string>
     <string name="group_details_home">Kezdőlap</string>
     <string name="actions">Műveletek</string>
-    <string name="send_bug_report_rage_shake">Rázd meg ha hibát szeretnél bejelenteni</string>
+    <string name="send_bug_report_rage_shake">Rázd meg az eszközt, ha hibát szeretnél bejelenteni</string>
 
     <plurals name="membership_changes">
         <item quantity="one">1 tagság változás</item>
@@ -797,8 +799,8 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
         <item quantity="other">%d szoba</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
-        <item quantity="one">%1$s szoba találat ehhez: %2$s</item>
-        <item quantity="other">%1$s szoba találat ehhez: %2$s</item>
+        <item quantity="one">%1$s szoba található ehhez: %2$s</item>
+        <item quantity="other">%1$s szoba található ehhez: %2$s</item>
     </plurals>
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">1 olvasatlan üzenet</item>
@@ -842,12 +844,12 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="title_activity_choose_sticker">Matrica küldése</string>
 
     <string name="option_send_sticker">Matrica küldése</string>
-    <string name="no_sticker_application_dialog_content">Nincs semmilyen matrica csomagod.
+    <string name="no_sticker_application_dialog_content">Jelenleg nincs matricacsomag bekapcsolva.
 \n
-\nHozzáadsz párat most\?</string>
+\nHozzáadsz most párat\?</string>
 
     <string name="settings_deactivate_account_section">Fiók felfüggesztése</string>
-    <string name="settings_deactivate_my_account">Függessze fel a fiókomat</string>
+    <string name="settings_deactivate_my_account">Saját fiók felfüggesztése</string>
 
     <string name="settings_opt_in_of_analytics">Analitikai adatok küldése</string>
     <string name="settings_opt_in_of_analytics_summary">Element anonim analitikai adatokat gyűjt, hogy javítani tudjuk az alkalmazást.</string>
@@ -872,27 +874,27 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="dialog_title_third_party_licences">Harmadik felektől származó licencek</string>
 
     <string name="download">Letöltés</string>
-    <string name="speak">Beszélj</string>
+    <string name="speak">Beszéd</string>
     <string name="clear">Törlés</string>
     <string name="e2e_re_request_encryption_key">Végpontok közötti titkosításhoz használt kulcsok újrakérése a többi munkamenetedtől.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Kulcs újrakérve.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Kérés elküldve</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Kérlek indítsd el a Elementot egy olyan eszközön ami ezt az üzenetet vissza tudja fejteni, hogy elküldhesse a kulcsot erre a munkamenetre.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Índítsd el a Elementet egy olyan eszközön, amely vissza tudja fejteni az üzenetet, hogy elküldhesse a kulcsot ennek a munkamenetnek.</string>
 
     <string name="lock_screen_hint">Ide írj…</string>
 
-    <string name="option_send_voice">Hang üzenet küldése</string>
+    <string name="option_send_voice">Hangüzenet küldése</string>
 
     <string name="go_on_with">tovább ezzel…</string>
-    <string name="error_no_external_application_found">Sajnálom, nem található külső alkalmazás a művelethez.</string>
+    <string name="error_no_external_application_found">Nem található külső alkalmazás a művelet befejezéséhez.</string>
 
     <string name="settings_labs_enable_send_voice">Hang üzenet küldése</string>
 
     <string name="error_empty_field_your_password">Kérlek add meg a jelszavad.</string>
 
-    <string name="send_bug_report_description_in_english">Kérlek, ha lehetséges a leírást angolul írd.</string>
+    <string name="send_bug_report_description_in_english">Ha lehetséges, a leírást angolul írd.</string>
     <string name="room_message_placeholder_reply_to_encrypted">Titkosított válasz küldése…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Válasz küldése (titkosítás nélkül)…</string>
     <string name="settings_preview_media_before_sending">Média előnézete küldés előtt</string>
@@ -1026,11 +1028,11 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="settings_call_category">Hívások</string>
     <string name="settings_call_ringtone_use_app_ringtone">Az alapértelmezett Element csengőhang használata bejövő hívásokhoz</string>
     <string name="settings_call_ringtone_title">Bejövő hívás csengőhangja</string>
-    <string name="settings_call_ringtone_dialog_title">Csengőhang kiválasztása hívásokhoz:</string>
+    <string name="settings_call_ringtone_dialog_title">Csengőhang kiválasztása a hívásokhoz:</string>
 
     <string name="accept">Elfogadás</string>
 
-    <string name="auth_accept_policies">Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit:</string>
+    <string name="auth_accept_policies">Nézd át és fogadd el a Matrix-kiszolgáló házirendjét:</string>
 
     <string name="settings_notification_troubleshoot">Értesítéshibák felderítése</string>
     <string name="settings_troubleshoot_diagnostic">Hibakereső diagnosztika</string>
@@ -1063,16 +1065,16 @@ Kérlek ellenőrizd a fiókbeállításokat.</string>
 \n%1$s"</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Play Services javítása</string>
 
-    <string name="settings_troubleshoot_test_fcm_title">Firebase Token</string>
+    <string name="settings_troubleshoot_test_fcm_title">Firebase token</string>
     <string name="settings_troubleshoot_test_fcm_success">FCM token fogadása sikeres:
 %1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM token fogadása sikertelen:
 %1$s</string>
 
-    <string name="settings_troubleshoot_test_token_registration_title">Token Regisztráció</string>
-    <string name="settings_troubleshoot_test_token_registration_success">FCM token sikeresen regisztrálva a Matrix szerveren.</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">FCM token regisztrációja sikertelen a Matrix szerveren:
-%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_title">Token regisztráció</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCM token sikeresen regisztrálva a Matrix-kiszolgálón.</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">FCM token regisztrációja sikertelen a Matrix-kiszolgálón:
+\n%1$s</string>
 
     <string name="settings_troubleshoot_test_foreground_service_started_title">Értesítés Szolgáltatás</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Értesítés Szolgáltatás fut.</string>
@@ -1114,11 +1116,11 @@ A következő képernyőn el kell fogadnod, hogy a Element folyamatosan fusson a
 
     <string name="no_valid_google_play_services_apk">Érvényes Google Play Services APK nem található. Az értesítések megbízhatatlanul működhetnek.</string>
 
-    <string name="video_call_in_progress">Videóhívás folyamatban…</string>
+    <string name="video_call_in_progress">Videohívás folyamatban…</string>
 
     <string name="title_activity_keys_backup_setup">Kulcsmentés</string>
     <string name="title_activity_keys_backup_restore">Kulcsmentés használata</string>
-    <string name="keys_backup_is_not_finished_please_wait">A kulcsok biztonsági mentése még tart, kérlek várj…</string>
+    <string name="keys_backup_is_not_finished_please_wait">A kulcsok biztonsági mentése még tart, kis türelmet…</string>
 
     <string name="skip">Kihagyás</string>
     <string name="done">Kész</string>
@@ -1304,8 +1306,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="ignore">Figyelmen kívül hagyás</string>
 
     <string name="auth_login_sso">Belépés egyszeri bejelelentkezéssel</string>
-    <string name="login_error_unknown_host">Ez az URL elérhetetlen, kérlek ellenőrizd</string>
-    <string name="login_error_ssl_handshake">Az eszközöd elavult TLS biztonsági protokollt használ ami támadható, a biztonságod érdekében nem csatlakozhatsz</string>
+    <string name="login_error_unknown_host">Ez az URL nem érhető el, ellenőrizd</string>
+    <string name="login_error_ssl_handshake">Az eszközöd elavult TLS biztonsági protokollt használ, amely támadható, a biztonságod érdekében nem csatlakozhatsz</string>
     <string name="settings_send_message_with_enter">Üzenet küldése Enter billentyűvel</string>
     <string name="settings_send_message_with_enter_summary">Az Enter billentyű a virtuális billentyűzeten elküldi az üzenetet és nem új sort szúr be</string>
 
@@ -1498,7 +1500,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="preference_root_help_about">Segítség &amp; Névjegy</string>
 
 
-    <string name="settings_troubleshoot_test_token_registration_quick_fix">„Token” regisztrálás</string>
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Token regisztrálása</string>
 
     <string name="send_suggestion">Javaslat tétel</string>
     <string name="send_suggestion_content">A javaslatodat kérlek ír le alulra.</string>
@@ -1567,20 +1569,20 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="disconnect">Bontás</string>
     <string name="people_no_identity_server">Nincs beállítva azonosítási kiszolgáló.</string>
 
-    <string name="call_failed_no_ice_title">A hívás sikertelen a hibásan beállított szerver miatt</string>
-    <string name="call_failed_no_ice_description">Kérd meg a matrix szervered (%1$s) adminisztrátorát, hogy állítson be egy TURN szervert, hogy a hívások megbízhatóan működjenek.
+    <string name="call_failed_no_ice_title">A hívás a hibásan beállított kiszolgáló miatt sikertelen</string>
+    <string name="call_failed_no_ice_description">Kérd meg a Matrix-kiszolgálód (%1$s) rendszergazdáját, hogy állítson be egy TURN-kiszolgálót, hogy a hívások megbízhatóan működjenek.
 \n
-\nAlternatív megoldásként használhatod a nyilvános szervert itt: %2$s, de ez lehet, hogy nem lesz annyira megbízható és az IP címedet megosztja a szerverrel. Ezt a Beállításokban tudod megadni.</string>
+\nAlternatív megoldásként használhatod az itteni nyilvános kiszolgálót: %2$s, de ez lehet, hogy nem lesz annyira megbízható és megosztja az IP-címedet a kiszolgálóval. Ezt a Beállításokban is meg tudod adni.</string>
     <string name="call_failed_no_ice_use_alt">Próbáld ki ezt: %s</string>
-    <string name="call_failed_dont_ask_again">Ne kérdezz újra</string>
+    <string name="call_failed_dont_ask_again">Ne kérdezze újra</string>
 
-    <string name="auth_add_email_message_2">Fiók visszaállításhoz e-mail beállítása, később esetleg megtalálhatnak akik ismernek téged.</string>
-    <string name="auth_add_phone_message_2">Telefonszám beállítása, és később esetleg megtalálhatnak akik ismernek téged.</string>
-    <string name="auth_add_email_phone_message_2">Fiók visszaállításhoz e-mail beállítás. Később esetleg e-mail vagy telefonszám alapján megtalálhatnak akik ismernek téged.</string>
-    <string name="auth_add_email_and_phone_message_2">Fiók visszaállításhoz e-mail beállítás. Később esetleg e-mail vagy telefonszám alapján megtalálhatnak akik ismernek téged.</string>
-    <string name="login_error_homeserver_not_found">A matrix szerver elérhetetlen ezen a címen, kérlek ellenőrizd</string>
-    <string name="settings_call_ringtone_use_default_stun">Tartalék hívás segítő szerver engedélyezése</string>
-    <string name="settings_call_ringtone_use_default_stun_sum">Segítségként %s lesz használatban ha a matrix szervered nem ajánl fel egyet (a hívás ideje alatt az IP címed megosztásra kerül)</string>
+    <string name="auth_add_email_message_2">Állíts be egy e-mail címet fiók visszaállításhoz, és hogy később megtalálhassanak akik ismernek.</string>
+    <string name="auth_add_phone_message_2">Állíts be egy telefonszámot, hogy megtalálhassanak akik ismernek.</string>
+    <string name="auth_add_email_phone_message_2">Állíts be egy e-mail címet fiók visszaállításhoz. E-mail vagy telefonszám alapján megtalálhatnak akik ismernek.</string>
+    <string name="auth_add_email_and_phone_message_2">Állíts be egy e-mail címet fiók visszaállításhoz. Később e-mail vagy telefonszám alapján megtalálhatnak akik ismernek.</string>
+    <string name="login_error_homeserver_not_found">Nem érhető el Matrix-kiszolgáló ezen a címen, ellenőrizd</string>
+    <string name="settings_call_ringtone_use_default_stun">Tartalék hívássegítő kiszolgáló engedélyezése</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Segítőként a(z) %s lesz használatban ha a Matrix-kiszolgálója nem biztosít egyet (a hívás ideje alatt az IP-címed megosztásra kerül)</string>
     <string name="invite_no_identity_server_error">A beállításokban adj hozzá egy azonosítási szervert ehhez a művelethez.</string>
     <string name="settings_background_fdroid_sync_mode">Háttér Szinkronizálási Mód (Kísérleti)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimalizált akkumulátor használat</string>
@@ -1676,7 +1678,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="report_content_custom_title">Tartalom bejelentése</string>
     <string name="report_content_custom_hint">A tartalom bejelentésének oka</string>
     <string name="report_content_custom_submit">JELENTÉS</string>
-    <string name="block_user">FELHASZNÁLÓ BLOKKOLÁSA</string>
+    <string name="block_user">FELHASZNÁLÓ FIGYELMEN KÍVÜL HAGYÁSA</string>
 
     <string name="content_reported_title">Tartalom bejelentve</string>
     <string name="content_reported_content">Ez a tartalom bejelentve.
@@ -1722,7 +1724,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="room_widget_permission_avatar_url">Profilképed URL-je</string>
     <string name="room_widget_permission_user_id">Felhasználói azonosítód</string>
     <string name="room_widget_permission_theme">Témád</string>
-    <string name="room_widget_permission_widget_id">Kisalkalmazás azon.</string>
+    <string name="room_widget_permission_widget_id">Kisalkalmazás-azonosító</string>
     <string name="room_widget_permission_room_id">Szoba azonosító</string>
 
 
@@ -1733,8 +1735,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="room_widget_webview_access_microphone">Mikrofon használata</string>
     <string name="room_widget_webview_read_protected_media">DRM-mel védett média olvasása</string>
 
-    <string name="login_error_no_homeserver_found">Ez nem egy érvényes Matrix szerver cím</string>
-    <string name="message_ignore_user">Felhasználó tiltása</string>
+    <string name="login_error_no_homeserver_found">Ez nem egy érvényes Matrix-kiszolgáló címe</string>
+    <string name="message_ignore_user">Felhasználó figyelmen kívül hagyása</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">Minden üzenet (hangos)</string>
     <string name="room_list_quick_actions_notifications_all">Minden üzenet</string>
@@ -1756,7 +1758,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="room_join_rules_invite">%1$s beállította, hogy a szobába csak meghívóval lehessen belépni.</string>
     <string name="timeline_unread_messages">Olvasatlan üzenetek</string>
 
-    <string name="login_splash_title">Szabadítsd fel a kommunikációdat</string>
+    <string name="login_splash_title">Szabadítsd fel a kommunikációdat.</string>
     <string name="login_splash_text1">Beszélgess másokkal közvetlenül vagy csoportosan</string>
     <string name="login_splash_text2">Beszélgess bizalmasan, titkosítást használva</string>
     <string name="login_splash_text3">Bővítsd és szabd testre a élményt</string>
@@ -1914,7 +1916,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="settings_advanced_settings">Haladó beállítások</string>
     <string name="settings_developer_mode">Fejlesztői mód</string>
     <string name="settings_developer_mode_summary">A fejlesztői móddal rejtett lehetőségeket kapcsolsz be amitől az alkalmazás instabilabb lehet. Csak fejlesztőknek!</string>
-    <string name="settings_rageshake">Rageshake</string>
+    <string name="settings_rageshake">Dühös rázás</string>
     <string name="settings_rageshake_detection_threshold">Észlelési határ</string>
     <string name="settings_rageshake_detection_threshold_summary">Az észlelési határ kipróbálásához rázd meg a telefonodat</string>
     <string name="rageshake_detected">Rázás észlelése sikeres!</string>
@@ -2050,13 +2052,13 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
 
     <string name="encryption_information_cross_signing_state">Eszközök közti hitelesítés</string>
-    <string name="encryption_information_dg_xsigning_complete">Az eszközök közötti hitelesítés engedélyezve van
-\nPrivát Kulcsok az eszközön.</string>
-    <string name="encryption_information_dg_xsigning_trusted">Az eszközök közötti hitelesítés engedélyezve van
+    <string name="encryption_information_dg_xsigning_complete">Az eszközök közötti hitelesítés engedélyezett.
+\nPrivát kulcsok az eszközön.</string>
+    <string name="encryption_information_dg_xsigning_trusted">Az eszközök közötti hitelesítés engedélyezett
 \nA kulcsok megbízhatók.
 \nA privát kulcsok ismeretlenek</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">Az eszközök közötti hitelesítés engedélyezve van.
-\nA kulcsok megbízhatatlanok</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">Az eszközök közötti hitelesítés engedélyezett.
+\nA kulcsok nem megbízhatóak</string>
     <string name="encryption_information_dg_xsigning_disabled">Eszközök közti hitelesítés nincs engedélyezve</string>
 
 
@@ -2071,8 +2073,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="settings_active_sessions_unverified_device_desc">A munkamenet megbízhatónak való jelöléséhez és a titkosított üzenetekhez való hozzáférés engedélyezéséhez hitelesítsd azt. Ha nem te jelentkeztél be ebbe a munkamenetbe akkor lehetséges, hogy a fiókodat feltörték:</string>
 
     <plurals name="settings_active_sessions_count">
-        <item quantity="one">%d munkamenet használatban</item>
-        <item quantity="other">%d munkamenet használatban</item>
+        <item quantity="one">%d aktív munkamenet</item>
+        <item quantity="other">%d aktív munkamenet</item>
     </plurals>
 
     <string name="crosssigning_verify_this_session">Munkamenet ellenőrzése</string>
@@ -2114,8 +2116,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
         <item quantity="other">%d szavazat</item>
     </plurals>
     <plurals name="poll_info_final">
-        <item quantity="one">Végeredmény - %d szavazat</item>
-        <item quantity="other">Végeredmény - %d szavazat</item>
+        <item quantity="one">%d szavazat – Végeredmény</item>
+        <item quantity="other">%d szavazat – Végeredmény</item>
     </plurals>
     <string name="poll_item_selected_aria">Kiválasztott Beállítások</string>
     <string name="command_description_poll">Egyszerű szavazás készítése</string>
@@ -2289,8 +2291,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \nElement Desktop</string>
     <string name="app_ios_android">Element iOS
 \nElement Android</string>
-    <string name="or_other_mx_capabale_client">vagy másik eszközök közötti hitelesítésre alkalmas Matrix kliensre</string>
-    <string name="use_latest_app">A Element legújabb kliensét használd a többi eszközödön:</string>
+    <string name="or_other_mx_capabale_client">"vagy más eszközök közötti hitelesítést támogató  Matrix-klienst"</string>
+    <string name="use_latest_app">Az Element legújabb kliensét használd a többi eszközödön:</string>
     <string name="command_description_discard_session">A jelenlegi csoport munkamenet törlését kikényszeríti a titkosított szobában</string>
     <string name="command_description_discard_session_not_handled">Csak a titkosított szobákban támogatott</string>
     <string name="enter_secret_storage_passphrase_or_key">Használd ezt: %1$s vagy ezt: %2$s a továbblépéshez.</string>
@@ -2314,7 +2316,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="error_empty_field_choose_password">Kérlek válassz jelszót.</string>
     <string name="external_link_confirmation_title">Ezt a hivatkozást ellenőrizd le még egyszer</string>
     <string name="create_room_dm_failure">A közvetlen üzenetedet nem sikerült elkészíteni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.</string>
-    <string name="use_other_session_content_description">Használd a legújabb Elementot a másik eszközödön, úgy mint Element Web, Asztali Element, Element for Android vagy más eszközök közötti hitelesítést támogató másik Matrix klienst</string>
+    <string name="use_other_session_content_description">"Használd a legújabb Elementet a többi eszközödön, azaz az Element Webet, az Element Desktopot, az Element for Androidot vagy más eszközök közötti hitelesítést támogató  Matrix-klienst"</string>
     <string name="confirm_your_identity">Erősítsd meg ebben a bejelentkezésben a személyazonosságodat egy másik munkamenetből, hogy hozzáférhess a titkosított üzenetekhez.</string>
     <string name="external_link_confirmation_message">%1$s hivatkozás egy másik oldalra visz: %2$s.
 \n
@@ -2341,7 +2343,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="uploads_media_title">MÉDIA</string>
     <string name="uploads_files_title">FÁJLOK</string>
     <string name="uploads_files_subtitle">%1$s itt: %2$s</string>
-    <string name="login_signin_matrix_id_title">Bejelentkezés</string>
+    <string name="login_signin_matrix_id_title">Bejelentkezés Matrix-azonosítóval</string>
     <string name="disconnect_identity_server_dialog_content">Lecsatlakozol erről az azonosítási szerverről: %s\?</string>
     <string name="identity_server_set_alternative_submit">Küldés</string>
 
@@ -2353,7 +2355,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="login_connect_using_matrix_id_notice">Vagy, ha már rendelkezel egy fiókkal és tudod a Matrix azonosítódat és jelszavadat használhatod ezt is:</string>
     <string name="login_connect_using_matrix_id_submit">Belépés a Matrix azonosítómmal</string>
-    <string name="login_signin_matrix_id_notice">Add meg az azonosítódat és jelszavadat</string>
+    <string name="login_signin_matrix_id_notice">Ha van fiókod egy Matrix-kiszolgálón, akkor meg a Matrix-azonosítódat (például @felhasznalo:domain.com) és jelszavadat lent.</string>
     <string name="login_signin_matrix_id_hint">Felhasználói azonosító</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Ez nem egy valós felhasználó azonosító. A helyes formátum: „@felhasznalo:matrixszerver.org”</string>
     <string name="autodiscover_well_known_error">Nem található a Matrix szerver. Ellenőrizd az azonosítódat</string>
@@ -2378,16 +2380,16 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="identity_server_set_alternative_notice">Vagy beírhatsz más azonosítási szerver URL-t</string>
     <string name="identity_server_set_alternative_notice_no_default">Add meg az azonosítási szerver URL-jét</string>
     <string name="pause_video">Szünet</string>
-    <string name="action_copy">Másol</string>
+    <string name="action_copy">Másolás</string>
     <string name="dialog_title_success">Siker</string>
 
     <string name="bottom_action_notification">Értesítések</string>
     <string name="call_select_sound_device">Hangeszköz kiválasztása</string>
     <string name="sound_device_phone">Telefon</string>
     <string name="sound_device_speaker">Hangszóró</string>
-    <string name="sound_device_headset">Headset</string>
-    <string name="sound_device_wireless_headset">Vezeték nélküli headset</string>
-    <string name="call_switch_camera">Kamera váltás</string>
+    <string name="sound_device_headset">Fejhallgató</string>
+    <string name="sound_device_wireless_headset">Vezeték nélküli fejhallgató</string>
+    <string name="call_switch_camera">Kameraváltás</string>
     <string name="call_camera_front">Első</string>
     <string name="call_camera_back">Hátsó</string>
     <string name="call_format_turn_hd_off">HD kikapcsolása</string>
@@ -2414,4 +2416,189 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="reset_secure_backup_warning">A jelenlegi Kulcsod vagy Jelmondatod ki lesz cserélve erre.</string>
 
     <string name="disabled_integration_dialog_title">Az integrációk ki vannak kapcsolva</string>
+    <string name="play_video">Lejátszás</string>
+    <string name="dismiss">Eltüntetés</string>
+
+
+    <string name="no_permissions_to_start_conf_call">Nincs engedélyed konferenciahívást indítani ebben a szobában</string>
+    <string name="conference_call_in_progress">Már folyamatban van egy konferencia!</string>
+    <string name="video_meeting">Videomegbeszélés indítása</string>
+    <string name="audio_meeting">Megbeszélés indítása (csak hang)</string>
+    <string name="audio_video_meeting_description">A megbeszélések a Jitsi biztonsági és jogosultsági házirendjét használják. A szobában szereplő összes ember meghívást fog kapni, ha elkezdődik a megbeszélés.</string>
+    <string name="cannot_call_yourself">Nem hívhatod fel saját magad</string>
+    <string name="cannot_call_yourself_with_invite">Nem hívhatod fel saját magad, várj amíg a résztvevők elfogadják a meghívást</string>
+    <string name="failed_to_add_widget">Kisalkalmazás hozzáadása sikertelen</string>
+    <string name="failed_to_remove_widget">Kisalkalmazás eltávolítása sikertelen</string>
+    <string name="call_failed_no_connection">Element hívás sikertelen</string>
+    <string name="call_failed_no_connection_description">Nem sikerült felépíteni a valós idejű kapcsolatot.
+\nKérd meg a Matrix-kiszolgálód rendszergazdáját, hogy állítson be egy TURN-kiszolgálót, hogy a hívások megbízhatóan működjenek.</string>
+
+    <string name="login_error_ssl_peer_unverified">SSL hiba: a partner személyazonossága nem lett megerősítve.</string>
+    <string name="settings_call_show_confirmation_dialog_title">Véletlen hívás megakadályozása</string>
+    <string name="room_participants_action_cancel_invite">Meghívás visszavonása</string>
+    <string name="room_participants_power_level_demote_warning_title">Lefokozza magát\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Nem fogja tudni visszavonni ezt a változtatást, mert lefokozza magát, ha Ön az utolsó privilegizált felhasználó a szobában, akkor lehetetlen lesz a jogosultságok visszanyerése.</string>
+    <string name="room_participants_power_level_demote">Lefokozás</string>
+
+
+    <string name="room_participants_action_ignore_prompt_msg">A felhasználó figyelmen kívül hagyása törli az üzeneteit a közös szobáikban.
+\n
+\nEzt a műveletet bármikor visszavonhatja az általános beállításokban.</string>
+    <string name="room_participants_action_unignore_title">Felhasználó figyelembe vétele</string>
+    <string name="room_participants_action_unignore_prompt_msg">A felhasználó figyelembe vétele után újra meg fog jelenni az összes üzenete.</string>
+    <string name="room_participants_action_cancel_invite_title">Meghívás visszavonása</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Biztos, hogy visszavonja a felhasználó meghívását\?</string>
+    <string name="room_participants_kick_prompt_msg">a felhasználó kirúgása eltávolítja a szobából.
+\n
+\nHa meg akarja akadályozni, hogy újra csatlakozzon, akkor inkább tiltsa ki.</string>
+    <string name="room_participants_unban_prompt_msg">A felhasználó tiltásának visszavonása lehetővé teszi, hogy újra csatlakozzon a szobához.</string>
+
+    <string name="disabled_integration_dialog_content">Ehhez kapcsold be az „Integrációk engedélyezését” a Beállításokban.</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d kitiltott felhasználó</item>
+        <item quantity="other">%d kitiltott felhasználó</item>
+    </plurals>
+
+    <string name="encryption_exported_successfully">Kulcsok sikeresen exportálva</string>
+
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d kulcs sikeresen importálva.</item>
+        <item quantity="other">%1$d/%2$d kulcs sikeresen importálva.</item>
+    </plurals>
+
+    <string name="active_widget_view_action">MEGTEKINTÉS</string>
+    <string name="active_widgets_title">Aktív kisalkalmazások</string>
+
+
+    <string name="room_manage_integrations">Integrációk kezelése</string>
+    <string name="room_no_active_widgets">Nincs aktív kisalkalmazás</string>
+    <string name="recovery_key_export_saved">A visszaállítási kulcs mentve lett.</string>
+
+    <string name="secure_backup_banner_setup_line1">Biztonságos mentés</string>
+    <string name="secure_backup_banner_setup_line2">Biztosíték a titkosított üzenetekhez és adatokhoz hozzáférés elvesztése ellen</string>
+
+    <string name="secure_backup_setup">Biztonságos mentés beállítása</string>
+
+    <string name="create_room_federation_error">A szoba létrejött, de néhány meghívó nem lett elküldve, a következő ok miatt:
+\n
+\n%s</string>
+
+    <string name="labs_merge_e2e_in_timeline">Az egyesítésnek nem sikerült visszafejtenie egy üzenetet az idővonalon</string>
+    <string name="labs_show_unread_notifications_as_tab">Külön lap hozzáadása az olvasatlan értesítések számára a főképernyőn.</string>
+
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s és még %3$d felhasználó olvasta</item>
+        <item quantity="other">%1$s, %2$s és még %3$d felhasználó olvasta</item>
+    </plurals>
+    <string name="room_list_quick_actions_favorite_add">Hozzáadás a kedvencekhez</string>
+    <string name="room_list_quick_actions_favorite_remove">Eltávolítás a kedvencek közül</string>
+    <string name="notice_member_no_changes_by_you">Nem változtattál semmit</string>
+    <string name="room_join_rules_public_by_you">Nyilvánossá tetted a szobát azok számára, akik ismerik a hivatkozást.</string>
+    <string name="room_join_rules_invite_by_you">Meghívásossá tetted a szobát.</string>
+    <string name="login_server_url_form_common_notice">Add meg a használandó kiszolgáló címét</string>
+
+    <string name="login_signin_matrix_id_password_notice">Ha nem tudod a jelszavad, akkor lépj vissza és állítsd helyre.</string>
+    <string name="send_a_sticker">Matrica</string>
+
+    <string name="room_profile_section_admin">Rendszergazdai műveletek</string>
+    <string name="room_member_power_level_default_in">Alapértelmezett itt: %1$s</string>
+    <string name="settings_hs_admin_e2e_disabled">A kiszolgáló rendszergazdája alapértelmezetten letiltotta a végpontok közti titkosítást a privát szobákban és közvetlen üzenetekben.</string>
+    <string name="bootstrap_info_text_2">Adj meg egy csak általad ismert biztonsági kifejezést a kiszolgálón található titkok védelméhez.</string>
+
+    <string name="bootstrap_cancel_text">Ha most megszakítod, akkor elvesztheted a titkosított üzeneteid és adataid, ha elveszted a bejelentkezési adataid.
+\n
+\nA Beállításokban állíthatsz be biztonságos mentést és kezelheted a kulcsaidat.</string>
+
+    <string name="room_created_summary_item_by_you">Létrehoztad és beállítottad a szobát.</string>
+
+    <string name="auth_invalid_login_deactivated_account">Ez a fiók letiltásra került.</string>
+
+    <string name="setup_cross_signing">Eszközök közti hitelesítés engedélyezése</string>
+    <string name="error_saving_media_file">A médiafájl mentése sikertelen</string>
+    <string name="power_level_edit_title">Szerepkör megadása</string>
+    <string name="power_level_title">Szerepkör</string>
+    <string name="a11y_open_chat">Csevegés megnyitása</string>
+    <string name="a11y_mute_microphone">Mikrofon némítása</string>
+    <string name="a11y_unmute_microphone">Mikrofon némításának megszüntetése</string>
+    <string name="a11y_stop_camera">Kamera leállítása</string>
+    <string name="a11y_start_camera">Kamera indítása</string>
+
+    <string name="settings_setup_secure_backup">Biztonságos mentés beállítása</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">Biztonságos mentés</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">A titkosított üzenetekhez és adatokhoz való hozzáférés elvesztésének megakadályozása a titkosítási kulcsok kiszolgálóra mentésével.</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Beállítás</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Biztonsági kulcs használata</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Állíts elő egy biztonsági kulcsot jelszókezelőben vagy széfben történő biztonságos tároláshoz.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Biztonsági kifejezés használata</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Adj meg egy csak általad ismert kifejezést, és készíts egy kulcsot biztonsági mentéshez.</string>
+
+    <string name="bottom_sheet_save_your_recovery_key_title">Biztonsági kulcs mentése</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">A biztonsági kulcsot tárold biztonságosan, például egy jelszókezelőben vagy széfben.</string>
+
+    <string name="set_a_security_phrase_title">Biztonsági kifejezés beállítása</string>
+    <string name="set_a_security_phrase_notice">Adj meg egy csak általad ismert biztonsági kifejezést a kiszolgálón található titkok védelméhez.</string>
+    <string name="set_a_security_phrase_hint">Biztonsági kifejezés</string>
+    <string name="set_a_security_phrase_again_notice">Add meg a biztonsági kifejezést a megerősítéshez.</string>
+
+    <string name="save_your_security_key_title">Biztonsági kulcs mentése</string>
+    <string name="save_your_security_key_notice">A biztonsági kulcsot tárold biztonságosan, például egy jelszókezelőben vagy széfben.</string>
+
+    <string name="room_settings_name_hint">Szoba neve</string>
+    <string name="room_settings_topic_hint">Téma</string>
+    <string name="room_settings_save_success">Szoba beállításainak módosítása sikeres</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">Nem érheted el ezt az üzenetet</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Várakozás erre az üzenetre, ez eltarthat egy darabig</string>
+    <string name="crypto_utd">Nem fejthető vissza</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">A végpontok közötti titkosítás miatt lehet hogy várnod kell, hogy valaki üzenet megérkezzen, mert a titkosítási kulcsok nem lettek megfelelően elküldve neked.</string>
+    <string name="crypto_error_withheld_blacklisted">Nem érheted el ezt az üzenetet, mert a küldő letiltott</string>
+    <string name="crypto_error_withheld_unverified">Nem érheted el ezt az üzenetet, mert a feladó nem bízik a munkamenetedben</string>
+    <string name="crypto_error_withheld_generic">Nem érheted el ezt az üzenetet, mert a feladó szándékosan nem küldte el a kulcsokat</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Várakozás a titkosítási előzményekre</string>
+
+    <string name="element_disclaimer_title">A Riot mostantól Element!</string>
+    <string name="element_disclaimer_content">Örömmel jelentjük be, hogy nevet változtattunk! Az alkalmazás naprakész, és be vagy jelentkezve a fiókodba.</string>
+    <string name="element_disclaimer_negative_button">ÉRTEM</string>
+    <string name="element_disclaimer_positive_button">TOVÁBBI INFORMÁCIÓK</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">Helyreállítási kulcs mentése ide:</string>
+
+    <string name="add_from_phone_book">Hozzáadás a telefonkönyvemből</string>
+    <string name="empty_phone_book">A telefonkönyved üres</string>
+    <string name="phone_book_title">Telefonkönyv</string>
+    <string name="search_in_my_contacts">Keresés a névjegyeimben</string>
+    <string name="loading_contact_book">Névjegyek lekérése…</string>
+    <string name="empty_contact_book">A névjegyzéked üres</string>
+    <string name="contacts_book_title">Névjegyzék</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">Meghívás visszavonása</string>
+    <string name="three_pid_revoke_invite_dialog_content">Visszavonod a meghívást ide: %1$s\?</string>
+
+    <string name="member_banned_by">%1$s kitiltotta</string>
+    <string name="failed_to_unban">Felhasználó visszaengedése sikertelen</string>
+
+    <string name="alert_push_are_disabled_title">A leküldéses értesítések ki vannak kapcsolva</string>
+    <string name="alert_push_are_disabled_description">A leküldéses értesítések bekapcsolásához tekintse át a beállításait</string>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Hibás kód, %d próbálkozás van hátra</item>
+        <item quantity="other">Hibás kód, %d próbálkozás van hátra</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Figyelem! Utolsó próbálkozási lehetőség a kiléptetés előtt!</string>
+    <string name="too_many_pin_failures">Túl sok hiba, kiléptettünk</string>
+    <string name="create_pin_title">Válassz biztonsági PIN-kódot</string>
+    <string name="create_pin_confirm_title">PIN-kód megerősítése</string>
+    <string name="create_pin_confirm_failure">Nem sikerült a PIN-kó ellenőrzése, írj be egy újat.</string>
+    <string name="auth_pin_title">Add meg a PIN-kódot</string>
+    <string name="auth_pin_forgot">Elfelejtetted a PIN-kódot\?</string>
+    <string name="auth_pin_reset_title">PIN-kód helyreállítása</string>
+    <string name="auth_pin_new_pin_action">Új PIN-kód</string>
+    <string name="auth_pin_reset_content">A PIN-kód helyreállításához újra be kell jelentkezned, és létre kell hoznod egy újat.</string>
+    <string name="settings_security_pin_code_title">PIN-kód bekapcsolása</string>
+    <string name="settings_security_pin_code_summary">Ha helyre akarod állítani a PIN-kódod, koppints az Elfelejtettem a PIN-kódot feliratra a kijelentkezéshez és helyreállításhoz.</string>
+    <string name="auth_pin_confirm_to_disable_title">Erősítsd meg a PIN-kódot a PIN-kód kikapcsolásához</string>
 </resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index bade2d66b7..9667dbf89c 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -133,6 +133,10 @@
     <string name="option_send_files">Invia file</string>
     <string name="option_take_photo_video">Fai una foto o un video</string>
 
+    <string name="call_notification_answer">Accetta</string>
+    <string name="call_notification_reject">Rifiuta</string>
+    <string name="call_notification_hangup">Riaggancia</string>
+
     <!-- Authentication -->
     <string name="auth_login">Accedi</string>
     <string name="auth_register">Crea account</string>
@@ -630,7 +634,7 @@
     <string name="encryption_information_sender_device_information">Informazioni sessione del mittente</string>
     <string name="encryption_information_device_name">Nome pubblico</string>
     <string name="encryption_information_name">Nome pubblico</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="encryption_information_device_id">ID sessione</string>
     <string name="encryption_information_device_key">Chiave sessione</string>
     <string name="encryption_information_verification">Verifica</string>
     <string name="encryption_information_ed25519_fingerprint">Impronta digitale Ed25519</string>
@@ -1728,7 +1732,7 @@
     <string name="report_content_custom_title">Segnala questo contenuto</string>
     <string name="report_content_custom_hint">Motivo della segnalazione</string>
     <string name="report_content_custom_submit">SEGNALA</string>
-    <string name="block_user">BLOCCA UTENTE</string>
+    <string name="block_user">IGNORA UTENTE</string>
 
     <string name="content_reported_title">Contenuto segnalato</string>
     <string name="content_reported_content">Questo contenuto è stato segnalato.
@@ -1785,7 +1789,7 @@
     <string name="room_widget_webview_read_protected_media">Leggi media protetti da DRM</string>
 
     <string name="login_error_no_homeserver_found">Questo non è un indirizzo di server Matrix valido</string>
-    <string name="message_ignore_user">Blocca utente</string>
+    <string name="message_ignore_user">Ignora utente</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">Tutti i messaggi (rumoroso)</string>
     <string name="room_list_quick_actions_notifications_all">Tutti i messaggi</string>
@@ -2620,4 +2624,34 @@
     <string name="auth_pin_confirm_to_disable_title">Conferma il PIN per disattivarlo</string>
     <string name="settings_call_show_confirmation_dialog_title">Impedisci chiamate accidentali</string>
     <string name="settings_call_show_confirmation_dialog_summary">Chiedi conferma prima di iniziare una chiamata</string>
+    <string name="no_permissions_to_start_conf_call">Non hai il permesso di avviare una chiamata di gruppo in questa stanza</string>
+    <string name="conference_call_in_progress">Una chiamata di gruppo è già in corso!</string>
+    <string name="video_meeting">Avvia conferenza video</string>
+    <string name="audio_meeting">Avvia conferenza audio</string>
+    <string name="audio_video_meeting_description">Le conferenze usano la sicurezza di Jitsi e le sua politica sui permessi. Tutte le persone attualmente nella stanza vedranno un invito per unirsi quando la conferenza è in corso.</string>
+    <string name="cannot_call_yourself">Non puoi chiamare te stesso</string>
+    <string name="cannot_call_yourself_with_invite">Non puoi chiamare te stesso, attendi che i partecipanti accettino l\'invito</string>
+    <string name="failed_to_add_widget">Aggiunta del widget fallita</string>
+    <string name="failed_to_remove_widget">Rimozione del widget fallita</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d chiave importata correttamente.</item>
+        <item quantity="other">%1$d/%2$d chiavi importate correttamente.</item>
+    </plurals>
+
+    <string name="room_manage_integrations">Gestisci integrazioni</string>
+    <string name="room_no_active_widgets">Nessun widget attivo</string>
+    <string name="create_room_federation_error">La stanza è stata creata, ma alcuni inviti non sono stati spediti per il seguente motivo:
+\n
+\n%s</string>
+
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s e %3$d altro hanno letto</item>
+        <item quantity="other">%1$s, %2$s e altri %3$d hanno letto</item>
+    </plurals>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Codice sbagliato, %d tentativo rimasto</item>
+        <item quantity="other">Codice sbagliato, %d tentativi rimasti</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Attenzione! Ultimo tentativo rimasto prima di venire disconnesso!</string>
+    <string name="too_many_pin_failures">Troppi errori, sei stato disconnesso</string>
 </resources>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index b48b4f401c..dacaa03450 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -1229,4 +1229,5 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
         <item quantity="other">元の大きさのまま画像を送信する</item>
     </plurals>
 
+    <string name="cannot_call_yourself">自分自身には通話できません</string>
 </resources>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
new file mode 100644
index 0000000000..a532b40d25
--- /dev/null
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -0,0 +1,1328 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="resources_language">kab</string>
+    <string name="resources_country_code">DZ</string>
+    <string name="resources_script">Latn</string>
+
+    <string name="light_theme">Asentel aceɛlal</string>
+    <string name="dark_theme">Asentel n yiḍ</string>
+    <string name="black_them">Asentel aberkan</string>
+    <string name="notification_sync_init">Awennez n umeẓlu</string>
+    <string name="title_activity_home">Iznan</string>
+    <string name="title_activity_room">Taxxamt</string>
+    <string name="title_activity_settings">Iɣewwaren</string>
+    <string name="title_activity_historical">Amazray</string>
+    <string name="title_activity_verify_device">Asenqed n tɣimit</string>
+
+    <string name="are_you_sure">Tebɣiḍ s tidet\?</string>
+    <string name="loading">Asali…</string>
+
+    <string name="ok">IH</string>
+    <string name="cancel">Sefsex</string>
+    <string name="save">Sekles</string>
+    <string name="leave">Ffeɣ</string>
+    <string name="send">Azen</string>
+    <string name="copy">Nɣel</string>
+    <string name="resend">Ɛawed azen</string>
+    <string name="redact">Sfeḍ</string>
+    <string name="quote">Tanebdurt</string>
+    <string name="download">Sader</string>
+    <string name="share">Bḍu</string>
+    <string name="later">Ticki</string>
+    <string name="view_source">Wali aɣbalu</string>
+    <string name="delete">Kkes</string>
+    <string name="rename">Beddel isem</string>
+    <string name="none">Ula yiwen</string>
+    <string name="revoke">Ḥwi</string>
+    <string name="disconnect">Ffeɣ seg tuqqna</string>
+    <string name="active_call">Asiwel urmid</string>
+    <string name="play_video">Ɣeṛ</string>
+    <string name="dismiss">Agi</string>
+
+
+    <string name="no_permissions_to_start_conf_call">Ur tesεiḍ ara tisirag ad tebduḍ asireg s usiwel deg texxamt-a</string>
+    <string name="failed_to_remove_widget">Tukksa n uwiǧit ur teddi ara</string>
+    <string name="or">neɣ</string>
+    <string name="invite">Nced</string>
+    <string name="offline">Beṛṛa n tuqqna</string>
+    <string name="accept">Qbel</string>
+    <string name="skip">Zgel</string>
+    <string name="done">Immed</string>
+    <string name="abort">Sefsex</string>
+    <string name="ignore">Ttu</string>
+    <string name="review">Senqed</string>
+    <string name="decline">Agwi</string>
+
+    <string name="action_exit">Ffeɣ</string>
+    <string name="actions">Tigawin</string>
+    <string name="action_sign_out">Ffeɣ seg tuqqna</string>
+    <string name="action_mark_all_as_read">Creḍ kullec yettwaɣra</string>
+    <string name="action_historical">Amazray</string>
+    <string name="action_open">Ldi</string>
+    <string name="action_close">Mdel</string>
+    <string name="action_copy">Nɣel</string>
+    <string name="disable">Sens</string>
+
+    <string name="dialog_title_confirmation">Asentem</string>
+    <string name="dialog_title_warning">Asmigel</string>
+    <string name="dialog_title_error">Tuccḍa</string>
+    <string name="dialog_title_success">Yedda</string>
+
+    <string name="bottom_action_home">Agejdan</string>
+    <string name="bottom_action_notification">Ilɣa</string>
+    <string name="bottom_action_favourites">Ismenyifen</string>
+    <string name="bottom_action_people">Imdanen</string>
+    <string name="bottom_action_rooms">Timɣiwent</string>
+    <string name="bottom_action_groups">Timɣiwnin</string>
+
+    <string name="invitations_header">Inced-d</string>
+    <string name="low_priority_header">Tazwart taddayt</string>
+    <string name="system_alerts_header">Ilɣa n unagraw</string>
+
+    <string name="no_result_placeholder">Ulac igmad</string>
+    <string name="rooms_header">Timɣiwent</string>
+    <string name="rooms_directory_header">Akaram n texxamt</string>
+    <string name="groups_invite_header">Nced</string>
+    <string name="groups_header">Timɣiwnin</string>
+    <string name="send_bug_report_include_logs">Azen iɣmisen</string>
+    <string name="join_room">Rnu ɣer texxamt</string>
+    <string name="username">Isem n useqdac</string>
+    <string name="create_account">Rnu amiḍan</string>
+    <string name="logout">Ffeɣ seg tuqqna</string>
+    <string name="identity_url">URL n uqeddac n timagit</string>
+    <string name="search">Nadi</string>
+
+    <string name="call_failed_no_ice_title">Ur yeddi ara usiwel ssebba n uqeddac ur nettuswel ara akken iwata</string>
+    <string name="sound_device_phone">Tiliɣri</string>
+    <string name="call_camera_back">Uɣal ɣer deffir</string>
+    <string name="auth_login_sso">Qqen s unekcum asuf</string>
+    <string name="auth_register">Rnu amiḍan</string>
+    <string name="auth_submit">Azen</string>
+    <string name="auth_skip">Zgel</string>
+    <string name="auth_send_reset_email">Azen imayl n uwennez</string>
+    <string name="auth_return_to_login">Uɣal ɣer ugdil n tuqqna</string>
+    <string name="auth_password_placeholder">Awal uffir</string>
+    <string name="auth_new_password_placeholder">Awal uffir amaynut</string>
+    <string name="auth_email_placeholder">Tansa n yimayl</string>
+    <string name="auth_reset_password_next_step_button">Sneqdeɣ tansa-inu n yimayl</string>
+    <string name="auth_reset_password_missing_password">Awal uffir amaynut ilaq ad yettusekcem.</string>
+    <string name="auth_reset_password_error_unauthorized">Asenqed n tansa n yimayl ur yeddi ara: wali ma yella tsateḍ ɣef useɣwen yellan deg yimayl</string>
+    <string name="e2e_re_request_encryption_key_sent">Asuter n tsarut yettwazen.</string>
+
+    <string name="compression_opt_list_original">Aneẓli</string>
+    <string name="compression_opt_list_medium">Alemmas</string>
+    <string name="yesterday">Iḍelli</string>
+    <string name="today">Ass-a</string>
+
+    <string name="settings_call_category">Isawalen</string>
+    <string name="call_ended">Asiwel yekfa</string>
+    <string name="permissions_rationale_popup_title">Talɣut</string>
+    <string name="yes">IH</string>
+    <string name="_continue">Kemmel</string>
+
+    <string name="remove">Sfeḍ</string>
+    <string name="join">Rnu</string>
+    <string name="preview">Taskant</string>
+    <string name="reject">Agi</string>
+
+    <string name="room_participants_leave_prompt_title">Ffeɣ seg texxamt</string>
+    <string name="room_participants_create">Snulfu-d</string>
+
+    <string name="room_participants_online">Srid</string>
+    <string name="room_participants_offline">Beṛṛa n tuqqna</string>
+    <string name="room_participants_idle">Arurmid</string>
+    <string name="room_participants_header_direct_chats">Iznan usligen</string>
+    <string name="room_participants_action_invite">Nced</string>
+    <string name="room_participants_action_ban">Agi</string>
+    <string name="room_participants_action_unban">Asefsex n tigtin</string>
+    <string name="room_participants_action_kick">Suffeɣ</string>
+    <string name="room_participants_action_mention">Abder</string>
+    <string name="room_participants_power_level_demote_warning_title">Ṣubb deg usellun-ik·im\?</string>
+    <string name="room_participants_power_level_demote">Ṣubb deg usellun</string>
+
+
+    <string name="room_participants_action_ignore">Ttu</string>
+
+    <string name="reason_hint">Taɣẓint</string>
+
+    <string name="room_menu_search">Nadi</string>
+    <string name="room_message_placeholder_encrypted">Azen izen yettuwgelhen…</string>
+    <string name="room_message_placeholder_reply_to_encrypted">Azen tiririt yettuwgelhen…</string>
+    <string name="room_do_not_have_permission_to_post">Ur tesεiḍ ara tasiregt ad d-tsuffɣeḍ deg texxamt-a</string>
+    <string name="ssl_trust">Ittkel</string>
+    <string name="ssl_logout_account">Tuffɣa</string>
+    <string name="ssl_remain_offline">Ttu</string>
+    <string name="room_details_people">Imdanen</string>
+    <string name="room_details_files">Ifuyla</string>
+    <string name="room_details_settings">Iɣewwaren</string>
+    <string name="search_hint">Nadi</string>
+    <string name="search_members_hint">Sizdeg iɛeggalen n texxamt</string>
+    <string name="search_no_results">Ulac igmad</string>
+    <string name="room_recents_start_chat">Bdu adiwenni</string>
+    <string name="room_recents_create_room">Rnu taxxamt</string>
+    <string name="room_settings_all_messages_noisy">Iznan i meṛṛa (sɛan ṣṣut)</string>
+    <string name="room_settings_all_messages">Iznan i meṛṛa</string>
+    <string name="room_settings_mute">Sens imesli</string>
+    <string name="room_settings_favourite">Asmenyif</string>
+    <string name="room_settings_direct_chat">Adiwenni uslig</string>
+    <string name="room_sliding_menu_messages">Iznan</string>
+    <string name="room_sliding_menu_settings">Iɣewwaren</string>
+    <string name="room_sliding_menu_version">Lqem</string>
+    <string name="room_sliding_menu_version_x">Lqem %s</string>
+    <string name="room_sliding_menu_copyright">Izerfan ttwaḥerzen</string>
+    <string name="settings_display_name">Sken isem</string>
+    <string name="settings_email_address">Imayl</string>
+    <string name="settings_phone_number">Tiliɣri</string>
+    <string name="settings_add_phone_number">Rnu uṭṭun n tiliɣri</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">Rmed</string>
+
+    <string name="settings_troubleshoot_test_device_settings_quickfix">Rmed</string>
+
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Rnu amiḍan</string>
+
+    <string name="settings_notification_privacy_normal">Amagnu</string>
+    <string name="settings_notification_ringtone">Imesli i yilɣa</string>
+    <string name="settings_enable_all_notif">Sens ilɣa i umiḍan-a</string>
+    <string name="settings_messages_sent_by_bot">Iznan yettwaznen s Bot</string>
+
+    <string name="settings_version">Lqem</string>
+    <string name="settings_copyright">Izerfan ttwaḥerzen</string>
+    <string name="settings_notifications">Ilɣa</string>
+    <string name="settings_ignored_users">Iseqdacen yettunfen</string>
+    <string name="settings_other">Nniḍen</string>
+    <string name="settings_advanced">Talqayt</string>
+    <string name="settings_cryptography">Awgelhan</string>
+    <string name="settings_send_typing_notifs">Azen ilɣa yettuszemlen</string>
+    <string name="settings_secure_backup_manage">Sefrek</string>
+    <string name="settings_deactivate_account_section">Sens amiḍan</string>
+    <string name="settings_discovery_category">Tagrut</string>
+    <string name="settings_analytics">Tiselḍin</string>
+    <string name="settings_opt_in_of_analytics">Azen isefka n tesleḍt</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="devices_details_name_title">Isem azayez</string>
+    <string name="devices_details_last_seen_title">Timeẓri taneggarut</string>
+    <string name="devices_delete_dialog_title">Asesteb</string>
+    <string name="devices_delete_pswd">Awal uffir:</string>
+    <string name="devices_delete_submit_button_label">Azen</string>
+
+    <string name="settings_logged_in">Iqqen am</string>
+    <string name="settings_identity_server">Aqeddac n timagit</string>
+    <string name="settings_integration_manager">Amsefrak n umsidef</string>
+
+    <string name="disabled_integration_dialog_title">Imsidaf ttwasensen</string>
+    <string name="settings_user_interface">Agrudem n useqdac</string>
+    <string name="settings_interface_language">Tutlayt</string>
+    <string name="account_email_validation_title">Asenqed yettṛaǧu</string>
+    <string name="account_email_validation_message">Ma ulac aɣilif, senqed imayl-ik/im syen sit ɣef useɣwen i yellan. Akken ara yemmed waya, sit ad tkemmleḍ.</string>
+    <string name="settings_password">Awal uffir</string>
+    <string name="settings_change_password">Beddel awal n uffir</string>
+    <string name="settings_old_password">Awal uffir amiran</string>
+    <string name="settings_new_password">Awal uffir amaynut</string>
+    <string name="settings_phone_number_code">Tangalt</string>
+    <string name="compression_opt_list_choose">Fren</string>
+    <string name="media_source_choose">Fren</string>
+    <string name="settings_flair">Lbenna</string>
+    <string name="media_saving_period_forever">Yal tikkelt</string>
+
+    <string name="room_settings_room_name">Isem n texxamt</string>
+    <string name="room_settings_tag_pref_entry_favourite">Asmenyif</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Tazwart taddayt</string>
+    <string name="room_settings_tag_pref_entry_none">Ula yiwen</string>
+
+    <string name="room_settings_room_notifications_title">Ilɣa</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Anwa i izemren ad d-iɣer amazray\?</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Anwa i izemren ad d-yernu ɣer texxamt-a\?</string>
+
+    <string name="room_settings_read_history_entry_anyone">Yal yiwen</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Iɛeggalen kan (segmi yebda ufran n textiṛit-a)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Iɛeggalen kan (segmi ara d-ttwanecden)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Iɛeggalen kan (segmi ara d-ttwarnun)</string>
+
+    <string name="room_settings_room_access_entry_only_invited">Ala imdanen i d-yettusnubegten</string>
+    <string name="room_settings_banned_users_title">Iseqdacen i yettwagin</string>
+    <string name="room_settings_category_advanced_title">Talqayt</string>
+    <string name="room_settings_labs_pref_title">Tinarimin</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Asulay n temɣiwent d arussin</string>
+    <string name="settings_theme">Asentel</string>
+
+    <string name="encryption_information_session_id">Asulay n tqimit</string>
+    <string name="encryption_information_device_id">Asulay n tqimit</string>
+    <string name="encryption_information_device_key">Tasarut n tɣimit</string>
+    <string name="encryption_information_verification">Asenqed</string>
+    <string name="encryption_export_e2e_room_keys">Sifeḍ tisura n texxamt E2E</string>
+    <string name="encryption_export_room_keys">Sifeḍ tisura n texxamt</string>
+    <string name="encryption_export_export">Sifeḍ</string>
+    <string name="encryption_import_e2e_room_keys">Kter tisura n texxamt E2E</string>
+    <string name="encryption_import_room_keys">Kter tisura n texxamt</string>
+    <string name="encryption_import_import">Kter</string>
+    <string name="encryption_information_verified">Yettwasenqed</string>
+    <string name="encryption_information_none">ulac</string>
+
+    <string name="encryption_information_verify">Senqed</string>
+    <string name="encryption_information_block">Tabdart taberkant</string>
+    <string name="encryption_information_verify_device">Asenqed n tɣimit</string>
+    <string name="directory_server_placeholder">URL n uqeddac agejdan</string>
+    <plurals name="notification_compat_summary_title">
+        <item quantity="one">%d n ulɣu</item>
+        <item quantity="other">%d n ilɣa</item>
+    </plurals>
+
+    <string name="notification_unknown_room_name">Taxxamt</string>
+    <string name="notification_sender_me">Nek</string>
+    <string name="font_size">Tuɣzi n tsefsit</string>
+    <string name="normal">Amagnu</string>
+    <string name="room_widget_permission_display_name">Isem-ik·im yettwaskanen</string>
+    <string name="room_widget_permission_avatar_url">URL n avatar-inek·inem</string>
+    <string name="room_widget_permission_user_id">Asulay-ik·m n useqdac</string>
+    <string name="room_widget_permission_theme">Asentel-inek·inem</string>
+    <string name="room_widget_permission_widget_id">Asulay n yiwiǧit</string>
+    <string name="room_widget_permission_room_id">Asulay n texxamt</string>
+
+
+    <string name="room_widget_resource_grant_permission">Sireg</string>
+    <string name="widget_integration_unable_to_create">Timerna n uwiǧit ulamek.</string>
+    <string name="widget_integration_failed_to_send_request">Tuzna n usuter ur teddi ara.</string>
+    <string name="widget_integration_positive_power_level">Ilaq ad yili uswir n tezmert d ummid ufrir.</string>
+    <string name="widget_integration_must_be_in_room">Ulac-ik/ikem deg texxamt-a.</string>
+    <string name="widget_integration_no_permission_in_room">Ur tesεiḍ ara tasiregt ad tgeḍ ayagi deg texxamt-a.</string>
+    <string name="room_manage_integrations">Sefrek imsidaf</string>
+    <string name="start_verification_short_label">Senqed</string>
+    <string name="share_without_verifying_short_label">Bḍu</string>
+    <string name="ignore_request_short_label">Ttu</string>
+
+    <string name="conference_call_warning_title">Ɣur-k·m!</string>
+    <string name="command_error">Tuccḍa n tladna</string>
+    <string name="command_description_emote">Yeskan tigawt</string>
+    <string name="command_description_ban_user">Agi aseqdac s usulay i d-yettunefken</string>
+    <string name="command_description_op_user">Sbadu aswir iǧehden n useqdac</string>
+    <string name="command_description_deop_user">Aseqdac Deops s usulay i d-yettunefken</string>
+    <string name="command_description_invite_user">Inced iseqdacen s tikci n usulay i texxamt tamirant</string>
+    <string name="command_description_part_room">Ffeɣ seg texxamt</string>
+    <string name="command_description_kick_user">Suffeɣ aseqdac s usulay i d-yettunefken</string>
+    <string name="command_description_nick">Ibeddel isem-inek·inem yettwaskanen</string>
+    <string name="notification_off">Insa</string>
+    <string name="create">Snulfu-d</string>
+    <string name="create_community">Rnu tamɣiwent</string>
+    <string name="community_name_hint">Amedya</string>
+    <string name="community_id_hint">amedya</string>
+
+    <string name="group_details_home">Agejdan</string>
+    <string name="group_details_people">Imdanen</string>
+    <string name="group_details_rooms">Timɣiwent</string>
+    <string name="rooms">Timɣiwent</string>
+    <string name="invited">Yettwancad</string>
+    <string name="forget_room">Tettuḍ taxxamt</string>
+
+    <string name="deactivate_account_title">Sens amiḍan</string>
+    <string name="deactivate_account_submit">Sens amiḍan</string>
+
+    <string name="resource_limit_hard_default">Aqeddac-a agejdan iɛedda yiwet seg tlisa-ines tiɣbula.</string>
+
+    <string name="resource_limit_hard_mau">Aqeddac-a agejdan yewweḍ ɣer talast n useqdac urmid n wayyur.</string>
+
+    <string name="merged_events_expand">snefli</string>
+    <string name="merged_events_collapse">fneẓ</string>
+
+    <string name="show_info_area_always">Yal ass</string>
+    <string name="passphrase_confirm_passphrase">Sentem tafyirt tuffirt</string>
+    <string name="passphrase_enter_passphrase">Sekcem tafyirt tuffirt</string>
+    <string name="keys_backup_setup">Bdu aseqdec n uḥraz n tsarut</string>
+    <string name="keys_backup_setup_step1_manual_export">Sifeḍ s ufus tisura</string>
+
+    <string name="keys_backup_setup_step3_button_title">Immed</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">Bḍu</string>
+    <string name="keys_backup_setup_override_replace">Semselsi</string>
+    <string name="keys_backup_setup_skip_title">Tebɣiḍ s tidet\?</string>
+    <string name="keys_backup_settings_restore_backup_button">Tiririt seg uḥraz</string>
+    <string name="keys_backup_settings_delete_backup_button">Kkes aḥraz</string>
+
+    <string name="keys_backup_settings_delete_confirm_title">Kkes aḥraz</string>
+    <string name="keys_backup_banner_setup_line2">Bdu aseqdec n uḥraz n tsarut</string>
+
+    <string name="keys_backup_info_keys_all_backup_up">Akk tisura ttwaḥerzent</string>
+    <string name="keys_backup_info_title_version">Lqem</string>
+    <string name="sas_incoming_request_title">Tuttra n usenqed i d-ikecmen</string>
+    <string name="sas_verified">Yettwasenqed!</string>
+    <string name="sas_verified_successful_description">Iznan iɣellsanen akked useqdac-a ttwawgelhen seg yixef ɣer yixef yerna yiwen ur yezmir ad ten-iɣeṛ.</string>
+    <string name="sas_got_it">Awi-t</string>
+
+    <string name="sas_incoming_request_notif_title">Asuter n usenqed</string>
+    <string name="edit">Ẓreg</string>
+    <string name="reply">Err</string>
+
+    <string name="global_retry">Ɛreḍ tikkelt-nniḍen</string>
+    <string name="room_list_rooms_empty_title">Timɣiwent</string>
+    <string name="event_redacted">Izen yettwakksen</string>
+    <string name="settings_show_redacted_summary">Sken-d iznan yettwakksen</string>
+    <string name="action_change">Beddel</string>
+    <string name="fab_menu_create_room">Timɣiwent</string>
+    <string name="fab_menu_create_chat">Iznan usligen</string>
+
+    <string name="create_room_directory_title">Akaram n texxamt</string>
+    <string name="settings_general_title">Amatu</string>
+    <string name="settings_preferences">Ismenyifen</string>
+    <string name="settings_security_and_privacy">Taɣellist &amp; tbaḍnit</string>
+    <string name="preference_voice_and_video">Ameslaw &amp; Tavidyut</string>
+    <string name="preference_root_help_about">Tallalt &amp; Ɣef</string>
+
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Sken-d ineḍruyen yeffren deg uzray</string>
+
+    <string name="bottom_action_people_x">Iznan usligen</string>
+
+    <string name="terms_of_service">Tiwtilin n useqdec</string>
+    <string name="change_identity_server">Snifel aqeddac n timagit</string>
+    <string name="attachment_type_file">Afaylu</string>
+    <string name="attachment_type_contact">Anermis</string>
+    <string name="attachment_type_camera">Takamiṛatt</string>
+    <string name="attachment_type_gallery">Timidelt</string>
+    <string name="room_list_quick_actions_notifications_all_noisy">Iznan i meṛṛa (sɛan ṣṣut)</string>
+    <string name="room_list_quick_actions_notifications_all">Iznan i meṛṛa</string>
+    <string name="room_list_quick_actions_notifications_mute">Sens imesli</string>
+    <string name="room_list_quick_actions_settings">Iɣewwaren</string>
+    <string name="room_list_quick_actions_favorite_add">Rnu inurifen</string>
+    <string name="room_list_quick_actions_favorite_remove">Kkes seg yinuraf</string>
+    <string name="login_splash_submit">Aha bdu tura</string>
+
+    <string name="login_server_other_title">Nniḍen</string>
+    <string name="login_continue">Kemmel</string>
+    <string name="login_signup">Jerred</string>
+    <string name="login_signin">Kcem</string>
+    <string name="login_reset_password_submit">Γer sdat</string>
+    <string name="login_reset_password_email_hint">Imayl</string>
+    <string name="login_reset_password_password_hint">Awal uffir amaynut</string>
+
+    <string name="login_reset_password_warning_title">Ɣur-k·m!</string>
+    <string name="login_reset_password_warning_submit">Kemmel</string>
+
+    <string name="login_reset_password_mail_confirmation_submit">Sneqdeɣ tansa-inu n yimayl</string>
+
+    <string name="login_reset_password_success_title">Tammug akken iwata!</string>
+    <string name="login_reset_password_success_notice">Awal uffir-inek/inem yettuwennez.</string>
+    <string name="login_reset_password_cancel_confirmation_title">Asmigel</string>
+    <string name="login_set_email_mandatory_hint">Imayl</string>
+    <string name="login_set_email_optional_hint">Imayl (Afrayan)</string>
+    <string name="login_set_email_submit">Γer sdat</string>
+
+    <string name="login_set_msisdn_submit">Γer sdat</string>
+
+    <string name="login_msisdn_confirm_submit">Γer sdat</string>
+
+    <string name="login_signup_username_hint">Isem n useqdac</string>
+    <string name="login_signup_password_hint">Awal uffir</string>
+    <string name="login_signup_submit">Γer sdat</string>
+    <string name="login_signup_cancel_confirmation_title">Asmigel</string>
+    <string name="login_signin_matrix_id_hint">Asulay n Matrix</string>
+    <string name="soft_logout_signin_title">Qqen</string>
+    <string name="soft_logout_signin_submit">Qqen</string>
+    <string name="soft_logout_signin_password_hint">Awal uffir</string>
+    <string name="soft_logout_clear_data_title">Sfeḍ isefka udmawanen</string>
+    <string name="soft_logout_clear_data_submit">Sfeḍ meṛṛa isefka</string>
+
+    <string name="settings">Iɣewwaren</string>
+    <string name="command_description_shrug">Yerna ¯\\_(ツ)_/¯ ɣer yizen n uḍris arewway</string>
+
+    <string name="verification_sas_match">Msaḍan</string>
+    <string name="verification_sas_do_not_match">Ur msaḍan ara</string>
+    <string name="sent_a_file">Afaylu</string>
+    <string name="verification_request_you_cancelled">Tesfesxeḍ</string>
+    <string name="verification_request_you_accepted">Tqebleḍ</string>
+    <string name="verification_request">Asuter n usenqed</string>
+    <string name="verification_verify_device">Asenqed n tɣimit</string>
+    <string name="room_profile_section_security">Taɣellist</string>
+    <string name="room_profile_section_more_notifications">Ilɣa</string>
+    <string name="room_profile_section_more_leave">Ffeɣ seg texxamt</string>
+    <string name="room_member_power_level_admins">Inedbalen</string>
+    <string name="room_member_power_level_custom">Sagen</string>
+    <string name="room_member_power_level_invites">Inced-d</string>
+    <string name="room_member_power_level_users">Iseqdacen</string>
+
+    <string name="room_member_jump_to_read_receipt">Ɛeddi ɣer tɣuri n wawwaḍ</string>
+
+    <string name="settings_category_timeline">Amazray</string>
+
+    <string name="room_settings_enable_encryption">Awgelhen seg yixef ɣer yixef ur yeddi ara</string>
+    <string name="room_settings_enable_encryption_dialog_title">Rmed awgelhen\?</string>
+    <string name="crosssigning_verify_this_session">Senqed anekcam-a</string>
+    <string name="crosssigning_other_user_not_trust">Iseqdacen-nniḍen yezmer ur tettamnen ara</string>
+    <string name="verification_profile_verify">Senqed</string>
+    <string name="verification_profile_verified">Yettwasenqed</string>
+    <string name="verification_profile_warning">Asmigel</string>
+
+    <string name="trusted">Yettwattkal</string>
+    <string name="not_trusted">Ur yettwattkal ara</string>
+
+    <string name="reset_cross_signing">Ales awennez n tsura</string>
+
+    <string name="qr_code_scanned_by_other_yes">Ih</string>
+    <string name="qr_code_scanned_by_other_no">Uhu</string>
+
+    <string name="delete_event_dialog_title">Sentem tukksa</string>
+    <string name="refresh">Smiren</string>
+
+    <string name="new_session">Anekcam amaynut. D kečč/kemm\?</string>
+    <string name="your_recovery_key">Tasarut-ik·im n uɛeddi</string>
+    <string name="finish">Fakk</string>
+
+    <string name="encryption_enabled">Awgelhen ur yeddi ara</string>
+    <string name="encryption_not_enabled">Awgelhen ur yermid ara</string>
+    <string name="settings_messages_at_room">Iznan ideg yella @taxxamt</string>
+    <string name="settings_messages_in_e2e_one_to_one">Iznan yettwawgelhen deg yidiwenniyen usriden</string>
+    <string name="settings_messages_in_e2e_group_chat">Iznan yettwawgelhen deg yidiwenniyen n ugraw</string>
+    <string name="settings_when_rooms_are_upgraded">Mi ara ttwaleqqment texxamin</string>
+    <string name="command_description_plain">Yuzen izen d aḍris aččuran war ma isegza-t s tukksa n tecreḍt</string>
+
+    <string name="auth_invalid_login_deactivated_account">Amiḍan-a yettuḥbes.</string>
+
+    <string name="upgrade_security">Yella uleqqem n uwgelhen</string>
+    <string name="security_prompt_text">Senqed iman-ik•im d wiyaḍ akken ad qqimen yidiwenniyen-ik•im d iɣellsanen</string>
+
+    <string name="use_recovery_key">Seqdec tasarut n uɛeddi</string>
+    <string name="unencrypted">Ur yettwawgelhen ara</string>
+    <string name="review_logins">Senqed ansi i d-tkecmeḍ</string>
+    <string name="verify_other_sessions">Senqed akk tiqimiyin-ik·im i wakken ad tḍemneḍ amiḍan-ik·m &amp; yiznan d iɣelsanen</string>
+    <string name="cross_signing_verify_by_text">Senqed s ufus s ttawil n uḍris</string>
+    <string name="identity_server_set_alternative_submit">Azen</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Sbadu</string>
+    <string name="bottom_sheet_save_your_recovery_key_title">Sekles tasarut-ik·im n tɣellist</string>
+    <string name="set_a_security_phrase_title">Sbadu tafyirt taɣelsant</string>
+    <string name="save_your_security_key_title">Sekles tasarut-ik·im n tɣellist</string>
+    <string name="room_settings_name_hint">Isem n texxamt</string>
+    <string name="element_disclaimer_title">Tura, Riot d aferdis!</string>
+    <string name="three_pid_revoke_invite_dialog_title">Sefesex tinnubga</string>
+    <string name="status_theme">Asent status.iml</string>
+
+    <string name="notification_sync_in_progress">Amtawi…</string>
+    <string name="notification_listening_for_events">Timesliwt i yineḍruyen</string>
+    <string name="notification_silent_notifications">Ilɣa s tsusmi</string>
+
+    <string name="title_activity_member_details">Talqayt n uɛeggal</string>
+    <string name="title_activity_bug_report">Aneqqis n wabug</string>
+    <string name="title_activity_group_details">Talqayt n temɣiwent</string>
+    <string name="title_activity_choose_sticker">Azen astiker</string>
+    <string name="title_activity_keys_backup_setup">Aḥraz n tsarut</string>
+    <string name="title_activity_keys_backup_restore">Aḥraz n tsarut n useqdac</string>
+    <string name="keys_backup_is_not_finished_please_wait">Aḥraz n tsura ur yemmid ara, ttxil-k·m ṛǧu…</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Ad tesruḥeḍ iznan-ik•im yettwawgelhen ma teffɣeḍ tura</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Akles n tsura yetteddu. Ma teffɣeḍ tura, ad tesruḥeḍ anekcum ɣer yiznan-ik•im yettwawgelhen.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Akles aɣellsan n tsura ilaq ad yermed deg tɣimiyin-ik•im akk akken ur tesruḥuḍ ara anekcum ɣer yiznan-ik•im yettwawgelhen.</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Ur bɣiɣ ara iznan-iw yettwawgelhen</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Akles n tsura…</string>
+    <string name="keys_backup_activate">Aḥraz n tsarut n useqdac</string>
+    <string name="backup">Aḥraz</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Ad tesruḥeḍ anekcum ɣer yiznan-ik•im yettwawgelhen anagar ma tkelseḍ tisura-inek•inem send tuffɣa.</string>
+    <string name="stay">Qqim</string>
+    <string name="speak">Mmeslay</string>
+    <string name="clear">Sfeḍ</string>
+    <string name="forward">Ɣer sdat</string>
+    <string name="permalink">Aseɣwen imezgi</string>
+    <string name="view_decrypted_source">Senqed taɣbalut tawgelhent</string>
+    <string name="report_content">Agbur n uneqqis</string>
+    <string name="ongoing_conference_call_voice">Taɣect</string>
+    <string name="ongoing_conference_call_video">Ividyuten</string>
+    <string name="cannot_start_call">Ulamek ad yebdu usiwel, ttxil ɛreḍ ticki</string>
+    <string name="conference_call_in_progress">Asarag ha-t-an itteddu!</string>
+    <string name="video_meeting">Bdu timlilit s tvidyut</string>
+    <string name="audio_meeting">Bdu timlilit tameslawt</string>
+    <string name="audio_video_meeting_description">Timlilit s useqdec n tsertiyin n tɣellist d tsiregt n Jitsi. Medden akk i yellan deg texxamt ad ẓren tinubga i tmerniwt mi ara d-teḍru temlilit.</string>
+    <string name="missing_permissions_title_to_start_conf_call">Ulamek ad yebdu usiwel</string>
+    <string name="cannot_call_yourself">Ur tezmireḍ ara ad tesɛeddiḍ asiwel i yima-ik•im</string>
+    <string name="cannot_call_yourself_with_invite">Ur tezmireḍ ara ad tesɛeddiḍ asiwel i yiman-ik•im, rǧu ad qeblen yimettekkiyen tinubga</string>
+    <string name="device_information">Talɣut ɣef tɣimit</string>
+    <string name="failed_to_add_widget">Timerniwt n uwiǧit ur teddi ara</string>
+    <string name="encrypted_message">Izen yettwawgelhen</string>
+
+    <string name="missing_permissions_warning">Imi xuṣṣent tsirag, izmer ur ttilint ara kra n tmahilin…</string>
+    <string name="missing_permissions_to_start_conf_call">Tesriḍ tisirag akken ad tebduḍ asarag deg texxamt-a</string>
+    <string name="missing_permissions_error">Imi llant tsirag i ixuṣṣen, tigawt-a ur tezmir ara ad tili.</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">Isiwlen isaragen ur ttwasefraken ara deg texxamin yettwawgelhen</string>
+    <string name="call_anyway">Ɣas siwel kan</string>
+    <string name="send_anyway">Ɣas azen kan</string>
+    <string name="action_sign_out_confirmation_simple">D tidet tebɣiḍ ad teffɣeḍ\?</string>
+    <string name="action_voice_call">Asiwel aɣectan</string>
+    <string name="action_video_call">Asiwel s tvidyut</string>
+    <string name="action_global_search">Anadi amatu</string>
+    <string name="action_quick_reply">Tiririt taruradt</string>
+    <string name="action_mark_room_read">Creḍ yettwaɣṛa</string>
+    <string name="copied_to_clipboard">Nɣel deg \"ɣef ufus\"</string>
+    <string name="home_filter_placeholder_home">Sizdeg ismawen n texxamin</string>
+    <string name="notification_noisy_notifications">Ilɣa s ṣṣut</string>
+    <string name="dialog_title_third_party_licences">Turagin n wis tlata</string>
+
+    <string name="pause_video">Sgunfu</string>
+    <string name="ongoing_conference_call">Asarag s usiwel iteddu
+\nRnu-d ɣer-s s %1$s neɣ s %2$s</string>
+    <string name="home_filter_placeholder_favorites">Sizdeg ismenyifen</string>
+    <string name="home_filter_placeholder_people">Sizdeg imttekkiyen</string>
+    <string name="home_filter_placeholder_rooms">Sizdeg ismawen n texxxamin</string>
+    <string name="home_filter_placeholder_groups">Sizdeg ismawen n temɣiwnin</string>
+
+    <string name="direct_chats_header">Idiwenniyen</string>
+    <string name="local_address_book_header">Adlis n tansiwin adigan</string>
+    <string name="user_directory_header">Akaram n useqdac</string>
+    <string name="matrix_only_filter">Inermisen kan n Matrix</string>
+    <string name="no_conversation_placeholder">Ulac idiwenniyen</string>
+    <string name="no_contact_access_placeholder">Ur teǧǧiḍ ara Element ad yekcem ɣer yinermisen-ik·im idiganen</string>
+    <string name="people_no_identity_server">Ulac aqeddac n timagit yettusiwlen.</string>
+
+    <string name="no_room_placeholder">Ulac tixxamin</string>
+    <string name="no_public_room_placeholder">Ulac tixxamin tizuyaz yellan</string>
+    <plurals name="public_room_nb_users">
+        <item quantity="one">1 useqdac</item>
+        <item quantity="other">%d yiseqdacen</item>
+    </plurals>
+
+    <string name="no_group_placeholder">Ulac igrawen</string>
+
+    <string name="send_bug_report_include_crash_logs">Azen iɣmisen n tuccḍa</string>
+    <string name="send_bug_report_include_screenshot">Azen tuṭṭfa n ugdil</string>
+    <string name="send_bug_report">Ini ɣef wabug</string>
+    <string name="send_bug_report_description">Ttxil-k·m glem-d abug. Acu i txedmeḍ\? Acu i terǧiḍ\? Acu yeḍran\?</string>
+    <string name="send_bug_report_description_in_english">Ma yella wamek, ttxil-k·m aru aglam s teglizit.</string>
+    <string name="send_bug_report_placeholder">Glem-d ugur-ik·im da</string>
+    <string name="send_bug_report_rage_shake">Zelzel reffu i tuzna n wabug</string>
+
+    <string name="send_bug_report_sent">Yettwazen uneqqis n wabug akken iwata</string>
+    <string name="send_bug_report_failed">Ur nessaweḍ ara ad nazen aneqqis n wabug (%s)</string>
+    <string name="send_bug_report_progress">Asfari (%s%%)</string>
+
+    <string name="send_files_in">Azen deg</string>
+    <string name="read_receipt">Ɣeṛ</string>
+
+    <string name="login">Qqen</string>
+    <string name="hs_url">URL n uqeddac agejdan</string>
+    <string name="start_new_chat">Yebda udiwenni amaynut</string>
+    <string name="start_voice_call">Yebda usiwel s taɣect</string>
+    <string name="start_video_call">Yebda usiwel s tvidyut</string>
+
+    <string name="option_send_voice">Azen s taɣuct</string>
+
+    <string name="start_new_chat_prompt_msg">Tebɣiḍ s tidet ad tebduḍ adiwenni amaynut d %s\?</string>
+    <string name="start_voice_call_prompt_msg">Tebɣiḍ s tidet ad tebduḍ asiwel s taɣect\?</string>
+    <string name="start_video_call_prompt_msg">Tebɣiḍ s tidet ad tebduḍ asiwel s tvidyut\?</string>
+    <string name="call_failed_no_ice_description">Ttxil-k·m suter anedbal n uqeddac-ik·im agejdan (%1$s) ad iswel aqeddac i wakken isawalen TURN i wakken isawalen ad ddun akken iwata.
+\n
+\nDeg wadeg n wayen, tzemreḍ ad tesqedceḍ aqeddac azayez ɣef %2$s, maca aya ur yettettkal ara fell-as, ad yebḍu tansa-ik·im IP d uqeddac-a. Tzemreḍ ad tesferkeḍ aya deg yiɣewwaren.</string>
+    <string name="call_failed_no_ice_use_alt">Ɛreḍ aseqdec n %s</string>
+    <string name="call_failed_dont_ask_again">Ur iyi-d-ssutur ara tikkelt-nniḍen</string>
+
+    <string name="call_failed_no_connection">Asiwel s Element ur yeddi ara</string>
+    <string name="call_select_sound_device">Fren ibenk n yimesli</string>
+    <string name="sound_device_speaker">Amennay</string>
+    <string name="sound_device_headset">Kask</string>
+    <string name="call_switch_camera">Beddel takamiṛat</string>
+    <string name="call_camera_front">N sdat</string>
+    <string name="call_format_turn_hd_off">Sens HD</string>
+    <string name="call_format_turn_hd_on">Rmed HD</string>
+
+    <string name="option_send_files">Azen ifuyla</string>
+    <string name="option_send_sticker">Azen astiker</string>
+    <string name="option_take_photo_video">Ṭṭef-d tawlaft neɣ tavidyut</string>
+    <string name="option_take_photo">Ṭṭef-d tawlaft</string>
+    <string name="option_take_video">Ṭṭef-d tavidyut</string>
+
+    <string name="go_on_with">kemmel s…</string>
+    <string name="error_no_external_application_found">Suref-aɣ, ulac asnas yeffɣen yettwafen i wakken ad temmed tigawt-a.</string>
+
+    <string name="auth_login">Qqen</string>
+    <string name="auth_user_id_placeholder">Imayl neɣ isem n useqdac</string>
+    <string name="auth_user_name_placeholder">Isem n useqdac</string>
+    <string name="auth_opt_email_placeholder">Tansa n yimayl (d tafrayan)</string>
+    <string name="auth_phone_number_placeholder">Uṭṭun n tiliɣri</string>
+    <string name="auth_opt_phone_number_placeholder">Uṭṭun n tiliɣri (d afrayan)</string>
+    <string name="auth_repeat_password_placeholder">Ales i wawal uffir</string>
+    <string name="auth_repeat_new_password_placeholder">Sentem awal-ik·im uffir amaynut</string>
+    <string name="auth_invalid_login_param">Isem n uqeddac d/neɣ awal uffir d arameɣtu</string>
+    <string name="auth_invalid_user_name">Ismawen n yiseqdacen ilaq ad sɛun kan isekkilen, imḍanen, agazen, ijerriden n tuqqna d yidduren n uderrer</string>
+    <string name="auth_invalid_password">Awal uffir wezzil aṭas (ma drus 6)</string>
+    <string name="auth_missing_password">Ixuṣ wawal uffir</string>
+    <string name="auth_invalid_phone">Wagi ur d-yettban ara d uṭṭun n tilifun ameɣtu</string>
+    <string name="auth_email_already_defined">Tansa-a n yimayl tettuseqdec yakan.</string>
+    <string name="auth_missing_email">Txuṣṣ tansa n yimayl</string>
+    <string name="auth_missing_phone">Ixuṣṣ wuṭṭun n tiliɣri</string>
+    <string name="auth_missing_email_or_phone">Txuṣṣ tansa n yimayl neɣ uṭṭun n tiliɣri</string>
+    <string name="auth_invalid_token">Ajuṭu d arameɣtu</string>
+    <string name="auth_password_dont_match">Awal uffir ur imṣada ara</string>
+    <string name="auth_forgot_password">Tettuḍ awal uffir\?</string>
+    <string name="auth_use_server_options">Seqdec tixtiṛiyin n uqeddac udmawan (leqqayen)</string>
+    <string name="auth_email_validation_message">Ttxil-k·m seqdec imayl-ik·im i wakken ad tkemmleḍ ajerred</string>
+    <string name="auth_recaptcha_message">Aqeddac-a agejdan yesra ad iẓer ma mačči d aṛubut i telliḍ</string>
+    <string name="auth_username_in_use">Isem n useqdac yettuseqdac</string>
+    <string name="auth_home_server">Aqeddac agejdan:</string>
+    <string name="auth_identity_server">Aqeddac n timagit:</string>
+    <string name="auth_reset_password_message">I uwennez n wawal-ik·im uffir, sekcem tansa n yimayl i icudden ɣer umiḍan-ik·im:</string>
+    <string name="auth_reset_password_missing_email">Tansa n yimayl i icudden ɣer umiḍan-ik·im ilaq ad tettwasekcem.</string>
+    <string name="auth_reset_password_email_validation_message">Yettwazen yimayl ɣer %s: Akken ara tḍefreḍ aseɣwen-nni yellan deg-s, sit ddaw.</string>
+    <string name="auth_accept_policies">Ttxil-k·m senqed syen qbel tisertiyin n uqeddac-a agejdan:</string>
+
+    <string name="login_error_must_start_http">Ilaq ad yebdu URL s http[s]://</string>
+    <string name="login_error_network_error">D awezɣi ad tkecmeḍ: tuccḍa deg uzeṭṭa</string>
+    <string name="login_error_unable_login">Anekcum d awezɣi</string>
+    <string name="login_error_registration_network_error">D awezɣi ad tjerrdeḍ: tuccḍa deg uzeṭṭa</string>
+    <string name="login_error_unable_register">Ajerred d awezɣi</string>
+    <string name="login_error_unable_register_mail_ownership">D awezɣi ad tjerrdeḍ: tuccḍa deg bab n tansa</string>
+    <string name="login_error_invalid_home_server">Ttxil-k·m sekcem URL ameɣtu</string>
+    <string name="login_error_unknown_host">URL-a ulac awwaḍ ɣur-s, ttxil-k·m senqed-it</string>
+    <string name="login_error_no_homeserver_found">Tagi mačči d tansa n uqeddac n Matrix ameɣtu</string>
+    <string name="login_error_homeserver_not_found">Ur tezmireḍ ara ad tawḍeḍ ɣer uqeddac agejdan n URL-a, ttxil-k·m senqed-it</string>
+    <string name="login_error_ssl_peer_unverified">Tuccḍa deg SSL: ayugan n timagit ur yettwasenqed ara.</string>
+    <string name="login_error_ssl_other">Tuccḍa n SSL.</string>
+    <string name="groups_list">Tabdart n yigrawen</string>
+
+    <string name="compression_options">Azen-aɣ-d</string>
+    <string name="compression_opt_list_large">Hraw</string>
+    <string name="compression_opt_list_small">Meẓẓiy</string>
+
+    <string name="attachment_cancel_download">Sefsex asider\?</string>
+    <string name="attachment_cancel_upload">Sefsex asali\?</string>
+    <string name="attachment_remaining_time_seconds">%d s</string>
+    <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
+
+    <string name="room_info_room_name">Isem n texxamt</string>
+    <string name="room_info_room_topic">Asentel n texxamt</string>
+
+    <string name="call">Siwel</string>
+    <string name="call_connected">Yeqqen asiwel</string>
+    <string name="call_connecting">Asiwel yetteqqen…</string>
+    <string name="call_ring">Asiwel…</string>
+    <string name="incoming_call">Asiwel i d-ikecmen</string>
+    <string name="incoming_video_call">Asiwel s tvidyut i d-ikecmen</string>
+    <string name="incoming_voice_call">Asiwel s taɣect i d-ikecmen</string>
+    <string name="call_in_progress">Asiwel la iteddu…</string>
+    <string name="video_call_in_progress">Asiwel s tvidyut la iteddu…</string>
+    <string name="active_call_with_duration">Rmed asiwel (%s)</string>
+    <string name="return_to_call">Uɣal ɣer usiwel</string>
+
+    <string name="media_slider_saved">Yettwasekles</string>
+    <string name="no">UHU</string>
+    <string name="list_members">Tabdart n yiɛeggalen</string>
+    <string name="room_sync_in_progress">Amtawi…</string>
+    <string name="room_jump_to_first_unread">Ɛeddi ɣer yizen amezwaru ur nettwaɣra ara.</string>
+
+    <string name="room_preview_invitation_format">Tettwanecdeḍ ad ternuḍ ɣer %s</string>
+    <string name="room_preview_try_join_an_unknown_room_default">taxxamt</string>
+    <string name="room_creation_title">Adiwenni amaynut</string>
+    <string name="room_creation_add_member">Rnu aɛeggal</string>
+    <plurals name="room_header_active_members_count">
+        <item quantity="one">1 uɛeggal urmid</item>
+        <item quantity="other">%d yiɛeggalen urmiden</item>
+    </plurals>
+    <plurals name="room_title_members">
+        <item quantity="one">1 uɛeggal</item>
+        <item quantity="other">%d yiɛeggalen</item>
+    </plurals>
+    <string name="room_title_one_member">1 uɛeggal</string>
+
+    <plurals name="format_time_s">
+        <item quantity="one">1tasint</item>
+        <item quantity="other">%dtsinin</item>
+    </plurals>
+    <plurals name="format_time_m">
+        <item quantity="one">1tesdidt</item>
+        <item quantity="other">%dtesdidin</item>
+    </plurals>
+    <plurals name="format_time_h">
+        <item quantity="one">1usrag</item>
+        <item quantity="other">%dyisragen</item>
+    </plurals>
+    <plurals name="format_time_d">
+        <item quantity="one">1wass</item>
+        <item quantity="other">%dwussan</item>
+    </plurals>
+
+    <string name="room_participants_now">%1$S tura</string>
+    <string name="room_participants_ago">Seg %1$S %2$S</string>
+
+    <string name="room_participants_header_admin_tools">IFECKA N UNEDBAL</string>
+    <string name="room_participants_header_call">SIWEL</string>
+    <string name="room_participants_header_devices">TIƔIMIYIN</string>
+
+    <string name="room_participants_action_cancel_invite">Sefsex tinubga</string>
+    <string name="room_participants_action_leave">Ffeɣ si texxamt-a</string>
+    <string name="room_participants_action_remove">Kkes si texxamt-a</string>
+    <string name="room_participants_action_set_default_power_level">Wennez aseqdac amagnu</string>
+    <string name="room_participants_action_set_moderator">Eg amaẓrag</string>
+    <string name="room_participants_action_set_admin">Eg anebdal</string>
+    <string name="room_participants_invite_search_another_user">Asulay n useqdac, Isem neɣ imayl</string>
+    <string name="room_participants_action_devices_list">Sken tabdart n tɣimiyin</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Ur tettizmireḍ ara ad tesfesxeḍ asnifel-a acku tettṣubbuḍ deg usellun-unek·inem, ma yella d kečč·kemm i d aseqdac aneglam n texxamt-a, d awezɣi ad d-terreḍ ula d yiwet n tseglut.</string>
+    <string name="room_participants_action_ignore_title">Zgel aseqdac</string>
+    <string name="room_participants_action_unignore">Ur yettwazgel ara</string>
+
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="room_participants_invite_join_names_and">%1$s d %2$s</string>
+    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
+
+    <string name="people_search_invite_by_id"><u>Snubget s usaulay</u></string>
+    <string name="people_search_local_contacts">INERMISEN IDIGANEN (%d)</string>
+    <string name="people_search_user_directory">AKARAM N USEQDAC (%s)</string>
+    <string name="people_search_filter_text">Iseqdacen kan n Matrix</string>
+
+    <string name="people_search_invite_by_id_dialog_title">Snubget-d iseqdacen s usulay</string>
+    <string name="people_search_invite_by_id_dialog_hint">Imayl neɣ asulay n Matrix</string>
+
+    <string name="room_one_user_is_typing">%s la yettaru…</string>
+    <string name="room_two_users_are_typing">%1$s &amp; %2$s la ttarun…</string>
+    <string name="room_many_users_are_typing">%1$s &amp; %2$s d wiyaḍ la ttarun…</string>
+    <string name="room_message_placeholder_not_encrypted">Azen izen (ur yettwawgelhen ara)…</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">Azen tiririt (ur yettwawgelhen ara)…</string>
+    <string name="room_offline_notification">Tṛuḥ tuqqna ɣer uqeddac.</string>
+    <string name="room_unsent_messages_notification">Iznan ur ttwaznen ara. %1$s neɣ %2$s tura\?</string>
+    <string name="room_unknown_devices_messages_notification">Iznan ur ttwaznen ara ssebba n tiltin n tɣimiyin tarussinin . %1$s neɣ %2$s tura\?</string>
+    <string name="room_prompt_resend">Wennez kullec</string>
+    <string name="room_prompt_cancel">Sefsex kullec</string>
+    <string name="room_resend_unsent_messages">Wennez iznan ur yettwaznen ara</string>
+    <string name="room_delete_unsent_messages">Kkes iznan ur yettwaznen ara</string>
+    <string name="room_message_file_not_found">Ur yettwaf ara ufaylu</string>
+    <plurals name="room_new_messages_notification">
+        <item quantity="one">1 yizen amaynut</item>
+        <item quantity="other">%d yiznan imaynuten</item>
+    </plurals>
+
+    <string name="ssl_do_not_trust">Ur ttkal ara</string>
+    <string name="ssl_fingerprint_hash">Adsil umḍin (%s):</string>
+    <string name="ssl_could_not_verify">D awezɣi ad nsenqed timagit n uqeddac agemmaḍ.</string>
+    <string name="room_details_people_invited_group_name">YETTWANCED</string>
+    <string name="room_details_people_present_group_name">YERNA</string>
+
+    <string name="tab_title_search_rooms">TIXXAMIN</string>
+    <string name="tab_title_search_messages">IZNAN</string>
+    <string name="tab_title_search_people">IMDANEN</string>
+    <string name="tab_title_search_files">IFUYLA</string>
+
+    <string name="room_recents_join">RNU</string>
+    <string name="room_recents_directory">AKARAM</string>
+    <string name="room_recents_favourites">INURIFEN</string>
+    <string name="room_recents_conversations">TIXXAMIN</string>
+    <string name="room_recents_low_priority">TAZWART TADDAYT</string>
+    <string name="room_recents_invites">INEBGAWEN</string>
+    <string name="room_recents_join_room">Rnu ɣer texxamt</string>
+    <string name="room_recents_join_room_title">Rnu ɣer texxamt</string>
+    <string name="room_recents_join_room_prompt">Aru asulay n texxamt neɣ isem yettunefken i texxamt</string>
+
+    <plurals name="directory_search_rooms">
+        <item quantity="one">1 texxamt</item>
+        <item quantity="other">%d texxamin</item>
+    </plurals>
+    <string name="room_settings_leave_conversation">Ffeɣ seg udiwenni</string>
+    <string name="room_settings_forget">Ttu</string>
+    <string name="room_sliding_menu_privacy_policy">Tasertit tabaḍnit</string>
+
+    <string name="settings_profile_picture">Tawlaft n umaɣnu</string>
+    <string name="settings_add_email_address">Rnu tansa n yimayl</string>
+    <string name="settings_app_info_link_title">Talɣut n usnas</string>
+    <string name="settings_troubleshoot_diagnostic">Tasleḍt n usellek</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">Seddu isekyaden</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">Aselkem… (%1$d of %2$d)</string>
+    <string name="open_settings">Ldi iɣewwaren</string>
+
+    <string name="settings_troubleshoot_test_account_settings_title">Iɣewwaren n umiḍan.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">Iɣewwaren n tɣimit.</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">Iɣewwaren udmawanen.</string>
+    <string name="settings_privacy_policy">Tasertit tabaḍnit</string>
+    <string name="settings_devices_list">Tiɣimiyin</string>
+    <string name="settings_secure_backup_setup">Sebadu aḥraz aɣelsan</string>
+    <string name="settings_secure_backup_section_info">Seḥbiber iman-ik·im ɣef uḍegger n unekcum ɣer yiznann &amp; yisefka yettwawgelhe s uḥraz n tsura n uwgelhen ɣef uqeddac-inek·inem.</string>
+    <string name="settings_confirm_password">Sentem awal uffir amaynut</string>
+    <string name="settings_media">Amidya</string>
+    <string name="media_saving_period_1_week">1 umalas</string>
+    <string name="room_settings_addresses_no_local_addresses">Taxxamt-a ur tesɛi ara tansiwin tidiganin</string>
+    <string name="room_settings_no_flair">Taxxamt-a ur d-teskin ara tasakezt ula i yiwet n temɣiwent</string>
+    <string name="device_name_warning">Isem n tiɣimit tazayezt yettban i yimdanen wukud tettmeslayeḍ</string>
+    <string name="encryption_information_verify_device_warning">Sentem s userwes gar wayen i d-iteddun d yiɣewwaren n useqdac deg tɣimit-ik·im tayeḍ:</string>
+    <string name="encryption_information_verify_device_warning2">Ma yella ur mṣadan ara, taɣellist n teywalt-ik·im tezmer ad tettwaker.</string>
+    <string name="directory_server_fail_to_retrieve_server">Aqeddac yezmer ad yili ulac-it neɣ iɛedda nnig uɛebbi</string>
+    <string name="notification_noisy">Sɛan ṣṣut</string>
+
+    <string name="joined">Ikcemed deg</string>
+    <string name="avatar">Tugna n umaɣnu</string>
+
+    <string name="deactivate_account_prompt_password">I wakken ad tkemmle, ttxil-k·m sekcem awal uffir n umiḍan-ik·im:</string>
+    <string name="keys_backup_setup_step1_title">Ur ttamdal ara akk iznan iwgelhanen</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Aḥraz ue yezmir ara ad yekkes awgelhen s tsarut-a n uɛeddi: ttxil-k·m sefqed ma d tasarut n uɛeddi tameɣtut i teskecmeḍ.</string>
+
+    <string name="keys_backup_banner_setup_line1">Ur ttamdal ara akk iznan iwgelhanen</string>
+    <string name="keys_backup_banner_recover_line1">Ur ttamdal ara akk iznan iwgelhanen</string>
+    <string name="keys_backup_banner_recover_line2">Aḥraz n tsarut n useqdac</string>
+
+    <string name="autodiscover_invalid_response">Tiririt n usnirem n uqeddac agejdan d tarameɣtut</string>
+    <string name="room_list_people_empty_title">Idiwenniyen</string>
+    <string name="title_activity_emoji_reaction_picker">Tisedmirin</string>
+    <string name="reactions">Tisedmirin</string>
+
+    <string name="create_room_public_title">Azayez</string>
+    <string name="quick_reactions">Tisedmirin tiruradin</string>
+
+    <string name="disconnect_identity_server">Ffeɣ seg tuqqna n uqeddac n timagit</string>
+    <string name="settings_discovery_mail_pending">Yettraǧu</string>
+
+    <string name="login_server_modular_learn_more">Issin ugar</string>
+    <string name="login_server_url_form_other_hint">Tansa</string>
+    <string name="login_reset_password_notice">Imayl n usenqed ad yettwazen ɣer tbewwaḍt-ik·im n yimayl i usentem n yiɣewwaren n wawal-ik·im uffir.</string>
+    <string name="login_reset_password_warning_content">Asnifel n wawal-ik·im uffir ad iwennez akk tisura n uwgelhen seg yixef ɣer yixef deg meṛṛa n tɣimiyin-ik·im, s tririt n umazray n udiwenni awgelhan ur yettwaɣra ara. Sbadu aḥraz n tsarut neɣ sifeḍ tisura n texxamt-ik·im seg texxamt-nniḍen send awennez n wawal-ik·im uffir.</string>
+    <string name="login_reset_password_success_notice_2">Aql-ak·akem teffɣeḍ seg meṛṛa tiɣimiyin syen ur d-teṭṭifeḍ ara akk ilɣa n Push. I wakken ad talseḍ armad n yilɣa, kcem tikkelt-nniḍen ɣef yal ibenk.</string>
+    <string name="devices_current_device">Tiγimit tamirant</string>
+    <string name="create_room_encryption_description">Akken ara yettwarmad, awgelhen ur yettizmir ara ad yens.</string>
+
+    <string name="you">Kečč / kem</string>
+
+    <string name="room_profile_not_encrypted_subtitle">Iznan deg texxamt-a ur ttwawgelhen ara seg yixef ɣer yixef.</string>
+    <string name="room_profile_section_security_learn_more">Issin ugar</string>
+    <string name="room_profile_section_more">Ugar</string>
+    <string name="unignore">Ur yettwazgel ara</string>
+
+    <string name="room_settings_enable_encryption_warning">Akken ara yettwarmad, awgelhen ur yettizmir ara ad yens.</string>
+
+    <string name="verification_conclusion_ok_self_notice">Tiɣimit-ik·im tamaynut dayen tettwasenqed tura. Ɣur-s anekcum ɣer yiznan yettwawgelhen, iseqdac-nniḍen daɣen ad asen-d-tban tettwattkal.</string>
+
+    <string name="settings_hs_admin_e2e_disabled">Anedbal-ik·im n uqeddac issens awgelhen seg yixef ɣer yixef s wudem amezwer deg texxamin tusligin &amp; yiznan usriden.</string>
+    <string name="room_member_profile_sessions_section_title">Tiɣimiyin</string>
+    <string name="delete_event_dialog_content">S tidet tebɣiḍ ad tekkseḍ aneḍru-a\? Err deg uqerru-k·m ma yella tekkseḍ asnifel n yisem neɣ asentel n texxamt, yemzer asnifel-a ad yettusefsex.</string>
+    <string name="or_other_mx_capabale_client">neɣ amsaɣ-nniḍen n Matrix yemṣadan d uzmul amdigan</string>
+    <string name="command_description_discard_session">Ḥettem tiɣimit n ugraw ara d-yeffɣen akka tura deg texxamt tawgelhant ad tettwakkes</string>
+    <string name="confirm_your_identity">Sentem timagit-ik·im s usenqed n yinekcam-a seg yiwet gar tɣimiyin-inek·inem-nniḍen, serreḥ-as ad tekcem ɣer yiznan yettwawgelhen.</string>
+    <string name="create_room_dm_failure">D awezɣi ad ternuḍ izen-inek·inem uslig. Ttxil-k·m senqed iseqdacen i tebɣiḍ ad d-tnecdeḍ syen ɛreḍ tikkelt-nniḍen.</string>
+
+    <string name="choose_locale_current_locale_title">Tutlayt tamirant</string>
+    <string name="settings_setup_secure_backup">Sebadu aḥraz aɣelsan</string>
+
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Seḥbiber iman-ik·im ɣef uḍegger n unekcum ɣer yiznann &amp; yisefka yettwawgelhe s uḥraz n tsura n uwgelhen ɣef uqeddac-inek·inem.</string>
+    <string name="set_a_security_phrase_hint">Tafyirt n tɣellist</string>
+    <string name="room_settings_topic_hint">Asentel</string>
+    <string name="crypto_utd">Ur yezmir ara ad yekkes awgelhen</string>
+    <string name="element_disclaimer_negative_button">AWI-T</string>
+    <string name="element_disclaimer_positive_button">ISSIN UGAR</string>
+
+    <string name="element_login_splash_brand">aferdis</string>
+
+
+    <string name="save_recovery_key_chooser_hint">Sekles tasarut n tririt deg</string>
+
+    <string name="add_from_phone_book">Rnu seg yidles n tiliɣri</string>
+    <string name="empty_phone_book">Idles-ik·im n tiliɣri d ilem</string>
+    <string name="phone_book_title">Adlis n tiliri</string>
+    <string name="search_in_my_contacts">Nadi deg yinermisen-inu</string>
+    <string name="loading_contact_book">Tiririt n yinermisen-ik·im…</string>
+    <string name="empty_contact_book">Adlis-ik·im n yinermisen d ilem</string>
+    <string name="contacts_book_title">Adlis n yinermisen</string>
+
+    <string name="three_pid_revoke_invite_dialog_content">Sefsex tinubga n %1$s\?</string>
+
+    <string name="member_banned_by">Yettwagi sɣur %1$s</string>
+    <string name="failed_to_unban">Asemmet n useqdac ur yeddi ara</string>
+
+    <string name="alert_push_are_disabled_title">Ilɣa push nsan</string>
+    <string name="alert_push_are_disabled_description">Senqed iɣewwaren-ik·im i wakken ad tremdeḍ ilɣa push</string>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Tuccḍa deg tengalt, %d uneɛruḍ i d-yeqqimen</item>
+        <item quantity="other">Tuccḍa deg tengalt, %d ineɛruḍen i d-yeqqimen</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Ɣur-k·m! Aneɛruḍ aneggaru send tuffɣa!</string>
+    <string name="too_many_pin_failures">Aṭas n tuccḍiwin, telliḍ teffɣeḍ seg tuqqna</string>
+    <string name="create_pin_title">Fren PIN i tɣellist</string>
+    <string name="create_pin_confirm_title">Sentem PIN</string>
+    <string name="create_pin_confirm_failure">Asentem n tebzimt ur yeddi ara, ttxil-k·m aru yiwet.</string>
+    <string name="auth_pin_title">Sekcem PIN inek·inem</string>
+    <string name="auth_pin_forgot">Ttu PIN\?</string>
+    <string name="auth_pin_reset_title">"Wennez tabzimt "</string>
+    <string name="auth_pin_new_pin_action">Tabzimt tamaynut n</string>
+    <string name="auth_pin_reset_content">I uwennez n PIN-inek·inem, tesriḍ ad talseḍ anekcum syen rnu yiwen.</string>
+    <string name="settings_security_pin_code_title">Rmed PIN</string>
+    <string name="settings_security_pin_code_summary">Ma yella tebɣiḍ ad twennzeḍ PIN-inek·inem, aru ttu PIN i wakken ad teffɣeḍ syen wennez.</string>
+    <string name="auth_pin_confirm_to_disable_title">Sentem PIN i wakken ad tsenseḍ PIN</string>
+    <string name="send_bug_report_logs_description">Iwakken ad d-naf uguren, iɣmisen n umsaɣ-a ad ttwaznen akked uneqqis-a n tuccḍa. Aneqqis-a n tuccḍa, akked yiɣmisen d tuṭṭfa n ugdil, ur d-ttbinen ara s wudem azayez. Ma tesmenyifeḍ tuzzna n uḍris-a kan seddaw, ttxil kkes acraḍ i:</string>
+    <string name="sound_device_wireless_headset">Kask war tinelwa</string>
+    <string name="auth_invalid_email">Ur tettban ara d tansa n yimayl tameɣtut</string>
+    <string name="login_error_forbidden">Isem n uqeddac/awal uffir d arameɣtu</string>
+    <string name="login_error_not_json">Ulac deg-s JSON ameɣtu</string>
+    <string name="login_error_user_in_use">Isem n useqdac-a yettwaseqdac yakan</string>
+    <string name="login_error_login_email_not_yet">Aseɣwen n yimayl iɣef mazal ur yettusit ara fell-as</string>
+
+    <string name="e2e_re_request_encryption_key">Ales asuter n tsura n uwgelhen seg tɣimiyin-ik·im tiyaḍ.</string>
+
+    <string name="e2e_re_request_encryption_key_dialog_title">Asuter yettwazen</string>
+    <string name="read_receipts_list">Ɣeṛ tabdart n wawwaḍ</string>
+
+    <plurals name="membership_changes">
+        <item quantity="one">1 usnifel deg umulteɣ</item>
+        <item quantity="other">%d yisnifal deg umulteɣ</item>
+    </plurals>
+
+    <string name="settings_call_show_confirmation_dialog_title">Sewḥel isawalen iɣef ur tebniḍ</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Suter i usentem send beddu n usiwel</string>
+    <string name="settings_call_ringtone_use_default_stun">"Sireg aqeddac n tallalt n yisawalen "</string>
+    <string name="room_participants_kick_title">Suffeɣ aseqdac</string>
+    <string name="room_participants_kick_reason">Ssebba n usuffeɣ</string>
+    <string name="room_participants_ban_title">Agi aseqdac</string>
+    <string name="room_participants_ban_reason">Ssebba n tigtin</string>
+    <string name="room_participants_unban_title">Asefsex n useqdac</string>
+    <string name="room_details_title">Talqayt n texxamt</string>
+    <plurals name="room_details_selected">
+        <item quantity="one">1 i yettufernen</item>
+        <item quantity="other">%d i yettufernen</item>
+    </plurals>
+    <string name="room_event_action_cancel_upload">Sefsex Asali</string>
+    <string name="room_event_action_cancel_download">Sefsex Asider</string>
+
+    <string name="directory_search_results_title">Nadi akaram</string>
+    <plurals name="directory_search_rooms_for">
+        <item quantity="one">%1$s taxxamt yettwafen i %2$s</item>
+        <item quantity="other">%1$s taxxamin yettwafen i %2$s</item>
+    </plurals>
+    <string name="directory_searching_title">Anadi n ukaram…</string>
+
+    <string name="room_settings_mention_only">Ibdaren kan</string>
+    <string name="settings_notification_privacy">Tabaḍnit n yilɣa</string>
+    <string name="settings_notification_troubleshoot">Ilɣa n usellek</string>
+    <string name="settings_notification_privacy_reduced">Tabaḍnit tettwasemẓẓi</string>
+    <string name="settings_notification_privacy_need_permission">Asnas yesra asireg i wakken ad iseddu tafelwit n ugilal</string>
+    <string name="settings_call_invitations">Tinubgiwin i usiwel</string>
+    <string name="settings_labs_native_camera">Seqdec takamiṛat tadigant</string>
+    <string name="settings_labs_enable_send_voice">Azen iznan n taɣuct</string>
+    <string name="start_verification">Bdu asenqed</string>
+    <string name="share_without_verifying">Bḍu war asenqed</string>
+    <string name="key_share_request">Asuter n beṭṭu n tsarut</string>
+    <string name="ignore_request">Anef i tuttra</string>
+    <string name="command_description_topic">Sbadu asentel n texxamt</string>
+    <string name="notification_silent">Tasusmi</string>
+    <string name="community_name">Isem n temɣiwent</string>
+    <string name="community_id">Asulay n temɣiwent</string>
+    <string name="no_users_placeholder">Ulac iseqdacen</string>
+
+    <string name="filter_group_members">Sizdeg iɛeggalen n ugraw</string>
+    <string name="filter_group_rooms">Sizdeg tixxamin n yigrawen</string>
+
+    <plurals name="group_members">
+        <item quantity="one">1 uɛeggal</item>
+        <item quantity="other">%d yiɛaggalen</item>
+    </plurals>
+
+    <plurals name="group_rooms">
+        <item quantity="one">1 texxamt</item>
+        <item quantity="other">%d texxamin</item>
+    </plurals>
+    <string name="reason_colon">Taɣzint: %1$s</string>
+    <string name="rejoin">Rnu</string>
+    <string name="receipt_avatar">Avaṭar n wawwaḍ</string>
+    <string name="notice_avatar">Avaṭar n ulɣu</string>
+    <string name="dialog_user_consent_submit">Senqed tura</string>
+
+    <string name="generic_label">%1$s:</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="plus_x">+%d</string>
+    <string name="x_plus">%d+</string>
+    <string name="keys_backup_setup_override_stop">Ḥbes</string>
+
+    <string name="recovery_key">Tasarut tririt</string>
+    <string name="new_recovery_method_popup_was_me">D nekk</string>
+
+    <string name="keys_backup_info_title_algorithm">Alguritm</string>
+    <string name="keys_backup_info_title_signature">Azmul</string>
+
+    <string name="sas_view_request_action">Wali asuter</string>
+    <string name="sas_verification_request_notification_channel_title">Asenqed n tsarut</string>
+    <string name="sas_cancelled_dialog_title">Asuter yettwasefsex</string>
+    <string name="sas_error_unknown">Tuccḍa tarussint</string>
+
+    <string name="invited_by">Yettwanced-d sɣur %s</string>
+
+    <string name="reactions_agree">Qbel</string>
+    <string name="reactions_like">Ḥemmel</string>
+    <string name="create_new_room">Rnu taxxamt tamaynut</string>
+    <string name="change_room_directory_network">Snifel azeṭṭa</string>
+    <string name="group_all_communities">Meṛṛa timɣiwnin</string>
+
+    <string name="create_room_title">Taxxamt tamaynut</string>
+    <string name="create_room_action_create">RNU</string>
+    <string name="create_room_name_hint">Isem n texxamt</string>
+    <string name="create_room_public_description">Yal yiwen yezmer ad yernu ɣer texxamt-a</string>
+    <string name="settings_sdk_version">Lqem SDK n Matrix</string>
+    <string name="settings_expert">Amussnaw</string>
+    <string name="settings_push_rules">Ilugan n push</string>
+    <string name="push_gateway_item_app_id">asnas_id:</string>
+    <string name="push_gateway_item_push_key">push_tasarut:</string>
+    <string name="push_gateway_item_app_display_name">asnas_sken_isem:</string>
+    <string name="push_gateway_item_device_name">tiɣimit_isem:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_format">Amasal:</string>
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Sekles ajuṭu</string>
+
+    <string name="send_suggestion">Eg asumer</string>
+    <string name="send_suggestion_content">Ttxil-k·m aru asumer-ik·im ddaw.</string>
+    <string name="send_file_step_idle">Yettaru…</string>
+    <string name="edited_suffix">(yettwaẓreg)</string>
+
+    <string name="message_edits">Tiẓrigin n yizen</string>
+    <string name="no_message_edits_found">Ulac tiẓrigin yettwafen</string>
+
+    <string name="room_filtering_filter_hint">Sizdeg idiwenniyen…</string>
+    <string name="room_directory_search_hint">Isem neɣ asulay (#example:matrix.org)</string>
+
+    <string name="add_by_matrix_id">Rnu s usulay n Matrix</string>
+    <string name="creating_direct_room">Timerna n texamt…</string>
+    <string name="read_at">Ɣeṛ deg</string>
+
+
+    <string name="identity_server">Aqeddac n timagit</string>
+    <string name="a11y_show_password">Sken awal uffir</string>
+    <string name="a11y_hide_password">Ffer awal uffir</string>
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s d %3$d d tɣuri-nniḍen</item>
+        <item quantity="other">%1$s, %2$s d %3$d d tɣuriyin-nniḍen</item>
+    </plurals>
+    <string name="three_users_read">Taɣuri n %1$s, %2$s d %3$s</string>
+    <string name="two_users_read">Taɣuri n %1$s d %2$s</string>
+    <string name="one_user_read">Taɣuri n %s</string>
+    <plurals name="fallback_users_read">
+        <item quantity="one">1 useqdac yeɣra</item>
+        <item quantity="other">%d yiseqdacen ɣran</item>
+    </plurals>
+
+    <string name="error_file_too_big">Afaylu \'%1$s\' (%2$s) ɣezzif aṭas i usali. Talast d %3$s.</string>
+
+    <string name="error_attachment">Tuccḍa deg tuqqna lawan n uneɛruḍ n uceqquf yeddan.</string>
+    <string name="attachment_type_audio">Ameslaw</string>
+    <string name="attachment_type_sticker">Astiker</string>
+    <string name="error_handling_incoming_share">Ur yezmir ara ad ttusqedcen deg yisefka n beṭṭu</string>
+
+    <string name="uploads_media_title">AMIDYA</string>
+    <string name="uploads_media_no_result">Ulac amidya deg texxamt-a</string>
+    <string name="uploads_files_title">IFUYLA</string>
+    <string name="uploads_files_subtitle">%1$s ɣer %2$s</string>
+    <string name="uploads_files_no_result">Ulac ifuyla deg texxxamt-a</string>
+
+    <string name="report_content_spam">D aspam</string>
+    <string name="report_content_custom">Aneqqis udmawan…</string>
+    <string name="report_content_custom_hint">Taɣzint i tuzna n ugbur-a</string>
+    <string name="report_content_custom_submit">ANEQQIS</string>
+    <string name="block_user">ZGEL ASEQDAC</string>
+
+    <string name="content_reported_title">Agbur yettwazen</string>
+    <string name="content_reported_as_spam_title">Yettwazen d aspam</string>
+    <string name="message_ignore_user">Zgel aseqdac</string>
+
+    <string name="room_list_quick_actions_notifications_mentions">Ibdaren kan</string>
+    <string name="room_list_quick_actions_leave">Ffeɣ si texxamt</string>
+    <string name="notice_member_no_changes">%1$s ur iga ara akk isnifal</string>
+    <string name="notice_member_no_changes_by_you">Ur tgiḍ ara akk isnifal</string>
+    <string name="reaction_search_type_hint">Aru n wawalen ufranen i tifin n tsedmirt.</string>
+
+    <string name="no_ignored_users">Ur tezgileṣ ula d yiwen useqdac</string>
+
+    <string name="room_join_rules_public">%1$s yerra taxxamt d tazayazt i kra n win yessnen aseɣwen.</string>
+    <string name="room_join_rules_public_by_you">Terriḍ taxxamt d tazayazt i kra n win yessnen aseɣwen.</string>
+    <string name="room_join_rules_invite">%1$s yerra taxxamt s tinubga kan.</string>
+    <string name="room_join_rules_invite_by_you">Terriḍ taxxamt s tinubga kan.</string>
+    <string name="timeline_unread_messages">Iznan ur nettwaɣra ara</string>
+
+    <string name="login_splash_title">D adiwenni-inek·inem. Ṭṭef-itt.</string>
+    <string name="login_splash_text1">Mmeslay d yimdanen srid neɣ deg ugraw</string>
+    <string name="login_splash_text2">Eǧǧ idiwenniyen d usligen s uwgelhen</string>
+    <string name="login_server_title">Fren aqeddac</string>
+    <string name="login_connect_to">Qqen ɣer %1$s</string>
+    <string name="login_signin_to">Kcem ɣer %1$s</string>
+    <string name="login_signin_sso">Kemmel s SSO</string>
+
+    <string name="login_server_url_form_modular_hint">Tansa n yimeẓla n Element Matrix</string>
+    <string name="login_server_url_form_common_notice">Sekcem tansa n uqeddac i tebɣiḍ ad tesqedceḍ</string>
+
+    <string name="login_login_with_email_error">Imayl-a ur iqqin ula ɣer yiwen n umiḍan.</string>
+
+    <string name="login_reset_password_on">Wennez awal uffir ɣef %1$s</string>
+    <string name="login_reset_password_error_not_found">Ulac amiḍan akk amiḍan wuɣur yeqqen yimayl-a</string>
+
+    <string name="login_reset_password_mail_confirmation_title">Senqed tabewwaḍt-ik·im n yimayl</string>
+    <string name="login_reset_password_mail_confirmation_notice">Imayl n usenqed yettwazen ɣer %1$s.</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Sit ɣef useɣwen i usentem n wawal-ik·im uffir. Akken ara tḍefreḍ aseɣwen i yellan deg-s, sit ddaw.</string>
+    <string name="login_reset_password_success_submit">Tuɣalin ɣer unekcum</string>
+
+    <string name="login_set_email_title">Sbadu tansa n yimayl</string>
+    <string name="login_set_msisdn_title">Sbadu uṭṭun n tiliɣri</string>
+    <string name="login_set_msisdn_mandatory_hint">Uṭṭun n tiliɣri</string>
+    <string name="login_set_msisdn_optional_hint">Uṭṭun n tiliɣri (d afrayan)</string>
+    <string name="login_msisdn_confirm_title">Sentem uṭṭun n tilifun</string>
+    <string name="login_msisdn_confirm_hint">Sekcem tangalt</string>
+    <string name="login_msisdn_confirm_send_again">Azen tikkelt-nniḍen</string>
+    <string name="login_signup_to">Ffeɣ seg %1$s</string>
+    <string name="login_signin_username_hint">Isem n useqdac neɣ imayl</string>
+    <string name="login_signup_error_user_in_use">Isem-a n useqdac yettwamudd</string>
+    <string name="login_a11y_choose_matrix_org">Fren matrix.org</string>
+    <string name="login_a11y_choose_modular">Fren imeẓla n Element Matrix</string>
+    <string name="login_a11y_choose_other">Fren aqeddac agejdan udmawan</string>
+    <string name="login_terms_title">Qbel tiwtilin i wakken ad tkemmleḍ</string>
+
+    <string name="login_wait_for_email_title">Ttxil-k·m senqed imayl-ik·im</string>
+    <string name="login_connect_using_matrix_id_submit">Kcem s usulay n Matrix</string>
+    <string name="login_signin_matrix_id_title">Kcem s usulay n Matrix</string>
+    <string name="seen_by">Yemmẓer sɣur</string>
+
+    <string name="signed_out_title">Aql-ak·akem teffɣeḍ</string>
+    <string name="signed_out_submit">Kcem tikkelt-nniḍen</string>
+
+    <string name="soft_logout_title">Aql-ak·akem teffɣeḍ</string>
+    <string name="soft_logout_clear_data_dialog_title">Sfeḍ isefka</string>
+    <string name="soft_logout_clear_data_dialog_submit">Sfeḍ isefka</string>
+    <string name="bug_report_error_too_short">Aglam wezzil aṭas</string>
+
+    <string name="notification_initial_sync">Amtawi amezwaru…</string>
+
+    <string name="settings_show_devices_list">Ẓer meṛṛa tiɣimiyin-inu</string>
+    <string name="settings_advanced_settings">Iɣewwaren leqqayen</string>
+    <string name="settings_developer_mode">Askar aneflay</string>
+    <string name="rageshake_detected">Azlaz yettwaf-d!</string>
+    <string name="devices_other_devices">Tiɣimiyin tiyaḍ</string>
+
+    <string name="create_room_encryption_title">Rmed awgelhen</string>
+    <string name="verification_conclusion_not_secure">Mačči d aɣelsan</string>
+    <string name="sent_a_video">Tavidyut.</string>
+    <string name="sent_an_image">Tugna.</string>
+    <string name="sent_an_audio_file">Ameslaw</string>
+    <string name="send_a_sticker">Astiker</string>
+
+    <string name="verification_request_waiting">Yettṛaǧu…</string>
+    <string name="verification_request_other_cancelled">%s yettwasefsex</string>
+    <string name="verification_request_other_accepted">%s yettwaqbal</string>
+    <string name="verification_sent">Asenqed yettwazen</string>
+    <string name="verification_verify_device_manually">Yettwasenqed s ufus</string>
+
+    <string name="verification_scan_their_code">Siggez tangalt-a</string>
+    <string name="recovery_key_empty_error_message">Ttxil-k·m sekcem tasarut n tririt</string>
+
+    <string name="bootstrap_progress_generating_ssss">Asirew n tsarut SSSS seg tefyirt tuffirt</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Asirew n tsarut SSSS seg tefyirt tuffirt (%s)</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Asirew n tsarut SSSS seg tsarut n tririt</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="error_saving_media_file">Ur yezmir ara ad isekles afaylu n umidya</string>
+    <string name="change_password_summary">Sbadu awal uffir amaynut n umiḍan…</string>
+
+    <string name="app_desktop_web">Element Web
+\nElement Desktop</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
+    <string name="use_latest_app">Seqdec aferdis aneggaru ɣef yibenkan-nniḍen:</string>
+    <string name="command_description_discard_session_not_handled">Yettusefrak kan deg texxamin yettwawgelhen</string>
+    <string name="enter_secret_storage_passphrase_or_key">Seqdec %1$s-inek·inem neɣ seqdec %2$s-inek.inem i wakken ad tkemmleḍ.</string>
+    <string name="keys_backup_recovery_key_error_decrypt">Aḥraz ur yezmir ara ad yekkes awgelhen s tsarut-a n tririt: ttxil-k·m sefqed ma d tasarut n tririt tameɣtut i teskecmeḍ.</string>
+    <string name="failed_to_access_secure_storage">Anekcum ɣer uklas aɣelsan ur yeddi ara</string>
+
+    <string name="encrypted_unverified">Yettuwgelhen s yibenk ur nettwasenqed ara</string>
+    <string name="verify_this_session">Senqed anekcam amaynut i ikecmen ɣer umiḍan-ik/im: %1$s</string>
+
+    <string name="crosssigning_verify_session">Senqed anekcam</string>
+    <string name="mark_as_verified">Creḍ yettwaḍman</string>
+
+    <string name="call_notification_answer">Qbel</string>
+    <string name="call_notification_reject">Agwi</string>
+    <string name="call_notification_hangup">Ɛelleq</string>
+
+    <string name="error_empty_field_choose_user_name">Ttxil-ik·im fren isem n useqdac.</string>
+    <string name="error_empty_field_choose_password">Ttxil-ik·im fren awal uffir.</string>
+    <string name="add_members_to_room">Rnu iɛeggalen</string>
+    <string name="invite_users_to_room_action_invite">NCED</string>
+    <string name="inviting_users_to_room">Ancad n yiseqdacen…</string>
+    <string name="invite_users_to_room_title">Nced-d iseqdacen</string>
+    <string name="invitation_sent_to_one_user">Tinubga tettwazen i %1$s</string>
+    <string name="invitations_sent_to_two_users">Tinubga tettwazen i %1$s d %2$s</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="one">Tinubga tettwazen i %1$s d wayeḍ-nniḍen</item>
+        <item quantity="other">Tinubga tettwazen i %1$s d %2$d d wiyeḍ</item>
+    </plurals>
+    <string name="invite_users_to_room_failure">Ur nezmir ara ad d-nesnubget iseqdacen. Ttxil-k·m wali iseqdac i tebɣiḍ ad d-tesnubegteḍ syen ɛreḍ tikkelt-nniḍen.</string>
+
+    <string name="choose_locale_other_locales_title">Tutlayin-nniḍen yellan</string>
+    <string name="choose_locale_loading_locales">Sali-d tutlayin yellan…</string>
+
+    <string name="open_terms_of">Ldi tiwtilin n %s</string>
+    <string name="identity_server_set_default_submit">Seqdec %1$s</string>
+    <string name="power_level_edit_title">Sbadu tamlilt</string>
+    <string name="power_level_title">Tamlilt</string>
+    <string name="a11y_open_chat">Ldi adiwenni</string>
+    <string name="a11y_mute_microphone">Sgugem asawaḍ</string>
+    <string name="a11y_unmute_microphone">Kkes asgugem i usawaḍ</string>
+    <string name="a11y_stop_camera">Seḥbes takamiṛat</string>
+    <string name="a11y_start_camera">Senker takamiṛat</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">Aḥraz aɣelsan</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Seqdec tasarut n tɣellist</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Sirew tasarut n tɣellist ara tḥerzeḍ deg wadeg yettwaḍemnen, am yimsefrak n wawalen uufiren neɣ deg usenduq.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Sbadu tafyirt taɣelsant</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Kles tasarut-ik·im n tɣellist deg wadeg yettwaḍemnen, am umsefrak n wawalen uffiren neɣ neɣ usenduq.</string>
+
+    <string name="save_your_security_key_notice">Kles tasarut-ik·im n tɣellist deg wadeg yettwaḍemnen, am umsefrak n wawalen uffiren neɣ neɣ usenduq.</string>
+
+    <string name="room_settings_save_success">Tbeddleḍ iɣewwaren n texxamt akken iwata</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">Ur tezmireḍ ara ad tkecmeḍ ɣer izen-a</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Aṛaǧu i umazray n uwgelhen</string>
+
+    <string name="send_bug_report_app_crashed">Asnas yerreẓ tikkelt-nni taneggarut. Tebɣiḍ ad teldiḍ agdil n uneqqis n truẓi\?</string>
+    <string name="no_sticker_application_dialog_content">Akka tura ur tesɛiḍ ara akemmus n yistiker yettwaremden.
+\n
+\nRnu yiwen tura\?</string>
+
+    <string name="room_participants_action_cancel_invite_title">Sefsex tinubga</string>
+    <string name="room_event_action_report_prompt_reason">Taɣzint i tuzna n ugbur-a</string>
+    <string name="devices_details_dialog_title">Talɣut ɣef tɣimit</string>
+    <string name="settings_select_country">Fren tamurt</string>
+
+    <string name="settings_phone_number_country_error">Ttxil-k·m fren tamurt</string>
+    <string name="settings_phone_number_label">Uṭṭun n tiliɣri</string>
+    <string name="settings_phone_number_error">Uṭṭun n tiliɣri d arameɣtu i ufran n tmurt</string>
+    <string name="settings_phone_number_verification">Asenqed n wuṭṭun n tilifun</string>
+    <string name="settings_phone_number_verification_instruction">Ad naze-n SMS deg-s tangalt n usenqed. Ttxil-k·m sekcem tangalt-a ddaw.</string>
+    <string name="settings_phone_number_verification_error_empty_code">Sekcem tangalt n usenqed</string>
+    <string name="settings_phone_number_verification_error">Tuccḍa mi ara nessentam uṭṭun-ik·im n tilifun</string>
+    <string name="account_phone_number_error">Tella-d tuccḍa mi ara nessenqad uṭṭun-ik·im n tilifun.</string>
+    <string name="account_additional_info">Talut-nnien: %s</string>
+
+    <string name="settings_default_compression">Asekkussem amezwer</string>
+    <string name="settings_default_media_source">Taɣbalut n umidyat amezwer</string>
+    <string name="room_settings_topic">Asentel</string>
+    <string name="encryption_information_algorithm">Alguritm</string>
+    <plurals name="notification_unread_notified_messages_in_room_rooms">
+        <item quantity="one">1 texxamt</item>
+        <item quantity="other">%d texxamin</item>
+    </plurals>
+
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="small">Meẓẓiy</string>
+    <string name="large">Hraw</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Ttxil-k·m sekcem tasarut n tririt</string>
+    <string name="room_settings_enable_encryption_dialog_submit">Rmed awgelhen</string>
+
+    <string name="bootstrap_loading_text">Ayagi yezmer ad yeṭṭef kra n wakud, ttxil-k·m ṣṣber.</string>
+    <string name="bootstrap_loading_title">Asbadu n tririt.</string>
+    <string name="bootstrap_finish_title">Tsuliḍ!</string>
+    <string name="keep_it_safe">Eǧǧ-it d aɣelasn</string>
+    <string name="bootstrap_save_key_description">Seqdec wa %1$s d azeṭṭa aɣelsan mi ara tettuḍ %2$s-inek·inem.</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">Asuffeɣ n tsura n timagit yettwarnan</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Asirew n tsarut n tɣellist seg tefyirt tuffirt</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Asbadu n tsarut s wudem amezwar n SSSS</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Amtawi n tsarut tagejdant</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Amtawi n tsarut n useqdac</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Amtawi n tsarut n uzmul asuf</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Asbadu n uḥraz n tsarut</string>
+
+
+    <string name="bootstrap_cross_signing_success">%2$s &amp; %1$s inek·inem ttusbadun tura.
+\n
+\nEǧǧ-iten d iɣelsanen! Ad ten-teḥwiǧeḍ ad teldiḍ iznan yettwawgelhen d telɣut n tɣellist ma yella tesruḥeḍ akk tiɣimiyin-ik·im yettwaremden.</string>
+
+    <string name="bootstrap_crosssigning_print_it">&lt;b&gt;Siggez-itt syen kles-itt deg wadeg aɣelsan</string>
+    <string name="bootstrap_crosssigning_save_usb">Sekles-itt ɣef tsarut USB neɣ deg yibenk n uḥraz</string>
+    <string name="bootstrap_crosssigning_save_cloud">Nɣel-itt ɣer uklas-ik·im n usigna udmawan</string>
+
+    <string name="auth_flow_not_supported">Ur tezmireḍ ara ad tgeḍ aya seg uziraz</string>
+
+    <string name="bootstrap_skip_text">Asbadu n tefyirt tuffirt n tririt ad ak·am-teḍmen taɣellist &amp; tawaledyawt n yiznan yettwawgelhen, yettwattkalen.
+\n
+\nMa yella ur tebɣiḍ ara ad tesbaduḍ awal uffir n yizen, sirew deg wadeg-is tasarut n yizen.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Imi yella uwgelhen seg yixef er yixef, ilaq-ak·am ad terǧuḍ i yizen n walbaɛḍ ad ak·am-id-yaweḍ acku ur ak·am-d-ttwaznent ara tsura akken iwata.</string>
+    <string name="crypto_error_withheld_blacklisted">Ur tezmireḍ ara ad tkecmeḍ ɣer yizen-a acku tettusweḥleḍ sɣur amazan</string>
+    <string name="crypto_error_withheld_unverified">Ur tezmireḍ ara ad tkecmeḍ ɣer yizen-a acku tiɣimit-ik·im ur tt-yeḍmin ara umazan</string>
+    <string name="crypto_error_withheld_generic">Ur tezmire ara ad tkecmeḍ ɣer yizen-a acku amazan iɛemmed ur d-yuzin ara tisura</string>
+    <string name="element_disclaimer_content">S tumert meqqren ara ak-d-nini nbeddel isem! Asnas-ik·im yettwaleqqem, ha-t-an tkecmeḍ ɣer umiḍan-ik·im.</string>
+</resources>
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index ab5b4e5c28..d830d40686 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -257,7 +257,7 @@
     <string name="encryption_information_algorithm">Algoritme</string>
     <string name="encryption_information_session_id">Økt-ID</string>
     <string name="device_name_warning">Det offentlige navnet til en økt er synlig for folkene du kommuniserer med</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="encryption_information_device_id">Økt-ID</string>
     <string name="encryption_information_device_key">Øktnøkkel</string>
     <string name="encryption_information_verification">Verifisering</string>
     <string name="encryption_export_export">Eksporter</string>
@@ -345,7 +345,7 @@
     <string name="invited_by">Invitert av %s</string>
 
     <string name="title_activity_emoji_reaction_picker">Reaksjoner</string>
-    <string name="reactions_like">Like</string>
+    <string name="reactions_like">Liker</string>
     <string name="reactions">Reaksjoner</string>
 
     <string name="action_change">Endre</string>
@@ -671,7 +671,7 @@
     <string name="missing_permissions_title_to_start_conf_call">Kan ikke starte samtale</string>
     <string name="device_information">Informasjon om Økten</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Konferansesamtaler er ikke støttet i enkrypterte rom</string>
-    <string name="call_anyway">Ring likevel.</string>
+    <string name="call_anyway">Ring likevel</string>
     <string name="send_anyway">Send likevel</string>
     <string name="action_sign_out_confirmation_simple">Er du sikker på at vil logge ut\?</string>
     <string name="action_voice_call">Telefonsamtale</string>
@@ -729,4 +729,302 @@
     <string name="start_new_chat_prompt_msg">Er du sikker på du vil starte en samtale med %s\?</string>
     <string name="start_voice_call_prompt_msg">Er du sikker på du vil starte en lydsamtale\?</string>
     <string name="start_video_call_prompt_msg">Er du sikker på du vil starte en videosamtale\?</string>
+    <string name="play_video">Spill av</string>
+    <string name="pause_video">Pause</string>
+    <string name="dismiss">Avslå</string>
+
+
+    <string name="no_permissions_to_start_conf_call">Du har ikke rettigheter til å starte en konferansesamtale i dette rommet</string>
+    <string name="conference_call_in_progress">Det pågår allerede en konferanse!</string>
+    <string name="video_meeting">Start videomøte</string>
+    <string name="audio_meeting">Start lydmøte</string>
+    <string name="audio_video_meeting_description">Møter bruker sikkerhets- og tilgangsregler fra Jitsi. Alle i rommet vil kunne se en invitasjon til møtet mens det pågår.</string>
+    <string name="cannot_call_yourself">Du kan ikke ringe deg selv</string>
+    <string name="cannot_call_yourself_with_invite">Du kan ikke ringe deg selv. Vent til inviterte deltakere godtar invitasjonen</string>
+    <string name="failed_to_add_widget">Kunne ikke legge til utvidelse</string>
+    <string name="failed_to_remove_widget">Kunne ikke fjerne utvidelse</string>
+    <string name="action_copy">Kopier</string>
+    <string name="dialog_title_success">Suksess</string>
+
+    <string name="bottom_action_notification">Varsler</string>
+    <string name="call_failed_no_ice_title">Oppringing feilet som følge av feilkonfigurert tjener</string>
+    <string name="call_failed_no_ice_use_alt">Prøv med %s</string>
+    <string name="call_failed_dont_ask_again">Ikke spør meg igjen</string>
+
+    <string name="call_failed_no_connection">Element samtale feilet</string>
+    <string name="call_select_sound_device">Velg lydenhet</string>
+    <string name="sound_device_phone">Telefon</string>
+    <string name="sound_device_speaker">Høytaler</string>
+    <string name="sound_device_headset">Hodesett</string>
+    <string name="sound_device_wireless_headset">Trådløst hodesett</string>
+    <string name="call_switch_camera">Bytt kamera</string>
+    <string name="call_camera_front">Foran</string>
+    <string name="call_camera_back">Bak</string>
+    <string name="call_format_turn_hd_off">Slå HD av</string>
+    <string name="call_format_turn_hd_on">Slå HD på</string>
+
+    <string name="option_send_files">Send filer</string>
+    <string name="option_send_sticker">Send klistremerke</string>
+    <string name="option_take_photo_video">Ta bilde eller video</string>
+    <string name="no_sticker_application_dialog_content">Du har ingen pakker med klistremerker slått på.
+\n
+\nLegge til noen nå\?</string>
+
+    <string name="go_on_with">fortsett med…</string>
+    <string name="error_no_external_application_found">Dessverre, kunne ikke finne en passende ekstern applikasjon for å utføre denne handlingen.</string>
+
+    <string name="auth_login_sso">Logg på med single sign-on</string>
+    <string name="auth_user_id_placeholder">E-post eller brukernavn</string>
+    <string name="auth_user_name_placeholder">Brukernavn</string>
+    <string name="auth_opt_email_placeholder">E-postadresse (valgfritt)</string>
+    <string name="auth_opt_phone_number_placeholder">Telefonnummer (valgfritt)</string>
+    <string name="auth_repeat_password_placeholder">Gjenta passord</string>
+    <string name="auth_repeat_new_password_placeholder">Bekreft ditt nye passord</string>
+    <string name="auth_missing_password">Manglende passord</string>
+    <string name="auth_invalid_email">Dette ser ikke ut som en gyldig E-postadresse</string>
+    <string name="auth_invalid_phone">Dette ser ikke ut som et gyldig telefonnummer</string>
+    <string name="auth_missing_email">Manglende E-postadresse</string>
+    <string name="auth_missing_phone">Manglende telefonnummer</string>
+    <string name="auth_missing_email_or_phone">Manglende E-postadresse eller telefonnummer</string>
+    <string name="auth_password_dont_match">Passordene samsvarer ikke</string>
+    <string name="login_error_ssl_other">SSL-feil.</string>
+    <string name="login_error_limit_exceeded">For mange forespørsler har blitt sendt</string>
+    <string name="compression_options">Send som</string>
+    <string name="attachment_cancel_download">Vil du avbryte nedlastingen\?</string>
+    <string name="attachment_cancel_upload">Vil du avbryte opplastingen\?</string>
+    <string name="room_info_room_name">Rommets navn</string>
+    <plurals name="room_header_active_members_count">
+        <item quantity="one">1 aktivt medlem</item>
+        <item quantity="other">%d aktive medlemmer</item>
+    </plurals>
+    <string name="room_participants_leave_prompt_title">Forlat rommet</string>
+    <string name="room_participants_ago">%1$s for %2$s siden</string>
+
+    <string name="room_participants_header_direct_chats">Direktemeldinger</string>
+    <string name="room_participants_action_leave">Forlat dette rommet</string>
+    <string name="room_participants_action_remove">Fjern fra dette rommet</string>
+    <string name="room_participants_action_set_moderator">Utnevn til moderator</string>
+    <string name="room_participants_action_set_admin">Utnevn til admin</string>
+    <string name="room_participants_action_ignore_title">Ignorer bruker</string>
+    <string name="room_participants_action_ignore">Ignorer</string>
+
+    <string name="room_participants_action_unignore">Opphev ignorering</string>
+
+    <string name="room_participants_ban_title">Bannlys bruker</string>
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="room_participants_invite_join_names_and">%1$s og %2$s</string>
+    <string name="room_two_users_are_typing">%1$s og %2$s skriver …</string>
+    <string name="room_many_users_are_typing">%1$s, %2$s og andre skriver …</string>
+    <string name="room_prompt_cancel">Avbryt alle</string>
+    <plurals name="room_new_messages_notification">
+        <item quantity="one">1 ny melding</item>
+        <item quantity="other">%d nye meldinger</item>
+    </plurals>
+
+    <string name="room_details_title">Romdetaljer</string>
+    <plurals name="room_details_selected">
+        <item quantity="one">1 valgt</item>
+        <item quantity="other">%d valgte</item>
+    </plurals>
+    <string name="room_details_people_invited_group_name">INVITERT</string>
+    <string name="tab_title_search_messages">MELDINGER</string>
+    <string name="tab_title_search_files">FILER</string>
+
+    <string name="room_recents_create_room">Opprett et rom</string>
+    <string name="room_recents_join_room">Bli med i rommet</string>
+    <string name="room_recents_join_room_title">Bli med i et rom</string>
+    <string name="room_sliding_menu_term_and_conditions">Betingelser og vilkår</string>
+    <string name="room_sliding_menu_privacy_policy">Personvernregler</string>
+
+    <string name="settings_add_email_address">Legg til E-postadresse</string>
+    <string name="settings_add_phone_number">Legg til telefonnummer</string>
+    <string name="settings_notification_advanced">Avanserte varselsinnstillinger</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Systeminnstillinger.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">Kontoinnstillinger.</string>
+    <string name="settings_troubleshoot_test_service_boot_title">Start ved systemoppstart</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Skru av restriksjoner</string>
+
+    <string name="settings_troubleshoot_test_battery_title">Batterioptimalisering</string>
+    <string name="settings_notification_privacy_reduced">Redusert privatliv</string>
+    <string name="settings_enable_all_notif">Skru på varsler for denne kontoen</string>
+    <string name="settings_enable_this_device">Skru på varsler for denne økten</string>
+    <string name="settings_turn_screen_on">Skru på skjermen i 3 sekunder</string>
+    <string name="settings_start_on_boot">Start ved systemoppstart</string>
+    <string name="settings_app_term_conditions">Betingelser og vilkår</string>
+    <string name="settings_clear_media_cache">Tøm mediemellomlager</string>
+
+    <string name="settings_user_settings">Brukerinnstillinger</string>
+    <string name="settings_ignored_users">Ignorerte brukere</string>
+    <string name="settings_integrations">Integreringer</string>
+    <string name="settings_show_read_receipts">Vis lesekvitteringer</string>
+    <string name="settings_send_message_with_enter">Send melding med Enter</string>
+    <string name="settings_secure_backup_manage">Administrer</string>
+    <string name="settings_secure_backup_enter_to_setup">Sett opp på denne enheten</string>
+    <string name="settings_deactivate_my_account">Deaktiver kontoen min</string>
+    <string name="settings_discovery_category">Oppdag</string>
+    <string name="settings_discovery_manage">Behandle dine oppdagelsesinnstillinger.</string>
+    <string name="startup_notification_privacy_button_grant">Gi tillatelse</string>
+    <string name="startup_notification_privacy_button_other">Velg et annet alternativ</string>
+
+    <string name="startup_notification_fdroid_battery_optim_button_grant">Gi tillatelse</string>
+
+    <string name="settings_data_save_mode">Datasparingsmodus</string>
+    <string name="devices_details_dialog_title">Øktinformasjon</string>
+    <string name="settings_home_server">Hjemmetjener</string>
+    <string name="settings_integration_allow">Tillat integreringer</string>
+    <string name="disabled_integration_dialog_title">Integreringer er skrudd av</string>
+    <string name="settings_select_language">Velg språk</string>
+
+    <string name="account_email_validation_title">Verifisering avventer</string>
+    <string name="account_email_not_found_error">Denne E-postadressen ble ikke funnet.</string>
+    <string name="settings_change_password_submit">Oppdater passord</string>
+    <string name="settings_phone_number_verification">Telefonverifisering</string>
+    <string name="settings_default_compression">Standardkomprimering</string>
+    <string name="room_settings_tag_pref_dialog_title">Merket som:</string>
+
+    <string name="room_settings_category_access_visibility_title">Tilgang og synlighet</string>
+    <string name="room_settings_room_access_rules_pref_title">Romtilgang</string>
+    <string name="room_settings_labs_end_to_end">Punkt-til-punkt-kryptering</string>
+    <string name="room_settings_labs_end_to_end_is_active">Punkt-til-punkt-kryptering er skrudd på</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Ugyldig samfunns-ID</string>
+    <string name="encryption_information_device_name">Offentlig navn</string>
+    <string name="encryption_information_name">Offentlig navn</string>
+    <string name="encryption_information_unknown_device">ukjent økt</string>
+    <string name="notification_unread_notified_messages_in_room">%1$s i %2$s</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+
+    <string name="active_widgets_title">Aktive moduler</string>
+
+
+    <string name="room_widget_reload">Last inn modulen på nytt</string>
+    <string name="room_widget_webview_access_camera">Bruk kameraet</string>
+    <string name="room_widget_webview_access_microphone">Bruk mikrofonen</string>
+    <string name="room_manage_integrations">Behandle integreringer</string>
+    <string name="room_no_active_widgets">Ingen aktive moduler</string>
+    <string name="error_empty_field_your_password">Vennligst skriv inn passordet ditt.</string>
+    <string name="room_tombstone_continuation_link">Samtalen fortsetter her</string>
+    <string name="resource_limit_contact_action">Kontakt administrator</string>
+
+    <string name="unknown_error">Beklager, det oppstod en feil</string>
+
+    <string name="passphrase_create_passphrase">Opprett en passordfrase</string>
+    <string name="passphrase_confirm_passphrase">Bekreft passordfrasen</string>
+    <string name="passphrase_enter_passphrase">Skriv inn passordfrase</string>
+    <string name="passphrase_passphrase_does_not_match">Passordfrasen samsvarer ikke</string>
+    <string name="passphrase_empty_error_message">Vennligst skriv inn en passordfrase</string>
+    <string name="passphrase_passphrase_too_weak">Passordfrasen er for svak</string>
+
+    <string name="keys_backup_setup_step1_advanced">(Avansert)</string>
+    <string name="keys_backup_setup_step2_button_title">Velg passordfrase</string>
+    <string name="keys_backup_setup_step3_success_title">Suksess!</string>
+    <string name="recovery_key">Gjenopprettingsnøkkel</string>
+    <string name="keys_backup_restore_key_enter_hint">Skriv inn gjenopprettingsnøkkelen</string>
+
+    <string name="keys_backup_settings_restore_backup_button">Gjenopprett fra sikkerhetskopi</string>
+    <string name="keys_backup_settings_delete_backup_button">Slett sikkerhetskopien</string>
+
+    <string name="keys_backup_settings_delete_confirm_title">Slett sikkerhetskopien</string>
+    <string name="sas_verify_start_button_title">Begynn verifisering</string>
+    <string name="identity_server_not_defined">Du bruker ikke noen identitetstjenere</string>
+    <string name="room_list_people_empty_title">Samtaler</string>
+    <string name="message_add_reaction">Legg til reaksjon</string>
+    <string name="event_redacted">Meldingen ble slettet</string>
+    <string name="settings_show_redacted">Vis fjernede meldinger</string>
+    <string name="settings_show_redacted_summary">Vis en stattholder for fjernede meldinger</string>
+    <string name="group_all_communities">Alle samfunn</string>
+
+    <string name="create_room_directory_title">Rom-arkiv</string>
+    <string name="settings_sdk_version">Matrix SDK-versjon</string>
+    <string name="quick_reactions">Hurtigreaksjoner</string>
+
+    <string name="send_suggestion">Send inn et forslag</string>
+    <string name="send_file_step_encrypting_file">Krypterer filen …</string>
+    <string name="room_directory_search_hint">Navn eller ID (#example:matrix.org)</string>
+
+    <string name="direct_room_filter_hint">Filtrer etter brukernavn eller ID …</string>
+
+    <string name="message_view_edit_history">Vis redigeringshistorikk</string>
+
+    <string name="uploads_media_title">MEDIA</string>
+    <string name="uploads_files_title">FILER</string>
+    <string name="uploads_files_subtitle">%1$s, kl. %2$s</string>
+    <string name="report_content_inappropriate">Det er upassende</string>
+    <string name="block_user">IGNORER BRUKER</string>
+
+    <string name="message_ignore_user">Ignorer bruker</string>
+
+    <string name="spoiler">Spoiler</string>
+    <string name="no_ignored_users">Du ignorerer ikke noen brukere</string>
+
+    <string name="help_long_click_on_room_for_more_options">Langklikk på et rom for å se flere innstillinger</string>
+
+
+    <string name="login_server_other_text">Tilpassede og avanserte innstillinger</string>
+
+    <string name="login_connect_to">Koble til %1$s</string>
+    <string name="login_server_url_form_other_hint">Adresse</string>
+    <string name="login_reset_password_mail_confirmation_title">Sjekk innboksen din</string>
+    <string name="login_set_msisdn_optional_hint">Telefonnummer (valgfritt)</string>
+    <string name="login_msisdn_confirm_title">Bekreft telefonnummer</string>
+    <string name="login_signup_to">Registrer deg på %1$s</string>
+    <string name="login_signin_username_hint">Brukernavn eller E-postadresse</string>
+    <string name="login_signup_error_user_in_use">Det brukernavnet har blitt tatt</string>
+    <string name="login_signin_matrix_id_hint">Matrix-ID</string>
+    <string name="signed_out_title">Du er logget av</string>
+    <string name="soft_logout_title">Du er logget av</string>
+    <string name="soft_logout_clear_data_submit">Tøm alle data</string>
+
+    <string name="settings_show_devices_list">Se alle mine økter</string>
+    <string name="create_room_encryption_title">Skru på kryptering</string>
+    <string name="verification_sas_do_not_match">De samsvarer ikke</string>
+    <string name="send_a_sticker">Klistremerke</string>
+
+    <string name="room_settings_enable_encryption_dialog_submit">Skru på kryptering</string>
+
+    <string name="refresh">Oppdater</string>
+
+    <string name="your_recovery_key">Din gjenopprettingsnøkkel</string>
+    <string name="finish">Avslutt</string>
+
+    <string name="encryption_enabled">Kryptering er skrudd på</string>
+    <string name="encryption_not_enabled">Kryptering er ikke skrudd på</string>
+    <string name="settings_messages_at_room">Medlinger som inneholder @room</string>
+    <string name="settings_messages_in_e2e_one_to_one">Krypterte meldinger i samtaler under fire øyne</string>
+    <string name="settings_messages_in_e2e_group_chat">Krypterte meldinger i gruppesamtaler</string>
+    <string name="settings_when_rooms_are_upgraded">Når rom blir oppgradert</string>
+    <string name="settings_troubleshoot_title">Feilsøk</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="change_password_summary">Velg et nytt kontopassord …</string>
+
+    <string name="unencrypted">Ukryptert</string>
+    <string name="add_members_to_room">Legg til medlemmer</string>
+    <string name="inviting_users_to_room">Inviterer brukere …</string>
+    <string name="invite_users_to_room_title">Inviter brukere</string>
+    <string name="choose_locale_current_locale_title">Nåværende språk</string>
+    <string name="choose_locale_other_locales_title">Andre tilgjengelige språk</string>
+    <string name="identity_server_set_default_submit">Bruk %1$s</string>
+    <string name="identity_server_set_alternative_submit">Send</string>
+    <string name="power_level_title">Rolle</string>
+    <string name="a11y_mute_microphone">Demp mikrofonen</string>
+    <string name="a11y_unmute_microphone">Opphev demping av mikrofonen</string>
+    <string name="a11y_stop_camera">Stopp kameraet</string>
+    <string name="a11y_start_camera">Start kameraet</string>
+
+    <string name="bottom_sheet_setup_secure_backup_submit">Sett opp</string>
+    <string name="room_settings_name_hint">Rommets navn</string>
+    <string name="room_settings_topic_hint">Emne</string>
+    <string name="crypto_utd">Kan ikke dekryptere</string>
+    <string name="element_disclaimer_negative_button">SKJØNNER</string>
+    <string name="element_disclaimer_positive_button">LÆR MER</string>
+
+    <string name="empty_phone_book">Telefonkatalogen din er tom</string>
+    <string name="phone_book_title">Telefonkatalog</string>
+    <string name="search_in_my_contacts">Søk i mine kontakter</string>
+    <string name="member_banned_by">Bannlyst av %1$s</string>
+    <string name="create_pin_confirm_title">Bekreft PIN-kode</string>
+    <string name="auth_pin_title">Skriv inn PIN-koden din</string>
+    <string name="auth_pin_forgot">Glemt PIN-koden\?</string>
+    <string name="settings_security_pin_code_title">Skru på PIN-kode</string>
 </resources>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 493f1f43fa..9409459279 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -9,9 +9,13 @@
     <string name="title_activity_home">Mensagens</string>
     <string name="title_activity_room">Sala</string>
     <string name="title_activity_settings">Configurações</string>
-    <string name="title_activity_member_details">Detalhes dos membros</string>
+    <string name="title_activity_member_details">Detalhes do participante</string>
     <string name="title_activity_historical">Histórico</string>
 
+    <string name="call_notification_answer">Aceitar</string>
+    <string name="call_notification_reject">Recusar</string>
+    <string name="call_notification_hangup">Encerrar</string>
+
     <!-- button names -->
     <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
@@ -28,12 +32,12 @@
     <string name="permalink">Link</string>
     <string name="view_source">Ver código-fonte</string>
     <string name="view_decrypted_source">Ver código-fonte descriptografado</string>
-    <string name="delete">Excluir</string>
+    <string name="delete">Apagar</string>
     <string name="rename">Renomear</string>
     <string name="report_content">Denunciar conteúdo</string>
     <string name="active_call">Chamada em andamento</string>
-    <string name="ongoing_conference_call">Chamada em grupo em andamento.↵
-\nEntre como %1$s ou %2$s</string>
+    <string name="ongoing_conference_call">Chamada em grupo em andamento.
+\nEntre com %1$s ou %2$s</string>
     <string name="ongoing_conference_call_voice">Voz</string>
     <string name="ongoing_conference_call_video">Vídeo</string>
     <string name="cannot_start_call">Não foi possível iniciar a chamada, tente mais tarde</string>
@@ -254,8 +258,6 @@
     <string name="permissions_rationale_msg_record_audio">Element necessita permissão para acessar seu microfone para realizar chamadas de áudio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
-\n↵
-\n↵
 \nPor favor, permita o acesso na próxima tela para fazer a chamada."</string>
     <string name="permissions_rationale_msg_camera_and_audio">Element necessita permissão para acessar sua câmera e seu microfone para fazer chamadas de vídeo.↵ 
 \n↵ 
@@ -275,7 +277,7 @@
     <string name="_continue">Continuar</string>
 
     <!-- Actions -->
-    <string name="remove">Remover</string>
+    <string name="remove">Apagar</string>
     <string name="join">Entrar</string>
     <string name="preview">Visualizar</string>
     <string name="reject">Recusar</string>
@@ -294,16 +296,16 @@
     <!-- Chat creation -->
     <string name="room_creation_title">Nova conversa</string>
     <string name="room_creation_add_member">Adicionar uma pessoa</string>
-    <string name="room_title_one_member">1 integrante</string>
+    <string name="room_title_one_member">1 participante</string>
 
     <!--  Chat participants -->
-    <string name="room_participants_leave_prompt_title">Deixar a sala</string>
+    <string name="room_participants_leave_prompt_title">Sair da sala</string>
     <string name="room_participants_leave_prompt_msg">Tem certeza de que deseja sair da sala\?</string>
-    <string name="room_participants_remove_prompt_msg">Você tem certeza que quer remover %s desta conversa?</string>
+    <string name="room_participants_remove_prompt_msg">Deseja remover %s desta conversa\?</string>
     <string name="room_participants_create">Criar</string>
 
     <string name="room_participants_online">Online</string>
-    <string name="room_participants_offline">Desconectada/o</string>
+    <string name="room_participants_offline">Offline</string>
     <string name="room_participants_idle">Ocioso</string>
 
     <string name="room_participants_header_admin_tools">FERRAMENTAS DE ADMINISTRAÇÃO</string>
@@ -312,7 +314,7 @@
     <string name="room_participants_header_devices">SESSÕES</string>
 
     <string name="room_participants_action_invite">Convidar</string>
-    <string name="room_participants_action_leave">Deixar esta sala</string>
+    <string name="room_participants_action_leave">Sair da sala</string>
     <string name="room_participants_action_remove">Remover desta sala</string>
     <string name="room_participants_action_ban">Banir da sala</string>
     <string name="room_participants_action_unban">Remover banimento</string>
@@ -373,21 +375,21 @@
     <string name="room_details_people">Pessoas</string>
     <string name="room_details_files">Arquivos</string>
     <string name="room_details_settings">Configurações</string>
-    <string name="malformed_id">ID mal formatado. Precisa ser um endereço de e-mail ou um ID Matrix, como \'@membrolocal:dominio\'</string>
+    <string name="malformed_id">ID mal formatado. Precisa ser um endereço de e-mail ou um ID Matrix, como \'@participantelocal:dominio\'</string>
     <string name="room_details_people_invited_group_name">CONVIDADOS</string>
     <string name="room_details_people_present_group_name">ENTRARAM</string>
 
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Motivo de denunciar este conteúdo</string>
-    <string name="room_event_action_report_prompt_ignore_user">Você deseja ocultar todas as mensagens deste usuário\?↵
-\n↵
-\nNote que esta ação irá reiniciar o aplicativo e poderá tomar um certo tempo.</string>
+    <string name="room_event_action_report_prompt_ignore_user">Deseja ocultar todas as mensagens deste usuário\?
+\n
+\nEsta ação irá reiniciar o aplicativo e poderá demorar um pouco.</string>
     <string name="room_event_action_cancel_upload">Cancelar envio</string>
     <string name="room_event_action_cancel_download">Cancelar download</string>
 
     <!-- Search -->
     <string name="search_hint">Pesquisar</string>
-    <string name="search_members_hint">Filtrar integrantes da sala</string>
+    <string name="search_members_hint">Pesquisar participantes da sala</string>
     <string name="search_no_results">Nenhum resultado</string>
     <string name="tab_title_search_rooms">SALAS</string>
     <string name="tab_title_search_messages">MENSAGENS</string>
@@ -415,7 +417,7 @@
     <string name="room_settings_favourite">Favoritar</string>
     <string name="room_settings_de_prioritize">Despriorizar</string>
     <string name="room_settings_direct_chat">Conversa direta</string>
-    <string name="room_settings_leave_conversation">Deixar a conversa</string>
+    <string name="room_settings_leave_conversation">Sair da conversa</string>
     <string name="room_settings_forget">Esquecer</string>
 
     <!-- home sliding menu -->
@@ -423,13 +425,13 @@
     <string name="room_sliding_menu_settings">Configurações</string>
     <string name="room_sliding_menu_version">Versão</string>
     <string name="room_sliding_menu_term_and_conditions">Termos e condições</string>
-    <string name="room_sliding_menu_third_party_notices">Avisos de terceiros</string>
+    <string name="room_sliding_menu_third_party_notices">Licenças de terceiros</string>
     <string name="room_sliding_menu_copyright">Direito autoral</string>
     <string name="room_sliding_menu_privacy_policy">Política de privacidade</string>
 
     <!-- Vector Settings -->
 
-    <string name="settings_profile_picture">Imagem do perfil</string>
+    <string name="settings_profile_picture">Foto de perfil</string>
     <string name="settings_display_name">Nome e sobrenome</string>
     <string name="settings_email_address">E-mail</string>
     <string name="settings_add_email_address">Adicionar endereço de e-mail</string>
@@ -442,11 +444,11 @@
     <string name="settings_enable_this_device">Ativar notificações nesta sessão</string>
     <string name="settings_turn_screen_on">Acender a tela por 3 segundos</string>
 
-    <string name="settings_messages_in_one_to_one">Msgs em conversas diretas</string>
+    <string name="settings_messages_in_one_to_one">Mensagens em conversas individuais</string>
     <string name="settings_messages_in_group_chat">Mensagens em salas</string>
-    <string name="settings_invited_to_room">Quando eu sou convidado a uma sala</string>
-    <string name="settings_call_invitations">Convites para chamadas</string>
-    <string name="settings_messages_sent_by_bot">Mensagens enviadas por "bot"</string>
+    <string name="settings_invited_to_room">Quando eu for convidada(o) a uma sala</string>
+    <string name="settings_call_invitations">Recebendo chamada</string>
+    <string name="settings_messages_sent_by_bot">Mensagens enviadas por bots</string>
 
     <string name="settings_background_sync">Sincronização em segundo plano</string>
     <string name="settings_enable_background_sync">Ativar a sincronização em segundo plano</string>
@@ -456,12 +458,12 @@
     <string name="settings_seconds">segundos</string>
 
     <string name="settings_version">Versão</string>
-    <string name="settings_olm_version">versão olm</string>
+    <string name="settings_olm_version">Versão do olm</string>
     <string name="settings_app_term_conditions">Termos e condições</string>
-    <string name="settings_third_party_notices">Avisos de terceiros</string>
+    <string name="settings_third_party_notices">Licenças de terceiros</string>
     <string name="settings_copyright">Direitos autorais</string>
     <string name="settings_privacy_policy">Política de privacidade</string>
-    <string name="settings_clear_cache">Limpar cache</string>
+    <string name="settings_clear_cache">Limpar cache e recarregar</string>
     <!--string name="settings_room_privacy_label">Privacidade</string-->
 
 
@@ -471,7 +473,7 @@
     <string name="settings_other">Outros</string>
     <string name="settings_advanced">Avançado</string>
     <string name="settings_cryptography">Criptografia</string>
-    <string name="settings_notifications_targets">Alvos de notificação</string>
+    <string name="settings_notifications_targets">Aparelhos notificados</string>
     <string name="settings_contact">Contatos locais</string>
     <string name="settings_contacts_app_permission">Permissão de acesso a contatos</string>
     <string name="settings_contacts_phonebook_country">País da agenda de contatos</string>
@@ -492,7 +494,7 @@
 
     <string name="settings_logged_in">Conectado como</string>
     <string name="settings_home_server">Servidor Principal (Home Server)</string>
-    <string name="settings_identity_server">Servidor de Identidade (Identity Server)</string>
+    <string name="settings_identity_server">Servidor de identidade</string>
 
     <string name="account_email_validation_title">Confirmação pendente</string>
     <string name="account_email_validation_message">Por favor, verifique o seu e-mail e clique no link que está lá. Feito isso, clique em continuar.</string>
@@ -502,9 +504,9 @@
     <string name="account_email_not_found_error">Este endereço de e-mail não foi encontrado.</string>
     <string name="account_phone_number_already_used_error">Este número de telefone já está em uso.</string>
 
-    <string name="settings_change_password">Alterar a senha</string>
+    <string name="settings_change_password">Alterar senha</string>
     <string name="settings_old_password">Senha atual</string>
-    <string name="settings_new_password">Senha nova</string>
+    <string name="settings_new_password">Nova senha</string>
     <string name="settings_confirm_password">Confirme a nova senha</string>
     <string name="settings_fail_to_update_password">Não consegui atualizar a senha</string>
     <string name="settings_password_updated">Sua senha foi atualizada</string>
@@ -512,9 +514,9 @@
 \n↵
 \nNote que esta ação irá reiniciar o aplicativo e pode levar algum tempo.</string>
 
-    <string name="settings_delete_notification_targets_confirmation">Você tem certeza que quer remover este destino de notificação?</string>
+    <string name="settings_delete_notification_targets_confirmation">Deseja deixar de notificar este aparelho\?</string>
 
-    <string name="settings_delete_threepid_confirmation">Você tem certeza que quer remover o %1$s %2$s?</string>
+    <string name="settings_delete_threepid_confirmation">Deseja remover o %1$s %2$s\?</string>
 
     <string name="settings_select_country">Escolha um país</string>
 
@@ -552,9 +554,9 @@
 
     <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Qualquer pessoa</string>
-    <string name="room_settings_read_history_entry_members_only_option_time_shared">Apenas integrantes (a partir do momento em que esta opção foi escolhida)</string>
-    <string name="room_settings_read_history_entry_members_only_invited">Apenas integrantes (desde que foram convidados)</string>
-    <string name="room_settings_read_history_entry_members_only_joined">Apenas integrantes (desde que entraram na sala)</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Apenas participantes (a partir do momento em que esta opção foi escolhida)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Apenas participantes (desde que foram convidados)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Apenas participantes (desde que entraram na sala)</string>
 
     <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Para fazer um link para uma sala, ela precisa ter um endereço.</string>
@@ -600,7 +602,7 @@
     <string name="directory_title">Diretório</string>
 
     <!-- matrix error -->
-    <string name="failed_to_load_timeline_position">%s estava tentando carregar um ponto específico da linha do tempo desta sala, mas não conseguiu encontrá-lo.</string>
+    <string name="failed_to_load_timeline_position">%s tentou carregar um trecho específico da conversa desta sala, mas não conseguiu.</string>
 
 
     <!-- encryption dialog -->
@@ -617,7 +619,7 @@
     <string name="encryption_information_sender_device_information">Informação sobre a sessão do remetente</string>
     <string name="encryption_information_device_name">Nome público do aparelho</string>
     <string name="encryption_information_name">Nome</string>
-    <string name="encryption_information_device_id">ID do aparelho</string>
+    <string name="encryption_information_device_id">ID da sessão</string>
     <string name="encryption_information_device_key">Chave da sessão</string>
     <string name="encryption_information_verification">Confirmação</string>
     <string name="encryption_information_ed25519_fingerprint">Impressão digital ed25519</string>
@@ -658,10 +660,10 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
 
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Esta sala contém sessões desconhecidas</string>
-    <string name="unknown_devices_alert_message">Esta sala contém sessões desconhecidas que não foram confirmadas.↵ 
-\nIsso significa que não há garantia de que estas sessões realmente pertencem aos usuários identificados.↵ 
-\nRecomendamos que você faça o processo de confirmação para cada sessão desconhecida antes de continuar, mas você pode reenviar a mensagem sem confirmar os aparelhos, se preferir.↵ 
-\n↵ 
+    <string name="unknown_devices_alert_message">Esta sala contém sessões desconhecidas que não foram confirmadas.
+\nIsso significa que não há garantia de que estas sessões realmente pertencem aos usuários identificados.
+\nRecomendamos que você faça o processo de confirmação para cada sessão desconhecida antes de continuar, mas você pode reenviar a mensagem sem confirmar os aparelhos, se preferir.
+\n
 \nSessões desconhecidas nesta sala:</string>
 
     <!-- directory activity  -->
@@ -685,7 +687,7 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="settings_always_show_timestamps">Mostrar a hora para todas as mensagens</string>
     <string name="settings_data_save_mode">Modo de economia de dados</string>
 
-    <string name="settings_user_interface">Interface de usuária(o)</string>
+    <string name="settings_user_interface">Aparência</string>
     <string name="settings_interface_language">Idioma</string>
     <string name="settings_select_language">Escolha o idioma</string>
 
@@ -747,7 +749,7 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
 
     <string name="settings_notification_ringtone">Som de notificação</string>
     <string name="settings_containing_my_display_name">Mensagens que contenham o meu nome e sobrenome</string>
-    <string name="settings_containing_my_user_name">Mensagens que contenham o meu nome de usuária(o)</string>
+    <string name="settings_containing_my_user_name">Mensagens que contenham o meu nome de usuário</string>
     <string name="settings_inline_url_preview">Visualização prévia do endereço</string>
     <string name="settings_12_24_timestamps">Mostrar a hora no formato de 12 horas</string>
     <string name="settings_vibrate_on_mention">Vibrar ao mencionar um usuário</string>
@@ -818,7 +820,7 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="rooms">Salas</string>
     <string name="joined">Entrou</string>
     <string name="invited">em que foi convidada/o</string>
-    <string name="filter_group_members">Filtrar integrantes da comunidade</string>
+    <string name="filter_group_members">Pesquisar participantes da comunidade</string>
     <string name="filter_group_rooms">Filtrar salas da comunidade</string>
 
     <string name="group_no_long_description">O(A) administrador(a) desta comunidade não definiu uma descrição longa da mesma.</string>
@@ -832,12 +834,12 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="open_chat_header">Abrir cabeçalho</string>
     <string name="room_sync_in_progress">Sincronizando…</string>
     <plurals name="room_header_active_members_count">
-        <item quantity="one">%d membro ativo</item>
-        <item quantity="other">%d membros ativos</item>
+        <item quantity="one">%d participante ativo</item>
+        <item quantity="other">%d participantes ativos</item>
     </plurals>
     <plurals name="room_title_members">
-        <item quantity="one">%d membro</item>
-        <item quantity="other">%d membros</item>
+        <item quantity="one">%d participante</item>
+        <item quantity="other">%d participantes</item>
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d nova mensagem</item>
@@ -857,7 +859,7 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
         <item quantity="other">%d alterações na filiação</item>
     </plurals>
 
-    <string name="list_members">Lista de integrantes</string>
+    <string name="list_members">Lista de participantes</string>
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d mensagem notificada não lida</item>
         <item quantity="other">%d mensagens notificadas não lidas</item>
@@ -987,7 +989,7 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="command_description_topic">Define a descrição da sala</string>
     <string name="command_description_kick_user">Remove o usuário com o ID fornecido</string>
     <string name="command_description_nick">Altera o seu nome e sobrenome</string>
-    <string name="command_description_markdown">Ativar/Desativar o Markdown</string>
+    <string name="command_description_markdown">Ativar/Desativar a formatação de texto</string>
     <string name="command_description_clear_scalar_token">Reparar a gestão de aplicativos Matrix</string>
 
     <plurals name="group_members">
@@ -1008,7 +1010,7 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
 \nDesativar sua conta <b>não faz com que, por padrão, suas mensagens enviadas sejam apagadas</b>. Se você deseja que suas mensagens também sejam apagadas, marque a opção abaixo.↵
 \n↵
 \nA visibilidade de mensagens na Matrix é semelhante a um e-mail. O fato de apagarmos suas mensagens significa que suas mensagens enviadas não serão compartilhadas com nenhum usuário novo ou ainda não registrado, mas os usuários registrados que já tiveram acesso a essas mensagens ainda terão acesso uma cópia delas.</string>
-    <string name="deactivate_account_delete_checkbox">Quando minha conta for desativada, exclua todas as mensagens que eu enviei (Atenção: isso fará com que futuros usuários tenham uma visão incompleta das conversas)</string>
+    <string name="deactivate_account_delete_checkbox">Quando minha conta for desativada, apague todas as mensagens que eu enviei (Atenção: isso fará com que futuros usuários tenham uma visão incompleta das conversas)</string>
     <string name="deactivate_account_prompt_password">Para continuar, entre com sua senha:</string>
     <string name="deactivate_account_submit">Desativar minha conta</string>
 
@@ -1049,46 +1051,46 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="reason_hint">Motivo</string>
 
     <string name="room_sliding_menu_version_x">Versão %s</string>
-    <string name="settings_notification_troubleshoot">Notificações de Resolução de Problemas</string>
-    <string name="settings_troubleshoot_diagnostic">Diagnóstico de Resolução de Problemas</string>
+    <string name="settings_notification_troubleshoot">Resolver problemas nas notificações</string>
+    <string name="settings_troubleshoot_diagnostic">Diagnóstico de resolução de problemas</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Executar Testes</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Executando… (%1$d of %2$d)</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">Diagnóstico básico está ok. Se você ainda não recebe notificações, por favor relate um erro para nos ajudar a investigar.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">O diagnóstico básico está ok. Se você ainda não recebe notificações, por favor relate um erro para nos ajudar a investigar.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Um ou mais testes falharam, tente as correções sugeridas.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Um ou mais testes falharam, por favor relate um erro para nos ajudar a investigar.</string>
 
-    <string name="settings_troubleshoot_test_system_settings_title">Configurações do sistema.</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Configurações do sistema</string>
     <string name="settings_troubleshoot_test_system_settings_success">Notificações estão ativadas nas configurações do sistema.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Notificações estão desativadas nas configurações do sistema. Por favor, revise as configurações do sistema.</string>
     <string name="open_settings">Abra as Configurações</string>
 
-    <string name="settings_troubleshoot_test_account_settings_title">Configurações da Conta.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">Configurações da conta</string>
     <string name="settings_troubleshoot_test_account_settings_success">Notificações estão ativadas para sua conta.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Notificações estão desativadas para sua conta.↵
 \nPor favor, revise as configurações da conta.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Ativar</string>
 
-    <string name="settings_troubleshoot_test_device_settings_title">Configurações da sessão.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">Configurações da sessão</string>
     <string name="settings_troubleshoot_test_device_settings_success">Notificações estão ativadas nesta sessão.</string>
     <string name="room_participants_action_kick">Remover da sala</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Notificações não estão ativadas nesta sessão.↵
 \nPor favor, revise as configurações do Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Ativar</string>
 
-    <string name="settings_troubleshoot_test_play_services_title">Revisão do Play Services</string>
+    <string name="settings_troubleshoot_test_play_services_title">Versão do Google Play Services</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK está disponível e atualizado.</string>
     <string name="settings_troubleshoot_test_play_services_failed">Element usa Google Play Services para entregar mensagens push, mas isto não parece está configurado corretamente:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Consertar Play Services</string>
 
-    <string name="settings_troubleshoot_test_fcm_title">Token Firebase</string>
+    <string name="settings_troubleshoot_test_fcm_title">Token do Firebase</string>
     <string name="settings_troubleshoot_test_fcm_success">Token FCM recuperado com sucesso:
 %1$s</string>
     <string name="call_anyway">Ligar mesmo assim</string>
     <string name="settings_troubleshoot_test_fcm_failed">Falha ao recuperar o token do FCM:
 %1$s</string>
 
-    <string name="settings_troubleshoot_test_token_registration_title">Registro de Token</string>
+    <string name="settings_troubleshoot_test_token_registration_title">Registro do token do Firebase</string>
     <string name="settings_troubleshoot_test_token_registration_success">Token FCM registrado com sucesso no HomeServer.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">Falha ao registrar o token FCM no HomeServer:
 %1$s</string>
@@ -1118,8 +1120,8 @@ Tente reiniciar a aplicação.</string>
     <string name="settings_inline_url_preview_summary">Prévia de links dentro do chat quando seu homeserver suporta este recurso.</string>
     <string name="settings_send_typing_notifs">Permitir que saibam quando eu estiver digitando</string>
     <string name="settings_send_typing_notifs_summary">Deixe outros usuários saberem quando você estiver digitando.</string>
-    <string name="settings_show_read_receipts">Mostrar confirmações de leitura</string>
-    <string name="settings_show_read_receipts_summary">Clique nas notificações de leitura para uma lista detalhada.</string>
+    <string name="settings_show_read_receipts">Mostrar confirmações de leitura dos outros usuários</string>
+    <string name="settings_show_read_receipts_summary">Clique nas confirmações de leitura para obter mais informações.</string>
     <string name="settings_show_join_leave_messages">Mostrar eventos de entrada e saída de sala</string>
     <string name="settings_show_join_leave_messages_summary">Convites, remoções e banimentos não são afetados.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Mostrar eventos da conta</string>
@@ -1132,8 +1134,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_troubleshoot_test_bg_restricted_failed">Restrições em segundo plano estão ativadas para o Element.↵
 \nO aplicativo funciona bastante restringido enquanto está em segundo plano, o que pode afetar as notificações.↵
 \n%1$s</string>
-    <string name="settings_send_markdown">Formatação Markdown</string>
-    <string name="settings_send_markdown_summary">Fomatar mensagens usando a sintaxe markdown antes delas serem enviadas. Isto permite uma formatação avançada como usar asteriscos para mostrar texto em itálico.</string>
+    <string name="settings_send_markdown">Formatação de texto</string>
+    <string name="settings_send_markdown_summary">Formatar o texto das mensagens a serem enviadas. Por exemplo: inserir asteriscos antes e depois do texto, mostrará o texto em itálico.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Conceder permissão</string>
 
     <string name="account_email_error">Ocorreu um erro ao confirmar seu endereço de e-mail.</string>
@@ -1143,14 +1145,14 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="account_additional_info">Informação adicional: %s</string>
 
     <string name="settings_labs_native_camera_summary">Inicie a câmera do sistema em vez da câmera personalizada.</string>
-    <string name="settings_labs_enable_send_voice_summary">Esta opção requer um aplicativo de terceiros para gravar as mensagens.</string>
+    <string name="settings_labs_enable_send_voice_summary">Esta opção requer um aplicativo de terceiros para gravar mensagens de voz.</string>
 
     <string name="command_problem_with_parameters">O comando \"%s\" precisa de mais parâmetros ou alguns parâmetros estão incorretos.</string>
-    <string name="markdown_has_been_enabled">Markdown foi ativado.</string>
-    <string name="markdown_has_been_disabled">Markdown foi desativado.</string>
+    <string name="markdown_has_been_enabled">A formatação de texto foi ativada.</string>
+    <string name="markdown_has_been_disabled">A formatação de texto foi desativada.</string>
 
-    <string name="settings_lazy_loading_description">Aumente o desempenho apenas carregando os membros da sala na primeira exibição.</string>
-    <string name="error_lazy_loading_not_supported_by_home_server">Seu homeserver não suporta o carregamento Lazy de membros da sala ainda. Tente depois.</string>
+    <string name="settings_lazy_loading_description">Aumente o desempenho apenas carregando os participantes da sala na primeira exibição.</string>
+    <string name="error_lazy_loading_not_supported_by_home_server">Seu servidor principal ainda não suporta o carregamento Lazy de participantes da sala. Tente depois.</string>
 
     <string name="unknown_error">Desculpe, ocorreu um erro</string>
 
@@ -1171,7 +1173,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_troubleshoot_test_battery_failed">Se um usuário deixar um aparelho desconectado por um período de tempo, com a tela desligada, o aparelho entrará no modo Soneca. Isso impede que os aplicativos acessem a rede, adiando seus trabalhos, sincronizações e alarmes padrão.</string>
     <string name="passphrase_create_passphrase">Criar frase secreta</string>
     <string name="passphrase_passphrase_does_not_match">A frase secreta está errada</string>
-    <string name="settings_lazy_loading_title">Carregamento Lazy dos membros das salas</string>
+    <string name="settings_lazy_loading_title">Carregamento Lazy dos participantes das salas</string>
 
     <string name="video_call_in_progress">Chamada de vídeo em andamento…</string>
 
@@ -1197,10 +1199,10 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="abort">Abortar</string>
 
     <string name="action_sign_out_confirmation_simple">Deseja mesmo sair\?</string>
-    <string name="settings_notification_advanced">Configurações avançadas de notificações</string>
-    <string name="settings_notification_by_event">Importância da notificação por evento</string>
+    <string name="settings_notification_advanced">Configurar notificações</string>
+    <string name="settings_notification_by_event">Configurar notificações por evento</string>
 
-    <string name="settings_troubleshoot_test_bing_settings_title">Configurações personalizadas.</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">Configurações personalizadas</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Observe que alguns tipos de mensagens estão configurados para serem silenciosos (produzirão uma notificação sem som).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Algumas notificações estão desativadas nas suas configurações personalizadas.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Falha ao carregar regras personalizadas, tente novamente.</string>
@@ -1251,8 +1253,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="dialog_title_success">Pronto</string>
 
     <string name="bottom_action_notification">Notificações</string>
-    <string name="call_failed_no_ice_description">Peça ao administrador do seu servidor principal (%1$s) que configure um servidor TURN para que as chamadas funcionem de maneira confiável.↵
-\n↵
+    <string name="call_failed_no_ice_description">Peça ao administrador do seu servidor principal (%1$s) que configure um servidor TURN para que as chamadas funcionem de maneira confiável.
+\n
 \nAlternativamente, você pode tentar usar o servidor público em %2$s. No entanto, ele não é tão confiável e compartilhará o seu IP com esse servidor. Você também pode configurar isso nas Configurações.</string>
     <string name="call_failed_no_ice_use_alt">Tente usar %s</string>
     <string name="call_failed_dont_ask_again">Não pergunte novamente</string>
@@ -1285,7 +1287,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="active_call_with_duration">Chamada em andamento (%s)</string>
     <string name="return_to_call">Retornar à chamada</string>
 
-    <string name="invite_no_identity_server_error">Adicionar um servidor de identidade nas suas configurações para executar esta ação.</string>
+    <string name="invite_no_identity_server_error">Adicione um servidor de identidade nas suas configurações para executar esta ação.</string>
     <string name="room_participants_action_cancel_invite">Cancelar convite</string>
     <string name="room_participants_power_level_demote_warning_title">Reduzir privilégios\?</string>
     <string name="room_participants_power_level_demote_warning_prompt">Você não poderá desfazer essa alteração, já que está reduzido seus privilégios. Se você for a última pessoa nesta sala, será impossível recuperar a permissão atual.</string>
@@ -1293,8 +1295,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
 
     <string name="room_participants_action_ignore_title">Bloquear usuário</string>
-    <string name="room_participants_action_ignore_prompt_msg">Ao bloquear este usuário, as mensagens dele serão ocultadas de você em todas as salas.↵
-\n↵
+    <string name="room_participants_action_ignore_prompt_msg">Ao bloquear este usuário, as mensagens dele serão ocultadas de você em todas as salas.
+\n
 \nVocê pode reverter esta ação a qualquer momento nas configurações.</string>
     <string name="room_participants_action_unignore_title">Desbloquear usuário</string>
     <string name="room_participants_action_unignore_prompt_msg">Desbloquear este usuário mostrará todas as mensagens dele novamente.</string>
@@ -1302,8 +1304,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_participants_action_cancel_invite_prompt_msg">Tem certeza que quer cancelar o convite para este usuário\?</string>
     <string name="room_participants_kick_title">Remover usuário</string>
     <string name="room_participants_kick_reason">Motivo da remoção</string>
-    <string name="room_participants_kick_prompt_msg">esta ação removerá o usuário desta sala.↵ 
-\n↵ 
+    <string name="room_participants_kick_prompt_msg">esta ação removerá o usuário desta sala.
+\n
 \nPara impedir que o usuário nunca mais entre novamente, você precisará bani-lo.</string>
     <string name="room_participants_ban_title">Banir usuário</string>
     <string name="room_participants_ban_reason">Motivo do banimento</string>
@@ -1332,9 +1334,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_set_workmanager_delay_summary">%s↵
 \nA sincronização pode ser adiada dependendo dos recursos (bateria) ou do estado do aparelho (modo de suspensão).</string>
     <string name="settings_integrations">Integrações</string>
-    <string name="settings_integrations_summary">Use o Gerenciador de Integrações para gerenciar bots, pontes, widgets e pacotes de figurinhas.↵
-\n
-\nO Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de privilégios em seu nome.</string>
+    <string name="settings_integrations_summary">Use o Gerenciador de Integrações para gerenciar bots, pontes, widgets e pacotes de figurinhas.
+\nO Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.</string>
     <string name="settings_send_message_with_enter_summary">Botão enter do teclado enviará a mensagem em vez de adicionar uma quebra de linha</string>
 
     <string name="settings_secure_backup_section_title">Backup Seguro</string>
@@ -1561,8 +1562,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="keys_backup_settings_delete_confirm_message">Excluir as chaves de criptografia do servidor\? Você não será mais capaz de usar a sua chave de recuperação para ler o histórico de mensagens criptografadas.</string>
 
     <string name="new_recovery_method_popup_title">Novo Backup da Chave</string>
-    <string name="new_recovery_method_popup_description">Foi detectado um novo backup da chave de mensagem.↵
-\n↵
+    <string name="new_recovery_method_popup_description">Foi detectado um novo backup da chave de mensagem.
+\n
 \nSe você não definiu o novo método de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina um novo método de recuperação imediatamente nas Configurações.</string>
     <string name="new_recovery_method_popup_was_me">Foi eu</string>
 
@@ -1639,12 +1640,12 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="sas_error_m_mismatched_commitment">O compromisso de hash não coincidiu</string>
     <string name="sas_error_m_mismatched_sas">O SAS não corresponde</string>
     <string name="sas_error_m_unexpected_message">A sessão recebeu uma mensagem inesperada</string>
-    <string name="sas_error_m_invalid_message">Foi recebida uma mensagem inválida</string>
+    <string name="sas_error_m_invalid_message">Uma mensagem inválida foi recebida</string>
     <string name="sas_error_m_key_mismatch">Chave incorreta</string>
     <string name="sas_error_m_user_error">Contato não corresponde</string>
     <string name="sas_error_unknown">Erro Desconhecido</string>
 
-    <string name="identity_server_not_defined">Você não está usando nenhum Servidor de Identidade</string>
+    <string name="identity_server_not_defined">Você não está usando algum servidor de identidade</string>
     <string name="identity_server_not_defined_for_password_reset">Nenhum servidor de identidade está configurado. É necessário usar um para redefinir sua senha.</string>
 
     <string name="error_user_already_logged_in">Parece que você está tentando se conectar com outro servidor local. Deseja sair\?</string>
@@ -1673,10 +1674,10 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="message_view_reaction">Veja as reações</string>
     <string name="reactions">Reações</string>
 
-    <string name="event_redacted">Mensagens excluídas</string>
-    <string name="settings_show_redacted">Mostrar mensagens excluídas</string>
-    <string name="settings_show_redacted_summary">Mostrar um espaço reservado para mensagens excluídas</string>
-    <string name="event_redacted_by_user_reason">Evento excluído pelo usuário</string>
+    <string name="event_redacted">Mensagem apagada</string>
+    <string name="settings_show_redacted">Mostrar mensagens apagadas</string>
+    <string name="settings_show_redacted_summary">Mostrar um espaço reservado para mensagens apagadas</string>
+    <string name="event_redacted_by_user_reason">Evento apagado pelo usuário</string>
     <string name="event_redacted_by_admin_reason">Evento moderado pelo administrador da sala</string>
     <string name="last_edited_info_message">Última edição por %1$s em %2$s</string>
 
@@ -1708,8 +1709,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="import_e2e_keys_from_file">Importar as chaves de arquivo \"%1$s\".</string>
 
-    <string name="settings_sdk_version">Versão SDK de Matrix</string>
-    <string name="settings_other_third_party_notices">Outros avisos de terceiros</string>
+    <string name="settings_sdk_version">Versão do SDK da Matrix</string>
+    <string name="settings_other_third_party_notices">Outras licenças de terceiros</string>
     <string name="navigate_to_room_when_already_in_the_room">Você já está vendo esta sala!</string>
 
     <string name="quick_reactions">Reações rápidas</string>
@@ -1722,7 +1723,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_push_rules_no_rules">Nenhuma regra Push definida</string>
     <string name="settings_push_gateway_no_pushers">Nenhuma entrada Push registrada</string>
 
-    <string name="push_gateway_item_app_id">id_do_app:</string>
+    <string name="push_gateway_item_app_id">app_id:</string>
     <string name="push_gateway_item_push_key">chave_push:</string>
     <string name="push_gateway_item_app_display_name">nome_da_ tela_ do_app:</string>
     <string name="push_gateway_item_device_name">nome_da_sessão:</string>
@@ -1741,7 +1742,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="send_suggestion_sent">Obrigado, a sugestão foi enviada com êxito</string>
     <string name="send_suggestion_failed">A sugestão não foi enviada (%s)</string>
 
-    <string name="settings_labs_show_hidden_events_in_timeline">Mostrar eventos ocultos na linha do tempo</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">Mostrar eventos ocultos nas conversas</string>
 
     <string name="bottom_action_people_x">Conversas</string>
 
@@ -1768,7 +1769,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_directory_search_hint">Nome ou ID (#example:matrix.org)</string>
 
     <string name="labs_swipe_to_reply_in_timeline">Ativar o recurso de deslizar para responder nas conversas</string>
-    <string name="labs_merge_e2e_in_timeline">Merge não conseguiu decifrar a mensagem na linha do tempo</string>
+    <string name="labs_merge_e2e_in_timeline">Alertar apenas uma vez em uma conversa de que não é possível descriptografar as mensagens, em vez de alertar para cada mensagem</string>
     <string name="labs_show_unread_notifications_as_tab">Adicione uma aba dedicada para notificações não lidas na tela principal.</string>
 
     <string name="link_copied_to_clipboard">Link copiado para a memória</string>
@@ -1794,7 +1795,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="identity_server">Servidor de identidade</string>
     <string name="disconnect_identity_server">Desconectar servidor de identidade</string>
     <string name="add_identity_server">Configurar servidor de identidade</string>
-    <string name="change_identity_server">Alterar o servidor de identidade</string>
+    <string name="change_identity_server">Alterar servidor de identidade</string>
     <string name="settings_discovery_identity_server_info">Atualmente você está usando %1$s para descobrir e ser descoberto pelos contatos existentes.</string>
     <string name="settings_discovery_identity_server_info_none">No momento, você não está usando um servidor de identidade. Para descobrir e ser descoberto pelos contatos existentes, adicione um abaixo.</string>
     <string name="settings_discovery_emails_title">Endereços de e-mail detectáveis</string>
@@ -1817,7 +1818,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_discovery_disconnect_with_bound_pid">Atualmente, você está compartilhando endereços de e-mail ou números de telefone no servidor de identidade %1$s. Você precisará reconectar-se a %2$s para parar de compartilhá-los.</string>
     <string name="settings_agree_to_terms">Concorde com os Termos de Serviço do servidor de identidade (%s), para que você possa ser descoberto por endereço de e-mail ou por número de telefone.</string>
 
-    <string name="labs_allow_extended_logging">Ativar registros detalhados.</string>
+    <string name="labs_allow_extended_logging">Ativar registros detalhados</string>
     <string name="labs_allow_extended_logging_summary">Os registros detalhados ajudarão os desenvolvedores, ao fornecerem mais registros quando você usar sacudir o aparelho. Mesmo quando ativado, o aplicativo não registra o conteúdo da mensagem ou qualquer outro dado privado.</string>
 
 
@@ -1857,10 +1858,10 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="error_handling_incoming_share">Não conseguia lidar com dados compartilhados</string>
 
     <string name="uploads_media_title">MÍDIA</string>
-    <string name="uploads_media_no_result">Não há mídia nesta sala</string>
+    <string name="uploads_media_no_result">Nenhuma mídia nesta sala</string>
     <string name="uploads_files_title">ARQUIVOS</string>
     <string name="uploads_files_subtitle">%1$s em %2$s</string>
-    <string name="uploads_files_no_result">Não há arquivos nesta sala</string>
+    <string name="uploads_files_no_result">Nenhum arquivo nesta sala</string>
 
     <string name="report_content_spam">É spam</string>
     <string name="report_content_inappropriate">É inapropriado</string>
@@ -1887,9 +1888,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \n↵
 \nPermita o acesso na próxima janela para poder exportar suas chaves manualmente.</string>
 
-    <string name="no_network_indicator">Não há conexão de rede neste momento</string>
+    <string name="no_network_indicator">Não há conexão de rede no momento</string>
 
-    <string name="message_ignore_user">Bloqueia usuário</string>
+    <string name="message_ignore_user">Bloquear usuário</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">Todas as mensagens novas (com som)</string>
     <string name="room_list_quick_actions_notifications_all">Todas as mensagens novas</string>
@@ -1897,7 +1898,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_list_quick_actions_notifications_mute">Silenciar</string>
     <string name="room_list_quick_actions_settings">Configurações</string>
     <string name="room_list_quick_actions_favorite_add">Adicionar aos favoritos</string>
-    <string name="room_list_quick_actions_favorite_remove">Excluír dos favoritos</string>
+    <string name="room_list_quick_actions_favorite_remove">Remover dos favoritos</string>
     <string name="room_list_quick_actions_leave">Sair da sala</string>
     <string name="notice_member_no_changes">%1$s não fez nenhuma alteração</string>
     <string name="notice_member_no_changes_by_you">Você não fez nenhuma alteração</string>
@@ -1905,7 +1906,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="spoiler">Estraga-Surpresa</string>
     <string name="reaction_search_type_hint">Digite palavras-chave para encontrar uma reação.</string>
 
-    <string name="no_ignored_users">Você não está bloqueando nenhum usuário</string>
+    <string name="no_ignored_users">Nenhum usuário bloqueado</string>
 
     <string name="help_long_click_on_room_for_more_options">Clique longo sobre uma sala para ver mais opções</string>
 
@@ -1928,7 +1929,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <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_other_title">Outros</string>
-    <string name="login_server_other_text">Configurações personalizadas</string>
+    <string name="login_server_other_text">Configurações avançadas e preferências</string>
 
     <string name="login_continue">Continuar</string>
     <string name="login_connect_to">Conecte-se a %1$s</string>
@@ -1961,7 +1962,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="login_reset_password_notice">Um e-mail de confirmação será enviado para sua caixa de entrada, para você confirmar a definição de sua nova senha.</string>
     <string name="login_reset_password_submit">Próximo</string>
     <string name="login_reset_password_email_hint">E-mail</string>
-    <string name="login_reset_password_password_hint">Senha nova</string>
+    <string name="login_reset_password_password_hint">Nova senha</string>
 
     <string name="login_reset_password_warning_title">Atenção!</string>
     <string name="login_reset_password_warning_content">Alterar a sua senha redefinirá todas as chaves de criptografia de ponta a ponta existentes em todas as suas sessões, tornando o histórico de mensagens criptografadas ilegível. Faça uma cópia (backup) das suas chaves, ou exporte as chaves de outra sessão antes de alterar a sua senha.</string>
@@ -2048,12 +2049,12 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="seen_by">Lida por</string>
 
     <string name="signed_out_title">Você está desconectada/o</string>
-    <string name="signed_out_notice">Isso pode ser devido à vários motivos:↵
-\n↵
-\n• Você alterou sua senha em outra sessão.↵
-\n↵
-\n• Você excluiu esta sessão de outra sessão.↵
-\n↵
+    <string name="signed_out_notice">Isso pode ser devido à vários motivos:
+\n
+\n• Você alterou sua senha em outra sessão.
+\n
+\n• Você excluiu esta sessão de outra sessão.
+\n
 \n• O administrador do seu servidor invalidou seu acesso por motivos de segurança.</string>
     <string name="signed_out_submit">Entrar novamente</string>
 
@@ -2086,7 +2087,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_show_devices_list">Veja todas as minhas sessões</string>
     <string name="settings_advanced_settings">Configurações avançadas</string>
     <string name="settings_developer_mode">Modo desenvolvedor</string>
-    <string name="settings_developer_mode_summary">O modo desenvolvedor ativa características ocultas e pode também tornar o aplicativo menos estável. Somente para desenvolvedores!</string>
+    <string name="settings_developer_mode_summary">O modo de desenvolvedor permite ativar recursos ocultos, o que pode tornar o aplicativo menos estável. Somente para desenvolvedores!</string>
     <string name="settings_rageshake">Agitar celular</string>
     <string name="settings_rageshake_detection_threshold">Detectar patamar</string>
     <string name="settings_rageshake_detection_threshold_summary">Agite seu telefone para testar o limiar de detecção</string>
@@ -2098,7 +2099,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="autocomplete_limited_results">Mostrando apenas os primeiros resultados, digite mais letras…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Relatar imediatamente as falhas</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element pode quebrar com mais freqüência quando ocorre um erro inesperado</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element poderá quebrar com mais frequência quando ocorrer um erro inesperado</string>
 
     <string name="command_description_shrug">Adicionar ¯\\_(ツ)_/¯ para uma mensagem de texto simples</string>
 
@@ -2159,9 +2160,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \n↵ 
 \nPara máxima segurança, faça isso pessoalmente.</string>
     <string name="room_profile_not_encrypted_subtitle">As mensagens nesta sala não estão criptografadas de ponta a ponta.</string>
-    <string name="room_profile_encrypted_subtitle">As mensagens nesta sala são criptografadas de ponta a ponta.↵
-\n↵
-\nSuas mensagens são protegidas com cadeados e somente você e o destinatário têm as chaves exclusivas que permitam a sua leitura.</string>
+    <string name="room_profile_encrypted_subtitle">As mensagens nesta sala estão criptografadas de ponta a ponta.
+\n
+\nSuas mensagens estão protegidas com cadeados e somente você e o destinatário têm as chaves exclusivas que permitem a leitura delas.</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_more">Mais</string>
@@ -2172,8 +2173,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
         <item quantity="one">Uma pessoa</item>
         <item quantity="other">%1$d pessoas</item>
     </plurals>
-    <string name="room_profile_section_more_uploads">Subidas</string>
-    <string name="room_profile_section_more_leave">Deixar a sala</string>
+    <string name="room_profile_section_more_uploads">Mídia e arquivos</string>
+    <string name="room_profile_section_more_leave">Sair da sala</string>
     <string name="room_profile_leaving_room">Deixando a sala…</string>
 
     <string name="room_member_power_level_admins">Administradores</string>
@@ -2204,9 +2205,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="command_description_rainbow">Envia a mensagem colorida como arco-íris</string>
     <string name="command_description_rainbow_emote">Envia o emoji colorido como um arco-íris</string>
 
-    <string name="settings_category_timeline">Linha do Tempo</string>
+    <string name="settings_category_timeline">Conversas</string>
 
-    <string name="settings_category_composer">Editor de mensagens</string>
+    <string name="settings_category_composer">Campo de texto</string>
 
     <string name="room_settings_enable_encryption">Ativar a criptografia de ponta a ponta</string>
     <string name="room_settings_enable_encryption_warning">Uma vez ativada, a criptografia não poderá ser desativada.</string>
@@ -2224,12 +2225,12 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="verification_conclusion_ok_self_notice">Sua nova sessão agora está confirmada. Ela tem acesso às suas mensagens criptografadas, e outros usuários a verão como confirmada.</string>
 
     <string name="encryption_information_cross_signing_state">Autoverificação</string>
-    <string name="encryption_information_dg_xsigning_complete">A autoverificação está ativada↵
+    <string name="encryption_information_dg_xsigning_complete">A autoverificação está ativada
 \nChaves privadas estão no aparelho.</string>
-    <string name="encryption_information_dg_xsigning_trusted">A autoverificação está ativada↵
-\nAs chaves são confiáveis.↵
+    <string name="encryption_information_dg_xsigning_trusted">A autoverificação está ativada
+\nAs chaves são confiáveis.
 \nAs chaves privadas não são conhecidas</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">A autoverificação está ativada.↵
+    <string name="encryption_information_dg_xsigning_not_trusted">A autoverificação está ativada.
 \nAs chaves não são confiáveis</string>
     <string name="encryption_information_dg_xsigning_disabled">A autoverificação não está ativada</string>
 
@@ -2304,11 +2305,11 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="enter_secret_storage_passphrase_warning">Atenção:</string>
     <string name="enter_secret_storage_passphrase_warning_text">Você só deveria entrar no armazenamento secreto a partir de um aparelho confiável</string>
 
-    <string name="message_action_item_redact">Excluír…</string>
+    <string name="message_action_item_redact">Apagar</string>
     <string name="share_confirm_room">Deseja enviar este anexo para %1$s\?</string>
     <plurals name="send_images_with_original_size">
-        <item quantity="one">Enviar imagem do tamanho original</item>
-        <item quantity="other">Enviar imagens do tamanho original</item>
+        <item quantity="one">Enviar imagem no tamanho original</item>
+        <item quantity="other">Enviar imagens no tamanho original</item>
     </plurals>
 
     <string name="delete_event_dialog_title">Confirmar a exclusão</string>
@@ -2316,7 +2317,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="delete_event_dialog_reason_checkbox">Incluir o motivo</string>
     <string name="delete_event_dialog_reason_hint">Motivo da edição</string>
 
-    <string name="event_redacted_by_user_reason_with_reason">Evento excluído pelo usuário, motivo: %1$s</string>
+    <string name="event_redacted_by_user_reason_with_reason">Evento apagado pelo usuário, motivo: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Evento moderado pelo administrador da sala, motivo: %1$s</string>
 
     <string name="keys_backup_restore_success_title_already_up_to_date">As chaves já estão atualizadas!</string>
@@ -2402,7 +2403,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="settings_notification_configuration">Configuração de notificações</string>
     <string name="settings_troubleshoot_title">Solução de problemas</string>
-    <string name="room_message_placeholder">Mensagem…</string>
+    <string name="room_message_placeholder">Digite uma mensagem…</string>
 
     <string name="use_file">Use Arquivo</string>
 
@@ -2411,7 +2412,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="bootstrap_progress_checking_backup">Verificando a chave de backup</string>
     <string name="bootstrap_skip_text">Criando uma Frase Secreta de Recuperação permite proteger e desbloquear mensagens criptografadas e estabelecer confiança.
 \n
-\n
 \nSe você não quiser definir uma Senha de Mensagem, crie antes uma Chave de Mensagem.</string>
     <string name="bootstrap_skip_text_no_gen_key">Criar uma Frase Secreta de Recuperação permite proteger e desbloquear mensagens criptografadas e estabelecer confiança.</string>
     <string name="bootstrap_cancel_text">Se você cancelar agora, poderá perder mensagens e dados criptografados para sempre se esquecer seus credenciais.
@@ -2429,12 +2429,12 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="error_failed_to_import_keys">Falha na importação de chaves</string>
 
     <string name="settings_messages_at_room">Mensagens contendo @room</string>
-    <string name="settings_messages_in_e2e_one_to_one">Mensagens criptografadas em bate-papos individuais</string>
-    <string name="settings_messages_in_e2e_group_chat">Mensagens criptografadas em conversas em grupo</string>
-    <string name="settings_when_rooms_are_upgraded">Quando as salas são atualizadas</string>
-    <string name="settings_notification_advanced_summary">Definir a importância da notificação por evento</string>
+    <string name="settings_messages_in_e2e_one_to_one">Mensagens criptografadas em conversas individuais</string>
+    <string name="settings_messages_in_e2e_group_chat">Mensagens criptografadas em salas</string>
+    <string name="settings_when_rooms_are_upgraded">Quando a versão da sala é atualizada</string>
+    <string name="settings_notification_advanced_summary">Ajustar as notificações por evento</string>
 
-    <string name="command_description_plain">Envia uma mensagem como texto simples, sem interpretá-la como markdown</string>
+    <string name="command_description_plain">Envia uma mensagem como texto simples, sem formatar o texto</string>
 
     <string name="auth_invalid_login_param_space_in_password">Nome de usuário e/ou senha incorretos. A senha digitada começa ou termina com espaços, favor verificá-la.</string>
     <string name="auth_invalid_login_deactivated_account">Esta conta foi desativada.</string>
@@ -2460,7 +2460,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Não conheça sua Frase Secreta de Chave do Backup, você pode %s.</string>
     <string name="bootstrap_migration_backup_recovery_key">Chave de recuperação de Chave do Backup</string>
 
-    <string name="settings_security_prevent_screenshots_title">Impedir captura da tela do aplicativo</string>
+    <string name="settings_security_prevent_screenshots_title">Impedir a captura de tela do aplicativo</string>
     <string name="settings_security_prevent_screenshots_summary">Ativando esta opção acrescenta FLAG_SECURE a todas as atividades. Reinicie o aplicativo para que a alteração tenha efeito.</string>
 
     <string name="media_file_added_to_gallery">Arquivo de mídia adicionado à Galeria</string>
@@ -2504,7 +2504,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="create_room_dm_failure">Não foi possível criar sua DM. Por favor, verifique os usuários que você deseja convidar e tente novamente.</string>
 
-    <string name="add_members_to_room">Adicionar membros</string>
+    <string name="add_members_to_room">Adicionar participantes</string>
     <string name="invite_users_to_room_action_invite">CONVITE</string>
     <string name="inviting_users_to_room">Convidando os usuários…</string>
     <string name="invite_users_to_room_title">Convidar Usuários</string>
@@ -2521,7 +2521,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="choose_locale_loading_locales">Carregando os idiomas disponíveis…</string>
 
     <string name="open_terms_of">Abra termos de %s</string>
-    <string name="disconnect_identity_server_dialog_content">Desconectar do servidor de identidade %s\?</string>
+    <string name="disconnect_identity_server_dialog_content">Desconectar-se do servidor de identidade %s\?</string>
     <string name="identity_server_error_outdated_identity_server">Este servidor de identidade está desatualizado. Element suporta apenas API V2.</string>
     <string name="identity_server_error_outdated_home_server">Esta operação não é possível. O servidor doméstico está desatualizado.</string>
     <string name="identity_server_error_no_identity_server_configured">Por favor, primeiro configure um servidor de identidade.</string>
@@ -2534,7 +2534,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="identity_server_set_default_submit">Use %1$s</string>
     <string name="identity_server_set_alternative_notice">Como alternativa, você pode digitar o endereço de outro servidor de identidade</string>
     <string name="identity_server_set_alternative_notice_no_default">Digite o endereço de um servidor de identidade</string>
-    <string name="identity_server_set_alternative_submit">Submeter</string>
+    <string name="identity_server_set_alternative_submit">Enviar</string>
     <string name="power_level_edit_title">Definir o papel</string>
     <string name="power_level_title">Papel</string>
     <string name="a11y_open_chat">Bate-papo aberto</string>
@@ -2616,4 +2616,34 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="auth_pin_confirm_to_disable_title">Confirme o PIN para desativar o PIN</string>
     <string name="settings_call_show_confirmation_dialog_title">Evitar chamadas acidentais</string>
     <string name="settings_call_show_confirmation_dialog_summary">Confirmarei a intenção de iniciar uma chamada</string>
+    <string name="no_permissions_to_start_conf_call">Você não tem permissão para iniciar uma chamada em grupo nesta sala</string>
+    <string name="conference_call_in_progress">Uma chamada em grupo já está em andamento!</string>
+    <string name="video_meeting">Iniciar chamada de vídeo</string>
+    <string name="audio_meeting">Iniciar chamada de voz</string>
+    <string name="audio_video_meeting_description">As chamadas utilizam as políticas de segurança e permissão do Jitsi. Todas as pessoas que estão atualmente na sala verão um convite para participar enquanto sua chamada estiver acontecendo.</string>
+    <string name="cannot_call_yourself">Você não pode iniciar uma chamada com você mesmo</string>
+    <string name="cannot_call_yourself_with_invite">Você não pode iniciar uma chamada consigo mesmo. Aguarde os participantes aceitarem o convite</string>
+    <string name="failed_to_add_widget">Falha ao adicionar o widget</string>
+    <string name="failed_to_remove_widget">Falha ao remover o widget</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d chave importada com êxito.</item>
+        <item quantity="other">%1$d/%2$d chaves importadas com êxito.</item>
+    </plurals>
+
+    <string name="room_manage_integrations">Gerenciar integrações</string>
+    <string name="room_no_active_widgets">Nenhum widget ativo</string>
+    <string name="create_room_federation_error">A sala foi criada, mas alguns convites não foram enviados pelo seguinte motivo:
+\n
+\n%s</string>
+
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s e %3$d outro leu</item>
+        <item quantity="other">%1$s, %2$s e %3$d outros leram</item>
+    </plurals>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Código errado, %d tentativa restante</item>
+        <item quantity="other">Código errado, %d tentativas restantes</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Atenção! Última tentativa restante antes de você ser desconectada/o!</string>
+    <string name="too_many_pin_failures">Muitos erros, você foi desconectada/o</string>
 </resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 72291bdb04..42d96669cb 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -12,6 +12,10 @@
     <string name="title_activity_member_details">Информация о собеседнике</string>
     <string name="title_activity_historical">Исторические</string>
 
+    <string name="call_notification_answer">Принять</string>
+    <string name="call_notification_reject">Отклонить</string>
+    <string name="call_notification_hangup">Завершить звонок</string>
+
     <!-- button names -->
     <string name="ok">OK</string>
     <string name="cancel">Отмена</string>
@@ -611,7 +615,7 @@
     <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_id">ID сессии</string>
     <string name="encryption_information_device_key">Ключ сессии</string>
     <string name="encryption_information_verification">Проверка</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 отпечаток</string>
@@ -1592,7 +1596,7 @@
 
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Регистрационный токен</string>
 
-    <string name="send_suggestion">Сделайте предложение</string>
+    <string name="send_suggestion">Оставить отзыв</string>
     <string name="send_suggestion_content">Пожалуйста, напишите ваше предложение ниже.</string>
     <string name="send_suggestion_report_placeholder">Опишите ваше предложение здесь</string>
     <string name="send_suggestion_sent">Спасибо, предложение было успешно отправлено</string>
@@ -1774,7 +1778,7 @@
     <string name="attachment_type_audio">Звук</string>
     <string name="attachment_type_gallery">Галерея</string>
     <string name="report_content_spam">Это спам</string>
-    <string name="message_ignore_user">Заблокировать пользователя</string>
+    <string name="message_ignore_user">Игнорировать пользователя</string>
 
     <string name="room_list_quick_actions_notifications_all">Все сообщения</string>
     <string name="room_list_quick_actions_notifications_mentions">Только при упоминаниях</string>
@@ -1792,7 +1796,7 @@
     <string name="attachment_type_sticker">Стикер</string>
     <string name="report_content_custom_hint">Причина жалобы на контент</string>
     <string name="report_content_custom_submit">Пожаловаться</string>
-    <string name="block_user">Заблокировать пользователя</string>
+    <string name="block_user">ИГНОРИРОВАТЬ ПОЛЬЗОВАТЕЛЯ</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">Все сообщения (громко)</string>
     <string name="room_list_quick_actions_notifications_mute">Без звука</string>
@@ -2664,4 +2668,37 @@
     <string name="auth_pin_confirm_to_disable_title">Подтвердите PIN-код, чтобы отключить PIN-код</string>
     <string name="settings_call_show_confirmation_dialog_title">Предотвращение случайных звонков</string>
     <string name="settings_call_show_confirmation_dialog_summary">Спрашивать подтверждение перед звонком</string>
+    <string name="no_permissions_to_start_conf_call">У вас нет разрешения на запуск конференции в этой комнате</string>
+    <string name="conference_call_in_progress">Конференция уже идет!</string>
+    <string name="video_meeting">Начать видеовстречу</string>
+    <string name="audio_meeting">Начать аудиовстречу</string>
+    <string name="audio_video_meeting_description">На встречах используются политики безопасности и разрешения Jitsi. Все люди, находящиеся в данный момент в комнате, увидят приглашение присоединиться во время вашей встречи.</string>
+    <string name="cannot_call_yourself">Вы не можете позвонить самому себе</string>
+    <string name="cannot_call_yourself_with_invite">Вы не можете позвонить самому себе, дождитесь, пока участники примут приглашение</string>
+    <string name="failed_to_add_widget">Не удалось добавить виджет</string>
+    <string name="failed_to_remove_widget">Не удалось удалить виджет</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d ключ успешно импортирован.</item>
+        <item quantity="few">%1$d/%2$d ключа успешно импортированы.</item>
+        <item quantity="many">%1$d/%2$d ключей успешно импортировано.</item>
+    </plurals>
+
+    <string name="room_manage_integrations">Управление интеграциями</string>
+    <string name="room_no_active_widgets">Нет активных виджетов</string>
+    <string name="create_room_federation_error">Комната создана, но некоторые приглашения не отправлены по следующей причине:
+\n
+\n%s</string>
+
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s и %3$d читает</item>
+        <item quantity="few">%1$s, %2$s и %3$d других читают</item>
+        <item quantity="many">%1$s, %2$s и %3$d других читают</item>
+    </plurals>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Неверный код, осталась %d попытка</item>
+        <item quantity="few">Неверный код, осталось %d попытки</item>
+        <item quantity="many">Неверный код, осталось %d попыток</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Предупреждение! Последняя оставшаяся попытка перед выходом из системы!</string>
+    <string name="too_many_pin_failures">Слишком много ошибок, вы вышли из системы</string>
 </resources>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 13e05110d9..bbb398cbba 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -10,6 +10,10 @@
     <string name="notification_sync_in_progress">Prebieha synchronizácia…</string>
     <string name="notification_listening_for_events">Spracovanie udalostí</string>
 
+    <string name="call_notification_answer">Prijať</string>
+    <string name="call_notification_reject">Odmietnuť</string>
+    <string name="call_notification_hangup">Zavesiť</string>
+
     <string name="title_activity_home">Správy</string>
     <string name="title_activity_room">Miestnosť</string>
     <string name="title_activity_settings">Nastavenia</string>
@@ -591,7 +595,7 @@ Pozor! Vykonaním tejto akcie reštartujete aplikáciu a opätovné načítanie
     <string name="encryption_information_sender_device_information">Informácie o relácií odosielateľa</string>
     <string name="encryption_information_device_name">Verejné meno</string>
     <string name="encryption_information_name">Verejné meno</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="encryption_information_device_id">ID relácie</string>
     <string name="encryption_information_device_key">Kľúč relácie</string>
     <string name="encryption_information_verification">Overenie</string>
     <string name="encryption_information_ed25519_fingerprint">Odtlačok prsta Ed25519</string>
@@ -1251,4 +1255,562 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
     <string name="login_error_no_homeserver_found">Toto nie je platná adresa Matrix serveru</string>
     <string name="login_error_homeserver_not_found">Domovský server je nedostupný na tejto URL adrese, preverte to prosím</string>
     <string name="room_member_profile_sessions_section_title">Relácie</string>
+    <string name="play_video">Prehrať</string>
+    <string name="pause_video">Pozastaviť</string>
+    <string name="dismiss">Odmietnuť</string>
+
+
+    <string name="no_permissions_to_start_conf_call">Nemáte právo začať konferenčný hovor v tejto miestnosti</string>
+    <string name="conference_call_in_progress">Konferenčný hovor práve prebieha!</string>
+    <string name="video_meeting">Začať video schôdzu</string>
+    <string name="audio_meeting">Začať audio schôdzu</string>
+    <string name="audio_video_meeting_description">Pre schôdze platia bezpečnostné politiky Jitsi. Počas prebiehajúcej schôdze sa všetkým členom v miestnosti bude zobrazovať pozvanie s možnosťou pridať sa k schôdzi.</string>
+    <string name="cannot_call_yourself">Nemôžete telefonovať samému sebe</string>
+    <string name="cannot_call_yourself_with_invite">Nemôžete telefonovať samému sebe, počkajte, kým sa pridajú ďalší účastníci</string>
+    <string name="failed_to_add_widget">Nepodarilo sa pridať widget</string>
+    <string name="failed_to_remove_widget">Nepodarilo sa odstrániť widget</string>
+    <string name="action_copy">Kopírovať</string>
+    <string name="dialog_title_success">Úspešné</string>
+
+    <string name="bottom_action_notification">Oznámenia</string>
+    <string name="call_failed_no_connection">Element hovor zlyhal</string>
+    <string name="call_failed_no_connection_description">Nepodarilo sa uskutočniť spojenie v reálnom čase.
+\nProsím, požiadajte správcu domovského servera, aby správne nastavil server turn na zaistenie čo najspoľahlivejšej prevádzky hovorov.</string>
+
+    <string name="call_select_sound_device">Vybrať zvukové zariadenie</string>
+    <string name="sound_device_phone">Slúchadlo telefónu</string>
+    <string name="sound_device_speaker">Reproduktor</string>
+    <string name="sound_device_headset">Slúchadlá</string>
+    <string name="sound_device_wireless_headset">Bezdrôtové slúchadlá</string>
+    <string name="call_switch_camera">Prepnúť fotoaparát</string>
+    <string name="call_camera_front">Predný</string>
+    <string name="call_camera_back">Zadný</string>
+    <string name="call_format_turn_hd_off">Vypnúť HD</string>
+    <string name="call_format_turn_hd_on">Zapnúť HD</string>
+
+    <string name="login_error_ssl_peer_unverified">Chyba SSL: Nie je možné overiť totožnosť protistrany.</string>
+    <string name="login_error_ssl_other">Chyba SSL.</string>
+    <string name="settings_call_show_confirmation_dialog_title">Zabrániť neúmyselnému telefonovaniu</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Žiadať potvrdenie pred uskutočnením hovoru</string>
+    <string name="settings_call_ringtone_use_default_stun">Povoliť záložný server pre nadviazanie hovoru</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Ak váš domovský server neponúka adresu servera turn, na nadviazanie hovorov sa použije %s (počas hovoru zdieľate svoju adresu IP)</string>
+    <string name="active_call_with_duration">Prebiehajúci hovor (%s)</string>
+    <string name="return_to_call">Návrat k hovoru</string>
+
+    <string name="invite_no_identity_server_error">Na uskutočnenie tejto akcie si prosím v nastaveniach pridajte server totožností.</string>
+    <string name="room_participants_action_cancel_invite">Zrušiť pozvanie</string>
+    <string name="room_participants_power_level_demote_warning_title">Znížiť vlastnú úroveň moci\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">"Túto zmenu nebudete môcť vrátiť späť pretože  znižujete vašu vlastnú úroveň moci. Ak ste jediný poverený používateľ v miestnosti, nebudete môcť znovu získať úroveň, akú máte teraz."</string>
+    <string name="room_participants_power_level_demote">Znížiť</string>
+
+
+    <string name="room_participants_action_ignore_title">Ignorovať používateľa</string>
+    <string name="room_participants_action_ignore_prompt_msg">Ignorovaním tohoto používateľa odstránite všetky jeho správy vo vašich spoločných miestnostiach.
+\nZvrátiť túto akciu môžete kedykoľvek vo všeobecných nastaveniach.</string>
+    <string name="room_participants_action_unignore_title">Neignorovať používateľa</string>
+    <string name="room_participants_action_unignore_prompt_msg">Zrušením ignorovania si opäť zobrazíte všetky správy od tohoto používateľa.</string>
+    <string name="room_participants_action_cancel_invite_title">Zrušiť pozvanie</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Ste si istí, že chcete zrušiť pozvanie tohoto používateľa\?</string>
+    <string name="room_participants_kick_title">Vykázať používateľa</string>
+    <string name="room_participants_kick_reason">Dôvod vykázania</string>
+    <string name="room_participants_kick_prompt_msg">Vykázaním odstránite používateľa z miestnosti.
+\n
+\nAk si želáte, aby sa nemohol vrátiť, mali by ste mu tiež zakázať vstupovať.</string>
+    <string name="room_participants_ban_title">Zakázať používateľovi vstupovať</string>
+    <string name="room_participants_ban_reason">Dôvod zákazu vstupovať</string>
+    <string name="room_participants_unban_title">Povoliť používateľovi vstupovať</string>
+    <string name="room_participants_unban_prompt_msg">Povolením používateľovi vstupovať zaistíte, aby sa používateľ mohol vrátiť do miestnosti.</string>
+
+    <string name="settings_add_3pid_confirm_password_title">Potvrdiť vaše heslo</string>
+    <string name="settings_add_3pid_flow_not_supported">Toto nie je možné urobiť cez mobilnú aplikáciu Element</string>
+    <string name="settings_add_3pid_authentication_needed">Je požadované overenie</string>
+
+
+    <string name="settings_background_fdroid_sync_mode">Režim synchronizácie na pozadí (Experimentálne)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimalizovaný na využívanie batérie</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element sa bude synchronizovať na pozadí s cieľom ušetriť limitované zdroje (batériu).
+\nV závislosti od kapacity prostriedkov zariadenia môže byť synchronizácia odložená operačným systémom na neskôr.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimalizovaný na používanie v reálnom čase</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element sa bude pravideľne synchronizovať na pozadí v presne stanovenom čase (nastaviteľné).
+\nToto ovplyvní využívanie batérie a prenos údajov, v oznamovacej oblasti sa bude neustále zobrazovať upozornenie, že Element spracúva udalosti.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Žiadna synchronizácia na pozadí</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Nebudete dostávať oznámenia o prichádzajúcich správach, keď aplikácia pracuje na pozadí.</string>
+    <string name="settings_background_sync_update_error">Nepodarilo sa aktualizovať nastavenia.</string>
+
+
+    <string name="settings_set_workmanager_delay">Uprednostňovaný interval synchronizácie</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nSynchronizácia môže byť odložená vzávislosti od kapacity zariadenia (batéria a režim spánku).</string>
+    <string name="settings_integrations">Integrácie</string>
+    <string name="settings_integrations_summary">Použite správcu integrácií na nastavenie botov, mostov, widgetov a balíčkov s nálepkami.
+\nSprávci integrácií zbierajú údaje konfigurácie, môžu meniť widgety, posielať pozvania vstúpiť do miestnosti a nastavovať úroveň moci vo vašom mene.</string>
+    <string name="settings_secure_backup_section_title">Bezpečné zálohovanie</string>
+    <string name="settings_secure_backup_manage">Spravovať</string>
+    <string name="settings_secure_backup_setup">Nastaviť bezpečné zálohovanie</string>
+    <string name="settings_secure_backup_reset">Znovu nastaviť bezpečné zálohovanie</string>
+    <string name="settings_secure_backup_enter_to_setup">Nastaviť na tomto zariadení</string>
+    <string name="settings_secure_backup_section_info">Zabezpečte sa pred stratou šifrovaných správ a údajov zálohovaním šifrovacích kľúčov na domovskom servery.</string>
+    <string name="reset_secure_backup_title">Vygenerovať nový kľúč zabezpečenia alebo opätovne nastaviť dlhé heslo pre existujúce zálohovanie.</string>
+    <string name="reset_secure_backup_warning">Týmto nahradíte váš aktuálny kľúč alebo dlhé heslo.</string>
+
+    <string name="settings_discovery_category">Zisťovanie</string>
+    <string name="settings_discovery_manage">Spravovať nastavenia zisťovania.</string>
+    <string name="settings_integration_allow">Povoliť integrácie</string>
+    <string name="settings_integration_manager">Správca integrácií</string>
+
+    <string name="disabled_integration_dialog_title">Integrácie sú zakázané</string>
+    <string name="disabled_integration_dialog_content">Na vykonanie tejto akcie zaškrtnite \'Povoliť integrácie\' v nastaveniach zisťovania.</string>
+
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">Zakázať vstupovať %d používateľ</item>
+        <item quantity="few">Zakázať vstupovať %d používatelia</item>
+        <item quantity="other">Zakázať vstupovať %d používateľov</item>
+    </plurals>
+
+    <string name="encryption_information_device_name_with_warning">Verejný názov (viditeľný pre ľudí, s ktorými komunikujete)</string>
+    <string name="device_name_warning">Verejný názov relácie je viditeľný všetkým používateľom, s ktorými komunikujete</string>
+    <string name="encryption_exported_successfully">Kľúče exportované úspešne</string>
+
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d z %2$d kľúč úspešne importovaný.</item>
+        <item quantity="few">%1$d z %2$d kľúčov úspešne importovaných.</item>
+        <item quantity="other">%1$d z %2$d kľúčov úspešne importovaných.</item>
+    </plurals>
+
+    <string name="encryption_information_unknown_ip">neznáma ip</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+
+    <string name="active_widget_view_action">Zobraziť</string>
+    <string name="active_widgets_title">Aktívne widgety</string>
+
+
+    <string name="room_widget_activity_title">Widget</string>
+    <string name="room_widget_permission_title">Načítať Widget</string>
+    <string name="room_widget_permission_added_by">Tento widget pridal:</string>
+    <string name="room_widget_permission_webview_shared_info_title">Používaním prijímate cookies od a zdieľate údaje s %s:</string>
+    <string name="room_widget_permission_shared_info_title">Používaním zdieľate údaje s %s:</string>
+    <string name="room_widget_failed_to_load">Nepodarilo sa načítať widget.
+\n%s</string>
+    <string name="room_widget_reload">Znovu načítať widget</string>
+    <string name="room_widget_open_in_browser">Otvoriť v prehliadači</string>
+    <string name="room_widget_revoke_access">Odvolať prístup pre mňa</string>
+
+    <string name="room_widget_permission_display_name">Vaše zobrazované meno</string>
+    <string name="room_widget_permission_avatar_url">URL vášho obrázka v profile</string>
+    <string name="room_widget_permission_user_id">Vaše ID používateľa</string>
+    <string name="room_widget_permission_theme">Váš vzhľad</string>
+    <string name="room_widget_permission_widget_id">ID widgetu</string>
+    <string name="room_widget_permission_room_id">ID miestnosti</string>
+
+
+    <string name="error_jitsi_not_supported_on_old_device">Prepáčte, konferenčné hovory Jitsi nie sú podporované na starších zariadeniach (starší systém než Android 5.0)</string>
+    <string name="room_widget_resource_permission_title">Tento widget žiada o nasledujúce zdroje:</string>
+    <string name="room_widget_resource_grant_permission">Povoliť</string>
+    <string name="room_widget_resource_decline_permission">Zablokovať všetko</string>
+    <string name="room_widget_webview_access_camera">Používať fotoaparát</string>
+    <string name="room_widget_webview_access_microphone">Používať mikrofón</string>
+    <string name="room_widget_webview_read_protected_media">Čítať média chránené systémom DRM</string>
+
+    <string name="integration_manager_not_configured">Nie je nastavený žiadny správca integrácií.</string>
+    <string name="room_manage_integrations">Spravovať integrácie</string>
+    <string name="room_no_active_widgets">Žiadne aktívne widgety</string>
+    <string name="widget_integration_review_terms">Skôr než budete pokračovať, mali by ste prijať podmienky poskytovania tejto služby.</string>
+
+    <string name="you_added_a_new_device_with_info">Nová relácia žiada o šifrovacie kľúče.
+\nNázov relácie: %1$s
+\nPosledné prihlásenie: %2$s
+\nAk ste sa neprihlásili do ďalšej relácie, ignorujte túto žiadosť.</string>
+    <string name="your_unverified_device_requesting_with_info">Neoverená relácia žiada o šifrovacie kľúče.
+\nNázov relácie: %1$s
+\nNaposledy prihlásená: %2$s
+\nAk ste sa neprihlásili do novej relácie, ignorujte túto žiadosť.</string>
+
+    <string name="start_verification_short_label">Overiť</string>
+    <string name="share_without_verifying_short_label">Zdieľať</string>
+    <string name="key_share_request">Žiadosť o zdieľanie kľúčov</string>
+    <string name="ignore_request_short_label">Ignorovať</string>
+
+    <string name="passphrase_empty_error_message">Prosím, zadajte dlhé heslo</string>
+    <string name="passphrase_passphrase_too_weak">Dlhé heslo je príliš slabé</string>
+
+    <string name="keys_backup_passphrase_not_empty_error_message">Prosím, zmažte dlhé heslo, ak si želáte vygenerovať kľúč obnovenia.</string>
+    <string name="keys_backup_no_session_error">Nie je dostupná žiadna relácia matrix</string>
+
+    <string name="keys_backup_setup_step1_title">Nikdy nepríďte o šifrované správy</string>
+    <string name="keys_backup_setup_step1_description">Správy v šifrovaných miestnostiach sú zabezpečené E2E šifrov. Ku kľúčom potrebných na ich čítanie máte prístup len vy a ich adresáti.
+\n
+\nBezpečne si zálohujte šifrovacie kľúče, aby ste o tieto správy neprišli.</string>
+    <string name="keys_backup_setup">Začať používať zálohovanie kľúčov</string>
+    <string name="keys_backup_setup_step1_advanced">(Pokročilé)</string>
+    <string name="keys_backup_setup_step1_manual_export">Exportovať kľúče ručne</string>
+
+    <string name="keys_backup_setup_step2_text_title">Zabezpečte si zálohu dlhým heslom.</string>
+    <string name="keys_backup_setup_step2_text_description">Zašifrovaná kópia vašich kľúčov bude uložená na domovskom servery. Ochránte si túto zálohu dlhým heslom pre zachovanie maximálnej bezpečnosti.
+\n
+\nPozor! Dlhé heslo by sa nemalo zhodovať s heslom k vášmu matrix účtu.</string>
+    <string name="keys_backup_setup_step2_button_title">Nastaviť dlhé heslo</string>
+    <string name="keys_backup_setup_creating_backup">Vytváranie zálohy</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Alebo, Zabezpečte si zálohu kľúčom obnovenia, ktorý si niekde naozaj bezpečne uložíte.</string>
+    <string name="keys_backup_setup_step2_skip_button_title">(Pre pokročilých) Nastaviť kľúč obnovenia</string>
+    <string name="keys_backup_setup_step3_success_title">Úspešne nastavené!</string>
+    <string name="keys_backup_setup_step3_text_line1">Vaše kľúče sú zálohované.</string>
+    <string name="keys_backup_setup_step3_text_line2">Váš kľúč obnovenia je ako ochranná sieť - Môžete ho použiť na obnovenie prístupu k vašim zašifrovaným správam aj keď zabudnete dlhé heslo.
+\nKľúč obnovenia si uchovajte na veľmi bezpečnom mieste napr. v správcovi hesiel (alebo v trezore)</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Kľúč obnovenia si uchovajte na veľmi bezpečnom mieste napr. v správcovi hesiel (alebo v trezore)</string>
+    <string name="keys_backup_setup_step3_button_title">Hotovo</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Urobil(a) som si kópiu</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Uložiť kľúč obnovenia</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">Zdieľať</string>
+    <string name="keys_backup_setup_step3_save_button_title">Uložiť ako súbor</string>
+    <string name="recovery_key_export_saved_as_warning">Kľúč obnovenia bol uložený do súboru \'%s\'.
+\n
+\nPozor: Keď odinštalujete aplikáciu Element, môže dôjsť k zmazaniu tohoto súboru.</string>
+    <string name="recovery_key_export_saved">Kľúč obnovenia bol uložený.</string>
+
+    <string name="keys_backup_setup_override_backup_prompt_tile">Záloha už existuje na domovskom servery</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Zdá sa, že ste si už zálohovanie kľúčov nastavili z inej relácie. Chcete ho nahradiť zálohou, ktorú vytvárate teraz\?</string>
+    <string name="keys_backup_setup_override_replace">Nahradiť</string>
+    <string name="keys_backup_setup_override_stop">Zastaviť</string>
+
+    <string name="keys_backup_setup_step3_please_make_copy">Prosím, urobte si kópiu</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Zdieľať kľúč obnovenia…</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Generovanie kľúča obnovenia podľa dlhého hesla, môže to trvať niekoľko sekúnd.</string>
+    <string name="recovery_key">Kľúč obnovenia</string>
+    <string name="unexpected_error">Neočakávaná chyba</string>
+    <string name="keys_backup_setup_backup_started_title">Zálohovanie spustené</string>
+    <string name="keys_backup_setup_backup_started_message">Vaše šifrovacie kľúče sú na pozadí zálohované na domovskom servery. Úvodné zálohovanie môže trvať niekoľko minút.</string>
+
+
+    <string name="keys_backup_setup_skip_title">Ste si istí\?</string>
+    <string name="keys_backup_setup_skip_msg">Môžete prísť o šifrované správy, ak sa odhlásite, odinštalujete aplikáciu, alebo stratíte toto zariadenie.</string>
+
+    <string name="keys_backup_restore_is_getting_backup_version">Získavanie verzie zálohy…</string>
+    <string name="keys_backup_restore_with_passphrase">Použiť dlhé heslo obnovenia a získať tak prístup k histórii šifrovaných správ</string>
+    <string name="keys_backup_restore_use_recovery_key">Použiť kľúč obnovenia</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Neviete svoje dlhé heslo obnovenia, môžete %s.</string>
+
+    <string name="keys_backup_restore_with_recovery_key">Použiť kľúč obnovenia a získať tak prístup k histórii šifrovaných správ</string>
+    <string name="keys_backup_restore_key_enter_hint">Vložte kľúč obnovenia</string>
+
+    <string name="keys_backup_restore_setup_recovery_key">Obnovenie správ</string>
+
+    <string name="keys_backup_restore_with_key_helper">Stratili ste kľúč obnovenia, v nastaveniach získate nový.</string>
+    <string name="keys_backup_passphrase_error_decrypt">Zálohu nie je možné dešifrovať týmto dlhým heslom: prosím uistite sa, že ste zadali správne dlhé heslo obnovenia.</string>
+    <string name="network_error_please_check_and_retry">Chyba siete: Prosím skontrolujte vaše pripojenie a skúste znovu.</string>
+
+    <string name="keys_backup_restoring_waiting_message">Obnova zo zálohy:</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Výpočet kľúča obnovenia…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">Sťahovanie kľúčov…</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">Import kľúčov…</string>
+    <string name="keys_backup_unlock_button">Sprístupniť históriu</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Prosím, vložte kľúč obnovenia</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Zálohu nie je možné dešifrovať týmto kľúčom: prosím, uistite sa, že ste vložili správny kľúč obnovenia.</string>
+
+    <string name="keys_backup_restore_success_title">Záloha obnovená %s !</string>
+    <plurals name="keys_backup_restore_success_description_part1">
+        <item quantity="one">Záloha s %d kľúčom obnovená.</item>
+        <item quantity="few">Záloha s %d kľúčmi obnovená.</item>
+        <item quantity="other">Záloha s %d kľúčami obnovená.</item>
+    </plurals>
+    <plurals name="keys_backup_restore_success_description_part2">
+        <item quantity="one">%d nový kľúč bol pridaný do tejto relácie.</item>
+        <item quantity="few">%d nové kľúče boli pridané do tejto relácie.</item>
+        <item quantity="other">%d nových kľúčov bolo pridaných do tejto relácie.</item>
+    </plurals>
+
+    <string name="keys_backup_get_version_error">Nepodarilo sa získať poslednú verziu kľúčov na obnovenie (%s).</string>
+    <string name="keys_backup_no_keysbackup_sdk_error">Šifrovanie nie je v tejto relácii aktivované</string>
+
+
+    <string name="keys_backup_settings_restore_backup_button">Obnoviť zo zálohy</string>
+    <string name="keys_backup_settings_delete_backup_button">Vymazať zálohu</string>
+
+    <string name="keys_backup_settings_status_ok">Zálohovanie kľúčov je nastavené správne pre túto reláciu.</string>
+    <string name="keys_backup_settings_status_ko">Zálohovanie kľúčov nie je aktívne v tejto relácii.</string>
+    <string name="keys_backup_settings_status_not_setup">Kľúče z tejto relácie nie sú zálohované.</string>
+
+    <string name="keys_backup_settings_signature_from_unknown_device">Záloha je podpísaná kľúčom z neznámej relácie, ID %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Záloha je podpísana platným kľúčom z tejto relácie.</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Záloha je podpísana platným kľúčom z overenej relácie %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Záloha je podpísana platným kľúčom z neoverenej relácie %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Záloha je podpísana neplatným kľúčom z overenej relácie %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Záloha je podpísana neplatným kľúčom z neoverenej relácie %s</string>
+    <string name="keys_backup_get_trust_error">Nepodarilo sa zistiť stav dôverihodnosti zálohy (%s).</string>
+
+    <string name="keys_backup_settings_untrusted_backup">Ak chcete v tejto relácii používať zálohovanie kľúčov, zadajte teraz dlhé heslo alebo kľúč obnovenia.</string>
+    <string name="keys_backup_settings_deleting_backup">Mazanie zálohy…</string>
+    <string name="keys_backup_settings_delete_backup_error">Nepodarilo sa vymazať zálohu (%s)</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Zisťovanie stavu zálohovania</string>
+    <string name="keys_backup_settings_delete_confirm_title">Vymazať zálohu</string>
+    <string name="keys_backup_settings_delete_confirm_message">Vymazať zálohované šifrovacie kľúče z domovského servera\? Nebudete môcť viac čítať históriu šifrovaných správ zadaním kľúča obnovenia.</string>
+
+    <string name="new_recovery_method_popup_title">Nová záloha kľúčov</string>
+    <string name="new_recovery_method_popup_description">Bola zistená nová bezpečná záloha šifrovacích kľúčov.
+\n
+\nAk ste si nenastavili nový spôsob obnovenia kľúčov, útočník sa môže pokúšať pristupovať k vášmu účtu. V nastaveniach si prosím hneď zmente prihlasovacie heslo účtu a nastavte zálohovanie kľúčov.</string>
+    <string name="new_recovery_method_popup_was_me">Bol(a) som to ja</string>
+
+    <string name="keys_backup_banner_setup_line1">Nikdy neprídete o šifrované správy</string>
+    <string name="keys_backup_banner_setup_line2">Začnite používať zálohovanie kľúčov</string>
+
+    <string name="secure_backup_banner_setup_line1">Bezpečné zálohovanie</string>
+    <string name="secure_backup_banner_setup_line2">Zabezpečte sa proti strate šifrovaných správ a údajov</string>
+
+    <string name="keys_backup_banner_recover_line1">Nikdy neprídete o šifrované správy</string>
+    <string name="keys_backup_banner_recover_line2">Použiť kľúče zo zálohy</string>
+
+    <string name="keys_backup_banner_update_line1">Nové bezpečné šifrovacie kľúče</string>
+    <string name="keys_backup_banner_update_line2">Spravovať v zálohovaní kľúčov</string>
+
+    <string name="keys_backup_banner_in_progress">Zálohovanie kľúčov. Môže to trvať niekoľko minút…</string>
+
+
+    <string name="secure_backup_setup">Nastavenie bezpečného zálohovania</string>
+
+    <string name="keys_backup_info_keys_all_backup_up">Všetky kľúče sú zálohované</string>
+    <plurals name="keys_backup_info_keys_backing_up">
+        <item quantity="one">Zálohovanie %d kľúča…</item>
+        <item quantity="few">Zálohovanie %d kľúčov…</item>
+        <item quantity="other">Zálohovanie %d kľúčov…</item>
+    </plurals>
+
+    <string name="keys_backup_info_title_version">Verzia</string>
+    <string name="keys_backup_info_title_algorithm">Algoritmus</string>
+    <string name="keys_backup_info_title_signature">Podpis</string>
+
+    <string name="autodiscover_invalid_response">Neplatná odpoveď pri zisťovaní domovského servera</string>
+    <string name="autodiscover_well_known_autofill_dialog_title">Automaticky doplniť možnosti servera</string>
+    <string name="autodiscover_well_known_autofill_dialog_message">Element zistil vlastné nastavenie servera pre vaše ID používateľa a doménu \"%1$s\":
+\n%2$s</string>
+    <string name="autodiscover_well_known_autofill_confirm">Použiť nastavenia</string>
+
+    <string name="invalid_or_expired_credentials">Boli ste odhlásení, pretože vaše prihlasovacie údaje vypršali alebo nie sú viac platné.</string>
+
+    <string name="sas_verify_title">Overiť porovnaním krátkeho textu.</string>
+    <string name="sas_security_advise">Z dôvodu dodržania maximálnej bezpečnosti odporúčame, aby ste toto urobili osobne alebo použili iný dôveryhodný komunikačný kanál.</string>
+    <string name="sas_verify_start_button_title">Spustiť overenie</string>
+    <string name="sas_incoming_request_title">Prichádzajúca žiadosť o overenie</string>
+    <string name="sas_incoming_request_description">Overte túto reláciu, aby ste ju mohli označiť za dôveryhodnú. Dôverovanie reláciám vašich komunikačných partnerov vám pridáva pokoj na duši pri používaní E2E šifrovaných správ.</string>
+    <string name="sas_incoming_request_description_2">Overením tejto relácie si ju označíte ako dôveryhodnú a tiež označíte vašu reláciu ako dôveryhodnú pre protistranu.</string>
+
+    <string name="sas_emoji_description">Overte túto reláciu potvrdením, že na obrazovke protistrany sa zobrazia nasledujúce emoji</string>
+    <string name="sas_decimal_description">Overte túto reláciu potvrdením, že na obrazovke protistrany sa zobrazia nasledujúce čísla</string>
+
+    <string name="sas_incoming_verification_request_dialog">Prijali ste žiadosť o overenie.</string>
+    <string name="sas_view_request_action">Zobraziť žiadosť</string>
+    <string name="sas_waiting_for_partner">Čakanie na potvrdenie protistrany…</string>
+
+    <string name="sas_verified">Overené!</string>
+    <string name="sas_verified_successful">Úspešne ste overili túto reláciu.</string>
+    <string name="sas_verified_successful_description">Šifrované správy s týmto používateľom sú zabezpečené E2E šifrou a nik okrem vás ich nemôže čítať.</string>
+    <string name="sas_got_it">Rozumiem</string>
+
+    <string name="sas_verifying_keys">Nič sa neobjavuje\? Ešte nie všetci klienti podporujú interaktívne overenie. Použite pôvodný spôsob overenia.</string>
+    <string name="sas_legacy_verification_button_title">Použiť pôvodný spôsob overenia.</string>
+
+    <string name="sas_verification_request_notification_channel_title">Overenie kľúčov</string>
+    <string name="sas_cancelled_dialog_title">Žiadosť zrušená</string>
+    <string name="sas_cancelled_by_other">Protistrana prerušila overenie.
+\n%s</string>
+    <string name="sas_cancelled_by_me">Overenie je zrušené.
+\nDôvod: %s</string>
+
+    <string name="sas_verification_request_notification_channel">Interaktívne overenie relácie</string>
+    <string name="sas_incoming_request_notif_title">Žiadosť o overenie</string>
+    <string name="sas_incoming_request_notif_content">%s chce overiť vašu reláciu</string>
+
+    <string name="sas_error_m_user">Používateľ prerušil overovanie</string>
+    <string name="sas_error_m_timeout">Čas overenia vypršal</string>
+    <string name="sas_error_m_unknown_transaction">Neznáma transakcia relácie</string>
+    <string name="sas_error_m_unknown_method">Kľúč relácie alebo metóda odtlačku, MAC alebo SAS sa nezhodujú</string>
+    <string name="sas_error_m_mismatched_commitment">Nesúhlasí použitie dohodnutého odtlačku</string>
+    <string name="sas_error_m_mismatched_sas">Nesúhlasí SAS</string>
+    <string name="sas_error_m_unexpected_message">Relácia dostala neočakávanú správu</string>
+    <string name="sas_error_m_invalid_message">Bola prijatá neplatná správa</string>
+    <string name="sas_error_m_key_mismatch">Nesúhlas kľúčov</string>
+    <string name="sas_error_m_user_error">Nesúhlas používateľov</string>
+    <string name="sas_error_unknown">Neznáma chyba</string>
+
+    <string name="identity_server_not_defined">Nepoužívate žiaden server totožností</string>
+    <string name="identity_server_not_defined_for_password_reset">Nemáte nastavený server totožností, čo znamená, že si nebudete môcť obnoviť zabudnuté heslo účtu.</string>
+
+    <string name="error_user_already_logged_in">Zdá sa, že sa pokúšate pripojiť k inému domovskému serveru. Chcete sa odhlásiť\?</string>
+
+    <string name="edit">Upraviť</string>
+    <string name="reply">Odpovedať</string>
+
+    <string name="global_retry">Skúsiť znovu</string>
+    <string name="room_list_empty">Aplikáciu začnite používať tým, že vstúpite do miestnosti.</string>
+    <string name="send_you_invite">Vám odoslal pozvanie</string>
+    <string name="invited_by">Pozvaný používateľom %s</string>
+
+    <string name="room_list_catchup_empty_title">Zoznam miestností je prázdny!</string>
+    <string name="room_list_catchup_empty_body">Nemáte žiadne neprečítané správy</string>
+    <string name="room_list_catchup_welcome_title">Vitajte doma!</string>
+    <string name="room_list_catchup_welcome_body">Tu nájdete neprečítané správy</string>
+    <string name="room_list_people_empty_title">Konverzácie</string>
+    <string name="room_list_people_empty_body">Tu sa zobrazia priame konverzácie</string>
+    <string name="room_list_rooms_empty_title">Miestnosti</string>
+    <string name="room_list_rooms_empty_body">Tu sa zobrazia vaše miestnosti</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reakcie</string>
+    <string name="reactions_agree">Súhlasím</string>
+    <string name="reactions_like">Páči sa mi</string>
+    <string name="message_add_reaction">Pridať reakciu</string>
+    <string name="message_view_reaction">Zobraziť reakcie</string>
+    <string name="reactions">Reakcie</string>
+
+    <string name="event_redacted">Odstránená správa</string>
+    <string name="settings_show_redacted">Zobrazovať odstránené správy</string>
+    <string name="settings_show_redacted_summary">Namiesto odstránených správ sa zobrazí prázdna položka</string>
+    <string name="event_redacted_by_user_reason">Udalosť odstránená používateľom</string>
+    <string name="event_redacted_by_admin_reason">Udalosť moderovaná správcom</string>
+    <string name="last_edited_info_message">Naposledy upravil %1$s %2$s</string>
+
+
+    <string name="malformed_message">Nesprávne vytvorená udalosť, nie je možné zobraziť</string>
+    <string name="create_new_room">Vytvoriť novú miestnosť</string>
+    <string name="error_no_network">Žiadna sieť. Prosím skontrolujte pripojenie na internet.</string>
+    <string name="action_change">Zmeniť</string>
+    <string name="change_room_directory_network">Zmeniť sieť</string>
+    <string name="please_wait">Prosím čakajte…</string>
+    <string name="group_all_communities">Všetky komunity</string>
+
+    <string name="room_preview_no_preview">Nie je možné zobraziť náhľad tejto miestnosti</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Nazeranie do verejných miestností nie je zatiaľ podporované</string>
+
+    <string name="fab_menu_create_room">Miestnosti</string>
+    <string name="fab_menu_create_chat">Priame konverzácie</string>
+
+    <string name="create_room_title">Nová miestnosť</string>
+    <string name="create_room_action_create">VYTVORIŤ</string>
+    <string name="create_room_name_hint">Názov miestnosti</string>
+    <string name="create_room_public_title">Verejná</string>
+    <string name="create_room_public_description">Ktokoľvek môže vstúpiť do tejto miestnosti</string>
+    <string name="create_room_directory_title">Adresár miestností</string>
+    <string name="create_room_directory_description">Uverejniť túto miestnosť v adresáry miestností</string>
+    <string name="create_room_federation_error">Miestnosť bola vytvorená, ale niektoré pozvania neboli odoslané z dôvodu:
+\n
+\n%s</string>
+
+    <string name="keys_backup_unable_to_get_trust_info">Pri získavaní stavu dôveryhodnosti nastala chyba</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">Pri získavaní údajov o zálohe kľúčov nastala chyba</string>
+
+    <string name="import_e2e_keys_from_file">Importovať E2E kľúče zo súboru \"%1$s\".</string>
+
+    <string name="settings_sdk_version">Verzia Matrix SDK</string>
+    <string name="settings_other_third_party_notices">Ďalšie poznámky tretích strán</string>
+    <string name="navigate_to_room_when_already_in_the_room">Už máte túto miestnosť zobrazenú!</string>
+
+    <string name="quick_reactions">Rýchle reakcie</string>
+
+    <string name="settings_general_title">Všeobecné</string>
+    <string name="settings_preferences">Predvoľby</string>
+    <string name="settings_security_and_privacy">Bezpečnosť a súkromie</string>
+    <string name="settings_expert">Expertné</string>
+    <string name="settings_push_rules">Pravidlá push oznámení</string>
+    <string name="settings_push_rules_no_rules">Nedefinované žiadne pravidlá push</string>
+    <string name="settings_push_gateway_no_pushers">Nezaregistrované žiadne brány push</string>
+
+    <string name="push_gateway_item_app_id">ID aplikácie:</string>
+    <string name="push_gateway_item_push_key">Kľúč push:</string>
+    <string name="push_gateway_item_app_display_name">Zobrazovaný názov aplikácie:</string>
+    <string name="push_gateway_item_device_name">Názov relácie:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_format">Formát:</string>
+
+    <string name="preference_voice_and_video">Hlas a video</string>
+    <string name="preference_root_help_about">Pomoc a o aplikácii</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Zaregistrovať token</string>
+
+    <string name="send_suggestion">Poslať návrh</string>
+    <string name="send_suggestion_content">Nižšie napíšte obsah návrhu.</string>
+    <string name="send_suggestion_report_placeholder">Popíšte váš návrh</string>
+    <string name="send_suggestion_sent">Ďakujeme, váš návrh bol úspešne odoslaný</string>
+    <string name="send_suggestion_failed">Návrh sa nepodarilo odoslať (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Zobrazovať skryté udalosti na časovej osy</string>
+
+    <string name="bottom_action_people_x">Priame konverzácie</string>
+
+    <string name="send_file_step_idle">Čakanie…</string>
+    <string name="send_file_step_encrypting_thumbnail">Šifrovanie náhľadu…</string>
+    <string name="send_file_step_sending_thumbnail">Odosielanie náhľadu (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Šifrovanie súboru…</string>
+    <string name="send_file_step_sending_file">Odosielanie súboru (%1$s / %2$s)</string>
+
+    <string name="downloading_file">Sťahovanie súboru %1$s…</string>
+    <string name="downloaded_file">Súbor %1$s bol stiahnutý!</string>
+
+    <string name="edited_suffix">(Upravené)</string>
+
+    <string name="message_edits">Úpravy správy</string>
+    <string name="no_message_edits_found">Neboli nájdené žiadne úpravy</string>
+
+    <string name="room_filtering_filter_hint">Filtrovať konverzácie…</string>
+    <string name="room_filtering_footer_title">Nemôžete nájsť, čo hľadáte\?</string>
+    <string name="room_filtering_footer_create_new_room">Vytvoriť novú miestnosť</string>
+    <string name="room_filtering_footer_create_new_direct_message">Poslať priamu správu</string>
+    <string name="room_filtering_footer_open_room_directory">Zobraziť adresár miestností</string>
+
+    <string name="room_directory_search_hint">Názov alebo ID (#priklad:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Povoliť odpovedať švihnutím na časovej osy</string>
+    <string name="labs_merge_e2e_in_timeline">Zlúčiť správy nepodarilo sa dešifrovať na časovej osy</string>
+    <string name="labs_show_unread_notifications_as_tab">Zobrazovať záložku oznámenia na hlavnej obrazovke.</string>
+
+    <string name="link_copied_to_clipboard">Odkaz skopírovaný do schránky</string>
+
+    <string name="add_by_matrix_id">Pridať matrix ID</string>
+    <string name="creating_direct_room">Vytváranie miestnosti…</string>
+    <string name="direct_room_no_known_users">Nenájdený žiadny výsledok, ak chcete hľadať na servery, klepnite na pridať Matrix ID.</string>
+    <string name="direct_room_start_search">Výsledky uvidíte hneď, čo začnete písať</string>
+    <string name="direct_room_filter_hint">Filtrovať zadaním používateľskeho mena alebo ID…</string>
+
+    <string name="joining_room">Vstupovanie do miestnosti…</string>
+
+    <string name="message_view_edit_history">Zobraziť históriu úprav</string>
+
+    <string name="terms_of_service">Podmienky poskytovania služby</string>
+    <string name="review_terms">Prečítať podmienky</string>
+    <string name="terms_description_for_identity_server">Umožnite ostatným vás nájsť</string>
+    <string name="terms_description_for_integration_manager">Používajte botov, mosty, widgety a balíčky s nálepkami</string>
+
+    <string name="read_at">Prečítajte si na adrese</string>
+
+
+    <string name="identity_server">Server totožností</string>
+    <string name="disconnect_identity_server">Odpojiť server totožností</string>
+    <string name="add_identity_server">Nastaviť server totožností</string>
+    <string name="change_identity_server">Zmeniť server totožností</string>
+    <string name="settings_discovery_identity_server_info">Používate server totožností %1$s, aby vás ľudia, ktorých poznáte mohli nájsť a aby ste vy mohli vyhľadávať kontakty.</string>
+    <string name="settings_discovery_identity_server_info_none">Momentálne nepoužívate server totožností. Nižšie si ho môžete nastaviť, ak chcete vašim známym umožniť, aby vás mohli nájsť a ak aj vy chcete vyhľadávať kontakty.</string>
+    <string name="settings_discovery_emails_title">Emailové adresy, podľa ktorých je vás možné nájsť</string>
+    <string name="settings_discovery_no_mails">Možnosti zisťovania sa zobrazia, až keď pridáte emailovú adresu.</string>
+    <string name="settings_discovery_no_msisdn">Možnosti zisťovania sa zobrazia, až keď pridáte telefónne číslo.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Odpojením sa od servera totožností znemožníte ostatným, aby vás našli a tiež nebudete môcť kontakty pozývať zadaním emailovej adresy alebo telefónneho čísla.</string>
+    <string name="settings_discovery_msisdn_title">Telefónne čísla, podľa ktorých je vás možné nájsť</string>
+    <string name="settings_discovery_confirm_mail">Poslali sme vám potvrdzujúcu správu na adresu %s, skontrolujte si email a overte vašu emailovú adresu klepnutím na odkaz, ktorý obsahuje</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Na adresu %s sme vám odoslali potvrdzujúcu správu, aby ste mohli pokračovať, skontrolujte si email a klepnite na odkaz, ktorý sme vám poslali</string>
+    <string name="settings_discovery_mail_pending">Očakáva sa</string>
+
+    <string name="settings_discovery_enter_identity_server">Zadajte URL adresu servera totožností</string>
+    <string name="settings_discovery_bad_identity_server">Nie je možné sa pripojiť k serveru totožností</string>
+    <string name="settings_discovery_please_enter_server">Prosím, zadajte URL adresu servera totožností</string>
+    <string name="settings_discovery_no_terms_title">Server totožností nezverejnil podmienky poskytovania služieb</string>
+    <string name="settings_discovery_no_terms">Vami vybratý server totožností nezverejňuje podmienky používania služieb. Pokračujte len v prípade, že dôverujete vlastníkovi servera</string>
+    <string name="settings_text_message_sent">Na číslo %s bola odoslaná textová správa. Prosím zadajte overovací kód, ktorý obsahuje.</string>
+    <string name="settings_text_message_sent_wrong_code">Overovací kód nie je správny.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">Emailové adresy a telefónne čísla zdieľate cez server totožností %1$s. Ak chcete toto zdieľanie zastaviť, mali by ste sa znovu pripojiť k serveru %2$s.</string>
+    <string name="settings_agree_to_terms">Odsúhlaste podmienky používania služieb servera totožností (%s), aby vás ostatní mohli nájsť podľa emailovej adresy alebo telefónneho čísla.</string>
+
+    <string name="labs_allow_extended_logging">Povoliť podrobné záznamy.</string>
+    <string name="labs_allow_extended_logging_summary">Podrobné záznamy pomôžu vývojárom poskytnúť viac detailov, keď posielate hlásenie o chybe. Aj keď je toto zapnuté, aplikácia nezaznamenáva obsah správ ani žiadne iné súkromné údaje.</string>
+
+
 </resources>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index f1ffb2079a..5383c03ba9 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -22,9 +22,9 @@
     <string name="title_activity_historical">Historisk</string>
     <string name="title_activity_bug_report">Buggrapport</string>
     <string name="title_activity_group_details">Gemenskapsdetaljer</string>
-    <string name="title_activity_choose_sticker">Skicka ett klistermärke</string>
+    <string name="title_activity_choose_sticker">Skicka en dekal</string>
     <string name="title_activity_keys_backup_setup">Säkerhetskopiering av nycklar</string>
-    <string name="title_activity_keys_backup_restore">Använd säkerhetskopiering av nycklar</string>
+    <string name="title_activity_keys_backup_restore">Använd nyckelsäkerhetskopiering</string>
     <string name="title_activity_verify_device">Verifiera session</string>
 
     <string name="keys_backup_is_not_finished_please_wait">Säkerhetskopiering av nycklar är inte färdig, vänligen vänta…</string>
@@ -33,7 +33,7 @@
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Säker säkerhetskopiering av nycklar bör vara aktivt i alla dina sessioner för att förhindra att du förlorar åtkomst till dina krypterade meddelanden.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Jag vill inte ha mina krypterade meddelanden</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Säkerhetskopierar nycklar…</string>
-    <string name="keys_backup_activate">Använd säkerhetskopiering av nycklar</string>
+    <string name="keys_backup_activate">Använd nyckelsäkerhetskopiering</string>
     <string name="are_you_sure">Är du säker\?</string>
     <string name="backup">Säkerhetskopiera</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Du kommer att förlora åtkomst till dina krypterade meddelanden om du inte säkerhetskopierar dina nycklar innan du loggar ut.</string>
@@ -140,7 +140,7 @@
     <string name="rooms_header">Rum</string>
     <string name="rooms_directory_header">Rumskatalog</string>
     <string name="no_room_placeholder">Inga rum</string>
-    <string name="no_public_room_placeholder">Inga publika rum tillgängliga</string>
+    <string name="no_public_room_placeholder">Inga offentliga rum tillgängliga</string>
     <plurals name="public_room_nb_users">
         <item quantity="one">1 användare</item>
         <item quantity="other">%d användare</item>
@@ -195,13 +195,13 @@
     <string name="call_failed_dont_ask_again">Fråga mig inte igen</string>
 
     <string name="option_send_files">Skicka filer</string>
-    <string name="option_send_sticker">Skicka klistermärke</string>
+    <string name="option_send_sticker">Skicka dekal</string>
     <string name="option_take_photo_video">Ta foto eller video</string>
     <string name="option_take_photo">Ta ett foto</string>
     <string name="option_take_video">Ta en video</string>
 
-    <string name="no_sticker_application_dialog_content">Du har för närvarande inga klistermärkespaket aktiva.
-\n
+    <string name="no_sticker_application_dialog_content">Du har för närvarande inga dekalpaket aktiva. 
+\n 
 \nLägg till några nu\?</string>
 
     <string name="go_on_with">fortsätt med…</string>
@@ -288,7 +288,7 @@
     <string name="e2e_re_request_encryption_key_dialog_title">Förfrågan har skickats</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Vänligen öppna Element på en annan enhet som kan dekryptera meddelandet så att den kan skicka nycklarna till den här sessionen.</string>
 
-    <string name="read_receipts_list">Läskvittolista</string>
+    <string name="read_receipts_list">Läsindikationslista</string>
 
     <string name="groups_list">Grupplista</string>
 
@@ -341,21 +341,21 @@
     <string name="media_picker_cannot_record_video">Kan inte spela in video</string>
 
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Element behöver tillstånd att komma åt ditt foto- och videobibliotek för att skicka och spara bilagor.
-\n
-\nVänligen tillåt åtkomst i nästa pop-up för att kunna skicka filer från din telefon.</string>
+    <string name="permissions_rationale_msg_storage">Element behöver tillstånd att komma åt ditt foto- och videobibliotek för att skicka och spara bilagor. 
+\n 
+\nVänligen ge tillstånd i nästa popup för att kunna skicka filer från din telefon.</string>
     <string name="permissions_rationale_msg_camera">Element behöver tillstånd att komma åt din kamera för att kunna ta bilder och hålla videosamtal.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
-\nVänligen ge tillgång i nästa pop-up för att kunna utföra samtalet."</string>
+\nVänligen ge tillstånd i nästa popup för att kunna utföra samtalet."</string>
     <string name="permissions_rationale_msg_record_audio">Element behöver tillstånd att komma åt din mikrofon för hålla röstsamtal.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
-\nVänligen ge tillgång i nästa pop-up för att kunna utföra samtalet."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element behöver tillstånd att komma åt din kamera och mikrofon för att kunna utföra videosamtal.
-\n
-\nVänligen ge tillgång i nästa pop-up för att kunna utföra samtalet.</string>
-    <string name="permissions_rationale_msg_contacts">Element kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer. Om du går med på att dela din adressbok för detta ändamål, vänligen ge tillgång i nästa pop-up.</string>
+\nVänligen ge tillstånd i nästa popup för att kunna utföra samtalet."</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Element behöver tillstånd att komma åt din kamera och mikrofon för att kunna utföra videosamtal. 
+\n 
+\nVänligen ge tillstånd i nästa popup för att kunna utföra samtalet.</string>
+    <string name="permissions_rationale_msg_contacts">Element kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer. Om du går med på att dela din adressbok för detta ändamål, vänligen ge tillstånd i nästa popup.</string>
     <string name="permissions_msg_contacts_warning_other_androids">Element kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer.
 \n
 \nVill du dela din adressbok för detta ändamål\?</string>
@@ -435,11 +435,11 @@
     <string name="room_participants_action_remove">Ta bort från det här rummet</string>
     <string name="room_participants_action_ban">Banna</string>
     <string name="room_participants_action_unban">Avbanna</string>
-    <string name="room_participants_action_kick">Kasta ut</string>
+    <string name="room_participants_action_kick">Kicka</string>
     <string name="room_participants_action_set_default_power_level">Återställ till vanlig användare</string>
     <string name="room_participants_action_set_moderator">Gör till moderator</string>
     <string name="room_participants_action_set_admin">Gör till administratör</string>
-    <string name="room_participants_action_ignore">Dölj alla meddelanden från den här användaren</string>
+    <string name="room_participants_action_ignore">Ignorera</string>
     <string name="search_members_hint">Filtrera rumsmedlemmar</string>
     <string name="tab_title_search_rooms">RUM</string>
     <string name="room_recents_conversations">RUM</string>
@@ -458,7 +458,7 @@
 
     <string name="failed_to_load_timeline_position">%s försökte ladda en specifik punkt i det här rummets tidslinje, men kunde inte hitta den.</string>
 
-    <string name="directory_server_type_homeserver">Skriv en hemserver att visa listan över publika rum från</string>
+    <string name="directory_server_type_homeserver">Skriv en hemserver att visa listan över offentliga rum från</string>
     <string name="directory_server_all_rooms_on_server">Alla rum på %s-servern</string>
     <string name="directory_server_native_rooms">Alla %s-rum på Matrix</string>
 
@@ -566,7 +566,7 @@
     <string name="verify_cancel_other">Du kommer inte att verifiera %1$s (%2$s) om du avbryter nu. Börja igen i hens användarprofil.</string>
 
     <string name="encryption_enabled_tile_description">Meddelanden i det här rummet är totalsträckskrypterade. Lär dig mer och verifiera användare i deras profiler.</string>
-    <string name="room_participants_action_unignore">Visa alla meddelanden från den här användaren</string>
+    <string name="room_participants_action_unignore">Avignorera</string>
     <string name="room_participants_invite_prompt_msg">Är du säker på att du vill bjuda in %s till den här chatten\?</string>
     <string name="people_search_invite_by_id"><u>Bjud in med ID</u></string>
     <string name="people_search_invite_by_id_dialog_title">Bjud in användare med ID</string>
@@ -646,7 +646,7 @@
     <string name="settings_containing_my_user_name">Meddelanden innehållande mitt användarnamn</string>
     <string name="settings_messages_in_one_to_one">Meddelanden i direktchattar</string>
     <string name="settings_messages_in_group_chat">Meddelanden i gruppchattar</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element kommer att synka I bakgrunden periodiskt vid precisa tider (konfigurerbart).
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element kommer att synka i bakgrunden periodiskt vid precisa tider (konfigurerbart). 
 \nDetta kommer att påverka data- och batterianvändning, och det kommer att visas en permanent avisering som säger att Element lyssnar efter händelser.</string>
     <string name="settings_version">Version</string>
     <string name="settings_olm_version">olm-version</string>
@@ -660,7 +660,7 @@
     <string name="settings_notifications_targets">Aviseringsmål</string>
     <string name="settings_send_typing_notifs">Skicka \"skriver\"-statusar</string>
     <string name="settings_send_markdown_summary">Formatera meddelanden med Markdown-syntax innan de skickas. Detta tillåter avancerad formatering som att använda asterisker för att visa kursiv text.</string>
-    <string name="settings_always_show_timestamps">Visa tidpunkt för alla meddelanden</string>
+    <string name="settings_always_show_timestamps">Visa tidsstämplar för alla meddelanden</string>
     <string name="settings_show_join_leave_messages">Visa när folk går med och lämnar</string>
     <string name="settings_preview_media_before_sending">Förhandsgranska media innan den skickas</string>
     <string name="settings_deactivate_account_section">Inaktivera konto</string>
@@ -742,7 +742,7 @@
     <string name="autodiscover_invalid_response">Ogiltigt hemserversvar</string>
     <string name="invalid_or_expired_credentials">Du har blivit utloggad på grund av ogiltiga eller utgångna uppgifter.</string>
 
-    <string name="sas_incoming_request_description">Verifiera den här sessionen för att markera den som pålitligt. Att lita på folks sessioner ger dig extra sinnesro när du skickar totalsträckskrypterade meddelanden.</string>
+    <string name="sas_incoming_request_description">Verifiera den här sessionen för att markera den som betrodd. Att lita på folks sessioner ger dig extra sinnesro när du skickar totalsträckskrypterade meddelanden.</string>
     <string name="sas_verified_successful_description">Säkra meddelanden mellan dig och den här användaren är totalsträckskrypterade och kommer inte att vara läsbara för tredje parter.</string>
     <string name="identity_server_not_defined">Du använder ingen identitetsserver</string>
 
@@ -774,7 +774,7 @@
     <string name="settings_discovery_disconnect_with_bound_pid">Du delar för närvarande e-postadresser och telefonnummer på hemservern %1$s. Du kommer behöva återansluta till %2$s för att sluta dela dem.</string>
     <string name="settings_agree_to_terms">Acceptera identitetsserverns (%s) användarvillkor för att låta dig själv vara upptäckbar med e-postadress eller telefonnummer.</string>
 
-    <string name="labs_allow_extended_logging_summary">Mångord loggar kommer att hjälpa utvecklare genom att skicka mer loggar när du skickar en raseriskakning. Även när det är aktiverat, så loggar appen inga meddelandeinnehåll eller annan privat data.</string>
+    <string name="labs_allow_extended_logging_summary">Mångordiga loggar kommer att hjälpa utvecklare genom att skicka mer loggar när du skickar en raseriskakning. Även när det är aktiverat, så loggar appen inga meddelandeinnehåll eller annan privat data.</string>
 
 
     <string name="a11y_show_password">Visa lösenord</string>
@@ -829,8 +829,8 @@
     <string name="login_set_msisdn_notice">Sätt ett telefonnummer som valfritt kan användas för att vara upptäckbar av folk som känner dig.</string>
     <string name="login_signin_username_hint">Användarnamn eller e-postadress</string>
     <string name="login_wait_for_email_title">Vänligen kolla din e-post</string>
-    <string name="login_wait_for_email_notice">Vi skickade just ett e-brev till %1$s.
-\nKlicka på länken i det för att fortsätta med kontoskapningen.</string>
+    <string name="login_wait_for_email_notice">Vi skickade just ett e-brev till %1$s. 
+\nKlicka på länken i det för att fortsätta med kontoskapandet.</string>
     <string name="login_error_outdated_homeserver_content">Den här hemservern kör en för gammal version för att ansluta till. Be administratören för hemservern att uppdatera.</string>
 
     <string name="soft_logout_signin_e2e_warning_notice">Logga in för att återfå krypteringsnycklar som endast lagras på den här enheten. Du behöver dem för att läsa alla dina säkra meddelanden på andra enheter.</string>
@@ -869,10 +869,10 @@
 
     <string name="room_settings_enable_encryption_dialog_content">Efter aktivering så kan kryptering inte avaktiveras. Meddelanden som skickas i ett krypterat rum kan inte läsas av servern, bara av deltagarna i rummet. Att aktivera kryptering kan kan göra att många bottar och bryggor inte funkar ordentligt.</string>
     <string name="verification_conclusion_ok_notice">Meddelanden mellan dig och den här användaren är totalsträckskrypterade och kan inte läsas av tredje parter.</string>
-    <string name="verification_conclusion_ok_self_notice">Din nya session är nu verifierad. Den har tillgång till dina krypterade meddelanden, och andra användare kommer att se den som pålitlig.</string>
+    <string name="verification_conclusion_ok_self_notice">Din nya session är nu verifierad. Den har tillgång till dina krypterade meddelanden, och andra användare kommer att se den som betrodd.</string>
 
 
-    <string name="settings_active_sessions_unverified_device_desc">Verifiera den här sessionen gör att markera den som pålitlig och ge den tillgång till dina krypterade meddelanden. Om det inte var du som loggade in i den här sessionen så kan ditt konto vara kapat:</string>
+    <string name="settings_active_sessions_unverified_device_desc">Verifiera den här sessionen gör att markera den som betrodd och ge den tillgång till dina krypterade meddelanden. Om det inte var du som loggade in i den här sessionen så kan ditt konto vara kapat:</string>
 
     <string name="verification_open_other_to_verify">Använd en existerande session för att verifiera den här och ge den tillgång till krypterade meddelanden.</string>
 
@@ -956,7 +956,7 @@
         <item quantity="other">%d nya meddelanden</item>
     </plurals>
 
-    <string name="ssl_expected_existing_expl">Certifikatet har ändrats från en pålitligt till en som vi inte litar på. Servern kan ha förnyat sitt certifikat. Kontakta serveradministratören för det förväntade fingeravtrycket.</string>
+    <string name="ssl_expected_existing_expl">Certifikatet har ändrats från ett betrott till ett som inte är betrott. Servern kan ha förnyat sitt certifikat. Kontakta serveradministratören för det förväntade fingeravtrycket.</string>
     <string name="room_details_settings">Inställningar</string>
     <string name="room_sliding_menu_settings">Inställningar</string>
     <string name="settings_troubleshoot_test_system_settings_title">Systeminställningar.</string>
@@ -969,8 +969,8 @@
 
     <string name="settings_notification_privacy_normal">Normal</string>
     <string name="settings_integrations">Integrationer</string>
-    <string name="settings_integrations_summary">Använd en integrationshanterare för att hantera bottar, bryggor, widgets och klistermärkespaket.
-\nIntegrationshanterare får konfigurationsdata, och kan ändra widgets, skicka rumsinbjudningar, och ändra användarnivåer å dina vägnar.</string>
+    <string name="settings_integrations_summary">Använd en integrationshanterare för att hantera bottar, bryggor, widgets och dekalpaket. 
+\nIntegrationshanterare får konfigurationsdata, och kan ändra widgets, skicka rumsinbjudningar, och ändra behörighetsnivåer å dina vägnar.</string>
     <string name="settings_send_message_with_enter">Skicka meddelande med retur</string>
     <string name="settings_send_message_with_enter_summary">Returtangenten på mjukvarutangentbordet kommer att skicka ett meddelande istället för att lägga till ett radslut</string>
 
@@ -1050,7 +1050,7 @@
     <string name="labs_merge_e2e_in_timeline">Sammanfogaren misslyckades med att avkryptera ett meddelande i tidslinjen</string>
     <string name="add_by_matrix_id">Lägg till med Matrix-ID</string>
     <string name="direct_room_no_known_users">Inga resultat hittade, använd \"Lägg till med Matrix-ID\" för att söka på servern.</string>
-    <string name="terms_description_for_integration_manager">Använd bottar, bryggor, widgets och klistermärkespaket</string>
+    <string name="terms_description_for_integration_manager">Använd bottar, bryggor, widgets och dekalpaket</string>
 
     <string name="settings_text_message_sent">Ett textmeddelande har skickats till %s. Vänligen skriv in verifieringskoden det innehåller.</string>
     <string name="error_file_too_big">Filen \'%1$s\' (%2$s) är för stor för att laddas upp. Gränsen är %3$s.</string>
@@ -1060,14 +1060,14 @@
     <string name="attachment_type_camera">Kamera</string>
     <string name="attachment_type_audio">Ljud</string>
     <string name="attachment_type_gallery">Galleri</string>
-    <string name="attachment_type_sticker">Klistermärke</string>
+    <string name="attachment_type_sticker">Dekal</string>
     <string name="command_description_spoiler">Skickar det valda meddelandet som en spoiler</string>
     <string name="login_server_matrix_org_text">Gå med miljontals användare gratis på den största publika servern</string>
     <string name="command_description_shrug">Lägger till ¯\\_(ツ)_/¯ till början av ett textmeddelande</string>
 
     <string name="sent_an_audio_file">Ljud</string>
     <string name="sent_a_file">Fil</string>
-    <string name="send_a_sticker">Klistermärke</string>
+    <string name="send_a_sticker">Dekal</string>
 
     <string name="rendering_event_error_type_of_message_not_handled">Element hanterar inte meddelanden av typen \'%1$s\'</string>
     <string name="command_description_rainbow">Skickar det valda meddelandet I regnbågsfärger</string>
@@ -1101,8 +1101,1435 @@
     <string name="notice_crypto_unable_to_decrypt_friendly">Väntar på det här meddelandet, det här kan ta ett tag</string>
     <string name="notice_crypto_unable_to_decrypt_friendly_desc">Vid totalsträckskryptering så kan du behöva vänta på att någons meddelande ska komma för att krypteringsnycklarna inte har skickats till dig.</string>
     <string name="crypto_error_withheld_blacklisted">Du kan inte komma åt det här meddelandet för att du har blockerats av avsändaren</string>
-    <string name="crypto_error_withheld_unverified">Du kan inte komma åt det här meddelandet för att avsändaren inte litar på din session</string>
+    <string name="crypto_error_withheld_unverified">Du kan inte komma åt det här meddelandet för att din session inte är betrodd av avsändaren</string>
     <string name="crypto_error_withheld_generic">Du kan inte komma åt det här meddelandet för att avsändaren avsiktligt inte skickade nycklarna</string>
     <string name="search_in_my_contacts">Sök i mina kontakter</string>
     <string name="empty_contact_book">Din kontaktbok är tom</string>
+    <string name="no_permissions_to_start_conf_call">Du har inte behörighet att starta ett gruppsamtal i det här rummet</string>
+    <string name="conference_call_in_progress">Ett gruppsamtal pågår redan!</string>
+    <string name="video_meeting">Starta videomöte</string>
+    <string name="audio_meeting">Starta ljudmöte</string>
+    <string name="audio_video_meeting_description">Möten använder Jitsis säkerhets- och behörighetsprinciper. Alla personer nu i rummet kommer att se en inbjudan för att gå med medans mötet pågår.</string>
+    <string name="cannot_call_yourself">Du kan inte ringa ett samtal till dig själv</string>
+    <string name="cannot_call_yourself_with_invite">Du kan inte ringa ett samtal till dig själv, vänta tills deltagare accepterar inbjudan</string>
+    <string name="failed_to_add_widget">Misslyckades att lägga till widget</string>
+    <string name="failed_to_remove_widget">Misslyckades att ta bort widget</string>
+    <string name="call_failed_no_connection">Elementsamtal misslyckades</string>
+    <string name="call_failed_no_connection_description">Misslyckades att upprätta en realtidsuppkoppling.
+\nVänligen be administratören för din hemserver att konfigurera en TURN-server för att samtal ska fungera pålitligt.</string>
+
+    <string name="call_select_sound_device">Välj ljudenhet</string>
+    <string name="sound_device_phone">Telefon</string>
+    <string name="sound_device_speaker">Högtalare</string>
+    <string name="sound_device_headset">Hörlurar</string>
+    <string name="sound_device_wireless_headset">Trådlösa hörlurar</string>
+    <string name="call_camera_front">Fram</string>
+    <string name="call_camera_back">Bak</string>
+    <string name="call_format_turn_hd_off">Stäng av HD</string>
+    <string name="call_format_turn_hd_on">Sätt på HD</string>
+
+    <string name="login_error_ssl_peer_unverified">SSL-fel: andra partens identitet har inte verifierats.</string>
+    <string name="login_error_ssl_other">SSL-fel.</string>
+    <string name="settings_call_show_confirmation_dialog_title">Förhindra oavsiktligt samtal</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Fråga efter bekräftelse innan ett samtal startas</string>
+    <string name="active_call_with_duration">Aktivt samtal (%s)</string>
+    <string name="return_to_call">Återgå till samtal</string>
+
+    <string name="room_participants_action_cancel_invite">Avbryt inbjudan</string>
+    <string name="room_participants_action_mention">Omnämn</string>
+    <string name="room_participants_action_devices_list">Visa sessionslista</string>
+    <string name="room_participants_power_level_prompt">Du kommer inte kunna ångra den här ändringen eftersom du befordrar användaren till samma behörighetsnivå som dig själv.
+\nÄr du säker\?</string>
+
+    <string name="room_participants_power_level_demote_warning_title">Degradera dig själv\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Du kommer inte kunna ångra den här ändringen eftersom du degraderar dig själv. Om du är den sista privilegierade användaren i det här rummet så kommer det att vara omöjligt att återfå privilegier.</string>
+    <string name="room_participants_power_level_demote">Degradera</string>
+
+
+    <string name="room_participants_action_ignore_title">Ignorera användare</string>
+    <string name="room_participants_action_unignore_title">Avignorera användare</string>
+    <string name="room_participants_action_unignore_prompt_msg">Att avignorera den här användaren kommer att visa alla meddelanden från hen igen.</string>
+    <string name="room_participants_action_cancel_invite_title">Avbryt inbjudan</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Är du säker på att du vill avbryta inbjudan för den här användaren\?</string>
+    <string name="room_participants_kick_title">Kicka användaren</string>
+    <string name="room_participants_kick_reason">Anledning för kick</string>
+    <string name="room_participants_kick_prompt_msg">att sparka ut användaren kommer att ta bort hen från det här rummet.
+\n
+\nFör att hindra hen från att gå med i rummet igen så bör du banna hen istället.</string>
+    <string name="room_participants_ban_title">Banna användaren</string>
+    <string name="room_participants_ban_reason">Anledning för bann</string>
+    <string name="room_participants_unban_title">Avbanna användaren</string>
+    <string name="room_participants_ban_prompt_msg">Att banna användaren kommer att kicka hen från det här rummet och hindra hen från att gå med igen.</string>
+    <string name="room_participants_unban_prompt_msg">Att avbanna användaren kommer att låta hen gå med i rummet igen.</string>
+
+    <string name="reason_hint">Anledning</string>
+
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="room_participants_invite_join_names_and">%1$s och %2$s</string>
+    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
+
+    <string name="people_search_local_contacts">LOKALA KONTAKTER (%d)</string>
+    <string name="people_search_user_directory">ANVÄNDARKATALOG (%s)</string>
+    <string name="people_search_filter_text">Endast Matrixanvändare</string>
+
+    <string name="room_menu_search">Sök</string>
+    <string name="room_one_user_is_typing">%s skriver…</string>
+    <string name="room_two_users_are_typing">%1$s och %2$s skriver…</string>
+    <string name="room_many_users_are_typing">%1$s, %2$s och andra skriver…</string>
+    <string name="room_message_placeholder_reply_to_encrypted">Skicka ett krypterat svar…</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">Skicka ett svar (okrypterat)…</string>
+    <string name="room_offline_notification">Anslutningen till servern har tappats.</string>
+    <string name="room_unsent_messages_notification">Meddelanden skickades inte. %1$s eller %2$s nu\?</string>
+    <string name="room_unknown_devices_messages_notification">Meddelanden skickades inte eftersom en okänd session närvarar. %1$s eller %2$s nu\?</string>
+    <string name="room_prompt_resend">Skicka alla igen</string>
+    <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="ssl_trust">Betro</string>
+    <string name="ssl_do_not_trust">Betro inte</string>
+    <string name="ssl_logout_account">Logga ut</string>
+    <string name="ssl_remain_offline">Ignorera</string>
+    <string name="ssl_fingerprint_hash">Fingeravtryck (%s):</string>
+    <string name="ssl_cert_not_trust">Detta kan betyda att någon med uppsåt fångar upp din trafik, eller att din mobil inte litar på certifikatet som skickades av servern.</string>
+    <string name="ssl_cert_new_account_expl">Om serveradministratören har sagt att detta är förväntat, försäkra att fingeravtrycket nedan matchar fingeravtrycket de angav.</string>
+    <string name="ssl_unexpected_existing_expl">Certifikatet har ändrats från ett som var betrott av din mobil. Detta är HÖGST OVANLIGT. Du rekommenderas att INTE ACCEPTERA det nya certifikatet.</string>
+    <string name="ssl_only_accept">Acceptera endast certifikatet om serveradministratören har publicerat ett fingeravtryck som matchar det ovan.</string>
+
+    <plurals name="room_details_selected">
+        <item quantity="one">1 valt</item>
+        <item quantity="other">%d valda</item>
+    </plurals>
+    <string name="room_details_people_invited_group_name">INBJUDNA</string>
+    <string name="room_details_people_present_group_name">ANSLUTNA</string>
+
+    <string name="room_event_action_report_prompt_reason">Anledning för att rapportera det här innehållet</string>
+    <string name="room_event_action_cancel_upload">Avbryt uppladdning</string>
+    <string name="room_event_action_cancel_download">Avbryt nedladdning</string>
+
+    <string name="search_hint">Sök</string>
+    <string name="search_no_results">Inga resultat</string>
+    <string name="tab_title_search_messages">MEDDELANDEN</string>
+    <string name="room_recents_join">GÅ MED</string>
+    <string name="room_recents_directory">KATALOG</string>
+    <string name="room_recents_favourites">FAVORITER</string>
+    <string name="room_recents_low_priority">LÅG PRIORITET</string>
+    <string name="room_recents_invites">INBJUDNINGAR</string>
+    <string name="room_recents_start_chat">Starta chatt</string>
+    <string name="room_recents_create_room">Skapa rum</string>
+    <string name="room_recents_join_room">Gå med i rum</string>
+    <string name="room_recents_join_room_title">Gå med i ett rum</string>
+    <string name="room_recents_join_room_prompt">Skriv ett rums-ID eller ett rumsalias</string>
+
+    <string name="directory_search_results_title">Bläddra i katalogen</string>
+    <string name="directory_searching_title">Söker i katalog…</string>
+
+    <string name="room_settings_favourite">Favorit</string>
+    <string name="room_settings_de_prioritize">Nedprioritera</string>
+    <string name="room_settings_forget">Glöm</string>
+    <string name="room_settings_add_homescreen_shortcut">Lägg till en genväg på hemskärmen</string>
+
+    <string name="room_sliding_menu_messages">Meddelanden</string>
+    <string name="room_sliding_menu_term_and_conditions">Användarvillkor</string>
+    <string name="room_sliding_menu_third_party_notices">Meddelanden från tredje part</string>
+    <string name="room_sliding_menu_copyright">Upphovsrätt</string>
+    <string name="room_sliding_menu_privacy_policy">Integritetspolicy</string>
+
+    <string name="settings_phone_number">Telefon</string>
+    <string name="settings_add_3pid_flow_not_supported">Du kan inte göra detta från element på mobilen</string>
+    <string name="settings_add_3pid_authentication_needed">Autentisering krävs</string>
+
+
+    <string name="settings_troubleshoot_diagnostic">Diagnostik för felsökning</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">Kör tester</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">Kör… (%1$d av %2$d)</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">Sätt på</string>
+
+    <string name="settings_troubleshoot_test_device_settings_quickfix">Sätt på</string>
+
+    <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Misslyckades att ladda anpassade regler, vänligen försök igen.</string>
+    <string name="settings_troubleshoot_test_play_services_title">Kolla Play-tjänster</string>
+    <string name="settings_troubleshoot_test_play_services_success">APK:n Google Play-tjänster är tillgänglig och uppdaterad.</string>
+    <string name="settings_troubleshoot_test_play_services_failed">Element använder Google Play-tjänster för att skicka pushmeddelanden, men den verkar inte vara korrekt konfigurerad:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_play_services_quickfix">Fixa Play-tjänster</string>
+
+    <string name="settings_troubleshoot_test_fcm_title">Firebase-token</string>
+    <string name="settings_troubleshoot_test_fcm_success">FCM-token hämtades framgångsrikt:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_failed">Misslyckades att hämta FCM-token:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nDet här felet är ur Elements kontroll, och enligt Google indikerar det här felet att den här enheten har för många appar registrerade med FCM. Felet händer endast i fall då extremt många appar är installerade, så det bör inte påverka normala användare.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nDet här felet är ur Elements kontroll. Det kan hända av flera anledningar. Det kanske funkar om du försöker igen senare, du kan kolla så att Google Play-tjänster inte är databegränsad i systeminställningarna, eller att enhetens klocka går rätt, eller så kan det hända på en alternativ ROM.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nDet här felet är ur Elements kontroll. Det finns inget Google-konto på telefonen. Vänligen öppna kontohanteraren och lägg till ett Google-konto.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Lägg till konto</string>
+
+    <string name="settings_troubleshoot_test_token_registration_title">Token-registrering</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCM-token registrerades framgångsrikt på hemservern.</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">Misslyckades att registrera FCM-token på hemservern:
+\n%1$s</string>
+
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Starta tjänst</string>
+
+    <string name="settings_troubleshoot_test_service_restart_success">Tjänsten dödades och startades om automatiskt.</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">Tjänsten misslyckades att starta om</string>
+
+    <string name="settings_troubleshoot_test_service_boot_title">Starta vid boot</string>
+    <string name="settings_troubleshoot_test_service_boot_success">Tjänsten kommer att startas när enheten startas om.</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">Aktivera start på boot</string>
+
+    <string name="settings_troubleshoot_test_bg_restricted_title">Kolla bakgrundsrestriktioner</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">Bakgrundsrestriktioner är inaktiverade för Element. Detta test bör köras med mobildata (inte Wi-Fi).
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Inaktivera restriktioner</string>
+
+    <string name="settings_troubleshoot_test_battery_title">Batterioptimering</string>
+    <string name="settings_troubleshoot_test_battery_success">Element påverkas inte av batterioptimering.</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Ignorera optimering</string>
+
+    <string name="settings_notification_privacy_reduced">Reducerad sekretess</string>
+    <string name="settings_notification_privacy_need_permission">Den här appen behöver behörighet att köra i bakgrunden</string>
+    <string name="settings_notification_privacy_no_background_sync">Apparna behöver <b>inte</b> ansluta till hemservern i bakgrunden, det bör reducera batterianvändning</string>
+    <string name="settings_turn_screen_on">Tänd skärmen i 3 sekunder</string>
+    <string name="settings_background_sync">Bakgrundssynkronisering</string>
+    <string name="settings_background_fdroid_sync_mode">Bakgrundssynkläge (experimentellt)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimerad för batteri</string>
+    <string name="settings_app_term_conditions">Användarvillkor</string>
+    <string name="settings_third_party_notices">Meddelanden från tredje part</string>
+    <string name="settings_copyright">Upphovsrätt</string>
+    <string name="settings_privacy_policy">Integritetspolicy</string>
+    <string name="settings_other">Annat</string>
+    <string name="settings_cryptography">Kryptografi</string>
+    <string name="settings_cryptography_manage_keys">Hantering av kryptografiska nycklar</string>
+    <string name="settings_devices_list">Sessioner</string>
+    <string name="settings_send_typing_notifs_summary">Låt andra användare se när du skriver.</string>
+    <string name="settings_send_markdown">Markdownformatering</string>
+    <string name="settings_show_read_receipts">Visa läsindikationer</string>
+    <string name="settings_show_read_receipts_summary">Tryck på läsindikationer för en detaljerad lista.</string>
+    <string name="settings_secure_backup_section_title">Säker säkerhetskopiering</string>
+    <string name="settings_secure_backup_setup">Sätt upp säker säkerhetskopiering</string>
+    <string name="settings_secure_backup_reset">Återställ säker säkerhetskopiering</string>
+    <string name="settings_secure_backup_enter_to_setup">Sätt upp på den här enheten</string>
+    <string name="reset_secure_backup_title">Generera en ny säkerhetskopia eller sätt en ny lösenfras för din existerande säkerhetskopia.</string>
+    <string name="devices_details_dialog_title">Sessionsinformation</string>
+    <string name="room_settings_labs_warning_message">Detta är experimentella funktioner som kan gå sönder på oväntade sätt. Använd varsamt.</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Kryptera endast till verifierade sessioner</string>
+    <string name="encryption_information_algorithm">Algoritm</string>
+    <string name="encryption_information_session_id">Sessions-ID</string>
+    <string name="encryption_information_sender_device_information">Avsändarens sessionsinformation</string>
+    <string name="encryption_information_device_id">Sessions-ID</string>
+    <string name="encryption_information_device_key">Sessionsnyckel</string>
+    <string name="encryption_export_e2e_room_keys">Exportera krypteringsnycklar</string>
+    <string name="encryption_export_room_keys">Exportera rumsnycklar</string>
+    <string name="encryption_export_export">Exportera</string>
+    <string name="encryption_export_notice">Vänligen skapa en lösenfras för att kryptera de exporterade nycklarna. Du kommer behöva skriva in samma lösenfras för att kunna importera nycklarna.</string>
+    <string name="encryption_settings_manage_message_recovery_summary">Hantera nyckelsäkerhetskopiering</string>
+
+    <string name="encryption_import_e2e_room_keys">Importera krypteringsnycklar</string>
+    <string name="encryption_import_room_keys">Importera rumsnycklar</string>
+    <string name="encryption_import_import">Importera</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Kryptera endast till verifierade sessioner</string>
+    <string name="encryption_information_unknown_device">okänd session</string>
+    <string name="encryption_information_verify_device">Verifiera session</string>
+    <string name="unknown_devices_alert_title">Rummet innehåller okända sessioner</string>
+    <string name="settings_labs_enable_send_voice_summary">Detta alternativ kräver en tredjepartsapplikation för att spela in meddelandena.</string>
+    <string name="you_added_a_new_device">Du har lagt till en ny session \'%s\', vilken begär krypteringsnycklar.</string>
+    <string name="you_added_a_new_device_with_info">En ny session begär krypteringsnycklar. Sessionsnamn: %1$s
+\nSenast sedd: %2$s
+\nOm du inte loggade in i en annan session, ignorera denna begäran.</string>
+    <string name="your_unverified_device_requesting">Din overifierade session \'%s\' begär krypteringsnycklar.</string>
+    <string name="your_unverified_device_requesting_with_info">En ny session begär krypteringsnycklar.
+\nSessionsnamn: %1$s
+\nSenast sedd: %2$s
+\nOm du inte loggade in i en annan session, ignorera denna begäran.</string>
+
+    <string name="markdown_has_been_enabled">Markdown har aktiverats.</string>
+    <string name="markdown_has_been_disabled">Markdown har inaktiverats.</string>
+
+    <string name="dialog_user_consent_content">För att fortsätta använda hemservern %1$s så måste du läsa och godkänna användarvillkoren.</string>
+    <string name="keys_backup_no_session_error">Ingen Matrixsession tillgänglig</string>
+
+    <string name="keys_backup_setup">Börja använda nyckelsäkerhetskopiering</string>
+    <string name="keys_backup_setup_step1_manual_export">Exportera nycklar manuellt</string>
+
+    <string name="keys_backup_setup_step2_text_title">Säkra din säkerhetskopia med en lösenfras.</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Eller säkra din säkerhetskopia med en återställningsnyckel och spara den någonstans säkert.</string>
+    <string name="keys_backup_setup_step3_text_line1">Dina nycklar säkerhetskopieras.</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Det ser ut som att du redan har konfigurerat säker säkerhetskopiering från en annan session. Vill du ersätta den med den du skapar\?</string>
+    <string name="keys_backup_setup_backup_started_message">Dina krypteringsnycklar säkerhetskopieras just nu till din hemserver i bakgrunden. Den initiala säkerhetskopieringen kan ta flera minuter.</string>
+
+
+    <string name="keys_backup_restore_with_key_helper">Förlorat din återställningsnyckel\? Du kan sätta upp en ny i inställningarna.</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Säkerhetskopieringen kunde inte avkrypteras med den här återställningsnyckeln: vänligen verifiera att du skrev in rätt återställningsnyckel.</string>
+
+    <plurals name="keys_backup_restore_success_description_part1">
+        <item quantity="one">Återställde en säkerhetskopia med %d nyckel.</item>
+        <item quantity="other">Återställde en säkerhetskopia med %d nycklar.</item>
+    </plurals>
+    <plurals name="keys_backup_restore_success_description_part2">
+        <item quantity="one">%d ny nyckel har lagts till till den här sessionen.</item>
+        <item quantity="other">%d nya nycklar har lagts till till den här sessionen.</item>
+    </plurals>
+
+    <string name="keys_backup_no_keysbackup_sdk_error">Sessionskrypto är inte aktiverats</string>
+
+
+    <string name="keys_backup_settings_restore_backup_button">Återställ från säkerhetskopia</string>
+    <string name="keys_backup_settings_delete_backup_button">Radera säkerhetskopia</string>
+
+    <string name="keys_backup_settings_status_ok">Nyckelsäkerhetskopiering har blivit korrekt konfigurerad för den här sessionen.</string>
+    <string name="keys_backup_settings_status_ko">Nyckelsäkerhetskopiering är inte aktiverad på den här sessionen.</string>
+    <string name="keys_backup_settings_status_not_setup">Dina nycklar säkerhetskopieras inte från den här sessionen.</string>
+
+    <string name="keys_backup_settings_signature_from_unknown_device">Säkerhetskopian har en signatur från en okänd session med ID %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Säkerhetskopian har en giltig signatur från den här sessionen.</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Säkerhetskopian har en giltig signatur från den verifierade sessionen %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Säkerhetskopian har en giltig signatur från den overifierade sessionen %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Säkerhetskopian har en ogiltig signatur från den verifierade sessionen %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Säkerhetskopian har en ogiltig signatur från den overifierade sessionen %s</string>
+    <string name="keys_backup_settings_untrusted_backup">För att använda nyckelsäkerhetskopiering i den här sessionen, återställ med din lösenfras eller återställningsnyckel nu.</string>
+    <string name="keys_backup_settings_delete_backup_error">Misslyckades att radera säkerhetskopia (%s)</string>
+
+    <string name="keys_backup_settings_delete_confirm_title">Radera säkerhetskopia</string>
+    <string name="new_recovery_method_popup_title">Ny nyckelsäkerhetskopia</string>
+    <string name="keys_backup_banner_setup_line2">Börja använda nyckelsäkerhetskopiering</string>
+
+    <string name="secure_backup_banner_setup_line1">Säker säkerhetskopiering</string>
+    <string name="keys_backup_banner_recover_line2">Använd nyckelsäkerhetskopiering</string>
+
+    <string name="keys_backup_banner_update_line2">Hantera i nyckelsäkerhetskopieringen</string>
+
+    <string name="secure_backup_setup">Sätt upp säker säkerhetskopiering</string>
+
+    <string name="keys_backup_info_keys_all_backup_up">Alla nycklar säkerhetskopierade</string>
+    <string name="keys_backup_info_title_algorithm">Algoritm</string>
+    <string name="sas_incoming_request_description_2">Att verifiera den här sessionen kommer att markera den som betrodd, och även markera din session som betrodd för den andra parten.</string>
+
+    <string name="sas_emoji_description">Verifiera den här sessionen genom att bekräfta att följande emojier visas på den andra partens skärm</string>
+    <string name="sas_decimal_description">Verifiera den här sessionen genom att bekräfta att följande nummer visas på den andra partens skärm</string>
+
+    <string name="sas_verified_successful">Du har framgångsrikt verifierat den här sessionen.</string>
+    <string name="sas_cancelled_by_other">Den andra parten avbröt verifikationen.
+\n%s</string>
+    <string name="sas_verification_request_notification_channel">Interaktiv sessionsverifiering</string>
+    <string name="sas_incoming_request_notif_content">%s vill verifiera din session</string>
+
+    <string name="sas_error_m_unknown_transaction">Sessionen känner inte till den överföringen</string>
+    <string name="sas_error_m_unknown_method">Sessionen kan inte komma överens om ett nyckelavtal, hash, MAC eller SAS-metod</string>
+    <string name="settings_show_redacted">Visa borttagna meddelanden</string>
+    <string name="settings_show_redacted_summary">Visa en platshållare för borttagna meddelanden</string>
+    <string name="settings_other_third_party_notices">Annan information från tredje part</string>
+    <string name="settings_push_rules">Pushregler</string>
+    <string name="settings_push_rules_no_rules">Inga pushregler satta</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">Visa dolda händelser i tidslinjen</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Tillåt att svajpa för att svara i tidslinjen</string>
+    <string name="labs_show_unread_notifications_as_tab">Lägg till en dedikerad flik för olästa aviseringar på startskärmen.</string>
+
+    <string name="labs_allow_extended_logging">Aktivera mångordiga loggar.</string>
+    <string name="error_terms_not_accepted">Vänligen försök igen när du har godkänt användarvillkoren för din hemserver.</string>
+
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s och %3$d annan har läst</item>
+        <item quantity="other">%1$s, %2$s och %3$d andra har läst</item>
+    </plurals>
+    <string name="permissions_rationale_msg_keys_backup_export">Element behöver behörighet för att spara dina nycklar för totalsträckskryptering i lagringen.
+\n
+\nVänligen ge tillstånd i nästa popup för att kunna manuellt exportera dina nycklar.</string>
+
+    <string name="no_ignored_users">Du ignorerar inga användare</string>
+
+    <string name="login_server_other_title">Annan</string>
+    <string name="login_signin_matrix_id_notice">Om du har skapat ett konto på en hemserver så kan du använda ditt Matrix-ID (t.ex. @användare:domän.com) och lösenord nedan.</string>
+    <string name="signed_out_notice">Detta kan bero på flera orsaker:
+\n
+\n• Du har ändrat ditt lösenord från en annan session.
+\n
+\n• Du har tagit bort den här sessionen från en annan session.
+\n
+\n• Serveradministratören har tagit bort din åtkomst av säkerhetsskäl.</string>
+    <string name="soft_logout_clear_data_notice">Varning: Din personliga data (inklusive krypteringsnycklar) lagras fortfarande på den här enheten.
+\n
+\nRensa den om du inte ska använda den här enheten längre, eller vill logga in på ett annat konto.</string>
+    <string name="soft_logout_sso_not_same_user_error">Den nuvarande sessionen är för användaren %1$s och du försedde uppgifter för användaren %2$s. Detta stöds inte av Element.
+\nVänligen rensa först data, och logga sen in på ett annat konto.</string>
+
+    <string name="settings_show_devices_list">Se alla mina sessioner</string>
+    <string name="settings_developer_mode">Utvecklarläge</string>
+    <string name="settings_developer_mode_summary">Utvecklarläget aktiverar dolda funktioner och kan också göra appen mindre stabil. Endast för utvecklare!</string>
+    <string name="settings_rageshake">Raseriskakning</string>
+    <string name="settings_rageshake_detection_threshold">Detektionsgräns</string>
+    <string name="settings_rageshake_detection_threshold_summary">Skaka din mobil för att testa detektionsgränsen</string>
+    <string name="devices_current_device">Nuvarande session</string>
+    <string name="devices_other_devices">Andra sessioner</string>
+
+    <string name="settings_developer_mode_fail_fast_title">Misslyckas snabbt</string>
+    <string name="verification_conclusion_compromised">En av följande kan vara äventyrad:
+\n
+\n - Din hemserver
+\n - Hemservern användaren du verifierar är ansluten till
+\n - Din eller den andra användarens internetanslutning
+\n - Din eller den andra användarens enhet</string>
+
+    <string name="verification_verify_device">Verifiera den här sessionen</string>
+    <string name="verification_scan_notice">Skanna koden med den andra användarens enhet för att säkert verifiera varandra</string>
+    <string name="settings_category_timeline">Tidslinje</string>
+
+    <string name="verification_code_notice">Jämför koden med den som visas på den andra användarens skärm.</string>
+    <string name="encryption_information_cross_signing_state">Korssignering</string>
+    <string name="encryption_information_dg_xsigning_complete">Korssignering är aktiverad
+\nPrivata nycklar finns på enheten.</string>
+    <string name="encryption_information_dg_xsigning_trusted">Korssignering är aktiverad
+\nNycklar är betrodda.
+\nPrivata nycklar är inte kända</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">Korssignering är aktiverad
+\nNycklar är inte betrodda</string>
+    <string name="encryption_information_dg_xsigning_disabled">Korssignering är inte aktiverat</string>
+
+    <string name="settings_active_sessions_list">Aktiva sessioner</string>
+    <string name="settings_active_sessions_show_all">Visa alla sessioner</string>
+    <string name="settings_active_sessions_manage">Hantera sessioner</string>
+    <string name="settings_active_sessions_signout_device">Logga ut ur den här sessionen</string>
+
+    <string name="settings_active_sessions_verified_device_desc">Den här sessionen är betrodd för säker kommunikation för att du verifierade den:</string>
+    <plurals name="settings_active_sessions_count">
+        <item quantity="one">%d aktiv session</item>
+        <item quantity="other">%d aktiva sessioner</item>
+    </plurals>
+
+    <string name="crosssigning_other_user_not_trust">Andra användare kanske inte litar på den</string>
+    <string name="room_member_profile_failed_to_get_devices">Misslyckades att hämta sessioner</string>
+    <string name="room_member_profile_sessions_section_title">Sessioner</string>
+    <string name="verification_profile_device_verified_because">Den här sessionen är betrodd för säker kommunikationen för säker kommunikation för att %1$s (%2$s) verifierade den:</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) loggade in i en ny session:</string>
+    <string name="verification_profile_device_untrust_info">Tills den här användaren litar på den här sessionen så kommer meddelanden skickade till och från den att bli märkta med varningar. Alternativt så kan du manuellt verifiera den.</string>
+
+
+    <string name="settings_dev_tools">Utvecklarverktyg</string>
+    <string name="settings_account_data">Kontodata</string>
+    <string name="verification_use_passphrase">Om du inte kan komma åt en existerande session</string>
+
+    <string name="settings_key_requests">Nyckelförfrågningar</string>
+
+    <string name="verify_not_me_self_verification">En av följande kan vara äventyrad:
+\n
+\n- Ditt lösenord
+\n- Din hemserver
+\n- Den här enheten, eller den andra enheten
+\n- Internetuppkopplingen en av enheterna använder
+\n
+\nVi rekommenderar att du ändrar ditt lösenord och återställningsnyckel i inställningarna omedelbart.</string>
+
+    <string name="bootstrap_crosssigning_progress_key_backup">Sätter upp nyckelsäkerhetskopiering</string>
+
+
+    <string name="bootstrap_crosssigning_save_usb">Spara den på ett USB-minne eller en säkerhetskopieringsenhet</string>
+    <string name="qr_code_scanned_self_verif_notice">Nästan färdigt! Visar den andra enheten samma sköld\?</string>
+    <string name="error_failed_to_import_keys">Misslyckades att importera nycklar</string>
+
+    <string name="setup_cross_signing">Aktivera korssignering</string>
+    <string name="bootstrap_progress_checking_backup">Kollar säkerhetskopieringsnyckel</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Kollar säkerhetskopieringsnyckel (%s)</string>
+    <string name="bootstrap_migration_enter_backup_password">Skriv in din lösenfras för säkerhetskopiering för att fortsätta.</string>
+    <string name="bootstrap_migration_use_recovery_key">använda din återställningsnyckel för säkerhetskopiering</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Om du inte känner till din lösenfras för säkerhetskopia så kan du %s.</string>
+    <string name="bootstrap_migration_backup_recovery_key">Återställningsnyckel för säkerhetskopiering</string>
+
+    <string name="settings_security_prevent_screenshots_title">Förhindra skärmdumpar av appen</string>
+    <string name="settings_security_prevent_screenshots_summary">Att aktivera den här inställningen lägger till FLAG_SECURE till alla aktiviteter. Starta om appen för att inställningen ska få effekt.</string>
+
+    <string name="use_other_session_content_description">Använd senaste Element på dina andra enheter; Element Web, Element iOS, Element för Android, eller annan Matrixklient som stöder korssignering</string>
+    <string name="or_other_mx_capabale_client">eller en annan Matrixklient som städer korssignering</string>
+    <string name="use_latest_app">Använd senaste Element på dina andra enheter:</string>
+    <string name="command_description_discard_session">Tvingar den nuvarande utgående gruppsessionen i ett krypterat rum att kasseras</string>
+    <string name="keys_backup_recovery_key_error_decrypt">Säkerhetskopian kunde inte avkrypteras med den här återställningsnyckeln: vänligen verifiera att du skrev in rätt återställningsnyckel.</string>
+    <string name="settings_setup_secure_backup">Sätt upp säker säkerhetskopiering</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">Säker säkerhetskopiering</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Sätt upp</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Skriv in en hemlig fras endast du känner till, och generera en nyckel för säkerhetskopiering.</string>
+
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element kommer att synka i bakgrunden på ett sätt som sparar på enhetens begränsade resurser (batteri).
+\nBeroende på din enhets resurser, så kan synkroniseringen bli uppskjuten av operativsystemet.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimerad för realtid</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Ingen bakgrundssynk</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Du kommer inte att bli aviserad om inkommande meddelanden när appen är i bakgrunden.</string>
+    <string name="settings_background_sync_update_error">Misslyckades att uppdatera inställningarna.</string>
+
+
+    <string name="settings_start_on_boot">Starta vid boot</string>
+    <string name="settings_enable_background_sync">Aktivera bakgrundssynk</string>
+    <string name="settings_set_sync_timeout">Timeout för synkbegäran</string>
+    <string name="settings_set_workmanager_delay">Föredraget synkintervall</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nSynkroniseringen kan skjutas upp beroende på resurserna (batteri) eller status för enheten (vila).</string>
+    <string name="settings_set_sync_delay">Fördröjning mellan varje synkronisering</string>
+    <string name="settings_second">sekund</string>
+    <string name="settings_seconds">sekunder</string>
+
+    <string name="settings_contact">Lokala kontakter</string>
+    <string name="settings_contacts_app_permission">Kontaktbehörighet</string>
+    <string name="settings_contacts_phonebook_country">Land för telefonbok</string>
+    <string name="settings_home_display">Hemskärm</string>
+    <string name="settings_inline_url_preview">Inbäddade URL-förhandsgranskningar</string>
+    <string name="settings_inline_url_preview_summary">Förhandsgranska länkar i chatten om din hemserver stöder den här funktionen.</string>
+    <string name="settings_12_24_timestamps">Visa tidsstämplar i 12-timmarsformat</string>
+    <string name="settings_show_join_leave_messages_summary">Inbjudningar, utsparkningar och bann påverkas inte.</string>
+    <string name="settings_show_avatar_display_name_changes_messages">Visa kontohändelser</string>
+    <string name="settings_vibrate_on_mention">Vibrera när en användare nämns</string>
+    <string name="settings_secure_backup_manage">Hantera</string>
+    <string name="reset_secure_backup_warning">Detta kommer att ersätta din nuvarande nyckel eller fras.</string>
+
+    <string name="startup_notification_privacy_button_grant">Ge behörighet</string>
+    <string name="startup_notification_privacy_button_other">Välj ett annat alternativ</string>
+
+    <string name="startup_notification_fdroid_battery_optim_title">Bakgrundsanslutning</string>
+    <string name="startup_notification_fdroid_battery_optim_button_grant">Ge behörighet</string>
+
+    <string name="settings_analytics">Statistik</string>
+    <string name="settings_opt_in_of_analytics">Skicka statistikdata</string>
+    <string name="settings_opt_in_of_analytics_summary">Element samlar in anonym statistik för att låta oss förbättra appen.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Vänligen aktivera statistik för att hjälpa oss att förbättra Element.</string>
+    <string name="settings_opt_in_of_analytics_ok">Ja, jag vill hjälpa till!</string>
+
+    <string name="settings_data_save_mode">Databesparingsläge</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="devices_details_name_title">Publikt namna</string>
+    <string name="devices_details_device_name">Uppdatera publikt namn</string>
+    <string name="devices_details_last_seen_title">Senast sedd</string>
+    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+    <string name="devices_delete_dialog_title">Autentisering</string>
+    <string name="devices_delete_submit_button_label">Skicka in</string>
+
+    <string name="settings_integration_manager">Integrationshanterare</string>
+
+    <string name="account_email_validation_title">Verifikation pågår</string>
+    <string name="account_phone_number_already_used_error">Det här telefonnumret används redan.</string>
+    <string name="passwords_do_not_match">Lösenorden matchar inte</string>
+
+    <string name="settings_delete_threepid_confirmation">Är du säker på att du vill ta bort %1$s %2$s\?</string>
+
+    <string name="settings_select_country">Välj ett land</string>
+
+    <string name="settings_phone_number_country_label">Land</string>
+    <string name="settings_phone_number_country_error">Vänligen välj ett land</string>
+    <string name="settings_phone_number_label">Telefonnummer</string>
+    <string name="settings_phone_number_error">Ogiltigt telefonnummer för det valda landet</string>
+    <string name="settings_phone_number_verification">Telefonverifiering</string>
+    <string name="settings_phone_number_verification_instruction">Vi har skickat ett SMS med en aktiveringskod. Vänligen skriv denna kod nedan.</string>
+    <string name="settings_phone_number_verification_error_empty_code">Skriv en aktiveringskod</string>
+    <string name="settings_phone_number_verification_error">Fel vid validering av ditt telefonnummer</string>
+    <string name="settings_phone_number_code">Kod</string>
+    <string name="account_phone_number_error">Ett fel inträffade vid verifiering av ditt telefonnummer.</string>
+    <string name="account_additional_info">Ytterligare info: %s</string>
+
+    <string name="settings_default_compression">Förvald komprimering</string>
+    <string name="compression_opt_list_choose">Välj</string>
+    <string name="media_source_choose">Välj</string>
+    <string name="settings_play_shutter_sound">Spela slutarljud</string>
+
+    <string name="media_saving_period_3_days">3 dagar</string>
+    <string name="media_saving_period_1_week">1 vecka</string>
+    <string name="media_saving_period_1_month">1 månad</string>
+    <string name="media_saving_period_forever">För alltid</string>
+
+    <string name="room_settings_room_photo">Rumsbild</string>
+    <string name="room_settings_room_name">Rumsnamn</string>
+    <string name="room_settings_topic">Ämne</string>
+    <string name="room_settings_room_tag">Rumsetikett</string>
+    <string name="room_settings_tag_pref_dialog_title">Märkt som:</string>
+
+    <string name="room_settings_tag_pref_entry_favourite">Favorit</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Låg prioritet</string>
+    <string name="room_settings_tag_pref_entry_none">Ingen</string>
+
+    <string name="room_settings_category_access_visibility_title">Behörighet och synlighet</string>
+    <string name="room_settings_directory_visibility">Lista det här rummet i rumskatalogen</string>
+    <string name="room_settings_room_access_rules_pref_title">Rumstillgång</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Synlighet för rumshistorik</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Vem kan läsa historiken\?</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Vem kan komma åt det här rummet\?</string>
+
+    <string name="room_settings_read_history_entry_anyone">Vem som helst</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Endast medlemmar (från när det här alternativet valdes)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Endast medlemmar (sen de bjöds in)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Endast medlemmar (sen de gick med)</string>
+
+    <string name="room_settings_room_access_warning">För att länka till ett rum så måste det ha en adress.</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Vem som helst som har rummets adress, förutom gäster</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Vem som helst som har rummets adress, inklusive gäster</string>
+
+    <string name="room_settings_banned_users_title">Bannade användare</string>
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d bannad användare</item>
+        <item quantity="other">%d bannade användare</item>
+    </plurals>
+
+    <string name="room_settings_room_internal_id">Rummets interna ID</string>
+    <string name="room_settings_addresses_pref_title">Adresser</string>
+    <string name="room_settings_labs_end_to_end_warnings">Du behöver logga ut för att kunna aktivera krypteringen.</string>
+    <string name="room_settings_addresses_no_local_addresses">Det här rummet har inga lokala adresser</string>
+    <string name="room_settings_addresses_add_new_address">Ny adress (t.ex. #foo:matrix.org)</string>
+
+    <string name="room_settings_add_new_group">Nytt gemenskaps-ID (t.ex. +foo:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Ogiltigt gemenskaps-ID</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' är inte ett giltigt gemenskaps-ID</string>
+
+
+    <string name="room_settings_addresses_invalid_format_dialog_title">Ogiltigt aliasformat</string>
+    <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' är inte ett giltigt format för ett alias</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">Du kommer inte att ha någon huvudadress specificerad för det här rummet.</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_title">Huvudadressvarningar</string>
+
+    <string name="room_settings_set_main_address">Sätt som huvudadress</string>
+    <string name="room_settings_unset_main_address">Avsätt som huvudadress</string>
+    <string name="room_settings_copy_room_id">Kopiera rums-ID</string>
+    <string name="room_settings_copy_room_address">Kopiera rumsadress</string>
+
+    <string name="room_settings_addresses_e2e_disabled">Kryptering är avaktiverat i det här rummet.</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">Aktivera kryptering
+\n(varning: kan inte avaktiveras igen!)</string>
+
+    <string name="directory_title">Katalog</string>
+    <string name="encryption_information_device_info">Händelseinformation</string>
+    <string name="encryption_information_user_id">Användar-ID</string>
+    <string name="encryption_information_curve25519_identity_key">Curve25519-identitetsnyckel</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">Gjorde anspråk på Ed25519-fingeravtrycksynyckel</string>
+    <string name="encryption_information_decryption_error">Avkrypteringsfel</string>
+
+    <string name="encryption_information_device_name">Publikt namn</string>
+    <string name="encryption_information_name">Publikt namn</string>
+    <string name="encryption_information_verification">Verifiering</string>
+    <string name="encryption_information_ed25519_fingerprint">Ed25519-fingeravtryck</string>
+
+    <string name="encryption_exported_successfully">Nycklar framgångsrikt importerade</string>
+
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d nyckel importerad framgångsrikt.</item>
+        <item quantity="other">%1$d/%2$d nycklar importerade framgångsrikt.</item>
+    </plurals>
+
+    <string name="encryption_information_not_verified">Inte verifierad</string>
+    <string name="encryption_information_verified">Verifierad</string>
+    <string name="encryption_information_blocked">Svartlistad</string>
+
+    <string name="encryption_information_unknown_ip">okänd IP</string>
+    <string name="encryption_information_none">ingen</string>
+
+    <string name="encryption_information_verify">Verifiera</string>
+    <string name="encryption_information_unverify">Avverifiera</string>
+    <string name="encryption_information_block">Svartlista</string>
+    <string name="encryption_information_unblock">Avsvartlista</string>
+
+    <string name="encryption_information_verify_device_warning2">Om de inte matchar så kan kommunikationens säkerhet vara äventyrad.</string>
+    <string name="encryption_information_verify_key_match">Jag verifierar att nycklarna matchar</string>
+
+    <string name="directory_server_fail_to_retrieve_server">Servern kan vara otillgänglig eller överbelastad</string>
+    <string name="directory_server_placeholder">Hemserver-URL</string>
+    <string name="lock_screen_hint">Skriv här…</string>
+
+    <string name="notification_unread_notified_messages_in_room">%1$s i %2$s</string>
+    <string name="notification_unknown_new_event">Ny händelse</string>
+    <string name="notification_unknown_room_name">Rum</string>
+    <string name="notification_new_messages">Nya meddelanden</string>
+    <string name="notification_new_invitation">Nya inbjudningar</string>
+    <string name="notification_sender_me">Jag</string>
+    <string name="notification_inline_reply_failed">** Misslyckades att skicka - vänligen öppna rummet</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+
+    <string name="historical_placeholder">Sök efter historiska</string>
+
+    <string name="widget_no_power_to_manage">Du behöver behörighet för att hantera widgets i det här rummet</string>
+    <string name="widget_creation_failure">Widgetskapande har misslyckats</string>
+    <string name="settings_labs_create_conference_with_jitsi">Skapa gruppsamtal med Jitsi</string>
+    <string name="widget_delete_message_confirmation">Är du säker på att du vill radera den här widgeten från det här rummet\?</string>
+    <plurals name="active_widgets">
+        <item quantity="one">1 aktiv widget</item>
+        <item quantity="other">%d aktiva widgets</item>
+    </plurals>
+    <string name="active_widget_view_action">VISA</string>
+    <string name="active_widgets_title">Aktiva widgets</string>
+
+
+    <string name="room_widget_activity_title">Widgets</string>
+    <string name="room_widget_permission_title">Ladda widget</string>
+    <string name="room_widget_permission_added_by">Den här widgeten lades till av:</string>
+    <string name="room_widget_permission_webview_shared_info_title">Att använda den kan sätta kakor och dela data med %s:</string>
+    <string name="room_widget_permission_shared_info_title">Att använda den kan dela data med %s:</string>
+    <string name="room_widget_failed_to_load">Misslyckades att ladda widgeten.
+\n%s</string>
+    <string name="room_widget_reload">Ladda om widget</string>
+    <string name="room_widget_open_in_browser">Öppna i webbläsaren</string>
+    <string name="room_widget_revoke_access">Återkalla tillgång för mig</string>
+
+    <string name="room_widget_permission_avatar_url">Din avatar-URL</string>
+    <string name="room_widget_permission_user_id">Ditt användar-ID</string>
+    <string name="room_widget_permission_widget_id">Widget-ID</string>
+    <string name="room_widget_permission_room_id">Rums-ID</string>
+
+
+    <string name="error_jitsi_not_supported_on_old_device">Tyvärr, gruppsamtal med Jitsi stöds inte på gamla enheter (enheter med Android äldre än 5.0)</string>
+    <string name="room_widget_resource_permission_title">Den här widgeten vill använda följande resurser:</string>
+    <string name="room_widget_resource_grant_permission">Tillåt</string>
+    <string name="room_widget_resource_decline_permission">Blockera alla</string>
+    <string name="room_widget_webview_access_microphone">Använd mikrofonen</string>
+    <string name="widget_integration_unable_to_create">Kunde inte skapa widgeten.</string>
+    <string name="widget_integration_failed_to_send_request">Misslyckades att skicka begäran.</string>
+    <string name="widget_integration_positive_power_level">Behörighetsnivå måste vara ett positivt heltal.</string>
+    <string name="widget_integration_must_be_in_room">Du är inte i det här rummet.</string>
+    <string name="widget_integration_no_permission_in_room">Du har inte behörighet att göra det i det här rummet.</string>
+    <string name="widget_integration_missing_room_id">Saknar room_id i begäran.</string>
+    <string name="widget_integration_missing_user_id">Saknar user_id i begäran.</string>
+    <string name="widget_integration_room_not_visible">Rummet %s är inte synligt.</string>
+    <string name="widget_integration_missing_parameter">En krävd parameter saknas.</string>
+    <string name="widget_integration_invalid_parameter">En parameter är inte giltig.</string>
+    <string name="integration_manager_not_configured">Ingen integrationshanterare konfigurerad.</string>
+    <string name="room_manage_integrations">Hantera integrationer</string>
+    <string name="room_no_active_widgets">Inga aktiva widgets</string>
+    <string name="settings_labs_enable_send_voice">Skicka röstmeddelanden</string>
+    <string name="widget_integration_review_terms">För att fortsätta behöver du acceptera villkoren för den här tjänsten.</string>
+
+    <string name="start_verification">Starta verifiering</string>
+    <string name="start_verification_short_label">Verifiera</string>
+    <string name="share_without_verifying">Dela utan att verifiera</string>
+    <string name="share_without_verifying_short_label">Dela</string>
+    <string name="key_share_request">Nyckeldelningsbegäran</string>
+    <string name="ignore_request">Ignorera begäran</string>
+    <string name="ignore_request_short_label">Ignorera</string>
+
+    <string name="conference_call_warning_title">Varning!</string>
+    <string name="conference_call_warning_message">Gruppsamtal är under utveckling och kanske inte är pålitligt.</string>
+
+    <string name="command_error">Kommandofel</string>
+    <string name="unrecognized_command">Okänt kommando: %s</string>
+    <string name="command_description_emote">Visar handling</string>
+    <string name="command_description_ban_user">Bannar användaren med det angivna ID:t</string>
+    <string name="command_description_unban_user">Avbannar användaren med det angivna ID:t</string>
+    <string name="command_description_op_user">Definiera behörighetsnivå för en användare</string>
+    <string name="command_description_deop_user">Avoppar användaren med det angivna ID:t</string>
+    <string name="command_description_invite_user">Bjuder in användaren med det angivna ID:t till det nuvarande rummet</string>
+    <string name="command_description_join_room">Går med i rummet med det angivna aliaset</string>
+    <string name="command_description_topic">Sätt ett rumsämne</string>
+    <string name="command_description_kick_user">Sparkar ut användaren med det angivna ID:t</string>
+    <string name="command_description_nick">Ändrar ditt visningsnamn</string>
+    <string name="command_description_clear_scalar_token">För att fixa Matrixapphantering</string>
+
+    <string name="create">Skapa</string>
+    <string name="create_community">Skapa gemenskap</string>
+    <string name="community_name">Gemenskapsnamn</string>
+    <string name="community_name_hint">Exempel</string>
+    <string name="community_id">Gemenskaps-ID</string>
+    <string name="community_id_hint">exempel</string>
+
+    <string name="group_details_home">Hem</string>
+    <string name="no_users_placeholder">Inga användare</string>
+
+    <string name="joined">Gick med</string>
+    <string name="invited">Bjöd in</string>
+    <plurals name="group_members">
+        <item quantity="one">1 medlem</item>
+        <item quantity="other">%d medlemmar</item>
+    </plurals>
+
+    <string name="group_no_long_description">Gemenskapsadministratören har inte försett en lång beskrivning för den här gemenskapen.</string>
+
+    <string name="has_been_kicked">Du har blivit utsparkad från %1$s av %2$s</string>
+    <string name="has_been_banned">Du har blivit bannad från %1$s av %2$s</string>
+    <string name="reason_colon">Orsak: %1$s</string>
+    <string name="rejoin">Gå med igen</string>
+    <string name="forget_room">Glöm rummet</string>
+
+    <string name="receipt_avatar">Läsindikationsavatar</string>
+    <string name="notice_avatar">Notisavatar</string>
+    <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_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>
+
+    <string name="resource_limit_exceeded_title">Resursgränsen överskriden</string>
+    <string name="resource_limit_soft_default">Hemservern har överskridit en av sina resursbegränsningar så <b>vissa användare kommer inte att kunna logga in</b>.</string>
+    <string name="resource_limit_hard_default">Den här hemservern har överskridit en av sina resursbegränsningar.</string>
+
+    <string name="resource_limit_soft_mau"> Den här hemservern har nått sin månatliga aktiva användargräns så <b>vissa användare kommer inte att kunna logga in</b>.</string>
+    <string name="resource_limit_hard_mau">Den här hemservern har nått sin månatliga aktiva användargräns.</string>
+
+    <string name="resource_limit_soft_contact">Vänligen %s för att öka den här gränsen.</string>
+    <string name="resource_limit_hard_contact">Vänligen %s för att fortsätta använda den här tjänsten.</string>
+
+    <string name="error_lazy_loading_not_supported_by_home_server">Din hemserver stöder inte fördröjd inladdning av rumsmedlemmar än. Försök igen senare.</string>
+
+    <string name="unknown_error">Tyvärr, ett fel inträffade</string>
+
+    <string name="merged_events_expand">expandera</string>
+    <string name="merged_events_collapse">kollapsa</string>
+
+    <string name="settings_info_area_show">Visa infoarean</string>
+    <string name="show_info_area_always">Alltid</string>
+    <string name="show_info_area_messages_and_errors">För meddelanden och fel</string>
+    <string name="show_info_area_only_errors">Endast för fel</string>
+
+    <string name="generic_label">%1$s:</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="plus_x">+%d</string>
+    <string name="x_plus">%d+</string>
+    <string name="passphrase_create_passphrase">Skapa lösenfras</string>
+    <string name="passphrase_confirm_passphrase">Bekräfta lösenfras</string>
+    <string name="passphrase_enter_passphrase">Skriv lösenfras</string>
+    <string name="passphrase_passphrase_does_not_match">Lösenfrasen matchar inte</string>
+    <string name="passphrase_empty_error_message">Vänligen skriv en lösenfras</string>
+    <string name="passphrase_passphrase_too_weak">Lösenfrasen är för svag</string>
+
+    <string name="keys_backup_passphrase_not_empty_error_message">Vänligen radera lösenfrasen om du vill att Element ska generera en återställningsnyckel.</string>
+    <string name="keys_backup_setup_step2_button_title">Sätt lösenfras</string>
+    <string name="keys_backup_setup_creating_backup">Skapar säkerhetskopia</string>
+    <string name="keys_backup_setup_step3_success_title">Framgång !</string>
+    <string name="keys_backup_setup_step3_button_title">Klar</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Jag har gjort en kopia</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Spara återställningnyckel</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">Dela</string>
+    <string name="recovery_key_export_saved">Återställningsnyckeln har sparats.</string>
+
+    <string name="keys_backup_setup_override_backup_prompt_tile">En säkerhetskopia finns redan på din hemserver</string>
+    <string name="keys_backup_setup_override_replace">Ersätt</string>
+    <string name="keys_backup_setup_override_stop">Stoppa</string>
+
+    <string name="keys_backup_setup_step3_please_make_copy">Vänligen gör en kopia</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Dela återställningsnyckel med…</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Genererar återställningsnyckel med hjälp av lösenfras, den här processen kan ta flera sekunder.</string>
+    <string name="recovery_key">Återställningsnyckel</string>
+    <string name="unexpected_error">Oväntat fel</string>
+    <string name="keys_backup_setup_backup_started_title">Säkerhetskopiering startad</string>
+    <string name="keys_backup_setup_skip_title">Är du säker\?</string>
+    <string name="keys_backup_setup_skip_msg">Du kan förlora åtkomst till dina meddelanden om du loggar ut ur eller förlorar den här enheten.</string>
+
+    <string name="keys_backup_restore_use_recovery_key">använd din återställningsnyckel</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Kan du inte din återställningslösenfras så kan du %s.</string>
+
+    <string name="keys_backup_restore_key_enter_hint">Skriv in återställningsnyckel</string>
+
+    <string name="keys_backup_passphrase_error_decrypt">Säkerhetskopian kunde inte avkrypteras med den här lösenfrasen: vänligen verifiera att du skrev in rätt lösenfras.</string>
+    <string name="network_error_please_check_and_retry">Nätverksfel: vänligen kolla din anslutning och försök igen.</string>
+
+    <string name="keys_backup_restoring_waiting_message">Återställer säkerhetskopia:</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Räknar ut återställningsnyckel…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">Laddar ner nycklar…</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">Importerar nycklar…</string>
+    <string name="keys_backup_unlock_button">Låser upp historia</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Vänligen skriv in en återställningsnyckel</string>
+    <string name="keys_backup_restore_success_title">Säkerhetskopia återställd %s !</string>
+    <string name="keys_backup_get_trust_error">Misslyckades att få betroendeinfo för säkerhetskopian (%s).</string>
+
+    <string name="keys_backup_settings_deleting_backup">Raderar säkerhetskopia…</string>
+    <string name="keys_backup_settings_checking_backup_state">Kollar status för säkerhetskopian</string>
+    <string name="new_recovery_method_popup_was_me">Det var jag</string>
+
+    <string name="keys_backup_banner_in_progress">Säkerhetskopierar dina nycklar. Detta kan ta flera minuter…</string>
+
+
+    <plurals name="keys_backup_info_keys_backing_up">
+        <item quantity="one">Säkerhetskopierar %d nyckel…</item>
+        <item quantity="other">Säkerhetskopierar %d nycklar…</item>
+    </plurals>
+
+    <string name="keys_backup_info_title_signature">Signatur</string>
+
+    <string name="autodiscover_well_known_autofill_dialog_title">Autokomplettera serveralternativ</string>
+    <string name="autodiscover_well_known_autofill_dialog_message">Element detekterade en anpassad serverkonfiguration för din användar-ID-domän \"%1$s\":
+\n%2$s</string>
+    <string name="autodiscover_well_known_autofill_confirm">Använd konfig</string>
+
+    <string name="sas_verify_title">Verifiera genom att jämföra en kort textsträng.</string>
+    <string name="sas_security_advise">För maximal säkerhet så rekommenderar vi att du gör det här personligen eller med en annan pålitlig form av kommunikation.</string>
+    <string name="sas_verify_start_button_title">Påbörja verifiering</string>
+    <string name="sas_incoming_request_title">Inkommande verifieringsbegäran</string>
+    <string name="sas_incoming_verification_request_dialog">Du mottog en inkommande verifieringsbegäran.</string>
+    <string name="sas_view_request_action">Visa begäran</string>
+    <string name="sas_waiting_for_partner">Väntar på att den andra parten ska bekräfta…</string>
+
+    <string name="sas_verified">Verifierad!</string>
+    <string name="sas_got_it">Jag förstår</string>
+
+    <string name="sas_verifying_keys">Dyker inget upp\? Inte alla klienter stöder interaktiv verifiering än. Använd legacyverifiering.</string>
+    <string name="sas_legacy_verification_button_title">Använd legacyverifiering.</string>
+
+    <string name="sas_verification_request_notification_channel_title">Nyckelverifiering</string>
+    <string name="sas_cancelled_dialog_title">Begäran avbruten</string>
+    <string name="sas_cancelled_by_me">Verifieringen är avbruten.
+\nAnledning: %s</string>
+
+    <string name="sas_incoming_request_notif_title">Verifieringsbegäran</string>
+    <string name="sas_error_m_user">Användaren avbröt verifieringen</string>
+    <string name="sas_error_m_timeout">Verifieringsprocessen timeade ut</string>
+    <string name="sas_error_m_mismatched_commitment">Hashåtagandet matchade inte</string>
+    <string name="sas_error_m_mismatched_sas">SAS:en matchade inte</string>
+    <string name="sas_error_m_key_mismatch">Nyckelmismatch</string>
+    <string name="sas_error_m_user_error">Användarmismatch</string>
+    <string name="sas_error_unknown">Okänt fel</string>
+
+    <string name="error_user_already_logged_in">Det verkar som att du försöker ansluta till en annan hemserver. Vill du logga ut\?</string>
+
+    <string name="edit">Redigera</string>
+    <string name="reply">Svara</string>
+
+    <string name="global_retry">Försök igen</string>
+    <string name="room_list_empty">Gå med i ett rum för att börja använda appen.</string>
+    <string name="send_you_invite">Skickade en inbjudan till dig</string>
+    <string name="invited_by">Inbjuden av %s</string>
+
+    <string name="room_list_catchup_welcome_title">Välkommen hit!</string>
+    <string name="room_list_catchup_welcome_body">Kom ikapp med olästa meddelanden här</string>
+    <string name="room_list_people_empty_title">Konversationer</string>
+    <string name="title_activity_emoji_reaction_picker">Reaktioner</string>
+    <string name="reactions_agree">Acceptera</string>
+    <string name="reactions_like">Gilla</string>
+    <string name="message_add_reaction">Lägg till reaktion</string>
+    <string name="message_view_reaction">Visa reaktioner</string>
+    <string name="reactions">Reaktioner</string>
+
+    <string name="event_redacted_by_user_reason">Händelsen raderades av användaren</string>
+    <string name="event_redacted_by_admin_reason">Händelsen modererades av en rumsadministratör</string>
+    <string name="last_edited_info_message">Senast redigerad av %1$s vid %2$s</string>
+
+
+    <string name="malformed_message">Felformaterad händelse, kan inte visa</string>
+    <string name="error_no_network">Inget nätverk. Vänligen kolla din internetanslutning.</string>
+    <string name="action_change">Ändra</string>
+    <string name="please_wait">Vänligen vänta…</string>
+    <string name="room_preview_no_preview">Det här rummet kan inte förhandsgranskas</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Förhandsgranskning av världsläsbara rum stöds inte än av Element</string>
+
+    <string name="create_room_title">Nytt rum</string>
+    <string name="create_room_action_create">SKAPA</string>
+    <string name="create_room_name_hint">Rumsnamn</string>
+    <string name="create_room_public_title">Publikt</string>
+    <string name="create_room_public_description">Vem som helst kommer kunna gå med i det här rummet</string>
+    <string name="create_room_directory_title">Rumskatalog</string>
+    <string name="create_room_directory_description">Publicera det här rummet till rumskatalogen</string>
+    <string name="create_room_federation_error">Rummet har skapats, men vissa inbjudningar har inte skickats av följande anledning:
+\n
+\n%s</string>
+
+    <string name="keys_backup_unable_to_get_trust_info">Ett fel inträffade vi hämtning av betroendeinfo</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">Ett fel inträffade vid hämtning av nyckelsäkerhetskopia</string>
+
+    <string name="navigate_to_room_when_already_in_the_room">Du tittar redan på det här rummet!</string>
+
+    <string name="quick_reactions">Snabbreaktioner</string>
+
+    <string name="settings_expert">Expert</string>
+    <string name="settings_push_gateway_no_pushers">Inga registrerade pushgateways</string>
+
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_format">Format:</string>
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Registrera token</string>
+
+    <string name="send_file_step_idle">Väntar…</string>
+    <string name="send_file_step_encrypting_thumbnail">Krypterar miniatyrbild…</string>
+    <string name="send_file_step_sending_thumbnail">Skickar miniatyrbild (%1$s / %2$s)</string>
+    <string name="edited_suffix">(redigerad)</string>
+
+    <string name="no_message_edits_found">Inga redigeringar funna</string>
+
+    <string name="link_copied_to_clipboard">Länk kopierad till klippbordet</string>
+
+    <string name="creating_direct_room">Skapar rum…</string>
+    <string name="direct_room_start_search">Börja skriva för att få resultat</string>
+    <string name="joining_room">Går med i rummet…</string>
+
+    <string name="message_view_edit_history">Visa redigeringshistoria</string>
+
+    <string name="terms_of_service">Användarvillkor</string>
+    <string name="review_terms">Granska villkor</string>
+    <string name="read_at">Läst vid</string>
+
+
+    <string name="settings_discovery_mail_pending">Väntar</string>
+
+    <string name="settings_text_message_sent_wrong_code">Verifikationskoden är felaktig.</string>
+
+    <string name="error_network_timeout">Det verkar som att servern tar för lång tid att svara. Detta kan orsakas av antingen dålig uppkoppling eller ett fel på servern. Vänligen försök igen senare.</string>
+
+    <string name="send_attachment">Skicka bilaga</string>
+
+    <string name="a11y_open_drawer">Öppna navigationslådan</string>
+    <string name="a11y_create_menu_open">Öppna rumskapandemenyn</string>
+    <string name="a11y_create_menu_close">Stäng rumskapandemenyn…</string>
+    <string name="a11y_close_keys_backup_banner">Stäng nyckelsäkerhetskopieringsbannern</string>
+    <string name="a11y_jump_to_bottom">Hoppa till botten</string>
+
+    <string name="three_users_read">%1$s, %2$s och %3$s läste</string>
+    <string name="two_users_read">%1$s och %2$s läste</string>
+    <string name="one_user_read">%s läste</string>
+    <plurals name="fallback_users_read">
+        <item quantity="one">1 användare läste</item>
+        <item quantity="other">%d användare läste</item>
+    </plurals>
+
+    <string name="error_attachment">Ett fel inträffade vid hämtning av bilagan.</string>
+    <string name="error_handling_incoming_share">Kunde inte hantera delningsdata</string>
+
+    <string name="uploads_files_subtitle">%1$s vid %2$s</string>
+    <string name="report_content_spam">Det är skräppost</string>
+    <string name="report_content_inappropriate">Det är olämpligt</string>
+    <string name="report_content_custom">Anpassad rapport…</string>
+    <string name="report_content_custom_title">Rapportera det här innehållet</string>
+    <string name="report_content_custom_hint">Anledning till att rapportera detta innehåll</string>
+    <string name="report_content_custom_submit">RAPPORTERA</string>
+    <string name="block_user">IGNORERA ANVÄNDARE</string>
+
+    <string name="content_reported_title">Innehåll rapporterat</string>
+    <string name="content_reported_as_spam_title">Rapporterad som skräppost</string>
+    <string name="content_reported_as_inappropriate_title">Rapporterad som olämplig</string>
+    <string name="no_network_indicator">Det finns ingen nätverksanslutning just nu</string>
+
+    <string name="message_ignore_user">Ignorera användare</string>
+
+    <string name="room_list_quick_actions_settings">Inställningar</string>
+    <string name="room_list_quick_actions_favorite_add">Lägg till i favoriter</string>
+    <string name="room_list_quick_actions_favorite_remove">Ta bort från favoriter</string>
+    <string name="notice_member_no_changes">%1$s gjorde inga ändringar</string>
+    <string name="notice_member_no_changes_by_you">Du gjorde inga ändringar</string>
+    <string name="spoiler">Spoiler</string>
+    <string name="room_join_rules_public">%1$s gjorde rummet publikt för alla som har länken.</string>
+    <string name="room_join_rules_public_by_you">Du gjorde rummet publikt för alla som har länken.</string>
+    <string name="room_join_rules_invite_by_you">Du ändrade rummet till endast inbjudna.</string>
+    <string name="timeline_unread_messages">Olästa meddelanden</string>
+
+    <string name="login_splash_title">Det är din konversation. Äg det.</string>
+    <string name="login_splash_text2">Håll konversationer privata med kryptering</string>
+    <string name="login_splash_text3">Utöka och anpassa din upplevelse</string>
+    <string name="login_splash_submit">Kom igång</string>
+
+    <string name="login_server_title">Välj en server</string>
+    <string name="login_server_modular_text">Premiumservervärd för organisationer</string>
+    <string name="login_continue">Fortsätt</string>
+    <string name="login_connect_to">Anslut till %1$s</string>
+    <string name="login_connect_to_modular">Anslut till Element Matrix Services</string>
+    <string name="login_connect_to_a_custom_server">Anslut till en annan server</string>
+    <string name="login_signin_to">Logga in på %1$s</string>
+    <string name="login_signup">Bli medlem</string>
+    <string name="login_signin">Logga in</string>
+    <string name="login_signin_sso">Fortsätt med SSO</string>
+
+    <string name="login_server_url_form_modular_hint">Element Matrix Services-adress</string>
+    <string name="login_server_url_form_other_hint">Adress</string>
+    <string name="login_server_url_form_modular_text">Premiumservervärd för organisationer</string>
+    <string name="login_server_url_form_modular_notice">Skriv in adressen för Modular Element eller servern du vill använda</string>
+    <string name="login_server_url_form_other_notice">Skriv in adressen för en server eller Element du vill ansluta till</string>
+    <string name="login_server_url_form_common_notice">Skriv in adressen för servern du vill använda</string>
+
+    <string name="login_sso_error_message">Ett fel inträffade vid laddning av sidan: %1$s (%2$d)</string>
+    <string name="login_mode_not_supported">Appen kan inte logga in på den här hemservern. Hemservern stöder följande inloggninstyp(er): %1$s.
+\n
+\nVill du logga in med en webbklient\?</string>
+    <string name="login_registration_disabled">Tyvärr, den här servern accepterar inte nya konton.</string>
+    <string name="login_registration_not_supported">Appen kan inte skapa ett konto på den här hemservern.
+\n
+\nVill du registrera dig med en webbklient\?</string>
+
+    <string name="login_reset_password_submit">Nästa</string>
+    <string name="login_reset_password_warning_title">Varning!</string>
+    <string name="login_reset_password_warning_submit">Fortsätt</string>
+
+    <string name="login_reset_password_mail_confirmation_title">Kolla din inkorg</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Tryck på länken för att bekräfta ditt nya lösenord. När du har följt länken det innehåller, klicka nedan.</string>
+    <string name="login_reset_password_success_title">Framgång!</string>
+    <string name="login_reset_password_success_notice">Ditt lösenord har återställts.</string>
+    <string name="login_reset_password_success_submit">Tillbaka till inloggning</string>
+
+    <string name="login_reset_password_cancel_confirmation_title">Varning</string>
+    <string name="login_reset_password_cancel_confirmation_content">Ditt lösenord har inte ändrats än.
+\n
+\nVill du avbryta återställningsprocessen\?</string>
+
+    <string name="login_set_email_submit">Nästa</string>
+
+    <string name="login_set_msisdn_title">Sätt telefonnummer</string>
+    <string name="login_set_msisdn_notice2">Vänligen använd internationellt format.</string>
+    <string name="login_set_msisdn_mandatory_hint">Telefonnummer</string>
+    <string name="login_set_msisdn_optional_hint">Telefonnummer (valfritt)</string>
+    <string name="login_set_msisdn_submit">Nästa</string>
+
+    <string name="login_msisdn_confirm_title">Bekräfta telefonnummer</string>
+    <string name="login_msisdn_confirm_notice">Vi skickade just en kod till %1$s. Skriv in den nedan för att bekräfta att det är du.</string>
+    <string name="login_msisdn_confirm_hint">Skriv in kod</string>
+    <string name="login_msisdn_confirm_send_again">Skicka igen</string>
+    <string name="login_msisdn_confirm_submit">Nästa</string>
+
+    <string name="login_msisdn_error_not_international">Internationella telefonnummer måste börja med \'+\'</string>
+    <string name="login_msisdn_error_other">Telefonnumret verkar vara ogiltigt. Vänligen kolla det</string>
+
+    <string name="login_signup_to">Logga in på %1$s</string>
+    <string name="login_signup_username_hint">Användarnamn</string>
+    <string name="login_signup_password_hint">Lösenord</string>
+    <string name="login_signup_submit">Nästa</string>
+    <string name="login_signup_error_user_in_use">Det användarnamnet är upptaget</string>
+    <string name="login_signup_cancel_confirmation_title">Varning</string>
+    <string name="login_signup_cancel_confirmation_content">Ditt konto är inte skapat än.
+\n
+\nVill du avbryta registreringsprocessen\?</string>
+
+    <string name="login_a11y_choose_matrix_org">Välj matrix.org</string>
+    <string name="login_a11y_choose_modular">Välj Element Matrix Services</string>
+    <string name="login_a11y_choose_other">Välj en annan hemserver</string>
+    <string name="login_a11y_captcha_container">Vänligen utför captchautmaningen</string>
+    <string name="login_terms_title">Acceptera villkoren för att fortsätta</string>
+
+    <string name="login_validation_code_is_not_correct">Den inskrivna koden är felaktig. Vänligen kolla den.</string>
+    <string name="login_error_outdated_homeserver_title">Utdaterad hemserver</string>
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="one">För många förfrågningar har skickats. Du kan försöka igen om %1$d sekund…</item>
+        <item quantity="other">För många förfrågningar har skickats. Du kan försöka igen om %1$d sekunder…</item>
+    </plurals>
+
+    <string name="login_connect_using_matrix_id_notice">Alternativt, om du redan har ett konto och du kan ditt Matrix-ID och ditt lösenord, så kan du använda den här metoden:</string>
+    <string name="login_connect_using_matrix_id_submit">Logga in med ditt Matrix-ID</string>
+    <string name="login_signin_matrix_id_title">Logga in med ditt Matrix-ID</string>
+    <string name="login_signin_matrix_id_hint">Matrix-ID</string>
+    <string name="login_signin_matrix_id_password_notice">Om du inte kan ditt lösenord, gå tillbaka för att återställa det.</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Det här är inte ett giltigt användar-ID. Förväntat format: \'@användare:hemserver.org\'</string>
+    <string name="seen_by">Sett av</string>
+
+    <string name="signed_out_title">Du är utloggad</string>
+    <string name="signed_out_submit">Logga in igen</string>
+
+    <string name="soft_logout_title">Du är utloggad</string>
+    <string name="soft_logout_signin_title">Logga in</string>
+    <string name="soft_logout_signin_notice">Administratören för din hemserver (%1$s) har loggat ut dig ur ditt konto %2$s (%3$s).</string>
+    <string name="soft_logout_signin_submit">Logga in</string>
+    <string name="soft_logout_signin_password_hint">Lösenord</string>
+    <string name="soft_logout_clear_data_title">Rensa personlig information</string>
+    <string name="soft_logout_clear_data_submit">Rensa all data</string>
+
+    <string name="soft_logout_clear_data_dialog_title">Rensa data</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Du kommer att bli av med åtkomsten till dina krypterade meddelanden om du inte loggar in igen för att återfå dina krypteringsnycklar.</string>
+    <string name="soft_logout_clear_data_dialog_submit">Rensa data</string>
+    <string name="permalink_malformed">Din matrix.to-länk var felformaterad</string>
+    <string name="bug_report_error_too_short">Beskrivningen är för kort</string>
+
+    <string name="notification_initial_sync">Inledande synk…</string>
+
+    <string name="rageshake_detected">Skakning upptäckt!</string>
+    <string name="settings">Inställningar</string>
+    <string name="create_room_encryption_title">Aktivera kryptering</string>
+    <string name="verification_conclusion_warning">Obetrodd inloggning</string>
+    <string name="verification_sas_match">De matchar</string>
+    <string name="verification_sas_do_not_match">De matchar inte</string>
+    <string name="verify_user_sas_emoji_help_text">Verifiera den här användaren genom att bekräfta att följande unika emojier visas på hens skärm i samma ordning.</string>
+    <string name="verify_user_sas_emoji_security_tip">För maximal säkerhet, använd en annan pålitlig kommunikationsform eller gör detta personligen.</string>
+    <string name="verification_green_shield">Kolla efter den gröna skölden för att försäkra dig om att en användare är betrodd. Lita på alla användare i ett rum för att försäkra dig om att rummet är säkert.</string>
+
+    <string name="verification_conclusion_not_secure">Inte säker</string>
+    <string name="sent_a_video">Video.</string>
+    <string name="sent_an_image">Bild.</string>
+    <string name="verification_request_waiting">Väntar…</string>
+    <string name="verification_request_other_cancelled">%s avbröt</string>
+    <string name="verification_request_you_cancelled">Du avbröt</string>
+    <string name="verification_request_other_accepted">%s accepterade</string>
+    <string name="verification_request_you_accepted">Du accepterade</string>
+    <string name="verification_sent">Verifikation skickad</string>
+    <string name="verification_request">Verifieringsbegäran</string>
+    <string name="verification_verify_device_manually">Verifiera manuellt</string>
+
+    <string name="you">Du</string>
+
+    <string name="verification_scan_their_code">Skanna deras kod</string>
+    <string name="verification_scan_emoji_title">Kan inte skanna</string>
+    <string name="verification_scan_emoji_subtitle">Om ni inte träffas personligen, jämför emojier istället</string>
+
+    <string name="verification_no_scan_emoji_title">Verifiera genom att jämföra emojier</string>
+
+    <string name="verify_by_emoji_title">Verifiera med emojier</string>
+    <string name="verify_by_emoji_description">Om du inte kan skanna koden ovan, verifiera genom att jämföra ett kort, unikt urval av emojier.</string>
+
+    <string name="a13n_qr_code_description">QR-kodsbild</string>
+
+    <string name="verification_verify_user">Verifiera %s</string>
+    <string name="verification_verified_user">Verifierade %s</string>
+    <string name="verification_request_waiting_for">Väntar på %s…</string>
+    <string name="verification_request_alert_description">För extra säkerhet, verifiera %s genom att kolla en engångskod på båda era enheter.
+\n
+\nFör maximal säkerhet, gör detta personligen.</string>
+    <string name="room_profile_section_security">Säkerhet</string>
+    <string name="room_profile_section_admin">Adminhandlingar</string>
+    <string name="room_profile_leaving_room">Lämnar rummet…</string>
+
+    <string name="room_member_power_level_custom">Anpassad</string>
+    <string name="room_member_power_level_invites">Inbjudningar</string>
+    <string name="room_member_power_level_users">Användare</string>
+
+    <string name="room_member_power_level_admin_in">Administratör i %1$s</string>
+    <string name="room_member_power_level_moderator_in">Moderator i %1$s</string>
+    <string name="room_member_power_level_default_in">Standard i %1$s</string>
+    <string name="room_member_power_level_custom_in">Anpassad (%1$d) i %2$s</string>
+
+    <string name="room_member_jump_to_read_receipt">Hoppa till läsindikation</string>
+
+    <string name="rendering_event_error_type_of_event_not_handled">Element hanterar inte händelser av typen \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element stötte på ett fel vid rendering av innehållet i händelsen med id \'%1$s\'</string>
+
+    <string name="unignore">Avignorera</string>
+
+    <string name="command_description_rainbow_emote">Skickar den givna emoten i regnbågsfärg</string>
+
+    <string name="call_notification_answer">Godkänn</string>
+    <string name="call_notification_reject">Avslå</string>
+    <string name="call_notification_hangup">Lägg på</string>
+
+    <string name="room_settings_enable_encryption_dialog_title">Aktivera kryptering\?</string>
+    <string name="room_settings_enable_encryption_dialog_submit">Aktivera kryptering</string>
+
+    <string name="verification_request_notice">För att vara säker, verifiera %s genom att kolla en engångskod.</string>
+    <string name="verification_request_start_notice">För att vara säker, gör detta personligen eller använd en annan säker kommunikationsform.</string>
+
+    <string name="verification_emoji_notice">Jämför de unika emojierna, och försäkra dig om att de visas i samma ordning.</string>
+    <string name="settings_hs_admin_e2e_disabled">Din serveradministratör har inaktiverat totalsträckskryptering som förval för privata rum och direktmeddelanden.</string>
+    <string name="settings_failed_to_get_crypto_device_info">Ingen kryptografisk information tillgänglig</string>
+
+    <string name="crosssigning_verify_this_session">Verifiera den här inloggningen</string>
+    <string name="complete_security">Fullborda säkerhet</string>
+
+    <string name="verification_profile_verify">Verifiera</string>
+    <string name="verification_profile_verified">Verifierad</string>
+    <string name="verification_profile_warning">Varning</string>
+
+    <string name="trusted">Betrodd</string>
+    <string name="not_trusted">Inte betrodd</string>
+
+    <string name="initialize_cross_signing">Initierar korssignering</string>
+    <string name="reset_cross_signing">Återställ nycklar</string>
+
+    <string name="a11y_qr_code_for_verification">QR-kod</string>
+
+    <string name="qr_code_scanned_by_other_notice">Nästan färdigt! Ser %s samma sköld\?</string>
+    <string name="qr_code_scanned_by_other_yes">Ja</string>
+    <string name="qr_code_scanned_by_other_no">Nej</string>
+
+    <string name="no_connectivity_to_the_server_indicator">Anslutningen till servern har tappats</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">Flygplansläge är på</string>
+
+    <plurals name="poll_info">
+        <item quantity="one">%d röst</item>
+        <item quantity="other">%d röster</item>
+    </plurals>
+    <plurals name="poll_info_final">
+        <item quantity="one">%d röst - Slutgiltigt resultat</item>
+        <item quantity="other">%d röster - Slutgiltigt resultat</item>
+    </plurals>
+    <string name="poll_item_selected_aria">Valt alternativ</string>
+    <string name="command_description_poll">Skapar en enkel omröstning</string>
+    <string name="verification_cannot_access_other_session">Använd en återställningslösenfras eller -nyckel</string>
+    <string name="new_signin">Ny inloggning</string>
+
+    <string name="enter_secret_storage_passphrase">Skriv in en lösenfras för hemlig lagring</string>
+    <string name="enter_secret_storage_passphrase_warning">Varning:</string>
+    <string name="enter_secret_storage_passphrase_warning_text">Du bör endast komma åt hemlig lagring från en betrodd enhet</string>
+
+    <string name="message_action_item_redact">Ta bort…</string>
+    <string name="share_confirm_room">Vill du skicka den här bilagan till %1$s\?</string>
+    <plurals name="send_images_with_original_size">
+        <item quantity="one">Skicka bild i originalstorlek</item>
+        <item quantity="other">Skicka bilder i originalstorlek</item>
+    </plurals>
+
+    <string name="delete_event_dialog_title">Bekräfta borttagning</string>
+    <string name="delete_event_dialog_content">Är du säker på att du vill ta bort (radera) den här händelsen\? Observera att om du raderar ett rumsnamn eller ämnesändring så kan det upphäva ändringen.</string>
+    <string name="delete_event_dialog_reason_checkbox">Inkludera en anledning</string>
+    <string name="delete_event_dialog_reason_hint">Anledning för borttagning</string>
+
+    <string name="event_redacted_by_user_reason_with_reason">Händelsen raderades av användaren, anledning: %1$s</string>
+    <string name="event_redacted_by_admin_reason_with_reason">Händelsen modererades av rumsadministratören. Anledning: %1$s</string>
+
+    <string name="keys_backup_restore_success_title_already_up_to_date">Nycklarna är redan uppdaterade!</string>
+
+    <string name="login_default_session_public_name">Element Android</string>
+
+    <string name="refresh">Ladda om</string>
+
+    <string name="new_session">Ny inloggning. Var det du\?</string>
+    <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="verification_cancelled">Verifikation avbruten</string>
+
+    <string name="recovery_passphrase">återställningslösenfras</string>
+    <string name="account_password">kontolösenord</string>
+
+    <string name="set_recovery_passphrase">Sätt en %s</string>
+    <string name="confirm_recovery_passphrase">Bekräfta %s</string>
+
+    <string name="enter_account_password">Skriv in ditt %s för att fortsätta.</string>
+
+    <string name="bootstrap_info_confirm_text">Skriv in din %s igen för att fortsätta.</string>
+    <string name="bootstrap_dont_reuse_pwd">Använd inte ditt kontolösenord.</string>
+
+    <string name="bootstrap_info_text_2">Skriv in en säkerhetsfras endast du känner till, vilken används för att säkra hemligheter på din server.</string>
+
+    <string name="bootstrap_loading_text">Detta kan ta flera sekunder, ha tålamod.</string>
+    <string name="bootstrap_loading_title">Sätter upp återställning.</string>
+    <string name="your_recovery_key">Din återställningsnyckel</string>
+    <string name="bootstrap_finish_title">Du är färdig!</string>
+    <string name="keep_it_safe">Håll den säker</string>
+    <string name="finish">Slutför</string>
+
+    <string name="bootstrap_save_key_description">Använd denna %1$s som ett skyddsnät ifall du glömmer din %2$s.</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">Publicerar skapade identitetsnycklar</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Genererar säkra nycklar baserat på lösenfras</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Definierar förvald nyckel för SSSS</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Synkroniserar huvudnyckel</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Synkroniserar användarnyckel</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Synkroniseras självsigneringsnyckel</string>
+    <string name="bootstrap_crosssigning_print_it">Skriv ut den och spara den någonstans säkert</string>
+    <string name="bootstrap_crosssigning_save_cloud">Kopiera den till din personliga molnlagring</string>
+
+    <string name="auth_flow_not_supported">Du kan inte göra det där på mobilen</string>
+
+    <string name="encryption_unknown_algorithm_tile_description">Krypteringen som används i det här rummet stöds inte</string>
+
+    <string name="room_created_summary_item">%s skapade och konfigurerade rummet.</string>
+    <string name="room_created_summary_item_by_you">Du skapade och konfigurerade rummet.</string>
+
+    <string name="qr_code_scanned_verif_waiting_notice">Nästan färdigt! Väntar på bekräftelse…</string>
+    <string name="qr_code_scanned_verif_waiting">Väntar på %s…</string>
+
+    <string name="auth_invalid_login_param_space_in_password">Felaktigt användarnamn och/eller lösenord. Lösenordet du skrev börjar eller slutar med mellanslag, vänligen kolla det.</string>
+    <string name="auth_invalid_login_deactivated_account">Kontot har inaktiverats.</string>
+
+    <string name="upgrade_security">Krypteringsuppgradering tillgänglig</string>
+    <string name="security_prompt_text">Verifiera dig själv och andra för att hålla dina chattar säkra</string>
+
+    <string name="bootstrap_enter_recovery">Skriv in din %s för att fortsätta</string>
+    <string name="enter_backup_passphrase">Skriv in %s</string>
+    <string name="backup_recovery_passphrase">Återställningslösenfras</string>
+    <string name="bootstrap_invalid_recovery_key">Det är inte en giltig återställningsnyckel</string>
+    <string name="recovery_key_empty_error_message">Vänligen skriv in en återställningsnyckel</string>
+
+    <string name="bootstrap_progress_compute_curve_key">Hämtar kurvnyckel</string>
+    <string name="bootstrap_progress_generating_ssss">Generar SSSS-nyckel baserat på lösenfras</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Generar SSSS-nyckel baserat på lösenfras (%s)</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Generar SSSS-nyckel baserat på återställningsnyckel</string>
+    <string name="bootstrap_progress_storing_in_sss">Lagrar hemlighet för nyckelsäkerhetskopiering i SSSS</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="app_desktop_web">Element Webb
+\nElement Skrivbord</string>
+    <string name="app_ios_android">Element iOS
+\nElement Android</string>
+    <string name="enter_secret_storage_passphrase_or_key">Använd din %1$s eller %2$s för att fortsätta.</string>
+    <string name="use_recovery_key">Använd återställningsnyckel</string>
+    <string name="enter_secret_storage_input_key">Välj din återställningsnyckel eller mata in den manuellt genom att skriva den eller klistra in från klippbordet</string>
+    <string name="failed_to_access_secure_storage">Misslyckades att komma åt säker lagring</string>
+
+    <string name="unencrypted">Okrypterad</string>
+    <string name="encrypted_unverified">Krypterad av en overifierad enhet</string>
+    <string name="verify_this_session">Verifiera den nya inloggningen på ditt konto: %1$s</string>
+
+    <string name="cross_signing_verify_by_text">Verifiera manuellt med text</string>
+    <string name="crosssigning_verify_session">Verifiera inloggning</string>
+    <string name="cross_signing_verify_by_emoji">Verifiera interaktivt med emojier</string>
+    <string name="mark_as_verified">Markera som betrodd</string>
+
+    <string name="error_empty_field_choose_user_name">Vänligen välj ett användarnamn.</string>
+    <string name="error_empty_field_choose_password">Vänligen välj att lösenord.</string>
+    <string name="external_link_confirmation_title">Dubbelkolla den här länken</string>
+    <string name="external_link_confirmation_message">Länken %1$s tar dig till en annan sida: %2$s.
+\n
+\nÄr du säker på att du vill fortsätta\?</string>
+
+    <string name="add_members_to_room">Lägg till medlemmar</string>
+    <string name="inviting_users_to_room">Bjuder in användare…</string>
+    <string name="invitation_sent_to_one_user">Inbjudan skickad till %1$s</string>
+    <string name="invitations_sent_to_two_users">Inbjudan skickad till %1$s och %2$s</string>
+    <string name="open_terms_of">Öppna villkor för %s</string>
+    <string name="identity_server_error_outdated_home_server">Den här operationen är inte möjlig. Hemservern är utdaterad.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">För ditt privatlivs skull stöder Element bara att skicka hashade e-postadresser och telefonnummer.</string>
+    <string name="identity_server_error_binding_error">Associationen har misslyckats.</string>
+    <string name="identity_server_error_no_current_binding_error">Det finns ingen nuvarande association med den här identifieraren.</string>
+
+    <string name="identity_server_set_default_submit">Använd %1$s</string>
+    <string name="identity_server_set_alternative_submit">Skicka in</string>
+    <string name="power_level_edit_title">Sätt roll</string>
+    <string name="power_level_title">Roll</string>
+    <string name="a11y_open_chat">Öppna chatt</string>
+    <string name="a11y_mute_microphone">Tysta mikrofonen</string>
+    <string name="a11y_unmute_microphone">Sluta tysta mikrofonen</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Använd säkerhetsnyckel</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Generera en säkerhetsnyckel att lagra någonstans säkert, som en lösenordshanterare eller ett kassaskåp.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Använd en säkerhetsfras</string>
+    <string name="bottom_sheet_save_your_recovery_key_title">Spara din säkerhetsnyckel</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Spara din säkerhetsnyckel någonstans säkert, som en lösenordshanterare eller ett kassaskåp.</string>
+
+    <string name="set_a_security_phrase_title">Sätt an säkerhetsfras</string>
+    <string name="set_a_security_phrase_notice">Skriv in en säkerhetsfras endast du känner till, vilken används för att säkra hemligheter på din server.</string>
+    <string name="set_a_security_phrase_hint">Säkerhetsfras</string>
+    <string name="set_a_security_phrase_again_notice">Skriv in säkerhetsfrasen igen för att bekräfta den.</string>
+
+    <string name="save_your_security_key_title">Spara din säkerhetsnyckel</string>
+    <string name="save_your_security_key_notice">Spara din säkerhetsnyckel någonstans säkert, som en lösenordshanterare eller ett kassaskåp.</string>
+
+    <string name="room_settings_name_hint">Rumsnamn</string>
+    <string name="room_settings_topic_hint">Ämne</string>
+    <string name="room_settings_save_success">Du ändrade rumsinställningarna framgångsrikt</string>
+
+    <string name="crypto_utd">Kan inte avkryptera</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Väntar på krypteringshistorik</string>
+
+    <string name="element_disclaimer_title">Riot är nu Element!</string>
+    <string name="element_disclaimer_content">Vi är glada att meddela att vi har bytt namn! Din app är uppdaterad och du är inloggad på ditt konto.</string>
+    <string name="element_disclaimer_negative_button">UPPFATTAT</string>
+    <string name="element_disclaimer_positive_button">LÄR DIG MER</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">Spara återställningsnyckel i</string>
+
+    <string name="add_from_phone_book">Lägg till från min telefonbok</string>
+    <string name="empty_phone_book">Din telefonbok är tom</string>
+    <string name="phone_book_title">Telefonbok</string>
+    <string name="loading_contact_book">Hämtar dina kontakter…</string>
+    <string name="contacts_book_title">Kontaktbok</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">Återkalla inbjudan</string>
+    <string name="three_pid_revoke_invite_dialog_content">Återkalla inbjudan av %1$s\?</string>
+
+    <string name="member_banned_by">Bannad av %1$s</string>
+    <string name="failed_to_unban">Misslyckades att avbanna användaren</string>
+
+    <string name="alert_push_are_disabled_title">Pushnotiser är inaktiverade</string>
+    <string name="alert_push_are_disabled_description">Granska dina inställningar för att aktivera pushnotiser</string>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Fel kod, %d försök kvar</item>
+        <item quantity="other">Fel kod, %d försök kvar</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Varning! Sista försöket innan du loggas ut!</string>
+    <string name="too_many_pin_failures">För många fel, du har blivit utloggad</string>
+    <string name="create_pin_title">Välj en PIN-kod för säkerhet</string>
+    <string name="create_pin_confirm_title">Bekräfta PIN</string>
+    <string name="create_pin_confirm_failure">Misslyckades med att validera PIN, vänligen skriv en ny.</string>
+    <string name="auth_pin_title">Skriv din PIN-kod</string>
+    <string name="auth_pin_forgot">Glömt PIN\?</string>
+    <string name="auth_pin_reset_title">Återställ PIN</string>
+    <string name="auth_pin_new_pin_action">Ny PIN</string>
+    <string name="auth_pin_reset_content">För att återställa din PIN-kod behöver du logga in igen och skapa en ny.</string>
+    <string name="settings_security_pin_code_title">Aktivera PIN</string>
+    <string name="settings_security_pin_code_summary">Om du vill återställa din PIN-kod, tryck på \"Glömt PIN\?\" för att logga ut och återställa.</string>
+    <string name="auth_pin_confirm_to_disable_title">Bekräfta PIN för att återställa PIN</string>
 </resources>
diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml
index f19c51ff83..3ca04aae89 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@@ -20,4 +20,90 @@
     <string name="auth_password_placeholder">รหัสผ่าน</string>
     <string name="auth_new_password_placeholder">รหัสผ่านใหม่</string>
     <string name="permalink">ลิงก์ถาวร</string>
+    <string name="title_activity_home">ข้อความ</string>
+    <string name="title_activity_room">ห้อง</string>
+    <string name="title_activity_settings">การตั้งค่า</string>
+    <string name="title_activity_member_details">ข้อมูลสมาชิก</string>
+    <string name="ok">ตกลง</string>
+    <string name="cancel">ยกเลิก</string>
+    <string name="save">บันทึก</string>
+    <string name="leave">ออก</string>
+    <string name="send">ส่ง</string>
+    <string name="copy">คัดลอก</string>
+    <string name="download">ดาวน์โหลด</string>
+    <string name="share">แชร์</string>
+    <string name="speak">พูด</string>
+    <string name="delete">ลบ</string>
+    <string name="rename">เปลี่ยนชื่อ</string>
+    <string name="skip">ข้าม</string>
+    <string name="resources_script">Thai</string>
+
+    <string name="title_activity_choose_sticker">ส่งสติกเกอร์</string>
+    <string name="loading">กำลังโหลด…</string>
+
+    <string name="forward">ส่งต่อ</string>
+    <string name="none">ไม่มี</string>
+    <string name="report_content">รายงานเนื้อหา</string>
+    <string name="play_video">เล่น</string>
+    <string name="pause_video">หยุดชั่วคราว</string>
+    <string name="ongoing_conference_call_voice">เสียง</string>
+    <string name="ongoing_conference_call_video">วิดีโอ</string>
+    <string name="bottom_action_home">หน้าหลัก</string>
+    <string name="bottom_action_notification">การแจ้งเตือน</string>
+    <string name="bottom_action_people">ผู้คน</string>
+    <string name="bottom_action_rooms">ห้อง</string>
+    <string name="bottom_action_groups">ชุมชน</string>
+
+    <string name="invitations_header">การเชิญ</string>
+    <string name="system_alerts_header">การแจ้งเตือนจากระบบ</string>
+
+    <string name="no_contact_access_placeholder">คุณไม่ได้อนุญาตให้ Element เข้าถึงรายชื่อผู้ติดต่อในเครื่อง</string>
+    <string name="no_result_placeholder">ไม่มีผลลัพธ์</string>
+    <string name="no_room_placeholder">ไม่มีห้อง</string>
+    <plurals name="public_room_nb_users">
+        <item quantity="other">ผู้ใช้ %d คน</item>
+    </plurals>
+
+    <string name="groups_invite_header">เชิญ</string>
+    <string name="groups_header">ชุมชน</string>
+    <string name="no_group_placeholder">ไม่มีกลุ่ม</string>
+
+    <string name="send_bug_report_description_in_english">ถ้าเป็นไปได้ โปรดเขียนคำอธิบายเป็นภาษาอังกฤษ</string>
+    <string name="send_bug_report_placeholder">อธิบายปัญหาของคุณที่นี่</string>
+    <string name="send_files_in">ส่งไปยัง</string>
+    <string name="join_room">เข้าห้อง</string>
+    <string name="username">ชื่อผู้ใช้</string>
+    <string name="create_account">สร้างบัญชี</string>
+    <string name="login">เข้าสู่ระบบ</string>
+    <string name="logout">ออกจากระบบ</string>
+    <string name="search">ค้นหา</string>
+
+    <string name="start_new_chat">เริ่มแชทใหม่</string>
+    <string name="call_failed_no_ice_use_alt">ลองโดยใช้ %s</string>
+    <string name="call_failed_dont_ask_again">ไม่ต้องถามฉันอีก</string>
+
+    <string name="call_select_sound_device">เลือกอุปกรณ์เสียง</string>
+    <string name="sound_device_phone">โทรศัพท์</string>
+    <string name="sound_device_speaker">ลำโพง</string>
+    <string name="sound_device_headset">หูฟัง</string>
+    <string name="sound_device_wireless_headset">หูฟังไร้สาย</string>
+    <string name="call_switch_camera">สลับกล้อง</string>
+    <string name="call_camera_front">หน้า</string>
+    <string name="call_camera_back">หลัง</string>
+    <string name="call_format_turn_hd_off">ปิด HD</string>
+    <string name="call_format_turn_hd_on">เปิด HD</string>
+
+    <string name="option_send_sticker">ส่งสติกเกอร์</string>
+    <string name="auth_login">เข้าสู่ระบบ</string>
+    <string name="auth_register">สร้างบัญชี</string>
+    <string name="auth_submit">ส่ง</string>
+    <string name="auth_send_reset_email">ส่งอีเมลรีเซ็ต</string>
+    <string name="auth_return_to_login">กลับไปที่หน้าเข้าสู่ระบบ</string>
+    <string name="auth_user_id_placeholder">อีเมลหรือชื่อผู้ใช้</string>
+    <string name="auth_user_name_placeholder">ชื่อผู้ใช้</string>
+    <string name="auth_email_placeholder">ที่อยู่อีเมล</string>
+    <string name="auth_opt_email_placeholder">ที่อยู่อีเมล (ไม่จำเป็น)</string>
+    <string name="auth_phone_number_placeholder">หมายเลขโทรศัพท์</string>
+    <string name="auth_opt_phone_number_placeholder">หมายเลขโทรศัพท์ (ไม่จำเป็น)</string>
+    <string name="auth_invalid_password">รหัสผ่านสั้นเกินไป (อย่างน้อย 6 ตัว)</string>
 </resources>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 91056b7193..98638c7226 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -126,7 +126,7 @@
     <string name="send_bug_report_description_in_english">Mümkünse, lütfen yapacağınız açıklamayı İngilizce yazın.</string>
     <string name="send_bug_report_placeholder">Sorununu buraya yaz</string>
     <string name="send_bug_report_logs_description">Sorunları teşhis etmek için bu istemciden gelen sistem günlüğü (log) hata raporu ile gönderilecek. Bu hata raporu -sistem günlüğü ve ekran görüntülere dahil- halka açık bir şekilde görünür olmayacaktır. Eğer sadece alttaki yazıları göndermek istiyorsanız, lütfen şunun işaretini kaldırın:</string>
-    <string name="send_bug_report_alert_message">Telefonunu öfkeyle ile sallıyor gibi görünüyorsun. Hata raporu göndermek ister misin\?</string>
+    <string name="send_bug_report_alert_message">Telefonunu yılgınlıkla sallıyor gibi görünüyorsun. Hata raporu göndermek ister misin\?</string>
     <string name="send_bug_report_app_crashed">Uygulama en son çökmüştü, hata raporu göndermek ister misiniz\?</string>
     <string name="send_bug_report_rage_shake">Hata bildirmek için öfkeyle salla</string>
 
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index cac1d7bd0e..9aea75781e 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -5,6 +5,10 @@
     <string name="resources_language">zh</string>
     <string name="resources_country_code">CN</string>
 
+    <string name="call_notification_answer">接受</string>
+    <string name="call_notification_reject">拒绝</string>
+    <string name="call_notification_hangup">挂断</string>
+
     <string name="resend">重新发送</string>
     <string name="quote">引用</string>
     <string name="share">分享</string>
@@ -179,7 +183,7 @@
 
     <string name="encryption_information_sender_device_information">发送者的会话信息</string>
     <string name="encryption_information_device_name">公开名称</string>
-    <string name="encryption_information_device_id">ID</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>
@@ -1794,7 +1798,7 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="report_content_custom_title">报告此内容</string>
     <string name="report_content_custom_hint">报告此内容的理由</string>
     <string name="report_content_custom_submit">报告</string>
-    <string name="block_user">屏蔽用户</string>
+    <string name="block_user">忽略用户</string>
 
     <string name="content_reported_title">内容已报告</string>
     <string name="content_reported_content">此内容已报告。
@@ -1815,7 +1819,7 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
 
     <string name="no_network_indicator">目前没有网络连接</string>
 
-    <string name="message_ignore_user">屏蔽用户</string>
+    <string name="message_ignore_user">忽略用户</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">全部消息（嘈杂）</string>
     <string name="room_list_quick_actions_notifications_all">全部消息</string>
@@ -2532,4 +2536,31 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="auth_pin_confirm_to_disable_title">确认 PIN 并禁用 PIN</string>
     <string name="settings_call_show_confirmation_dialog_title">防止意外通话</string>
     <string name="settings_call_show_confirmation_dialog_summary">发起通话之前要求确认</string>
+    <string name="no_permissions_to_start_conf_call">您没有权限在此聊天室发起会议通话</string>
+    <string name="conference_call_in_progress">会议正在进行！</string>
+    <string name="video_meeting">发起视频会议</string>
+    <string name="audio_meeting">发起音频会议</string>
+    <string name="audio_video_meeting_description">会议使用 Jitsi 安全与许可政策。您的会议进行期间当前聊天室内的所有人将看到加入邀请。</string>
+    <string name="cannot_call_yourself">您无法呼叫您自己</string>
+    <string name="cannot_call_yourself_with_invite">您无法呼叫您自己，请等待参与者接受邀请</string>
+    <string name="failed_to_add_widget">添加小部件失败</string>
+    <string name="failed_to_remove_widget">移除小部件失败</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="other">成功导入 %1$d/%2$d 个密钥。</item>
+    </plurals>
+
+    <string name="room_manage_integrations">管理集成</string>
+    <string name="room_no_active_widgets">无活动小部件</string>
+    <string name="create_room_federation_error">聊天室已创建，但由于以下原因一些邀请尚未发送：
+\n
+\n%s</string>
+
+    <plurals name="two_and_some_others_read">
+        <item quantity="other">%1$s，%2$s 和其他 %3$d 人已读</item>
+    </plurals>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="other">错误代码，剩余 %d 次尝试</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">注意！登出前最后一次尝试！</string>
+    <string name="too_many_pin_failures">错误次数过多，您已被登出</string>
 </resources>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index fbf26817b8..24480a2d90 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -10,6 +10,10 @@
     <string name="notification_sync_in_progress">正在同步……</string>
     <string name="notification_listening_for_events">聆聽事件</string>
 
+    <string name="call_notification_answer">接受</string>
+    <string name="call_notification_reject">拒絕</string>
+    <string name="call_notification_hangup">掛斷</string>
+
     <string name="title_activity_home">訊息</string>
     <string name="title_activity_room">聊天室</string>
     <string name="title_activity_settings">設定</string>
@@ -698,7 +702,7 @@
     <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_id">工作階段 ID</string>
     <string name="encryption_information_device_key">工作階段金鑰</string>
     <string name="encryption_information_verification">驗證</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 指紋</string>
@@ -1630,7 +1634,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="report_content_custom_title">回報此內容</string>
     <string name="report_content_custom_hint">回報此內容的理由</string>
     <string name="report_content_custom_submit">回報</string>
-    <string name="block_user">封鎖使用者</string>
+    <string name="block_user">忽略使用者</string>
 
     <string name="content_reported_title">內容已回報</string>
     <string name="content_reported_content">此內容已回報。
@@ -1689,7 +1693,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="room_widget_webview_read_protected_media">讀取 DRM 保護的媒體</string>
 
     <string name="login_error_no_homeserver_found">這不是有效的 Matrix 伺服器位置</string>
-    <string name="message_ignore_user">封鎖使用者</string>
+    <string name="message_ignore_user">忽略使用者</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">所有訊息（吵雜）</string>
     <string name="room_list_quick_actions_notifications_all">所有訊息</string>
@@ -2516,4 +2520,31 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="auth_pin_confirm_to_disable_title">確認 PIN 碼以停用 PIN 碼</string>
     <string name="settings_call_show_confirmation_dialog_title">避免意外的通話</string>
     <string name="settings_call_show_confirmation_dialog_summary">開始通話前要求確認</string>
+    <string name="no_permissions_to_start_conf_call">您沒有在此聊天室中開始會議通話的權限</string>
+    <string name="conference_call_in_progress">會議已在進行中！</string>
+    <string name="video_meeting">開始視訊會議</string>
+    <string name="audio_meeting">開始音訊會議</string>
+    <string name="audio_video_meeting_description">會議使用 Jitsi 安全與權限策略。目前在聊天室中的所有人在您的會議開始時都會看到加入的邀請。</string>
+    <string name="cannot_call_yourself">您無法與自己通話</string>
+    <string name="cannot_call_yourself_with_invite">您無法與自己進行通話，請等候參與者接受邀請</string>
+    <string name="failed_to_add_widget">新增小工具失敗</string>
+    <string name="failed_to_remove_widget">移除小工具失敗</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="other">%1$d/%2$d 金鑰匯入成功。</item>
+    </plurals>
+
+    <string name="room_manage_integrations">管理整合</string>
+    <string name="room_no_active_widgets">無作用中的小工具</string>
+    <string name="create_room_federation_error">已建立聊天室，但因為以下理由而未傳送某些邀請：
+\n
+\n%s</string>
+
+    <plurals name="two_and_some_others_read">
+        <item quantity="other">%1$s, %2$s 與 %3$d 個其他人已讀取</item>
+    </plurals>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="other">錯誤的代碼，還可以嘗試 %d 次</item>
+    </plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">警告！登出前的最後一次嘗試！</string>
+    <string name="too_many_pin_failures">太多錯誤，您已被登出</string>
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 0b9cbab57a..a0abc28a4d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -114,6 +114,10 @@
     <string name="review">Review</string>
     <string name="decline">Decline</string>
 
+    <string name="call_notification_answer">Accept</string>
+    <string name="call_notification_reject">Decline</string>
+    <string name="call_notification_hangup">Hang Up</string>
+
     <!-- actions -->
     <string name="action_exit">Exit</string>
     <string name="actions">Actions</string>
@@ -281,6 +285,7 @@
     <string name="auth_invalid_email">"This doesn’t look like a valid email address"</string>
     <string name="auth_invalid_phone">"This doesn’t look like a valid phone number"</string>
     <string name="auth_email_already_defined">This email address is already defined.</string>
+    <string name="auth_msisdn_already_defined">This phone number is already defined.</string>
     <string name="auth_missing_email">Missing email address</string>
     <string name="auth_missing_phone">Missing phone number</string>
     <string name="auth_missing_email_or_phone">Missing email address or phone number</string>
@@ -675,6 +680,7 @@
     <string name="settings_email_address">Email</string>
     <string name="settings_add_email_address">Add email address</string>
     <string name="settings_phone_number">Phone</string>
+    <string name="settings_phone_number_empty">No phone number has been added to your account</string>
     <string name="settings_add_phone_number">Add phone number</string>
     <string name="settings_app_info_link_title">Application info</string>
     <string name="settings_app_info_link_summary">Show the application info in the system settings.</string>
@@ -682,6 +688,11 @@
     <string name="settings_add_3pid_flow_not_supported">You can\'t do this from Element mobile</string>
     <string name="settings_add_3pid_authentication_needed">Authentication is required</string>
 
+    <string name="settings_emails">Email addresses</string>
+    <string name="settings_emails_empty">No email has been added to your account</string>
+    <string name="settings_phone_numbers">Phone numbers</string>
+    <string name="settings_remove_three_pid_confirmation_content">Remove %s?</string>
+    <string name="error_threepid_auth_failed">Ensure that you have clicked on the link in the email we have sent to you.</string>
 
     <string name="settings_notification_advanced">Advanced Notification Settings</string>
     <string name="settings_notification_by_event">Notification importance by event</string>
@@ -927,6 +938,9 @@
     <string name="settings_unignore_user">Show all messages from %s?\n\nNote that this action will restart the app and it may take some time.</string>
     <string name="passwords_do_not_match">Passwords do not match</string>
 
+    <string name="settings_emails_and_phone_numbers_title">Emails and phone numbers</string>
+    <string name="settings_emails_and_phone_numbers_summary">Manage emails and phone numbers linked to your Matrix account</string>
+
     <string name="settings_delete_notification_targets_confirmation">Are you sure you want to remove this notification target?</string>
 
     <string name="settings_delete_threepid_confirmation">Are you sure you want to remove the %1$s %2$s?</string>
@@ -1756,6 +1770,7 @@
     <string name="settings_discovery_no_terms_title">Identity server has no terms of services</string>
     <string name="settings_discovery_no_terms">The identity server you have chosen does not have any terms of services. Only continue if you trust the owner of the service</string>
     <string name="settings_text_message_sent">A text message has been sent to %s. Please enter the verification code it contains.</string>
+    <string name="settings_text_message_sent_hint">Code</string>
     <string name="settings_text_message_sent_wrong_code">The verification code is not correct.</string>
 
     <string name="settings_discovery_disconnect_with_bound_pid">You are currently sharing email addresses or phone numbers on the identity server %1$s. You will need to reconnect to %2$s to stop sharing them.</string>
@@ -1944,6 +1959,7 @@
     <string name="login_msisdn_confirm_send_again">Send again</string>
     <string name="login_msisdn_confirm_submit">Next</string>
 
+    <string name="login_msisdn_notice">"Please use the international format (phone number must start with '+')"</string>
     <string name="login_msisdn_error_not_international">"International phone numbers must start with '+'"</string>
     <string name="login_msisdn_error_other">"Phone number seems invalid. Please check it"</string>
 
@@ -2051,6 +2067,10 @@
     <string name="sent_an_audio_file">Audio</string>
     <string name="sent_a_file">File</string>
     <string name="send_a_sticker">Sticker</string>
+    <string name="sent_a_poll">Poll</string>
+    <string name="sent_a_bot_buttons">Bot Buttons</string>
+    <string name="sent_a_reaction">Reacted with: %s</string>
+    <string name="sent_verification_conclusion">Verification Conclusion</string>
 
     <string name="verification_request_waiting">Waiting…</string>
     <string name="verification_request_other_cancelled">%s cancelled</string>
@@ -2413,8 +2433,11 @@
     <string name="crosssigning_verify_session">Verify login</string>
     <string name="cross_signing_verify_by_emoji">Interactively Verify by Emoji</string>
     <string name="confirm_your_identity">Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.</string>
+    <string name="confirm_your_identity_quad_s">Confirm your identity by verifying this login, granting it access to encrypted messages.</string>
     <string name="mark_as_verified">Mark as Trusted</string>
 
+    <string name="error_sso_flow_not_supported_yet">Sorry, this operation is not possible yet for accounts connected using Single Sign-On.</string>
+
     <string name="error_empty_field_choose_user_name">Please choose a username.</string>
     <string name="error_empty_field_choose_password">Please choose a password.</string>
     <string name="external_link_confirmation_title">Double-check this link</string>
@@ -2539,4 +2562,9 @@
     <string name="settings_security_pin_code_title">Enable PIN</string>
     <string name="settings_security_pin_code_summary">If you want to reset your PIN, tap Forgot PIN to logout and reset.</string>
     <string name="auth_pin_confirm_to_disable_title">Confirm PIN to disable PIN</string>
+    <string name="error_opening_banned_room">Can\'t open a room where you are banned from.</string>
+    <string name="room_error_not_found">Can\'t find this room. Make sure it exists.</string>
+
+    <!-- Universal link -->
+    <string name="universal_link_malformed">The link was malformed</string>
 </resources>
diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml
index 042ea5c77c..c1fe82e4c2 100644
--- a/vector/src/main/res/xml/vector_settings_general.xml
+++ b/vector/src/main/res/xml/vector_settings_general.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_USER_SETTINGS_PREFERENCE_KEY"
         android:title="@string/settings_user_settings">
@@ -22,29 +21,13 @@
             android:summary="@string/change_password_summary"
             android:title="@string/settings_password" />
 
-        <!-- Email will be added here -->
-
-        <!-- Note: inputType does not work, it is set also in code, as well as iconTint -->
-        <im.vector.app.core.preference.VectorEditTextPreference
-            android:icon="@drawable/ic_material_add"
-            android:inputType="textEmailAddress"
-            android:key="ADD_EMAIL_PREFERENCE_KEY"
-            android:order="100"
-            android:title="@string/settings_add_email_address"
-            app:iconTint="@color/riotx_accent" />
-
-        <!-- Phone will be added here -->
-
-        <!-- Note: iconTint does not work, it is also done in code -->
         <im.vector.app.core.preference.VectorPreference
-            android:icon="@drawable/ic_material_add"
-            android:key="ADD_PHONE_NUMBER_PREFERENCE_KEY"
-            android:order="200"
-            android:title="@string/settings_add_phone_number"
-            app:iconTint="@color/riotx_accent" />
+            android:key="SETTINGS_EMAILS_AND_PHONE_NUMBERS_PREFERENCE_KEY"
+            android:summary="@string/settings_emails_and_phone_numbers_summary"
+            android:title="@string/settings_emails_and_phone_numbers_title"
+            app:fragment="im.vector.app.features.settings.threepids.ThreePidsSettingsFragment" />
 
         <im.vector.app.core.preference.VectorPreference
-            android:order="1000"
             android:persistent="false"
             android:summary="@string/settings_discovery_manage"
             android:title="@string/settings_discovery_category"