diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 89a7c466fd..523496e317 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,15 +7,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
diff --git a/.travis.yml b/.travis.yml
index 85bddac7f3..6e67639284 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# FTR: Configuration on https://travis-ci.org/vector-im/riotX-android/settings
+# FTR: Configuration on https://travis-ci.org/github/vector-im/element-android/settings
 #
 # - Build only if .travis.yml is present -> On
 # - Limit concurrent jobs                -> Off
@@ -8,53 +8,11 @@
 # - Auto cancel branch builds            -> On
 # - Auto cancel pull request builds      -> On
 
-language: android
-jdk: oraclejdk8
 sudo: false
 
 notifications:
   email: false
 
-android:
-  components:
-    # Uncomment the lines below if you want to
-    # use the latest revision of Android SDK Tools
-    - tools
-    - platform-tools
-
-    # The BuildTools version used by your project
-    - build-tools-29.0.3
-
-    # The SDK version used to compile your project
-    - android-29
-
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-    - $HOME/.android/build-cache
-
-# Build with the development SDK
-before_script:
-  # Not necessary for the moment
-  # - /bin/sh ./set_debug_env.sh
-
-# Just build the project for now
+# Just run a simple script here
 script:
-  # Build app (assembleGplayRelease assembleFdroidRelease)
-  # Build Android test (assembleAndroidTest) (disabled for now)
-  # Code quality (lintGplayRelease lintFdroidRelease)
-  # Split into two steps because if a task contain Fdroid, PlayService will be disabled
-  # Done by Buildkite now: - ./gradlew clean assembleGplayRelease lintGplayRelease --stacktrace
-  # Done by Buildkite now: - ./gradlew clean assembleFdroidRelease lintFdroidRelease --stacktrace
-  # Run unitary test (Disable for now, see https://travis-ci.org/vector-im/riot-android/builds/502504370)
-  # - ./gradlew testGplayReleaseUnitTest --stacktrace
-  # Other code quality check
-  # Done by Buildkite now: - ./tools/check/check_code_quality.sh
   - ./tools/travis/check_pr.sh
-  # Check that indonesians file are identical. Due to Android issue, the resource folder must be value-in/, and Weblate export data into value-id/.
-  # Done by Buildkite now: - diff ./vector/src/main/res/values-id/strings.xml ./vector/src/main/res/values-in/strings.xml
diff --git a/CHANGES.md b/CHANGES.md
index ae5c24a578..3dda2fcb18 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,35 @@
-Changes in Element 1.1.7 (2021-XX-XX)
+Changes in Element 1.1.8 (2021-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Bugfix 🐛:
+ - Space Invite by link not always displayed for public space (#3345)
+ - Wrong copy in share space bottom sheet (#3346)
+ - Fix a problem with database migration on nightly builds (#3335)
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ -
+
+Build 🧱:
+ - Compile with Kotlin 1.5.
+ - Upgrade some dependencies: gradle wrapper, third party lib, etc.
+ - Sign APK with build tools 30.0.3
+
+Test:
+ -
+
+Other changes:
+ - Add documentation on LoginWizard and RegistrationWizard (#3303)
+
+Changes in Element 1.1.7 (2021-05-12)
 ===================================================
 
 Features ✨:
@@ -12,6 +43,7 @@ Improvements 🙌:
  - Improve file too big error detection (#3245)
  - User can now select video when selecting Gallery to send attachments to a room
  - Add option to record a video from the camera
+ - Add the public icon on the rooms in the room list (#3292)
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
@@ -25,9 +57,8 @@ Bugfix 🐛:
  - Fix read marker not updating automatically (#3267)
  - Sent video does not contains duration (#3272)
  - Properly clean the back stack if the user cancel registration when waiting for email validation
-
-Translations 🗣:
- -
+ - Fix read marker visibility/position when filtering some events 
+ - Fix user invitation in case of restricted profile api (#3306)
 
 SDK API changes ⚠️:
  - RegistrationWizard.createAccount() parameters are now all optional, following Matrix spec (#3205)
@@ -35,9 +66,7 @@ SDK API changes ⚠️:
 Build 🧱:
  - Upgrade to gradle 7
  - https://github.com/Piasy/BigImageViewer is now hosted on mavenCentral()
-
-Test:
- -
+ - Upgrade Realm to version 10.4.0
 
 Other changes:
  - New store descriptions
@@ -70,7 +99,7 @@ Changes in Element 1.1.4 (2021-04-09)
 
 Improvements 🙌:
  - Split network request `/keys/query` into smaller requests (250 users max) (#2925)
- - Crypto improvement | Bulk send NO_OLM withheld code
+ - Crypto improvement | Bulk send NO_OLM withheld code
  - Display the room shield in all room setting screens
  - Improve message with Emoji only detection (#3017)
  - Picture preview when replying. Also add the image preview in the message detail bottomsheet (#2916)
@@ -629,7 +658,7 @@ Improvements 🙌:
  - Sending events is now retried only 3 times, so we avoid blocking the sending queue too long.
  - Display warning when fail to send events in room list
  - Improve UI of edit role action in member profile
- - Moderation | New screen to display list of banned users in room settings, with unban action
+ - Moderation | New screen to display list of banned users in room settings, with unban action
 
 Bugfix 🐛:
  - Fix theme issue on Room directory screen (#1613)
diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 0ac8ac4a9a..aa35f06767 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -47,7 +47,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.chrisbanes:PhotoView:2.1.4'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
diff --git a/build.gradle b/build.gradle
index 9c9e7a6c20..470e9a06b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,8 +2,8 @@
 
 buildscript {
     // Ref: https://kotlinlang.org/releases.html
-    ext.kotlin_version = '1.4.32'
-    ext.kotlin_coroutines_version = "1.4.2"
+    ext.kotlin_version = '1.5.0'
+    ext.kotlin_coroutines_version = "1.5.0-RC"
     repositories {
         google()
         jcenter()
@@ -12,10 +12,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath 'com.google.gms:google-services:4.3.5'
+        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.google.gms:google-services:4.3.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1'
+        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.2.0'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.4'
         classpath "com.likethesalad.android:string-reference:1.2.2"
 
diff --git a/fastlane/metadata/android/cs/changelogs/40101020.txt b/fastlane/metadata/android/cs/changelogs/40101020.txt
new file mode 100644
index 0000000000..5e90e49daa
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: vylepšení výkonnosti a opravy chyb!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/cs/changelogs/40101030.txt b/fastlane/metadata/android/cs/changelogs/40101030.txt
new file mode 100644
index 0000000000..0e624ba6d1
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: vylepšení výkonnosti a opravy chyb!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/cs/changelogs/40101040.txt b/fastlane/metadata/android/cs/changelogs/40101040.txt
new file mode 100644
index 0000000000..1818c92ba8
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: vylepšení výkonnosti a opravy chyb!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/cs/changelogs/40101050.txt b/fastlane/metadata/android/cs/changelogs/40101050.txt
new file mode 100644
index 0000000000..3e33cd8d07
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: nutné opravy pro 1.1.4
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/cs/changelogs/40101060.txt b/fastlane/metadata/android/cs/changelogs/40101060.txt
new file mode 100644
index 0000000000..d148a9bc37
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: nutné opravy chyb pro 1.1.5!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/cs/short_description.txt b/fastlane/metadata/android/cs/short_description.txt
index a654a9ea6a..d14ac49efa 100644
--- a/fastlane/metadata/android/cs/short_description.txt
+++ b/fastlane/metadata/android/cs/short_description.txt
@@ -1 +1 @@
-Zabezpečený decentralizovaný chat a VoIP. Uchovejte svá data v bezpečí.
+Skupinový messenger - šifrovaná komunikace, skupinový chat a video hovory
diff --git a/fastlane/metadata/android/cs/title.txt b/fastlane/metadata/android/cs/title.txt
index 76943289ad..2fedfecb15 100644
--- a/fastlane/metadata/android/cs/title.txt
+++ b/fastlane/metadata/android/cs/title.txt
@@ -1 +1 @@
-Element (dříve Riot.im)
+Element - bezpečný messenger
diff --git a/fastlane/metadata/android/de/changelogs/40100110.txt b/fastlane/metadata/android/de/changelogs/40100110.txt
index 24bc6e518c..120f04a3f9 100644
--- a/fastlane/metadata/android/de/changelogs/40100110.txt
+++ b/fastlane/metadata/android/de/changelogs/40100110.txt
@@ -1,2 +1,2 @@
-Diese neue Version enthält hauptsächlich Verbesserungen der Benutzeroberfläche und der Handhabung. Du kannst jetzt ganz schnell Freund*innen einladen und DMs erstellen, indem du schlicht einen QR-Code scannst.
+Diese neue Version enthält hauptsächlich Verbesserungen der Benutzeroberfläche und der Handhabung. Du kannst jetzt ganz schnell Freunde einladen und DMs erstellen, indem du schlicht einen QR-Code scannst.
 Vollständige Versionshinweise: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/de/changelogs/40101040.txt b/fastlane/metadata/android/de/changelogs/40101040.txt
new file mode 100644
index 0000000000..eaa8db1409
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Leistungsverbesserung und Fehlerbehebungen!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/de/changelogs/40101050.txt b/fastlane/metadata/android/de/changelogs/40101050.txt
new file mode 100644
index 0000000000..de6352961a
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Wichtige Fehlerbehebungen für 1.1.4!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/de/changelogs/40101060.txt b/fastlane/metadata/android/de/changelogs/40101060.txt
new file mode 100644
index 0000000000..775c016b3d
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Wichtige Fehlerbehebungen für 1.1.5!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/de/full_description.txt b/fastlane/metadata/android/de/full_description.txt
index 568ae61875..69343cf0e3 100644
--- a/fastlane/metadata/android/de/full_description.txt
+++ b/fastlane/metadata/android/de/full_description.txt
@@ -1,30 +1,39 @@
-Element ist eine neuartige Messaging- und Kollaborationsapp:
+Element ist mehr als ein sicherer Messenger. Es ist ein produktives Kolaborationsapp für das Team und eignet sich ideal für den Gruppenchat beim Arbeiten von zuhause aus. Mit eingebauter Ende-zu-Ende-Verschlüsselung ermöglicht Element umfangreiche und sichere Videokonferenzen, das Teilen von Dokumenten/Dateien und Videoanrufe.
 
-1. Volle Kontrolle über deine Privatssphäre
-2. Kommuniziere mit jedem aus dem Matrix-Netzwerk und mit der Integration von z.B. Slack sogar über Matrix hinaus
-3. Schutz vor Werbung, Datamining und geschlossenen Platformen
-4. Absicherung durch Ende-zu-Ende-Verschlüsselung, und Cross-Signing um andere zu verifizieren
+<b>Element enthält folgende Funktionen:</b>
+- Fortgeschrittene Werkzeuge für die Online-Kommunikation
+- Vollverschlüsselte Nachrichten um eine sichere Kommunikation innerhalb und außerhalb des Unternehmens zu ermöglichen
+- Dezentralisierte Chats basierend auf das quelloffene Matrix-Framework
+- Sichere und kontrollierte Dateienfreigabe durch verschlüsselte Daten beim verwalten von Projekten
+- Videochats über VoIP und Bildschirmübertragung
+- Einfache Einbindungen mit Ihren favorisierten Online-Kolaborationswerkzeugen, Projektverwaltungswerkzeugen, VoIP-Diensten und andere Kommunikationsapps für Ihren Team
 
-Element unterscheidet sich durch Dezentralität und Open Source deutlich von anderen Messaging- und Kollaborationsapps.
+Element unterscheidet sich deutlich von anderen Kommunikations- und Kollaborationsapps. Es läuft auf Matrix, ein offenes Netzwerk für eine sichere und dezentralisierte Kommunikation. Es erlaubt den Nutzern ihre eigenen Matrix-Dienste zu betreiben und gibt ihnen damit die vollständige Kontrolle und Besitz über ihre eigenen Daten und Nachrichten.
 
-Element ermöglicht es einen eigenen Server zu betreiben - oder einen beliebigen auszuwählen, sodass du nicht nur Privatssphäre gewinnst, sondern auch deine Daten und Konversationen in deiner Hand sind und du sie kontrollieren kannst. Du hast Zugriff auf ein offenes Netzwerk, und kannst daher nicht nur mit Element-Nutzern schreiben. Und es ist sehr sicher.
+<b>Privatsphäre/Datenschutz und verschlüsselte Kommunikation</b>
+Element schützt Ihnen vor unerwünschte Werbung, das Datenschürfen und geschlossene unentkommbare Dienste. Auch schützt es all Ihre Daten, Video und Sprachkommunikation unter vier Augen durch Ende-zu-Ende-Verschlüsselung und das Quersignieren von Geräten zur Verifizierung.
 
-Element ist zu all diesem in der Lage, weil es Matrix nutzt - einen Standard für offene, dezentrale Kommunikation.
+Element gibt Ihnen die Kontrolle über Ihre Privatsphäre, während es Ihnen ermöglicht mit jeden auf dem Matrix-Netzwerk oder andere geschäftliche Kollaborationswerkzeuge durch das Einbinden von Apps wie Slack sicher zu kommunizieren. 
 
-Element gibt dir die Kontrolle, indem es dir die Wahl darüber lässt, wer deine Konversationen hostet. In der Element-App kannst du zwischen verschiedenen Möglichkeiten auswählen:
+<b>Element kann man selber betreiben</b>
+Um mehr Kontrolle über Ihre sensiblen Daten und Konversationen zu ermöglichen, kann man Element selbst betreiben oder Sie wählen irgendeinen Matrix-basierten Dienst - der standard für quelloffene, dezentralisierte Kommunikation. Element gibt Ihnen Privatsphäre, Sicherheitskonformität und die Flexibilität zum Integrieren.
 
+<b>Besitzen Sie Ihre Daten</b>
+Sie entscheiden wo Sie Ihre Daten und Nachrichten aufbewahren, ohne das Risiko des Datenschürfens oder des Zugriffes Dritter.
+
+Element gibt Ihnen die Kontrolle durch verschiedene Wege:
 1. Kostenlos auf dem öffentlichen matrix.org Server registrieren, der von den Matrix-Entwicklern gehostet wird, oder wähle aus Tausenden von öffentlichen Servern, die von Freiwilligen gehostet werden
-2. Einen Konto auf einem eigenen Server auf eigener Hardware betreiben
+2. Einen Konto auf einem eigenen Server in der eigenen IT-Infrastruktur betreiben
 3. Einen Konto auf einem benutzerdefinierten Server erstellen, zum Beispiel durch ein Abonnement bei Element Matrix Services (kurz EMS)
 
-<b>Wieso Element nutzen?</b>
+<b>Offene Kommunikation und Zusammenarbeit</b>
+Sie können mit jeden auf dem Matrix-Netzwerk chatten, egal ob sie Element, eine Matrix-App oder sogar eine andere Kommunikationsapp nutzen.
 
-<b>BESITZE DEINE DATEN</b>: Du entscheidest wo deine Daten und Nachrichten gespeichert werden. Du besitzt und kontrollierst sie, anstatt ein Großkonzern, der deine Daten analysiert und Dritten Zugriff gibt.
+<b>Super sicher</b>
+Reale Ende-zu-Ende-Verschlüsselung (nur die Personen in der Konversation können die Nachricht entschüsseln) und Quersignierung von Geräten zur Verifizierung.
 
-<b>OFFENE KOMMUNIKATION UND KOLLABORATION</b>: Du kannst mit jedem im Matrix-Netzwerk schreiben, ob sie nun Element oder eine andere Matrix-App nutzen, oder gar ein anderes Kommunikationssystem wie z.B. Slack, IRC oder XMPP.
+<b>Vollständige Kommunikation und Integration</b>
+Kurznachrichten, Sprach- und Videoanrufe, kontrollierte Dateifreigaben, Bildschirmübertragungen und eine ganze Reihe an Integrationen, Bots and Widgets. Schaffe Räume, Gemeinschaften, bleibe auf dem Laufenden und erledige Sachen.
 
-<b>SUPER SICHER</b>: Echte Ende-zu-Ende-Verschlüsselung (nur Personen in der Konversation können die Nachrichten entschlüsseln), und Cross-Signing um die Geräte der anderen Personen zu verifizieren.
-
-<b>VOLLSTÄNDIGE KOMMUNIKATION</b>: Nachrichten, Telefonate und Videoanrufe, Teilen von Dateien oder dem eigenen Bildschirm und viele andere Integrationen, Bots und Widgets. Erstelle Räume, Communities, bleib in Kontakt und sei produktiv.
-
-<b>ÜBERALL WO DU BIST</b>: Bleib in Kontakt wo auch immer du bist - mit einem vollständig synchronisierten Nachrichtenverlauf über alle Geräte und im Netz auf https://app.element.io.
+<b>Das Stehengelassene später wieder aufgreifen</b>
+Bleibe auf dem Laufenden, egal wo Sie sind, mit vollständig synchronisierter Nachrichtenverlauf quer über all Ihrer Geräte und im Netz auf https://app.element.io
diff --git a/fastlane/metadata/android/de/short_description.txt b/fastlane/metadata/android/de/short_description.txt
index d2c30d4167..d27bd3ef12 100644
--- a/fastlane/metadata/android/de/short_description.txt
+++ b/fastlane/metadata/android/de/short_description.txt
@@ -1 +1 @@
-Sicherer dezentraler Chat und Telefonie. Schütze deine Daten vor Dritten.
+Gruppen-Messenger - verschlüsselte Kommunikation, Gruppenchat und Videoanrufe
diff --git a/fastlane/metadata/android/de/title.txt b/fastlane/metadata/android/de/title.txt
index ec25e8a631..6304f37925 100644
--- a/fastlane/metadata/android/de/title.txt
+++ b/fastlane/metadata/android/de/title.txt
@@ -1 +1 @@
-Element (zuvor Riot.im)
+Element - Sicherer Messenger
diff --git a/fastlane/metadata/android/en-US/changelogs/40101070.txt b/fastlane/metadata/android/en-US/changelogs/40101070.txt
new file mode 100644
index 0000000000..254e4c0f62
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40101070.txt
@@ -0,0 +1,2 @@
+Main changes in this version: beta support for Spaces. Compress video before sending.
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.7
\ No newline at end of file
diff --git a/fastlane/metadata/android/et/changelogs/40101040.txt b/fastlane/metadata/android/et/changelogs/40101040.txt
new file mode 100644
index 0000000000..2e7849db9e
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jõudluse parandused ja pisikohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/et/changelogs/40101050.txt b/fastlane/metadata/android/et/changelogs/40101050.txt
new file mode 100644
index 0000000000..9aa2f4e10c
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: kiirparandused versioon 1.1.4 jaoks.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/et/changelogs/40101060.txt b/fastlane/metadata/android/et/changelogs/40101060.txt
new file mode 100644
index 0000000000..0577bf452d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: kiirparandused versioon 1.1.5 jaoks.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/et/full_description.txt b/fastlane/metadata/android/et/full_description.txt
index 7c7f7195a8..ee0adef9ac 100644
--- a/fastlane/metadata/android/et/full_description.txt
+++ b/fastlane/metadata/android/et/full_description.txt
@@ -1,30 +1,39 @@
-Element on uut tüüpi suhtlus- ja koostöörakendus, mis:
+Element on nii suhtlus- ja koostöörakendus, mis sobib ideaalselt rühmavestlusteks kaugtöö ajal. Läbiv krüptimine on kasutusel sõnumivahetuseks, videokõnedeks, häälkõnedeks ja failide jagamiseks.
 
-1. Võimaldab täielikku kontrolli privaatsuse üle
-2. Võimaldab suhelda kõigiga Matrixi võrgus ja isegi väljaspool seda, olles integreeritud selliste rakendustega nagu Slack
-3. Kaitseb sind reklaamide ja andmekogumise eest
-4. Tagab turvalisuse läbiva krüptimise abil, kasutades risttunnustamist vestlejate tuvastamiseks
+<b>Element pakub muu hulgas selliseid võimalusi</b>
+- moodsad võrgupõhised suhtlusvahendid
+- läbivalt krüptitud sõnumid võimaldavad turvalist suhtlust, sealhulgas kaugtöötajatega
+- Matrix'i protokollil põhinev hajutatud suhtlusvõrk
+- projektide jaoks vajalike failide jagamine turvaliselt ja krüptitult
+- VoIP'i põhised videokõned ja ekraani jagamine
+- lihtne lõimimine harjumispäraste võrgupõhiste koostöövahenditega, projektihalduse rakendustega, VoIP-teenustega ja muude ühistöörakendustega
 
-Element erineb täielikult teistest sõnumside- ja koostöörakendustest, kuna see on detsentraliseeritud ja avatud lähtekoodiga.
+Element erineb teistest sõnumi- ja koostöörakendustest. Tema aluseks on Matrix - avatud võrk turvalise ja hajutatud suhtluse jaoks.
 
-Element võimaldab ise hostida - või valida hosti -, et oleks tagatud privaatsus ja kontroll oma andmete ja vestluste üle. Element annab ka juurdepääsu avatud võrgule, nii et te ei pea vaid Elemendi kasutajatega rääkima. Ning kogu süsteem on väga turvaline.
+<b>Privaatsus ja krüptitud sõnumivahetus</b>
+Element tagab, et sa ei ole seotud reklaamidega, andmekogumisega ja suletud süsteemidega. Kasutades läbivat krüptimist ja risttunnustamisel põhinevat verifitseerimist on sinu sõnumid, andmed, kahepoolsed videokõned ja häälkõned turvatud.
 
-Element töötab Matrixil - avatud, detsentraliseeritud suhtlus-standardil.
+Lubades suhelda turvaliselt ükspuha kellega Matrix'i võrgus või muude ärikeskondades kasutatavate koostöörakendustega nagu Slack, jätab Element sulle kontrolli oma privaatsuse üle.
 
-Võimaldades valida, kes vestlusi korraldab, annab Element annab kontrolli sinule. Rakendust Element saad kasutada mitmel viisil.
+<b>Võid kasutada Element'i jaoks oma serverid</b>
+Kui vajad suuremat kontrolli oma suhtluse ja andmete üle, siis võid kasutada oma serverit või tellida teenuse ükspuha missuguselt Matrix'i-teenuse pakkujalt. Matrix on standard avatud lähtekoodil põhineva detsentraliseeritud suhtluse jaoks.
 
-1. Tasuta konto Matrixi arendajate hostitud avalikus serveris matrix.org või vali tuhandete avalike serverite hulgast, mida haldavad vabatahtlikud
-2. Hosti oma kontot ise, paigaldades serveri oma riistvarale
-3. Registreeruge serveris olevale kontole, tellides Element Matrix Services teenuseplatvormi
+<b>Andmed on Sinu omad</b>
+Sina otsustad seda, kus hoiad oma sõnumeid ja andmeid. Ning seejuures puudub andmekaevandamise risk ja ligipääs kolmandatele osapooltele.
 
-<b> Miks valida element? </b>
+Element annab kontrolli sinule valikuga mitme võimaluse vahel:
+1. tasuta konto Matrix'i arendajate hostitud avalikus serveris matrix.org või vali tuhandete avalike serverite hulgast, mida haldavad vabatahtlikud
+2. hosti oma kontot ise, paigaldades serveri oma IT-taristule
+3. telli tasuline kasutajakonto Element Matrix Services teenuseplatvormilt
 
-<b> KONTROLL ANDMETE ÜLE</b>: otsustad ise, kus oma andmeid ja sõnumeid hoida. Need kuuluvad sulle ja sinu käes on kontroll, mitte mõne MEGAFIRMA käes, mis andmeid oma kasuks kaevandab või kolmandatele isikutele juurdepääsu annab.
+<b>Avatud suhtlus ja koostöö</b>
+Saad vestelda kõigi teistega Matrix'i võrgus, olenemata sellest, kas nad kasutavad Elementi või mõnda muud Matrixi rakendust ja isegi kui nad kasutavad mõnda teistsugust suhtlussüsteemi.
 
-<b> AVATUD SUHTLUS JA KOOSTÖÖ </b>: saad vestelda kõigi teistega Matrixi võrgus, olenemata sellest, kas nad kasutavad Elementi või mõnda muud Matrixi rakendust, ja isegi kui nad kasutavad teistsugust suhtlussüsteemi nagu Slack, IRC või XMPP.
+<b>Üliturvaline</b>
+Tõeline läbiv krüptimine (ainult vestluses osalejad saavad sõnumeid lugeda) ja risttunnustamine vestluses osalejate tuvastamiseks.
 
-<b> ÜLITURVALINE </b>: tõeline läbiv krüptimine (ainult vestluses osalejad saavad sõnumeid lugeda) ja risttunnustamine vestluses osalejate tuvastamiseks.
+<b>Kõik suhtlusvõimalused</b>
+Sõnumid, hääl- ja videokõned, failide jagamine, ekraani jagamine ja terve hulk lõiminguid, roboteid ja vidinaid. Loo tubasid, kogukondi, hoia ühendust ja saa asjad aetud.
 
-<b> KÕIK SUHTLUSVÕIMALUSED</b>: sõnumid, hääl- ja videokõned, failide jagamine, ekraani jagamine ja terve hulk lõiminguid, roboteid ja vidinaid. Loo tubasid, kogukondi, hoia ühendust ja saa asjad aetud.
-
-<b> KÕIKJAL, KUS VIIBITE</b>: saad suhelda kõigis oma seadmetes ja ka veebis aadressil https://app.element.io ning sealjuures täielikult sünkroonitud sõnumite ajalooga.
+<b>Jätka sealt, kus pooleli jäid</b>
+Saad suhelda kõigis oma seadmetes ja ka veebis aadressil https://app.element.io ning sealjuures täielikult sünkroonitud sõnumite ajalooga.
diff --git a/fastlane/metadata/android/et/short_description.txt b/fastlane/metadata/android/et/short_description.txt
index 4075c1f7cf..5352464a7a 100644
--- a/fastlane/metadata/android/et/short_description.txt
+++ b/fastlane/metadata/android/et/short_description.txt
@@ -1 +1 @@
-Turvalised ning hajutatud vestlused ja VoIP-kõned. Sinu suhtlus on üliturvaline.
+Vestlus- ja koostöörakendus: krüptitud sõnumid, rühmavestlused ja videokõned
diff --git a/fastlane/metadata/android/et/title.txt b/fastlane/metadata/android/et/title.txt
index f74f9ff18f..b0bf39ba23 100644
--- a/fastlane/metadata/android/et/title.txt
+++ b/fastlane/metadata/android/et/title.txt
@@ -1 +1 @@
-Element (varem Riot.im)
+Element - turvaline sõnumiklient
diff --git a/fastlane/metadata/android/fr/changelogs/40101040.txt b/fastlane/metadata/android/fr/changelogs/40101040.txt
new file mode 100644
index 0000000000..0af0cf55d8
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : amélioration des performances et corrections de bugs !
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/fr/changelogs/40101050.txt b/fastlane/metadata/android/fr/changelogs/40101050.txt
new file mode 100644
index 0000000000..dd6e8468af
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Corrections de bugs sur la 1.1.4
+Liste de tous les changements : https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/fr/changelogs/40101060.txt b/fastlane/metadata/android/fr/changelogs/40101060.txt
new file mode 100644
index 0000000000..e10a8aa4f3
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Corrections de bugs sur la 1.1.5
+Liste de tous les changements : https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/fr/short_description.txt b/fastlane/metadata/android/fr/short_description.txt
index 2fb9762e97..6d86b77a6b 100644
--- a/fastlane/metadata/android/fr/short_description.txt
+++ b/fastlane/metadata/android/fr/short_description.txt
@@ -1 +1 @@
-Chat & VoIP sûr et décentralisé. Gardez vos données en sécurité.
+Messagerie de groupes - messages chiffrés, groupés et appels vidéos
diff --git a/fastlane/metadata/android/fr/title.txt b/fastlane/metadata/android/fr/title.txt
index 87cbc3b858..9152e92cfa 100644
--- a/fastlane/metadata/android/fr/title.txt
+++ b/fastlane/metadata/android/fr/title.txt
@@ -1 +1 @@
-Element (anciennement Riot.im)
+Element - Messagerie sécurisée
diff --git a/fastlane/metadata/android/fy/changelogs/40100100.txt b/fastlane/metadata/android/fy/changelogs/40100100.txt
new file mode 100644
index 0000000000..dc2eda9234
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100100.txt
@@ -0,0 +1,2 @@
+Disse nije ferzje bestjit foar in grut diel út breksoplossings en ferbetteringen. Berjochten stjoere giet no in soad flugger.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.10
diff --git a/fastlane/metadata/android/fy/changelogs/40100110.txt b/fastlane/metadata/android/fy/changelogs/40100110.txt
new file mode 100644
index 0000000000..8249b5c409
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100110.txt
@@ -0,0 +1,2 @@
+Disse nije ferzje bestjit foar in grut diel út brûkersinterfaasje en brûkersûnderfingsferbetteringen. No kinst freonen útnûgje, en gau DM's meitsje troch QR koades te scannen.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/fy/changelogs/40100120.txt b/fastlane/metadata/android/fy/changelogs/40100120.txt
new file mode 100644
index 0000000000..9605ce2a75
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100120.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: URL ynsjen, nij emoji toetseboerd, nij keamer ynstellings moochlikheden, en snie foar kryst.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/fy/changelogs/40100130.txt b/fastlane/metadata/android/fy/changelogs/40100130.txt
new file mode 100644
index 0000000000..ebc7285193
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100130.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: URL ynsjen, nij emoji toetseboerd, nij keamer ynstellings moochlikheden, en snie foar kryst.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/fy/changelogs/40100140.txt b/fastlane/metadata/android/fy/changelogs/40100140.txt
new file mode 100644
index 0000000000..6886848889
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Keamer fjochten feroarje, automatysk ljocht/tsjuster tema, en breksferbetteringen.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/fy/changelogs/40100150.txt b/fastlane/metadata/android/fy/changelogs/40100150.txt
new file mode 100644
index 0000000000..d291da0475
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Stipe foar sosjaal ynlogge!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/fy/changelogs/40100160.txt b/fastlane/metadata/android/fy/changelogs/40100160.txt
new file mode 100644
index 0000000000..eb2be2d09c
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Stipe foar sosjaal ynlogge!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.15 and https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/fy/changelogs/40100170.txt b/fastlane/metadata/android/fy/changelogs/40100170.txt
new file mode 100644
index 0000000000..281b087584
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/fy/changelogs/40101000.txt b/fastlane/metadata/android/fy/changelogs/40101000.txt
new file mode 100644
index 0000000000..a860b7b468
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: VoIP (lûds en video skilje yn DM) ferbetteringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/fy/changelogs/40101010.txt b/fastlane/metadata/android/fy/changelogs/40101010.txt
new file mode 100644
index 0000000000..2369fc4d22
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Prestaasje feroaringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/fy/changelogs/40101020.txt b/fastlane/metadata/android/fy/changelogs/40101020.txt
new file mode 100644
index 0000000000..13aa172071
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Prestaasje feroaringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/fy/changelogs/40101030.txt b/fastlane/metadata/android/fy/changelogs/40101030.txt
new file mode 100644
index 0000000000..595cbdf104
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Prestaasje feroaringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/fy/changelogs/40101040.txt b/fastlane/metadata/android/fy/changelogs/40101040.txt
new file mode 100644
index 0000000000..e86e7ce3e3
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Prestaasje feroaringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/fy/changelogs/40101050.txt b/fastlane/metadata/android/fy/changelogs/40101050.txt
new file mode 100644
index 0000000000..fdf5f98eb7
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: feroaringen foar 1.1.4
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/fy/changelogs/40101060.txt b/fastlane/metadata/android/fy/changelogs/40101060.txt
new file mode 100644
index 0000000000..47ac5692d5
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: feroaringen foar 1.1.5
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/fy/short_description.txt b/fastlane/metadata/android/fy/short_description.txt
new file mode 100644
index 0000000000..ddc559b59c
--- /dev/null
+++ b/fastlane/metadata/android/fy/short_description.txt
@@ -0,0 +1 @@
+Groepsberjochtetsjinst - fersifere berjochten, groeps petearen en fideo skilje
diff --git a/fastlane/metadata/android/fy/title.txt b/fastlane/metadata/android/fy/title.txt
new file mode 100644
index 0000000000..c4b5b596fc
--- /dev/null
+++ b/fastlane/metadata/android/fy/title.txt
@@ -0,0 +1 @@
+Element - Feilige Berjochtetsjinst
diff --git a/fastlane/metadata/android/it/changelogs/40101040.txt b/fastlane/metadata/android/it/changelogs/40101040.txt
new file mode 100644
index 0000000000..93aac046a1
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: prestazioni migliorate e correzione di errori!
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/it/changelogs/40101050.txt b/fastlane/metadata/android/it/changelogs/40101050.txt
new file mode 100644
index 0000000000..7fa5ba20df
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: correzioni per la 1.1.4
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/it/changelogs/40101060.txt b/fastlane/metadata/android/it/changelogs/40101060.txt
new file mode 100644
index 0000000000..d915bf2d8f
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: correzioni per la 1.1.5
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/it/full_description.txt b/fastlane/metadata/android/it/full_description.txt
index b6f7cf449c..dd7716ffbf 100644
--- a/fastlane/metadata/android/it/full_description.txt
+++ b/fastlane/metadata/android/it/full_description.txt
@@ -1,30 +1,39 @@
-Element è un nuovo tipo di app di messaggistica e collaborazione che:
+Element è sia un messenger sicuro sia un'app collaborativa per team di produttività, ideale per chat di gruppo durante il lavoro da remoto. Questa app usa una crittografia end-to-end per fornire videoconferenze, condivisione di file e videochiamate.
 
-1. Ti mette al controllo per preservare la tua privacy
-2. Ti lascia comunicare con chiunque nella rete Matrix e oltre, integrandosi con app come Slack
-3. Ti protegge da pubblicità, raccolta di dati e piattaforme chiuse
-4. Ti protegge con la crittografia end-to-end, con la firma incrociata per verificare gli altri
+<b>Tra le caratteristiche di Element ci sono:</b>
+- Strumenti di comunicazione online avanzati
+- Messaggi totalmente cifrati per consentire comunicazioni aziendali più sicure, anche per i lavoratori remoti
+- Chat decentralizzate basate sull'infrastruttura open source Matrix
+- Condivisione sicura di file con dati crittografati durante la gestione dei progetti
+- Videochiamate con "Voice over IP" e condivisione dello schermo
+- Facile integrazione con i tuoi strumenti collaborativi online preferiti, strumenti di gestione progetti, servizi VoIP ed altre app di messaggistica tra team
 
-Element è completamente diverso dalle altre app di messaggistica e collaborazione perchè è decentralizzato e open source.
+Element è completamente diverso dalle altre app di messaggistica e collaborazione. Funziona su Matrix, una rete aperta per messaggi sicuri e comunicazioni decentralizzate. Può essere installato in locale per dare agli utenti il pieno possesso e controllo dei propri dati e messaggi.
 
-Element può essere gestito in locale - o puoi scegliere un host - in modo che tu abbia privacy, possesso e controllo dei tuoi dati e conversazioni. Ti dà accesso ad una rete aperta, quindi non sei limitato a parlare solo con altri utenti Element. Ed è molto sicuro.
+<b>Privacy e messaggi privati</b>
+Element ti protegge da pubblicità indesiderate, dalla raccolta di dati e dalle piattaforme chiuse. Protegge tutti i tuoi dati e comunicazioni uno-ad-uno, attraverso la crittografia end-to-end e la verifica a firma incrociata tra dispositivi.
 
-Element può fare tutto ciò perchè funziona su Matrix - lo standard per comunicazioni aperte e decentralizzate.
+Element ti dà il controllo della tua privacy consentendoti di comunicazre in modo sicuro con chiunque nella rete di Matrix, o con altri strumenti collaborativi aziendali, integrandosi con app come Slack.
 
-Element ti mette al controllo lasciandoti scegliere chi gestisce il server delle tue conversazioni. Dall'app Element, hai diverse opzioni:
+<b>Element può essere installato in locale</b>
+Per consentire un maggiore controllo dei tuoi dati sensibili e delle conversazioni, Element può essere gestito in locale o puoi scegliere un qualsiasi host basato su Matrix - lo standard per le comunicazioni open source e decentralizzate. Element ti offre privacy, conformità alla sicurezza e flessibilità di integrazione.
 
+<b>Possiedi i tuoi dati</b>
+Decidi tu dove tenere i tuoi dati e messaggi. Senza il rischio di raccolta di dati o accessi da terze parti.
+
+Element ti mette al controllo in diversi modi:
 1. Crea un account gratuito sul server pubblico matrix.org gestito dagli sviluppatori di Matrix, o scegli tra migliaia di server pubblici gestiti da volontari
-2. Gestisci autonomamente un account installando un server sul tuo hardware
+2. Gestisci autonomamente un account installando un server nella tua infrastruttura informatica
 3. Registra un account su un server personalizzato iscrivendoti alla piattaforma Element Matrix Services
 
-<b>Perchè scegliere Element?</b>
+<b>Messaggistica e collaborazioni aperte</b>
+Puoi chattare con chiunque nella rete Matrix, sia che stiano usando Element, un'altra app Matrix, o anche un'app di messaggistica diversa.
 
-<b>POSSIEDI I TUOI DATI</b>: decidi dove tenere i tuoi dati e messaggi. Sono tuoi e li controlli tu, non qualche MEGADITTA che raccoglie i tuoi dati o ne dà l'accesso a terze parti.
+<b>Super sicuro</b>
+Vera crittografia end-to-end (solo chi è nella conversazione può decifrare i messaggi) e verifica di dispositivi a firma incrociata.
 
-<b>MESSAGGISTICA E COLLABORAZIONE APERTE</b>: puoi chattare con chiunque nella rete Matrix, usando Element o un'altra app Matrix, o anche se si sta usando un sistema di messaggistica diverso come Slack, IRC o XMPP.
+<b>Comunicazioni ed integrazioni complete</b>
+Messaggi, chiamate audio e video, condivisione file e schermo, un vasto numero di integrazioni, bot e widget. Crea stanze, comunità, resta in contatto e porta a termine gli obiettivi.
 
-<b>SUPER SICURO</b>: vera crittografia end-to-end (solo chi è nella conversazione può decifrare i messaggi) e firma incrociata per verificare i dispositivi dei partecipanti.
-
-<b>COMUNICAZIONE COMPLETA</b>: messaggi, chiamate audio e video, condivisione file e schermo, un vasto numero di integrazioni, bot e widget. Crea stanze, comunità, resta in contatto e porta a termine gli impegni.
-
-<b>OVUNQUE TU SIA</b>: resta in contatto ovunque tu sia con la cronologia dei messaggi sincronizzata tra tutti i tuoi dispositivi e in rete su https://app.element.io.
+<b>Riprendi da dove ti eri fermato</b>
+Resta in contatto ovunque tu sia con la cronologia dei messaggi sincronizzata tra tutti i tuoi dispositivi e in rete su https://app.element.io
diff --git a/fastlane/metadata/android/it/short_description.txt b/fastlane/metadata/android/it/short_description.txt
index 8c0c8fbee0..5050d0c1c5 100644
--- a/fastlane/metadata/android/it/short_description.txt
+++ b/fastlane/metadata/android/it/short_description.txt
@@ -1 +1 @@
-Chat e VoIP decentralizzati sicuri. Tieni lontani i tuoi dati dalle terze parti.
+Messenger di gruppo - messaggi cifrati, chat di gruppo e videochiamate
diff --git a/fastlane/metadata/android/it/title.txt b/fastlane/metadata/android/it/title.txt
index 54e3b456c7..c426a480d3 100644
--- a/fastlane/metadata/android/it/title.txt
+++ b/fastlane/metadata/android/it/title.txt
@@ -1 +1 @@
-Element (ex Riot.im)
+Element - Messaggi sicuri
diff --git a/fastlane/metadata/android/sv/changelogs/40101040.txt b/fastlane/metadata/android/sv/changelogs/40101040.txt
new file mode 100644
index 0000000000..46a004ec54
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: prestandaförbättringar och buggfixar!
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/sv/changelogs/40101050.txt b/fastlane/metadata/android/sv/changelogs/40101050.txt
new file mode 100644
index 0000000000..158e2032b7
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: hotfixar för 1.1.4
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/sv/changelogs/40101060.txt b/fastlane/metadata/android/sv/changelogs/40101060.txt
new file mode 100644
index 0000000000..cc7a9b84b6
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: hotfixar för 1.1.5
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/sv/full_description.txt b/fastlane/metadata/android/sv/full_description.txt
index d130e9214a..5302976ed7 100644
--- a/fastlane/metadata/android/sv/full_description.txt
+++ b/fastlane/metadata/android/sv/full_description.txt
@@ -1,30 +1,39 @@
-Element är en ny sorts meddelande- och samarbetsapp som:
+Element är både en säker meddelandeapp och en samarbetsapp för produktivitet som är ideal för gruppchattar vid distansarbete. Appen använder totalsträckskryptering för att tillhandahålla kraftfulla videogruppsamtal, fildelning och röstsamtal.
 
-1. Sätter dig i kontroll för att kunna säkerställa ditt privatliv
-2. Låter dig kommunicera med vem som helst i Matrix-nätverket, och till och med bortom det genom integrationer med appar som Slack
-3. Skyddar dig från reklam, datainsamling och inlåsning
-4. Säkrar dig genom totalsträckskryptering, med korssingering för att verifiera andra
+<b>Elements funktioner inkluderar:</b>
+- Avancerade kommunikationsverktyg
+- Fullt krypterade meddelanden för att tillåta säkrare företagskommunikation, även för distansarbetare
+- Decentraliserad chatt baserad på det öppna ramverket Matrix
+- Säker fildelning med krypterad data vid hantering av projekt
+- Videochattar med Voice over IP och skärmdelning
+- Enkel integration med dina föredragna onlinesamarbetsverktyg, projektledningsverktyg, VoIP-tjänster och andra teammeddelandeappar
 
-Element skiljer sig helt från andra meddelande- och samarbetsappar genom att vara decentraliserad och öppen källkod.
+Element är helt olik andra meddelande- och samarbetsappar. Den använder Matrix, ett öppet nätverk för säkra meddelanden och decentraliserad kommunikation. Den låter dig driva en igen server för att ge användare maximalt ägandeskap över sin data och sina meddelanden.
 
-Element låter dig driva en egen server - eller välja en värd - så att du har sekretess, ägande och kontroll över din data och dina konversationer. Den ger dig tillgång till ett öppet nätverk; så att du inte kan prata bara med Element-användare. Och den är väldigt säker.
+<b>Sekretess och krypterade meddelanden</b>
+Element skyddar dig från oönskad reklam, datainsamling och inlåsning. Den skyddar även all din data, en-till-en-video- och röstkommunikation genom totalsträckskryptering och korssignerad enhetsverifiering.
 
-Element kan göra allt detta för att den använder Matrix - standarden för öppen decentraliserad kommunikation.
+Element sätter dig i kontroll över ditt privatliv och låter dig kommunicera säkert med vem som helst i Matrix-nätverket, eller andra samarbetsverktyg genom att integrera med appar som Slack.
 
-Element sätter dig i kontroll genom att låta dig välja att vara värd för dina konversationer. Från appen Element kan du välja att ansluta på följande sätt:
+<b>Du kan driva Element själv</b>
+För att tillåta större kontroll över din känsliga data och konversationer, så kan du lägga Element på en egen server eller använda valfri Matrix-baserad värd - standarden för open source-baserad, decentraliserad kommunikation. Element ger dig sekretess, säkerhetsefterlevnad och integrationsflexibilitet.
 
-1. Skaffa ett gratis konto på den publika servern på matrix.org, vilken drivs av Matrix-utvecklarna, eller välj bland tusentals offentliga servrar som drivs av volontärer
-2. Var värd för ditt eget konto genom att driva en server på din egen hårdvara
-3. Skapa ett konto på en anpassad server genom att registrera dig på värdplattformen Element Matrix Services
+<b>Äg din data</b>
+Du bestämmer vart du vill lagra din data och dina meddelanden, utan rist för datainsamling eller åtkomst av tredje parter.
 
-<b>Varför välja Element?</b>
+Element sätter dig i kontroll på olika sätt:
+1. Få ett gratiskonto på den offentliga servern matrix.org som drivas av Matrixutvecklarna, eller välj bland tusentals offentliga servrar som drivs av volontärer
+2. Självdriv ditt konto genom att driva en server på din egen IT-infrastruktur
+3. Skapa ett konto på en anpassad server genom att abonnera på värdplattformen Element Matrix Services
 
-<b>ÄG DIN DATA</b>: Du väljer var du vill ha din data och dina meddelanden. Du äger den och kontrollerar den, inte nåt stort företag som samlar in din data och ger den till tredje parter.
+<b>Öppen meddelandehantering och kommunikation</b>
+Du kan chatta med vem som helst i Matrix-nätverket, oavsett om de använder Matrix, en annan Matrix-app eller till och med en annan meddelandeapp.
 
-<b>ÖPPEN KOMMUNIKATION OCH ÖPPET SAMARBETE</b>: Du kan chatta med vem som helst på Matrix-nätverket, oavsett om de använder Element eller en annan Matrix-app, och till och med om de använder ett annat meddelandesystem som Slack, IRC eller XMPP.
+<b>Supersäker</b>
+Riktig totalsträckskryptering (bara de i konversationen kan avkryptera meddelanden), och korssignerad enhetsverifiering.
 
-<b>SUPERSÄKER</b>: Riktig totalsträckskryptering (bara de in konversationen kan avkryptera meddelandena), och korssingering för att verifiera konversationsmedlemmars enheter.
+<b>Komplett kommunikation och integration</b>
+Meddelanden, röst- och videosamtal, fildelning, skärmdelning och massa integrationer, bottar och widgets. Bygg rum och gemenskaper, håll kontakten och få saker gjorda.
 
-<b>KOMPLETT KOMMUNIKATION</b>: Meddelanden, röst- och videosamtal, fildelning, skärmdelning och massa integrationer, bottar och widgets. Skapa rum och gemenskaper, håll kontakten och få saker gjorda.
-
-<b>ÖVERALLT DÄR DU ÄR</b>: Håll kontakten vart du än befinner dig med fullständigt synkroniserad meddelandehistorik på alla dina enheter och på webben på https://app.element.io.
+<b>Fortsätt där du lämnade</b>
+Håll kontakten vart du än är med fullt synkroniserad meddelandehistorik på alla dina enheter och på webben på https://app.element.io
diff --git a/fastlane/metadata/android/sv/short_description.txt b/fastlane/metadata/android/sv/short_description.txt
index ddfc5dcbfb..c16da5c761 100644
--- a/fastlane/metadata/android/sv/short_description.txt
+++ b/fastlane/metadata/android/sv/short_description.txt
@@ -1 +1 @@
-Säker decentraliserad chatt och VoIP. Håll din data säker från tredje parter.
+Gruppmeddelandeapp - krypterade meddelanden, gruppchatt och videosamtal
diff --git a/fastlane/metadata/android/sv/title.txt b/fastlane/metadata/android/sv/title.txt
index 573e27fab9..4fc189de15 100644
--- a/fastlane/metadata/android/sv/title.txt
+++ b/fastlane/metadata/android/sv/title.txt
@@ -1 +1 @@
-Element (före detta Riot.im)
+Element - Säker meddelandeapp
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101040.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101040.txt
new file mode 100644
index 0000000000..1786691c42
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hant/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：效能改善與錯誤修復！
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101050.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101050.txt
new file mode 100644
index 0000000000..899ce72c9a
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hant/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：1.1.4 的快速修補
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101060.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101060.txt
new file mode 100644
index 0000000000..838dc6d731
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hant/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：1.1.5 的快速修補
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/zh-Hant/full_description.txt b/fastlane/metadata/android/zh-Hant/full_description.txt
index 2fdf6fa478..90c0eb4c4c 100644
--- a/fastlane/metadata/android/zh-Hant/full_description.txt
+++ b/fastlane/metadata/android/zh-Hant/full_description.txt
@@ -1,30 +1,39 @@
-Element 是一種新型態的即時通訊軟體與協作應用程式：
+Element 同時是安全的通訊軟體，也是生產力團隊協作應用程式，非常適合在遠端工作時進行群組聊天。此聊天應用程式使用了端到端加密來提供強大的視訊會議、檔案分享與語音通話。
 
-1. 自己的隱私自己掌控
-2. 讓您與任何在 Matrix 網路中的人通訊，甚至可與如 Slack 等的應用程式整合
-3. 保護您免受廣告、資料採礦與圍牆花園的侵害
-4. 透過端到端加密保護您，並使用交叉簽章來驗證其他人
+<b>Element 的功能包含了：</b>
+- 進階線上通訊工具
+- 完全加密的訊息，即使對於遠端工作者，也可以有更安全的公司通訊
+- 以 Matrix 開放原始碼框架為基礎的去中心化的聊天
+- 在管理專案時透過加密資料安全地分享檔案
+- 包含了 VoIP 與畫面分享的視訊聊天
+- 與您最喜歡的協作工具、專案管理工具、VoIP 服務與其他團隊訊息應用程式輕鬆整合
 
-Element 是去中心化且開放原始碼的應用程式，因此與其他即時通訊與協作軟體完全不同。
+Element 與其他訊息傳遞與協作應用程式完全不同。它在 Matrix（一個用於安全傳遞訊息與去中心化通訊的開放網路）上執行。其可以自架，讓使用者對他們的資料與訊息有最大的所有權與控制權。
 
-Element 讓您可以自架（或是自行選擇服務提供者）所以您擁有您資料與對話的隱私、所有權與控制權。它讓您可以存取開放的網路；因此，您不僅可以與其他 Matrix 使用者聊天。而且非常安全。
+<b>隱私與加密訊息傳遞</b>
+Element 保護您不受不想要的廣告、資料挖礦與圍牆花園侵擾。其也透過端到端加密與交叉簽章裝置驗證保護了您所有的資料，並提供一對一視訊以及語音通訊。
 
-Element 能作到這些事情是因為它在 Matrix 上執行，這是一個開放的去中心化通訊的標準。
+Element 透過與其他商業協作工具，如 Slack 等應用程式整合，讓您可以在控制您的隱私的同時，也可以與 Matrix 網路上的任何人安全地通訊。
 
-Element 讓您選擇您要在哪裡託管您的對話來將控制權還給您。在 Element 應用程式中，您可以選擇其他方式來託管：
+<b>Element 可以自架</b>
+為了可以完整控制您的敏感資料與對話，Element 可以自架，您也可以選擇任何以 Matrix 為基礎的服務提供商，開放原始碼、去中心化的通訊標準。Element 為您提供隱私、安全合規與整合活性。
 
-1. 在由 Matrix 開發者架設的 matrix.org 公開伺服器上取得免費的帳號，或是從數千個由志願者所架設的公開伺服器中選擇
-2. 在您自己的硬體上自行架設伺服器並建立帳號
-3. 訂閱 Element Matrix 服務託管平台並在自訂伺服氣上註冊帳號
+<b>擁有您的資料</b>
+您可以決定將您的資料與訊息儲存在何處。沒有資料挖礦或被第三方存取的風險。
 
-<b>為何選擇 Element？</b>
+Element 透過不同的方式讓您掌控一切：
+1. 在 Matrix 開發者架設的 matrix.org 公開伺服器上取得免費帳號，或是從數千個由志願者架設的公開伺服器中選擇
+2. 在您自己的 IT 基礎架構上執行伺服器來自行託管您的帳號
+3. 只要訂閱 Element Matrix Services 託管平台就可以在自訂的伺服器上註冊帳號
 
-<b>擁有您的資料</b>：您決定您的資料與訊息要放在哪裡。您擁有並控制它，而非某些科技巨頭會挖掘您的資料並將其售予第三方。
+<b>開放訊息傳遞與協作</b>
+您可以與 Matrix 網路上的任何人聊天，不論他們是使用 Element、其他 Matrix 應用程式或其他通訊應用程式。
 
-<b>開放的即時通訊與協作</b>：您可以與 Matrix 網路中的任何人聊天，不管他們是使用 Element 或其他 Matrix 應用程式都可以，或甚至是其他的訊息系統，如 Slack、IRC 或 XMPP 也都可以。
+<b>超級安全</b>
+真的端到端加密（僅有那些在對話中的可以解密訊息）以及交叉簽章裝置驗證。
 
-<b>超級安全</b>：即時的端到端加密（僅有參與對話的人可以解密訊息），以及交叉簽章以驗證對話參與者的裝置。
+<b>完整的通訊與整合Complete communication and integration</b>
+訊息傳遞、語音與視訊通話、檔案分享、畫面分享與超多的整合、機器人與小工具。建構聊天室、社群、保持聯絡並完成工作。
 
-<b>完整通訊</b>：即時通訊、語音與視訊通話、檔案分享、畫面分享與超多的整合、機器人與小工具。建立聊天室、保持聯繫並完成工作。
-
-<b>無論您身在何處</b>：無論您身在何處，都可以透過 https://app.element.io 來在所有裝置與網路上保持訊息歷史同步。
+<b>從上次離開的地方開始</b>
+無論您身在何處，都可以透過在您所有裝置與網頁 https://app.element.io 間完全同步的訊息歷史保持聯絡
diff --git a/fastlane/metadata/android/zh-Hant/short_description.txt b/fastlane/metadata/android/zh-Hant/short_description.txt
index 23bb82c04e..0d1f5bb7cd 100644
--- a/fastlane/metadata/android/zh-Hant/short_description.txt
+++ b/fastlane/metadata/android/zh-Hant/short_description.txt
@@ -1 +1 @@
-安全的去中心化聊天與 VoIP。確保您的資料不受第三方的影響。
+群組通訊軟體 - 訊息加密、群組聊天與視訊通話
diff --git a/fastlane/metadata/android/zh-Hant/title.txt b/fastlane/metadata/android/zh-Hant/title.txt
index 3be2260b73..47d8a6b3ad 100644
--- a/fastlane/metadata/android/zh-Hant/title.txt
+++ b/fastlane/metadata/android/zh-Hant/title.txt
@@ -1 +1 @@
-Element（曾名為 Riot.im）
+Element - 安全的通訊軟體
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9d174797f7..e1e2fd2c75 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionSha256Sum=13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 4059004394..a65dc6298e 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -6,13 +6,10 @@ apply plugin: 'realm-android'
 
 buildscript {
     repositories {
-        // mavenCentral()
-        //noinspection GrDeprecatedAPIUsage
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        // Stick to this version until https://github.com/realm/realm-java/issues/7402 is fixed
-        classpath "io.realm:realm-gradle-plugin:10.3.1"
+        classpath "io.realm:realm-gradle-plugin:10.5.0"
     }
 }
 
@@ -115,7 +112,7 @@ dependencies {
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
-    def daggerVersion = '2.35'
+    def daggerVersion = '2.35.1'
     def work_version = '2.5.0'
     def retrofit_version = '2.9.0'
 
@@ -172,7 +169,7 @@ dependencies {
     implementation 'com.otaliastudios:transcoder:0.10.3'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.22'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.23'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.5.1'
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
index ee604fc9ab..76bf6dc040 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
@@ -226,12 +226,12 @@ class QrCodeTest : InstrumentedTest {
 
     private fun checkHeader(byteArray: ByteArray) {
         // MATRIX
-        byteArray[0] shouldBeEqualTo 'M'.toByte()
-        byteArray[1] shouldBeEqualTo 'A'.toByte()
-        byteArray[2] shouldBeEqualTo 'T'.toByte()
-        byteArray[3] shouldBeEqualTo 'R'.toByte()
-        byteArray[4] shouldBeEqualTo 'I'.toByte()
-        byteArray[5] shouldBeEqualTo 'X'.toByte()
+        byteArray[0] shouldBeEqualTo 'M'.code.toByte()
+        byteArray[1] shouldBeEqualTo 'A'.code.toByte()
+        byteArray[2] shouldBeEqualTo 'T'.code.toByte()
+        byteArray[3] shouldBeEqualTo 'R'.code.toByte()
+        byteArray[4] shouldBeEqualTo 'I'.code.toByte()
+        byteArray[5] shouldBeEqualTo 'X'.code.toByte()
 
         // Version
         byteArray[6] shouldBeEqualTo 2
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index a7f5163774..5e35917243 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -51,11 +51,15 @@ interface AuthenticationService {
 
     /**
      * Return a LoginWizard, to login to the homeserver. The login flow has to be retrieved first.
+     *
+     * See [LoginWizard] for more details
      */
     fun getLoginWizard(): LoginWizard
 
     /**
      * Return a RegistrationWizard, to create an matrix account on the homeserver. The login flow has to be retrieved first.
+     *
+     * See [RegistrationWizard] for more details.
      */
     fun getRegistrationWizard(): RegistrationWizard
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
index 9c96cba40c..da6eb0c3ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
@@ -17,34 +17,46 @@
 package org.matrix.android.sdk.api.auth.login
 
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.util.Cancelable
 
+/**
+ * Set of methods to be able to login to an existing account on a homeserver.
+ *
+ * More documentation can be found in the file https://github.com/vector-im/element-android/blob/main/docs/signin.md
+ */
 interface LoginWizard {
-
     /**
-     * @param login the login field
-     * @param password the password field
+     * Login to the homeserver.
+     *
+     * @param login the login field. Can be a user name, or a msisdn (email or phone number) associated to the account
+     * @param password the password of the account
      * @param deviceName the initial device name
-     * @param callback  the matrix callback on which you'll receive the result of authentication.
-     * @return a [Cancelable]
+     * @return a [Session] if the login is successful
      */
     suspend fun login(login: String,
                       password: String,
                       deviceName: String): Session
 
     /**
-     * Exchange a login token to an access token
+     * Exchange a login token to an access token.
+     *
+     * @param loginToken login token, obtain when login has happen in a WebView, using SSO
+     * @return a [Session] if the login is successful
      */
     suspend fun loginWithToken(loginToken: String): Session
 
     /**
-     * Reset user password
+     * Ask the homeserver to reset the user password. The password will not be reset until
+     * [resetPasswordMailConfirmed] is successfully called.
+     *
+     * @param email an email previously associated to the account the user wants the password to be reset.
+     * @param newPassword the desired new password
      */
     suspend fun resetPassword(email: String,
                               newPassword: String)
 
     /**
      * Confirm the new password, once the user has checked their email
+     * When this method succeed, tha account password will be effectively modified.
      */
     suspend fun resetPasswordMailConfirmed()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
index f059bf26c4..621253faa5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
@@ -16,32 +16,98 @@
 
 package org.matrix.android.sdk.api.auth.registration
 
+/**
+ * Set of methods to be able to create an account on a homeserver.
+ *
+ * Common scenario to register an account successfully:
+ *  - Call [getRegistrationFlow] to check that you application supports all the mandatory registration stages
+ *  - Call [createAccount] to start the account creation
+ *  - Fulfill all mandatory stages using the methods [performReCaptcha] [acceptTerms] [dummy], etc.
+ *
+ * More documentation can be found in the file https://github.com/vector-im/element-android/blob/main/docs/signup.md
+ * and https://matrix.org/docs/spec/client_server/latest#account-registration-and-management
+ */
 interface RegistrationWizard {
-
+    /**
+     * Call this method to get the possible registration flow of the current homeserver.
+     * It can be useful to ensure that your application implementation supports all the stages
+     * required to create an account. If it is not the case, you will have to use the web fallback
+     * to let the user create an account with your application.
+     * See [org.matrix.android.sdk.api.auth.AuthenticationService.getFallbackUrl]
+     */
     suspend fun getRegistrationFlow(): RegistrationResult
 
+    /**
+     * Can be call to check is the desired userName is available for registration on the current homeserver.
+     * It may also fails if the desired userName is not correctly formatted or does not follow any restriction on
+     * the homeserver. Ex: userName with only digits may be rejected.
+     * @param userName the desired username. Ex: "alice"
+     */
+    suspend fun registrationAvailable(userName: String): RegistrationAvailability
+
+    /**
+     * This is the first method to call in order to create an account and start the registration process.
+     *
+     * @param userName the desired username. Ex: "alice"
+     * @param password the desired password
+     * @param initialDeviceDisplayName the device display name
+     */
     suspend fun createAccount(userName: String?,
                               password: String?,
                               initialDeviceDisplayName: String?): RegistrationResult
 
+    /**
+     * Perform the "m.login.recaptcha" stage.
+     *
+     * @param response the response from ReCaptcha
+     */
     suspend fun performReCaptcha(response: String): RegistrationResult
 
+    /**
+     * Perform the "m.login.terms" stage.
+     */
     suspend fun acceptTerms(): RegistrationResult
 
+    /**
+     * Perform the "m.login.dummy" stage.
+     */
     suspend fun dummy(): RegistrationResult
 
+    /**
+     * Perform the "m.login.email.identity" or "m.login.msisdn" stage.
+     *
+     * @param threePid the threePid to add to the account. If this is an email, the homeserver will send an email
+     * to validate it. For a msisdn a SMS will be sent.
+     */
     suspend fun addThreePid(threePid: RegisterThreePid): RegistrationResult
 
+    /**
+     * Ask the homeserver to send again the current threePid (email or msisdn).
+     */
     suspend fun sendAgainThreePid(): RegistrationResult
 
+    /**
+     * Send the code received by SMS to validate a msisdn.
+     * If the code is correct, the registration request will be executed to validate the msisdn.
+     */
     suspend fun handleValidateThreePid(code: String): RegistrationResult
 
+    /**
+     * Useful to poll the homeserver when waiting for the email to be validated by the user.
+     * Once the email is validated, this method will return successfully.
+     * @param delayMillis the SDK can wait before sending the request
+     */
     suspend fun checkIfEmailHasBeenValidated(delayMillis: Long): RegistrationResult
 
-    suspend fun registrationAvailable(userName: String): RegistrationAvailability
-
+    /**
+     * This is the current ThreePid, waiting for validation. The SDK will store it in database, so it can be
+     * restored even if the app has been killed during the registration
+     */
     val currentThreePid: String?
 
-    // True when login and password has been sent with success to the homeserver
+    /**
+     * True when login and password have been sent with success to the homeserver, i.e. [createAccount] has been
+     * called successfully.
+     */
     val isRegistrationStarted: Boolean
 }
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 e493adeaf2..05fa24946a 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
@@ -66,6 +66,7 @@ interface ProfileService {
     /**
      * Get the combined profile information for this user.
      * This may return keys which are not limited to displayname or avatar_url.
+     * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response can be HTTP 403.
      * @param userId the userId param to look for
      *
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index f3eeb902a8..8c434fc440 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -83,7 +83,7 @@ interface Room :
      * @param beforeLimit how many events before the result are returned.
      * @param afterLimit how many events after the result are returned.
      * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
-     * @param callback Callback to get the search result
+     * @return The search result
      */
     suspend fun search(searchTerm: String,
                nextBatch: String?,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index d324cff246..cae4775e71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -26,7 +26,7 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
  * This class holds some data of a room.
  * It can be retrieved by [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
  */
-data class RoomSummary constructor(
+data class RoomSummary(
         val roomId: String,
         // Computed display name
         val displayName: String = "",
@@ -35,6 +35,7 @@ data class RoomSummary constructor(
         val avatarUrl: String = "",
         val canonicalAlias: String? = null,
         val aliases: List<String> = emptyList(),
+        val joinRules: RoomJoinRules? = null,
         val isDirect: Boolean = false,
         val directUserId: String? = null,
         val joinedMembersCount: Int? = 0,
@@ -74,6 +75,9 @@ data class RoomSummary constructor(
     val isFavorite: Boolean
         get() = hasTag(RoomTag.ROOM_TAG_FAVOURITE)
 
+    val isPublic: Boolean
+        get() = joinRules == RoomJoinRules.PUBLIC
+
     fun hasTag(tag: String) = tags.any { it.name == tag }
 
     val canStartCall: Boolean
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
index fd5fbf7bb0..2d31930b33 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
@@ -29,5 +29,6 @@ data class SpaceChildInfo(
         val activeMemberCount: Int?,
         val autoJoin: Boolean,
         val viaServers: List<String>,
-        val parentRoomId: String?
+        val parentRoomId: String?,
+        val suggested: Boolean?
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 9dba4f90af..db25762c2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -33,7 +33,7 @@ interface Space {
     fun spaceSummary(): RoomSummary?
 
     suspend fun addChildren(roomId: String,
-                            viaServers: List<String>,
+                            viaServers: List<String>?,
                             order: String?,
                             autoJoin: Boolean = false,
                             suggested: Boolean? = false)
@@ -46,5 +46,8 @@ interface Space {
     @Throws
     suspend fun setChildrenAutoJoin(roomId: String, autoJoin: Boolean)
 
+    @Throws
+    suspend fun setChildrenSuggested(roomId: String, suggested: Boolean)
+
 //    fun getChildren() : List<IRoomSummary>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt
index 2c4c03b7d4..7a4231c277 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt
@@ -20,6 +20,7 @@ import android.annotation.SuppressLint
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.util.safeCapitalize
 
 /**
  * Ref: https://github.com/matrix-org/matrix-doc/issues/1236
@@ -39,6 +40,6 @@ data class WidgetContent(
 
     @SuppressLint("DefaultLocale")
     fun getHumanName(): String {
-        return (name ?: type ?: "").capitalize()
+        return (name ?: type ?: "").safeCapitalize()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
index 7b2fae86ef..3bf3f66e40 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
@@ -117,22 +117,22 @@ sealed class MatrixItem(
                     var first = dn[startIndex]
 
                     // LEFT-TO-RIGHT MARK
-                    if (dn.length >= 2 && 0x200e == first.toInt()) {
+                    if (dn.length >= 2 && 0x200e == first.code) {
                         startIndex++
                         first = dn[startIndex]
                     }
 
                     // check if it’s the start of a surrogate pair
-                    if (first.toInt() in 0xD800..0xDBFF && dn.length > startIndex + 1) {
+                    if (first.code in 0xD800..0xDBFF && dn.length > startIndex + 1) {
                         val second = dn[startIndex + 1]
-                        if (second.toInt() in 0xDC00..0xDFFF) {
+                        if (second.code in 0xDC00..0xDFFF) {
                             length++
                         }
                     }
 
                     dn.substring(startIndex, startIndex + length)
                 }
-                .toUpperCase(Locale.ROOT)
+                .uppercase(Locale.ROOT)
     }
 
     companion object {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 2163b2a5e0..7f5cfe8df1 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -545,14 +545,14 @@ internal class DefaultCryptoService @Inject constructor(
         val existingAlgorithm = cryptoStore.getRoomAlgorithm(roomId)
 
         if (!existingAlgorithm.isNullOrEmpty() && existingAlgorithm != algorithm) {
-            Timber.e("## CRYPTO | setEncryptionInRoom() : Ignoring m.room.encryption event which requests a change of config in $roomId")
+            Timber.e("## CRYPTO | setEncryptionInRoom() : Ignoring m.room.encryption event which requests a change of config in $roomId")
             return false
         }
 
         val encryptingClass = MXCryptoAlgorithms.hasEncryptorClassForAlgorithm(algorithm)
 
         if (!encryptingClass) {
-            Timber.e("## CRYPTO | setEncryptionInRoom() : Unable to encrypt room $roomId with $algorithm")
+            Timber.e("## CRYPTO | setEncryptionInRoom() : Unable to encrypt room $roomId with $algorithm")
             return false
         }
 
@@ -649,17 +649,17 @@ internal class DefaultCryptoService @Inject constructor(
             val safeAlgorithm = alg
             if (safeAlgorithm != null) {
                 val t0 = System.currentTimeMillis()
-                Timber.v("## CRYPTO | encryptEventContent() starts")
+                Timber.v("## CRYPTO | encryptEventContent() starts")
                 runCatching {
                     val content = safeAlgorithm.encryptEventContent(eventContent, eventType, userIds)
-                    Timber.v("## CRYPTO | encryptEventContent() : succeeds after ${System.currentTimeMillis() - t0} ms")
+                    Timber.v("## CRYPTO | encryptEventContent() : succeeds after ${System.currentTimeMillis() - t0} ms")
                     MXEncryptEventContentResult(content, EventType.ENCRYPTED)
                 }.foldToCallback(callback)
             } else {
                 val algorithm = getEncryptionAlgorithm(roomId)
                 val reason = String.format(MXCryptoError.UNABLE_TO_ENCRYPT_REASON,
                         algorithm ?: MXCryptoError.NO_MORE_ALGORITHM_REASON)
-                Timber.e("## CRYPTO | encryptEventContent() : $reason")
+                Timber.e("## CRYPTO | encryptEventContent() : $reason")
                 callback.onFailure(Failure.CryptoError(MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_ENCRYPT, reason)))
             }
         }
@@ -769,7 +769,7 @@ internal class DefaultCryptoService @Inject constructor(
         }
         val alg = roomDecryptorProvider.getOrCreateRoomDecryptor(roomKeyContent.roomId, roomKeyContent.algorithm)
         if (alg == null) {
-            Timber.e("## CRYPTO | GOSSIP onRoomKeyEvent() : Unable to handle keys for ${roomKeyContent.algorithm}")
+            Timber.e("## CRYPTO | GOSSIP onRoomKeyEvent() : Unable to handle keys for ${roomKeyContent.algorithm}")
             return
         }
         alg.onRoomKeyEvent(event, keysBackupService)
@@ -777,7 +777,7 @@ internal class DefaultCryptoService @Inject constructor(
 
     private fun onKeyWithHeldReceived(event: Event) {
         val withHeldContent = event.getClearContent().toModel<RoomKeyWithHeldContent>() ?: return Unit.also {
-            Timber.i("## CRYPTO | Malformed onKeyWithHeldReceived() : missing fields")
+            Timber.i("## CRYPTO | Malformed onKeyWithHeldReceived() : missing fields")
         }
         Timber.i("## CRYPTO | onKeyWithHeldReceived() received from:${event.senderId}, content <$withHeldContent>")
         val alg = roomDecryptorProvider.getOrCreateRoomDecryptor(withHeldContent.roomId, withHeldContent.algorithm)
@@ -790,16 +790,16 @@ internal class DefaultCryptoService @Inject constructor(
     }
 
     private fun onSecretSendReceived(event: Event) {
-        Timber.i("## CRYPTO | GOSSIP onSecretSend() from ${event.senderId} : onSecretSendReceived ${event.content?.get("sender_key")}")
+        Timber.i("## CRYPTO | GOSSIP onSecretSend() from ${event.senderId} : onSecretSendReceived ${event.content?.get("sender_key")}")
         if (!event.isEncrypted()) {
             // secret send messages must be encrypted
-            Timber.e("## CRYPTO | GOSSIP onSecretSend() :Received unencrypted secret send event")
+            Timber.e("## CRYPTO | GOSSIP onSecretSend() :Received unencrypted secret send event")
             return
         }
 
         // Was that sent by us?
         if (event.senderId != userId) {
-            Timber.e("## CRYPTO | GOSSIP onSecretSend() : Ignore secret from other user ${event.senderId}")
+            Timber.e("## CRYPTO | GOSSIP onSecretSend() : Ignore secret from other user ${event.senderId}")
             return
         }
 
@@ -809,13 +809,13 @@ internal class DefaultCryptoService @Inject constructor(
                 .getOutgoingSecretKeyRequests().firstOrNull { it.requestId == secretContent.requestId }
 
         if (existingRequest == null) {
-            Timber.i("## CRYPTO | GOSSIP onSecretSend() : Ignore secret that was not requested: ${secretContent.requestId}")
+            Timber.i("## CRYPTO | GOSSIP onSecretSend() : Ignore secret that was not requested: ${secretContent.requestId}")
             return
         }
 
         if (!handleSDKLevelGossip(existingRequest.secretName, secretContent.secretValue)) {
             // TODO Ask to application layer?
-            Timber.v("## CRYPTO | onSecretSend() : secret not handled by SDK")
+            Timber.v("## CRYPTO | onSecretSend() : secret not handled by SDK")
         }
     }
 
@@ -972,13 +972,13 @@ internal class DefaultCryptoService @Inject constructor(
         cryptoCoroutineScope.launch(coroutineDispatchers.main) {
             runCatching {
                 withContext(coroutineDispatchers.crypto) {
-                    Timber.v("## CRYPTO | importRoomKeys starts")
+                    Timber.v("## CRYPTO | importRoomKeys starts")
 
                     val t0 = System.currentTimeMillis()
                     val roomKeys = MXMegolmExportEncryption.decryptMegolmKeyFile(roomKeysAsArray, password)
                     val t1 = System.currentTimeMillis()
 
-                    Timber.v("## CRYPTO | importRoomKeys : decryptMegolmKeyFile done in ${t1 - t0} ms")
+                    Timber.v("## CRYPTO | importRoomKeys : decryptMegolmKeyFile done in ${t1 - t0} ms")
 
                     val importedSessions = MoshiProvider.providesMoshi()
                             .adapter<List<MegolmSessionData>>(Types.newParameterizedType(List::class.java, MegolmSessionData::class.java))
@@ -986,7 +986,7 @@ internal class DefaultCryptoService @Inject constructor(
 
                     val t2 = System.currentTimeMillis()
 
-                    Timber.v("## CRYPTO | importRoomKeys : JSON parsing ${t2 - t1} ms")
+                    Timber.v("## CRYPTO | importRoomKeys : JSON parsing ${t2 - t1} ms")
 
                     if (importedSessions == null) {
                         throw Exception("Error")
@@ -1125,7 +1125,7 @@ internal class DefaultCryptoService @Inject constructor(
      */
     override fun reRequestRoomKeyForEvent(event: Event) {
         val wireContent = event.content.toModel<EncryptedEventContent>() ?: return Unit.also {
-            Timber.e("## CRYPTO | reRequestRoomKeyForEvent Failed to re-request key, null content")
+            Timber.e("## CRYPTO | reRequestRoomKeyForEvent Failed to re-request key, null content")
         }
 
         val requestBody = RoomKeyRequestBody(
@@ -1140,18 +1140,18 @@ internal class DefaultCryptoService @Inject constructor(
 
     override fun requestRoomKeyForEvent(event: Event) {
         val wireContent = event.content.toModel<EncryptedEventContent>() ?: return Unit.also {
-            Timber.e("## CRYPTO | requestRoomKeyForEvent Failed to request key, null content eventId: ${event.eventId}")
+            Timber.e("## CRYPTO | requestRoomKeyForEvent Failed to request key, null content eventId: ${event.eventId}")
         }
 
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
 //            if (!isStarted()) {
-//                Timber.v("## CRYPTO | requestRoomKeyForEvent() : wait after e2e init")
+//                Timber.v("## CRYPTO | requestRoomKeyForEvent() : wait after e2e init")
 //                internalStart(false)
 //            }
             roomDecryptorProvider
                     .getOrCreateRoomDecryptor(event.roomId, wireContent.algorithm)
                     ?.requestKeysForEvent(event, false) ?: run {
-                Timber.v("## CRYPTO | requestRoomKeyForEvent() : No room decryptor for roomId:${event.roomId} algorithm:${wireContent.algorithm}")
+                Timber.v("## CRYPTO | requestRoomKeyForEvent() : No room decryptor for roomId:${event.roomId} algorithm:${wireContent.algorithm}")
             }
         }
     }
@@ -1180,11 +1180,11 @@ internal class DefaultCryptoService @Inject constructor(
 //        val lastForcedDate = lastNewSessionForcedDates.getObject(senderId, deviceKey) ?: 0
 //        val now = System.currentTimeMillis()
 //        if (now - lastForcedDate < CRYPTO_MIN_FORCE_SESSION_PERIOD_MILLIS) {
-//            Timber.d("## CRYPTO | markOlmSessionForUnwedging: New session already forced with device at $lastForcedDate. Not forcing another")
+//            Timber.d("## CRYPTO | markOlmSessionForUnwedging: New session already forced with device at $lastForcedDate. Not forcing another")
 //            return
 //        }
 //
-//        Timber.d("## CRYPTO | markOlmSessionForUnwedging from $senderId:${deviceInfo.deviceId}")
+//        Timber.d("## CRYPTO | markOlmSessionForUnwedging from $senderId:${deviceInfo.deviceId}")
 //        lastNewSessionForcedDates.setObject(senderId, deviceKey, now)
 //
 //        cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
@@ -1201,7 +1201,7 @@ internal class DefaultCryptoService @Inject constructor(
 //            val encodedPayload = messageEncrypter.encryptMessage(payloadJson, listOf(deviceInfo))
 //            val sendToDeviceMap = MXUsersDevicesMap<Any>()
 //            sendToDeviceMap.setObject(senderId, deviceInfo.deviceId, encodedPayload)
-//            Timber.v("## CRYPTO | markOlmSessionForUnwedging() : sending to $senderId:${deviceInfo.deviceId}")
+//            Timber.v("## CRYPTO | markOlmSessionForUnwedging() : sending to $senderId:${deviceInfo.deviceId}")
 //            val sendToDeviceParams = SendToDeviceTask.Params(EventType.ENCRYPTED, sendToDeviceMap)
 //            sendToDeviceTask.execute(sendToDeviceParams)
 //        }
@@ -1290,12 +1290,12 @@ internal class DefaultCryptoService @Inject constructor(
 
     override fun prepareToEncrypt(roomId: String, callback: MatrixCallback<Unit>) {
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
-            Timber.d("## CRYPTO | prepareToEncrypt() : Check room members up to date")
+            Timber.d("## CRYPTO | prepareToEncrypt() : Check room members up to date")
             // Ensure to load all room members
             try {
                 loadRoomMembersTask.execute(LoadRoomMembersTask.Params(roomId))
             } catch (failure: Throwable) {
-                Timber.e("## CRYPTO | prepareToEncrypt() : Failed to load room members")
+                Timber.e("## CRYPTO | prepareToEncrypt() : Failed to load room members")
                 callback.onFailure(failure)
                 return@launch
             }
@@ -1308,7 +1308,7 @@ internal class DefaultCryptoService @Inject constructor(
 
             if (alg == null) {
                 val reason = String.format(MXCryptoError.UNABLE_TO_ENCRYPT_REASON, MXCryptoError.NO_MORE_ALGORITHM_REASON)
-                Timber.e("## CRYPTO | prepareToEncrypt() : $reason")
+                Timber.e("## CRYPTO | prepareToEncrypt() : $reason")
                 callback.onFailure(IllegalArgumentException("Missing algorithm"))
                 return@launch
             }
@@ -1318,7 +1318,7 @@ internal class DefaultCryptoService @Inject constructor(
             }.fold(
                     { callback.onSuccess(Unit) },
                     {
-                        Timber.e("## CRYPTO | prepareToEncrypt() failed.")
+                        Timber.e("## CRYPTO | prepareToEncrypt() failed.")
                         callback.onFailure(it)
                     }
             )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index e5f1c011f8..63f15aaf6e 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -111,7 +111,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
                     res = !notReadyToRetryHS.contains(userId.substringAfter(':'))
                 }
             } catch (e: Exception) {
-                Timber.e(e, "## CRYPTO | canRetryKeysDownload() failed")
+                Timber.e(e, "## CRYPTO | canRetryKeysDownload() failed")
             }
         }
 
@@ -150,7 +150,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
 
         for (userId in userIds) {
             if (!deviceTrackingStatuses.containsKey(userId) || TRACKING_STATUS_NOT_TRACKED == deviceTrackingStatuses[userId]) {
-                Timber.v("## CRYPTO | startTrackingDeviceList() : Now tracking device list for $userId")
+                Timber.v("## CRYPTO | startTrackingDeviceList() : Now tracking device list for $userId")
                 deviceTrackingStatuses[userId] = TRACKING_STATUS_PENDING_DOWNLOAD
                 isUpdated = true
             }
@@ -178,7 +178,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
 
         for (userId in changed) {
             if (deviceTrackingStatuses.containsKey(userId)) {
-                Timber.v("## CRYPTO | handleDeviceListsChanges() : Marking device list outdated for $userId")
+                Timber.v("## CRYPTO | handleDeviceListsChanges() : Marking device list outdated for $userId")
                 deviceTrackingStatuses[userId] = TRACKING_STATUS_PENDING_DOWNLOAD
                 isUpdated = true
             }
@@ -186,7 +186,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
 
         for (userId in left) {
             if (deviceTrackingStatuses.containsKey(userId)) {
-                Timber.v("## CRYPTO | handleDeviceListsChanges() : No longer tracking device list for $userId")
+                Timber.v("## CRYPTO | handleDeviceListsChanges() : No longer tracking device list for $userId")
                 deviceTrackingStatuses[userId] = TRACKING_STATUS_NOT_TRACKED
                 isUpdated = true
             }
@@ -276,7 +276,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
      * @param forceDownload Always download the keys even if cached.
      */
     suspend fun downloadKeys(userIds: List<String>?, forceDownload: Boolean): MXUsersDevicesMap<CryptoDeviceInfo> {
-        Timber.v("## CRYPTO | downloadKeys() : forceDownload $forceDownload : $userIds")
+        Timber.v("## CRYPTO | downloadKeys() : forceDownload $forceDownload : $userIds")
         // Map from userId -> deviceId -> MXDeviceInfo
         val stored = MXUsersDevicesMap<CryptoDeviceInfo>()
 
@@ -305,13 +305,13 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
             }
         }
         return if (downloadUsers.isEmpty()) {
-            Timber.v("## CRYPTO | downloadKeys() : no new user device")
+            Timber.v("## CRYPTO | downloadKeys() : no new user device")
             stored
         } else {
-            Timber.v("## CRYPTO | downloadKeys() : starts")
+            Timber.v("## CRYPTO | downloadKeys() : starts")
             val t0 = System.currentTimeMillis()
             val result = doKeyDownloadForUsers(downloadUsers)
-            Timber.v("## CRYPTO | downloadKeys() : doKeyDownloadForUsers succeeds after ${System.currentTimeMillis() - t0} ms")
+            Timber.v("## CRYPTO | downloadKeys() : doKeyDownloadForUsers succeeds after ${System.currentTimeMillis() - t0} ms")
             result.also {
                 it.addEntriesFromMap(stored)
             }
@@ -324,7 +324,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
      * @param downloadUsers the user ids list
      */
     private suspend fun doKeyDownloadForUsers(downloadUsers: List<String>): MXUsersDevicesMap<CryptoDeviceInfo> {
-        Timber.v("## CRYPTO | doKeyDownloadForUsers() : doKeyDownloadForUsers ${downloadUsers.logLimit()}")
+        Timber.v("## CRYPTO | doKeyDownloadForUsers() : doKeyDownloadForUsers ${downloadUsers.logLimit()}")
         // get the user ids which did not already trigger a keys download
         val filteredUsers = downloadUsers.filter { MatrixPatterns.isUserId(it) }
         if (filteredUsers.isEmpty()) {
@@ -335,16 +335,16 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
         val response = try {
             downloadKeysForUsersTask.execute(params)
         } catch (throwable: Throwable) {
-            Timber.e(throwable, "## CRYPTO | doKeyDownloadForUsers(): error")
+            Timber.e(throwable, "## CRYPTO | doKeyDownloadForUsers(): error")
             onKeysDownloadFailed(filteredUsers)
             throw throwable
         }
-        Timber.v("## CRYPTO | doKeyDownloadForUsers() : Got keys for " + filteredUsers.size + " users")
+        Timber.v("## CRYPTO | doKeyDownloadForUsers() : Got keys for " + filteredUsers.size + " users")
         for (userId in filteredUsers) {
             // al devices =
             val models = response.deviceKeys?.get(userId)?.mapValues { entry -> CryptoInfoMapper.map(entry.value) }
 
-            Timber.v("## CRYPTO | doKeyDownloadForUsers() : Got keys for $userId : $models")
+            Timber.v("## CRYPTO | doKeyDownloadForUsers() : Got keys for $userId : $models")
             if (!models.isNullOrEmpty()) {
                 val workingCopy = models.toMutableMap()
                 for ((deviceId, deviceInfo) in models) {
@@ -377,13 +377,13 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
             }
 
             val masterKey = response.masterKeys?.get(userId)?.toCryptoModel().also {
-                Timber.v("## CRYPTO | CrossSigning : Got keys for $userId : MSK ${it?.unpaddedBase64PublicKey}")
+                Timber.v("## CRYPTO | CrossSigning : Got keys for $userId : MSK ${it?.unpaddedBase64PublicKey}")
             }
             val selfSigningKey = response.selfSigningKeys?.get(userId)?.toCryptoModel()?.also {
-                Timber.v("## CRYPTO | CrossSigning : Got keys for $userId : SSK ${it.unpaddedBase64PublicKey}")
+                Timber.v("## CRYPTO | CrossSigning : Got keys for $userId : SSK ${it.unpaddedBase64PublicKey}")
             }
             val userSigningKey = response.userSigningKeys?.get(userId)?.toCryptoModel()?.also {
-                Timber.v("## CRYPTO | CrossSigning : Got keys for $userId : USK ${it.unpaddedBase64PublicKey}")
+                Timber.v("## CRYPTO | CrossSigning : Got keys for $userId : USK ${it.unpaddedBase64PublicKey}")
             }
             cryptoStore.storeUserCrossSigningKeys(
                     userId,
@@ -411,28 +411,28 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
      */
     private fun validateDeviceKeys(deviceKeys: CryptoDeviceInfo?, userId: String, deviceId: String, previouslyStoredDeviceKeys: CryptoDeviceInfo?): Boolean {
         if (null == deviceKeys) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : deviceKeys is null from $userId:$deviceId")
+            Timber.e("## CRYPTO | validateDeviceKeys() : deviceKeys is null from $userId:$deviceId")
             return false
         }
 
         if (null == deviceKeys.keys) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : deviceKeys.keys is null from $userId:$deviceId")
+            Timber.e("## CRYPTO | validateDeviceKeys() : deviceKeys.keys is null from $userId:$deviceId")
             return false
         }
 
         if (null == deviceKeys.signatures) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : deviceKeys.signatures is null from $userId:$deviceId")
+            Timber.e("## CRYPTO | validateDeviceKeys() : deviceKeys.signatures is null from $userId:$deviceId")
             return false
         }
 
         // Check that the user_id and device_id in the received deviceKeys are correct
         if (deviceKeys.userId != userId) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : Mismatched user_id ${deviceKeys.userId} from $userId:$deviceId")
+            Timber.e("## CRYPTO | validateDeviceKeys() : Mismatched user_id ${deviceKeys.userId} from $userId:$deviceId")
             return false
         }
 
         if (deviceKeys.deviceId != deviceId) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : Mismatched device_id ${deviceKeys.deviceId} from $userId:$deviceId")
+            Timber.e("## CRYPTO | validateDeviceKeys() : Mismatched device_id ${deviceKeys.deviceId} from $userId:$deviceId")
             return false
         }
 
@@ -440,21 +440,21 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
         val signKey = deviceKeys.keys[signKeyId]
 
         if (null == signKey) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : Device $userId:${deviceKeys.deviceId} has no ed25519 key")
+            Timber.e("## CRYPTO | validateDeviceKeys() : Device $userId:${deviceKeys.deviceId} has no ed25519 key")
             return false
         }
 
         val signatureMap = deviceKeys.signatures[userId]
 
         if (null == signatureMap) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : Device $userId:${deviceKeys.deviceId} has no map for $userId")
+            Timber.e("## CRYPTO | validateDeviceKeys() : Device $userId:${deviceKeys.deviceId} has no map for $userId")
             return false
         }
 
         val signature = signatureMap[signKeyId]
 
         if (null == signature) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : Device $userId:${deviceKeys.deviceId} is not signed")
+            Timber.e("## CRYPTO | validateDeviceKeys() : Device $userId:${deviceKeys.deviceId} is not signed")
             return false
         }
 
@@ -469,7 +469,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
         }
 
         if (!isVerified) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : Unable to verify signature on device " + userId + ":"
+            Timber.e("## CRYPTO | validateDeviceKeys() : Unable to verify signature on device " + userId + ":"
                     + deviceKeys.deviceId + " with error " + errorMessage)
             return false
         }
@@ -480,12 +480,12 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
                 // best off sticking with the original keys.
                 //
                 // Should we warn the user about it somehow?
-                Timber.e("## CRYPTO | validateDeviceKeys() : WARNING:Ed25519 key for device " + userId + ":"
+                Timber.e("## CRYPTO | validateDeviceKeys() : WARNING:Ed25519 key for device " + userId + ":"
                         + deviceKeys.deviceId + " has changed : "
                         + previouslyStoredDeviceKeys.fingerprint() + " -> " + signKey)
 
-                Timber.e("## CRYPTO | validateDeviceKeys() : $previouslyStoredDeviceKeys -> $deviceKeys")
-                Timber.e("## CRYPTO | validateDeviceKeys() : ${previouslyStoredDeviceKeys.keys} -> ${deviceKeys.keys}")
+                Timber.e("## CRYPTO | validateDeviceKeys() : $previouslyStoredDeviceKeys -> $deviceKeys")
+                Timber.e("## CRYPTO | validateDeviceKeys() : ${previouslyStoredDeviceKeys.keys} -> ${deviceKeys.keys}")
 
                 return false
             }
@@ -499,7 +499,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
      * This method must be called on getEncryptingThreadHandler() thread.
      */
     suspend fun refreshOutdatedDeviceLists() {
-        Timber.v("## CRYPTO | refreshOutdatedDeviceLists()")
+        Timber.v("## CRYPTO | refreshOutdatedDeviceLists()")
         val deviceTrackingStatuses = cryptoStore.getDeviceTrackingStatuses().toMutableMap()
 
         val users = deviceTrackingStatuses.keys.filterTo(mutableListOf()) { userId ->
@@ -518,10 +518,10 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
             doKeyDownloadForUsers(users)
         }.fold(
                 {
-                    Timber.v("## CRYPTO | refreshOutdatedDeviceLists() : done")
+                    Timber.v("## CRYPTO | refreshOutdatedDeviceLists() : done")
                 },
                 {
-                    Timber.e(it, "## CRYPTO | refreshOutdatedDeviceLists() : ERROR updating device keys for users $users")
+                    Timber.e(it, "## CRYPTO | refreshOutdatedDeviceLists() : ERROR updating device keys for users $users")
                 }
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
index 32324896fa..8d86380e39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
@@ -92,20 +92,20 @@ internal class EventDecryptor @Inject constructor(
     private fun internalDecryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
         val eventContent = event.content
         if (eventContent == null) {
-            Timber.e("## CRYPTO | decryptEvent : empty event content")
+            Timber.e("## CRYPTO | decryptEvent : empty event content")
             throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE, MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON)
         } else {
             val algorithm = eventContent["algorithm"]?.toString()
             val alg = roomDecryptorProvider.getOrCreateRoomDecryptor(event.roomId, algorithm)
             if (alg == null) {
                 val reason = String.format(MXCryptoError.UNABLE_TO_DECRYPT_REASON, event.eventId, algorithm)
-                Timber.e("## CRYPTO | decryptEvent() : $reason")
+                Timber.e("## CRYPTO | decryptEvent() : $reason")
                 throw MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT, reason)
             } else {
                 try {
                     return alg.decryptEvent(event, timeline)
                 } catch (mxCryptoError: MXCryptoError) {
-                    Timber.v("## CRYPTO | internalDecryptEvent : Failed to decrypt ${event.eventId} reason: $mxCryptoError")
+                    Timber.v("## CRYPTO | internalDecryptEvent : Failed to decrypt ${event.eventId} reason: $mxCryptoError")
                     if (algorithm == MXCRYPTO_ALGORITHM_OLM) {
                         if (mxCryptoError is MXCryptoError.Base
                                 && mxCryptoError.errorType == MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE) {
@@ -119,7 +119,7 @@ internal class EventDecryptor @Inject constructor(
                                             markOlmSessionForUnwedging(event.senderId ?: "", it)
                                         }
                                         ?: run {
-                                            Timber.i("## CRYPTO | internalDecryptEvent() : Failed to find sender crypto device for unwedging")
+                                            Timber.i("## CRYPTO | internalDecryptEvent() : Failed to find sender crypto device for unwedging")
                                         }
                             }
                         }
@@ -137,18 +137,18 @@ internal class EventDecryptor @Inject constructor(
         val lastForcedDate = lastNewSessionForcedDates.getObject(senderId, deviceKey) ?: 0
         val now = System.currentTimeMillis()
         if (now - lastForcedDate < DefaultCryptoService.CRYPTO_MIN_FORCE_SESSION_PERIOD_MILLIS) {
-            Timber.w("## CRYPTO | markOlmSessionForUnwedging: New session already forced with device at $lastForcedDate. Not forcing another")
+            Timber.w("## CRYPTO | markOlmSessionForUnwedging: New session already forced with device at $lastForcedDate. Not forcing another")
             return
         }
 
-        Timber.i("## CRYPTO | markOlmSessionForUnwedging from $senderId:${deviceInfo.deviceId}")
+        Timber.i("## CRYPTO | markOlmSessionForUnwedging from $senderId:${deviceInfo.deviceId}")
         lastNewSessionForcedDates.setObject(senderId, deviceKey, now)
 
         // offload this from crypto thread (?)
         cryptoCoroutineScope.launch(coroutineDispatchers.computation) {
             val ensured = ensureOlmSessionsForDevicesAction.handle(mapOf(senderId to listOf(deviceInfo)), force = true)
 
-            Timber.i("## CRYPTO | markOlmSessionForUnwedging() : ensureOlmSessionsForDevicesAction isEmpty:${ensured.isEmpty}")
+            Timber.i("## CRYPTO | markOlmSessionForUnwedging() : ensureOlmSessionsForDevicesAction isEmpty:${ensured.isEmpty}")
 
             // Now send a blank message on that session so the other side knows about it.
             // (The keyshare request is sent in the clear so that won't do)
@@ -161,13 +161,13 @@ internal class EventDecryptor @Inject constructor(
             val encodedPayload = messageEncrypter.encryptMessage(payloadJson, listOf(deviceInfo))
             val sendToDeviceMap = MXUsersDevicesMap<Any>()
             sendToDeviceMap.setObject(senderId, deviceInfo.deviceId, encodedPayload)
-            Timber.i("## CRYPTO | markOlmSessionForUnwedging() : sending dummy to $senderId:${deviceInfo.deviceId}")
+            Timber.i("## CRYPTO | markOlmSessionForUnwedging() : sending dummy to $senderId:${deviceInfo.deviceId}")
             withContext(coroutineDispatchers.io) {
                 val sendToDeviceParams = SendToDeviceTask.Params(EventType.ENCRYPTED, sendToDeviceMap)
                 try {
                     sendToDeviceTask.execute(sendToDeviceParams)
                 } catch (failure: Throwable) {
-                    Timber.e(failure, "## CRYPTO | markOlmSessionForUnwedging() : failed to send dummy to $senderId:${deviceInfo.deviceId}")
+                    Timber.e(failure, "## CRYPTO | markOlmSessionForUnwedging() : failed to send dummy to $senderId:${deviceInfo.deviceId}")
                 }
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index 787d16defc..a29ac457fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -74,7 +74,7 @@ internal class MXMegolmDecryption(private val userId: String,
 
     @Throws(MXCryptoError::class)
     private fun decryptEvent(event: Event, timeline: String, requestKeysOnFail: Boolean): MXEventDecryptionResult {
-        Timber.v("## CRYPTO | decryptEvent ${event.eventId} , requestKeysOnFail:$requestKeysOnFail")
+        Timber.v("## CRYPTO | decryptEvent ${event.eventId}, requestKeysOnFail:$requestKeysOnFail")
         if (event.roomId.isNullOrBlank()) {
             throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON)
         }
@@ -360,7 +360,7 @@ internal class MXMegolmDecryption(private val userId: String,
                                             },
                                             {
                                                 // TODO
-                                                Timber.e(it, "## CRYPTO | shareKeysWithDevice: failed to get session for request $body")
+                                                Timber.e(it, "## CRYPTO | shareKeysWithDevice: failed to get session for request $body")
                                             }
 
                                     )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index 697711d051..a756444475 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -80,9 +80,9 @@ internal class MXMegolmEncryption(
                                              eventType: String,
                                              userIds: List<String>): Content {
         val ts = System.currentTimeMillis()
-        Timber.v("## CRYPTO | encryptEventContent : getDevicesInRoom")
+        Timber.v("## CRYPTO | encryptEventContent : getDevicesInRoom")
         val devices = getDevicesInRoom(userIds)
-        Timber.v("## CRYPTO | encryptEventContent ${System.currentTimeMillis() - ts}: getDevicesInRoom ${devices.allowedDevices.map}")
+        Timber.v("## CRYPTO | encryptEventContent ${System.currentTimeMillis() - ts}: getDevicesInRoom ${devices.allowedDevices.map}")
         val outboundSession = ensureOutboundSession(devices.allowedDevices)
 
         return encryptContent(outboundSession, eventType, eventContent)
@@ -91,7 +91,7 @@ internal class MXMegolmEncryption(
                     // annoyingly we have to serialize again the saved outbound session to store message index :/
                     // if not we would see duplicate message index errors
                     olmDevice.storeOutboundGroupSessionForRoom(roomId, outboundSession.sessionId)
-                    Timber.v("## CRYPTO | encryptEventContent: Finished in ${System.currentTimeMillis() - ts} millis")
+                    Timber.v("## CRYPTO | encryptEventContent: Finished in ${System.currentTimeMillis() - ts} millis")
                 }
     }
 
@@ -118,13 +118,13 @@ internal class MXMegolmEncryption(
 
     override suspend fun preshareKey(userIds: List<String>) {
         val ts = System.currentTimeMillis()
-        Timber.v("## CRYPTO | preshareKey : getDevicesInRoom")
+        Timber.v("## CRYPTO | preshareKey : getDevicesInRoom")
         val devices = getDevicesInRoom(userIds)
         val outboundSession = ensureOutboundSession(devices.allowedDevices)
 
         notifyWithheldForSession(devices.withHeldDevices, outboundSession)
 
-        Timber.v("## CRYPTO | preshareKey ${System.currentTimeMillis() - ts} millis")
+        Timber.v("## CRYPTO | preshareKey ${System.currentTimeMillis() - ts} millis")
     }
 
     /**
@@ -133,7 +133,7 @@ internal class MXMegolmEncryption(
      * @return the session description
      */
     private fun prepareNewSessionInRoom(): MXOutboundSessionInfo {
-        Timber.v("## CRYPTO | prepareNewSessionInRoom() ")
+        Timber.v("## CRYPTO | prepareNewSessionInRoom() ")
         val sessionId = olmDevice.createOutboundGroupSessionForRoom(roomId)
 
         val keysClaimedMap = HashMap<String, String>()
@@ -153,7 +153,7 @@ internal class MXMegolmEncryption(
      * @param devicesInRoom the devices list
      */
     private suspend fun ensureOutboundSession(devicesInRoom: MXUsersDevicesMap<CryptoDeviceInfo>): MXOutboundSessionInfo {
-        Timber.v("## CRYPTO | ensureOutboundSession start")
+        Timber.v("## CRYPTO | ensureOutboundSession start")
         var session = outboundSession
         if (session == null
                 // Need to make a brand new session?
@@ -190,7 +190,7 @@ internal class MXMegolmEncryption(
                                  devicesByUsers: Map<String, List<CryptoDeviceInfo>>) {
         // nothing to send, the task is done
         if (devicesByUsers.isEmpty()) {
-            Timber.v("## CRYPTO | shareKey() : nothing more to do")
+            Timber.v("## CRYPTO | shareKey() : nothing more to do")
             return
         }
         // reduce the map size to avoid request timeout when there are too many devices (Users size  * devices per user)
@@ -203,7 +203,7 @@ internal class MXMegolmEncryption(
                 break
             }
         }
-        Timber.v("## CRYPTO | shareKey() ; sessionId<${session.sessionId}> userId ${subMap.keys}")
+        Timber.v("## CRYPTO | shareKey() ; sessionId<${session.sessionId}> userId ${subMap.keys}")
         shareUserDevicesKey(session, subMap)
         val remainingDevices = devicesByUsers - subMap.keys
         shareKey(session, remainingDevices)
@@ -232,11 +232,11 @@ internal class MXMegolmEncryption(
         payload["content"] = submap
 
         var t0 = System.currentTimeMillis()
-        Timber.v("## CRYPTO | shareUserDevicesKey() : starts")
+        Timber.v("## CRYPTO | shareUserDevicesKey() : starts")
 
         val results = ensureOlmSessionsForDevicesAction.handle(devicesByUser)
         Timber.v(
-                """## CRYPTO | shareUserDevicesKey(): ensureOlmSessionsForDevices succeeds after ${System.currentTimeMillis() - t0} ms"""
+                """## CRYPTO | shareUserDevicesKey(): ensureOlmSessionsForDevices succeeds after ${System.currentTimeMillis() - t0} ms"""
                         .trimMargin()
         )
         val contentMap = MXUsersDevicesMap<Any>()
@@ -257,7 +257,7 @@ internal class MXMegolmEncryption(
                     noOlmToNotify.add(UserDevice(userId, deviceID))
                     continue
                 }
-                Timber.i("## CRYPTO | shareUserDevicesKey() : Add to share keys contentMap for $userId:$deviceID")
+                Timber.i("## CRYPTO | shareUserDevicesKey() : Add to share keys contentMap for $userId:$deviceID")
                 contentMap.setObject(userId, deviceID, messageEncrypter.encryptMessage(payload, listOf(sessionResult.deviceInfo)))
                 haveTargets = true
             }
@@ -289,17 +289,17 @@ internal class MXMegolmEncryption(
 
         if (haveTargets) {
             t0 = System.currentTimeMillis()
-            Timber.i("## CRYPTO | shareUserDevicesKey() ${session.sessionId} : has target")
+            Timber.i("## CRYPTO | shareUserDevicesKey() ${session.sessionId} : has target")
             val sendToDeviceParams = SendToDeviceTask.Params(EventType.ENCRYPTED, contentMap)
             try {
                 sendToDeviceTask.execute(sendToDeviceParams)
-                Timber.i("## CRYPTO | shareUserDevicesKey() : sendToDevice succeeds after ${System.currentTimeMillis() - t0} ms")
+                Timber.i("## CRYPTO | shareUserDevicesKey() : sendToDevice succeeds after ${System.currentTimeMillis() - t0} ms")
             } catch (failure: Throwable) {
                 // What to do here...
-                Timber.e("## CRYPTO | shareUserDevicesKey() : Failed to share session <${session.sessionId}> with $devicesByUser ")
+                Timber.e("## CRYPTO | shareUserDevicesKey() : Failed to share session <${session.sessionId}> with $devicesByUser ")
             }
         } else {
-            Timber.i("## CRYPTO | shareUserDevicesKey() : no need to sharekey")
+            Timber.i("## CRYPTO | shareUserDevicesKey() : no need to sharekey")
         }
 
         if (noOlmToNotify.isNotEmpty()) {
@@ -317,7 +317,7 @@ internal class MXMegolmEncryption(
                                           sessionId: String,
                                           senderKey: String?,
                                           code: WithHeldCode) {
-        Timber.i("## CRYPTO | notifyKeyWithHeld() :sending withheld key for $targets session:$sessionId and code $code")
+        Timber.i("## CRYPTO | notifyKeyWithHeld() :sending withheld key for $targets session:$sessionId and code $code")
         val withHeldContent = RoomKeyWithHeldContent(
                 roomId = roomId,
                 senderKey = senderKey,
@@ -336,7 +336,7 @@ internal class MXMegolmEncryption(
         try {
             sendToDeviceTask.execute(params)
         } catch (failure: Throwable) {
-            Timber.e("## CRYPTO | notifyKeyWithHeld() : Failed to notify withheld key for $targets session: $sessionId ")
+            Timber.e("## CRYPTO | notifyKeyWithHeld() : Failed to notify withheld key for $targets session: $sessionId ")
         }
     }
 
@@ -473,7 +473,7 @@ internal class MXMegolmEncryption(
         val encodedPayload = messageEncrypter.encryptMessage(payloadJson, listOf(deviceInfo))
         val sendToDeviceMap = MXUsersDevicesMap<Any>()
         sendToDeviceMap.setObject(userId, deviceId, encodedPayload)
-        Timber.i("## CRYPTO | reshareKey() : sending session $sessionId to $userId:$deviceId")
+        Timber.i("## CRYPTO | reshareKey() : sending session $sessionId to $userId:$deviceId")
         val sendToDeviceParams = SendToDeviceTask.Params(EventType.ENCRYPTED, sendToDeviceMap)
         return try {
             sendToDeviceTask.execute(sendToDeviceParams)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt
index 6d52e682bc..6839ccd326 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt
@@ -57,7 +57,7 @@ object HkdfSha256 {
 
         /*
           The output OKM is calculated as follows:
-          Notation | -> When the message is composed of several elements we use concatenation (denoted |) in the second argument;
+          Notation | -> When the message is composed of several elements we use concatenation (denoted |) in the second argument;
 
 
            N = ceil(L/HashLen)
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 c7885ce449..4bf01a2809 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
@@ -345,7 +345,7 @@ internal abstract class SASDefaultVerificationTransaction(
     }
 
     protected fun hashUsingAgreedHashMethod(toHash: String): String? {
-        if ("sha256" == accepted?.hash?.toLowerCase(Locale.ROOT)) {
+        if ("sha256" == accepted?.hash?.lowercase(Locale.ROOT)) {
             val olmUtil = OlmUtility()
             val hashBytes = olmUtil.sha256(toHash)
             olmUtil.releaseUtility()
@@ -355,7 +355,7 @@ internal abstract class SASDefaultVerificationTransaction(
     }
 
     private fun macUsingAgreedMethod(message: String, info: String): String? {
-        return when (accepted?.messageAuthenticationCode?.toLowerCase(Locale.ROOT)) {
+        return when (accepted?.messageAuthenticationCode?.lowercase(Locale.ROOT)) {
             SAS_MAC_SHA256_LONGKDF -> getSAS().calculateMacLongKdf(message, info)
             SAS_MAC_SHA256         -> getSAS().calculateMac(message, info)
             else                   -> null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
index 6bc3483e65..76e88442b6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
@@ -48,7 +48,7 @@ fun QrCodeData.toEncodedString(): String {
 
     // TransactionId
     transactionId.forEach {
-        result += it.toByte()
+        result += it.code.toByte()
     }
 
     // Keys
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 05213b40e5..d810c8b1a8 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,6 +20,7 @@ import io.realm.DynamicRealm
 import io.realm.FieldAttribute
 import io.realm.RealmMigration
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
@@ -33,9 +34,9 @@ import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomTagEntityFields
-import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.SpaceParentSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import timber.log.Timber
 import javax.inject.Inject
@@ -43,7 +44,7 @@ import javax.inject.Inject
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 11L
+        const val SESSION_STORE_SCHEMA_VERSION = 13L
     }
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@@ -60,6 +61,8 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         if (oldVersion <= 8) migrateTo9(realm)
         if (oldVersion <= 9) migrateTo10(realm)
         if (oldVersion <= 10) migrateTo11(realm)
+        if (oldVersion <= 11) migrateTo12(realm)
+        if (oldVersion <= 12) migrateTo13(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -144,10 +147,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         Timber.d("Step 7 -> 8")
 
         val editionOfEventSchema = realm.schema.create("EditionOfEvent")
-                .apply {
-                    // setEmbedded does not return `this`...
-                    isEmbedded = true
-                }
                 .addField(EditionOfEventFields.CONTENT, String::class.java)
                 .addField(EditionOfEventFields.EVENT_ID, String::class.java)
                 .setRequired(EditionOfEventFields.EVENT_ID, true)
@@ -162,6 +161,10 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 ?.removeField("lastEditTs")
                 ?.removeField("sourceLocalEchoEvents")
                 ?.addRealmListField(EditAggregatedSummaryEntityFields.EDITIONS.`$`, editionOfEventSchema)
+
+        // This has to be done once a parent use the model as a child
+        // See https://github.com/realm/realm-java/issues/7402
+        editionOfEventSchema.isEmbedded = true
     }
 
     private fun migrateTo9(realm: DynamicRealm) {
@@ -247,4 +250,39 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         realm.schema.get("EventEntity")
                 ?.addField(EventEntityFields.SEND_STATE_DETAILS, String::class.java)
     }
+
+    private fun migrateTo12(realm: DynamicRealm) {
+        Timber.d("Step 11 -> 12")
+
+        val joinRulesContentAdapter = MoshiProvider.providesMoshi().adapter(RoomJoinRulesContent::class.java)
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.JOIN_RULES_STR, String::class.java)
+                ?.transform { obj ->
+                    val joinRulesEvent = realm.where("CurrentStateEventEntity")
+                            .equalTo(CurrentStateEventEntityFields.ROOM_ID, obj.getString(RoomSummaryEntityFields.ROOM_ID))
+                            .equalTo(CurrentStateEventEntityFields.TYPE, EventType.STATE_ROOM_JOIN_RULES)
+                            .findFirst()
+
+                    val roomJoinRules = joinRulesEvent?.getObject(CurrentStateEventEntityFields.ROOT.`$`)
+                            ?.getString(EventEntityFields.CONTENT)?.let {
+                                joinRulesContentAdapter.fromJson(it)?.joinRules
+                            }
+
+                    obj.setString(RoomSummaryEntityFields.JOIN_RULES_STR, roomJoinRules?.name)
+                }
+
+        realm.schema.get("SpaceChildSummaryEntity")
+                ?.addField(SpaceChildSummaryEntityFields.SUGGESTED, Boolean::class.java)
+                ?.setNullable(SpaceChildSummaryEntityFields.SUGGESTED, true)
+    }
+
+    private fun migrateTo13(realm: DynamicRealm) {
+        Timber.d("Step 12 -> 13")
+
+        // Fix issue with the nightly build. Eventually play again the migration which has been included in migrateTo12()
+        realm.schema.get("SpaceChildSummaryEntity")
+                ?.takeIf { !it.hasField(SpaceChildSummaryEntityFields.SUGGESTED) }
+                ?.addField(SpaceChildSummaryEntityFields.SUGGESTED, Boolean::class.java)
+                ?.setNullable(SpaceChildSummaryEntityFields.SUGGESTED, true)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 92aff0a140..fbecbf37be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -44,6 +44,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                 name = roomSummaryEntity.name ?: "",
                 topic = roomSummaryEntity.topic ?: "",
                 avatarUrl = roomSummaryEntity.avatarUrl ?: "",
+                joinRules = roomSummaryEntity.joinRules,
                 isDirect = roomSummaryEntity.isDirect,
                 directUserId = roomSummaryEntity.directUserId,
                 latestPreviewableEvent = latestEvent,
@@ -88,7 +89,8 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                             order = it.order,
                             autoJoin = it.autoJoin ?: false,
                             viaServers = it.viaServers.toList(),
-                            parentRoomId = roomSummaryEntity.roomId
+                            parentRoomId = roomSummaryEntity.roomId,
+                            suggested = it.suggested
                     )
                 },
                 flattenParentIds = roomSummaryEntity.flattenParentIds?.split("|") ?: emptyList()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index 4f47032c4d..1001f9cd66 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -21,7 +21,9 @@ import io.realm.RealmObject
 import io.realm.annotations.Index
 import io.realm.annotations.PrimaryKey
 import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
@@ -242,6 +244,19 @@ internal open class RoomSummaryEntity(
             }
         }
 
+    private var joinRulesStr: String? = null
+    var joinRules: RoomJoinRules?
+        get() {
+            return joinRulesStr?.let {
+                tryOrNull { RoomJoinRules.valueOf(it) }
+            }
+        }
+        set(value) {
+            if (value?.name != joinRulesStr) {
+                joinRulesStr = value?.name
+            }
+        }
+
     var roomEncryptionTrustLevel: RoomEncryptionTrustLevel?
         get() {
             return roomEncryptionTrustLevelStr?.let {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt
index 982c9ece6a..ce1afbb507 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt
@@ -29,6 +29,8 @@ internal open class SpaceChildSummaryEntity(
 
         var autoJoin: Boolean? = null,
 
+        var suggested: Boolean? = null,
+
         var childRoomId: String? = null,
         // Link to the actual space summary if it is known locally
         var childSummaryEntity: RoomSummaryEntity? = null,
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 891858d857..a284d976d0 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
@@ -291,7 +291,7 @@ internal class DefaultFileService @Inject constructor(
                     Timber.v("Get size of ${it.absolutePath}")
                     true
                 }
-                .sumBy { it.length().toInt() }
+                .sumOf { it.length().toInt() }
     }
 
     override fun clearCache() {
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 4f6e906766..114695062c 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
@@ -117,7 +117,7 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor(
         return withOlmUtility { olmUtility ->
             threePids.map { threePid ->
                 base64ToBase64Url(
-                        olmUtility.sha256(threePid.value.toLowerCase(Locale.ROOT)
+                        olmUtility.sha256(threePid.value.lowercase(Locale.ROOT)
                                 + " " + threePid.toMedium() + " " + pepper)
                 )
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
index 71a6e224bf..970752449a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
@@ -18,19 +18,13 @@ package org.matrix.android.sdk.internal.session.permalinks
 
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService.Companion.MATRIX_TO_URL_BASE
-import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
-import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.internal.di.UserId
-import org.matrix.android.sdk.internal.session.room.RoomGetter
-import java.net.URLEncoder
 import javax.inject.Inject
-import javax.inject.Provider
 
 internal class PermalinkFactory @Inject constructor(
         @UserId
         private val userId: String,
-        // Use a provider to fix circular Dagger dependency
-        private val roomGetterProvider: Provider<RoomGetter>
+        private val viaParameterFinder: ViaParameterFinder
 ) {
 
     fun createPermalink(event: Event): String? {
@@ -50,12 +44,12 @@ internal class PermalinkFactory @Inject constructor(
         return if (roomId.isEmpty()) {
             null
         } else {
-            MATRIX_TO_URL_BASE + escape(roomId) + computeViaParams(userId, roomId)
+            MATRIX_TO_URL_BASE + escape(roomId) + viaParameterFinder.computeViaParams(userId, roomId)
         }
     }
 
     fun createPermalink(roomId: String, eventId: String): String {
-        return MATRIX_TO_URL_BASE + escape(roomId) + "/" + escape(eventId) + computeViaParams(userId, roomId)
+        return MATRIX_TO_URL_BASE + escape(roomId) + "/" + escape(eventId) + viaParameterFinder.computeViaParams(userId, roomId)
     }
 
     fun getLinkedId(url: String): String? {
@@ -66,25 +60,6 @@ internal class PermalinkFactory @Inject constructor(
         } else null
     }
 
-    /**
-     * Compute the via parameters.
-     * Take up to 3 homeserver domains, taking the most representative one regarding room members and including the
-     * current user one.
-     */
-    private fun computeViaParams(userId: String, roomId: String): String {
-        val userHomeserver = userId.substringAfter(":")
-        return getUserIdsOfJoinedMembers(roomId)
-                .map { it.substringAfter(":") }
-                .groupBy { it }
-                .mapValues { it.value.size }
-                .toMutableMap()
-                // Ensure the user homeserver will be included
-                .apply { this[userHomeserver] = Int.MAX_VALUE }
-                .let { map -> map.keys.sortedByDescending { map[it] } }
-                .take(3)
-                .joinToString(prefix = "?via=", separator = "&via=") { URLEncoder.encode(it, "utf-8") }
-    }
-
     /**
      * Escape '/' in id, because it is used as a separator
      *
@@ -104,15 +79,4 @@ internal class PermalinkFactory @Inject constructor(
     private fun unescape(id: String): String {
         return id.replace("%2F", "/")
     }
-
-    /**
-     * Get a set of userIds of joined members of a room
-     */
-    private fun getUserIdsOfJoinedMembers(roomId: String): Set<String> {
-        return roomGetterProvider.get().getRoom(roomId)
-                ?.getRoomMembers(roomMemberQueryParams { memberships = listOf(Membership.JOIN) })
-                ?.map { it.userId }
-                .orEmpty()
-                .toSet()
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
new file mode 100644
index 0000000000..0da60e9ba2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.permalinks
+
+import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.RoomGetter
+import java.net.URLEncoder
+import javax.inject.Inject
+import javax.inject.Provider
+
+internal class ViaParameterFinder @Inject constructor(
+        @UserId private val userId: String,
+        private val roomGetterProvider: Provider<RoomGetter>
+) {
+
+    fun computeViaParams(roomId: String, max: Int): List<String> {
+        return computeViaParams(userId, roomId, max)
+    }
+
+    /**
+     * Compute the via parameters.
+     * Take up to 3 homeserver domains, taking the most representative one regarding room members and including the
+     * current user one.
+     */
+    fun computeViaParams(userId: String, roomId: String): String {
+        return computeViaParams(userId, roomId, 3)
+                .joinToString(prefix = "?via=", separator = "&via=") { URLEncoder.encode(it, "utf-8") }
+    }
+
+    fun computeViaParams(userId: String, roomId: String, max: Int): List<String> {
+        val userHomeserver = userId.substringAfter(":")
+        return getUserIdsOfJoinedMembers(roomId)
+                .map { it.substringAfter(":") }
+                .groupBy { it }
+                .mapValues { it.value.size }
+                .toMutableMap()
+                // Ensure the user homeserver will be included
+                .apply { this[userHomeserver] = Int.MAX_VALUE }
+                .let { map -> map.keys.sortedByDescending { map[it] } }
+                .take(max)
+    }
+
+    /**
+     * Get a set of userIds of joined members of a room
+     */
+    private fun getUserIdsOfJoinedMembers(roomId: String): Set<String> {
+        return roomGetterProvider.get().getRoom(roomId)
+                ?.getRoomMembers(roomMemberQueryParams { memberships = listOf(Membership.JOIN) })
+                ?.map { it.userId }
+                .orEmpty()
+                .toSet()
+    }
+}
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 5113b821e8..485a4973ca 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
@@ -33,6 +33,7 @@ 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.
      * This API may return keys which are not limited to displayname or avatar_url.
+     * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response can be HTTP 403.
      * @param userId the user id to fetch profile info
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index c6059f84ea..a5e066dae8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -40,6 +40,7 @@ import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.session.permalinks.ViaParameterFinder
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.search.SearchTask
@@ -66,6 +67,7 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
                                                private val roomMembersService: MembershipService,
                                                private val roomPushRuleService: RoomPushRuleService,
                                                private val sendStateTask: SendStateTask,
+                                               private val viaParameterFinder: ViaParameterFinder,
                                                private val searchTask: SearchTask) :
         Room,
         TimelineService by timelineService,
@@ -154,6 +156,6 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
 
     override fun asSpace(): Space? {
         if (roomSummary()?.roomType != RoomType.SPACE) return null
-        return DefaultSpace(this, roomSummaryDataSource)
+        return DefaultSpace(this, roomSummaryDataSource, viaParameterFinder)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
index 90640b4700..3f743c2922 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.session.room
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.permalinks.ViaParameterFinder
 import org.matrix.android.sdk.internal.session.room.alias.DefaultAliasService
 import org.matrix.android.sdk.internal.session.room.call.DefaultRoomCallService
 import org.matrix.android.sdk.internal.session.room.draft.DefaultDraftService
@@ -60,6 +61,7 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                                                       private val membershipServiceFactory: DefaultMembershipService.Factory,
                                                       private val roomPushRuleServiceFactory: DefaultRoomPushRuleService.Factory,
                                                       private val sendStateTask: SendStateTask,
+                                                      private val viaParameterFinder: ViaParameterFinder,
                                                       private val searchTask: SearchTask) :
         RoomFactory {
 
@@ -83,7 +85,8 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                 roomMembersService = membershipServiceFactory.create(roomId),
                 roomPushRuleService = roomPushRuleServiceFactory.create(roomId),
                 sendStateTask = sendStateTask,
-                searchTask = searchTask
+                searchTask = searchTask,
+                viaParameterFinder = viaParameterFinder
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index f580a7f354..cac0d715f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -24,6 +24,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomAliasesContent
 import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
 import org.matrix.android.sdk.api.session.room.model.RoomNameContent
 import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
 import org.matrix.android.sdk.api.session.room.model.RoomType
@@ -104,6 +105,7 @@ internal class RoomSummaryUpdater @Inject constructor(
         val lastCanonicalAliasEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_CANONICAL_ALIAS, stateKey = "")?.root
         val lastAliasesEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_ALIASES, stateKey = "")?.root
         val roomCreateEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_CREATE, stateKey = "")?.root
+        val joinRulesEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_JOIN_RULES, stateKey = "")?.root
 
         val roomType = ContentMapper.map(roomCreateEvent?.content).toModel<RoomCreateContent>()?.type
         roomSummaryEntity.roomType = roomType
@@ -130,6 +132,7 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.avatarUrl = roomAvatarResolver.resolve(realm, roomId)
         roomSummaryEntity.name = ContentMapper.map(lastNameEvent?.content).toModel<RoomNameContent>()?.name
         roomSummaryEntity.topic = ContentMapper.map(lastTopicEvent?.content).toModel<RoomTopicContent>()?.topic
+        roomSummaryEntity.joinRules = ContentMapper.map(joinRulesEvent?.content).toModel<RoomJoinRulesContent>()?.joinRules
         roomSummaryEntity.latestPreviewableEvent = latestPreviewableEvent
         roomSummaryEntity.canonicalAlias = ContentMapper.map(lastCanonicalAliasEvent?.content).toModel<RoomCanonicalAliasContent>()
                 ?.canonicalAlias
@@ -361,6 +364,8 @@ internal class RoomSummaryUpdater @Inject constructor(
                         realm.where(RoomSummaryEntity::class.java)
                                 .process(RoomSummaryEntityFields.MEMBERSHIP_STR, listOf(Membership.JOIN))
                                 .notEqualTo(RoomSummaryEntityFields.ROOM_TYPE, RoomType.SPACE)
+                                // also we do not count DM in here, because home space will already show them
+                                .equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
                                 .contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, space.roomId)
                                 .findAll().forEach {
                                     highlightCount += it.highlightCount
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 93cb9d9d34..70c52bf4ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -24,11 +24,13 @@ import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import org.matrix.android.sdk.internal.session.permalinks.ViaParameterFinder
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 
 internal class DefaultSpace(
         private val room: Room,
-        private val spaceSummaryDataSource: RoomSummaryDataSource
+        private val spaceSummaryDataSource: RoomSummaryDataSource,
+        private val viaParameterFinder: ViaParameterFinder
 ) : Space {
 
     override fun asRoom(): Room {
@@ -46,15 +48,17 @@ internal class DefaultSpace(
     }
 
     override suspend fun addChildren(roomId: String,
-                                     viaServers: List<String>,
+                                     viaServers: List<String>?,
                                      order: String?,
                                      autoJoin: Boolean,
                                      suggested: Boolean?) {
+        // Find best via
+
         room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
-                        via = viaServers,
+                        via = viaServers ?: viaParameterFinder.computeViaParams(roomId, 3),
                         autoJoin = autoJoin,
                         order = order,
                         suggested = suggested
@@ -63,20 +67,21 @@ internal class DefaultSpace(
     }
 
     override suspend fun removeChildren(roomId: String) {
-        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
-                .firstOrNull()
-                ?.content.toModel<SpaceChildContent>()
-                ?: // should we throw here?
-                return
+//        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+//                .firstOrNull()
+//                ?.content.toModel<SpaceChildContent>()
+//                ?: // should we throw here?
+//                return
 
         // edit state event and set via to null
         room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
-                        order = existing.order,
+                        order = null,
                         via = null,
-                        autoJoin = existing.autoJoin
+                        autoJoin = null,
+                        suggested = null
                 ).toContent()
         )
     }
@@ -94,7 +99,8 @@ internal class DefaultSpace(
                 body = SpaceChildContent(
                         order = order,
                         via = existing.via,
-                        autoJoin = existing.autoJoin
+                        autoJoin = existing.autoJoin,
+                        suggested = existing.suggested
                 ).toContent()
         )
     }
@@ -105,6 +111,11 @@ internal class DefaultSpace(
                 ?.content.toModel<SpaceChildContent>()
                 ?: throw IllegalArgumentException("$roomId is not a child of this space")
 
+        if (existing.autoJoin == autoJoin) {
+            // nothing to do?
+            return
+        }
+
         // edit state event and set via to null
         room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
@@ -112,7 +123,31 @@ internal class DefaultSpace(
                 body = SpaceChildContent(
                         order = existing.order,
                         via = existing.via,
-                        autoJoin = autoJoin
+                        autoJoin = autoJoin,
+                        suggested = existing.suggested
+                ).toContent()
+        )
+    }
+
+    override suspend fun setChildrenSuggested(roomId: String, suggested: Boolean) {
+        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+                .firstOrNull()
+                ?.content.toModel<SpaceChildContent>()
+                ?: throw IllegalArgumentException("$roomId is not a child of this space")
+
+        if (existing.suggested == suggested) {
+            // nothing to do?
+            return
+        }
+        // edit state event and set via to null
+        room.sendStateEvent(
+                eventType = EventType.STATE_SPACE_CHILD,
+                stateKey = roomId,
+                body = SpaceChildContent(
+                        order = existing.order,
+                        via = existing.via,
+                        autoJoin = existing.autoJoin,
+                        suggested = suggested
                 ).toContent()
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 8fdc563edb..f7fd77c528 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -127,24 +127,31 @@ internal class DefaultSpaceService @Inject constructor(
                     ),
                     second = response.rooms
                             ?.filter { it.roomId != spaceId }
-                            ?.map { childSummary ->
-                                val childStateEv = response.events
-                                        ?.firstOrNull { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
-                                val childStateEvContent = childStateEv?.content.toModel<SpaceChildContent>()
-                                SpaceChildInfo(
-                                        childRoomId = childSummary.roomId,
-                                        isKnown = true,
-                                        roomType = childSummary.roomType,
-                                        name = childSummary.name,
-                                        topic = childSummary.topic,
-                                        avatarUrl = childSummary.avatarUrl,
-                                        order = childStateEvContent?.order,
-                                        autoJoin = childStateEvContent?.autoJoin ?: false,
-                                        viaServers = childStateEvContent?.via ?: emptyList(),
-                                        activeMemberCount = childSummary.numJoinedMembers,
-                                        parentRoomId = childStateEv?.roomId
-                                )
-                            }.orEmpty()
+                            ?.flatMap { childSummary ->
+                                response.events
+                                        ?.filter { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
+                                        ?.mapNotNull { childStateEv ->
+                                            // create a child entry for everytime this room is the child of a space
+                                            // beware that a room could appear then twice in this list
+                                            childStateEv.content.toModel<SpaceChildContent>()?.let { childStateEvContent ->
+                                                SpaceChildInfo(
+                                                        childRoomId = childSummary.roomId,
+                                                        isKnown = true,
+                                                        roomType = childSummary.roomType,
+                                                        name = childSummary.name,
+                                                        topic = childSummary.topic,
+                                                        avatarUrl = childSummary.avatarUrl,
+                                                        order = childStateEvContent.order,
+                                                        autoJoin = childStateEvContent.autoJoin ?: false,
+                                                        viaServers = childStateEvContent.via.orEmpty(),
+                                                        activeMemberCount = childSummary.numJoinedMembers,
+                                                        parentRoomId = childStateEv.roomId,
+                                                        suggested = childStateEvContent.suggested
+                                                )
+                                            }
+                                        }.orEmpty()
+                            }
+                            .orEmpty()
             )
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index 5e1b829249..e9d5ba5193 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -83,7 +83,7 @@ internal class DefaultJoinSpaceTask @Inject constructor(
         Timber.v("## Space: > Sync done ...")
         // after that i should have the children (? do I need to paginate to get state)
         val summary = roomSummaryDataSource.getSpaceSummary(params.roomIdOrAlias)
-        Timber.v("## Space: Found space summary Name:[${summary?.name}] children: ${summary?.spaceChildren?.size}")
+        Timber.v("## Space: Found space summary Name:[${summary?.name}] children: ${summary?.spaceChildren?.size}")
         summary?.spaceChildren?.forEach {
 //            val childRoomSummary = it.roomSummary ?: return@forEach
             Timber.v("## Space: Processing child :[${it.childRoomId}] autoJoin:${it.autoJoin}")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
index ae60faf905..411a9c5c06 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
@@ -64,7 +64,7 @@ internal class CryptoSyncHandler @Inject constructor(private val cryptoService:
      * @return true if the event has been decrypted
      */
     private fun decryptToDeviceEvent(event: Event, timelineId: String?): Boolean {
-        Timber.v("## CRYPTO | decryptToDeviceEvent")
+        Timber.v("## CRYPTO | decryptToDeviceEvent")
         if (event.getClearType() == EventType.ENCRYPTED) {
             var result: MXEventDecryptionResult? = null
             try {
@@ -76,7 +76,7 @@ internal class CryptoSyncHandler @Inject constructor(private val cryptoService:
                 val deviceId = cryptoService.getCryptoDeviceInfo(event.senderId!!).firstOrNull {
                     it.identityKey() == senderKey
                 }?.deviceId ?: senderKey
-                Timber.e("## CRYPTO | Failed to decrypt to device event from ${event.senderId}|$deviceId reason:<${event.mCryptoError ?: exception}>")
+                Timber.e("## CRYPTO | Failed to decrypt to device event from ${event.senderId}|$deviceId reason:<${event.mCryptoError ?: exception}>")
             }
 
             if (null != result) {
@@ -89,7 +89,7 @@ internal class CryptoSyncHandler @Inject constructor(private val cryptoService:
                 return true
             } else {
                 // should not happen
-                Timber.e("## CRYPTO | ERROR NULL DECRYPTION RESULT from ${event.senderId}")
+                Timber.e("## CRYPTO | ERROR NULL DECRYPTION RESULT from ${event.senderId}")
             }
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
index e19b1bcca7..47f20913ec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
@@ -27,7 +27,7 @@ fun String.md5() = try {
     digest.update(toByteArray())
     digest.digest()
             .joinToString("") { String.format("%02X", it) }
-            .toLowerCase(Locale.ROOT)
+            .lowercase(Locale.ROOT)
 } catch (exc: Exception) {
     // Should not happen, but just in case
     hashCode().toString()
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 2fabca4be8..aa0b92aa45 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
@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.internal.util
 
 import timber.log.Timber
+import java.util.Locale
 
 /**
  * Convert a string to an UTF8 String
@@ -24,7 +25,7 @@ import timber.log.Timber
  * @param s the string to convert
  * @return the utf-8 string
  */
-fun convertToUTF8(s: String): String {
+internal fun convertToUTF8(s: String): String {
     return try {
         val bytes = s.toByteArray(Charsets.UTF_8)
         String(bytes)
@@ -40,7 +41,7 @@ fun convertToUTF8(s: String): String {
  * @param s the string to convert
  * @return the utf-16 string
  */
-fun convertFromUTF8(s: String): String {
+internal fun convertFromUTF8(s: String): String {
     return try {
         val bytes = s.toByteArray()
         String(bytes, Charsets.UTF_8)
@@ -56,7 +57,7 @@ fun convertFromUTF8(s: String): String {
  * @param subString  the string to search for
  * @return whether a match was found
  */
-fun String.caseInsensitiveFind(subString: String): Boolean {
+internal fun String.caseInsensitiveFind(subString: String): Boolean {
     // add sanity checks
     if (subString.isEmpty() || isEmpty()) {
         return false
@@ -78,3 +79,14 @@ internal val spaceChars = "[\u00A0\u2000-\u200B\u2800\u3000]".toRegex()
  * Strip all the UTF-8 chars which are actually spaces
  */
 internal fun String.replaceSpaceChars() = replace(spaceChars, "")
+
+// String.capitalize is now deprecated
+internal fun String.safeCapitalize(): String {
+    return replaceFirstChar { char ->
+        if (char.isLowerCase()) {
+            char.titlecase(Locale.getDefault())
+        } else {
+            char.toString()
+        }
+    }
+}
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 8f9cc852a7..b55487e8c0 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===99
+enum class===100
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3
diff --git a/tools/release/sign_apk.sh b/tools/release/sign_apk.sh
index 77af5823c4..7697f58ceb 100755
--- a/tools/release/sign_apk.sh
+++ b/tools/release/sign_apk.sh
@@ -17,7 +17,7 @@ PARAM_KEYSTORE_PATH=$1
 PARAM_APK=$2
 
 # Other params
-BUILD_TOOLS_VERSION="29.0.3"
+BUILD_TOOLS_VERSION="30.0.3"
 MIN_SDK_VERSION=21
 
 echo "Signing APK with build-tools version ${BUILD_TOOLS_VERSION} for min SDK version ${MIN_SDK_VERSION}..."
diff --git a/tools/release/sign_apk_unsafe.sh b/tools/release/sign_apk_unsafe.sh
index b145ad45da..af5b0f0e32 100755
--- a/tools/release/sign_apk_unsafe.sh
+++ b/tools/release/sign_apk_unsafe.sh
@@ -23,7 +23,7 @@ PARAM_KS_PASS=$3
 PARAM_KEY_PASS=$4
 
 # Other params
-BUILD_TOOLS_VERSION="29.0.3"
+BUILD_TOOLS_VERSION="30.0.3"
 MIN_SDK_VERSION=21
 
 echo "Signing APK with build-tools version ${BUILD_TOOLS_VERSION} for min SDK version ${MIN_SDK_VERSION}..."
diff --git a/vector/build.gradle b/vector/build.gradle
index 3ecdcea524..a9a8ba0924 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 1
-ext.versionPatch = 7
+ext.versionPatch = 8
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -297,7 +297,7 @@ dependencies {
     def big_image_viewer_version = '1.8.0'
     def glide_version = '4.12.0'
     def moshi_version = '1.12.0'
-    def daggerVersion = '2.35'
+    def daggerVersion = '2.35.1'
     def autofill_version = "1.1.0"
     def work_version = '2.5.0'
     def arch_version = '2.1.0'
@@ -326,7 +326,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.sharetarget:sharetarget:1.1.0"
     implementation 'androidx.core:core-ktx:1.3.2'
-    implementation "androidx.media:media:1.3.0"
+    implementation "androidx.media:media:1.3.1"
 
     implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
     implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.9.0"
@@ -343,7 +343,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.22'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.23'
 
     // rx
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
@@ -406,7 +406,7 @@ dependencies {
     implementation "com.github.piasy:GlideImageViewFactory:$big_image_viewer_version"
 
     // implementation 'com.github.MikeOrtiz:TouchImageView:3.0.2'
-    implementation 'com.github.chrisbanes:PhotoView:2.1.4'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
     implementation "com.github.bumptech.glide:glide:$glide_version"
     kapt "com.github.bumptech.glide:compiler:$glide_version"
@@ -417,14 +417,14 @@ dependencies {
     implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
 
     // Chat effects
-    implementation 'nl.dionsegijn:konfetti:1.2.6'
-    implementation 'com.github.jetradarmobile:android-snowfall:1.2.0'
+    implementation 'nl.dionsegijn:konfetti:1.3.2'
+    implementation 'com.github.jetradarmobile:android-snowfall:1.2.1'
     // DI
     implementation "com.google.dagger:dagger:$daggerVersion"
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
 
     // gplay flavor only
-    gplayImplementation('com.google.firebase:firebase-messaging:21.1.0') {
+    gplayImplementation('com.google.firebase:firebase-messaging:22.0.0') {
         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/sampledata/matrix.json b/vector/sampledata/messages.json
similarity index 57%
rename from vector/sampledata/matrix.json
rename to vector/sampledata/messages.json
index c69e0201ad..8145277f6b 100644
--- a/vector/sampledata/matrix.json
+++ b/vector/sampledata/messages.json
@@ -1,58 +1,22 @@
 {
   "data": [
     {
-      "displayName": "Long display name useful to test layout with a long display name",
-      "mxid": "@longmatrixidbecausesometimesuserschooselongmxid:matrix.org",
-      "message": "William Shakespeare (bapt. 26 April 1564 – 23 April 1616) was an English poet, playwright and actor, widely regarded as the greatest writer in the English language and the world's greatest dramatist. He is often called England's national poet and the \"Bard of Avon\". His extant works, including collaborations, consist of approximately 39 plays, 154 sonnets, two long narrative poems, and a few other verses, some of uncertain authorship. His plays have been translated into every major living language and are performed more often than those of any other playwright.\n\nShakespeare was born and raised in Stratford-upon-Avon, Warwickshire. At the age of 18, he married Anne Hathaway, with whom he had three children: Susanna and twins Hamnet and Judith. Sometime between 1585 and 1592, he began a successful career in London as an actor, writer, and part-owner of a playing company called the Lord Chamberlain's Men, later known as the King's Men. At age 49 (around 1613), he appears to have retired to Stratford, where he died three years later. Few records of Shakespeare's private life survive; this has stimulated considerable speculation about such matters as his physical appearance, his sexuality, his religious beliefs, and whether the works attributed to him were written by others. Such theories are often criticised for failing to adequately note that few records survive of most commoners of the period.\n\nShakespeare produced most of his known works between 1589 and 1613. His early plays were primarily comedies and histories and are regarded as some of the best work produced in these genres. Until about 1608, he wrote mainly tragedies, among them Hamlet, Othello, King Lear, and Macbeth, all considered to be among the finest works in the English language. In the last phase of his life, he wrote tragicomedies (also known as romances) and collaborated with other playwrights.\n\nMany of Shakespeare's plays were published in editions of varying quality and accuracy in his lifetime. However, in 1623, two fellow actors and friends of Shakespeare's, John Heminges and Henry Condell, published a more definitive text known as the First Folio, a posthumous collected edition of Shakespeare's dramatic works that included all but two of his plays. The volume was prefaced with a poem by Ben Jonson, in which Jonson presciently hails Shakespeare in a now-famous quote as \"not of an age, but for all time\".\n\nThroughout the 20th and 21st centuries, Shakespeare's works have been continually adapted and rediscovered by new movements in scholarship and performance. His plays remain popular and are studied, performed, and reinterpreted through various cultural and political contexts around the world.",
-      "roomName": "Matrix HQ",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Runner's world",
-      "roomTopic": "Welcome to Matrix HQ! Here is the rest of the room topic, with a https://www.example.org url and a phone number: 0102030405 which should not be clickable."
+      "message": "William Shakespeare (bapt. 26 April 1564 – 23 April 1616) was an English poet, playwright and actor, widely regarded as the greatest writer in the English language and the world's greatest dramatist. He is often called England's national poet and the \"Bard of Avon\". His extant works, including collaborations, consist of approximately 39 plays, 154 sonnets, two long narrative poems, and a few other verses, some of uncertain authorship. His plays have been translated into every major living language and are performed more often than those of any other playwright.\n\nShakespeare was born and raised in Stratford-upon-Avon, Warwickshire. At the age of 18, he married Anne Hathaway, with whom he had three children: Susanna and twins Hamnet and Judith. Sometime between 1585 and 1592, he began a successful career in London as an actor, writer, and part-owner of a playing company called the Lord Chamberlain's Men, later known as the King's Men. At age 49 (around 1613), he appears to have retired to Stratford, where he died three years later. Few records of Shakespeare's private life survive; this has stimulated considerable speculation about such matters as his physical appearance, his sexuality, his religious beliefs, and whether the works attributed to him were written by others. Such theories are often criticised for failing to adequately note that few records survive of most commoners of the period.\n\nShakespeare produced most of his known works between 1589 and 1613. His early plays were primarily comedies and histories and are regarded as some of the best work produced in these genres. Until about 1608, he wrote mainly tragedies, among them Hamlet, Othello, King Lear, and Macbeth, all considered to be among the finest works in the English language. In the last phase of his life, he wrote tragicomedies (also known as romances) and collaborated with other playwrights.\n\nMany of Shakespeare's plays were published in editions of varying quality and accuracy in his lifetime. However, in 1623, two fellow actors and friends of Shakespeare's, John Heminges and Henry Condell, published a more definitive text known as the First Folio, a posthumous collected edition of Shakespeare's dramatic works that included all but two of his plays. The volume was prefaced with a poem by Ben Jonson, in which Jonson presciently hails Shakespeare in a now-famous quote as \"not of an age, but for all time\".\n\nThroughout the 20th and 21st centuries, Shakespeare's works have been continually adapted and rediscovered by new movements in scholarship and performance. His plays remain popular and are studied, performed, and reinterpreted through various cultural and political contexts around the world."
     },
     {
-      "displayName": "benoit",
-      "mxid": "@benoit:matrix.org",
-      "message": "Hello!",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Matrix Org",
-      "roomTopic": "Room topic very loooooooong with some details"
+      "message": "Hello!"
     },
     {
-      "displayName": "ganfra",
-      "mxid": "@ganfra:matrix.org",
-      "message": "How are you?",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Rennes",
-      "roomTopic": "Room topic very loooooooong with some details"
+      "message": "How are you?"
     },
     {
-      "displayName": "Manu",
-      "mxid": "@manu:matrix.org",
-      "message": "Great weather today!",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Est London",
-      "roomTopic": "Room topic very loooooooong with some details"
+      "message": "Great weather today!"
     },
     {
-      "displayName": "Giom",
-      "mxid": "@giom:matrix.org",
-      "message": "Let's do a picnic",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Element HQ",
-      "roomTopic": "Room topic very loooooooong with some details"
+      "message": "Let's do a picnic"
     },
     {
-      "displayName": "Nad",
-      "mxid": "@nadonomy:matrix.org",
-      "message": "Yes, great idea",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "My Company",
-      "roomTopic": "Room topic very loooooooong with some details"
+      "message": "Yes, great idea"
     }
   ]
 }
diff --git a/vector/sampledata/room_round_avatars/0_element_rainbow.png b/vector/sampledata/room_round_avatars/0_element_rainbow.png
new file mode 100644
index 0000000000..2efdc02312
Binary files /dev/null and b/vector/sampledata/room_round_avatars/0_element_rainbow.png differ
diff --git a/vector/sampledata/room_round_avatars/element_black.png b/vector/sampledata/room_round_avatars/element_black.png
new file mode 100644
index 0000000000..3b7430b5c1
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_black.png differ
diff --git a/vector/sampledata/room_round_avatars/element_ems.png b/vector/sampledata/room_round_avatars/element_ems.png
new file mode 100644
index 0000000000..63cdf3ccae
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_ems.png differ
diff --git a/vector/sampledata/room_round_avatars/element_multi.png b/vector/sampledata/room_round_avatars/element_multi.png
new file mode 100644
index 0000000000..ab0657768a
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_multi.png differ
diff --git a/vector/sampledata/room_round_avatars/element_sky.png b/vector/sampledata/room_round_avatars/element_sky.png
new file mode 100644
index 0000000000..16c1be7316
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_sky.png differ
diff --git a/vector/sampledata/room_round_avatars/element_verde.png b/vector/sampledata/room_round_avatars/element_verde.png
new file mode 100644
index 0000000000..778ad83725
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_verde.png differ
diff --git a/vector/sampledata/room_round_avatars/element_web.png b/vector/sampledata/room_round_avatars/element_web.png
new file mode 100644
index 0000000000..c99a34f1a2
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_web.png differ
diff --git a/vector/sampledata/room_round_avatars/element_x.png b/vector/sampledata/room_round_avatars/element_x.png
new file mode 100644
index 0000000000..bc95bf28f3
Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_x.png differ
diff --git a/vector/sampledata/room_round_avatars/matrix.png b/vector/sampledata/room_round_avatars/matrix.png
new file mode 100644
index 0000000000..a3b8f89a8a
Binary files /dev/null and b/vector/sampledata/room_round_avatars/matrix.png differ
diff --git a/vector/sampledata/room_round_avatars/new_vector.png b/vector/sampledata/room_round_avatars/new_vector.png
new file mode 100644
index 0000000000..16a51c6788
Binary files /dev/null and b/vector/sampledata/room_round_avatars/new_vector.png differ
diff --git a/vector/sampledata/room_round_avatars/ops.png b/vector/sampledata/room_round_avatars/ops.png
new file mode 100644
index 0000000000..6809885cc9
Binary files /dev/null and b/vector/sampledata/room_round_avatars/ops.png differ
diff --git a/vector/sampledata/room_round_avatars/write_club.png b/vector/sampledata/room_round_avatars/write_club.png
new file mode 100644
index 0000000000..1284472581
Binary files /dev/null and b/vector/sampledata/room_round_avatars/write_club.png differ
diff --git a/vector/sampledata/rooms.json b/vector/sampledata/rooms.json
new file mode 100644
index 0000000000..9304aa308d
--- /dev/null
+++ b/vector/sampledata/rooms.json
@@ -0,0 +1,14 @@
+{
+  "data": [
+    {
+      "name": "Matrix HQ",
+      "alias": "#matrix:matrix.org",
+      "topic": "Welcome to Matrix HQ! Here is the rest of the room topic, with a https://www.example.org url and a phone number: 0102030405 which should not be clickable."
+    },
+    {
+      "name": "Room name very loooooooong with some details",
+      "alias": "#matrix:matrix.org",
+      "topic": "Room topic very loooooooong with some details"
+    }
+  ]
+}
diff --git a/vector/sampledata/space_avatars/car.png b/vector/sampledata/space_avatars/car.png
new file mode 100644
index 0000000000..7e8af6b71d
Binary files /dev/null and b/vector/sampledata/space_avatars/car.png differ
diff --git a/vector/sampledata/space_avatars/face.png b/vector/sampledata/space_avatars/face.png
new file mode 100644
index 0000000000..8bec44153c
Binary files /dev/null and b/vector/sampledata/space_avatars/face.png differ
diff --git a/vector/sampledata/space_avatars/london.png b/vector/sampledata/space_avatars/london.png
new file mode 100644
index 0000000000..e77ddaaccc
Binary files /dev/null and b/vector/sampledata/space_avatars/london.png differ
diff --git a/vector/sampledata/space_avatars/paris.png b/vector/sampledata/space_avatars/paris.png
new file mode 100644
index 0000000000..4506794b4a
Binary files /dev/null and b/vector/sampledata/space_avatars/paris.png differ
diff --git a/vector/sampledata/space_avatars/runner.png b/vector/sampledata/space_avatars/runner.png
new file mode 100644
index 0000000000..ceaa047f79
Binary files /dev/null and b/vector/sampledata/space_avatars/runner.png differ
diff --git a/vector/sampledata/space_avatars/snow.png b/vector/sampledata/space_avatars/snow.png
new file mode 100644
index 0000000000..b523cf3066
Binary files /dev/null and b/vector/sampledata/space_avatars/snow.png differ
diff --git a/vector/sampledata/spaces.json b/vector/sampledata/spaces.json
new file mode 100644
index 0000000000..f58c2ca5da
--- /dev/null
+++ b/vector/sampledata/spaces.json
@@ -0,0 +1,28 @@
+{
+  "data": [
+    {
+      "name": "Runner's world",
+      "topic": "Space about running around the world!"
+    },
+    {
+      "name": "Matrix Org",
+      "topic": "Space about matrix.org!"
+    },
+    {
+      "name": "Rennes",
+      "topic": "Venez visiter Rennes!"
+    },
+    {
+      "name": "Est London",
+      "topic": "All about Est London!"
+    },
+    {
+      "name": "Element HQ",
+      "topic": "All about Element!"
+    },
+    {
+      "name": "My Company",
+      "topic": "All about My company!"
+    }
+  ]
+}
diff --git a/vector/sampledata/user_round_avatars/0_amandine.png b/vector/sampledata/user_round_avatars/0_amandine.png
new file mode 100644
index 0000000000..2a279852b3
Binary files /dev/null and b/vector/sampledata/user_round_avatars/0_amandine.png differ
diff --git a/vector/sampledata/user_round_avatars/1_benoit.png b/vector/sampledata/user_round_avatars/1_benoit.png
new file mode 100644
index 0000000000..6c51a1bb5a
Binary files /dev/null and b/vector/sampledata/user_round_avatars/1_benoit.png differ
diff --git a/vector/sampledata/user_round_avatars/2_gaelle.png b/vector/sampledata/user_round_avatars/2_gaelle.png
new file mode 100644
index 0000000000..a679639e00
Binary files /dev/null and b/vector/sampledata/user_round_avatars/2_gaelle.png differ
diff --git a/vector/sampledata/user_round_avatars/3_manu.png b/vector/sampledata/user_round_avatars/3_manu.png
new file mode 100644
index 0000000000..0cf9229614
Binary files /dev/null and b/vector/sampledata/user_round_avatars/3_manu.png differ
diff --git a/vector/sampledata/user_round_avatars/4_matthew.png b/vector/sampledata/user_round_avatars/4_matthew.png
new file mode 100644
index 0000000000..13d8eb3cfc
Binary files /dev/null and b/vector/sampledata/user_round_avatars/4_matthew.png differ
diff --git a/vector/sampledata/user_round_avatars/5_nad.png b/vector/sampledata/user_round_avatars/5_nad.png
new file mode 100644
index 0000000000..e60f9f3325
Binary files /dev/null and b/vector/sampledata/user_round_avatars/5_nad.png differ
diff --git a/vector/sampledata/user_round_avatars/ben.png b/vector/sampledata/user_round_avatars/ben.png
new file mode 100644
index 0000000000..14839da426
Binary files /dev/null and b/vector/sampledata/user_round_avatars/ben.png differ
diff --git a/vector/sampledata/user_round_avatars/bruno.png b/vector/sampledata/user_round_avatars/bruno.png
new file mode 100644
index 0000000000..c0278ea73d
Binary files /dev/null and b/vector/sampledata/user_round_avatars/bruno.png differ
diff --git a/vector/sampledata/user_round_avatars/nique.png b/vector/sampledata/user_round_avatars/nique.png
new file mode 100644
index 0000000000..41480b4bb4
Binary files /dev/null and b/vector/sampledata/user_round_avatars/nique.png differ
diff --git a/vector/sampledata/user_round_avatars/toml.png b/vector/sampledata/user_round_avatars/toml.png
new file mode 100644
index 0000000000..1abeb74d94
Binary files /dev/null and b/vector/sampledata/user_round_avatars/toml.png differ
diff --git a/vector/sampledata/user_round_avatars/victor.png b/vector/sampledata/user_round_avatars/victor.png
new file mode 100644
index 0000000000..f1f91bda4f
Binary files /dev/null and b/vector/sampledata/user_round_avatars/victor.png differ
diff --git a/vector/sampledata/users.json b/vector/sampledata/users.json
new file mode 100644
index 0000000000..0a49d27450
--- /dev/null
+++ b/vector/sampledata/users.json
@@ -0,0 +1,28 @@
+{
+  "data": [
+    {
+      "displayName": "amandine",
+      "id": "@amandine:matrix.org"
+    },
+    {
+      "displayName": "benoit",
+      "id": "@benoit:matrix.org"
+    },
+    {
+      "displayName": "gaelle",
+      "id": "@gawa:matrix.org"
+    },
+    {
+      "displayName": "Manu",
+      "id": "@manu:matrix.org"
+    },
+    {
+      "displayName": "Matthew",
+      "id": "@matthew:matrix.org"
+    },
+    {
+      "displayName": "Nad",
+      "id": "@nadonomy:matrix.org"
+    }
+  ]
+}
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index 15c7e88bac..d429b293b2 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -19,13 +19,14 @@ import android.content.Intent
 import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
 import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.FcmHelper
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -38,7 +39,8 @@ import javax.inject.Inject
 class TestPushFromPushGateway @Inject constructor(private val context: AppCompatActivity,
                                                   private val stringProvider: StringProvider,
                                                   private val errorFormatter: ErrorFormatter,
-                                                  private val pushersManager: PushersManager)
+                                                  private val pushersManager: PushersManager,
+                                                  private val activeSessionHolder: ActiveSessionHolder)
     : TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
 
     private var action: Job? = null
@@ -50,7 +52,7 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
             status = TestStatus.FAILED
             return
         }
-        action = GlobalScope.launch {
+        action = activeSessionHolder.getActiveSession().coroutineScope.launch {
             val result = runCatching { pushersManager.testPush(fcmToken) }
 
             withContext(Dispatchers.Main) {
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index cbe29d1900..edbd14d5d4 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -23,13 +23,13 @@ import arrow.core.Option
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.BehaviorDataSource
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
+import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.ui.UiStateRepository
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.addTo
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
@@ -71,30 +71,30 @@ class AppStateHandler @Inject constructor(
     fun getCurrentRoomGroupingMethod(): RoomGroupingMethod? = selectedSpaceDataSource.currentValue?.orNull()
 
     fun setCurrentSpace(spaceId: String?, session: Session? = null) {
-        val uSession = session ?: activeSessionHolder.getSafeActiveSession()
+        val uSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
         if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.BySpace
                 && spaceId == selectedSpaceDataSource.currentValue?.orNull()?.space()?.roomId) return
-        val spaceSum = spaceId?.let { uSession?.getRoomSummary(spaceId) }
+        val spaceSum = spaceId?.let { uSession.getRoomSummary(spaceId) }
         selectedSpaceDataSource.post(Option.just(RoomGroupingMethod.BySpace(spaceSum)))
         if (spaceId != null) {
-            GlobalScope.launch(Dispatchers.IO) {
+            uSession.coroutineScope.launch(Dispatchers.IO) {
                 tryOrNull {
-                    uSession?.getRoom(spaceId)?.loadRoomMembersIfNeeded()
+                    uSession.getRoom(spaceId)?.loadRoomMembersIfNeeded()
                 }
             }
         }
     }
 
     fun setCurrentGroup(groupId: String?, session: Session? = null) {
-        val uSession = session ?: activeSessionHolder.getSafeActiveSession()
+        val uSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
         if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.ByLegacyGroup
                 && groupId == selectedSpaceDataSource.currentValue?.orNull()?.group()?.groupId) return
-        val activeGroup = groupId?.let { uSession?.getGroupSummary(groupId) }
+        val activeGroup = groupId?.let { uSession.getGroupSummary(groupId) }
         selectedSpaceDataSource.post(Option.just(RoomGroupingMethod.ByLegacyGroup(activeGroup)))
         if (groupId != null) {
-            GlobalScope.launch {
+            uSession.coroutineScope.launch {
                 tryOrNull {
-                    uSession?.getGroup(groupId)?.fetchGroupData()
+                    uSession.getGroup(groupId)?.fetchGroupData()
                 }
             }
         }
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 c685231756..25c8a07597 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
@@ -125,6 +125,8 @@ import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
 import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
 import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
 import im.vector.app.features.spaces.manage.SpaceAddRoomFragment
+import im.vector.app.features.spaces.manage.SpaceManageRoomsFragment
+import im.vector.app.features.spaces.manage.SpaceSettingsFragment
 import im.vector.app.features.spaces.people.SpacePeopleFragment
 import im.vector.app.features.spaces.preview.SpacePreviewFragment
 import im.vector.app.features.terms.ReviewTermsFragment
@@ -684,4 +686,14 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(SpacePeopleFragment::class)
     fun bindSpacePeopleFragment(fragment: SpacePeopleFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SpaceSettingsFragment::class)
+    fun bindSpaceSettingsFragment(fragment: SpaceSettingsFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SpaceManageRoomsFragment::class)
+    fun bindSpaceManageRoomsFragment(fragment: SpaceManageRoomsFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index c16c602530..dbfbcbdd1e 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -78,12 +78,12 @@ import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheet
 import im.vector.app.features.share.IncomingShareActivity
 import im.vector.app.features.signout.soft.SoftLogoutActivity
 import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
-import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpaceExploreActivity
-import im.vector.app.features.spaces.invite.SpaceInviteBottomSheet
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
+import im.vector.app.features.spaces.invite.SpaceInviteBottomSheet
 import im.vector.app.features.spaces.manage.SpaceManageActivity
+import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.ui.UiStateRepository
 import im.vector.app.features.usercode.UserCodeActivity
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyFormExt.kt b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyFormExt.kt
new file mode 100644
index 0000000000..f93b07a98d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyFormExt.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.epoxy
+
+import android.widget.CompoundButton
+import com.google.android.material.switchmaterial.SwitchMaterial
+import com.google.android.material.textfield.TextInputEditText
+
+fun VectorEpoxyHolder.setValueOnce(textInputEditText: TextInputEditText, value: String?) {
+    if (view.isAttachedToWindow) {
+        // the view is attached to the window
+        // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
+        // Downside is if you ever wanted to programmatically change the content of the edit text while it is on screen you would not be able to
+    } else {
+        textInputEditText.setText(value)
+    }
+}
+
+fun VectorEpoxyHolder.setValueOnce(switchView: SwitchMaterial, switchChecked: Boolean, listener: CompoundButton.OnCheckedChangeListener) {
+    if (view.isAttachedToWindow) {
+        // the view is attached to the window
+        // So it is a rebind of new data and you could ignore it assuming this is value that was already inputted into the view.
+    } else {
+        switchView.isChecked = switchChecked
+        switchView.setOnCheckedChangeListener(listener)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
index 33e7199334..05b70def3d 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
@@ -57,15 +57,3 @@ fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_searc
         return@OnTouchListener false
     })
 }
-
-/**
- * Update the edit text value, only if necessary and move the cursor to the end of the text
- */
-fun EditText.setTextSafe(value: String?) {
-    if (value != null && text.toString() != value) {
-        setText(value)
-        // To fix jumping cursor to the start https://github.com/airbnb/epoxy/issues/426
-        // Note: there is still a known bug if deleting char in the middle of the text, by long pressing on the backspace button.
-        setSelection(value.length)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt b/vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt
index 1299f4086b..e68b5e1b07 100644
--- a/vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt
+++ b/vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt
@@ -45,7 +45,7 @@ fun getMimeTypeFromUri(context: Context, uri: Uri): String? {
 
         if (null != mimeType) {
             // the mimetype is sometimes in uppercase.
-            mimeType = mimeType.toLowerCase(Locale.ROOT)
+            mimeType = mimeType.lowercase(Locale.ROOT)
         }
     } catch (e: Exception) {
         Timber.e(e, "Failed to open resource input stream")
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt
index d0c65aff95..bc5446e836 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt
@@ -16,12 +16,14 @@
 package im.vector.app.core.ui.list
 
 import android.widget.TextView
+import androidx.annotation.ColorInt
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * A generic list item header left aligned with notice color.
@@ -32,9 +34,18 @@ abstract class GenericItemHeader : VectorEpoxyModel<GenericItemHeader.Holder>()
     @EpoxyAttribute
     var text: String? = null
 
+    @EpoxyAttribute
+    @ColorInt
+    var textColor: Int? = null
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.text.setTextOrHide(text)
+        if (textColor != null) {
+            holder.text.setTextColor(textColor!!)
+        } else {
+            holder.text.setTextColor(ThemeUtils.getColor(holder.view.context, R.attr.vctr_notice_text_color))
+        }
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt
new file mode 100644
index 0000000000..ce9e35c007
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.app.core.ui.list
+
+import android.content.res.ColorStateList
+import android.view.Gravity
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.core.view.isVisible
+import androidx.core.widget.ImageViewCompat
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.themes.ThemeUtils
+
+/**
+ * A generic list item with a rounded corner background and an optional icon
+ */
+@EpoxyModelClass(layout = R.layout.item_generic_pill_footer)
+abstract class GenericPillItem : VectorEpoxyModel<GenericPillItem.Holder>() {
+
+    @EpoxyAttribute
+    var text: CharSequence? = null
+
+    @EpoxyAttribute
+    var style: ItemStyle = ItemStyle.NORMAL_TEXT
+
+    @EpoxyAttribute
+    var itemClickAction: GenericItem.Action? = null
+
+    @EpoxyAttribute
+    var centered: Boolean = false
+
+    @EpoxyAttribute
+    @DrawableRes
+    var imageRes: Int? = null
+
+    @EpoxyAttribute
+    var tintIcon: Boolean = true
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+
+        holder.textView.setTextOrHide(text)
+        holder.textView.typeface = style.toTypeFace()
+        holder.textView.textSize = style.toTextSize()
+        holder.textView.gravity = if (centered) Gravity.CENTER_HORIZONTAL else Gravity.START
+
+        if (imageRes != null) {
+            holder.imageView.setImageResource(imageRes!!)
+            holder.imageView.isVisible = true
+        } else {
+            holder.imageView.isVisible = false
+        }
+        if (tintIcon) {
+            val iconTintColor = ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
+            ImageViewCompat.setImageTintList(holder.imageView, ColorStateList.valueOf(iconTintColor))
+        } else {
+            ImageViewCompat.setImageTintList(holder.imageView, null)
+        }
+
+        holder.view.setOnClickListener {
+            itemClickAction?.perform?.run()
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val imageView by bind<ImageView>(R.id.itemGenericPillImage)
+        val textView by bind<TextView>(R.id.itemGenericPillText)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/utils/Emoji.kt b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
index 66907ded10..d73af1e917 100644
--- a/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
@@ -42,13 +42,13 @@ fun CharSequence.splitEmoji(): List<CharSequence> {
     while (index < length) {
         val firstChar = get(index)
 
-        if (firstChar.toInt() == 0x200e) {
+        if (firstChar.code == 0x200e) {
             // Left to right mark. What should I do with it?
-        } else if (firstChar.toInt() in 0xD800..0xDBFF && index + 1 < length) {
+        } else if (firstChar.code in 0xD800..0xDBFF && index + 1 < length) {
             // We have the start of a surrogate pair
             val secondChar = get(index + 1)
 
-            if (secondChar.toInt() in 0xDC00..0xDFFF) {
+            if (secondChar.code in 0xDC00..0xDFFF) {
                 // We have an emoji
                 result.add("$firstChar$secondChar")
                 index++
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 859df7d714..d82de1b4ed 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
@@ -43,8 +43,7 @@ import im.vector.app.R
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.themes.ThemeUtils
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import okio.buffer
 import okio.sink
 import okio.source
@@ -57,6 +56,7 @@ import timber.log.Timber
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
+import java.lang.IllegalStateException
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -344,90 +344,93 @@ private fun appendTimeToFilename(name: String): String {
     return """${filename}_$dateExtension.$fileExtension"""
 }
 
-fun saveMedia(context: Context, file: File, title: String, mediaMimeType: String?, notificationUtils: NotificationUtils) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        val filename = appendTimeToFilename(title)
+suspend fun saveMedia(context: Context, file: File, title: String, mediaMimeType: String?, notificationUtils: NotificationUtils) {
+    withContext(Dispatchers.IO) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            val filename = appendTimeToFilename(title)
 
-        val values = ContentValues().apply {
-            put(MediaStore.Images.Media.TITLE, filename)
-            put(MediaStore.Images.Media.DISPLAY_NAME, filename)
-            put(MediaStore.Images.Media.MIME_TYPE, mediaMimeType)
-            put(MediaStore.Images.Media.DATE_ADDED, System.currentTimeMillis())
-            put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis())
-        }
-        val externalContentUri = when {
-            mediaMimeType?.isMimeTypeImage() == true -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
-            mediaMimeType?.isMimeTypeVideo() == true -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
-            mediaMimeType?.isMimeTypeAudio() == true -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
-            else                                     -> MediaStore.Downloads.EXTERNAL_CONTENT_URI
-        }
+            val values = ContentValues().apply {
+                put(MediaStore.Images.Media.TITLE, filename)
+                put(MediaStore.Images.Media.DISPLAY_NAME, filename)
+                put(MediaStore.Images.Media.MIME_TYPE, mediaMimeType)
+                put(MediaStore.Images.Media.DATE_ADDED, System.currentTimeMillis())
+                put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis())
+            }
+            val externalContentUri = when {
+                mediaMimeType?.isMimeTypeImage() == true -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+                mediaMimeType?.isMimeTypeVideo() == true -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
+                mediaMimeType?.isMimeTypeAudio() == true -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
+                else                                     -> MediaStore.Downloads.EXTERNAL_CONTENT_URI
+            }
 
-        val uri = context.contentResolver.insert(externalContentUri, values)
-        if (uri == null) {
-            Toast.makeText(context, R.string.error_saving_media_file, Toast.LENGTH_LONG).show()
-        } else {
-            val source = file.inputStream().source().buffer()
-            context.contentResolver.openOutputStream(uri)?.sink()?.buffer()?.let { sink ->
-                source.use { input ->
-                    sink.use { output ->
-                        output.writeAll(input)
+            val uri = context.contentResolver.insert(externalContentUri, values)
+            if (uri == null) {
+                Toast.makeText(context, R.string.error_saving_media_file, Toast.LENGTH_LONG).show()
+                throw IllegalStateException(context.getString(R.string.error_saving_media_file))
+            } else {
+                val source = file.inputStream().source().buffer()
+                context.contentResolver.openOutputStream(uri)?.sink()?.buffer()?.let { sink ->
+                    source.use { input ->
+                        sink.use { output ->
+                            output.writeAll(input)
+                        }
                     }
                 }
+                notificationUtils.buildDownloadFileNotification(
+                        uri,
+                        filename,
+                        mediaMimeType ?: MimeTypes.OctetStream
+                ).let { notification ->
+                    notificationUtils.showNotificationMessage("DL", uri.hashCode(), notification)
+                }
             }
-            notificationUtils.buildDownloadFileNotification(
-                    uri,
-                    filename,
-                    mediaMimeType ?: MimeTypes.OctetStream
-            ).let { notification ->
-                notificationUtils.showNotificationMessage("DL", uri.hashCode(), notification)
-            }
+        } else {
+            saveMediaLegacy(context, mediaMimeType, title, file)
         }
-    } else {
-        saveMediaLegacy(context, mediaMimeType, title, file)
     }
 }
 
 @Suppress("DEPRECATION")
-private fun saveMediaLegacy(context: Context, mediaMimeType: String?, title: String, file: File) {
+private fun saveMediaLegacy(context: Context,
+                            mediaMimeType: String?,
+                            title: String,
+                            file: File) {
     val state = Environment.getExternalStorageState()
     if (Environment.MEDIA_MOUNTED != state) {
         context.toast(context.getString(R.string.error_saving_media_file))
-        return
+        throw IllegalStateException(context.getString(R.string.error_saving_media_file))
     }
 
-    GlobalScope.launch(Dispatchers.IO) {
-        val dest = when {
-            mediaMimeType?.isMimeTypeImage() == true -> Environment.DIRECTORY_PICTURES
-            mediaMimeType?.isMimeTypeVideo() == true -> Environment.DIRECTORY_MOVIES
-            mediaMimeType?.isMimeTypeAudio() == true -> Environment.DIRECTORY_MUSIC
-            else                                     -> Environment.DIRECTORY_DOWNLOADS
+    val dest = when {
+        mediaMimeType?.isMimeTypeImage() == true -> Environment.DIRECTORY_PICTURES
+        mediaMimeType?.isMimeTypeVideo() == true -> Environment.DIRECTORY_MOVIES
+        mediaMimeType?.isMimeTypeAudio() == true -> Environment.DIRECTORY_MUSIC
+        else                                     -> Environment.DIRECTORY_DOWNLOADS
+    }
+    val downloadDir = Environment.getExternalStoragePublicDirectory(dest)
+    try {
+        val outputFilename = if (title.substringAfterLast('.', "").isEmpty()) {
+            val extension = mediaMimeType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) }
+            "$title.$extension"
+        } else {
+            title
         }
-        val downloadDir = Environment.getExternalStoragePublicDirectory(dest)
-        try {
-            val outputFilename = if (title.substringAfterLast('.', "").isEmpty()) {
-                val extension = mediaMimeType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) }
-                "$title.$extension"
-            } else {
-                title
-            }
-            val savedFile = saveFileIntoLegacy(file, downloadDir, outputFilename)
-            if (savedFile != null) {
-                val downloadManager = context.getSystemService<DownloadManager>()
-                downloadManager?.addCompletedDownload(
-                        savedFile.name,
-                        title,
-                        true,
-                        mediaMimeType ?: MimeTypes.OctetStream,
-                        savedFile.absolutePath,
-                        savedFile.length(),
-                        true)
-                addToGallery(savedFile, mediaMimeType, context)
-            }
-        } catch (error: Throwable) {
-            GlobalScope.launch(Dispatchers.Main) {
-                context.toast(context.getString(R.string.error_saving_media_file))
-            }
+        val savedFile = saveFileIntoLegacy(file, downloadDir, outputFilename)
+        if (savedFile != null) {
+            val downloadManager = context.getSystemService<DownloadManager>()
+            downloadManager?.addCompletedDownload(
+                    savedFile.name,
+                    title,
+                    true,
+                    mediaMimeType ?: MimeTypes.OctetStream,
+                    savedFile.absolutePath,
+                    savedFile.length(),
+                    true)
+            addToGallery(savedFile, mediaMimeType, context)
         }
+    } catch (error: Throwable) {
+        context.toast(context.getString(R.string.error_saving_media_file))
+        throw error
     }
 }
 
@@ -509,7 +512,7 @@ fun selectTxtFileToWrite(
  * @param sourceFile     the file source path
  * @param dstDirPath     the dst path
  * @param outputFilename optional the output filename
- * @param callback       the asynchronous callback
+ * @return               the created file
  */
 @Suppress("DEPRECATION")
 fun saveFileIntoLegacy(sourceFile: File, dstDirPath: File, outputFilename: String?): File? {
diff --git a/vector/src/main/java/im/vector/app/core/utils/FileUtils.kt b/vector/src/main/java/im/vector/app/core/utils/FileUtils.kt
index b5ce922487..7ce6dd1c67 100644
--- a/vector/src/main/java/im/vector/app/core/utils/FileUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/FileUtils.kt
@@ -112,7 +112,7 @@ fun getFileExtension(fileUri: String): String? {
                 val ext = filename.substring(dotPos + 1)
 
                 if (ext.isNotBlank()) {
-                    return ext.toLowerCase(Locale.ROOT)
+                    return ext.lowercase(Locale.ROOT)
                 }
             }
         }
@@ -131,5 +131,5 @@ fun getSizeOfFiles(root: File): Int {
                 Timber.v("Get size of ${it.absolutePath}")
                 true
             }
-            .sumBy { it.length().toInt() }
+            .sumOf { it.length().toInt() }
 }
diff --git a/vector/src/main/java/im/vector/app/core/utils/StringUtils.kt b/vector/src/main/java/im/vector/app/core/utils/StringUtils.kt
new file mode 100644
index 0000000000..6d681007ce
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/utils/StringUtils.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.utils
+
+import java.util.Locale
+
+// String.capitalize is now deprecated
+fun String.safeCapitalize(locale: Locale): String {
+    return replaceFirstChar { char ->
+        if (char.isLowerCase()) {
+            char.titlecase(locale)
+        } else {
+            char.toString()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
index fcd6bf0a77..a3a1a29c4b 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -33,11 +33,12 @@ import im.vector.app.features.call.utils.awaitCreateOffer
 import im.vector.app.features.call.utils.awaitSetLocalDescription
 import im.vector.app.features.call.utils.awaitSetRemoteDescription
 import im.vector.app.features.call.utils.mapToCallCandidate
+import im.vector.app.features.session.coroutineScope
 import io.reactivex.disposables.Disposable
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.ReplaySubject
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -103,6 +104,9 @@ class WebRtcCall(val mxCall: MxCall,
 
     private val listeners = CopyOnWriteArrayList<Listener>()
 
+    private val sessionScope: CoroutineScope?
+        get() = sessionProvider.get()?.coroutineScope
+
     fun addListener(listener: Listener) {
         listeners.add(listener)
     }
@@ -191,7 +195,7 @@ class WebRtcCall(val mxCall: MxCall,
     fun onIceCandidate(iceCandidate: IceCandidate) = iceCandidateSource.onNext(iceCandidate)
 
     fun onRenegotiationNeeded(restartIce: Boolean) {
-        GlobalScope.launch(dispatcher) {
+        sessionScope?.launch(dispatcher) {
             if (mxCall.state != CallState.CreateOffer && mxCall.opponentVersion == 0) {
                 Timber.v("Opponent does not support renegotiation: ignoring onRenegotiationNeeded event")
                 return@launch
@@ -262,7 +266,7 @@ class WebRtcCall(val mxCall: MxCall,
         localSurfaceRenderers.addIfNeeded(localViewRenderer)
         remoteSurfaceRenderers.addIfNeeded(remoteViewRenderer)
 
-        GlobalScope.launch(dispatcher) {
+        sessionScope?.launch(dispatcher) {
             when (mode) {
                 VectorCallActivity.INCOMING_ACCEPT -> {
                     internalAcceptIncomingCall()
@@ -283,7 +287,7 @@ class WebRtcCall(val mxCall: MxCall,
     }
 
     fun acceptIncomingCall() {
-        GlobalScope.launch {
+        sessionScope?.launch {
             Timber.v("## VOIP acceptIncomingCall from state ${mxCall.state}")
             if (mxCall.state == CallState.LocalRinging) {
                 internalAcceptIncomingCall()
@@ -564,7 +568,7 @@ class WebRtcCall(val mxCall: MxCall,
     }
 
     fun updateRemoteOnHold(onHold: Boolean) {
-        GlobalScope.launch(dispatcher) {
+        sessionScope?.launch(dispatcher) {
             if (remoteOnHold == onHold) return@launch
             val direction: RtpTransceiver.RtpTransceiverDirection
             if (onHold) {
@@ -688,7 +692,7 @@ class WebRtcCall(val mxCall: MxCall,
     }
 
     fun onAddStream(stream: MediaStream) {
-        GlobalScope.launch(dispatcher) {
+        sessionScope?.launch(dispatcher) {
             // reportError("Weird-looking stream: " + stream);
             if (stream.audioTracks.size > 1 || stream.videoTracks.size > 1) {
                 Timber.e("## VOIP StreamObserver weird looking stream: $stream")
@@ -712,7 +716,7 @@ class WebRtcCall(val mxCall: MxCall,
     }
 
     fun onRemoveStream() {
-        GlobalScope.launch(dispatcher) {
+        sessionScope?.launch(dispatcher) {
             remoteSurfaceRenderers
                     .mapNotNull { it.get() }
                     .forEach { remoteVideoTrack?.removeSink(it) }
@@ -734,7 +738,7 @@ class WebRtcCall(val mxCall: MxCall,
         }
         val wasRinging = mxCall.state is CallState.LocalRinging
         mxCall.state = CallState.Terminated
-        GlobalScope.launch(dispatcher) {
+        sessionScope?.launch(dispatcher) {
             release()
         }
         onCallEnded(callId)
@@ -750,7 +754,7 @@ class WebRtcCall(val mxCall: MxCall,
     // Call listener
 
     fun onCallIceCandidateReceived(iceCandidatesContent: CallCandidatesContent) {
-        GlobalScope.launch(dispatcher) {
+        sessionScope?.launch(dispatcher) {
             iceCandidatesContent.candidates.forEach {
                 if (it.sdpMid.isNullOrEmpty() || it.candidate.isNullOrEmpty()) {
                     return@forEach
@@ -763,7 +767,7 @@ class WebRtcCall(val mxCall: MxCall,
     }
 
     fun onCallAnswerReceived(callAnswerContent: CallAnswerContent) {
-        GlobalScope.launch(dispatcher) {
+        sessionScope?.launch(dispatcher) {
             Timber.v("## VOIP onCallAnswerReceived ${callAnswerContent.callId}")
             val sdp = SessionDescription(SessionDescription.Type.ANSWER, callAnswerContent.answer.sdp)
             try {
@@ -779,7 +783,7 @@ class WebRtcCall(val mxCall: MxCall,
     }
 
     fun onCallNegotiateReceived(callNegotiateContent: CallNegotiateContent) {
-        GlobalScope.launch(dispatcher) {
+        sessionScope?.launch(dispatcher) {
             val description = callNegotiateContent.description
             val type = description?.type
             val sdpText = description?.sdp
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
index 282f7b1a71..c7e4c26385 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
@@ -18,8 +18,8 @@ package im.vector.app.features.crypto.keys
 
 import android.content.Context
 import android.net.Uri
+import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixCallback
@@ -33,7 +33,7 @@ class KeysExporter(private val session: Session) {
      * Export keys and return the file path with the callback
      */
     fun export(context: Context, password: String, uri: Uri, callback: MatrixCallback<Boolean>) {
-        GlobalScope.launch(Dispatchers.Main) {
+        session.coroutineScope.launch(Dispatchers.Main) {
             runCatching {
                 withContext(Dispatchers.IO) {
                     val data = awaitCallback<ByteArray> { session.cryptoService().exportRoomKeys(password, it) }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
index 8932bb9489..3d93b26edd 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
@@ -20,8 +20,8 @@ import android.content.Context
 import android.net.Uri
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.resources.openResource
+import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixCallback
@@ -41,7 +41,7 @@ class KeysImporter(private val session: Session) {
                mimetype: String?,
                password: String,
                callback: MatrixCallback<ImportRoomKeysResult>) {
-        GlobalScope.launch(Dispatchers.Main) {
+        session.coroutineScope.launch(Dispatchers.Main) {
             runCatching {
                 withContext(Dispatchers.IO) {
                     val resource = openResource(context, uri, mimetype ?: getMimeTypeFromUri(context, uri))
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index 9a3b5fa874..8833702e35 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -25,6 +25,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import arrow.core.Try
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import im.vector.app.R
@@ -37,7 +38,6 @@ import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.FragmentKeysBackupSetupStep3Binding
 
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.IOException
@@ -163,7 +163,7 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
     }
 
     private fun exportRecoveryKeyToFile(uri: Uri, data: String) {
-        GlobalScope.launch(Dispatchers.Main) {
+        lifecycleScope.launch(Dispatchers.Main) {
             Try {
                 withContext(Dispatchers.IO) {
                     requireContext().contentResolver.openOutputStream(uri)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
index d5e7305e11..0e11c35289 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
@@ -24,6 +24,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
@@ -35,7 +36,6 @@ import im.vector.app.core.utils.toast
 import im.vector.app.databinding.FragmentBootstrapSaveKeyBinding
 
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -80,7 +80,7 @@ class BootstrapSaveRecoveryKeyFragment @Inject constructor(
     private val saveStartForActivityResult = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
             val uri = activityResult.data?.data ?: return@registerStartForActivityResult
-            GlobalScope.launch(Dispatchers.IO) {
+            lifecycleScope.launch(Dispatchers.IO) {
                 try {
                     sharedViewModel.handle(BootstrapActions.SaveKeyToUri(requireContext().contentResolver!!.openOutputStream(uri)!!))
                 } catch (failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index a67cb96d37..8e21412715 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -33,7 +33,6 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
@@ -427,7 +426,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
     }
 
     private fun tentativeRestoreBackup(res: Map<String, String>?) {
-        GlobalScope.launch(Dispatchers.IO) {
+        viewModelScope.launch(Dispatchers.IO) {
             try {
                 val secret = res?.get(KEYBACKUP_SECRET_SSSS_NAME) ?: return@launch Unit.also {
                     Timber.v("## Keybackup secret not restored from SSSS")
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 fdac8afaed..f8bcbddd34 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
@@ -27,7 +27,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setTextSafe
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input)
@@ -60,7 +60,7 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     @EpoxyAttribute
     var endIconMode: Int? = null
 
-    @EpoxyAttribute
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var onTextChange: ((String) -> Unit)? = null
 
     private val onTextChangeListener = object : SimpleTextWatcher() {
@@ -76,8 +76,8 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         holder.textInputLayout.error = errorMessage
         holder.textInputLayout.endIconMode = endIconMode ?: TextInputLayout.END_ICON_NONE
 
-        // Update only if text is different and value is not null
-        holder.textInputEditText.setTextSafe(value)
+        holder.setValueOnce(holder.textInputEditText, value)
+
         holder.textInputEditText.isEnabled = enabled
         inputType?.let { holder.textInputEditText.inputType = it }
         holder.textInputEditText.isSingleLine = singleLine ?: false
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
index 08fc435e11..6cf862b10b 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
@@ -26,7 +26,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setTextSafe
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input_with_button)
@@ -61,8 +61,8 @@ abstract class FormEditTextWithButtonItem : VectorEpoxyModel<FormEditTextWithBut
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.hint = hint
 
-        // Update only if text is different
-        holder.textInputEditText.setTextSafe(value)
+        holder.setValueOnce(holder.textInputEditText, value)
+
         holder.textInputEditText.isEnabled = enabled
 
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
index cbb545825d..0a07d27f64 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
@@ -83,7 +83,6 @@ abstract class FormEditableSquareAvatarItem : EpoxyModelWithHolder<FormEditableS
 
     override fun unbind(holder: Holder) {
         avatarRenderer?.clear(holder.image)
-        GlideApp.with(holder.image).clear(holder.image)
         super.unbind(holder)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
index 6c6f6d284d..7ebe09eeee 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
@@ -27,7 +27,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setTextSafe
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_multiline_text_input)
@@ -57,7 +57,7 @@ abstract class FormMultiLineEditTextItem : VectorEpoxyModel<FormMultiLineEditTex
     @EpoxyAttribute
     var typeFace: Typeface = Typeface.DEFAULT
 
-    @EpoxyAttribute
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var onTextChange: ((String) -> Unit)? = null
 
     private val onTextChangeListener = object : SimpleTextWatcher() {
@@ -76,8 +76,8 @@ abstract class FormMultiLineEditTextItem : VectorEpoxyModel<FormMultiLineEditTex
         holder.textInputEditText.textSize = textSizeSp?.toFloat() ?: 14f
         holder.textInputEditText.minLines = minLines
 
-        // Update only if text is different and value is not null
-        holder.textInputEditText.setTextSafe(value)
+        holder.setValueOnce(holder.textInputEditText, value)
+
         holder.textInputEditText.isEnabled = enabled
 
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
diff --git a/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
index ff4f8711e0..5a7ddd5835 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
@@ -25,6 +25,7 @@ import com.google.android.material.switchmaterial.SwitchMaterial
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_form_switch)
@@ -40,7 +41,7 @@ abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
     var switchChecked: Boolean = false
 
     @EpoxyAttribute
-    var title: String? = null
+    var title: CharSequence? = null
 
     @EpoxyAttribute
     var summary: String? = null
@@ -61,11 +62,10 @@ abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
 
         holder.switchView.isEnabled = enabled
 
-        holder.switchView.setOnCheckedChangeListener(null)
-        holder.switchView.isChecked = switchChecked
-        holder.switchView.setOnCheckedChangeListener { _, isChecked ->
+        holder.setValueOnce(holder.switchView, switchChecked) { _, isChecked ->
             listener?.invoke(isChecked)
         }
+
         holder.divider.isVisible = showDivider
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
index 553f82e98f..ddda38aa9c 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
@@ -18,6 +18,7 @@
 package im.vector.app.features.grouplist
 
 import android.content.res.ColorStateList
+import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
@@ -35,8 +36,9 @@ import im.vector.app.features.themes.ThemeUtils
 abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Holder>() {
 
     @EpoxyAttribute var selected: Boolean = false
-    @EpoxyAttribute var listener: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: (() -> Unit)? = null
     @EpoxyAttribute var countState : UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+    @EpoxyAttribute var showSeparator: Boolean = false
 
     override fun getViewType(): Int {
         // mm.. it's reusing the same layout for basic space item
@@ -56,6 +58,7 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         holder.leaveView.isVisible = false
 
         holder.counterBadgeView.render(countState)
+        holder.bottomSeparator.isVisible = showSeparator
     }
 
     class Holder : VectorEpoxyHolder() {
@@ -64,5 +67,6 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
         val leaveView by bind<ImageView>(R.id.groupTmpLeave)
         val counterBadgeView by bind<UnreadCounterBadgeView>(R.id.groupCounterBadge)
+        val bottomSeparator by bind<View>(R.id.groupBottomSeparator)
     }
 }
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 1de1ff1c3e..7714a69196 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
@@ -55,14 +55,15 @@ import im.vector.app.features.permalink.PermalinkHandler
 import im.vector.app.features.popup.DefaultVectorAlert
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
+import im.vector.app.features.rageshake.ReportType
 import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
-import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
 import im.vector.app.features.spaces.invite.SpaceInviteBottomSheet
+import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
@@ -216,6 +217,9 @@ class HomeActivity :
                             SpaceInviteBottomSheet.newInstance(sharedAction.spaceId)
                                     .show(supportFragmentManager, "SPACE_INVITE")
                         }
+                        HomeActivitySharedAction.SendSpaceFeedBack -> {
+                            bugReporter.openBugReportScreen(this, ReportType.SPACE_BETA_FEEDBACK)
+                        }
                     }.exhaustive
                 }
                 .disposeOnDestroy()
@@ -449,11 +453,11 @@ class HomeActivity :
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menu_home_suggestion -> {
-                bugReporter.openBugReportScreen(this, true)
+                bugReporter.openBugReportScreen(this, ReportType.SUGGESTION)
                 return true
             }
             R.id.menu_home_report_bug -> {
-                bugReporter.openBugReportScreen(this, false)
+                bugReporter.openBugReportScreen(this, ReportType.BUG_REPORT)
                 return true
             }
             R.id.menu_home_init_sync_legacy -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
index d79f24fc4c..6047a1e55e 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
@@ -29,4 +29,5 @@ sealed class HomeActivitySharedAction : VectorSharedAction {
     data class OpenSpacePreview(val spaceId: String) : HomeActivitySharedAction()
     data class OpenSpaceInvite(val spaceId: String) : HomeActivitySharedAction()
     data class ShowSpaceSettings(val spaceId: String) : HomeActivitySharedAction()
+    object SendSpaceFeedBack : HomeActivitySharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index 447a567cf4..bfedbd6f52 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -27,9 +27,9 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.login.ReAuthHelper
+import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.UIABaseAuth
@@ -184,7 +184,7 @@ class HomeActivityViewModel @AssistedInject constructor(
 
     private fun maybeBootstrapCrossSigningAfterInitialSync() {
         // We do not use the viewModel context because we do not want to tie this action to activity view model
-        GlobalScope.launch(Dispatchers.IO) {
+        activeSessionHolder.getSafeActiveSession()?.coroutineScope?.launch(Dispatchers.IO) {
             val session = activeSessionHolder.getSafeActiveSession() ?: return@launch
 
             tryOrNull("## MaybeBootstrapCrossSigning: Failed to download keys") {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index be5c72330e..836c63e85b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -202,7 +202,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                             setState {
                                 copy(
                                         notificationCountCatchup = dmRooms.totalCount + otherRooms.totalCount + roomsInvite + dmInvites,
-                                        notificationHighlightCatchup = dmRooms.isHighlight || otherRooms.isHighlight,
+                                        notificationHighlightCatchup = dmRooms.isHighlight || otherRooms.isHighlight || (dmInvites + roomsInvite) > 0,
                                         notificationCountPeople = dmRooms.totalCount + dmInvites,
                                         notificationHighlightPeople = dmRooms.isHighlight || dmInvites > 0,
                                         notificationCountRooms = otherRooms.totalCount + roomsInvite,
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index 43c878624b..9b506b6ed7 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -29,6 +29,7 @@ import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.settings.VectorPreferences
 import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
@@ -52,6 +53,7 @@ data class CountInfo(
 
 class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initialState: UnreadMessagesState,
                                                                 session: Session,
+                                                                private val vectorPreferences: VectorPreferences,
                                                                 appStateHandler: AppStateHandler)
     : VectorViewModel<UnreadMessagesState, EmptyAction, EmptyViewEvents>(initialState) {
 
@@ -126,12 +128,24 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                         }
                         is RoomGroupingMethod.BySpace       -> {
                             val selectedSpace = appStateHandler.safeActiveSpaceId()
-                            val counts = session.getNotificationCountForRooms(
+
+                            val inviteCount = session.getRoomSummaries(
+                                    roomSummaryQueryParams { this.memberships = listOf(Membership.INVITE) }
+                            ).size
+
+                            val totalCount = session.getNotificationCountForRooms(
                                     roomSummaryQueryParams {
                                         this.memberships = listOf(Membership.JOIN)
-                                        this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+                                        this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
+                                            vectorPreferences.labsSpacesOnlyOrphansInHome()
+                                        } ?: ActiveSpaceFilter.None
                                     }
                             )
+
+                            val counts = RoomAggregateNotificationCount(
+                                    totalCount.notificationCount + inviteCount,
+                                    totalCount.highlightCount + inviteCount
+                            )
                             val rootCounts = session.spaceService().getRootSpaceSummaries()
                                     .filter {
                                         // filter out current selection
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 cabd69ecf9..1f3f527be8 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
@@ -93,9 +93,9 @@ import im.vector.app.core.platform.showOptimizedSnackbar
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.ui.views.ActiveConferenceView
 import im.vector.app.core.ui.views.CurrentCallsView
+import im.vector.app.core.ui.views.FailedMessagesWarningView
 import im.vector.app.core.ui.views.JumpToReadMarkerView
 import im.vector.app.core.ui.views.KnownCallsViewHolder
-import im.vector.app.core.ui.views.FailedMessagesWarningView
 import im.vector.app.core.ui.views.NotificationAreaView
 import im.vector.app.core.utils.Debouncer
 import im.vector.app.core.utils.DimensionConverter
@@ -164,7 +164,7 @@ import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
-import im.vector.app.features.spaces.ShareSpaceBottomSheet
+import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgs
@@ -677,7 +677,7 @@ class RoomDetailFragment @Inject constructor(
 
     private fun handleSpaceShare() {
         roomDetailArgs.openShareSpaceForId?.let { spaceId ->
-            ShareSpaceBottomSheet.show(childFragmentManager, spaceId)
+            ShareSpaceBottomSheet.show(childFragmentManager, spaceId, true)
             view?.post {
                 handleChatEffect(ChatEffect.CONFETTI)
             }
@@ -1745,20 +1745,19 @@ class RoomDetailFragment @Inject constructor(
         session.coroutineScope.launch {
             val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
             if (!isAdded) return@launch
-            result.fold(
-                    {
-                        saveMedia(
-                                context = requireContext(),
-                                file = it,
-                                title = action.messageContent.body,
-                                mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), it.toUri()),
-                                notificationUtils = notificationUtils
-                        )
-                    },
-                    {
+            result.mapCatching {
+                saveMedia(
+                        context = requireContext(),
+                        file = it,
+                        title = action.messageContent.body,
+                        mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), it.toUri()),
+                        notificationUtils = notificationUtils
+                )
+            }
+                    .onFailure {
+                        if (!isAdded) return@onFailure
                         showErrorInSnackbar(it)
                     }
-            )
         }
     }
 
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 52779c863d..3a9969b43c 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
@@ -449,7 +449,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                 widgetSessionId = widgetSessionId.substring(0, 7)
             }
             val roomId: String = room.roomId
-            val confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.toLowerCase(VectorLocale.applicationLocale)
+            val confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.lowercase(VectorLocale.applicationLocale)
 
             val preferredJitsiDomain = tryOrNull {
                 rawService.getElementWellknown(session.myUserId)
@@ -832,7 +832,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                                     session.spaceService().getSpace(spaceId)
                                             ?.addChildren(
                                                     state.roomId,
-                                                    listOf(session.sessionParams.homeServerHost ?: ""),
+                                                    null,
                                                     null,
                                                     true
                                             )
@@ -849,7 +849,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                                     session.spaceService().getSpace(slashCommandResult.spaceId)
                                             ?.addChildren(
                                                     room.roomId,
-                                                    listOf(session.sessionParams.homeServerHost ?: ""),
+                                                    null,
                                                     null,
                                                     false
                                             )
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
index dcbfb13dcc..2defc7bd30 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
@@ -83,7 +83,7 @@ class MatrixItemColorProvider @Inject constructor(
         fun getColorFromUserId(userId: String?): Int {
             var hash = 0
 
-            userId?.toList()?.map { chr -> hash = (hash shl 5) - hash + chr.toInt() }
+            userId?.toList()?.map { chr -> hash = (hash shl 5) - hash + chr.code }
 
             return getUserColorByIndex(abs(hash))
         }
@@ -104,7 +104,7 @@ class MatrixItemColorProvider @Inject constructor(
 
         @ColorRes
         private fun getColorFromRoomId(roomId: String?): Int {
-            return when ((roomId?.toList()?.sumBy { it.toInt() } ?: 0) % 3) {
+            return when ((roomId?.toList()?.sumOf { it.code } ?: 0) % 3) {
                 1    -> R.color.riotx_avatar_fill_2
                 2    -> R.color.riotx_avatar_fill_3
                 else -> R.color.riotx_avatar_fill_1
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
index 72fdef9f7d..389dd15413 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
@@ -62,6 +62,7 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
         val firstUnreadEventId = (unreadState as? UnreadState.HasUnread)?.firstUnreadEventId
         var atLeastOneVisibleItemSinceLastDaySeparator = false
         var atLeastOneVisibleItemsBeforeReadMarker = false
+        var appendReadMarker = false
 
         // Then iterate on models so we have the exact positions in the adapter
         modelsIterator.forEach { epoxyModel ->
@@ -72,11 +73,7 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                 }
                 epoxyModel.getEventIds().forEach { eventId ->
                     adapterPositionMapping[eventId] = index
-                    if (epoxyModel.canAppendReadMarker() && eventId == firstUnreadEventId && atLeastOneVisibleItemsBeforeReadMarker) {
-                        modelsIterator.addReadMarkerItem(callback)
-                        index++
-                        positionOfReadMarker.set(index)
-                    }
+                    appendReadMarker = epoxyModel.canAppendReadMarker() && eventId == firstUnreadEventId && atLeastOneVisibleItemsBeforeReadMarker
                 }
             }
             if (epoxyModel is DaySeparatorItem) {
@@ -91,6 +88,12 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                     atLeastOneVisibleItemSinceLastDaySeparator = true
                 }
             }
+            if (appendReadMarker) {
+                modelsIterator.addReadMarkerItem(callback)
+                index++
+                positionOfReadMarker.set(index)
+                appendReadMarker = false
+            }
             index++
         }
         previousModelsSize = models.size
@@ -103,8 +106,6 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                     it.setOnVisibilityStateChanged(ReadMarkerVisibilityStateChangedListener(callback))
                 }
         add(readMarker)
-        // Use next as we still have some process to do before the next iterator loop
-        next()
     }
 
     private fun MutableListIterator<EpoxyModel<*>>.removeCallItemIfNeeded(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index bc24705e13..246d5052cf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -69,12 +69,12 @@ class RoomListViewModel @Inject constructor(
          * Filter the rooms if they are part of the current space (children and grand children).
          * If current space is null, will return orphan rooms only
          */
-        NORMAL,
+        ORPHANS_IF_SPACE_NULL,
         /**
          * Special case when we don't want to discriminate rooms when current space is null.
          * In this case return all.
          */
-        NOT_IF_ALL,
+        ALL_IF_SPACE_NULL,
         /** Do not filter based on space*/
         NONE
     }
@@ -131,7 +131,8 @@ class RoomListViewModel @Inject constructor(
                     },
                     {
                         updatableQuery = it
-                    }
+                    },
+                    vectorPreferences.labsSpacesOnlyOrphansInHome()
             ).buildSections(initialState.displayMode)
         } else {
             GroupRoomListSectionBuilder(
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 06f55d3952..d099ac16b7 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
@@ -50,6 +50,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var lastFormattedEvent: CharSequence
     @EpoxyAttribute lateinit var lastEventTime: CharSequence
     @EpoxyAttribute var encryptionTrustLevel: RoomEncryptionTrustLevel? = null
+    @EpoxyAttribute var izPublic: Boolean = false
     @EpoxyAttribute var unreadNotificationCount: Int = 0
     @EpoxyAttribute var hasUnreadMessage: Boolean = false
     @EpoxyAttribute var hasDraft: Boolean = false
@@ -74,6 +75,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
         holder.draftView.isVisible = hasDraft
         avatarRenderer.render(matrixItem, holder.avatarImageView)
         holder.roomAvatarDecorationImageView.render(encryptionTrustLevel)
+        holder.roomAvatarPublicDecorationImageView.isVisible = izPublic
         holder.roomAvatarFailSendingImageView.isVisible = hasFailedSending
         renderSelection(holder, showSelected)
         holder.typingView.setTextOrHide(typingMessage)
@@ -110,6 +112,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
         val avatarCheckedImageView by bind<ImageView>(R.id.roomAvatarCheckedImageView)
         val avatarImageView by bind<ImageView>(R.id.roomAvatarImageView)
         val roomAvatarDecorationImageView by bind<ShieldImageView>(R.id.roomAvatarDecorationImageView)
+        val roomAvatarPublicDecorationImageView by bind<ImageView>(R.id.roomAvatarPublicDecorationImageView)
         val roomAvatarFailSendingImageView by bind<ImageView>(R.id.roomAvatarFailSendingImageView)
         val rootView by bind<ViewGroup>(R.id.itemRoomLayout)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 283ed0ac85..e4826af04c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -112,6 +112,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
                 .avatarRenderer(avatarRenderer)
                 // We do not display shield in the room list anymore
                 // .encryptionTrustLevel(roomSummary.roomEncryptionTrustLevel)
+                .izPublic(roomSummary.isPublic)
                 .matrixItem(roomSummary.toMatrixItem())
                 .lastEventTime(latestEventTime)
                 .typingMessage(typingMessage)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index f7e527a710..266adf6b0c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -41,6 +41,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.rx.asObservable
 
 class SpaceRoomListSectionBuilder(
@@ -50,7 +51,8 @@ class SpaceRoomListSectionBuilder(
         val viewModelScope: CoroutineScope,
         private val suggestedRoomJoiningState: LiveData<Map<String, Async<Unit>>>,
         val onDisposable: (Disposable) -> Unit,
-        val onUdpatable: (UpdatableLivePageResult) -> Unit
+        val onUdpatable: (UpdatableLivePageResult) -> Unit,
+        val onlyOrphansInHome: Boolean = false
 ) : RoomListSectionBuilder {
 
     val pagedListConfig = PagedList.Config.Builder()
@@ -87,22 +89,31 @@ class SpaceRoomListSectionBuilder(
             }
             RoomListDisplayMode.NOTIFICATIONS -> {
                 addSection(
-                        sections,
-                        activeSpaceAwareQueries,
-                        R.string.invitations_header,
-                        true,
-                        RoomListViewModel.SpaceFilterStrategy.NORMAL
+                        sections = sections,
+                        activeSpaceUpdaters = activeSpaceAwareQueries,
+                        nameRes = R.string.invitations_header,
+                        notifyOfLocalEcho = true,
+                        spaceFilterStrategy = if (onlyOrphansInHome) {
+                            RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                        } else {
+                            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                        },
+                        countRoomAsNotif = true
                 ) {
                     it.memberships = listOf(Membership.INVITE)
                     it.roomCategoryFilter = RoomCategoryFilter.ALL
                 }
 
                 addSection(
-                        sections,
-                        activeSpaceAwareQueries,
-                        R.string.bottom_action_rooms,
-                        false,
-                        RoomListViewModel.SpaceFilterStrategy.NORMAL
+                        sections = sections,
+                        activeSpaceUpdaters = activeSpaceAwareQueries,
+                        nameRes = R.string.bottom_action_rooms,
+                        notifyOfLocalEcho = false,
+                        spaceFilterStrategy = if (onlyOrphansInHome) {
+                            RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                        } else {
+                            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                        }
                 ) {
                     it.memberships = listOf(Membership.JOIN)
                     it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
@@ -126,10 +137,12 @@ class SpaceRoomListSectionBuilder(
 
     private fun buildRoomsSections(sections: MutableList<RoomsSection>, activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>) {
         addSection(
-                sections, activeSpaceAwareQueries,
-                R.string.invitations_header,
-                true,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+                sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.invitations_header,
+                notifyOfLocalEcho = true,
+                spaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL,
+                countRoomAsNotif = true
         ) {
             it.memberships = listOf(Membership.INVITE)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -140,7 +153,7 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.bottom_action_favourites,
                 false,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+                RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -148,11 +161,15 @@ class SpaceRoomListSectionBuilder(
         }
 
         addSection(
-                sections,
-                activeSpaceAwareQueries,
-                R.string.bottom_action_rooms,
-                false,
-                RoomListViewModel.SpaceFilterStrategy.NORMAL
+                sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.bottom_action_rooms,
+                notifyOfLocalEcho = false,
+                spaceFilterStrategy = if (onlyOrphansInHome) {
+                    RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                } else {
+                    RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                }
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -160,11 +177,15 @@ class SpaceRoomListSectionBuilder(
         }
 
         addSection(
-                sections,
-                activeSpaceAwareQueries,
-                R.string.low_priority_header,
-                false,
-                RoomListViewModel.SpaceFilterStrategy.NORMAL
+                sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.low_priority_header,
+                notifyOfLocalEcho = false,
+                spaceFilterStrategy = if (onlyOrphansInHome) {
+                    RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                } else {
+                    RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                }
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -172,11 +193,15 @@ class SpaceRoomListSectionBuilder(
         }
 
         addSection(
-                sections,
-                activeSpaceAwareQueries,
-                R.string.system_alerts_header,
-                false,
-                RoomListViewModel.SpaceFilterStrategy.NORMAL
+                sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.system_alerts_header,
+                notifyOfLocalEcho = false,
+                spaceFilterStrategy = if (onlyOrphansInHome) {
+                    RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                } else {
+                    RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                }
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -194,7 +219,7 @@ class SpaceRoomListSectionBuilder(
                             } else {
                                 liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
                                     val spaceSum = tryOrNull { session.spaceService().querySpaceChildren(selectedSpace.roomId, suggestedOnly = true) }
-                                    val value = spaceSum?.second ?: emptyList()
+                                    val value = spaceSum?.second.orEmpty().distinctBy { it.childRoomId }
                                     // i need to check if it's already joined.
                                     val filtered = value.filter {
                                         session.getRoomSummary(it.childRoomId)?.membership?.isActive() != true
@@ -228,11 +253,12 @@ class SpaceRoomListSectionBuilder(
     }
 
     private fun buildDmSections(sections: MutableList<RoomsSection>, activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>) {
-        addSection(sections,
-                activeSpaceAwareQueries,
-                R.string.invitations_header,
-                true,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+        addSection(sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.invitations_header,
+                notifyOfLocalEcho = true,
+                spaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL,
+                countRoomAsNotif = true
         ) {
             it.memberships = listOf(Membership.INVITE)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -242,7 +268,7 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.bottom_action_favourites,
                 false,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+                RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -253,7 +279,7 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.bottom_action_people_x,
                 false,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+                RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -266,6 +292,7 @@ class SpaceRoomListSectionBuilder(
                            @StringRes nameRes: Int,
                            notifyOfLocalEcho: Boolean = false,
                            spaceFilterStrategy: RoomListViewModel.SpaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.NONE,
+                           countRoomAsNotif: Boolean = false,
                            query: (RoomSummaryQueryParams.Builder) -> Unit) {
         withQueryParams(
                 { query.invoke(it) },
@@ -277,7 +304,7 @@ class SpaceRoomListSectionBuilder(
                             pagedListConfig
                     ).also {
                         when (spaceFilterStrategy) {
-                            RoomListViewModel.SpaceFilterStrategy.NORMAL     -> {
+                            RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL -> {
                                 activeSpaceUpdaters.add(object : RoomListViewModel.ActiveSpaceQueryUpdater {
                                     override fun updateForSpaceId(roomId: String?) {
                                         it.updateQuery {
@@ -288,7 +315,7 @@ class SpaceRoomListSectionBuilder(
                                     }
                                 })
                             }
-                            RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL -> {
+                            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL     -> {
                                 activeSpaceUpdaters.add(object : RoomListViewModel.ActiveSpaceQueryUpdater {
                                     override fun updateForSpaceId(roomId: String?) {
                                         if (roomId != null) {
@@ -307,7 +334,7 @@ class SpaceRoomListSectionBuilder(
                                     }
                                 })
                             }
-                            RoomListViewModel.SpaceFilterStrategy.NONE       -> {
+                            RoomListViewModel.SpaceFilterStrategy.NONE                  -> {
                                 // we ignore current space for this one
                             }
                         }
@@ -320,9 +347,15 @@ class SpaceRoomListSectionBuilder(
                                         .subscribe {
                                             sections.find { it.sectionName == name }
                                                     ?.notificationCount
-                                                    ?.postValue(session.getNotificationCountForRooms(
-                                                            roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())
-                                                    ))
+                                                    ?.postValue(
+                                                            if (countRoomAsNotif) {
+                                                                RoomAggregateNotificationCount(it.size, it.size)
+                                                            } else {
+                                                                session.getNotificationCountForRooms(
+                                                                        roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())
+                                                                )
+                                                            }
+                                                    )
                                         }.also {
                                             onDisposable.invoke(it)
                                         }
@@ -349,14 +382,16 @@ class SpaceRoomListSectionBuilder(
 
     internal fun RoomSummaryQueryParams.process(spaceFilter: RoomListViewModel.SpaceFilterStrategy, currentSpace: String?): RoomSummaryQueryParams {
         return when (spaceFilter) {
-            RoomListViewModel.SpaceFilterStrategy.NORMAL -> {
+            RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL -> {
                 copy(
                         activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(currentSpace)
                 )
             }
-            RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL -> {
+            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL -> {
                 if (currentSpace == null) {
-                    this
+                    copy(
+                            activeSpaceFilter = ActiveSpaceFilter.None
+                    )
                 } else {
                     copy(
                             activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(currentSpace)
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
index b9ef833850..61e4accba2 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
@@ -36,6 +36,7 @@ import im.vector.app.databinding.BottomSheetMatrixToCardBinding
 import im.vector.app.features.home.AvatarRenderer
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
+import java.lang.ref.WeakReference
 import javax.inject.Inject
 import kotlin.reflect.KClass
 
@@ -56,7 +57,13 @@ class MatrixToBottomSheet :
         injector.inject(this)
     }
 
-    private var interactionListener: InteractionListener? = null
+    private var weakReference = WeakReference<InteractionListener>(null)
+
+    var interactionListener: InteractionListener?
+        set(value) {
+            weakReference = WeakReference(value)
+        }
+        get() = weakReference.get()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetMatrixToCardBinding {
         return BottomSheetMatrixToCardBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index 0d633ac422..694f324025 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -120,6 +120,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                         ?.roomSummary()
                         // don't take if not active, as it could be outdated
                         ?.takeIf { it.membership.isActive() }
+                // XXX fix that
                 val forceRefresh = true
                 if (!forceRefresh && knownRoom != null) {
                     setState {
@@ -147,7 +148,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                                     topic = peekResult.topic ?: "",
                                     memberCount = peekResult.numJoinedMembers,
                                     alias = peekResult.alias,
-                                    membership = Membership.NONE,
+                                    membership = knownRoom?.membership ?: Membership.NONE,
                                     roomType = peekResult.roomType,
                                     viaServers = peekResult.viaServers.takeIf { it.isNotEmpty() } ?: permalinkData.viaParameters
                             ).also {
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 7a5a740b93..04f72000fa 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -21,7 +21,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isGone
-import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
@@ -31,6 +30,7 @@ import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.ButtonStateView
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentMatrixToRoomSpaceCardBinding
 import im.vector.app.features.home.AvatarRenderer
@@ -50,11 +50,18 @@ class MatrixToRoomSpaceFragment @Inject constructor(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        views.matrixToCardMainButton.debouncedClicks {
-            mainButtonClicked()
+        views.matrixToCardMainButton.callback = object : ButtonStateView.Callback {
+            override fun onButtonClicked() {
+                mainButtonClicked()
+            }
+
+            override fun onRetryClicked() = onButtonClicked()
         }
-        views.matrixToCardSecondaryButton.debouncedClicks {
-            secondaryButtonClicked()
+        views.matrixToCardSecondaryButton.callback = object : ButtonStateView.Callback {
+            override fun onButtonClicked() {
+                secondaryButtonClicked()
+            }
+            override fun onRetryClicked() = onButtonClicked()
         }
     }
 
@@ -164,16 +171,20 @@ class MatrixToRoomSpaceFragment @Inject constructor(
         when (state.peopleYouKnow) {
             is Success -> {
                 val someYouKnow = state.peopleYouKnow.invoke()
-                someYouKnow.forEachIndexed { index, item ->
-                    images[index].isVisible = true
-                    avatarRenderer.render(item, images[index])
+                if (someYouKnow.isEmpty()) {
+                    views.peopleYouMayKnowText.isVisible = false
+                } else {
+                    someYouKnow.forEachIndexed { index, item ->
+                        images[index].isVisible = true
+                        avatarRenderer.render(item, images[index])
+                    }
+                    views.peopleYouMayKnowText.setTextOrHide(
+                            resources.getQuantityString(R.plurals.space_people_you_know,
+                                    someYouKnow.count(),
+                                    someYouKnow.count()
+                            )
+                    )
                 }
-                views.peopleYouMayKnowText.setTextOrHide(
-                        resources.getQuantityString(R.plurals.space_people_you_know,
-                                someYouKnow.count(),
-                                someYouKnow.count()
-                        )
-                )
             }
             else       -> {
                 views.peopleYouMayKnowText.isVisible = false
@@ -182,21 +193,17 @@ class MatrixToRoomSpaceFragment @Inject constructor(
 
         when (state.startChattingState) {
             Uninitialized -> {
-                views.matrixToCardButtonLoading.isVisible = false
-//                views.matrixToCardMainButton.isVisible = false
+                views.matrixToCardMainButton.render(ButtonStateView.State.Button)
             }
             is Success -> {
-                views.matrixToCardButtonLoading.isVisible = false
-                views.matrixToCardMainButton.isVisible = true
+                views.matrixToCardMainButton.render(ButtonStateView.State.Button)
             }
             is Fail -> {
-                views.matrixToCardButtonLoading.isVisible = false
-                views.matrixToCardMainButton.isVisible = true
+                views.matrixToCardMainButton.render(ButtonStateView.State.Error)
                 // TODO display some error copy?
             }
             is Loading -> {
-                views.matrixToCardButtonLoading.isVisible = true
-                views.matrixToCardMainButton.isInvisible = true
+                views.matrixToCardMainButton.render(ButtonStateView.State.Loading)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt b/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt
index b549e01551..f067cd7599 100644
--- a/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.media
 
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.resources.StringProvider
+import kotlinx.coroutines.CoroutineScope
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -30,24 +31,31 @@ class AttachmentProviderFactory @Inject constructor(
         private val session: Session
 ) {
 
-    fun createProvider(attachments: List<TimelineEvent>): RoomEventsAttachmentProvider {
+    fun createProvider(attachments: List<TimelineEvent>,
+                       coroutineScope: CoroutineScope
+    ): RoomEventsAttachmentProvider {
         return RoomEventsAttachmentProvider(
-                attachments,
-                imageContentRenderer,
-                vectorDateFormatter,
-                session.fileService(),
-                stringProvider
+                attachments = attachments,
+                imageContentRenderer = imageContentRenderer,
+                dateFormatter = vectorDateFormatter,
+                fileService = session.fileService(),
+                coroutineScope = coroutineScope,
+                stringProvider = stringProvider
         )
     }
 
-    fun createProvider(attachments: List<AttachmentData>, room: Room?): DataAttachmentRoomProvider {
+    fun createProvider(attachments: List<AttachmentData>,
+                       room: Room?,
+                       coroutineScope: CoroutineScope
+    ): DataAttachmentRoomProvider {
         return DataAttachmentRoomProvider(
-                attachments,
-                room,
-                imageContentRenderer,
-                vectorDateFormatter,
-                session.fileService(),
-                stringProvider
+                attachments = attachments,
+                room = room,
+                imageContentRenderer = imageContentRenderer,
+                dateFormatter = vectorDateFormatter,
+                fileService = session.fileService(),
+                coroutineScope = coroutineScope,
+                stringProvider = stringProvider
         )
     }
 }
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 53996171a5..ca469bfbcb 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
@@ -31,8 +31,8 @@ import im.vector.lib.attachmentviewer.AttachmentInfo
 import im.vector.lib.attachmentviewer.AttachmentSourceProvider
 import im.vector.lib.attachmentviewer.ImageLoaderTarget
 import im.vector.lib.attachmentviewer.VideoLoaderTarget
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.session.events.model.isVideoMessage
@@ -44,6 +44,7 @@ abstract class BaseAttachmentProvider<Type>(
         private val attachments: List<Type>,
         private val imageContentRenderer: ImageContentRenderer,
         protected val fileService: FileService,
+        private val coroutineScope: CoroutineScope,
         private val dateFormatter: VectorDateFormatter,
         private val stringProvider: StringProvider
 ) : AttachmentSourceProvider {
@@ -155,7 +156,7 @@ abstract class BaseAttachmentProvider<Type>(
             target.onVideoURLReady(info.uid, data.url)
         } else {
             target.onVideoFileLoading(info.uid)
-            GlobalScope.launch(Dispatchers.Main) {
+            coroutineScope.launch(Dispatchers.IO) {
                 val result = runCatching {
                     fileService.downloadFile(
                             fileName = data.filename,
@@ -178,5 +179,5 @@ abstract class BaseAttachmentProvider<Type>(
         // TODO("Not yet implemented")
     }
 
-    abstract fun getFileForSharing(position: Int, callback: ((File?) -> Unit))
+    abstract suspend fun getFileForSharing(position: Int): File?
 }
diff --git a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
index 630433506f..31162f309f 100644
--- a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
@@ -19,10 +19,8 @@ package im.vector.app.features.media
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.resources.StringProvider
 import im.vector.lib.attachmentviewer.AttachmentInfo
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.CoroutineScope
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -35,8 +33,16 @@ class DataAttachmentRoomProvider(
         imageContentRenderer: ImageContentRenderer,
         dateFormatter: VectorDateFormatter,
         fileService: FileService,
+        coroutineScope: CoroutineScope,
         stringProvider: StringProvider
-) : BaseAttachmentProvider<AttachmentData>(attachments, imageContentRenderer, fileService, dateFormatter, stringProvider) {
+) : BaseAttachmentProvider<AttachmentData>(
+        attachments = attachments,
+        imageContentRenderer = imageContentRenderer,
+        fileService = fileService,
+        coroutineScope = coroutineScope,
+        dateFormatter = dateFormatter,
+        stringProvider = stringProvider
+) {
 
     override fun getAttachmentInfoAt(position: Int): AttachmentInfo {
         return getItem(position).let {
@@ -78,20 +84,17 @@ class DataAttachmentRoomProvider(
         return room?.getTimeLineEvent(item.eventId)
     }
 
-    override fun getFileForSharing(position: Int, callback: (File?) -> Unit) {
-        val item = getItem(position)
-        GlobalScope.launch {
-            val result = runCatching {
-                fileService.downloadFile(
-                        fileName = item.filename,
-                        mimeType = item.mimeType,
-                        url = item.url,
-                        elementToDecrypt = item.elementToDecrypt
-                )
-            }
-            withContext(Dispatchers.Main) {
-                callback(result.getOrNull())
-            }
-        }
+    override suspend fun getFileForSharing(position: Int): File? {
+        return getItem(position)
+                .let { item ->
+                    tryOrNull {
+                        fileService.downloadFile(
+                                fileName = item.filename,
+                                mimeType = item.mimeType,
+                                url = item.url,
+                                elementToDecrypt = item.elementToDecrypt
+                        )
+                    }
+                }
     }
 }
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 fc6d5a1f22..1e0a3a2ad9 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
@@ -19,10 +19,8 @@ package im.vector.app.features.media
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.resources.StringProvider
 import im.vector.lib.attachmentviewer.AttachmentInfo
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.CoroutineScope
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
@@ -41,8 +39,16 @@ class RoomEventsAttachmentProvider(
         imageContentRenderer: ImageContentRenderer,
         dateFormatter: VectorDateFormatter,
         fileService: FileService,
+        coroutineScope: CoroutineScope,
         stringProvider: StringProvider
-) : BaseAttachmentProvider<TimelineEvent>(attachments, imageContentRenderer, fileService, dateFormatter, stringProvider) {
+) : BaseAttachmentProvider<TimelineEvent>(
+        attachments = attachments,
+        imageContentRenderer = imageContentRenderer,
+        fileService = fileService,
+        coroutineScope = coroutineScope,
+        dateFormatter = dateFormatter,
+        stringProvider = stringProvider
+) {
 
     override fun getAttachmentInfoAt(position: Int): AttachmentInfo {
         return getItem(position).let {
@@ -121,24 +127,19 @@ class RoomEventsAttachmentProvider(
         return getItem(position)
     }
 
-    override fun getFileForSharing(position: Int, callback: (File?) -> Unit) {
-        getItem(position).let { timelineEvent ->
-
-            val messageContent = timelineEvent.root.getClearContent().toModel<MessageContent>()
-                    as? MessageWithAttachmentContent
-                    ?: return@let
-            GlobalScope.launch {
-                val result = runCatching {
-                    fileService.downloadFile(
-                            fileName = messageContent.body,
-                            mimeType = messageContent.mimeType,
-                            url = messageContent.getFileUrl(),
-                            elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
+    override suspend fun getFileForSharing(position: Int): File? {
+        return getItem(position)
+                .let { timelineEvent ->
+                    timelineEvent.root.getClearContent().toModel<MessageContent>() as? MessageWithAttachmentContent
                 }
-                withContext(Dispatchers.Main) {
-                    callback(result.getOrNull())
+                ?.let { messageContent ->
+                    tryOrNull {
+                        fileService.downloadFile(
+                                fileName = messageContent.body,
+                                mimeType = messageContent.mimeType,
+                                url = messageContent.getFileUrl(),
+                                elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
+                    }
                 }
-            }
-        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
index c632a008ce..bc3acf3eec 100644
--- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
@@ -28,7 +28,7 @@ import androidx.core.transition.addListener
 import androidx.core.view.ViewCompat
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
-import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
 import androidx.transition.Transition
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
@@ -42,6 +42,9 @@ import im.vector.app.features.themes.ActivityOtherThemes
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.lib.attachmentviewer.AttachmentCommands
 import im.vector.lib.attachmentviewer.AttachmentViewerActivity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 import javax.inject.Inject
@@ -119,11 +122,11 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
         val inMemoryData = intent.getParcelableArrayListExtra<AttachmentData>(EXTRA_IN_MEMORY_DATA)
         val sourceProvider = if (inMemoryData != null) {
             initialIndex = inMemoryData.indexOfFirst { it.eventId == args.eventId }.coerceAtLeast(0)
-            dataSourceFactory.createProvider(inMemoryData, room)
+            dataSourceFactory.createProvider(inMemoryData, room, lifecycleScope)
         } else {
             val events = room?.getAttachmentMessages().orEmpty()
             initialIndex = events.indexOfFirst { it.eventId == args.eventId }.coerceAtLeast(0)
-            dataSourceFactory.createProvider(events)
+            dataSourceFactory.createProvider(events, lifecycleScope)
         }
         sourceProvider.interactionListener = this
         setSourceProvider(sourceProvider)
@@ -264,9 +267,15 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
     }
 
     override fun onShareTapped() {
-        currentSourceProvider?.getFileForSharing(currentPosition) { data ->
-            if (data != null && lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
-                shareMedia(this@VectorAttachmentViewerActivity, data, getMimeTypeFromUri(this@VectorAttachmentViewerActivity, data.toUri()))
+        lifecycleScope.launch(Dispatchers.IO) {
+            val file = currentSourceProvider?.getFileForSharing(currentPosition) ?: return@launch
+
+            withContext(Dispatchers.Main) {
+                shareMedia(
+                        this@VectorAttachmentViewerActivity,
+                        file,
+                        getMimeTypeFromUri(this@VectorAttachmentViewerActivity, file.toUri())
+                )
             }
         }
     }
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 80d2d8ba45..635de2ba16 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
@@ -25,8 +25,9 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.files.LocalFilesHelper
+import im.vector.app.features.session.coroutineScope
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
@@ -39,6 +40,9 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
                                                private val activeSessionHolder: ActiveSessionHolder,
                                                private val errorFormatter: ErrorFormatter) {
 
+    private val sessionScope: CoroutineScope
+        get() = activeSessionHolder.getActiveSession().coroutineScope
+
     @Parcelize
     data class Data(
             override val eventId: String,
@@ -76,7 +80,7 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
                 thumbnailView.isVisible = true
                 loadingView.isVisible = true
 
-                GlobalScope.launch {
+                sessionScope.launch {
                     val result = runCatching {
                         activeSessionHolder.getActiveSession().fileService()
                                 .downloadFile(
@@ -119,7 +123,7 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
                 thumbnailView.isVisible = true
                 loadingView.isVisible = true
 
-                GlobalScope.launch {
+                sessionScope.launch {
                     val result = runCatching {
                         activeSessionHolder.getActiveSession().fileService()
                                 .downloadFile(
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 27de04210a..bf8fa497ff 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
@@ -74,6 +74,7 @@ import im.vector.app.features.share.SharedData
 import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
 import im.vector.app.features.spaces.SpaceExploreActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
+import im.vector.app.features.spaces.manage.ManageType
 import im.vector.app.features.spaces.manage.SpaceManageActivity
 import im.vector.app.features.spaces.people.SpacePeopleActivity
 import im.vector.app.features.terms.ReviewTermsActivity
@@ -123,7 +124,7 @@ class DefaultNavigator @Inject constructor(
                 }
             }
             Navigator.PostSwitchSpaceAction.OpenAddExistingRooms -> {
-                startActivity(context, SpaceManageActivity.newIntent(context, spaceId), false)
+                startActivity(context, SpaceManageActivity.newIntent(context, spaceId, ManageType.AddRooms), false)
             }
             is Navigator.PostSwitchSpaceAction.OpenDefaultRoom -> {
                 val args = RoomDetailArgs(
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
index adc618d82e..9c55b88805 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
@@ -60,6 +60,7 @@ class PinLocker @Inject constructor(
         return liveState
     }
 
+    @Suppress("EXPERIMENTAL_API_USAGE")
     private fun computeState() {
         GlobalScope.launch {
             val state = if (shouldBeLocked && pinCodeStore.hasEncodedPin()) {
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index 024d84f27b..27adefd50f 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -16,6 +16,8 @@
 
 package im.vector.app.features.rageshake
 
+import android.content.Context
+import android.content.Intent
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
@@ -27,6 +29,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityBugReportBinding
+import org.matrix.android.sdk.api.extensions.tryOrNull
 
 import timber.log.Timber
 import javax.inject.Inject
@@ -46,7 +49,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
     private val viewModel: BugReportViewModel by viewModel()
 
-    private var forSuggestion: Boolean = false
+    private var reportType: ReportType = ReportType.BUG_REPORT
 
     override fun initUiAndData() {
         configureToolbar(views.bugReportToolbar)
@@ -60,32 +63,50 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
             views.bugReportButtonIncludeScreenshot.isEnabled = false
         }
 
-        forSuggestion = intent.getBooleanExtra("FOR_SUGGESTION", false)
+        reportType = intent.getStringExtra(REPORT_TYPE_EXTRA)?.let {
+            tryOrNull { ReportType.valueOf(it) }
+        } ?: ReportType.BUG_REPORT
 
         // Default screen is for bug report, so modify it for suggestion
-        if (forSuggestion) {
-            supportActionBar?.setTitle(R.string.send_suggestion)
+        when (reportType) {
+            ReportType.BUG_REPORT -> {
+                supportActionBar?.setTitle(R.string.title_activity_bug_report)
+                views.bugReportButtonContactMe.isVisible = true
+            }
+            ReportType.SUGGESTION -> {
+                supportActionBar?.setTitle(R.string.send_suggestion)
 
-            views.bugReportFirstText.setText(R.string.send_suggestion_content)
-            views.bugReportTextInputLayout.hint = getString(R.string.send_suggestion_report_placeholder)
+                views.bugReportFirstText.setText(R.string.send_suggestion_content)
+                views.bugReportTextInputLayout.hint = getString(R.string.send_suggestion_report_placeholder)
+                views.bugReportButtonContactMe.isVisible = true
 
-            views.bugReportLogsDescription.isVisible = false
+                hideBugReportOptions()
+            }
+            ReportType.SPACE_BETA_FEEDBACK -> {
+                supportActionBar?.setTitle(R.string.send_feedback_space_title)
 
-            views.bugReportButtonIncludeLogs.isChecked = false
-            views.bugReportButtonIncludeLogs.isVisible = false
+                views.bugReportFirstText.setText(R.string.send_feedback_space_info)
+                views.bugReportTextInputLayout.hint = getString(R.string.feedback)
+                views.bugReportButtonContactMe.isVisible = true
 
-            views.bugReportButtonIncludeCrashLogs.isChecked = false
-            views.bugReportButtonIncludeCrashLogs.isVisible = false
-
-            views.bugReportButtonIncludeKeyShareHistory.isChecked = false
-            views.bugReportButtonIncludeKeyShareHistory.isVisible = false
-
-            // Keep the screenshot
-        } else {
-            supportActionBar?.setTitle(R.string.title_activity_bug_report)
+                hideBugReportOptions()
+            }
         }
     }
 
+    private fun hideBugReportOptions() {
+        views.bugReportLogsDescription.isVisible = false
+
+        views.bugReportButtonIncludeLogs.isChecked = false
+        views.bugReportButtonIncludeLogs.isVisible = false
+
+        views.bugReportButtonIncludeCrashLogs.isChecked = false
+        views.bugReportButtonIncludeCrashLogs.isVisible = false
+
+        views.bugReportButtonIncludeKeyShareHistory.isChecked = false
+        views.bugReportButtonIncludeKeyShareHistory.isVisible = false
+    }
+
     private fun setupViews() {
         views.bugReportEditText.doOnTextChanged { _, _, _, _ -> textChanged() }
         views.bugReportButtonIncludeScreenshot.setOnCheckedChangeListener { _, _ -> onSendScreenshotChanged() }
@@ -134,23 +155,31 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
         views.bugReportProgressView.progress = 0
 
         bugReporter.sendBugReport(this,
-                forSuggestion,
+                reportType,
                 views.bugReportButtonIncludeLogs.isChecked,
                 views.bugReportButtonIncludeCrashLogs.isChecked,
                 views.bugReportButtonIncludeKeyShareHistory.isChecked,
                 views.bugReportButtonIncludeScreenshot.isChecked,
                 views.bugReportEditText.text.toString(),
                 state.serverVersion,
+                views.bugReportButtonContactMe.isChecked,
                 object : BugReporter.IMXBugReportListener {
                     override fun onUploadFailed(reason: String?) {
                         try {
                             if (!reason.isNullOrEmpty()) {
-                                if (forSuggestion) {
-                                    Toast.makeText(this@BugReportActivity,
-                                            getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show()
-                                } else {
-                                    Toast.makeText(this@BugReportActivity,
-                                            getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show()
+                                when (reportType) {
+                                    ReportType.BUG_REPORT          -> {
+                                        Toast.makeText(this@BugReportActivity,
+                                                getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show()
+                                    }
+                                    ReportType.SUGGESTION          -> {
+                                        Toast.makeText(this@BugReportActivity,
+                                                getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show()
+                                    }
+                                    ReportType.SPACE_BETA_FEEDBACK -> {
+                                        Toast.makeText(this@BugReportActivity,
+                                                getString(R.string.feedback_failed, reason), Toast.LENGTH_LONG).show()
+                                    }
                                 }
                             }
                         } catch (e: Exception) {
@@ -178,10 +207,16 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
                     override fun onUploadSucceed() {
                         try {
-                            if (forSuggestion) {
-                                Toast.makeText(this@BugReportActivity, R.string.send_suggestion_sent, Toast.LENGTH_LONG).show()
-                            } else {
-                                Toast.makeText(this@BugReportActivity, R.string.send_bug_report_sent, Toast.LENGTH_LONG).show()
+                            when (reportType) {
+                                ReportType.BUG_REPORT          -> {
+                                    Toast.makeText(this@BugReportActivity, R.string.send_bug_report_sent, Toast.LENGTH_LONG).show()
+                                }
+                                ReportType.SUGGESTION          -> {
+                                    Toast.makeText(this@BugReportActivity, R.string.send_suggestion_sent, Toast.LENGTH_LONG).show()
+                                }
+                                ReportType.SPACE_BETA_FEEDBACK -> {
+                                    Toast.makeText(this@BugReportActivity, R.string.feedback_sent, Toast.LENGTH_LONG).show()
+                                }
                             }
                         } catch (e: Exception) {
                             Timber.e(e, "## onUploadSucceed() : failed to dismiss the toast")
@@ -214,4 +249,14 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
         super.onBackPressed()
     }
+
+    companion object {
+        private const val REPORT_TYPE_EXTRA = "REPORT_TYPE_EXTRA"
+
+        fun intent(context: Context, reportType: ReportType): Intent {
+            return Intent(context, BugReportActivity::class.java).apply {
+                putExtra(REPORT_TYPE_EXTRA, reportType.name)
+            }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 15fd18039b..5202d78f1a 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.rageshake
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.os.Build
@@ -149,7 +148,7 @@ class BugReporter @Inject constructor(
      * Send a bug report.
      *
      * @param context           the application context
-     * @param forSuggestion     true to send a suggestion
+     * @param reportType        The report type (bug, suggestion, feedback)
      * @param withDevicesLogs   true to include the device log
      * @param withCrashLogs     true to include the crash logs
      * @param withKeyRequestHistory true to include the crash logs
@@ -159,13 +158,14 @@ class BugReporter @Inject constructor(
      */
     @SuppressLint("StaticFieldLeak")
     fun sendBugReport(context: Context,
-                      forSuggestion: Boolean,
+                      reportType: ReportType,
                       withDevicesLogs: Boolean,
                       withCrashLogs: Boolean,
                       withKeyRequestHistory: Boolean,
                       withScreenshot: Boolean,
                       theBugDescription: String,
                       serverVersion: String,
+                      canContact: Boolean = false,
                       listener: IMXBugReportListener?) {
         // enumerate files to delete
         val mBugReportFiles: MutableList<File> = ArrayList()
@@ -246,13 +246,11 @@ class BugReporter @Inject constructor(
                 }
 
                 if (!mIsCancelled) {
-                    val text = "[Element] " +
-                            if (forSuggestion) {
-                                "[Suggestion] "
-                            } else {
-                                ""
-                            } +
-                            bugDescription
+                    val text = when (reportType) {
+                        ReportType.BUG_REPORT -> "[Element] $bugDescription"
+                        ReportType.SUGGESTION -> "[Element] [Suggestion] $bugDescription"
+                        ReportType.SPACE_BETA_FEEDBACK -> "[Element] [spaces-feedback] $bugDescription"
+                    }
 
                     // build the multi part request
                     val builder = BugReporterMultipartBody.Builder()
@@ -260,6 +258,7 @@ class BugReporter @Inject constructor(
                             .addFormDataPart("app", "riot-android")
                             .addFormDataPart("user_agent", Matrix.getInstance(context).getUserAgent())
                             .addFormDataPart("user_id", userId)
+                            .addFormDataPart("can_contact", canContact.toString())
                             .addFormDataPart("device_id", deviceId)
                             .addFormDataPart("version", versionProvider.getVersion(longFormat = true, useBuildNumber = false))
                             .addFormDataPart("branch_name", context.getString(R.string.git_branch_name))
@@ -321,9 +320,12 @@ class BugReporter @Inject constructor(
                     // Special for RiotX
                     builder.addFormDataPart("label", "[Element]")
 
-                    // Suggestion
-                    if (forSuggestion) {
-                        builder.addFormDataPart("label", "[Suggestion]")
+                    when (reportType) {
+                        ReportType.BUG_REPORT -> {
+                            /* nop */
+                        }
+                        ReportType.SUGGESTION -> builder.addFormDataPart("label", "[Suggestion]")
+                        ReportType.SPACE_BETA_FEEDBACK -> builder.addFormDataPart("label", "spaces-feedback")
                     }
 
                     if (getCrashFile(context).exists()) {
@@ -447,16 +449,14 @@ class BugReporter @Inject constructor(
     /**
      * Send a bug report either with email or with Vector.
      */
-    fun openBugReportScreen(activity: FragmentActivity, forSuggestion: Boolean = false) {
+    fun openBugReportScreen(activity: FragmentActivity, reportType: ReportType = ReportType.BUG_REPORT) {
         screenshot = takeScreenshot(activity)
         activeSessionHolder.getSafeActiveSession()?.let {
             it.logDbUsageInfo()
             it.cryptoService().logDbUsageInfo()
         }
 
-        val intent = Intent(activity, BugReportActivity::class.java)
-        intent.putExtra("FOR_SUGGESTION", forSuggestion)
-        activity.startActivity(intent)
+        activity.startActivity(BugReportActivity.intent(activity, reportType))
     }
 
 // ==============================================================================================================
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/ReportType.kt b/vector/src/main/java/im/vector/app/features/rageshake/ReportType.kt
new file mode 100644
index 0000000000..44682efb40
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/rageshake/ReportType.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.rageshake
+
+enum class ReportType {
+    BUG_REPORT,
+    SUGGESTION,
+    SPACE_BETA_FEEDBACK
+}
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
index 304720dfb0..2f8e013f46 100644
--- a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
@@ -88,6 +88,7 @@ class VectorFileLogger @Inject constructor(
         }
     }
 
+    @Suppress("EXPERIMENTAL_API_USAGE")
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         fileHandler ?: return
         GlobalScope.launch(Dispatchers.IO) {
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
index 095e250602..51dc62af8b 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
@@ -19,6 +19,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.EmojiChooserFragmentBinding
@@ -51,6 +52,8 @@ class EmojiChooserFragment @Inject constructor(
         }
     }
 
+    override fun getCoroutineScope() = lifecycleScope
+
     override fun firstVisibleSectionChange(section: Int) {
         viewModel.setCurrentSection(section)
     }
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt
index 92bc21be25..45d26e81eb 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt
@@ -31,8 +31,8 @@ import androidx.transition.AutoTransition
 import androidx.transition.TransitionManager
 import im.vector.app.R
 import im.vector.app.features.reactions.data.EmojiDataSource
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.math.abs
@@ -221,7 +221,7 @@ class EmojiRecyclerAdapter @Inject constructor(
     }
 
     override fun getItemCount() = dataSource.rawData.categories
-            .sumBy { emojiCategory -> 1 /* Section */ + emojiCategory.emojis.size }
+            .sumOf { emojiCategory -> 1 /* Section */ + emojiCategory.emojis.size }
 
     abstract class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         abstract fun bind(s: String?)
@@ -278,6 +278,7 @@ class EmojiRecyclerAdapter @Inject constructor(
     }
 
     interface InteractionListener {
+        fun getCoroutineScope(): CoroutineScope
         fun firstVisibleSectionChange(section: Int)
     }
 
@@ -323,11 +324,11 @@ class EmojiRecyclerAdapter @Inject constructor(
             // Log.i("SCROLL SPEED","scroll speed $dy")
             isFastScroll = abs(dy) > 50
             val visible = (recyclerView.layoutManager as GridLayoutManager).findFirstCompletelyVisibleItemPosition()
-            GlobalScope.launch {
+            interactionListener?.getCoroutineScope()?.launch {
                 val section = getSectionForAbsoluteIndex(visible)
                 if (section != currentFirstVisibleSection) {
                     currentFirstVisibleSection = section
-                    GlobalScope.launch(Dispatchers.Main) {
+                    interactionListener?.getCoroutineScope()?.launch(Dispatchers.Main) {
                         interactionListener?.firstVisibleSectionChange(currentFirstVisibleSection)
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 4eb05fb697..8c8d17dd46 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -236,10 +236,9 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted private val init
                         if (initialState.parentSpaceId != null) {
                             // add it as a child
                             try {
-                                val via = session.sessionParams.homeServerHost?.let { listOf(it) }.orEmpty()
                                 session.spaceService()
                                         .getSpace(initialState.parentSpaceId)
-                                        ?.addChildren(roomId, viaServers = via, order = null)
+                                        ?.addChildren(roomId, viaServers = null, order = null)
                             } catch (failure: Throwable) {
                                 Timber.w(failure, "Failed to add as a child")
                             }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
index 2a30545a47..800d7292d2 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
@@ -27,7 +27,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setTextSafe
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_room_alias_text_input)
@@ -62,8 +62,7 @@ abstract class RoomAliasEditItem : VectorEpoxyModel<RoomAliasEditItem.Holder>()
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.error = errorMessage
 
-        // Update only if text is different and value is not null
-        holder.textInputEditText.setTextSafe(value)
+        holder.setValueOnce(holder.textInputEditText, value)
         holder.textInputEditText.isEnabled = enabled
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
         holder.homeServerText.text = homeServer
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index 299c8ed6ec..b12a6d52eb 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -121,7 +121,7 @@ class RoomSettingsController @Inject constructor(
         buildProfileAction(
                 id = "joinRule",
                 title = stringProvider.getString(R.string.room_settings_room_access_title),
-                subtitle = data.getJoinRuleWording(),
+                subtitle = data.getJoinRuleWording(stringProvider),
                 dividerColor = dividerColor,
                 divider = false,
                 editable = data.actionPermissions.canChangeJoinRule,
@@ -142,24 +142,4 @@ class RoomSettingsController @Inject constructor(
             }
         }
     }
-
-    private fun RoomSettingsViewState.getJoinRuleWording(): String {
-        return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
-            RoomJoinRules.INVITE     -> {
-                stringProvider.getString(R.string.room_settings_room_access_private_title)
-            }
-            RoomJoinRules.PUBLIC     -> {
-                stringProvider.getString(R.string.room_settings_room_access_public_title)
-            }
-            RoomJoinRules.KNOCK      -> {
-                stringProvider.getString(R.string.room_settings_room_access_entry_knock)
-            }
-            RoomJoinRules.RESTRICTED -> {
-                stringProvider.getString(R.string.room_settings_room_access_restricted_title)
-            }
-            else                     -> {
-                stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
-            }
-        }
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index 99df27b8f1..9aa164271e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -60,7 +60,8 @@ class RoomSettingsFragment @Inject constructor(
         VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         RoomSettingsController.Callback,
         OnBackPressed,
-        GalleryOrCameraDialogHelper.Listener {
+        GalleryOrCameraDialogHelper.Listener,
+        RoomSettingsViewModel.Factory {
 
     private val viewModel: RoomSettingsViewModel by fragmentViewModel()
     private lateinit var roomProfileSharedActionViewModel: RoomProfileSharedActionViewModel
@@ -76,6 +77,10 @@ class RoomSettingsFragment @Inject constructor(
 
     override fun getMenuRes() = R.menu.vector_room_settings
 
+    override fun create(initialState: RoomSettingsViewState): RoomSettingsViewModel {
+        return viewModelFactory.create(initialState)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         roomProfileSharedActionViewModel = activityViewModelProvider.get(RoomProfileSharedActionViewModel::class.java)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index 7f75ded738..0a9c32e4c2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.roomprofile.settings
 
 import androidx.core.net.toFile
+import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
@@ -55,8 +56,11 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
 
         @JvmStatic
         override fun create(viewModelContext: ViewModelContext, state: RoomSettingsViewState): RoomSettingsViewModel? {
-            val fragment: RoomSettingsFragment = (viewModelContext as FragmentViewModelContext).fragment()
-            return fragment.viewModelFactory.create(state)
+            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")
         }
     }
 
@@ -123,7 +127,9 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                             canChangeJoinRule = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
                                     EventType.STATE_ROOM_JOIN_RULES)
                                     && powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
-                                    EventType.STATE_ROOM_GUEST_ACCESS)
+                                    EventType.STATE_ROOM_GUEST_ACCESS),
+                            canAddChildren = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
+                                    EventType.STATE_SPACE_CHILD)
                     )
                     setState { copy(actionPermissions = permissions) }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index 7403917d48..e220687878 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -20,6 +20,8 @@ import android.net.Uri
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
@@ -51,7 +53,8 @@ data class RoomSettingsViewState(
             val canChangeName: Boolean = false,
             val canChangeTopic: Boolean = false,
             val canChangeHistoryVisibility: Boolean = false,
-            val canChangeJoinRule: Boolean = false
+            val canChangeJoinRule: Boolean = false,
+            val canAddChildren: Boolean = false
     )
 
     sealed class AvatarAction {
@@ -67,4 +70,24 @@ data class RoomSettingsViewState(
     ) {
         fun hasChanged() = newJoinRules != null || newGuestAccess != null
     }
+
+    fun getJoinRuleWording(stringProvider: StringProvider): String {
+        return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
+            RoomJoinRules.INVITE -> {
+                stringProvider.getString(R.string.room_settings_room_access_private_title)
+            }
+            RoomJoinRules.PUBLIC -> {
+                stringProvider.getString(R.string.room_settings_room_access_public_title)
+            }
+            RoomJoinRules.KNOCK -> {
+                stringProvider.getString(R.string.room_settings_room_access_entry_knock)
+            }
+            RoomJoinRules.RESTRICTED -> {
+                stringProvider.getString(R.string.room_settings_room_access_restricted_title)
+            }
+            else                     -> {
+                stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
+            }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
index 3867485e6f..2141b6bf27 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.net.toUri
+import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -36,6 +37,7 @@ import im.vector.app.databinding.FragmentRoomUploadsBinding
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.roomprofile.RoomProfileArgs
+import kotlinx.coroutines.launch
 
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
@@ -76,13 +78,21 @@ class RoomUploadsFragment @Inject constructor(
                     shareMedia(requireContext(), it.file, getMimeTypeFromUri(requireContext(), it.file.toUri()))
                 }
                 is RoomUploadsViewEvents.FileReadyForSaving  -> {
-                    saveMedia(
-                            context = requireContext(),
-                            file = it.file,
-                            title = it.title,
-                            mediaMimeType = getMimeTypeFromUri(requireContext(), it.file.toUri()),
-                            notificationUtils = notificationUtils
-                    )
+                    lifecycleScope.launch {
+                        runCatching {
+                            saveMedia(
+                                    context = requireContext(),
+                                    file = it.file,
+                                    title = it.title,
+                                    mediaMimeType = getMimeTypeFromUri(requireContext(), it.file.toUri()),
+                                    notificationUtils = notificationUtils
+                            )
+                        }.onFailure { failure ->
+                            if (!isAdded) return@onFailure
+                            showErrorInSnackbar(failure)
+                        }
+                    }
+                    Unit
                 }
                 is RoomUploadsViewEvents.Failure             -> showFailure(it.throwable)
             }.exhaustive
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 cff4ca0cb9..f558ba28c6 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
@@ -181,7 +181,7 @@ object VectorLocale {
             }
         }
                 // sort by human display names
-                .sortedBy { localeToLocalisedString(it).toLowerCase(it) }
+                .sortedBy { localeToLocalisedString(it).lowercase(it) }
 
         supportedLocales.clear()
         supportedLocales.addAll(list)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index b44d44aba0..9fc496a914 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -151,6 +151,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
 
         const val SETTINGS_LABS_ALLOW_EXTENDED_LOGS = "SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
         const val SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE = "SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE"
+        const val SETTINGS_LABS_SPACES_HOME_AS_ORPHAN = "SETTINGS_LABS_SPACES_HOME_AS_ORPHAN"
 
         private const val SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         private const val SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY = "SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
@@ -956,6 +957,10 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE, false)
     }
 
+    fun labsSpacesOnlyOrphansInHome(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_SPACES_HOME_AS_ORPHAN, false)
+    }
+
     /*
      * Photo / video picker
      */
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 334464e304..adab8f8630 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
@@ -52,7 +52,6 @@ import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.workers.signout.SignOutUiWorker
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.failure.isInvalidPassword
@@ -224,7 +223,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
             it.summary = TextUtils.formatFileSize(requireContext(), size.toLong())
 
             it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                GlobalScope.launch(Dispatchers.Main) {
+                lifecycleScope.launch(Dispatchers.Main) {
                     // On UI Thread
                     displayLoadingView()
 
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 6a4ea83d68..ae6b24e4e4 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,6 +17,9 @@
 package im.vector.app.features.settings
 
 import im.vector.app.R
+import im.vector.app.core.preference.VectorSwitchPreference
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
 import javax.inject.Inject
 
 class VectorSettingsLabsFragment @Inject constructor(
@@ -27,6 +30,11 @@ class VectorSettingsLabsFragment @Inject constructor(
     override val preferenceXmlRes = R.xml.vector_settings_labs
 
     override fun bindPref() {
-        // Nothing to do
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_SPACES_HOME_AS_ORPHAN)!!.let { pref ->
+            pref.setOnPreferenceChangeListener { _, _ ->
+                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = false))
+                true
+            }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
index 9654eb2190..effb593add 100644
--- a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
@@ -24,6 +24,7 @@ import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.epoxy.profiles.profileSectionItem
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.safeCapitalize
 import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.settings.VectorPreferences
 import java.util.Locale
@@ -46,7 +47,7 @@ class LocalePickerController @Inject constructor(
         }
         localeItem {
             id(data.currentLocale.toString())
-            title(VectorLocale.localeToLocalisedString(data.currentLocale).capitalize(data.currentLocale))
+            title(VectorLocale.localeToLocalisedString(data.currentLocale).safeCapitalize(data.currentLocale))
             if (vectorPreferences.developerMode()) {
                 subtitle(VectorLocale.localeToLocalisedStringInfo(data.currentLocale))
             }
@@ -75,7 +76,7 @@ class LocalePickerController @Inject constructor(
                             .forEach {
                                 localeItem {
                                     id(it.toString())
-                                    title(VectorLocale.localeToLocalisedString(it).capitalize(it))
+                                    title(VectorLocale.localeToLocalisedString(it).safeCapitalize(it))
                                     if (vectorPreferences.developerMode()) {
                                         subtitle(VectorLocale.localeToLocalisedStringInfo(it))
                                     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
deleted file mode 100644
index 2f69ba89b9..0000000000
--- a/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2021 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.spaces
-
-import android.os.Bundle
-import android.os.Parcelable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentManager
-import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.di.ScreenComponent
-import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.app.core.utils.startSharePlainTextIntent
-import im.vector.app.databinding.BottomSheetSpaceInviteBinding
-import im.vector.app.features.invite.InviteUsersToRoomActivity
-import kotlinx.parcelize.Parcelize
-import javax.inject.Inject
-
-class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpaceInviteBinding>() {
-
-    @Parcelize
-    data class Args(
-            val spaceId: String
-    ) : Parcelable
-
-    override val showExpanded = true
-
-    @Inject
-    lateinit var activeSessionHolder: ActiveSessionHolder
-
-    override fun injectWith(injector: ScreenComponent) {
-        injector.inject(this)
-    }
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSpaceInviteBinding {
-        return BottomSheetSpaceInviteBinding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        // Not going for full view model for now, as it may change
-
-        val args: Args = arguments?.getParcelable(EXTRA_ARGS)
-                ?: return Unit.also { dismiss() }
-        val summary = activeSessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(args.spaceId)?.spaceSummary()
-
-        val spaceName = summary?.name
-        views.descriptionText.text = getString(R.string.invite_people_to_your_space_desc, spaceName)
-
-        // XXX enable back when supported
-        views.inviteByMailButton.isVisible = false
-        views.inviteByMailButton.debouncedClicks {
-        }
-
-        views.inviteByMxidButton.debouncedClicks {
-            val intent = InviteUsersToRoomActivity.getIntent(requireContext(), args.spaceId)
-            startActivity(intent)
-        }
-
-        views.inviteByLinkButton.debouncedClicks {
-            activeSessionHolder.getSafeActiveSession()?.permalinkService()?.createRoomPermalink(args.spaceId)?.let { permalink ->
-                startSharePlainTextIntent(
-                        fragment = this,
-                        activityResultLauncher = null,
-                        chooserTitle = getString(R.string.share_by_text),
-                        text = getString(R.string.share_space_link_message, spaceName, permalink),
-                        extraTitle = getString(R.string.share_space_link_message, spaceName, permalink)
-                )
-            }
-        }
-
-//        views.skipButton.debouncedClicks {
-//            dismiss()
-//        }
-    }
-
-    companion object {
-
-        const val EXTRA_ARGS = "EXTRA_ARGS"
-
-        fun show(fragmentManager: FragmentManager, spaceId: String): ShareSpaceBottomSheet {
-            return ShareSpaceBottomSheet().apply {
-                isCancelable = true
-                arguments = Bundle().apply {
-                    this.putParcelable(EXTRA_ARGS, ShareSpaceBottomSheet.Args(spaceId = spaceId))
-                }
-            }.also {
-                it.show(fragmentManager, ShareSpaceBottomSheet::class.java.name)
-            }
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
index 8014dfad3d..1fbaee4b22 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
@@ -16,13 +16,28 @@
 
 package im.vector.app.features.spaces
 
+import android.view.View
+import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.utils.DebouncedClickListener
 
 @EpoxyModelClass(layout = R.layout.item_space_beta_header)
 abstract class SpaceBetaHeaderItem : VectorEpoxyModel<SpaceBetaHeaderItem.Holder>() {
 
-    class Holder : VectorEpoxyHolder()
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var clickAction: View.OnClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.feedBackAction.setOnClickListener(DebouncedClickListener({
+            clickAction?.onClick(it)
+        }))
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val feedBackAction by bind<View>(R.id.spaceBetaFeedbackAction)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index e07896de50..dbe92d4d93 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -19,6 +19,8 @@ package im.vector.app.features.spaces
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
 import im.vector.app.R
@@ -26,6 +28,7 @@ import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.spaces.explore.SpaceDirectoryArgs
 import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
 import im.vector.app.features.spaces.explore.SpaceDirectoryState
@@ -33,7 +36,7 @@ import im.vector.app.features.spaces.explore.SpaceDirectoryViewEvents
 import im.vector.app.features.spaces.explore.SpaceDirectoryViewModel
 import javax.inject.Inject
 
-class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceDirectoryViewModel.Factory {
+class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceDirectoryViewModel.Factory, MatrixToBottomSheet.InteractionListener {
 
     @Inject lateinit var spaceDirectoryViewModelFactory: SpaceDirectoryViewModel.Factory
 
@@ -47,8 +50,25 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
 
     val sharedViewModel: SpaceDirectoryViewModel by viewModel()
 
+    private val fragmentLifecycleCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
+        override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
+            if (f is MatrixToBottomSheet) {
+                f.interactionListener = this@SpaceExploreActivity
+            }
+            super.onFragmentAttached(fm, f, context)
+        }
+
+        override fun onFragmentDetached(fm: FragmentManager, f: Fragment) {
+            if (f is MatrixToBottomSheet) {
+                f.interactionListener = null
+            }
+            super.onFragmentDetached(fm, f)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
 
         if (isFirstCreation()) {
             val simpleName = SpaceDirectoryFragment::class.java.simpleName
@@ -72,10 +92,18 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
                 is SpaceDirectoryViewEvents.NavigateToRoom -> {
                     navigator.openRoom(this, it.roomId)
                 }
+                is SpaceDirectoryViewEvents.NavigateToMxToBottomSheet -> {
+                    MatrixToBottomSheet.withLink(it.link, this).show(supportFragmentManager, "ShowChild")
+                }
             }
         }
     }
 
+    override fun onDestroy() {
+        supportFragmentManager.unregisterFragmentLifecycleCallbacks(fragmentLifecycleCallbacks)
+        super.onDestroy()
+    }
+
     companion object {
         fun newIntent(context: Context, spaceId: String): Intent {
             return Intent(context, SpaceExploreActivity::class.java).apply {
@@ -86,4 +114,8 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
 
     override fun create(initialState: SpaceDirectoryState): SpaceDirectoryViewModel =
             spaceDirectoryViewModelFactory.create(initialState)
+
+    override fun navigateToRoom(roomId: String) {
+        navigator.openRoom(this, roomId)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index f1627cc6b6..f50ba90221 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -101,4 +101,8 @@ class SpaceListFragment @Inject constructor(
     override fun onGroupSelected(groupSummary: GroupSummary?) {
         viewModel.handle(SpaceListAction.SelectLegacyGroup(groupSummary))
     }
+
+    override fun sendFeedBack() {
+        sharedActionViewModel.post(HomeActivitySharedAction.SendSpaceFeedBack)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index 5a1d80c240..491c14e415 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -33,13 +33,17 @@ import im.vector.app.databinding.BottomSheetSpaceSettingsBinding
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import im.vector.app.features.rageshake.BugReporter
+import im.vector.app.features.rageshake.ReportType
 import im.vector.app.features.roomprofile.RoomProfileActivity
+import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.spaces.manage.ManageType
 import im.vector.app.features.spaces.manage.SpaceManageActivity
 import io.reactivex.android.schedulers.AndroidSchedulers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.util.toMatrixItem
@@ -57,6 +61,7 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var avatarRenderer: AvatarRenderer
     @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var bugReporter: BugReporter
 
     private val spaceArgs: SpaceBottomSheetSettingsArgs by args()
 
@@ -94,10 +99,21 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
                     val powerLevelsHelper = PowerLevelsHelper(powerLevelContent)
                     val canInvite = powerLevelsHelper.isUserAbleToInvite(session.myUserId)
                     val canAddChild = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_SPACE_CHILD)
-                    views.invitePeople.isVisible = canInvite
+
+                    val canChangeAvatar = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_AVATAR)
+                    val canChangeName = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_NAME)
+                    val canChangeTopic = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_TOPIC)
+
+                    views.spaceSettings.isVisible = canChangeAvatar || canChangeName || canChangeTopic
+
+                    views.invitePeople.isVisible = canInvite || roomSummary?.isPublic.orFalse()
                     views.addRooms.isVisible = canAddChild
                 }.disposeOnDestroyView()
 
+        views.spaceBetaTag.setOnClickListener {
+            bugReporter.openBugReportScreen(requireActivity(), ReportType.SPACE_BETA_FEEDBACK)
+        }
+
         views.invitePeople.views.bottomSheetActionClickableZone.debouncedClicks {
             dismiss()
             interactionListener?.onShareSpaceSelected(spaceArgs.spaceId)
@@ -107,9 +123,9 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
             navigator.openRoomProfile(requireContext(), spaceArgs.spaceId, RoomProfileActivity.EXTRA_DIRECT_ACCESS_ROOM_MEMBERS)
         }
 
-        views.spaceSettings.isVisible = vectorPreferences.developerMode()
         views.spaceSettings.views.bottomSheetActionClickableZone.debouncedClicks {
-            navigator.openRoomProfile(requireContext(), spaceArgs.spaceId)
+//            navigator.openRoomProfile(requireContext(), spaceArgs.spaceId)
+            startActivity(SpaceManageActivity.newIntent(requireActivity(), spaceArgs.spaceId, ManageType.Settings))
         }
 
         views.exploreRooms.views.bottomSheetActionClickableZone.debouncedClicks {
@@ -118,14 +134,14 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
 
         views.addRooms.views.bottomSheetActionClickableZone.debouncedClicks {
             dismiss()
-            startActivity(SpaceManageActivity.newIntent(requireActivity(), spaceArgs.spaceId))
+            startActivity(SpaceManageActivity.newIntent(requireActivity(), spaceArgs.spaceId, ManageType.AddRooms))
         }
 
         views.leaveSpace.views.bottomSheetActionClickableZone.debouncedClicks {
             AlertDialog.Builder(requireContext())
                     .setMessage(getString(R.string.space_leave_prompt_msg))
                     .setPositiveButton(R.string.leave) { _, _ ->
-                        GlobalScope.launch {
+                        session.coroutineScope.launch {
                             try {
                                 session.getRoom(spaceArgs.spaceId)?.leave(null)
                             } catch (failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 4b78a999bb..8f48c3c2f1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -16,9 +16,11 @@
 
 package im.vector.app.features.spaces
 
+import android.view.View
 import com.airbnb.epoxy.EpoxyController
 import im.vector.app.R
 import im.vector.app.RoomGroupingMethod
+import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItemHeader
@@ -31,18 +33,21 @@ import im.vector.app.space
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
-import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class SpaceSummaryController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
+        private val colorProvider: ColorProvider,
         private val stringProvider: StringProvider) : EpoxyController() {
 
     var callback: Callback? = null
     private var viewState: SpaceListViewState? = null
 
+    private val subSpaceComparator: Comparator<SpaceChildInfo> = compareBy<SpaceChildInfo> { it.order }.thenBy { it.childRoomId }
+
     init {
         requestModelBuild()
     }
@@ -70,6 +75,7 @@ class SpaceSummaryController @Inject constructor(
             genericItemHeader {
                 id("legacy_groups")
                 text(stringProvider.getString(R.string.groups_header))
+                textColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
             }
 
             // add home for communities
@@ -102,13 +108,13 @@ class SpaceSummaryController @Inject constructor(
                                  rootSpaces: List<RoomSummary>?,
                                  expandedStates: Map<String, Boolean>,
                                  homeCount: RoomAggregateNotificationCount) {
-        genericItemHeader {
-            id("spaces")
-            text(stringProvider.getString(R.string.spaces_header))
+        spaceBetaHeaderItem {
+            id("beta_header")
+            clickAction(View.OnClickListener {
+                callback?.sendFeedBack()
+            })
         }
 
-        spaceBetaHeaderItem { id("beta_header") }
-
         // show invites on top
 
         summaries?.filter { it.membership == Membership.INVITE }
@@ -132,13 +138,13 @@ class SpaceSummaryController @Inject constructor(
         }
 
         rootSpaces
-                ?.sortedBy { it.displayName }
+                ?.sortedBy { it.roomId }
                 ?.forEach { groupSummary ->
                     val isSelected = selected is RoomGroupingMethod.BySpace && groupSummary.roomId == selected.space()?.roomId
                     // does it have children?
                     val subSpaces = groupSummary.spaceChildren?.filter { childInfo ->
                         summaries?.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
-                    }
+                    }?.sortedWith(subSpaceComparator)
                     val hasChildren = (subSpaces?.size ?: 0) > 0
                     val expanded = expandedStates[groupSummary.roomId] == true
 
@@ -163,24 +169,7 @@ class SpaceSummaryController @Inject constructor(
                     if (hasChildren && expanded) {
                         // it's expanded
                         subSpaces?.forEach { child ->
-                            summaries?.firstOrNull { it.roomId == child.childRoomId }?.let { childSum ->
-                                val isChildSelected = selected is RoomGroupingMethod.BySpace && childSum.roomId == selected.space()?.roomId
-                                spaceSummaryItem {
-                                    avatarRenderer(avatarRenderer)
-                                    id(child.childRoomId)
-                                    hasChildren(false)
-                                    selected(isChildSelected)
-                                    matrixItem(MatrixItem.RoomItem(child.childRoomId, child.name, child.avatarUrl))
-                                    listener { callback?.onSpaceSelected(childSum) }
-                                    indent(1)
-                                    countState(
-                                            UnreadCounterBadgeView.State(
-                                                    groupSummary.notificationCount,
-                                                    groupSummary.highlightCount > 0
-                                            )
-                                    )
-                                }
-                            }
+                            buildSubSpace(summaries, expandedStates, selected, child, 1, 3)
                         }
                     }
                 }
@@ -191,13 +180,52 @@ class SpaceSummaryController @Inject constructor(
         }
     }
 
+    private fun buildSubSpace(summaries: List<RoomSummary>?,
+                              expandedStates: Map<String, Boolean>,
+                              selected: RoomGroupingMethod,
+                              info: SpaceChildInfo, currentDepth: Int, maxDepth: Int) {
+        if (currentDepth >= maxDepth) return
+        val childSummary = summaries?.firstOrNull { it.roomId == info.childRoomId } ?: return
+        // does it have children?
+        val subSpaces = childSummary.spaceChildren?.filter { childInfo ->
+            summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
+        }?.sortedWith(subSpaceComparator)
+        val expanded = expandedStates[childSummary.roomId] == true
+        val isSelected = selected is RoomGroupingMethod.BySpace && childSummary.roomId == selected.space()?.roomId
+
+        subSpaceSummaryItem {
+            avatarRenderer(avatarRenderer)
+            id(childSummary.roomId)
+            hasChildren(!subSpaces.isNullOrEmpty())
+            selected(isSelected)
+            expanded(expanded)
+            onMore { callback?.onSpaceSettings(childSummary) }
+            matrixItem(childSummary.toMatrixItem())
+            listener { callback?.onSpaceSelected(childSummary) }
+            toggleExpand { callback?.onToggleExpand(childSummary) }
+            indent(currentDepth)
+            countState(
+                    UnreadCounterBadgeView.State(
+                            childSummary.notificationCount,
+                            childSummary.highlightCount > 0
+                    )
+            )
+        }
+
+        if (expanded) {
+            subSpaces?.forEach {
+                buildSubSpace(summaries, expandedStates, selected, it, currentDepth + 1, maxDepth)
+            }
+        }
+    }
+
     interface Callback {
         fun onSpaceSelected(spaceSummary: RoomSummary?)
         fun onSpaceInviteSelected(spaceSummary: RoomSummary)
         fun onSpaceSettings(spaceSummary: RoomSummary)
         fun onToggleExpand(spaceSummary: RoomSummary)
         fun onAddSpaceSelected()
-
         fun onGroupSelected(groupSummary: GroupSummary?)
+        fun sendFeedBack()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 013f7d6db5..c029f4b25e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.spaces
 
+import android.view.View
 import android.widget.ImageView
 import android.widget.Space
 import android.widget.TextView
@@ -37,17 +38,18 @@ import org.matrix.android.sdk.api.util.MatrixItem
 @EpoxyModelClass(layout = R.layout.item_space)
 abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
 
-    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute lateinit var matrixItem: MatrixItem
     @EpoxyAttribute var selected: Boolean = false
-    @EpoxyAttribute var listener: (() -> Unit)? = null
-    @EpoxyAttribute var onMore: (() -> Unit)? = null
-    @EpoxyAttribute var toggleExpand: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onMore: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var toggleExpand: (() -> Unit)? = null
     @EpoxyAttribute var expanded: Boolean = false
     @EpoxyAttribute var hasChildren: Boolean = false
     @EpoxyAttribute var indent: Int = 0
     @EpoxyAttribute var countState : UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
     @EpoxyAttribute var description: String? = null
+    @EpoxyAttribute var showSeparator: Boolean = false
 
     override fun bind(holder: Holder) {
         super.bind(holder)
@@ -83,6 +85,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         }
 
         holder.indentSpace.isVisible = indent > 0
+        holder.separator.isVisible = showSeparator
 
         avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
         holder.counterBadgeView.render(countState)
@@ -102,5 +105,6 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         val collapseIndicator by bind<ImageView>(R.id.groupChildrenCollapse)
         val indentSpace by bind<Space>(R.id.indent)
         val counterBadgeView by bind<UnreadCounterBadgeView>(R.id.groupCounterBadge)
+        val separator by bind<View>(R.id.groupBottomSeparator)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 9b2cffc59c..d7d7af4ca5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -28,8 +28,7 @@ import dagger.assisted.AssistedInject
 import im.vector.app.AppStateHandler
 import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.ui.UiStateRepository
+import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.group
 import im.vector.app.space
 import io.reactivex.Observable
@@ -45,6 +44,7 @@ import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.rx.asObservable
@@ -54,8 +54,7 @@ import java.util.concurrent.TimeUnit
 class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
                                                       private val appStateHandler: AppStateHandler,
                                                       private val session: Session,
-                                                      private val stringProvider: StringProvider,
-                                                      private val uiStateRepository: UiStateRepository
+                                                      private val vectorPreferences: VectorPreferences
 ) : VectorViewModel<SpaceListViewState, SpaceListAction, SpaceListViewEvents>(initialState) {
 
     @AssistedFactory
@@ -108,21 +107,34 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                     }
                 }.disposeOnClear()
 
+        // XXX there should be a way to refactor this and share it
         session.getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
-                    this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+                    this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
+                        vectorPreferences.labsSpacesOnlyOrphansInHome()
+                    } ?: ActiveSpaceFilter.None
                 }, sortOrder = RoomSortOrder.NONE
         ).asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
                 .observeOn(Schedulers.computation())
                 .subscribe {
-                    val counts = session.getNotificationCountForRooms(
+                    val inviteCount = session.getRoomSummaries(
+                            roomSummaryQueryParams { this.memberships = listOf(Membership.INVITE) }
+                    ).size
+
+                    val totalCount = session.getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
-                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
+                                    vectorPreferences.labsSpacesOnlyOrphansInHome()
+                                } ?: ActiveSpaceFilter.None
                             }
                     )
+                    val counts = RoomAggregateNotificationCount(
+                            totalCount.notificationCount + inviteCount,
+                            totalCount.highlightCount + inviteCount
+                    )
                     setState {
                         copy(
                                 homeAggregateCount = counts
@@ -217,7 +229,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                         .rx()
                         .liveUser(session.myUserId)
                         .map {
-                             it.getOrNull()
+                            it.getOrNull()
                         },
                 session
                         .rx()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
new file mode 100644
index 0000000000..db58353e5c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import android.widget.ImageView
+import android.widget.Space
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_sub_space)
+abstract class SubSpaceSummaryItem : VectorEpoxyModel<SubSpaceSummaryItem.Holder>() {
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute var selected: Boolean = false
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onMore: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var toggleExpand: (() -> Unit)? = null
+    @EpoxyAttribute var expanded: Boolean = false
+    @EpoxyAttribute var hasChildren: Boolean = false
+    @EpoxyAttribute var indent: Int = 0
+    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.rootView.setOnClickListener { listener?.invoke() }
+        holder.groupNameView.text = matrixItem.displayName
+        holder.rootView.isChecked = selected
+        if (onMore != null) {
+            holder.moreView.isVisible = true
+            holder.moreView.setOnClickListener(
+                    DebouncedClickListener({ _ ->
+                        onMore?.invoke()
+                    })
+            )
+        } else {
+            holder.moreView.isVisible = false
+        }
+
+        holder.collapseIndicator.setImageDrawable(
+                ContextCompat.getDrawable(holder.view.context,
+                        if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more
+                )
+        )
+        holder.collapseIndicator.setOnClickListener(
+                DebouncedClickListener({ _ ->
+                    toggleExpand?.invoke()
+                })
+        )
+
+        holder.collapseIndicator.isVisible = hasChildren
+
+        holder.indentSpace.isVisible = indent > 0
+        holder.indentSpace.updateLayoutParams {
+            width = indent * 30
+        }
+
+        avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
+        holder.counterBadgeView.render(countState)
+    }
+
+    override fun unbind(holder: Holder) {
+        avatarRenderer.clear(holder.avatarImageView)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.groupAvatarImageView)
+        val groupNameView by bind<TextView>(R.id.groupNameView)
+        val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
+        val moreView by bind<ImageView>(R.id.groupTmpLeave)
+        val collapseIndicator by bind<ImageView>(R.id.groupChildrenCollapse)
+        val indentSpace by bind<Space>(R.id.indent)
+        val counterBadgeView by bind<UnreadCounterBadgeView>(R.id.groupCounterBadge)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 44d98766d5..28d410529e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -18,13 +18,21 @@ package im.vector.app.features.spaces.explore
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
 import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericPillItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.list.spaceChildInfoItem
+import me.gujun.android.span.span
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError.Companion.M_UNRECOGNIZED
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.util.MatrixItem
@@ -32,12 +40,16 @@ import javax.inject.Inject
 
 class SpaceDirectoryController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
-        private val stringProvider: StringProvider
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider,
+        private val errorFormatter: ErrorFormatter
 ) : TypedEpoxyController<SpaceDirectoryState>() {
 
     interface InteractionListener {
         fun onButtonClick(spaceChildInfo: SpaceChildInfo)
         fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo)
+        fun onRoomClick(spaceChildInfo: SpaceChildInfo)
+        fun retry()
     }
 
     var listener: InteractionListener? = null
@@ -49,6 +61,33 @@ class SpaceDirectoryController @Inject constructor(
             loadingItem {
                 id("loading")
             }
+        } else if (results is Fail) {
+            val failure = results.error
+            if (failure is Failure.ServerError && failure.error.code == M_UNRECOGNIZED) {
+                genericPillItem {
+                    id("HS no Support")
+                    imageRes(R.drawable.error)
+                    tintIcon(false)
+                    text(
+                            span {
+                                span(stringProvider.getString(R.string.spaces_no_server_support_title)) {
+                                    textStyle = "bold"
+                                    textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_primary)
+                                }
+                                +"\n\n"
+                                span(stringProvider.getString(R.string.spaces_no_server_support_description)) {
+                                    textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+                                }
+                            }
+                    )
+                }
+            } else {
+                errorWithRetryItem {
+                    id("api_err")
+                    text(errorFormatter.toHumanReadable(failure))
+                    listener { listener?.retry() }
+                }
+            }
         } else {
             val flattenChildInfo = results?.invoke()
                     ?.filter {
@@ -81,6 +120,8 @@ class SpaceDirectoryController @Inject constructor(
                         apply {
                             if (isSpace) {
                                 itemClickListener(View.OnClickListener { listener?.onSpaceChildClick(info) })
+                            } else {
+                                itemClickListener(View.OnClickListener { listener?.onRoomClick(info) })
                             }
                         }
                         buttonClickListener(View.OnClickListener { listener?.onButtonClick(info) })
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index 567012675e..fa44f4595e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -23,13 +23,13 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import javax.inject.Inject
 
@@ -68,8 +68,13 @@ class SpaceDirectoryFragment @Inject constructor(
         super.onDestroyView()
     }
 
-    override fun invalidate() = withState(viewModel) {
-        epoxyController.setData(it)
+    override fun invalidate() = withState(viewModel) { state ->
+        epoxyController.setData(state)
+
+        val title = state.hierarchyStack.lastOrNull()?.let { currentParent ->
+            state.spaceSummaryApiResult.invoke()?.firstOrNull { it.childRoomId == currentParent }
+        }?.name ?: getString(R.string.space_explore_activity_title)
+        views.toolbar.title = title
     }
 
     override fun onButtonClick(spaceChildInfo: SpaceChildInfo) {
@@ -77,13 +82,22 @@ class SpaceDirectoryFragment @Inject constructor(
     }
 
     override fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo) {
-        if (spaceChildInfo.roomType == RoomType.SPACE) {
-            viewModel.handle(SpaceDirectoryViewAction.ExploreSubSpace(spaceChildInfo))
-        }
+        viewModel.handle(SpaceDirectoryViewAction.ExploreSubSpace(spaceChildInfo))
+    }
+
+    override fun onRoomClick(spaceChildInfo: SpaceChildInfo) {
+        viewModel.handle(SpaceDirectoryViewAction.ShowDetails(spaceChildInfo))
     }
 
     override fun onBackPressed(toolbarButton: Boolean): Boolean {
         viewModel.handle(SpaceDirectoryViewAction.HandleBack)
         return true
     }
+
+    override fun retry() {
+        viewModel.handle(SpaceDirectoryViewAction.Retry)
+    }
+//    override fun navigateToRoom(roomId: String) {
+//        viewModel.handle(SpaceDirectoryViewAction.NavigateToRoom(roomId))
+//    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
index a74662759e..83cdf2916d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
@@ -22,5 +22,8 @@ import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 sealed class SpaceDirectoryViewAction : VectorViewModelAction {
     data class ExploreSubSpace(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
     data class JoinOrOpen(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
+    data class ShowDetails(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
+    data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewAction()
     object HandleBack : SpaceDirectoryViewAction()
+    object Retry : SpaceDirectoryViewAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt
index ef6f5385d3..3ac0426de9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt
@@ -21,4 +21,5 @@ import im.vector.app.core.platform.VectorViewEvents
 sealed class SpaceDirectoryViewEvents : VectorViewEvents {
     object Dismiss : SpaceDirectoryViewEvents()
     data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewEvents()
+    data class NavigateToMxToBottomSheet(val link: String) : SpaceDirectoryViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index fbe405e641..0c23752936 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -39,7 +39,7 @@ import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
 class SpaceDirectoryViewModel @AssistedInject constructor(
-        @Assisted initialState: SpaceDirectoryState,
+        @Assisted val initialState: SpaceDirectoryState,
         private val session: Session
 ) : VectorViewModel<SpaceDirectoryState, SpaceDirectoryViewAction, SpaceDirectoryViewEvents>(initialState) {
 
@@ -63,11 +63,21 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
         val spaceSum = session.getRoomSummary(initialState.spaceId)
         setState {
             copy(
-                    childList = spaceSum?.spaceChildren ?: emptyList(),
-                    spaceSummaryApiResult = Loading()
+                    childList = spaceSum?.spaceChildren ?: emptyList()
             )
         }
 
+        refreshFromApi()
+        observeJoinedRooms()
+        observeMembershipChanges()
+    }
+
+    private fun refreshFromApi() {
+        setState {
+            copy(
+                    spaceSummaryApiResult = Loading()
+            )
+        }
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 val query = session.spaceService().querySpaceChildren(initialState.spaceId)
@@ -84,13 +94,12 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
                 }
             }
         }
-        observeJoinedRooms()
-        observeMembershipChanges()
     }
 
     private fun observeJoinedRooms() {
         val queryParams = roomSummaryQueryParams {
             memberships = listOf(Membership.JOIN)
+            excludeType = null
         }
         session
                 .rx()
@@ -135,6 +144,19 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
             is SpaceDirectoryViewAction.JoinOrOpen -> {
                 handleJoinOrOpen(action.spaceChildInfo)
             }
+            is SpaceDirectoryViewAction.NavigateToRoom -> {
+                _viewEvents.post(SpaceDirectoryViewEvents.NavigateToRoom(action.roomId))
+            }
+            is SpaceDirectoryViewAction.ShowDetails -> {
+                // This is temporary for now to at least display something for the space beta
+                // It's not ideal as it's doing some peeking that is not needed.
+                session.permalinkService().createRoomPermalink(action.spaceChildInfo.childRoomId)?.let {
+                    _viewEvents.post(SpaceDirectoryViewEvents.NavigateToMxToBottomSheet(it))
+                }
+            }
+            SpaceDirectoryViewAction.Retry -> {
+                refreshFromApi()
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
index 46ca2a6606..dffb09529b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
@@ -19,6 +19,8 @@ package im.vector.app.features.spaces.manage
 import androidx.recyclerview.widget.DiffUtil
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.paging.PagedListEpoxyController
+import im.vector.app.R
+import im.vector.app.core.ui.list.GenericPillItem_
 import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.core.utils.createUIHandler
 import im.vector.app.features.home.AvatarRenderer
@@ -56,6 +58,8 @@ class AddRoomListController @Inject constructor(
     var listener: Listener? = null
     var ignoreRooms: List<String>? = null
 
+    var subHeaderText: CharSequence? = null
+
     var initialLoadOccurred = false
 
     fun boundaryChange(boundary: ResultBoundaries) {
@@ -100,6 +104,15 @@ class AddRoomListController @Inject constructor(
                         expanded(true)
                     }
             )
+            if (subHeaderText != null) {
+                add(
+                        GenericPillItem_().apply {
+                            id("sub_header")
+                            text(subHeaderText)
+                            imageRes(R.drawable.ic_info)
+                        }
+                )
+            }
         }
         super.addModels(filteredModel)
         if (!initialLoadOccurred) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/RoomManageSelectionItem.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/RoomManageSelectionItem.kt
new file mode 100644
index 0000000000..9d188ac457
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/RoomManageSelectionItem.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.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_room_to_manage_in_space)
+abstract class RoomManageSelectionItem : VectorEpoxyModel<RoomManageSelectionItem.Holder>() {
+
+    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute var space: Boolean = false
+    @EpoxyAttribute var selected: Boolean = false
+    @EpoxyAttribute var suggested: Boolean = false
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemClickListener: View.OnClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        if (space) {
+            avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
+        } else {
+            avatarRenderer.render(matrixItem, holder.avatarImageView)
+        }
+        holder.titleText.text = matrixItem.getBestName()
+
+        if (selected) {
+            holder.checkboxImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_checkbox_on))
+            holder.checkboxImage.contentDescription = holder.view.context.getString(R.string.a11y_checked)
+        } else {
+            holder.checkboxImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_checkbox_off))
+            holder.checkboxImage.contentDescription = holder.view.context.getString(R.string.a11y_unchecked)
+        }
+
+        holder.suggestedText.isVisible = suggested
+
+        holder.view.setOnClickListener {
+            itemClickListener?.onClick(it)
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.itemAddRoomRoomAvatar)
+        val titleText by bind<TextView>(R.id.itemAddRoomRoomNameText)
+        val suggestedText by bind<TextView>(R.id.itemManageRoomSuggested)
+        val checkboxImage by bind<ImageView>(R.id.itemAddRoomRoomCheckBox)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
index 9a25e79f85..203098d32b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
@@ -16,9 +16,6 @@
 
 package im.vector.app.features.spaces.manage
 
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
@@ -26,12 +23,8 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.ConcatAdapter
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.airbnb.epoxy.EpoxyViewHolder
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
@@ -41,7 +34,6 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSpaceAddRoomsBinding
-import im.vector.app.features.home.room.list.RoomCategoryItem_
 import io.reactivex.rxkotlin.subscribeBy
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import java.util.concurrent.TimeUnit
@@ -88,6 +80,7 @@ class SpaceAddRoomFragment @Inject constructor(
                 }
                 .disposeOnDestroyView()
 
+        spaceEpoxyController.subHeaderText = getString(R.string.spaces_feeling_experimental_subspace)
         viewModel.selectionListLiveData.observe(viewLifecycleOwner) {
             spaceEpoxyController.selectedItems = it
             roomEpoxyController.selectedItems = it
@@ -183,36 +176,6 @@ class SpaceAddRoomFragment @Inject constructor(
         }
 
         views.roomList.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-        views.roomList.addItemDecoration(
-
-                object : DividerItemDecoration(context, VERTICAL) {
-                    val decorationDrawable = ContextCompat.getDrawable(requireContext(), R.drawable.divider_horizontal)
-
-                    override fun getDrawable(): Drawable? {
-                        return decorationDrawable
-                    }
-
-                    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
-                        val position = parent.getChildAdapterPosition(view)
-                        val vh = parent.findViewHolderForAdapterPosition(position)
-                        val nextIsSectionOrFinal = parent.findViewHolderForAdapterPosition(position + 1)?.let {
-                            (it as? EpoxyViewHolder)?.model is RoomCategoryItem_
-                        } ?: true
-                        if (vh == null
-                                || (vh as? EpoxyViewHolder)?.model is RoomCategoryItem_
-                                || nextIsSectionOrFinal
-                        ) {
-                            outRect.setEmpty()
-                        } else {
-                            super.getItemOffsets(outRect, view, parent, state)
-                        }
-                    }
-
-                    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-                        super.onDraw(c, parent, state)
-                    }
-                }
-        )
         views.roomList.setHasFixedSize(true)
 
         concatAdapter.addAdapter(roomEpoxyController.adapter)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index f64a4c897b..55e65eb171 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -54,6 +54,11 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
         private val session: Session
 ) : VectorViewModel<SpaceAddRoomsState, SpaceAddRoomActions, SpaceAddRoomsViewEvents>(initialState) {
 
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: SpaceAddRoomsState): SpaceAddRoomsViewModel
+    }
+
     val updatableLiveSpacePageResult: UpdatableLivePageResult by lazy {
         session.getFilteredPagedRoomSummariesLive(
                 roomSummaryQueryParams {
@@ -106,11 +111,6 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
         }
     }
 
-    @AssistedFactory
-    interface Factory {
-        fun create(initialState: SpaceAddRoomsState): SpaceAddRoomsViewModel
-    }
-
     companion object : MvRxViewModelFactory<SpaceAddRoomsViewModel, SpaceAddRoomsState> {
         override fun create(viewModelContext: ViewModelContext, state: SpaceAddRoomsState): SpaceAddRoomsViewModel? {
             val factory = when (viewModelContext) {
@@ -174,7 +174,7 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
                 try {
                     session.spaceService().getSpace(initialState.spaceId)!!.addChildren(
                             roomId = roomId,
-                            viaServers = listOf(session.sessionParams.homeServerHost ?: ""),
+                            viaServers = null,
                             order = null
                     )
                     completed.add(roomId)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceChildInfoMatchFilter.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceChildInfoMatchFilter.kt
new file mode 100644
index 0000000000..17f5d13e19
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceChildInfoMatchFilter.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import io.reactivex.functions.Predicate
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+
+class SpaceChildInfoMatchFilter : Predicate<SpaceChildInfo> {
+    var filter: String = ""
+
+    override fun test(spaceChildInfo: SpaceChildInfo): Boolean {
+        if (filter.isEmpty()) {
+            // No filter
+            return true
+        }
+        // if filter is "Jo Do", it should match "John Doe"
+        return filter.split(" ").all {
+            spaceChildInfo.name?.contains(it, ignoreCase = true).orFalse()
+                    || spaceChildInfo.topic?.contains(it, ignoreCase = true).orFalse()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
index 47c8982643..a4585df474 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
@@ -20,28 +20,37 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
+import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.platform.ToolbarConfigurable
 import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.app.databinding.ActivitySimpleLoadingBinding
 import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
 import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
 import im.vector.app.features.roomdirectory.createroom.CreateRoomArgs
 import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
 
 @Parcelize
 data class SpaceManageArgs(
-        val spaceId: String
+        val spaceId: String,
+        val manageType: ManageType
 ) : Parcelable
 
-class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceManageSharedViewModel.Factory {
+class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
+        ToolbarConfigurable,
+        SpaceManageSharedViewModel.Factory {
 
     @Inject lateinit var sharedViewModelFactory: SpaceManageSharedViewModel.Factory
     private lateinit var sharedDirectoryActionViewModel: RoomDirectorySharedActionViewModel
@@ -50,12 +59,26 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
         injector.inject(this)
     }
 
-    override fun getBinding(): ActivitySimpleBinding = ActivitySimpleBinding.inflate(layoutInflater)
+    override fun getBinding(): ActivitySimpleLoadingBinding = ActivitySimpleLoadingBinding.inflate(layoutInflater)
 
     override fun getTitleRes(): Int = R.string.space_add_existing_rooms
 
     val sharedViewModel: SpaceManageSharedViewModel by viewModel()
 
+    override fun showWaitingView(text: String?) {
+        hideKeyboard()
+        views.waitingView.waitingStatusText.isGone = views.waitingView.waitingStatusText.text.isNullOrBlank()
+        super.showWaitingView(text)
+    }
+
+    override fun hideWaitingView() {
+        views.waitingView.waitingStatusText.text = null
+        views.waitingView.waitingStatusText.isGone = true
+        views.waitingView.waitingHorizontalProgress.progress = 0
+        views.waitingView.waitingHorizontalProgress.isVisible = false
+        super.hideWaitingView()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -72,14 +95,35 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
 
         val args = intent?.getParcelableExtra<SpaceManageArgs>(MvRx.KEY_ARG)
         if (isFirstCreation()) {
-            val simpleName = SpaceAddRoomFragment::class.java.simpleName
-            if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
-                supportFragmentManager.commitTransaction {
-                    replace(R.id.simpleFragmentContainer,
-                            SpaceAddRoomFragment::class.java,
-                            Bundle().apply { this.putParcelable(MvRx.KEY_ARG, args) },
-                            simpleName
-                    )
+            withState(sharedViewModel) {
+                when (it.manageType) {
+                    ManageType.AddRooms -> {
+                        val simpleName = SpaceAddRoomFragment::class.java.simpleName
+                        if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
+                            supportFragmentManager.commitTransaction {
+                                replace(R.id.simpleFragmentContainer,
+                                        SpaceAddRoomFragment::class.java,
+                                        Bundle().apply { this.putParcelable(MvRx.KEY_ARG, args) },
+                                        simpleName
+                                )
+                            }
+                        }
+                    }
+                    ManageType.Settings -> {
+                        val simpleName = SpaceSettingsFragment::class.java.simpleName
+                        if (supportFragmentManager.findFragmentByTag(simpleName) == null && args?.spaceId != null) {
+                            supportFragmentManager.commitTransaction {
+                                replace(R.id.simpleFragmentContainer,
+                                        SpaceSettingsFragment::class.java,
+                                        Bundle().apply { this.putParcelable(MvRx.KEY_ARG, RoomProfileArgs(args.spaceId)) },
+                                        simpleName
+                                )
+                            }
+                        }
+                    }
+                    ManageType.ManageRooms -> {
+                        // no direct access for now
+                    }
                 }
             }
         }
@@ -90,10 +134,10 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
                     finish()
                 }
                 SpaceManagedSharedViewEvents.HideLoading -> {
-                    views.simpleActivityWaitingView.isVisible = false
+                    hideWaitingView()
                 }
                 SpaceManagedSharedViewEvents.ShowLoading -> {
-                    views.simpleActivityWaitingView.isVisible = true
+                    showWaitingView()
                 }
                 SpaceManagedSharedViewEvents.NavigateToCreateRoom -> {
                     addFragmentToBackstack(
@@ -102,17 +146,30 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
                             CreateRoomArgs("", parentSpaceId = args?.spaceId)
                     )
                 }
+                SpaceManagedSharedViewEvents.NavigateToManageRooms -> {
+                    args?.spaceId?.let { spaceId ->
+                        addFragmentToBackstack(
+                                R.id.simpleFragmentContainer,
+                                SpaceManageRoomsFragment::class.java,
+                                SpaceManageArgs(spaceId, ManageType.ManageRooms)
+                        )
+                    }
+                }
             }
         }
     }
 
     companion object {
-        fun newIntent(context: Context, spaceId: String): Intent {
+        fun newIntent(context: Context, spaceId: String, manageType: ManageType): Intent {
             return Intent(context, SpaceManageActivity::class.java).apply {
-                putExtra(MvRx.KEY_ARG, SpaceManageArgs(spaceId))
+                putExtra(MvRx.KEY_ARG, SpaceManageArgs(spaceId, manageType))
             }
         }
     }
 
     override fun create(initialState: SpaceManageViewState) = sharedViewModelFactory.create(initialState)
+
+    override fun configure(toolbar: Toolbar) {
+        configureToolbar(toolbar)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt
new file mode 100644
index 0000000000..c232377aba
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class SpaceManageRoomViewAction : VectorViewModelAction {
+    data class ToggleSelection(val roomId: String) : SpaceManageRoomViewAction()
+    data class UpdateFilter(val filter: String) : SpaceManageRoomViewAction()
+    object ClearSelection : SpaceManageRoomViewAction()
+    data class MarkAllAsSuggested(val suggested: Boolean) : SpaceManageRoomViewAction()
+    object BulkRemove : SpaceManageRoomViewAction()
+    object RefreshFromServer : SpaceManageRoomViewAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
new file mode 100644
index 0000000000..8ba7398a2f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SpaceManageRoomViewEvents : VectorViewEvents {
+//    object BulkActionSuccess: SpaceManageRoomViewEvents()
+    data class BulkActionFailure(val errorList: List<Throwable>) : SpaceManageRoomViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt
new file mode 100644
index 0000000000..7bae216b10
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+
+data class SpaceManageRoomViewState(
+        val spaceId: String,
+        val spaceSummary: Async<RoomSummary> = Uninitialized,
+        val childrenInfo: Async<List<SpaceChildInfo>> = Uninitialized,
+        val selectedRooms: List<String> = emptyList(),
+        val currentFilter: String = "",
+        val actionState: Async<Unit> = Uninitialized
+) : MvRxState {
+    constructor(args: SpaceManageArgs) : this(
+            spaceId = args.spaceId
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
new file mode 100644
index 0000000000..a94a2d9242
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Incomplete
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class SpaceManageRoomsController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val errorFormatter: ErrorFormatter
+) : TypedEpoxyController<SpaceManageRoomViewState>() {
+
+    interface Listener {
+        fun toggleSelection(childInfo: SpaceChildInfo)
+        fun retry()
+    }
+
+    var listener: Listener? = null
+    private val matchFilter = SpaceChildInfoMatchFilter()
+
+    override fun buildModels(data: SpaceManageRoomViewState?) {
+        val roomListAsync = data?.childrenInfo
+        if (roomListAsync is Incomplete) {
+            loadingItem { id("loading") }
+            return
+        }
+        if (roomListAsync is Fail) {
+            errorWithRetryItem {
+                id("Api Error")
+                text(errorFormatter.toHumanReadable(roomListAsync.error))
+                listener { listener?.retry() }
+            }
+            return
+        }
+
+        val roomList = roomListAsync?.invoke() ?: return
+
+        val directChildren = roomList.filter {
+            it.parentRoomId == data.spaceId
+            /** Only direct children **/
+        }
+        matchFilter.filter = data.currentFilter
+        val filteredResult = directChildren.filter { matchFilter.test(it) }
+
+        filteredResult.forEach { childInfo ->
+            roomManageSelectionItem {
+                id(childInfo.childRoomId)
+                matrixItem(childInfo.toMatrixItem())
+                avatarRenderer(avatarRenderer)
+                suggested(childInfo.suggested ?: false)
+                space(childInfo.roomType == RoomType.SPACE)
+                selected(data.selectedRooms.contains(childInfo.childRoomId))
+                itemClickListener(DebouncedClickListener({
+                    listener?.toggleSelection(childInfo)
+                }))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
new file mode 100644
index 0000000000..b918af0b68
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.view.ActionMode
+import androidx.appcompat.view.ActionMode.Callback
+import androidx.core.view.isVisible
+import androidx.transition.TransitionManager
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import com.jakewharton.rxbinding3.appcompat.queryTextChanges
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.toast
+import im.vector.app.databinding.FragmentSpaceAddRoomsBinding
+import io.reactivex.rxkotlin.subscribeBy
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class SpaceManageRoomsFragment @Inject constructor(
+        private val viewModelFactory: SpaceManageRoomsViewModel.Factory,
+        private val epoxyController: SpaceManageRoomsController
+) : VectorBaseFragment<FragmentSpaceAddRoomsBinding>(),
+        SpaceManageRoomsViewModel.Factory,
+        OnBackPressed,
+        SpaceManageRoomsController.Listener,
+        Callback {
+
+    private val viewModel by fragmentViewModel(SpaceManageRoomsViewModel::class)
+    private val sharedViewModel: SpaceManageSharedViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) = FragmentSpaceAddRoomsBinding.inflate(inflater)
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        parentFragmentManager.popBackStack()
+        return true
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar(views.addRoomToSpaceToolbar)
+        views.appBarTitle.text = getString(R.string.space_manage_rooms_and_spaces)
+        views.createNewRoom.isVisible = false
+        epoxyController.listener = this
+        views.roomList.configureWith(epoxyController, hasFixedSize = true, showDivider = true)
+
+        views.publicRoomsFilter.queryTextChanges()
+                .debounce(200, TimeUnit.MILLISECONDS)
+                .subscribeBy {
+                    viewModel.handle(SpaceManageRoomViewAction.UpdateFilter(it.toString()))
+                }
+                .disposeOnDestroyView()
+
+        viewModel.selectSubscribe(SpaceManageRoomViewState::actionState) { actionState ->
+            when (actionState) {
+                is Loading -> {
+                    sharedViewModel.handle(SpaceManagedSharedAction.ShowLoading)
+                }
+                else       -> {
+                    sharedViewModel.handle(SpaceManagedSharedAction.HideLoading)
+                }
+            }
+        }
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is SpaceManageRoomViewEvents.BulkActionFailure -> {
+                    vectorBaseActivity.toast(errorFormatter.toHumanReadable(it.errorList.firstOrNull()))
+                }
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        epoxyController.listener = null
+        views.roomList.cleanup()
+        super.onDestroyView()
+    }
+
+    override fun create(initialState: SpaceManageRoomViewState) = viewModelFactory.create(initialState)
+
+    override fun invalidate() = withState(viewModel) { state ->
+        epoxyController.setData(state)
+
+        state.spaceSummary.invoke()?.let {
+            views.appBarSpaceInfo.text = it.displayName
+        }
+        if (state.selectedRooms.isNotEmpty()) {
+            if (currentActionMode == null) {
+                views.addRoomToSpaceToolbar.isVisible = true
+                vectorBaseActivity.startSupportActionMode(this)
+            } else {
+                currentActionMode?.title = "${state.selectedRooms.size} selected"
+            }
+//            views.addRoomToSpaceToolbar.isVisible = false
+//            views.addRoomToSpaceToolbar.startActionMode(this)
+        } else {
+            currentActionMode?.finish()
+        }
+        Unit
+    }
+
+    var currentActionMode: ActionMode? = null
+
+    override fun toggleSelection(childInfo: SpaceChildInfo) {
+        viewModel.handle(SpaceManageRoomViewAction.ToggleSelection(childInfo.childRoomId))
+    }
+
+    override fun retry() {
+        viewModel.handle(SpaceManageRoomViewAction.RefreshFromServer)
+    }
+
+    override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+        val inflater = mode?.menuInflater
+        inflater?.inflate(R.menu.menu_manage_space, menu)
+        withState(viewModel) {
+            mode?.title = resources.getQuantityString(R.plurals.room_details_selected, it.selectedRooms.size, it.selectedRooms.size)
+        }
+        currentActionMode = mode
+        views.addRoomToSpaceToolbar.isVisible = false
+        return true
+    }
+
+    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+        withState(viewModel) { state ->
+            // check if we show mark as suggested or not
+            val areAllSuggested = state.childrenInfo.invoke().orEmpty().filter { state.selectedRooms.contains(it.childRoomId) }
+                    .all { it.suggested == true }
+            menu?.findItem(R.id.action_mark_as_suggested)?.isVisible = !areAllSuggested
+            menu?.findItem(R.id.action_mark_as_not_suggested)?.isVisible = areAllSuggested
+        }
+
+        return true
+    }
+
+    override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
+        when (item?.itemId) {
+            R.id.action_delete -> {
+                handleDeleteSelection()
+            }
+            R.id.action_mark_as_suggested -> {
+                viewModel.handle(SpaceManageRoomViewAction.MarkAllAsSuggested(true))
+            }
+            R.id.action_mark_as_not_suggested -> {
+                viewModel.handle(SpaceManageRoomViewAction.MarkAllAsSuggested(false))
+            }
+            else                              -> {
+            }
+        }
+        mode?.finish()
+        return true
+    }
+
+    private fun handleDeleteSelection() {
+        viewModel.handle(SpaceManageRoomViewAction.BulkRemove)
+    }
+
+    override fun onDestroyActionMode(mode: ActionMode?) {
+        // should force a refresh
+        currentActionMode = null
+        viewModel.handle(SpaceManageRoomViewAction.ClearSelection)
+        views.coordinatorLayout.post {
+            if (isAdded) {
+                TransitionManager.beginDelayedTransition(views.coordinatorLayout)
+                views.addRoomToSpaceToolbar.isVisible = true
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
new file mode 100644
index 0000000000..d1e1d8f0fb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.mvrx.runCatchingToAsync
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.session.coroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+
+class SpaceManageRoomsViewModel @AssistedInject constructor(
+        @Assisted val initialState: SpaceManageRoomViewState,
+        private val session: Session
+) : VectorViewModel<SpaceManageRoomViewState, SpaceManageRoomViewAction, SpaceManageRoomViewEvents>(initialState) {
+
+    init {
+        val spaceSummary = session.getRoomSummary(initialState.spaceId)
+        setState {
+            copy(
+                    spaceSummary = spaceSummary?.let { Success(it) } ?: Uninitialized,
+                    childrenInfo = Loading()
+            )
+        }
+
+        viewModelScope.launch(Dispatchers.IO) {
+            val apiResult = runCatchingToAsync {
+                session.spaceService().querySpaceChildren(spaceId = initialState.spaceId).second
+            }
+            setState {
+                copy(
+                        childrenInfo = apiResult
+                )
+            }
+        }
+    }
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: SpaceManageRoomViewState): SpaceManageRoomsViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SpaceManageRoomsViewModel, SpaceManageRoomViewState> {
+        override fun create(viewModelContext: ViewModelContext, state: SpaceManageRoomViewState): SpaceManageRoomsViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    override fun handle(action: SpaceManageRoomViewAction) {
+        when (action) {
+            is SpaceManageRoomViewAction.ToggleSelection -> handleToggleSelection(action)
+            is SpaceManageRoomViewAction.UpdateFilter -> {
+                setState { copy(currentFilter = action.filter) }
+            }
+            SpaceManageRoomViewAction.ClearSelection -> {
+                setState { copy(selectedRooms = emptyList()) }
+            }
+            SpaceManageRoomViewAction.BulkRemove -> {
+                handleBulkRemove()
+            }
+            is SpaceManageRoomViewAction.MarkAllAsSuggested -> {
+                handleBulkMarkAsSuggested(action.suggested)
+            }
+            SpaceManageRoomViewAction.RefreshFromServer -> {
+                refreshSummaryAPI()
+            }
+        }
+    }
+
+    private fun handleBulkRemove() = withState { state ->
+        setState { copy(actionState = Loading()) }
+        val selection = state.selectedRooms
+        session.coroutineScope.launch(Dispatchers.IO) {
+            val errorList = mutableListOf<Throwable>()
+            selection.forEach {
+                try {
+                    session.spaceService().getSpace(state.spaceId)?.removeChildren(it)
+                } catch (failure: Throwable) {
+                    errorList.add(failure)
+                }
+            }
+            if (errorList.isEmpty()) {
+                // success
+            } else {
+                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionFailure(errorList))
+            }
+            refreshSummaryAPI()
+            setState { copy(actionState = Uninitialized) }
+        }
+    }
+
+    private fun handleBulkMarkAsSuggested(suggested: Boolean) = withState { state ->
+        setState { copy(actionState = Loading()) }
+        val selection = state.childrenInfo.invoke()?.filter {
+            state.selectedRooms.contains(it.childRoomId)
+        }.orEmpty()
+        session.coroutineScope.launch(Dispatchers.IO) {
+            val errorList = mutableListOf<Throwable>()
+            selection.forEach { info ->
+                try {
+                    session.spaceService().getSpace(state.spaceId)?.addChildren(
+                            roomId = info.childRoomId,
+                            viaServers = info.viaServers,
+                            order = info.order,
+                            suggested = suggested,
+                            autoJoin = info.autoJoin
+                    )
+                } catch (failure: Throwable) {
+                    errorList.add(failure)
+                }
+            }
+            if (errorList.isEmpty()) {
+                // success
+            } else {
+                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionFailure(errorList))
+            }
+            refreshSummaryAPI()
+            setState { copy(actionState = Uninitialized) }
+        }
+    }
+
+    private fun refreshSummaryAPI() {
+        setState {
+            copy(
+                    childrenInfo = Loading()
+            )
+        }
+        viewModelScope.launch(Dispatchers.IO) {
+            val apiResult = runCatchingToAsync {
+                session.spaceService().querySpaceChildren(spaceId = initialState.spaceId).second
+            }
+            setState {
+                copy(
+                        childrenInfo = apiResult
+                )
+            }
+        }
+    }
+
+    private fun handleToggleSelection(action: SpaceManageRoomViewAction.ToggleSelection) = withState { state ->
+        val existing = state.selectedRooms.toMutableList()
+        if (existing.contains(action.roomId)) {
+            existing.remove(action.roomId)
+        } else {
+            existing.add(action.roomId)
+        }
+        setState {
+            copy(
+                    selectedRooms = existing.toList()
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
index 24110c081a..57c47250f9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
@@ -55,6 +55,7 @@ class SpaceManageSharedViewModel @AssistedInject constructor(
             SpaceManagedSharedAction.HideLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading)
             SpaceManagedSharedAction.ShowLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading)
             SpaceManagedSharedAction.CreateRoom ->  _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToCreateRoom)
+            SpaceManagedSharedAction.ManageRooms -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToManageRooms)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
index 18c289f3b3..91d49d90d1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
@@ -18,10 +18,17 @@ package im.vector.app.features.spaces.manage
 
 import com.airbnb.mvrx.MvRxState
 
+enum class ManageType {
+    AddRooms,
+    Settings,
+    ManageRooms
+}
 data class SpaceManageViewState(
-        val spaceId: String = ""
+        val spaceId: String = "",
+        val manageType: ManageType
 ) : MvRxState {
     constructor(args: SpaceManageArgs) : this(
-            spaceId = args.spaceId
+            spaceId = args.spaceId,
+            manageType = args.manageType
     )
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
index 1c0de1041b..0b413a3b8a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
@@ -23,4 +23,5 @@ sealed class SpaceManagedSharedAction : VectorViewModelAction {
     object ShowLoading : SpaceManagedSharedAction()
     object HideLoading : SpaceManagedSharedAction()
     object CreateRoom : SpaceManagedSharedAction()
+    object ManageRooms : SpaceManagedSharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
index 0cf6bcaee1..da6f01d205 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
@@ -23,4 +23,5 @@ sealed class SpaceManagedSharedViewEvents : VectorViewEvents {
     object ShowLoading : SpaceManagedSharedViewEvents()
     object HideLoading : SpaceManagedSharedViewEvents()
     object NavigateToCreateRoom : SpaceManagedSharedViewEvents()
+    object NavigateToManageRooms : SpaceManagedSharedViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
new file mode 100644
index 0000000000..de51805472
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.epoxy.profiles.buildProfileAction
+import im.vector.app.core.epoxy.profiles.buildProfileSection
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.form.formEditTextItem
+import im.vector.app.features.form.formEditableSquareAvatarItem
+import im.vector.app.features.form.formMultiLineEditTextItem
+import im.vector.app.features.form.formSwitchItem
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewState
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class SpaceSettingsController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val avatarRenderer: AvatarRenderer,
+        colorProvider: ColorProvider,
+        private val vectorPreferences: VectorPreferences
+) : TypedEpoxyController<RoomSettingsViewState>() {
+
+    interface Callback {
+        // Delete the avatar, or cancel an avatar change
+        fun onAvatarDelete()
+        fun onAvatarChange()
+        fun onNameChanged(name: String)
+        fun onTopicChanged(topic: String)
+        fun onHistoryVisibilityClicked()
+        fun onJoinRuleClicked()
+        fun onToggleGuestAccess()
+        fun onDevTools()
+        fun onDevRoomSettings()
+        fun onManageRooms()
+        fun setIsPublic(public: Boolean)
+    }
+
+    private val dividerColor = colorProvider.getColorFromAttribute(R.attr.vctr_list_divider_color)
+
+    var callback: Callback? = null
+
+    override fun buildModels(data: RoomSettingsViewState?) {
+        val roomSummary = data?.roomSummary?.invoke() ?: return
+
+        formEditableSquareAvatarItem {
+            id("avatar")
+            enabled(data.actionPermissions.canChangeAvatar)
+            when (val avatarAction = data.avatarAction) {
+                RoomSettingsViewState.AvatarAction.None -> {
+                    // Use the current value
+                    avatarRenderer(avatarRenderer)
+                    // We do not want to use the fallback avatar url, which can be the other user avatar, or the current user avatar.
+                    matrixItem(roomSummary.toMatrixItem().copy(avatarUrl = data.currentRoomAvatarUrl))
+                }
+                RoomSettingsViewState.AvatarAction.DeleteAvatar ->
+                    imageUri(null)
+                is RoomSettingsViewState.AvatarAction.UpdateAvatar ->
+                    imageUri(avatarAction.newAvatarUri)
+            }
+            clickListener { callback?.onAvatarChange() }
+            deleteListener { callback?.onAvatarDelete() }
+        }
+
+        buildProfileSection(
+                stringProvider.getString(R.string.settings)
+        )
+
+        formEditTextItem {
+            id("name")
+            enabled(data.actionPermissions.canChangeName)
+            value(data.newName ?: roomSummary.displayName)
+            hint(stringProvider.getString(R.string.create_room_name_hint))
+            showBottomSeparator(false)
+            onTextChange { text ->
+                callback?.onNameChanged(text)
+            }
+        }
+
+        formMultiLineEditTextItem {
+            id("topic")
+            enabled(data.actionPermissions.canChangeTopic)
+            value(data.newTopic ?: roomSummary.topic)
+            hint(stringProvider.getString(R.string.create_space_topic_hint))
+            showBottomSeparator(false)
+            onTextChange { text ->
+                callback?.onTopicChanged(text)
+            }
+        }
+
+        if (vectorPreferences.labsUseExperimentalRestricted()) {
+            buildProfileAction(
+                    id = "joinRule",
+                    title = stringProvider.getString(R.string.room_settings_room_access_title),
+                    subtitle = data.getJoinRuleWording(stringProvider),
+                    dividerColor = dividerColor,
+                    divider = true,
+                    editable = data.actionPermissions.canChangeJoinRule,
+                    action = { if (data.actionPermissions.canChangeJoinRule) callback?.onJoinRuleClicked() }
+            )
+        } else {
+            val isPublic = (data.newRoomJoinRules.newJoinRules ?: data.currentRoomJoinRules) == RoomJoinRules.PUBLIC
+            formSwitchItem {
+                id("isPublic")
+                enabled(data.actionPermissions.canChangeJoinRule)
+                title(stringProvider.getString(R.string.make_this_space_public))
+                switchChecked(isPublic)
+
+                listener { value ->
+                    callback?.setIsPublic(value)
+                }
+            }
+        }
+
+        buildProfileAction(
+                id = "manage_rooms",
+                title = stringProvider.getString(R.string.space_settings_manage_rooms),
+                // subtitle = data.getJoinRuleWording(stringProvider),
+                dividerColor = dividerColor,
+                divider = vectorPreferences.developerMode(),
+                editable = data.actionPermissions.canAddChildren,
+                action = {
+                    if (data.actionPermissions.canAddChildren) callback?.onManageRooms()
+                }
+        )
+
+        if (vectorPreferences.developerMode()) {
+            buildProfileAction(
+                    id = "dev_tools",
+                    title = stringProvider.getString(R.string.settings_dev_tools),
+                    icon = R.drawable.ic_verification_glasses,
+                    tintIcon = false,
+                    dividerColor = dividerColor,
+                    divider = true,
+                    action = {
+                        callback?.onDevTools()
+                    }
+            )
+
+            buildProfileAction(
+                    id = "room_tools",
+                    title = stringProvider.getString(R.string.room_list_quick_actions_room_settings),
+                    icon = R.drawable.ic_verification_glasses,
+                    tintIcon = false,
+                    dividerColor = dividerColor,
+                    divider = false,
+                    action = {
+                        callback?.onDevRoomSettings()
+                    }
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
new file mode 100644
index 0000000000..85c73ac8ef
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
@@ -0,0 +1,267 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.args
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
+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.intent.getFilenameFromUri
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.utils.toast
+import im.vector.app.databinding.FragmentRoomSettingGenericBinding
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomprofile.RoomProfileArgs
+import im.vector.app.features.roomprofile.settings.RoomSettingsAction
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewEvents
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewModel
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewState
+import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleBottomSheet
+import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleSharedActionViewModel
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+import org.matrix.android.sdk.api.util.toMatrixItem
+import java.util.UUID
+import javax.inject.Inject
+
+class SpaceSettingsFragment @Inject constructor(
+        private val epoxyController: SpaceSettingsController,
+        private val colorProvider: ColorProvider,
+        val viewModelFactory: RoomSettingsViewModel.Factory,
+        private val avatarRenderer: AvatarRenderer,
+        private val drawableProvider: DrawableProvider
+) : VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
+        RoomSettingsViewModel.Factory,
+        SpaceSettingsController.Callback,
+        GalleryOrCameraDialogHelper.Listener,
+        OnBackPressed {
+
+    private val viewModel: RoomSettingsViewModel by fragmentViewModel()
+    private val sharedViewModel: SpaceManageSharedViewModel by activityViewModel()
+
+    private lateinit var roomJoinRuleSharedActionViewModel: RoomJoinRuleSharedActionViewModel
+
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) = FragmentRoomSettingGenericBinding.inflate(inflater)
+
+    private val roomProfileArgs: RoomProfileArgs by args()
+
+    override fun getMenuRes() = R.menu.vector_room_settings
+
+    override fun create(initialState: RoomSettingsViewState): RoomSettingsViewModel {
+        return viewModelFactory.create(initialState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar(views.roomSettingsToolbar)
+        // roomProfileSharedActionViewModel = activityViewModelProvider.get(RoomProfileSharedActionViewModel::class.java)
+//        setupRoomHistoryVisibilitySharedActionViewModel()
+        setupRoomJoinRuleSharedActionViewModel()
+        epoxyController.callback = this
+        views.roomSettingsRecyclerView.configureWith(epoxyController, hasFixedSize = true)
+        views.waitingView.waitingStatusText.setText(R.string.please_wait)
+        views.waitingView.waitingStatusText.isVisible = true
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is RoomSettingsViewEvents.Failure -> showFailure(it.throwable)
+                RoomSettingsViewEvents.Success -> showSuccess()
+                RoomSettingsViewEvents.GoBack -> {
+                    ignoreChanges = true
+                    vectorBaseActivity.onBackPressed()
+                }
+            }.exhaustive
+        }
+    }
+
+    override fun onDestroyView() {
+        epoxyController.callback = null
+        views.roomSettingsRecyclerView.cleanup()
+        super.onDestroyView()
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        withState(viewModel) { state ->
+            menu.findItem(R.id.roomSettingsSaveAction).isVisible = state.showSaveAction
+        }
+        super.onPrepareOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.roomSettingsSaveAction) {
+            viewModel.handle(RoomSettingsAction.Save)
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun renderRoomSummary(state: RoomSettingsViewState) {
+        views.waitingView.root.isVisible = state.isLoading
+
+        state.roomSummary()?.let {
+            views.roomSettingsToolbarTitleView.text = it.displayName
+            views.roomSettingsToolbarTitleView.setCompoundDrawablesWithIntrinsicBounds(
+                    null,
+                    null,
+                    drawableProvider.getDrawable(R.drawable.ic_beta_pill),
+                    null
+            )
+            avatarRenderer.renderSpace(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView)
+            views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
+        }
+
+        invalidateOptionsMenu()
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        epoxyController.setData(state)
+        renderRoomSummary(state)
+    }
+
+    private fun setupRoomJoinRuleSharedActionViewModel() {
+        roomJoinRuleSharedActionViewModel = activityViewModelProvider.get(RoomJoinRuleSharedActionViewModel::class.java)
+        roomJoinRuleSharedActionViewModel
+                .observe()
+                .subscribe { action ->
+                    viewModel.handle(RoomSettingsAction.SetRoomJoinRule(action.roomJoinRule))
+                }
+                .disposeOnDestroyView()
+    }
+
+    private var ignoreChanges = false
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        if (ignoreChanges) return false
+
+        return withState(viewModel) {
+            return@withState if (it.showSaveAction) {
+                AlertDialog.Builder(requireContext())
+                        .setTitle(R.string.dialog_title_warning)
+                        .setMessage(R.string.warning_unsaved_change)
+                        .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
+                            viewModel.handle(RoomSettingsAction.Cancel)
+                        }
+                        .setNegativeButton(R.string.cancel, null)
+                        .show()
+                true
+            } else {
+                false
+            }
+        }
+    }
+
+    private fun showSuccess() {
+        activity?.toast(R.string.room_settings_save_success)
+    }
+
+    override fun onNameChanged(name: String) {
+        viewModel.handle(RoomSettingsAction.SetRoomName(name))
+    }
+
+    override fun onTopicChanged(topic: String) {
+        viewModel.handle(RoomSettingsAction.SetRoomTopic(topic))
+    }
+
+    override fun onHistoryVisibilityClicked() {
+        // N/A for space settings screen
+    }
+
+    override fun onJoinRuleClicked() = withState(viewModel) { state ->
+        val currentJoinRule = state.newRoomJoinRules.newJoinRules ?: state.currentRoomJoinRules
+        RoomJoinRuleBottomSheet.newInstance(currentJoinRule)
+                .show(childFragmentManager, "RoomJoinRuleBottomSheet")
+    }
+
+    override fun onToggleGuestAccess() = withState(viewModel) { state ->
+        val currentGuestAccess = state.newRoomJoinRules.newGuestAccess ?: state.currentGuestAccess
+        val toggled = if (currentGuestAccess == GuestAccess.Forbidden) GuestAccess.CanJoin else GuestAccess.Forbidden
+        viewModel.handle(RoomSettingsAction.SetRoomGuestAccess(toggled))
+    }
+
+    override fun onDevTools() = withState(viewModel) { state ->
+        navigator.openDevTools(requireContext(), state.roomId)
+    }
+
+    override fun onDevRoomSettings() = withState(viewModel) { state ->
+        navigator.openRoomProfile(requireContext(), state.roomId)
+    }
+
+    override fun onManageRooms() {
+        sharedViewModel.handle(SpaceManagedSharedAction.ManageRooms)
+    }
+
+    override fun setIsPublic(public: Boolean) {
+        if (public) {
+            viewModel.handle(RoomSettingsAction.SetRoomJoinRule(RoomJoinRules.PUBLIC))
+            viewModel.handle(RoomSettingsAction.SetRoomHistoryVisibility(RoomHistoryVisibility.WORLD_READABLE))
+        } else {
+            viewModel.handle(RoomSettingsAction.SetRoomJoinRule(RoomJoinRules.INVITE))
+            viewModel.handle(RoomSettingsAction.SetRoomHistoryVisibility(RoomHistoryVisibility.INVITED))
+        }
+    }
+
+    override fun onImageReady(uri: Uri?) {
+        uri ?: return
+        viewModel.handle(
+                RoomSettingsAction.SetAvatarAction(
+                        RoomSettingsViewState.AvatarAction.UpdateAvatar(
+                                newAvatarUri = uri,
+                                newAvatarFileName = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString())
+                )
+        )
+    }
+
+    override fun onAvatarDelete() {
+        withState(viewModel) {
+            when (it.avatarAction) {
+                RoomSettingsViewState.AvatarAction.None -> {
+                    viewModel.handle(RoomSettingsAction.SetAvatarAction(RoomSettingsViewState.AvatarAction.DeleteAvatar))
+                }
+                RoomSettingsViewState.AvatarAction.DeleteAvatar -> {
+                    /* Should not happen */
+                }
+                is RoomSettingsViewState.AvatarAction.UpdateAvatar -> {
+                    // Cancel the update of the avatar
+                    viewModel.handle(RoomSettingsAction.SetAvatarAction(RoomSettingsViewState.AvatarAction.None))
+                }
+            }
+        }
+    }
+
+    override fun onAvatarChange() {
+        galleryOrCameraDialogHelper.show()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
index 87f5356f6d..b4b48d7710 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
@@ -28,7 +28,7 @@ import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.platform.GenericIdArgs
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleLoadingBinding
-import im.vector.app.features.spaces.ShareSpaceBottomSheet
+import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
 
 class SpacePeopleActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>() {
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceAction.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceAction.kt
new file mode 100644
index 0000000000..d97e17fabb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceAction.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.share
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class ShareSpaceAction : VectorViewModelAction {
+    object InviteByMxId : ShareSpaceAction()
+    object InviteByLink : ShareSpaceAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
new file mode 100644
index 0000000000..4289af7b3b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.share
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentManager
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.utils.startSharePlainTextIntent
+import im.vector.app.databinding.BottomSheetSpaceInviteBinding
+import im.vector.app.features.invite.InviteUsersToRoomActivity
+import kotlinx.parcelize.Parcelize
+import javax.inject.Inject
+
+class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpaceInviteBinding>(), ShareSpaceViewModel.Factory {
+
+    @Parcelize
+    data class Args(
+            val spaceId: String,
+            val postCreation: Boolean = false
+    ) : Parcelable
+
+    override val showExpanded = true
+
+    private val viewModel: ShareSpaceViewModel by fragmentViewModel(ShareSpaceViewModel::class)
+
+    @Inject lateinit var viewModelFactory: ShareSpaceViewModel.Factory
+
+    override fun create(initialState: ShareSpaceViewState): ShareSpaceViewModel = viewModelFactory.create(initialState)
+
+    override fun injectWith(injector: ScreenComponent) {
+        injector.inject(this)
+    }
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSpaceInviteBinding {
+        return BottomSheetSpaceInviteBinding.inflate(inflater, container, false)
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        super.invalidate()
+        val summary = state.spaceSummary.invoke()
+
+        val spaceName = summary?.name
+
+        if (state.postCreation) {
+            views.headerText.text = getString(R.string.invite_people_to_your_space)
+            views.descriptionText.setTextOrHide(getString(R.string.invite_people_to_your_space_desc, spaceName))
+        } else {
+            views.headerText.text = getString(R.string.invite_to_space, spaceName)
+            views.descriptionText.setTextOrHide(null)
+        }
+
+        views.inviteByMailButton.isVisible = false // not yet implemented
+        views.inviteByLinkButton.isVisible = state.canShareLink
+        views.inviteByMxidButton.isVisible = state.canInviteByMxId
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // XXX enable back when supported
+        views.inviteByMailButton.isVisible = false
+        views.inviteByMailButton.debouncedClicks {
+        }
+
+        views.inviteByMxidButton.debouncedClicks {
+            viewModel.handle(ShareSpaceAction.InviteByMxId)
+        }
+
+        views.inviteByLinkButton.debouncedClicks {
+            viewModel.handle(ShareSpaceAction.InviteByLink)
+        }
+
+        viewModel.observeViewEvents { event ->
+            when (event) {
+                is ShareSpaceViewEvents.NavigateToInviteUser -> {
+                    val intent = InviteUsersToRoomActivity.getIntent(requireContext(), event.spaceId)
+                    startActivity(intent)
+                }
+                is ShareSpaceViewEvents.ShowInviteByLink     -> {
+                    startSharePlainTextIntent(
+                            fragment = this,
+                            activityResultLauncher = null,
+                            chooserTitle = getString(R.string.share_by_text),
+                            text = getString(R.string.share_space_link_message, event.spaceName, event.permalink),
+                            extraTitle = getString(R.string.share_space_link_message, event.spaceName, event.permalink)
+                    )
+                }
+            }
+        }
+    }
+
+    companion object {
+
+        fun show(fragmentManager: FragmentManager, spaceId: String, postCreation: Boolean = false): ShareSpaceBottomSheet {
+            return ShareSpaceBottomSheet().apply {
+                setArguments(Args(spaceId = spaceId, postCreation = postCreation))
+            }.also {
+                it.show(fragmentManager, ShareSpaceBottomSheet::class.java.name)
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewEvents.kt
new file mode 100644
index 0000000000..60c553b7b0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewEvents.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.share
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class ShareSpaceViewEvents : VectorViewEvents {
+    data class NavigateToInviteUser(val spaceId: String) : ShareSpaceViewEvents()
+    data class ShowInviteByLink(val permalink: String, val spaceName: String) : ShareSpaceViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
new file mode 100644
index 0000000000..dfce534a7a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.share
+
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+
+class ShareSpaceViewModel @AssistedInject constructor(
+        @Assisted private val initialState: ShareSpaceViewState,
+        private val session: Session) : VectorViewModel<ShareSpaceViewState, ShareSpaceAction, ShareSpaceViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: ShareSpaceViewState): ShareSpaceViewModel
+    }
+
+    companion object : MvRxViewModelFactory<ShareSpaceViewModel, ShareSpaceViewState> {
+        override fun create(viewModelContext: ViewModelContext, state: ShareSpaceViewState): ShareSpaceViewModel? {
+            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 {
+        val roomSummary = session.getRoomSummary(initialState.spaceId)
+        setState {
+            copy(
+                    spaceSummary = roomSummary?.let { Success(it) } ?: Uninitialized,
+                    canShareLink = roomSummary?.isPublic.orFalse()
+            )
+        }
+        observePowerLevel()
+    }
+
+    private fun observePowerLevel() {
+        val room = session.getRoom(initialState.spaceId) ?: return
+        PowerLevelsObservableFactory(room)
+                .createObservable()
+                .subscribe { powerLevelContent ->
+                    val powerLevelsHelper = PowerLevelsHelper(powerLevelContent)
+                    setState {
+                        copy(
+                                canInviteByMxId = powerLevelsHelper.isUserAbleToInvite(session.myUserId)
+                        )
+                    }
+                }
+                .disposeOnClear()
+    }
+
+    override fun handle(action: ShareSpaceAction) {
+        when (action) {
+            ShareSpaceAction.InviteByLink -> {
+                val roomSummary = session.getRoomSummary(initialState.spaceId)
+                val alias = roomSummary?.canonicalAlias
+                val permalink = if (alias != null) {
+                    session.permalinkService().createPermalink(alias)
+                } else {
+                    session.permalinkService().createRoomPermalink(initialState.spaceId)
+                }
+                if (permalink != null) {
+                    _viewEvents.post(ShareSpaceViewEvents.ShowInviteByLink(permalink, roomSummary?.name ?: ""))
+                }
+            }
+            ShareSpaceAction.InviteByMxId -> {
+                _viewEvents.post(ShareSpaceViewEvents.NavigateToInviteUser(initialState.spaceId))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewState.kt
new file mode 100644
index 0000000000..97606e9506
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewState.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.share
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+data class ShareSpaceViewState(
+        val spaceId: String,
+        val spaceSummary: Async<RoomSummary> = Uninitialized,
+        val canInviteByMxId: Boolean = false,
+        val canShareLink: Boolean = false,
+        val postCreation: Boolean = false
+) : MvRxState {
+    constructor(args: ShareSpaceBottomSheet.Args) : this(
+            spaceId = args.spaceId,
+            postCreation = args.postCreation
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index a68717ea57..5d5247ec06 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -33,7 +33,6 @@ import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.session.user.model.User
-import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.rx.rx
@@ -137,7 +136,15 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
                                                 avatarUrl = json[ProfileService.AVATAR_URL_KEY] as? String
                                         ).toOptional()
                                     }
-                                    .onErrorReturn { Optional.empty() }
+                                    .onErrorReturn {
+                                        // Profile API can be restricted and doesn't have to return result.
+                                        // In this case allow inviting valid user ids.
+                                        User(
+                                                userId = search,
+                                                displayName = null,
+                                                avatarUrl = null
+                                        ).toOptional()
+                                    }
 
                             Single.zip(
                                     searchObservable,
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index 9fa04aabbb..f9acfb3ce6 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -22,7 +22,7 @@ import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
-import kotlinx.coroutines.GlobalScope
+import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.QueryStringValue
@@ -465,7 +465,8 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
     }
 
     private fun launchWidgetAPIAction(widgetPostAPIMediator: WidgetPostAPIMediator, eventData: JsonDict, block: suspend () -> Unit): Job {
-        return GlobalScope.launch {
+        // We should probably use a scope tight to the lifecycle here...
+        return session.coroutineScope.launch {
             kotlin.runCatching {
                 block()
             }.fold(
diff --git a/vector/src/main/res/drawable/background_circle.xml b/vector/src/main/res/drawable/background_circle.xml
new file mode 100644
index 0000000000..5e20ad45ce
--- /dev/null
+++ b/vector/src/main/res/drawable/background_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="96dp" />
+    <solid android:color="?riotx_background" />
+
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_feedback.xml b/vector/src/main/res/drawable/ic_feedback.xml
new file mode 100644
index 0000000000..e774a8ab5c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_feedback.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6.2887,10.748C8.7036,10.748 10.6612,8.7897 10.6612,6.374C10.6612,3.9583 8.7036,2 6.2887,2C3.8739,2 1.9163,3.9583 1.9163,6.374C1.9163,7.038 2.0642,7.6674 2.3288,8.2311L1.6,9.7683C1.2011,10.6099 2.0682,11.492 2.9165,11.1074L4.5258,10.378C5.0651,10.6159 5.6615,10.748 6.2887,10.748Z"
+      android:fillColor="#368BD6"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.6608,7.3739C12.6608,9.7896 10.7032,11.7479 8.2883,11.7479C7.8421,11.7479 7.4114,11.681 7.0059,11.5568C7.7732,12.2953 8.8076,12.7479 9.9456,12.7479C10.5605,12.7479 11.1451,12.6158 11.6737,12.3778L13.211,13.0887C14.0564,13.4796 14.9301,12.6043 14.5376,11.7597L13.8272,10.2308C14.0865,9.6672 14.2315,9.0378 14.2315,8.3739C14.2315,6.4535 13.0188,4.8221 11.3323,4.2339C12.1516,5.0289 12.6608,6.1419 12.6608,7.3739Z"
+      android:fillColor="#368BD6"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_info.xml b/vector/src/main/res/drawable/ic_info.xml
new file mode 100644
index 0000000000..afca98641a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M14.6666,7.9999C14.6666,11.6818 11.6818,14.6666 7.9999,14.6666C4.318,14.6666 1.3333,11.6818 1.3333,7.9999C1.3333,4.318 4.318,1.3333 7.9999,1.3333C11.6818,1.3333 14.6666,4.318 14.6666,7.9999ZM6.3333,7.9999C6.3333,8.4353 6.6115,8.8057 6.9999,8.943V10.9999C6.9999,11.5522 7.4476,11.9999 7.9999,11.9999H8.9999C9.5522,11.9999 9.9999,11.5522 9.9999,10.9999C9.9999,10.4476 9.5522,9.9999 8.9999,9.9999V7.9999C8.9999,7.4476 8.5522,6.9999 7.9999,6.9999H7.3333C6.781,6.9999 6.3333,7.4476 6.3333,7.9999ZM7.9999,6.6666C8.5522,6.6666 8.9999,6.2189 8.9999,5.6666C8.9999,5.1143 8.5522,4.6666 7.9999,4.6666C7.4476,4.6666 6.9999,5.1143 6.9999,5.6666C6.9999,6.2189 7.4476,6.6666 7.9999,6.6666Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_public_room.xml b/vector/src/main/res/drawable/ic_public_room.xml
index 1520898831..d6602cc59c 100644
--- a/vector/src/main/res/drawable/ic_public_room.xml
+++ b/vector/src/main/res/drawable/ic_public_room.xml
@@ -1,13 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12Z"
-      android:fillColor="#C1C6CD"/>
-  <path
-      android:pathData="M18.6999,18.8177L19.6243,15.9652C19.6324,15.9404 19.6365,15.9143 19.6365,15.8882V15.0473C19.6365,14.9823 19.6111,14.9197 19.5657,14.8731L18.7105,13.9934C18.6916,13.9739 18.6697,13.9577 18.6456,13.9453L16.8092,13.0009C16.7852,12.9885 16.7632,12.9723 16.7443,12.9529L15.8919,12.0761C15.8449,12.0277 15.7802,12.0004 15.7127,12.0004H12.2501C12.1121,12.0004 12.0001,11.8885 12.0001,11.7504V10.2868C12.0001,10.1487 11.8882,10.0368 11.7501,10.0368H9.3865C9.2484,10.0368 9.1365,9.9248 9.1365,9.7868V8.3798C9.1365,8.2215 9.2818,8.103 9.4369,8.1349L13.6089,8.9931C13.7639,9.0251 13.9092,8.9066 13.9092,8.7483V7.1928C13.9092,7.1277 13.9346,7.0652 13.98,7.0185L16.6034,4.3201C16.6978,4.2231 16.6978,4.0686 16.6034,3.9716L14.9023,2.2219C14.8769,2.1957 14.8461,2.1755 14.8121,2.1625L13.3697,1.613C12.4823,1.275 11.5072,1.2439 10.6001,1.5247L9.1365,1.9777C7.1638,2.6207 5.6129,4.1612 4.9568,6.1296L4.621,7.1369C4.5407,7.3779 4.4931,7.6285 4.4795,7.8822L4.3696,9.9275C4.3659,9.9972 4.3914,10.0652 4.44,10.1152L6.1992,11.9247C6.2463,11.9731 6.311,12.0004 6.3785,12.0004H8.1214C8.1612,12.0004 8.2004,12.0099 8.2358,12.0281L9.9554,12.9124C10.0387,12.9553 10.091,13.0411 10.091,13.1348V15.8701C10.091,15.908 10.0996,15.9454 10.1162,15.9794L10.9772,17.7506C11.019,17.8367 11.1063,17.8913 11.202,17.8913H12.8491C12.9166,17.8913 12.9812,17.9186 13.0283,17.967L13.9092,18.8731L14.8357,19.8261C14.8543,19.8452 14.8697,19.8671 14.8813,19.8911L15.6626,21.4982C15.7383,21.654 15.9458,21.6874 16.0667,21.5631L16.7729,20.8368L17.7274,19.8549L18.6413,18.9149C18.6681,18.8874 18.6881,18.8542 18.6999,18.8177Z"
-      android:fillColor="#F4F6FA"
-      android:fillAlpha="0.91"/>
+    android:width="21dp"
+    android:height="20dp"
+    android:viewportWidth="21"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#8D99A5"
+        android:fillType="evenOdd"
+        android:pathData="M10.5,20C16.0228,20 20.5,15.5228 20.5,10C20.5,4.4771 16.0228,0 10.5,0C4.9771,0 0.5,4.4771 0.5,10C0.5,15.5228 4.9771,20 10.5,20ZM16.8518,13.3106L16.0865,15.6722C16.0747,15.7086 16.0546,15.7419 16.0279,15.7694L15.2731,16.5458L14.4776,17.364L13.9305,17.9267C13.8097,18.051 13.6022,18.0176 13.5264,17.8617L12.9043,16.5819C12.8927,16.558 12.8773,16.5361 12.8587,16.517L12.0913,15.7276L11.3694,14.9852C11.3224,14.9367 11.2577,14.9094 11.1902,14.9094H9.8614C9.7656,14.9094 9.6783,14.8548 9.6365,14.7687L8.9346,13.3248C8.918,13.2908 8.9094,13.2534 8.9094,13.2155V10.9711C8.9094,10.8774 8.8571,10.7916 8.7738,10.7487L7.3724,10.028C7.337,10.0098 7.2978,10.0003 7.258,10.0003H5.8333C5.7657,10.0003 5.7011,9.973 5.654,9.9246L4.213,8.4424C4.1644,8.3924 4.1389,8.3244 4.1426,8.2547L4.2331,6.5685C4.2445,6.3571 4.2842,6.1482 4.3511,5.9474L4.6309,5.108C5.1777,3.4677 6.47,2.1839 8.114,1.6481L9.1003,1.3428C10.0075,1.062 10.9825,1.0931 11.8699,1.4312L12.835,1.7988C12.8691,1.8118 12.8999,1.832 12.9253,1.8582L14.3082,3.2806C14.4025,3.3776 14.4025,3.5321 14.3082,3.6291L12.162,5.8366C12.1166,5.8833 12.0913,5.9458 12.0913,6.0109V7.2391C12.0913,7.3974 11.946,7.5159 11.7909,7.484L8.4144,6.7894C8.2593,6.7575 8.114,6.8759 8.114,7.0343V8.114C8.114,8.252 8.2259,8.364 8.364,8.364H10.2504C10.3884,8.364 10.5004,8.4759 10.5004,8.614V9.7503C10.5004,9.8884 10.6123,10.0003 10.7504,10.0003H13.5766C13.6441,10.0003 13.7087,10.0276 13.7558,10.0761L14.4491,10.7892C14.468,10.8086 14.4899,10.8248 14.514,10.8372L16.0321,11.618C16.0562,11.6304 16.0782,11.6466 16.0971,11.666L16.7932,12.3821C16.8386,12.4288 16.864,12.4913 16.864,12.5564V13.2336C16.864,13.2597 16.8599,13.2857 16.8518,13.3106Z" />
+
 </vector>
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 78a0139e1d..f21d2cda48 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -133,6 +133,15 @@
                     android:checked="false"
                     android:text="@string/send_bug_report_include_key_share_history" />
 
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/bug_report_button_contact_me"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:checked="false"
+                    android:text="@string/you_may_contact_me" />
+
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/bug_report_button_include_screenshot"
                     android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 7ea632eefb..c4bba45ebf 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -79,7 +79,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/smallIsHeldIcon"
@@ -106,7 +106,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/otherMemberAvatar"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/callStatusText"
diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index 05296dd65a..77c1ab4b6c 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -18,7 +18,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/incomingCallNameView"
@@ -34,7 +34,7 @@
         app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
         app:layout_constraintStart_toEndOf="@id/incomingCallAvatar"
         app:layout_constraintTop_toTopOf="@id/incomingCallAvatar"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/incomingCallKindView"
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 7a2e81a6ce..3db8a3343c 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toStartOf="@+id/alerter_texts"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/ivIcon"
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
index 6730a585db..d3e9009a0f 100644
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -31,7 +31,7 @@
                 app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@sample/user_round_avatars" />
 
 
             <TextView
@@ -57,7 +57,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/inviterAvatarImage"
                 app:layout_constraintTop_toBottomOf="@id/inviterText"
-                tools:text="@sample/matrix.json/data/mxid" />
+                tools:text="@sample/users.json/data/id" />
 
 
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 2f8d890131..68fc8653cf 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -46,7 +46,7 @@
             android:layout_height="40dp"
             android:layout_gravity="center"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <LinearLayout
             android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 053a326b03..1c0e959d25 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -23,14 +23,13 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/space_avatars" />
 
         <TextView
             android:id="@+id/spaceNameView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginEnd="8dp"
             android:duplicateParentState="true"
             android:ellipsize="end"
             android:maxLines="1"
@@ -39,11 +38,21 @@
             android:textStyle="bold"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toTopOf="@+id/spaceDescription"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/spaceBetaTag"
             app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
-            tools:text="@sample/matrix.json/data/displayName" />
+            tools:text="@sample/spaces.json/data/name" />
+
+        <ImageView
+            android:id="@+id/spaceBetaTag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:contentDescription="@string/a11y_beta"
+            android:src="@drawable/ic_beta_pill"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/spaceDescription"
@@ -61,7 +70,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
             app:layout_constraintTop_toBottomOf="@+id/spaceNameView"
-            tools:text="@sample/matrix.json/data/message"
+            tools:text="@sample/spaces.json/data/topic"
             tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -94,12 +103,10 @@
         android:id="@+id/spaceSettings"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
         app:actionTitle="@string/settings"
         app:leftIcon="@drawable/ic_settings_root_general"
         app:tint="?attr/riotx_text_primary"
-        app:titleTextColor="?attr/riotx_text_primary"
-        tools:visibility="visible" />
+        app:titleTextColor="?attr/riotx_text_primary" />
 
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/exploreRooms"
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 9ed8f17069..e3c97d92dc 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -26,7 +26,7 @@
             android:scaleType="centerCrop"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <im.vector.app.core.ui.views.ShieldImageView
             android:id="@+id/otherUserShield"
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index e837d2d80b..4d65100a97 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -37,8 +37,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:contentDescription="@string/avatar"
-        tools:ignore="MissingConstraints"
-        tools:src="@tools:sample/avatars" />
+        tools:ignore="MissingConstraints" />
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index f9ccd9e545..a6bd6afae4 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -45,8 +45,7 @@
         android:contentDescription="@string/avatar"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="parent"
-        tools:src="@tools:sample/avatars" />
+        app:layout_constraintEnd_toStartOf="parent" />
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 50fb5d27b0..b137689d9d 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -47,7 +47,7 @@
         app:layout_constraintEnd_toStartOf="@+id/composerRelatedMessageTitle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/composerRelatedMessageTitle"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 0a4206b8c0..6f35eab176 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -40,7 +40,7 @@
             android:transitionName="profile"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <TextView
             android:id="@+id/homeDrawerUsernameView"
@@ -55,7 +55,7 @@
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
             app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderAvatarView"
-            tools:text="@sample/matrix.json/data/displayName" />
+            tools:text="@sample/users.json/data/displayName" />
 
         <TextView
             android:id="@+id/homeDrawerUserIdView"
@@ -70,7 +70,7 @@
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
             app:layout_constraintTop_toBottomOf="@+id/homeDrawerUsernameView"
-            tools:text="@sample/matrix.json/data/mxid" />
+            tools:text="@sample/users.json/data/id" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/homeDrawerQRCodeButton"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index cf99fbd64b..398aaf2c4a 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -58,7 +58,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         tools:alpha="1"
-                        tools:src="@tools:sample/avatars" />
+                        tools:src="@sample/room_round_avatars" />
 
                     <im.vector.app.core.ui.views.ShieldImageView
                         android:id="@+id/matrixProfileDecorationToolbarAvatarImageView"
@@ -87,7 +87,7 @@
                         app:layout_constraintStart_toEndOf="@+id/matrixProfileToolbarAvatarImageView"
                         app:layout_constraintTop_toTopOf="parent"
                         tools:alpha="1"
-                        tools:text="@sample/matrix.json/data/roomName" />
+                        tools:text="@sample/rooms.json/data/name" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 85ec04ba50..b2d24f5218 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -26,14 +26,14 @@
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />
 
         <ImageView
             android:id="@+id/matrixToBetaTag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_vertical_margin_big"
-            android:importantForAccessibility="no"
+            android:contentDescription="@string/a11y_beta"
             android:src="@drawable/ic_beta_pill"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
@@ -52,7 +52,7 @@
             android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
-            tools:text="@sample/matrix.json/data/roomName" />
+            tools:text="@sample/rooms.json/data/name" />
 
         <TextView
             android:id="@+id/matrixToCardAliasText"
@@ -67,7 +67,8 @@
             android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
             app:layout_goneMarginTop="0dp"
-            tools:text="@sample/matrix.json/data/roomAlias" />
+            tools:text="@sample/rooms.json/data/alias"
+            tools:visibility="visible" />
 
         <LinearLayout
             android:id="@+id/matrixToMemberPills"
@@ -117,7 +118,7 @@
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
             app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
-            tools:text="@sample/matrix.json/data/roomTopic" />
+            tools:text="@sample/rooms.json/data/topic" />
 
         <ImageView
             android:id="@+id/knownMember5"
@@ -128,7 +129,7 @@
             app:layout_constraintCircleAngle="90"
             app:layout_constraintCircleRadius="20dp"
             tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars"
+            tools:src="@sample/user_round_avatars"
             tools:visibility="gone" />
 
         <ImageView
@@ -140,7 +141,7 @@
             app:layout_constraintCircleAngle="90"
             app:layout_constraintCircleRadius="20dp"
             tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars"
+            tools:src="@sample/user_round_avatars"
             tools:visibility="gone" />
 
         <ImageView
@@ -152,7 +153,7 @@
             app:layout_constraintCircleAngle="90"
             app:layout_constraintCircleRadius="20dp"
             tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <ImageView
             android:id="@+id/knownMember2"
@@ -163,7 +164,7 @@
             app:layout_constraintCircleAngle="90"
             app:layout_constraintCircleRadius="20dp"
             tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <ImageView
             android:id="@+id/knownMember1"
@@ -173,19 +174,21 @@
             android:contentDescription="@string/avatar"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/matrixToCardDescText"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
+        <!-- layout_goneMarginStart: add half the width of the avatar: 15dp -->
         <TextView
             android:id="@+id/peopleYouMayKnowText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="10dp"
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="@id/knownMember1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/knownMember5"
             app:layout_constraintTop_toTopOf="@id/knownMember1"
+            app:layout_goneMarginStart="25dp"
             tools:text="7 people you may know" />
 
         <im.vector.app.core.platform.ButtonStateView
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
index 03599779f1..ecc3a6ccc1 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/matrixToCardNameText"
@@ -32,7 +32,7 @@
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixToCardUserIdText"
@@ -47,7 +47,7 @@
         android:textColor="?riotx_text_secondary"
         android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/matrixToCardSendMessageButton"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 11d97c9f4b..75b14752a4 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -32,7 +32,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@sample/room_round_avatars" />
 
             <im.vector.app.core.ui.views.ShieldImageView
                 android:id="@+id/roomToolbarDecorationImageView"
@@ -58,7 +58,7 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="@sample/matrix.json/data/roomName" />
+                tools:text="@sample/rooms.json/data/name" />
 
             <TextView
                 android:id="@+id/roomToolbarSubtitleView"
@@ -75,7 +75,7 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
                 app:layout_constraintTop_toBottomOf="@+id/roomToolbarTitleView"
-                tools:text="@sample/matrix.json/data/roomTopic" />
+                tools:text="@sample/rooms.json/data/topic" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 55dcc560e3..dc23a8f33f 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -32,7 +32,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/room_round_avatars" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewToolbarTitle"
@@ -49,7 +49,7 @@
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toEndOf="@+id/roomPreviewNoPreviewToolbarAvatar"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/matrix.json/data/displayName" />
+                    tools:text="@sample/users.json/data/displayName" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -82,7 +82,7 @@
                     android:layout_height="128dp"
                     android:layout_marginTop="60dp"
                     android:importantForAccessibility="no"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/room_round_avatars" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewName"
@@ -93,7 +93,7 @@
                     android:textAppearance="@style/TextAppearance.Vector.Title"
                     android:textSize="15sp"
                     android:textStyle="bold"
-                    tools:text="@sample/matrix.json/data/roomName" />
+                    tools:text="@sample/rooms.json/data/name" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewTopic"
@@ -104,7 +104,7 @@
                     android:gravity="center"
                     android:textAppearance="@style/TextAppearance.Vector.Subtitle"
                     android:textSize="15sp"
-                    tools:text="@sample/matrix.json/data/roomTopic" />
+                    tools:text="@sample/rooms.json/data/topic" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewLabel"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 9c3827f919..1ecd8f1719 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -5,7 +5,7 @@
     android:id="@+id/rootConstraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?riotx_header_panel_background">
+    android:background="?riotx_background">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/roomSettingsToolbar"
@@ -32,7 +32,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@sample/room_round_avatars" />
 
             <im.vector.app.core.ui.views.ShieldImageView
                 android:id="@+id/roomSettingsDecorationToolbarAvatarImageView"
@@ -57,7 +57,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/roomSettingsToolbarAvatarImageView"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="@sample/matrix.json/data/roomName" />
+                tools:text="@sample/rooms.json/data/name" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index d6af178308..39ba60f1a7 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -37,7 +37,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/room_round_avatars" />
 
                 <im.vector.app.core.ui.views.ShieldImageView
                     android:id="@+id/roomUploadsDecorationToolbarAvatarImageView"
@@ -62,7 +62,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/roomUploadsToolbarAvatarImageView"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/matrix.json/data/roomName" />
+                    tools:text="@sample/rooms.json/data/name" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 6619d06cca..eb21470ba5 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -10,7 +10,7 @@
         android:id="@+id/roomList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?riotx_header_panel_background"
+        android:background="?riotx_background"
         android:overScrollMode="always"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/item_room_to_add_in_space" />
@@ -63,7 +63,7 @@
                     android:maxLines="1"
                     android:textColor="?riotx_text_secondary"
                     android:textSize="16sp"
-                    tools:text="@sample/matrix.json/data/spaceName" />
+                    tools:text="@sample/spaces.json/data/name" />
 
             </LinearLayout>
 
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 7e89ab9070..765b5f607c 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -46,7 +46,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/space_avatars" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewToolbarTitle"
@@ -63,7 +63,7 @@
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toEndOf="@+id/spacePreviewToolbarAvatar"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/matrix.json/data/displayName" />
+                    tools:text="@sample/users.json/data/displayName" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 6b92712d3a..e77b51591c 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -69,7 +69,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/showUserCodeCardTopBarrier"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/showUserCodeCardTopBarrier"
@@ -109,7 +109,7 @@
                     android:textColor="?riotx_text_primary"
                     android:textSize="15sp"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/matrix.json/data/displayName" />
+                    tools:text="@sample/users.json/data/displayName" />
 
                 <TextView
                     android:id="@+id/showUserCodeCardUserIdText"
@@ -124,7 +124,7 @@
                     android:textColor="?riotx_text_secondary"
                     android:textSize="15sp"
                     app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
-                    tools:text="@sample/matrix.json/data/mxid" />
+                    tools:text="@sample/users.json/data/id" />
 
 
                 <!--                android:id="@+id/itemShareQrCodeImage"-->
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 4fc7d45f07..e15db581fd 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -14,7 +14,7 @@
         android:layout_height="28dp"
         android:layout_gravity="center_vertical"
         android:importantForAccessibility="no"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index c2175d495e..2d2b33141b 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -20,7 +20,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_sender"
@@ -37,7 +37,8 @@
         app:layout_constraintEnd_toStartOf="@+id/bottom_sheet_message_preview_timestamp"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toTopOf="@id/bottom_sheet_message_preview_avatar"
-        tools:text="@tools:sample/full_names" />
+        tools:fontFamily="sans-serif"
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_timestamp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index de3b27d368..9e98774eaf 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -23,7 +23,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/bottomSheetRoomPreviewName"
@@ -41,7 +41,8 @@
         app:layout_constraintEnd_toStartOf="@+id/bottomSheetRoomPreviewLowPriority"
         app:layout_constraintStart_toEndOf="@id/bottomSheetRoomPreviewAvatar"
         app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar"
-        tools:text="@tools:sample/full_names" />
+        tools:fontFamily="sans-serif"
+        tools:text="@sample/rooms.json/data/name" />
 
     <ImageView
         android:id="@+id/bottomSheetRoomPreviewLowPriority"
diff --git a/vector/src/main/res/layout/item_breadcrumbs.xml b/vector/src/main/res/layout/item_breadcrumbs.xml
index 8bb1b93fb5..d615657a7b 100644
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@@ -34,7 +34,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/breadcrumbsUnreadCounterBadgeView"
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index c6a16bdb69..09ff80ec54 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -24,7 +24,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/contactDetailMatrixId"
@@ -40,7 +40,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/contactDetailName"
         app:layout_constraintTop_toBottomOf="@+id/contactDetailName"
-        tools:text="@sample/matrix.json/data/mxid"
+        tools:text="@sample/users.json/data/id"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index 8db2080b47..812325d16a 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -18,7 +18,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/contactDisplayName"
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 041d0c59b5..556a344359 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -25,7 +25,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <ImageView
             android:id="@+id/createDirectRoomUserAvatarChecked"
@@ -55,7 +55,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/createDirectRoomUserAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/createDirectRoomUserID"
@@ -70,6 +70,6 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/createDirectRoomUserName"
         app:layout_constraintTop_toBottomOf="@+id/createDirectRoomUserName"
-        tools:text="Blabla" />
+        tools:text="@sample/users.json/data/id" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_display_read_receipt.xml b/vector/src/main/res/layout/item_display_read_receipt.xml
index 7058b8b86f..58ddf8e5ad 100644
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@@ -17,12 +17,12 @@
         android:layout_height="32dp"
         android:layout_marginEnd="8dp"
         android:contentDescription="@string/avatar"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/readReceiptName"
         style="@style/BottomSheetItemTextMain"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/readReceiptDate"
diff --git a/vector/src/main/res/layout/item_editable_avatar.xml b/vector/src/main/res/layout/item_editable_avatar.xml
index 7c067cc46c..b19279989e 100644
--- a/vector/src/main/res/layout/item_editable_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_avatar.xml
@@ -34,7 +34,7 @@
             android:importantForAccessibility="no"
             android:scaleType="center"
             tools:alpha="0.3"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
     </FrameLayout>
 
diff --git a/vector/src/main/res/layout/item_editable_square_avatar.xml b/vector/src/main/res/layout/item_editable_square_avatar.xml
index d931e807ea..bfd806c520 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -28,7 +28,7 @@
             android:importantForAccessibility="no"
             android:scaleType="fitCenter"
             tools:alpha="0.3"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/space_avatars" />
 
     </FrameLayout>
 
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index d0520d2dba..5da2583fd3 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -20,7 +20,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:maxLines="2"
-        tools:text="@sample/matrix.json/data/roomTopic" />
+        tools:text="@sample/rooms.json/data/topic" />
 
     <ImageView
         android:id="@+id/expandableArrow"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index cc662680bb..54eabd703d 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -50,7 +50,7 @@
         android:id="@+id/formSwitchDivider"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?riotx_header_panel_border_mobile"
+        android:background="?vctr_list_divider_color"
         app:layout_constraintBottom_toBottomOf="parent"
         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 0dd0313fe4..7e5a55fd24 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -58,7 +58,8 @@
         app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/item_generic_title_text"
-        tools:text="At totam delectus et aliquid dolorem. Consectetur voluptas tempore et non blanditiis id optio. Dolorum impedit quidem minus nihil. "
+        tools:maxLines="3"
+        tools:text="@tools:sample/lorem/random"
         tools:visibility="visible" />
 
     <androidx.constraintlayout.widget.Barrier
diff --git a/vector/src/main/res/layout/item_generic_pill_footer.xml b/vector/src/main/res/layout/item_generic_pill_footer.xml
new file mode 100644
index 0000000000..a0b19db32f
--- /dev/null
+++ b/vector/src/main/res/layout/item_generic_pill_footer.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="16dp"
+    android:background="@drawable/rounded_rect_shape_8"
+    android:backgroundTint="?riotx_reaction_background_off"
+    android:orientation="horizontal"
+    android:padding="16dp">
+
+    <ImageView
+        android:id="@+id/itemGenericPillImage"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_info"
+        app:tint="?riotx_text_secondary" />
+
+    <TextView
+        android:id="@+id/itemGenericPillText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:gravity="start"
+        tools:text="@tools:sample/lorem" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 9cd07f3215..c575b4ee23 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -21,7 +21,7 @@
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/groupNameView"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index f20b7cd183..c202be75ff 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -25,7 +25,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <ImageView
             android:id="@+id/knownUserAvatarChecked"
@@ -54,7 +54,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/knownUserAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/knownUserID"
@@ -69,6 +69,6 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/knownUserName"
         app:layout_constraintTop_toBottomOf="@+id/knownUserName"
-        tools:text="Blabla" />
+        tools:text="@sample/users.json/data/id" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 3d9aa0e876..db7c36658a 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -24,7 +24,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/matrixItemAvatarDecoration"
@@ -51,7 +51,7 @@
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginEnd="80dp"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
@@ -69,7 +69,7 @@
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
         app:layout_goneMarginEnd="8dp"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <TextView
         android:id="@+id/matrixItemPowerLevelLabel"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 55e8cecade..7925ea59f3 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -24,7 +24,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/matrixItemAvatarDecoration"
@@ -51,7 +51,7 @@
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginEnd="80dp"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
@@ -69,7 +69,7 @@
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
         app:layout_goneMarginEnd="8dp"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <ProgressBar
         android:id="@+id/matrixItemProgress"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index a65115e1da..ca714ba2af 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -21,7 +21,7 @@
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/itemPublicRoomName"
@@ -39,7 +39,7 @@
         app:layout_constraintStart_toEndOf="@id/itemPublicRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@sample/matrix.json/data/roomName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <TextView
         android:id="@+id/itemPublicRoomTopic"
@@ -57,7 +57,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
         app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomName"
-        tools:text="@sample/matrix.json/data/roomTopic"
+        tools:text="@sample/rooms.json/data/topic"
         tools:visibility="visible" />
 
     <TextView
@@ -93,7 +93,7 @@
         app:layout_constraintBaseline_toBaselineOf="@+id/itemPublicRoomMembersCount"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount"
-        tools:text="@sample/matrix.json/data/roomAlias" />
+        tools:text="@sample/rooms.json/data/alias" />
 
     <im.vector.app.core.platform.ButtonStateView
         android:id="@+id/itemPublicRoomButtonState"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 4e20d270cd..4cfd2cf1bc 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -35,7 +35,7 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />
 
         <ImageView
             android:id="@+id/roomAvatarCheckedImageView"
@@ -60,6 +60,7 @@
         app:layout_constraintCircleRadius="30dp"
         tools:ignore="MissingConstraints" />
 
+    <!-- Note: this is always gone now -->
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/roomAvatarDecorationImageView"
         android:layout_width="24dp"
@@ -67,7 +68,23 @@
         app:layout_constraintCircle="@id/roomAvatarContainer"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="28dp"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints"
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/roomAvatarPublicDecorationImageView"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:background="@drawable/background_circle"
+        android:contentDescription="@string/a11y_public_room"
+        android:padding="2dp"
+        android:src="@drawable/ic_public_room"
+        android:visibility="gone"
+        app:layout_constraintCircle="@id/roomAvatarContainer"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="28dp"
+        tools:ignore="MissingConstraints"
+        tools:visibility="visible" />
 
     <!-- Margin bottom does not work, so I use space -->
     <Space
@@ -97,7 +114,7 @@
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <ImageView
         android:id="@+id/roomDraftBadge"
@@ -162,7 +179,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomNameView"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/messages.json/data/message" />
 
     <TextView
         android:id="@+id/roomTypingView"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 2654fb6997..0e679927b8 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -19,7 +19,7 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <!-- Margin bottom does not work, so I use space -->
     <Space
@@ -50,7 +50,7 @@
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomInvitationAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <TextView
         android:id="@+id/roomInvitationSubTitle"
@@ -64,7 +64,7 @@
         app:layout_constraintEnd_toEndOf="@+id/roomInvitationNameView"
         app:layout_constraintStart_toStartOf="@+id/roomInvitationNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomInvitationNameView"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/rooms.json/data/topic" />
 
     <!-- Margin bottom does not work, so I use space -->
     <Space
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index 7d1c04468c..5560feddcb 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -20,7 +20,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/itemAddRoomRoomNameText"
@@ -38,7 +38,7 @@
         app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@sample/matrix.json/data/roomName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <ImageView
         android:id="@+id/itemAddRoomRoomCheckBox"
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml b/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml
index 9ddce4ba18..e5b1d65a1f 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml
@@ -1,7 +1,6 @@
 <?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/itemPublicRoomLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -28,29 +27,10 @@
         android:layout_marginStart="17dp"
         android:layout_marginEnd="40dp"
         android:background="@drawable/rounded_rect_shape_8"
-        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/itemAddRoomRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@sample/matrix.json/data/roomName" />
-
-    <!--    <ImageView-->
-    <!--        android:id="@+id/itemAddRoomRoomCheckBox"-->
-    <!--        android:layout_width="20dp"-->
-    <!--        android:layout_height="20dp"-->
-    <!--        android:layout_marginEnd="16dp"-->
-    <!--        android:importantForAccessibility="no"-->
-    <!--        android:src="@drawable/ic_checkbox_off"-->
-    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--        app:layout_constraintEnd_toEndOf="parent"-->
-    <!--        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"-->
-    <!--        app:layout_constraintTop_toTopOf="parent" />-->
-
+        app:layout_constraintVertical_chainStyle="packed" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
new file mode 100644
index 0000000000..8513649ad1
--- /dev/null
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -0,0 +1,73 @@
+<?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/itemPublicRoomLayout"
+    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="50dp">
+
+    <ImageView
+        android:id="@+id/itemAddRoomRoomAvatar"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="16dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/itemAddRoomRoomNameText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="17dp"
+        android:layout_marginEnd="4dp"
+        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_toStartOf="@+id/itemManageRoomSuggested"
+        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@sample/rooms.json/data/name" />
+
+    <TextView
+        android:id="@+id/itemManageRoomSuggested"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
+        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        android:text="@string/space_suggested" />
+
+    <ImageView
+        android:id="@+id/itemAddRoomRoomCheckBox"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginEnd="16dp"
+        android:contentDescription="@string/a11y_checked"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/itemManageRoomSuggested"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_checkbox_on" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index 3e89ab4ba4..1837175b71 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -15,7 +15,7 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/messageMemberNameView"
@@ -33,7 +33,7 @@
         app:layout_constraintEnd_toStartOf="@+id/messageTimeView"
         app:layout_constraintStart_toEndOf="@+id/messageAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/messageTimeView"
@@ -58,6 +58,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/messageMemberNameView"
         app:layout_constraintTop_toBottomOf="@+id/messageMemberNameView"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/messages.json/data/message" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 73b0750cbd..1fd9df247c 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -24,7 +24,7 @@
     <TextView
         android:id="@+id/itemSimpleReactionInfoMemberName"
         style="@style/BottomSheetItemTextMain"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/itemSimpleReactionInfoTime"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 91952391be..d2ce67e703 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -31,7 +31,7 @@
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toEndOf="@id/indent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/space_avatars" />
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/groupCounterBadge"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 77e260d9fd..4ae5f8e9a2 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -1,47 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp">
+    android:orientation="vertical"
+    android:paddingStart="16dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp">
 
-    <FrameLayout
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/rounded_rect_stroke_8"
-        android:padding="8dp">
+        android:layout_marginTop="8dp"
+        android:text="@string/spaces_header"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:drawableEndCompat="@drawable/ic_beta_pill" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="vertical">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/spaces_beta_welcome_to_spaces_desc"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_beta_pill" />
+    <TextView
+        android:id="@+id/spaceBetaFeedbackAction"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawablePadding="8dp"
+        android:paddingStart="0dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp"
+        android:text="@string/give_feedback"
+        android:textColor="@color/vector_info_color"
+        android:textSize="15sp"
+        app:drawableStartCompat="@drawable/ic_feedback" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/spaces_beta_welcome_to_spaces"
-                android:textColor="?riotx_text_primary"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:text="@string/spaces_beta_welcome_to_spaces_desc"
-                android:textColor="?riotx_text_secondary"
-                android:textSize="15sp" />
-        </LinearLayout>
-
-    </FrameLayout>
-
-
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index e12653077e..536a749344 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -37,7 +37,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="MissingPrefix"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />
 
         <TextView
             android:id="@+id/childRoomName"
@@ -57,7 +57,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/childRoomAvatar"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/full_names" />
+            tools:text="@sample/rooms.json/data/name" />
 
         <TextView
             android:id="@+id/childRoomTopic"
@@ -71,7 +71,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="@+id/childRoomName"
             app:layout_constraintTop_toBottomOf="@+id/childRoomName"
-            tools:text="@sample/matrix.json/data/roomTopic" />
+            tools:text="@sample/rooms.json/data/topic" />
 
         <ImageView
             android:id="@+id/spaceChildMemberCountIcon"
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index 5dcf2fa4c6..f364dccdf5 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -32,7 +32,7 @@
         app:layout_constraintStart_toEndOf="@id/childSpaceTab"
         app:layout_constraintTop_toTopOf="@id/childSpaceName"
         tools:ignore="MissingPrefix"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/space_avatars" />
 
     <View
         android:layout_width="2dp"
@@ -62,6 +62,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/childSpaceAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/spaces.json/data/name" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 27b21ece9b..fd451e7b93 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -44,6 +44,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/spaceSummaryMemberCountIcon"
-        tools:text="@sample/matrix.json/data/roomTopic" />
+        tools:text="@sample/spaces.json/data/topic" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
new file mode 100644
index 0000000000..33f9e0c469
--- /dev/null
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemGroupLayout"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:background="@drawable/bg_space_item"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground">
+
+    <Space
+        android:id="@+id/indent"
+        android:layout_width="20dp"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/groupAvatarImageView"
+        android:layout_width="26dp"
+        android:layout_height="26dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:contentDescription="@string/avatar"
+        android:duplicateParentState="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/indent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/space_avatars" />
+
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+        android:id="@+id/groupCounterBadge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:gravity="center"
+        android:minWidth="16dp"
+        android:minHeight="16dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        android:textColor="@android:color/white"
+        android:textSize="10sp"
+        android:visibility="gone"
+        app:layout_constraintCircle="@+id/groupAvatarImageView"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="14dp"
+        tools:background="@drawable/bg_unread_highlight"
+        tools:text="147"
+        tools:visibility="visible" />
+
+
+    <TextView
+        android:id="@+id/groupNameView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
+        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@tools:sample/lorem/random" />
+
+    <ImageView
+        android:id="@+id/groupChildrenCollapse"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:background="?selectableItemBackground"
+        android:clickable="true"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_expand_less_white"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/groupTmpLeave"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix"
+        tools:src="@drawable/ic_expand_more_white"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/groupTmpLeave"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="4dp"
+        android:background="?selectableItemBackground"
+        android:clickable="true"
+        android:importantForAccessibility="no"
+        android:padding="4dp"
+        android:src="@drawable/ic_more_vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/groupAvatarChevron"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_secondary" />
+
+    <ImageView
+        android:id="@+id/groupAvatarChevron"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="21dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_arrow_right"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
+
+<!--    <View-->
+<!--        android:id="@+id/groupBottomSeparator"-->
+<!--        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" />-->
+
+</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index e694e34c13..dd1c5ba01e 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -22,7 +22,7 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />
 
     </FrameLayout>
 
@@ -55,7 +55,7 @@
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/suggestedRoomDescription"
@@ -70,7 +70,7 @@
         app:layout_constraintEnd_toStartOf="@id/joinSuggestedRoomButton"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomNameView"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/rooms.json/data/topic" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/joinSuggestedRoomButton"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 282c3f6140..2cd211288f 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -22,7 +22,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
         android:contentDescription="@string/avatar"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/messageMemberNameView"
@@ -39,7 +39,7 @@
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/messageTimeView"
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index 78d0d4458d..978719989a 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -12,7 +12,7 @@
         android:layout_height="40dp"
         android:layout_gravity="center_horizontal"
         android:contentDescription="@string/avatar"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/itemCallCreatorNameTextView"
@@ -25,7 +25,7 @@
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
 
     <TextView
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index 01b6e63aaa..34c2f4d698 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -13,7 +13,7 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/avatars" />
+        tools:srcCompat="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/itemDefaultTextView"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index b9c5f039e9..24784a3029 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -35,7 +35,7 @@
             android:importantForAccessibility="no"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/creationEncryptionTile"
-            tools:srcCompat="@tools:sample/avatars" />
+            tools:srcCompat="@sample/room_round_avatars" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/creationTileSetAvatarButton"
@@ -73,7 +73,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/creationTileRoomAvatarImageView"
-            tools:text="@sample/matrix.json/data/roomName" />
+            tools:text="@sample/rooms.json/data/name" />
 
         <TextView
             android:id="@+id/roomNameDescriptionText"
@@ -153,7 +153,7 @@
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:contentDescription="@string/avatar"
-            tools:srcCompat="@tools:sample/avatars" />
+            tools:srcCompat="@sample/user_round_avatars" />
 
         <TextView
             android:id="@+id/itemNoticeTextView"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index 530a72351a..7c940f5dbf 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -13,7 +13,7 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/avatars" />
+        tools:srcCompat="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/itemNoticeTextView"
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 42cf24d027..404c2477e8 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:textColor="?riotx_text_primary"
         android:textSize="14sp"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/messages.json/data/message" />
 
     <im.vector.app.features.home.room.detail.timeline.url.PreviewUrlView
         android:id="@+id/messageUrlPreview"
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index 4387577d51..c183463217 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -21,7 +21,7 @@
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <TextView
         android:id="@+id/itemUnknownRoomName"
@@ -39,7 +39,7 @@
         app:layout_constraintStart_toEndOf="@id/itemUnknownRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@sample/matrix.json/data/roomName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <View
         android:id="@+id/itemPublicRoomBottomSeparator"
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 2300036beb..98bbf901d8 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -19,7 +19,7 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/itemUserId"
@@ -37,7 +37,7 @@
         app:layout_constraintStart_toEndOf="@+id/itemUserAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <TextView
         android:id="@+id/itemUserName"
@@ -53,7 +53,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/itemUserAvatar"
         app:layout_constraintTop_toBottomOf="@+id/itemUserId"
-        tools:text="@sample/matrix.json/data/displayName"
+        tools:text="@sample/users.json/data/displayName"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 3028fb7953..7af3262248 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <TextView
         android:id="@+id/inviteNameView"
@@ -30,7 +30,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteAvatarView"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/inviteIdentifierView"
@@ -43,7 +43,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteNameView"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <TextView
         android:id="@+id/inviteLabelView"
diff --git a/vector/src/main/res/layout/vector_message_merge_avatar_list.xml b/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
index 0ed0c87d5d..a9907b31a3 100644
--- a/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
+++ b/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
@@ -12,7 +12,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/mels_list_avatar_2"
@@ -23,7 +23,7 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/mels_list_avatar_3"
@@ -34,7 +34,7 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/mels_list_avatar_4"
@@ -45,7 +45,7 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/mels_list_avatar_5"
@@ -56,6 +56,6 @@
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/vector_settings_round_avatar.xml b/vector/src/main/res/layout/vector_settings_round_avatar.xml
index 3349e092f9..596eef5d3c 100644
--- a/vector/src/main/res/layout/vector_settings_round_avatar.xml
+++ b/vector/src/main/res/layout/vector_settings_round_avatar.xml
@@ -11,7 +11,7 @@
         android:adjustViewBounds="true"
         android:contentDescription="@string/avatar"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ProgressBar
         android:id="@+id/avatar_update_progress_bar"
diff --git a/vector/src/main/res/layout/view_read_marker.xml b/vector/src/main/res/layout/view_read_marker.xml
index d9c25b4be8..bea00fbb15 100644
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ b/vector/src/main/res/layout/view_read_marker.xml
@@ -21,7 +21,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar4"
@@ -30,7 +30,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar3"
@@ -39,7 +39,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar2"
@@ -48,7 +48,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar1"
@@ -57,6 +57,6 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
 </merge>
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index ac4351b379..6e674406fa 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -26,7 +26,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar4"
@@ -36,7 +36,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar3"
@@ -46,7 +46,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar2"
@@ -56,7 +56,7 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar1"
@@ -66,6 +66,6 @@
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
         android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />
 
 </merge>
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 7df09721be..c31f25d24b 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -28,7 +28,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="spread_inside"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />
 
         <im.vector.app.core.ui.views.ShieldImageView
             android:id="@+id/memberProfileDecorationImageView"
@@ -51,7 +51,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/memberProfileAvatarView"
-            tools:text="@sample/matrix.json/data/displayName" />
+            tools:text="@sample/users.json/data/displayName" />
 
         <TextView
             android:id="@+id/memberProfileIdView"
@@ -67,7 +67,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/memberProfileNameView"
-            tools:text="@sample/matrix.json/data/mxid" />
+            tools:text="@sample/users.json/data/id" />
 
         <TextView
             android:id="@+id/memberProfilePowerLevelView"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index e3f16882ee..0812b0d4e2 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -18,7 +18,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/roomProfileDecorationImageView"
@@ -41,7 +41,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/roomProfileAvatarView"
-        tools:text="@sample/matrix.json/data/roomName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <TextView
         android:id="@+id/roomProfileAliasView"
@@ -57,6 +57,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/roomProfileNameView"
-        tools:text="@sample/matrix.json/data/roomAlias" />
+        tools:text="@sample/rooms.json/data/alias" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/menu/menu_manage_space.xml b/vector/src/main/res/menu/menu_manage_space.xml
new file mode 100644
index 0000000000..858c3bc9c3
--- /dev/null
+++ b/vector/src/main/res/menu/menu_manage_space.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_delete"
+        android:title="@string/delete"
+        android:icon="@drawable/ic_delete_unsent_messages"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/action_mark_as_suggested"
+        android:title="@string/space_mark_as_suggested"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_mark_as_not_suggested"
+        android:title="@string/space_mark_as_not_suggested"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 4e74426e9a..d82181d374 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -11,9 +11,9 @@
     <string name="notice_room_unban">رفعَ ⁨%1$s⁩ المنع عن ⁨%2$s⁩</string>
     <string name="notice_room_ban">منعَ ⁨%1$s⁩ ⁨%2$s⁩</string>
     <string name="notice_avatar_url_changed">غيّر ⁨%1$s⁩ صورته الشخصية</string>
-    <string name="notice_display_name_changed_from">إنَّ %1$s قد غيَّرَ اسمه الظاهر من %2$s إلى %3$s</string>
-    <string name="notice_display_name_removed">إنَّ %1$s قد أزالَ اسمه الظاهر (لقد كان %2$s)</string>
-    <string name="notice_room_topic_changed">إنَّ %1$s قد غيَّرَ الموضوع إلى: %2$s</string>
+    <string name="notice_display_name_changed_from">غيّر %1$s اسمه الظاهر من %2$s إلى %3$s</string>
+    <string name="notice_display_name_removed">أزال %1$s اسمه الظاهر (كان %2$s)</string>
+    <string name="notice_room_topic_changed">غيّر %1$s الموضوع إلى: %2$s</string>
     <string name="notice_room_name_changed">إنَّ %1$s قد غيَّرَ اسم الغُرفة إلى: %2$s</string>
     <string name="notice_answered_call">إنَّ %s قد أجابَ على المُكالمة.</string>
     <string name="notice_ended_call">إنَّ %s قد أنهى المُكالمة.</string>
@@ -74,10 +74,10 @@
     <string name="notice_room_ban_by_you">منعتَ ⁨%1$s⁩</string>
     <string name="notice_room_withdraw_by_you">سحبتَ الدعوة الموجّهة إلى ⁨%1$s⁩</string>
     <string name="notice_avatar_url_changed_by_you">غيّرتَ صورتك الشخصية</string>
-    <string name="notice_display_name_set_by_you">أنتَ قد عيَّنتَ اسمك الظاهر إلى %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">أنتَ قد غيّرتَ اسمك الظاهر من ⁨%1$s⁩ إلى ⁨%2$s⁩</string>
-    <string name="notice_display_name_removed_by_you">أنتَ قد أزلتَ اسمك الظاهر (لقد كان ⁨%1$s⁩)</string>
-    <string name="notice_room_topic_changed_by_you">أنتَ قد غيَّرتَ الموضوع إلى: ⁨%1$s⁩</string>
+    <string name="notice_display_name_set_by_you">عيَّنتَ اسمك الظاهر إلى %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">غيّرتَ اسمك الظاهر من ⁨%1$s⁩ إلى ⁨%2$s⁩</string>
+    <string name="notice_display_name_removed_by_you">أزلتَ اسمك الظاهر (كان ⁨%1$s⁩)</string>
+    <string name="notice_room_topic_changed_by_you">غيَّرتَ الموضوع إلى: ⁨%1$s⁩</string>
     <string name="notice_room_avatar_changed">إنَّ %1$s قد غيَّرَ صورة الغُرفة</string>
     <string name="notice_room_avatar_changed_by_you">أنتَ قد غيَّرتَ صورة الغُرفة</string>
     <string name="notice_room_name_changed_by_you">أنتَ قد غيَّرتَ اسم الغُرفة إلى: %1$s</string>
@@ -1128,4 +1128,11 @@
     <string name="title_activity_keys_backup_setup">نسخ إحتياطي للمفتاح</string>
     <string name="notification_sync_init">جاري إعداد الخدمة</string>
     <string name="system_theme">إفتراضي النظام</string>
+    <string name="notice_room_canonical_alias_set">غير %1$s عنوان الغرفة الى %2$s.</string>
+    <string name="event_status_sent_message">أُرسلت الرسالة</string>
+    <string name="initial_sync_start_downloading">المزامنة الأولية:
+\nينزل البيانات…</string>
+    <string name="initial_sync_start_server_computing">المزامنة الأولية:
+\nينتظر رد الخادم…</string>
+    <string name="notice_display_name_set">غير %1$s اسمه الى %2$s</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 812cb4b531..f87c4bdd21 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -2741,4 +2741,13 @@
     <string name="event_status_a11y_sent">Enviat</string>
     <string name="event_status_a11y_sending">Enviant</string>
     <string name="event_status_sent_message">Missatge enviat</string>
+    <string name="search_hint_room_name">Cerca nom</string>
+    <string name="room_settings_room_access_public_description">Qualsevol pot trobar la sala i unir-s\'hi</string>
+    <string name="room_settings_room_access_private_title">Privat</string>
+    <string name="room_settings_room_access_public_title">Públic</string>
+    <string name="room_settings_room_access_private_description">Només els convidats poden trobar-la i unir-s\'hi</string>
+    <string name="room_settings_room_access_entry_knock">Qualsevol pot demanar entrar a la sala, els participants poden acceptar-ho o rebutjar-ho</string>
+    <string name="room_settings_guest_access_title">Permet als convidats unir-se</string>
+    <string name="spaces_invited_header">Invitacions</string>
+    <string name="suggested_header">Sales suggerides</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 0b76b6c019..ae136a0274 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1724,7 +1724,7 @@
     <string name="login_splash_submit">Můžeme začít</string>
     <string name="login_server_title">Vybrat server</string>
     <string name="login_server_text">Jako email, účty mají jeden domov, ačkoli můžete mluvit s kýmkoli</string>
-    <string name="login_server_matrix_org_text">Přidejte se k miliónům svobodným na největším veřejném serveru</string>
+    <string name="login_server_matrix_org_text">Přidejte se bezplatně k miliónům na největším veřejném serveru</string>
     <string name="login_server_modular_text">Prémiový hosting pro organizace</string>
     <string name="login_server_modular_learn_more">Dozvědět se více</string>
     <string name="login_server_other_title">Další</string>
@@ -2724,4 +2724,84 @@
     <string name="settings_room_directory_show_all_rooms">Zobrazit místnosti s explicitním obsahem</string>
     <string name="settings_category_room_directory">Adresář místností</string>
     <string name="event_status_sent_message">Zpráva odeslána</string>
+    <string name="a11y_unchecked">Neoznačeno</string>
+    <string name="labs_use_restricted_join_rule">Experimentální, prostor - omezená místnost.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Prostory jsou způsob organizace místností a lidí k práci, zábavě anebo jen pro Vás.</string>
+    <string name="create_spaces_room_private_header_desc">Založme pro každé místnost. Později můžete přidat i další, včetně již existujících.</string>
+    <string name="create_spaces_room_private_header">Na jakých tématech pracujete\?</string>
+    <string name="create_spaces_room_public_header_desc">Založíme pro ně místnosti. Můžete přidat další později.</string>
+    <string name="create_spaces_details_private_header">Doplňte nějaké podrobnosti, aby jej lidé mohli identifikovat. Můžete je kdykoli změnit.</string>
+    <string name="create_spaces_type_header">Prostory jsou nový způsob organizace místností a lidí</string>
+    <string name="spaces_header">Prostory</string>
+    <string name="labs_use_restricted_join_rule_desc">Varování, nutná podpora serveru a experimentální verze místnosti</string>
+    <string name="you_are_invited">Jste zváni</string>
+    <string name="spaces_beta_welcome_to_spaces">Vítejte v prostorech!</string>
+    <string name="space_add_existing_rooms">Přidat existující místnosti a prostor</string>
+    <string name="space_leave_prompt_msg">Jste si jisti, že chcete opustit tento prostor\?</string>
+    <string name="leave_space">Opustit prostor</string>
+    <string name="space_add_child_title">Přidat místnosti</string>
+    <string name="space_explore_activity_title">Prozkoumat místnosti</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d známá osoba již vstoupila</item>
+        <item quantity="few">%d známé osoby již vstoupily</item>
+        <item quantity="other">%d známých osob již vstoupilo</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Vítejte v %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Zatím nejste v žádné místnosti. Níže uvádíme doporučené místnosti, ale můžete se podívat na další zeleným tlačítkem vpravo dole.</string>
+    <string name="room_alias_preview_not_found">Tento alias není v tuto chvíli přístupný.
+\nZkuste znovu později nebo se obraťte na správce místnosti, máte-li přístup.</string>
+    <string name="join_anyway">I tak vstoupit</string>
+    <string name="join_space">Vstoupit do prostoru</string>
+    <string name="create_space">Založit prostor</string>
+    <string name="skip_for_now">Nyní přeskočit</string>
+    <string name="share_space_link_message">Připojte se k mému prostoru %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">Nebudou součástí %s</string>
+    <string name="invite_just_to_this_room">Jen do této místnosti</string>
+    <string name="invite_to_space_with_name_desc">Budou moci %s prozkoumat</string>
+    <string name="invite_to_space_with_name">Pozvat do %s</string>
+    <string name="invite_by_link">Sdílet odkaz</string>
+    <string name="invite_by_mxid">Pozvat podle uživatelského jména</string>
+    <string name="invite_by_email">Pozvat emailem</string>
+    <string name="invite_people_to_your_space_desc">V tomto okamžiku jste to jen Vy. %s bude s dalšími lepší.</string>
+    <string name="invite_people_menu">Pozvat lidi</string>
+    <string name="invite_people_to_your_space">Pozvěte do svého prostoru lidi</string>
+    <string name="create_space_topic_hint">Popis</string>
+    <string name="create_spaces_loading_message">Zakládám prostor…</string>
+    <string name="create_spaces_default_public_random_room_name">Nahodilé</string>
+    <string name="create_spaces_default_public_room_name">Obecné</string>
+    <string name="create_spaces_room_public_header">Jaké diskuse si přejete vést v %s\?</string>
+    <string name="create_space_error_empty_field_space_name">Dejte prostoru jméno a pokračujte.</string>
+    <string name="create_spaces_details_public_header">Doplňte nějaké podrobnosti, aby prostor zaujal. Můžete je kdykoli změnit.</string>
+    <string name="activity_create_space_title">Založit prostor</string>
+    <string name="space_type_private_desc">Pouze na pozvání, nejlepší pro Vás nebo týmy</string>
+    <string name="space_type_private">Privátní</string>
+    <string name="space_type_public_desc">Otevřený pro všechny, nejlepší pro komunity</string>
+    <string name="space_type_public">Veřejný</string>
+    <string name="create_spaces_private_teammates">Privátní prostor pro Vás a Vaše kolegy</string>
+    <string name="create_spaces_me_and_teammates">Já a kolegové</string>
+    <string name="create_spaces_organise_rooms">Privátní prostor k organizaci Vašich místností</string>
+    <string name="create_spaces_just_me">Jen já</string>
+    <string name="create_spaces_make_sure_access">Ujistěte se, že ti správní lidé mají přístup do %s. Můžete změnit později.</string>
+    <string name="create_spaces_who_are_you_working_with">S kým pracujete\?</string>
+    <string name="create_spaces_join_info_help">K vstupu do existujícího prostoru potřebujete pozvání.</string>
+    <string name="create_spaces_you_can_change_later">Můžete změnit později</string>
+    <string name="create_spaces_choose_type_label">Jaký typ prostoru chcete založit\?</string>
+    <string name="your_private_space">Váš privátní prostor</string>
+    <string name="your_public_space">Váš veřejný prostor</string>
+    <string name="add_space">Přidat prostor</string>
+    <string name="command_description_leave_room">Opustit místnost s daným id (nebo nynější místnost pokud prázdné)</string>
+    <string name="command_description_join_space">Vstoupit do prostoru s daným id</string>
+    <string name="command_description_create_space">Založit prostor</string>
+    <string name="search_hint_room_name">Hledat jméno</string>
+    <string name="room_settings_room_access_restricted_description">Kdokoli v prostoru s touto místností ji může nalézt a vstoupit. Jen správci místnosti ji mohou připojit k prostoru.</string>
+    <string name="room_settings_room_access_restricted_title">Prostory</string>
+    <string name="room_settings_room_access_public_description">Kdokoli může místnost nalézt a vstoupit</string>
+    <string name="room_settings_room_access_public_title">Veřejná</string>
+    <string name="room_settings_room_access_private_description">Pouze pozvaní mohou místnost nalézt a vstoupit</string>
+    <string name="room_settings_room_access_private_title">Privátní</string>
+    <string name="room_settings_room_access_entry_unknown">Neznámé nastavení přístupu (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Každý může na místnost zaklepat, členové pak mohou přijmout či odmítnout</string>
+    <string name="room_settings_guest_access_title">Dovolit hostům vstoupit</string>
+    <string name="spaces_invited_header">Pozvání</string>
+    <string name="suggested_header">Doporučené místnosti</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 1899bfdf59..9eb7301176 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2736,4 +2736,74 @@
     <string name="event_status_a11y_sending">Wird gesendet</string>
     <string name="event_status_sent_message">Nachricht gesendet</string>
     <string name="call_transfer_consult_first">Zuerst nachfragen</string>
+    <string name="space_type_private">Privat</string>
+    <string name="space_type_public">Öffentlich</string>
+    <string name="create_spaces_you_can_change_later">Du kannst dies später ändern</string>
+    <string name="a11y_unchecked">Ungeprüft</string>
+    <string name="room_settings_room_access_public_description">Jeder kann den Raum finden und beitreten</string>
+    <string name="room_settings_room_access_public_title">Öffentlich</string>
+    <string name="room_settings_room_access_private_description">Nur Eingeladene können es finden und beitreten</string>
+    <string name="room_settings_room_access_private_title">Privat</string>
+    <string name="room_settings_room_access_entry_unknown">Unbekannte Zugriffseinstellung (%s)</string>
+    <string name="room_settings_guest_access_title">Gäste erlauben beizutreten</string>
+    <string name="spaces_invited_header">Einladungen</string>
+    <string name="suggested_header">Vorgeschlagene Räume</string>
+    <string name="spaces_header">Spaces</string>
+    <string name="room_settings_room_access_entry_knock">Jeder kann im Raum anklopfen, Mitglieder können dann zustimmen oder ablehnen</string>
+    <string name="invite_people_to_your_space_desc"></string>
+    <string name="invite_to_space_with_name_desc">Diese werden in der Lage sein %s zu durchsuchen</string>
+    <string name="invite_just_to_this_room_desc">Diese werden kein Teil von %s sein</string>
+    <string name="share_space_link_message">Tritt meinem Space %1$s %2$s bei</string>
+    <string name="suggested_rooms_pills_on_empty_header">Willkommen zu %1$s, %2$s.</string>
+    <string name="labs_use_restricted_join_rule_desc">Warnung benötigt Server Unterstützung und eine experimentelle Raumversion</string>
+    <string name="labs_use_restricted_join_rule">Experimenteller Space - Zugangsbeschränkter Raum.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Mit Spaces hast du die Möglichkeit Personen und Räume für die Arbeit, zum Spaß oder nur für dich selbst zu gruppieren.</string>
+    <string name="spaces_beta_welcome_to_spaces">Sag hallo zu Spaces!</string>
+    <string name="space_add_existing_rooms">Füge bereits existierende Räume und Spaces hinzu</string>
+    <string name="skip_for_now">Vorübergehend überspringen</string>
+    <string name="create_spaces_room_public_header">Über welche Themen möchtest du dich in %s unterhalten\?</string>
+    <string name="create_spaces_details_private_header">Füge ein paar Details hinzu, um die Wiedererkennbarkeit zu steigern. Du kannst die Angaben auch später wieder ändern.</string>
+    <string name="create_spaces_details_public_header">Füge ein paar Details hinzu, um die Wiedererkennbarkeit zu steigern. Du kannst die Angaben auch später wieder ändern.</string>
+    <string name="space_type_private_desc">Zugang nur mit Einladung. Am besten für Teams oder dich selbst</string>
+    <string name="create_spaces_make_sure_access">Stelle sicher, dass die richtigen Personen Zugang zu %s besitzen. Du kannst das später noch ändern.</string>
+    <string name="create_spaces_who_are_you_working_with">Mit wem arbeitest du zusammen\?</string>
+    <string name="command_description_leave_room">Verlasse den Raum mit der angegebenen ID (oder den aktuellen Raum, indem du keine ID angibst)</string>
+    <string name="search_hint_room_name">Name des Spaces</string>
+    <string name="you_are_invited">Du wurdest eingeladen</string>
+    <string name="space_leave_prompt_msg">Bist du dir sicher, dass du den Space verlassen willst\?</string>
+    <string name="leave_space">Space verlassen</string>
+    <string name="space_add_child_title">Räume hinzufügen</string>
+    <string name="space_explore_activity_title">Räume erkunden</string>
+    <string name="suggested_rooms_pills_on_empty_text">Bislang bist du keinem Raum beigetreten. Unterhalb findest du ein paar Raum-Empfehlungen, welche du mit der grünen Taste unten rechts erweitern kannst.</string>
+    <string name="join_anyway">Trotzdem beitreten</string>
+    <string name="join_space">Space beitreten</string>
+    <string name="create_space">Space erzeugen</string>
+    <string name="invite_just_to_this_room">Nur zu diesem Raum</string>
+    <string name="invite_to_space_with_name">Zu %s einladen</string>
+    <string name="invite_by_link">Link teilen</string>
+    <string name="invite_by_mxid">Mithilfe eines Benutzernamens einladen</string>
+    <string name="invite_by_email">Mithilfe einer E-Mail-Adresse einladen</string>
+    <string name="invite_people_menu">Personen einladen</string>
+    <string name="invite_people_to_your_space">Lade Personen in deinen Space ein</string>
+    <string name="create_space_error_empty_field_space_name">Trage einen Namen ein um fortzufahren.</string>
+    <string name="space_type_public_desc">Offen für Jeden. Am Besten für Communities</string>
+    <string name="create_spaces_private_teammates">Ein privater Space für meine Teamkameraden und mich</string>
+    <string name="create_spaces_me_and_teammates">Meine Teamkameraden und ich</string>
+    <string name="create_spaces_organise_rooms">Ein privater Space um deine Räume zu organisieren</string>
+    <string name="create_spaces_join_info_help">Um einem bereits existierenden Space beizutreten, benötigst du eine Einladung.</string>
+    <string name="create_spaces_type_header">Spaces sind eine neue Art Personen und Räume zu gruppieren</string>
+    <string name="your_private_space">Dein Privater space</string>
+    <string name="your_public_space">Dein Öffentliches Space</string>
+    <string name="command_description_join_space">Betrete einen Space mit der angegebenen ID</string>
+    <string name="create_space_topic_hint">Beschreibung</string>
+    <string name="create_spaces_loading_message">Erzeuge Space…</string>
+    <string name="create_spaces_default_public_random_room_name">Irgendetwas</string>
+    <string name="create_spaces_default_public_room_name">Allgemein</string>
+    <string name="activity_create_space_title">Einen Space erstellen</string>
+    <string name="create_spaces_just_me">Nur für mich</string>
+    <string name="create_spaces_choose_type_label">Welche Art von Space möchtest du erstellen\?</string>
+    <string name="add_space">Space hinzufügen</string>
+    <string name="command_description_create_space">Space erstellen</string>
+    <string name="room_settings_room_access_restricted_description">Jeder, der sich in einem Space mit diesem Raum befindet, kann diesen Raum finden und ihm beitreten. Nur die Administratoren des Raums können diesen zu einem Space hinzufügen.</string>
+    <string name="room_settings_room_access_restricted_title">Spaces</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index b2165af837..8047422a1f 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -991,7 +991,7 @@
     <string name="login_splash_submit">Alusta</string>
     <string name="login_server_title">Vali server</string>
     <string name="login_server_text">Nii nagu e-posti puhul, siis kasutajakonto asub ühes serveris, kuid saab suhelda kasutajatega üle ilma</string>
-    <string name="login_server_matrix_org_text">Liitu tasuta miljonite teistega suurimas tasuta Matrix\'i serveris</string>
+    <string name="login_server_matrix_org_text">Liitu tasuta miljonite teistega suurimas avalikus Matrix\'i serveris</string>
     <string name="login_server_modular_text">Tasuline Matrix\'i majutusteenus organisatsioonidele</string>
     <string name="login_server_modular_learn_more">Lisateave</string>
     <string name="login_server_other_title">Muud serverid</string>
@@ -2673,4 +2673,83 @@
     <string name="event_status_a11y_sending">Saadan</string>
     <string name="settings_category_room_directory">Jututubade kataloog</string>
     <string name="event_status_sent_message">Sõnum on saadetud</string>
+    <string name="labs_use_restricted_join_rule_desc">Hoiatus: eeldab serveripoolset tuge ning katselise jututoa versiooni kasutamist</string>
+    <string name="labs_use_restricted_join_rule">Katseline kogukonnakeskus - ligipääs on piiratud.</string>
+    <string name="you_are_invited">Sa oled saanud kutse</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Kogukonnakeskused on võimalus siduda jututubasid ja inimesi nii tööks, meelelahutuseks kui lihtsalt sinu jaoks.</string>
+    <string name="spaces_beta_welcome_to_spaces">Tere tulemast kasutama kogukonnakeskuseid!</string>
+    <string name="space_add_existing_rooms">Lisa olemasolevaid jututubasid ja kogukonnakeskuseid</string>
+    <string name="space_leave_prompt_msg">Kas oled kindel, et soovid lahkuda kogukonnakeskusest\?</string>
+    <string name="leave_space">Lahku kogukonnakeskusest</string>
+    <string name="space_add_child_title">Lisa jututuba</string>
+    <string name="space_explore_activity_title">Uuri jututubasid</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d sinu tuttav on juba liitunud</item>
+        <item quantity="other">%d sinu tuttavat on juba liitunud</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">%2$s, tere tulemast %1$s kogukonnakeskusesse.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Sa ei osale hetkel mitte ainsamaski jututoas. Järgnevas on mõned soovitused, aga sa leiad kogu loendi all paremal asuvast rohelisest nupust.</string>
+    <string name="room_alias_preview_not_found">Sellele jututoale puudub hetkel ligipääs.
+\nProovi hiljem uuesti või küsi jututoa haldajalt, kas sul on olemas selleks vajalikud õigused.</string>
+    <string name="join_anyway">Liitu ikkagi</string>
+    <string name="join_space">Liitu kogukonnakeskusega</string>
+    <string name="create_space">Loo kogukonnakeskus</string>
+    <string name="skip_for_now">Hetkel jäta vahele</string>
+    <string name="share_space_link_message">Palun liitu %1$s kogukonnakeskusega %2$s</string>
+    <string name="invite_just_to_this_room_desc">Nad ei saa osalema %s jututoas</string>
+    <string name="invite_just_to_this_room">Kutse vaid siia jututuppa</string>
+    <string name="invite_to_space_with_name_desc">Nad saavad tutvuda %s kogukonnakeskusega</string>
+    <string name="invite_to_space_with_name">Kutse kasutajale %s</string>
+    <string name="invite_by_link">Jaga linki</string>
+    <string name="invite_by_mxid">Kutsu kasutajanime alusel</string>
+    <string name="invite_by_email">Saada kutse e-kirjaga</string>
+    <string name="invite_people_to_your_space_desc">Hetkel oled siin vaid sina. Aga %s läheb aina paremaks, kui teised liituvad.</string>
+    <string name="invite_people_menu">Kutsu teisi kasutajaid</string>
+    <string name="invite_people_to_your_space">Kutsu inimesi oma kogukonnakeskusega liituma</string>
+    <string name="create_space_topic_hint">Kirjeldus</string>
+    <string name="create_spaces_loading_message">Loon kogukonnakeskust…</string>
+    <string name="create_spaces_default_public_random_room_name">Juhuslik</string>
+    <string name="create_spaces_default_public_room_name">Üldist</string>
+    <string name="create_spaces_room_private_header_desc">Loome nüüd igaühe jaoks jututoa. Sa võid neid ka hiljem lisada, sealhulgas olemasolevaid.</string>
+    <string name="create_spaces_room_private_header">Mis ettevõtmistega sa tegeled\?</string>
+    <string name="create_spaces_room_public_header_desc">Lisame selle jaoks ka jututoad. Sa saad neid veel hiljemgi lisada.</string>
+    <string name="create_spaces_room_public_header">Mis teemal sa sooviksid %s kogukonnakeskuses vestelda\?</string>
+    <string name="create_space_error_empty_field_space_name">Jätkamaks anna talle nimi.</string>
+    <string name="create_spaces_details_private_header">Tuvastamiseks palun lisa natuke teavet. Sa saad seda hiljem muuta ja täiendada.</string>
+    <string name="create_spaces_details_public_header">Eristumiseks palun lisa natuke teavet. Sa saad seda hiljem muuta ja täiendada.</string>
+    <string name="activity_create_space_title">Loo kogukonnakeskus</string>
+    <string name="space_type_private_desc">Liitumine vaid kutse alusel, sobib sulle ja sinu lähematele kaaslastele</string>
+    <string name="space_type_private">Privaatne</string>
+    <string name="space_type_public_desc">Avaliku ligipääsuga kogukonnakeskus</string>
+    <string name="space_type_public">Avalik</string>
+    <string name="create_spaces_private_teammates">Privaatne kogukonnakeskus sinu ja sinu kaasteeliste jaoks</string>
+    <string name="create_spaces_me_and_teammates">Mina ja minu kaasteelised</string>
+    <string name="create_spaces_organise_rooms">Privaatne kogukonnakeskus jututubade koondamiseks</string>
+    <string name="create_spaces_just_me">Vaid mina</string>
+    <string name="create_spaces_make_sure_access">Kontrolli, et vajalikel inimestel oleks ligipääs %s kogukonnakeskusesse. Sa võid seda hiljem muuta.</string>
+    <string name="create_spaces_who_are_you_working_with">Kellega sa koos töötad\?</string>
+    <string name="create_spaces_join_info_help">Olemasoleva kogukonnakeskusega liitumiseks vajad sa kutset.</string>
+    <string name="create_spaces_you_can_change_later">Sa võid seda hiljem muuta</string>
+    <string name="create_spaces_choose_type_label">Missugust kogukonnakeskust sooviksid sa luua\?</string>
+    <string name="create_spaces_type_header">Kogukonnakeskused on uus viis jututubade ja inimeste ühendamiseks</string>
+    <string name="your_private_space">Sinu privaatne kogukonnakeskus</string>
+    <string name="your_public_space">Sinu avalik kogukonnakeskus</string>
+    <string name="add_space">Lisa kogukonnakeskus</string>
+    <string name="command_description_leave_room">Lahku antud tunnusega jututoast (tunnuse puudumisel jututoast, kus hetkel asud)</string>
+    <string name="command_description_join_space">Liitu kogukonnakeskusega tema tunnuse alusel</string>
+    <string name="command_description_create_space">Loo kogukonnakeskus</string>
+    <string name="a11y_unchecked">Pole kontrollitud</string>
+    <string name="search_hint_room_name">Otsi nime alusel</string>
+    <string name="room_settings_room_access_restricted_description">Kõik sellise kogukonnakeskuse liikmed, kuhu see jututuba kuulub, võivad seda leida ja temaga liituda. Ainult selle jututoa haldajad võivad teda kogukonnakeskusesse liita.</string>
+    <string name="room_settings_room_access_restricted_title">Kogukonnakeskused</string>
+    <string name="room_settings_room_access_public_description">Kõik võivad jututuba leida ja sellega liituda</string>
+    <string name="room_settings_room_access_public_title">Avalik</string>
+    <string name="room_settings_room_access_private_description">Jututuba saab leida ja sellega liituda vaid kutsete alusel</string>
+    <string name="room_settings_room_access_private_title">Privaatne</string>
+    <string name="room_settings_room_access_entry_unknown">Tundmatu seadistus ligipääsuks (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Kõik võivad jututoa uksele koputada ning senised liikmed saavad uut liitumist lubada või keelata</string>
+    <string name="room_settings_guest_access_title">Luba külalistel liituda</string>
+    <string name="spaces_header">Kogukonnakeskused</string>
+    <string name="spaces_invited_header">Kutsed</string>
+    <string name="suggested_header">Soovitatud jututoad</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index ee58a8e508..4d1ff806e5 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -2673,4 +2673,83 @@
     <string name="settings_room_directory_show_all_rooms">نمایش‌ها همه‌ی اتاق‌ها</string>
     <string name="settings_category_room_directory">فهرست اتاق‌ها</string>
     <string name="event_status_sent_message">پَیام فِرِستاده شُد</string>
+    <string name="labs_use_restricted_join_rule_desc">هشدار به پشتیبانی سرور و نسخه اتاق آزمایشی نیاز دارد</string>
+    <string name="labs_use_restricted_join_rule">فضای کاری آزمایشی - اتاق محدود.</string>
+    <string name="you_are_invited">شما دعوت شده‌اید</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">فضای‌های کاری روش هایی برای دسته‌بندی اتاق‌ها و افراد برای کار، تفریح یا فقط خودتان است.</string>
+    <string name="spaces_beta_welcome_to_spaces">به فضای‌های کاری خوش‌آمدید!</string>
+    <string name="space_add_existing_rooms">اتاق‌ها و فضای کاری موجود را اضافه کنید</string>
+    <string name="space_leave_prompt_msg">آیا مطمئن هستید که می خواهید فضای کاری را ترک کنید؟</string>
+    <string name="leave_space">خروج از فضای کاری</string>
+    <string name="space_add_child_title">افزودن اتاق</string>
+    <string name="space_explore_activity_title">کاوش در اتاق‌ها</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d نفر از افرادی که می‌شناسید عضو شده‌اند</item>
+        <item quantity="other">%d نفر از کسانی که می‌شناسید عضو شده‌اند</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">%2$s، به %1$s خوش آمدی.</string>
+    <string name="suggested_rooms_pills_on_empty_text">شما هنوز در هیچ اتاقی نیستید. در زیر چند اتاق پیشنهادی وجود دارد، با دکمه سبز پایین سمت راست می توانید موارد بیشتری را مشاهده کنید.</string>
+    <string name="room_alias_preview_not_found">این نام مستعار در حال حاضر قابل دسترسی نیست.
+\nبعداً دوباره امتحان کنید، یا از مدیر اتاق بخواهید که دسترسی شما به آن را بررسی کند.</string>
+    <string name="join_anyway">در هر صورت بپیوند</string>
+    <string name="join_space">پیوستن به فضای کاری</string>
+    <string name="create_space">ساخت فضای کاری</string>
+    <string name="skip_for_now">فعلا رد شوید</string>
+    <string name="share_space_link_message">به فضای کاری %1$s من بپیوند.%2$s</string>
+    <string name="invite_just_to_this_room_desc">آن‌ها بخشی از %s نخواهند شد</string>
+    <string name="invite_just_to_this_room">فقط به این اتاق</string>
+    <string name="invite_to_space_with_name_desc">آنها قادر به کاوش در %s خواهند بود</string>
+    <string name="invite_to_space_with_name">دعوت به %s</string>
+    <string name="invite_by_link">به اشتراک‌گذاری لینک</string>
+    <string name="invite_by_mxid">دعوت با شناسه‌کاربری</string>
+    <string name="invite_by_email">دعوت با ایمیل</string>
+    <string name="invite_people_to_your_space_desc">در حال حاضر فقط شما هستید. %s با دیگران حتی بهتر خواهد بود.</string>
+    <string name="invite_people_menu">دعوت افراد</string>
+    <string name="invite_people_to_your_space">افراد را به فضای کاری خود دعوت کنید</string>
+    <string name="create_space_topic_hint">توضیحات</string>
+    <string name="create_spaces_loading_message">در حال ساخت فضای کاری …</string>
+    <string name="create_spaces_default_public_random_room_name">تصادفی</string>
+    <string name="create_spaces_default_public_room_name">عمومی</string>
+    <string name="create_spaces_room_private_header_desc">بیایید برای هر یک از آنها یک اتاق درست کنیم. بعداً می توانید موارد دیگر را اضافه کنید، از جمله موارد موجود.</string>
+    <string name="create_spaces_room_private_header">روی چه چیزی کار می کنید؟</string>
+    <string name="create_spaces_room_public_header_desc">ما اتاق‌هایی برای آنها ایجاد خواهیم کرد. بعداً می توانید بیشتر اضافه کنید.</string>
+    <string name="create_spaces_room_public_header">موضوع گفتگوها %s یی چیست؟</string>
+    <string name="create_space_error_empty_field_space_name">برای ادامه یک اسم برای آن بگذارید.</string>
+    <string name="create_spaces_details_private_header">توضیحاتی را برای کمک به افراد در شناسایی آن اضافه کنید. همواره می توانید این توضیحات را تغییر دهید.</string>
+    <string name="create_spaces_details_public_header">توضیحاتی را برای مشخص کردن آن اضافه کنید. همواره می توانید این توضیحات را تغییر دهید.</string>
+    <string name="activity_create_space_title">ساخت فضای کاری</string>
+    <string name="space_type_private_desc">فقط با دعوت، مناسب برای خودتان و یا تیم‌ها</string>
+    <string name="space_type_private">خصوصی</string>
+    <string name="space_type_public_desc">برای همه آزاد است، بهترین حالت برای انجمن‌ها می‌باشد</string>
+    <string name="space_type_public">عمومی</string>
+    <string name="create_spaces_private_teammates">یک فضای کاری خصوصی برای شما و همکارانتان</string>
+    <string name="create_spaces_me_and_teammates">من و همکارانم</string>
+    <string name="create_spaces_organise_rooms">یک فضای کاری خصوصی برای نظم بخشیدن به اتاق‌های شما</string>
+    <string name="create_spaces_just_me">فقط خودم</string>
+    <string name="create_spaces_make_sure_access">اطمینان حاصل کنید که افراد مناسب به %s دسترسی دارند. شما می‌توانید این را بعدا تغییر دهید.</string>
+    <string name="command_description_create_space">ساخت فضای کاری</string>
+    <string name="room_settings_room_access_restricted_description">هر کسی در فضای کاری این اتاق وجود داشته باشد، می‌تواند اتاق را پیدا کرده و به آن بپیوندد. فقط مدیران این اتاق می توانند آن را به یک فضای کاری اضافه کنند.</string>
+    <string name="room_settings_room_access_restricted_title">فضا‌های کاری</string>
+    <string name="spaces_header">فضا‌های کاری</string>
+    <string name="create_spaces_who_are_you_working_with">با چه کسانی کار می‌کنی؟</string>
+    <string name="create_spaces_join_info_help">برای پیوستن به یک فضای کاری موجود، نیاز به دعوت دارید.</string>
+    <string name="create_spaces_you_can_change_later">می‌توانید این را بعدا تغییر دهید</string>
+    <string name="create_spaces_choose_type_label">می خواهید چه نوع فضای‌ کاری‌ای ایجاد کنید؟</string>
+    <string name="create_spaces_type_header">فضاهای کاری راهی جدید برای ایجاد دسته‌هایی از اتاق‌ها و افراد است</string>
+    <string name="your_private_space">فضای کاری خصوصی شما</string>
+    <string name="your_public_space">فضای کاری عمومی شما</string>
+    <string name="add_space">افزودن فضای کاری</string>
+    <string name="command_description_leave_room">ترک اتاق با شناسه داده شده (یا اگر اتاق خالی باشد اتاق فعلی)</string>
+    <string name="command_description_join_space">پیوستن به فضای کاری با شناسه</string>
+    <string name="a11y_unchecked">علامت زده نشده</string>
+    <string name="search_hint_room_name">جستجو با نام اتاق</string>
+    <string name="room_settings_room_access_public_description">هرکسی می تواند اتاق را پیدا کرده و به آن بپیوندد</string>
+    <string name="room_settings_room_access_public_title">عمومی</string>
+    <string name="room_settings_room_access_private_description">فقط افراد دعوت شده می‌توانند اتاق را پیدا کرده و به آن بپیوندند</string>
+    <string name="room_settings_room_access_private_title">خصوصی</string>
+    <string name="room_settings_room_access_entry_unknown">تنظیم دسترسی ناشناخته (%s)</string>
+    <string name="room_settings_room_access_entry_knock">هرکسی می تواند درخواست ورود به اتاق را بدهد، سپس اعضا می توانند قبول یا رد کنند</string>
+    <string name="room_settings_guest_access_title">مجوز پیوستن مهمان به اتاق</string>
+    <string name="spaces_invited_header">دعوت‌ها</string>
+    <string name="suggested_header">اتاق‌های پیشنهادی</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 9fb80f67a7..acd069818d 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2680,4 +2680,82 @@
     <string name="settings_room_directory_show_all_rooms">Afficher les salons au contenu choquant</string>
     <string name="settings_category_room_directory">Répertoire des salons</string>
     <string name="event_status_sent_message">Message envoyé</string>
+    <string name="create_spaces_you_can_change_later">Vous pouvez changer ceci plus tard</string>
+    <string name="create_spaces_choose_type_label">Quel type d’espace voulez-vous créer \?</string>
+    <string name="create_spaces_type_header">Les espaces sont un nouveau moyen de regrouper les salons et les personnes</string>
+    <string name="your_private_space">Votre espace privé</string>
+    <string name="your_public_space">Votre espace public</string>
+    <string name="add_space">Ajouter un espace</string>
+    <string name="command_description_leave_room">Partir du salon correspondant à l’identifiant donné (ou le salon actuel si aucun n’est fourni)</string>
+    <string name="command_description_join_space">Rejoindre l’espace avec l’identifiant donné</string>
+    <string name="command_description_create_space">Créer un espace</string>
+    <string name="a11y_unchecked">Décoché</string>
+    <string name="search_hint_room_name">Rechercher par nom</string>
+    <string name="room_settings_room_access_restricted_description">Tout membre d’un espace contenant ce salon peut le trouver et le rejoindre. Seuls les administrateurs de ce salon peuvent l’ajouter à un espace.</string>
+    <string name="room_settings_room_access_restricted_title">Espaces</string>
+    <string name="room_settings_room_access_public_description">Tout le monde peut trouver ce salon et le rejoindre</string>
+    <string name="room_settings_room_access_public_title">Public</string>
+    <string name="room_settings_room_access_private_description">Seules les personnes invitées peuvent le trouver et le rejoindre</string>
+    <string name="room_settings_room_access_private_title">Privé</string>
+    <string name="room_settings_room_access_entry_unknown">Paramètre d’accès inconnu (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Tout le monde peut frapper à la porte du salon, les membres peuvent accepter ou rejeter la demande</string>
+    <string name="room_settings_guest_access_title">Permettre l’accès aux visiteurs</string>
+    <string name="spaces_header">Espaces</string>
+    <string name="spaces_invited_header">Invitations</string>
+    <string name="suggested_header">Salons recommandés</string>
+    <string name="labs_use_restricted_join_rule">Espace expérimental – salon restreint.</string>
+    <string name="you_are_invited">Vous êtes invité</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Les espaces sont un moyen de regrouper les salons et personnes pour travailler, s’amuser, ou juste pour vous-même.</string>
+    <string name="spaces_beta_welcome_to_spaces">Bienvenue dans les espaces !</string>
+    <string name="space_add_existing_rooms">Ajouter des salons et espaces existants</string>
+    <string name="space_leave_prompt_msg">Voulez-vous vraiment quitter l’espace \?</string>
+    <string name="leave_space">Quitter l’espace</string>
+    <string name="space_add_child_title">Ajouter des salons</string>
+    <string name="space_explore_activity_title">Parcourir les salons</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d personne que vous connaissez en fait partie</item>
+        <item quantity="other">%d personnes que vous connaissez en font partie</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Bienvenue dans %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Vous ne faites partie d’aucun salon pour l’instant. Vous trouverez ci-dessous les salons recommandés, mais vous pouvez en voir plus avec le bouton vert en bas à droite.</string>
+    <string name="room_alias_preview_not_found">Cet alias n’est pas accessible en ce moment.
+\nRéessayez plus tard, ou demandez à un administrateur de ce salon de vérifier que vous pouvez y accéder.</string>
+    <string name="join_anyway">Rejoindre quand même</string>
+    <string name="join_space">Rejoindre l’espace</string>
+    <string name="create_space">Créer un espace</string>
+    <string name="skip_for_now">Passer pour l’instant</string>
+    <string name="share_space_link_message">Rejoignez mon espace %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">Ne fera pas partie de %s</string>
+    <string name="invite_just_to_this_room">Seulement ce salon</string>
+    <string name="invite_to_space_with_name_desc">Permettra de parcourir les salons de %s</string>
+    <string name="invite_to_space_with_name">Inviter dans %s</string>
+    <string name="invite_by_link">Partager le lien</string>
+    <string name="invite_by_mxid">Inviter par nom d’utilisateur</string>
+    <string name="invite_by_email">Inviter par e-mail</string>
+    <string name="invite_people_to_your_space_desc">Vous êtes seul pour l’instant. %s sera plus agréable avec de la compagnie.</string>
+    <string name="invite_people_to_your_space">Invitez des personnes dans votre espace</string>
+    <string name="invite_people_menu">Inviter des personnes</string>
+    <string name="create_space_topic_hint">Description</string>
+    <string name="create_spaces_loading_message">Création de l’espace…</string>
+    <string name="create_spaces_default_public_random_room_name">Aléatoire</string>
+    <string name="create_spaces_default_public_room_name">Général</string>
+    <string name="create_spaces_room_private_header_desc">Créons un salon pour chacun d’entre eux. Vous pourrez en ajouter plus tard, y compris certains déjà existant.</string>
+    <string name="create_spaces_room_private_header">Sur quels projets travaillez-vous \?</string>
+    <string name="create_spaces_room_public_header_desc">Nous allons créer les salons pour ces sujets. Vous pourrez en ajouter d’autres plus tard.</string>
+    <string name="create_spaces_room_public_header">De quoi allez vous parler dans %s \?</string>
+    <string name="create_space_error_empty_field_space_name">Donnez lui un nom pour poursuivre.</string>
+    <string name="create_spaces_details_private_header">Ajoutez quelques informations pour renforcer son identité. Vous pourrez changer ceci plus tard.</string>
+    <string name="create_spaces_details_public_header">Ajoutez quelques informations pour l’aider à se démarquer. Vous pourrez changer ceci plus tard.</string>
+    <string name="activity_create_space_title">Créer un espace</string>
+    <string name="space_type_private_desc">Sur invitation, idéal pour vous-même ou les équipes</string>
+    <string name="space_type_private">Privé</string>
+    <string name="space_type_public_desc">Ouvert à tous, idéal pour les communautés</string>
+    <string name="space_type_public">Public</string>
+    <string name="create_spaces_private_teammates">Un espace privé pour vous et votre équipe</string>
+    <string name="create_spaces_me_and_teammates">Moi et mon équipe</string>
+    <string name="create_spaces_organise_rooms">Un espace privé pour organiser vos salons</string>
+    <string name="create_spaces_just_me">Seulement moi</string>
+    <string name="create_spaces_make_sure_access">Assurez-vous que les accès à %s sont accordés aux bonnes personnes. Vous pourrez changer ceci plus tard.</string>
+    <string name="create_spaces_who_are_you_working_with">Avec qui travaillez-vous \?</string>
+    <string name="create_spaces_join_info_help">Pour rejoindre un espace existant, il vous faut une invitation.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index 0e2bad095a..582f678e81 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -1,15 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="light_theme">Ljocht tema</string>
-    <string name="dark_theme">Donker tema</string>
+    <string name="dark_theme">Tsjuster tema</string>
     <string name="black_theme">Swart tema</string>
-
     <string name="notification_sync_init">Tsjinst inisjalisearje</string>
     <string name="notification_sync_in_progress">Syngronisearje…</string>
     <string name="notification_listening_for_events">Lústerje nei barrens</string>
     <string name="notification_noisy_notifications">Lûdsmeldingen</string>
     <string name="notification_silent_notifications">Stille meldingen</string>
-
     <string name="title_activity_home">Berjochten</string>
     <string name="title_activity_room">Petear</string>
     <string name="title_activity_settings">Ynstellingen</string>
@@ -21,7 +19,6 @@
     <string name="title_activity_keys_backup_setup">Kaaireservekopy</string>
     <string name="title_activity_keys_backup_restore">Kaaireservekopy brûke</string>
     <string name="title_activity_verify_device">Apparaat ferifiearje</string>
-
     <string name="keys_backup_is_not_finished_please_wait">Kaaireservekopy is noch net ree, in amerijke…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">As jo jo no ôfmelde, sille jo jo fersifere berjochten kwytreitsje</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Kaaireservekopy is dwaande. Asto dy no ôfmeldst, silsto de tagong ta dyn fersifere berjochten kwytreitsje.</string>
@@ -32,11 +29,8 @@
     <string name="are_you_sure">Binne jo wis\?</string>
     <string name="backup">Reservekopy meitsje</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Do silst de tagong ta dyn fersifere berjochten ferlieze, útsein asto earst in reservekopy fan dyn kaaien makkest eardatsto dy ôfmeldst.</string>
-
     <string name="dialog_title_third_party_licences">Lisinsjes fan tredde partijen</string>
-
     <string name="loading">Lade…</string>
-
     <string name="ok">Oké</string>
     <string name="cancel">Annulearje</string>
     <string name="save">Bewarje</string>
@@ -85,7 +79,6 @@
     <string name="ignore">Negearje</string>
     <string name="review">Beoardielje</string>
     <string name="decline">Wegerje</string>
-
     <string name="action_exit">Ofslute</string>
     <string name="actions">Aksjes</string>
     <string name="action_sign_out">Ofmelde</string>
@@ -101,27 +94,22 @@
     <string name="action_close">Slute</string>
     <string name="copied_to_clipboard">Nei klamboerd kopiearre</string>
     <string name="disable">Utskeakelje</string>
-
     <string name="dialog_title_confirmation">Befêstiging</string>
     <string name="dialog_title_warning">Warskôging</string>
     <string name="dialog_title_error">Flater</string>
-
     <string name="bottom_action_home">Start</string>
     <string name="bottom_action_favourites">Favoriten</string>
     <string name="bottom_action_people">Minsken</string>
     <string name="bottom_action_rooms">Petearen</string>
     <string name="bottom_action_groups">Mienskippen</string>
-
     <string name="home_filter_placeholder_home">Petearnammen filterje</string>
     <string name="home_filter_placeholder_favorites">Favoriten filterje</string>
     <string name="home_filter_placeholder_people">Persoanen filterje</string>
     <string name="home_filter_placeholder_rooms">Petearnammen filterje</string>
     <string name="home_filter_placeholder_groups">Mienskipsnammen filterje</string>
-
     <string name="invitations_header">Utnûgingen</string>
     <string name="low_priority_header">Lege prioriteit</string>
     <string name="system_alerts_header">Systeemmeldingen</string>
-
     <string name="direct_chats_header">Petearen</string>
     <string name="local_address_book_header">Lokale kontaktelist</string>
     <string name="user_directory_header">Brûkerskatalogus</string>
@@ -130,7 +118,6 @@
     <string name="template_no_contact_access_placeholder">Jo hawwe ${app_name} gjin tagong ta jo lokale kontakten jûn</string>
     <string name="no_result_placeholder">Gjin resultaten</string>
     <string name="people_no_identity_server">Gjin identiteitsserver konfigurearre.</string>
-
     <string name="rooms_header">Petearen</string>
     <string name="rooms_directory_header">Petearkatalogus</string>
     <string name="no_room_placeholder">Gjin petearen</string>
@@ -139,11 +126,9 @@
         <item quantity="one">1 brûker</item>
         <item quantity="other">%d brûkers</item>
     </plurals>
-
     <string name="groups_invite_header">Utnûgje</string>
     <string name="groups_header">Mienskippen</string>
     <string name="no_group_placeholder">Gjin groepen</string>
-
     <string name="send_bug_report_include_logs">Lochboek ferstjoere</string>
     <string name="send_bug_report_include_crash_logs">Ungeloklochboek ferstjoere</string>
     <string name="send_bug_report_include_screenshot">Skermôfdruk ferstjoere</string>
@@ -151,4 +136,462 @@
     <string name="send_bug_report_description">Beskriuw de flater. Wat hawwe jo dien\? Wat ferwachten jo dat der barre soe\? Wat is der echt bard\?</string>
     <string name="send_bug_report_description_in_english">Beskriuw it probleem yn it Ingelsk, wannear mooglik.</string>
     <string name="send_bug_report_placeholder">Beskriuw hjir jo probleem</string>
-</resources>
+    <string name="finish">Ôfrûnje</string>
+    <string name="keep_it_safe">Hâld it feilich</string>
+    <string name="bootstrap_finish_title">Do binst klear!</string>
+    <string name="bootstrap_save_key_description">Brûk disse %1$s as in feiligensnet, foar it gefal ast dyn %2$s ferjitst.</string>
+    <string name="call_notification_hangup">Ophingje</string>
+    <string name="call_notification_reject">Ferfalle litte</string>
+    <string name="call_notification_answer">Akseptearje</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Do hast it haadadres fan disse keamer fuortsmiten.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s hat it adres fan disse keamer feroare.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Do hast it adres fan disse keamer feroare.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Do binst fuort gien. Reden: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s is fuort gien. Reden: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Do hast de keamer ferlitten. Reden: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s hat de keamer ferlitten. Reden: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Do binst de keamer yn kaam. Reden: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s is de keamer yn kaam. Reden: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Do binst de keamer yn kaam. Reden: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s is de keamer yn kaam. Reden: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s hat dy útnûge. Reden: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Do hast %1$s útnûge. Reden: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s hat %2$s útnûge. Reden: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Dyn útnûging. Reden: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s harren útnûging. Reden: %2$s</string>
+    <string name="clear_timeline_send_queue">Ferstjoeringslist leech meitsje</string>
+    <string name="event_status_sending_message">Berjocht oan it fersjoeren…</string>
+    <string name="event_status_sent_message">Berjocht ferstjoerd</string>
+    <string name="initial_sync_start_importing_account_data">Inisjele Syngronisaasje:
+\nAkkount Data Binnenhelje</string>
+    <string name="initial_sync_start_importing_account_groups">Inisjele Syngronisaasje:
+\nMienskippen Binnenhelje</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Inisjele Syngronisaasje:
+\nOerblieuwne Keamers Binnenhelje</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Inisjele Syngronisaasje:
+\nKeamers Werst Foar Útnûge Binst Binnenhelje</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Inisjele Syngronisaasje:
+\nKeamers wer ast yn kaam binst binnenhelje</string>
+    <string name="initial_sync_start_importing_account_rooms">Inisjele Syngronisaasje:
+\nKeamers binnenhelje</string>
+    <string name="initial_sync_start_importing_account">Inisjele Syngronisaasje:
+\nAkkount importearje…</string>
+    <string name="initial_sync_start_downloading">Inisjele Syngronisaasje:
+\nData binnenhelje…</string>
+    <string name="initial_sync_start_server_computing">Inisjele Syngronisaasje:
+\nWachtsjend op reaksje fan tsjinner…</string>
+    <string name="room_displayname_empty_room_was">Lege keamer (wie %s)</string>
+    <string name="room_displayname_empty_room">Lege keamer</string>
+    <string name="medium_email">Email adres</string>
+    <string name="room_displayname_invite_from">Útnûging fan %s</string>
+    <string name="medium_phone_number">Tillefoan nûmer</string>
+    <string name="message_failed_to_upload">Upload fan ôfbylding mislearre</string>
+    <string name="notice_crypto_unable_to_decrypt">** Koe %s net ûntsiferje **</string>
+    <string name="could_not_redact">Koe net ynlûke</string>
+    <string name="power_level_custom_no_value">Oanpast</string>
+    <string name="power_level_custom">Oanpast (%1$d)</string>
+    <string name="power_level_default">Standert</string>
+    <string name="notice_widget_jitsi_modified_by_you">Do hast de fideo konferînsje oanpast</string>
+    <string name="power_level_admin">Behearder</string>
+    <string name="notice_event_redacted_by_with_reason">Berjocht fuortsmiten troch %1$s [reden: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">Berjocht fuortsmiten [reden: %1$s]</string>
+    <string name="notice_event_redacted_by">Berjocht fuortsmiten troch %1$s</string>
+    <string name="notice_room_server_acl_updated_no_change">Gjin feroaringen.</string>
+    <string name="notice_room_server_acl_set_allowed">• Tsjinners dy foldoche oan %s bin tastien.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Do hast de ACLs foar de keamer opnij ynsteld.</string>
+    <string name="notice_room_server_acl_set_title">%s hat de ACLs foar disse keamer ynsteld.</string>
+    <string name="notice_room_update_by_you">Do hast disse keamer opwurdeare.</string>
+    <string name="notice_room_update">%s hat disse keamer upwurdeare.</string>
+    <string name="notice_end_to_end_by_you">Do hast end-to-end fersifering ynskakele (%1$s)</string>
+    <string name="notice_end_to_end">%1$s hat end-to-end fersifering ynskakele (%2$s)</string>
+    <string name="notice_room_visibility_unknown">ûnbekend (%s).</string>
+    <string name="notice_room_visibility_shared">Alle keamerleden.</string>
+    <string name="notice_room_visibility_joined">Olle keamerleden, fanôf it momint dot se de keamer ynkaam binne.</string>
+    <string name="notice_room_visibility_invited">Olle keamerleden, fanôf it momint dot se útnûge binne.</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="space_type_public_desc">Iepen foar eltsenien, it beste foar mienskippen</string>
+    <string name="group_all_communities">Alle mienskippen</string>
+    <string name="community_id">Mienskips ID</string>
+    <string name="community_name">Mienskipsnamme</string>
+    <string name="create_community">Mienskip Oanmeitsje</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' is net in jildich mienskips ID</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Ûnjildich mienskips ID</string>
+    <string name="room_settings_add_new_group">Nije mienskips ID (b.v. +foo:matrix.org)</string>
+    <string name="settings_without_flair">Do binst op it momint net lid fan in mienskip.</string>
+    <string name="dialog_title_success">Sukses</string>
+    <string name="room_participants_invite_search_another_user">Brûkers ID, Namme of email</string>
+    <string name="room_participants_action_leave">Disse keamer ferlitte</string>
+    <string name="room_participants_create">Oanmeitsje</string>
+    <string name="room_participants_action_remove">Út disse keamer smite</string>
+    <string name="room_settings_enable_encryption_no_permission">Do hast gjin tastimming om enkripsje yn te skakeljen yn disse keamer.</string>
+    <string name="sound_device_phone">Tillefoan</string>
+    <string name="call_failed_dont_ask_again">My net wer freechje</string>
+    <string name="start_new_chat">Nij petear begjinne</string>
+    <string name="search">Sykje</string>
+    <string name="create_account">Akkount oanmeitsje</string>
+    <string name="username">Brûkersnamme</string>
+    <string name="logout">Útlogge</string>
+    <string name="login">Ynlogge</string>
+    <string name="read_receipt">Léze</string>
+    <string name="search_in_my_contacts">Yn mien kontakten sykje</string>
+    <string name="phone_book_perform_lookup">Om matrix kontakten sykje</string>
+    <string name="message_action_item_redact">Fuortsmite…</string>
+    <string name="share_confirm_room">Wolst dit taheaksel fersjoere nei %1$s\?</string>
+    <string name="send_attachment">Taheaksel ferstjoere</string>
+    <string name="settings_text_message_sent_wrong_code">De ferifikaasje koade is net jildich.</string>
+    <string name="settings_text_message_sent_hint">Koade</string>
+    <string name="settings_text_message_sent">In tekst berjocht is nei %s stjoerd. Graach de ferifikaasje koade ynfiere dyt der yn stiet.</string>
+    <string name="settings_discovery_bad_identity_server">Kin net ferbine mei identiteits tsjinner</string>
+    <string name="settings_discovery_enter_identity_server">Identiteits tsjinner URL ynfiere</string>
+    <string name="identity_server_consent_dialog_title">Emails en tillefoan nûmers ferstjoere</string>
+    <string name="settings_discovery_consent_action_give_consent">Tastimming jaan</string>
+    <string name="settings_discovery_consent_action_revoke">Tastimming wer ynlûke</string>
+    <string name="settings_discovery_consent_notice_off">Do hast gjin tastimming jûn emails en tillefoan nûmers nei disse identiteits tsjinner te stjoeren, om oare brûkers út dyn kontakten te finen.</string>
+    <string name="settings_discovery_consent_notice_on">Do hast tastimming jûn emails en tillefoan nûmers nei disse identiteits tsjinner te stjoeren, om oare brûkers út dyn kontakten te finen.</string>
+    <string name="settings_discovery_consent_title">Emails en tillefoan nûmers ferstjoere</string>
+    <string name="settings_discovery_mail_pending">Yn ôfwachting</string>
+    <string name="terms_description_for_integration_manager">Bots, brêgen, widgets en sticker paketten brûke</string>
+    <string name="terms_description_for_identity_server">Foar oaren fynber wéze</string>
+    <string name="message_view_edit_history">Feroarings Skiednis Besjen</string>
+    <string name="joining_room">Keamer binnen gean…</string>
+    <string name="creating_direct_room">Keamer wurd oanmakke…</string>
+    <string name="room_filtering_footer_create_new_room">Nije keamer oanmeitsje</string>
+    <string name="no_message_edits_found">Gjin feroaringen fûn</string>
+    <string name="edited_suffix">(feroare)</string>
+    <string name="send_file_step_idle">Wachtsjend…</string>
+    <string name="preference_root_help_about">Hulp &amp; Oer</string>
+    <string name="quick_reactions">Flugge Reaksjes</string>
+    <string name="settings_sdk_version">Matrix SDK Ferzje</string>
+    <string name="create_room_settings_section">Keamer ynstellings</string>
+    <string name="create_room_topic_hint">Ûnderwerp</string>
+    <string name="create_room_topic_section">Keamer ûnderwerp (opsjoneel)</string>
+    <string name="create_room_name_hint">Namme</string>
+    <string name="create_room_name_section">Keamer namme</string>
+    <string name="create_room_action_create">OANMEITSJE</string>
+    <string name="create_room_title">Nije Keamer</string>
+    <string name="fab_menu_create_chat">Direkte Berjochten</string>
+    <string name="fab_menu_create_room">Keamers</string>
+    <string name="room_preview_no_preview_join">Disse keamer kin net ynsjûn wurde. Wolst de keamer binnen gean\?</string>
+    <string name="room_preview_not_found">Disse keamer jout no gjin tagong.
+\nProbearje it letter noch ris in kear, of freechje in administrator om te sjen ast wol de nediche rjochten hast.</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Ynsjoch yn wrâld-lésbere keamers wurd noch net stipe troch ${app_name}</string>
+    <string name="room_preview_no_preview">Disse keamer kin net ynsjûn wurde</string>
+    <string name="please_wait">Graach efkes wachtsje…</string>
+    <string name="change_room_directory_network">Netwurk feroarje</string>
+    <string name="action_change">Feroarje</string>
+    <string name="error_no_network">Gjin netwurk. Kontroleerje dyn internet ferbyning.</string>
+    <string name="create_new_room">Nije Keamer Meitsje</string>
+    <string name="malformed_message">Net gûd foarme evenemint, kin net sjen litten wurde</string>
+    <string name="last_edited_info_message">Foar it letst feroare troch %1$s op %2$s</string>
+    <string name="event_redacted_by_user_reason">Evenemint troch brûker fuortsmiten</string>
+    <string name="settings_show_redacted">Fuortsmiten berjiochten sjen litte</string>
+    <string name="event_redacted">Berjocht fuortsmiten</string>
+    <string name="reactions">Reaksjes</string>
+    <string name="create_room_directory_title">Keamer List</string>
+    <string name="create_room_public_description">Eltsenien kin disse keamer binnen gean</string>
+    <string name="create_room_public_title">Iepenbier</string>
+    <string name="settings_preferences">Foarkarren</string>
+    <string name="send_suggestion">Sugestje dwaan</string>
+    <string name="room_preview_try_join_an_unknown_room_default">in keamer</string>
+    <string name="room_creation_title">Nij Petear</string>
+    <string name="preview">Ynsjen</string>
+    <string name="join">Meidwaan</string>
+    <string name="remove">Fuortsmite</string>
+    <string name="_continue">Troch gean</string>
+    <string name="no">NEE</string>
+    <string name="yes">JA</string>
+    <string name="permissions_rationale_popup_title">Informaasje</string>
+    <string name="call_resume_action">Troch gean</string>
+    <string name="room_info_room_topic">Keamer ûnderwerp</string>
+    <string name="room_info_room_name">Keamer namme</string>
+    <string name="today">Hjoerd</string>
+    <string name="yesterday">Juster</string>
+    <string name="compression_opt_list_small">Lyts</string>
+    <string name="compression_opt_list_medium">Gemiddeld</string>
+    <string name="compression_opt_list_large">Grut</string>
+    <string name="compression_opt_list_original">Orizineel</string>
+    <string name="compression_options">Ferstjoer as</string>
+    <plurals name="membership_changes">
+        <item quantity="one">%d lidmaatskip wiizige</item>
+        <item quantity="other">%d lidmaatskippen wiizige</item>
+    </plurals>
+    <string name="groups_list">Groepslist</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">Oanfraach ferstjoerd</string>
+    <string name="e2e_re_request_encryption_key_sent">Kaai oanfraach ferstjoerd.</string>
+    <string name="login_error_login_email_not_yet">De email link wer oft noch net op klikt is</string>
+    <string name="login_error_user_in_use">Disse brûkersnamme wurd ol brûkt</string>
+    <string name="login_error_limit_exceeded">Der binne te folle oanfraachen festjoerd</string>
+    <string name="login_error_bad_json">Misfoarme JSON</string>
+    <string name="login_error_forbidden">Ûnjildiche brûkersnamme/wachtwurd</string>
+    <string name="login_error_ssl_handshake">Dyn apperaat brûkt in âlde ferzje fan it TLS feiligings protokol, kwetsber foar oanfallen, foar dyn feiligens kinst no net ferbine</string>
+    <string name="login_error_ssl_other">SSL Flater.</string>
+    <string name="login_error_homeserver_not_found">Kin de thústsjinner op disse URL net berikke, kontroleerje dit</string>
+    <string name="login_error_no_homeserver_found">Dit is net in jildich Matrix tsjinner adres</string>
+    <string name="login_error_unknown_host">Disse URL is net te berikken, kontroleerje dit</string>
+    <string name="login_error_invalid_home_server">Fier in jildiche URL yn</string>
+    <string name="login_error_unable_register">Kin net registreerje</string>
+    <string name="login_error_registration_network_error">Kin net registreerje: Netwurk flater</string>
+    <string name="login_error_unable_login">Kin net ynlogge</string>
+    <string name="auth_reset_password_error_unauthorized">Koe it email adres net ferifiëre: wês der wis fan dost op it linkje yn\'e email klikt hast</string>
+    <string name="auth_reset_password_email_validation_message">Der is een email nei %s stjoerd. Ost op it linkje klikt hast wot der yn stie, klikst hjir ûnder.</string>
+    <string name="auth_email_validation_message">Kontroleerje dyn email om troch te gean mei de registraasje</string>
+    <string name="auth_forgot_password">Wachtwurd fergetten\?</string>
+    <string name="auth_password_dont_match">Wachtwurden binne net gelyk</string>
+    <string name="auth_invalid_token">Ûnjildich token</string>
+    <string name="auth_missing_email_or_phone">Der mist een email adres of tillefoan nûmer</string>
+    <string name="auth_missing_phone">Tillefoan nûmer mist</string>
+    <string name="auth_missing_email">Email adres mist</string>
+    <string name="auth_email_already_defined">Dit email adres wurd ol brûkt.</string>
+    <string name="auth_invalid_phone">Dit sjucht der net út as in jildich tillefoan nûmer</string>
+    <string name="auth_opt_phone_number_placeholder">Tillefoan nûmer (opsjoneel)</string>
+    <string name="auth_phone_number_placeholder">Tillefoan nûmer</string>
+    <string name="auth_invalid_password">Wachtwurd te koart (min 6)</string>
+    <string name="auth_repeat_password_placeholder">Wachtwurd nog ris ynfiere</string>
+    <string name="auth_new_password_placeholder">Nij wachtwurd</string>
+    <string name="auth_login">Ynlogge</string>
+    <string name="call_switch_camera">Fan kamera wikselje</string>
+    <string name="option_take_video">Fideo nimme</string>
+    <string name="option_take_photo">Foto nimme</string>
+    <string name="option_take_photo_video">Foto of fideo nimme</string>
+    <string name="option_send_sticker">Stickers ferstjoere</string>
+    <string name="option_send_files">Triemen ferstjoere</string>
+    <string name="call_format_turn_hd_on">HD ynskakelje</string>
+    <string name="call_format_turn_hd_off">HD útskakelje</string>
+    <string name="call_camera_back">Efterkant</string>
+    <string name="call_camera_front">Foarkant</string>
+    <string name="go_on_with">troch gean mei…</string>
+    <string name="auth_user_name_placeholder">Brûkersnamme</string>
+    <string name="auth_missing_password">Wachtwurd mist</string>
+    <string name="auth_recaptcha_message">Disse Thús Tsjinner wol der graach wis fon wéze dost gjin robot bist</string>
+    <string name="auth_reset_password_missing_password">Der mat in nij wachtwurd ynfierd wurde.</string>
+    <string name="auth_reset_password_missing_email">It email adres dyt by dien akkount hjeard mat hjir ynfierd wurde.</string>
+    <string name="auth_reset_password_message">Om dyn wachtwurd opnij yn te stellen, mast it email adres dyt by dien account hjeard hjir ynfiere:</string>
+    <string name="auth_reset_password_next_step_button">Ik ha myn emailadres ferifiere</string>
+    <string name="auth_identity_server">Identiteits Tsjinner:</string>
+    <string name="auth_home_server">Thús Tsjinner:</string>
+    <string name="auth_username_in_use">Brûkernamme wurd ol brûkt</string>
+    <string name="settings_security_and_privacy">Feiligens &amp; Privacy</string>
+    <string name="room_widget_resource_grant_permission">Tastean</string>
+    <string name="room_settings_room_version_title">Keamer ferzje</string>
+    <string name="room_settings_category_advanced_title">Avanseare</string>
+    <string name="room_settings_room_access_restricted_title">Rômtes</string>
+    <string name="room_settings_room_access_public_description">Eltsenien kin de keamer fyne en der yn komme</string>
+    <string name="room_settings_read_history_entry_anyone">Eltsenien</string>
+    <string name="room_settings_guest_access_title">Gasten tastean om de keamer yn te gean</string>
+    <string name="room_alias_published_alias_main">Dit is it haad adres</string>
+    <string name="room_alias_main_address_hint">Haad adres</string>
+    <string name="room_settings_room_notifications_title">Notifikaasjes</string>
+    <string name="media_saving_period_1_month">1 moanne</string>
+    <string name="media_saving_period_1_week">1 wike</string>
+    <string name="media_saving_period_3_days">3 dagen</string>
+    <string name="media_saving_period_forever">Foar oltiid</string>
+    <string name="action_add">Tafoegje</string>
+    <string name="bottom_action_notification">Notifikaasjes</string>
+    <string name="create_spaces_default_public_room_name">Olgemien</string>
+    <string name="matrix_error">Matrix flater</string>
+    <string name="network_error">Netwurk flater</string>
+    <string name="unable_to_send_message">Kin it berjocht net ferstjoere</string>
+    <string name="notice_event_redacted">Berjocht fuortsmiten</string>
+    <string name="labs_use_restricted_join_rule_desc">Waskôging hat ûndersteuning fan\'e tsjinner en in eksperimintele keamer nedich</string>
+    <string name="labs_use_restricted_join_rule">Eksperiminteel Rômte - Beheinde Keamer.</string>
+    <string name="you_are_invited">Do bist útnûge</string>
+    <string name="notice_room_visibility_world_readable">eltsenien.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Do hast takomstige berjochten foar %1$s sichtber makke</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s hat takomstige berjochten foar %2$s sichtber makke</string>
+    <string name="notice_made_future_room_visibility_by_you">Do hast de takomstige keamer skiednis foar %1$s sichtber makke</string>
+    <string name="notice_made_future_room_visibility">%1$s hat de takomstige keamer skiednis foar %2$s sichtber makke</string>
+    <string name="notice_ended_call_by_you">Do hast it petear beënige.</string>
+    <string name="notice_ended_call">%s hat it petear beëinige.</string>
+    <string name="notice_answered_call_by_you">Do hast it petear beantwurde.</string>
+    <string name="notice_answered_call">%s hat it petear beantwurde.</string>
+    <string name="notice_call_candidates_by_you">Do hast data stjoerd om in petear op te setten.</string>
+    <string name="notice_call_candidates">%s hat data stjoerd om in petear op te setten.</string>
+    <string name="notice_placed_voice_call">%s hat in fideo petear oanmakke.</string>
+    <string name="notice_placed_video_call_by_you">Do hast in fideo petear oanmakke.</string>
+    <string name="notice_placed_video_call">%s hat in fideo petear oanmakke.</string>
+    <string name="notice_room_name_changed_by_you">Do hast de namme fan\'e keamer feroare nei: %1$s</string>
+    <string name="notice_room_name_changed">%1$s hat de namme fan\'e keamer feroare nei: %2$s</string>
+    <string name="notice_room_topic_changed_by_you">Do hast it ûnderwerp feroare nei: %1$s</string>
+    <string name="notice_room_topic_changed">%1$s hat it ûnderwerp feroare nei: %2$s</string>
+    <string name="notice_display_name_removed_by_you">Do hast dyn namme fuortsmiten (it wie %1$s)</string>
+    <string name="notice_display_name_removed">%1$s hat syn namme fuortsmiten (it wie %2$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Do hast dyn namme fan %1$s nei %2$s feroare</string>
+    <string name="notice_display_name_changed_from">%1$s hat syn namme fan %2$s nei %3$s feroare</string>
+    <string name="notice_display_name_set_by_you">Do hast dyn namme nei %1$s feroare</string>
+    <string name="notice_display_name_set">%1$s hat syn namme nei %2$s feroare</string>
+    <string name="notice_room_withdraw_by_you">Do hast de útnûging foar %1$s wer ynlutsen</string>
+    <string name="notice_room_withdraw">%1$s hat de útnûging foar %2$s wer ynlutsen</string>
+    <string name="notice_room_ban_by_you">Do hast %1$s ferbonne</string>
+    <string name="notice_direct_room_join_by_you">Do bist de keamer yn kaam</string>
+    <string name="notice_room_ban">%1$s hat %2$s ferbonne</string>
+    <string name="notice_room_kick_by_you">Do hast %1$s der út skopt</string>
+    <string name="notice_room_kick">%1$s hat %2$s der út skopt</string>
+    <string name="notice_room_reject_by_you">Do hast de útnûging ôfwiisd</string>
+    <string name="notice_room_reject">%1$s hat de útnûging ôfwiisd</string>
+    <string name="notice_direct_room_leave_by_you">Do hast de keamer ferlitten</string>
+    <string name="notice_direct_room_leave">%1$s hat de keamer ferlitten</string>
+    <string name="notice_room_leave_by_you">Do hast de keamer ferlitten</string>
+    <string name="notice_room_leave">%1$s hat de keamer ferlitten</string>
+    <string name="notice_direct_room_join">%1$s is de keamer yn kaam</string>
+    <string name="notice_room_join_by_you">Do bist de keamer yn kaam</string>
+    <string name="notice_room_join">%1$s is de keamer yn kaam</string>
+    <string name="notice_room_invite_you">%1$s hat dy útnûge</string>
+    <string name="notice_room_invite_by_you">Do hast %1$s útnûge</string>
+    <string name="notice_room_invite">%1$s hat %2$s útnûge</string>
+    <string name="notice_direct_room_created_by_you">Do hast de diskusje oanmakke</string>
+    <string name="notice_direct_room_created">%1$s hat de diskusje oanmakke</string>
+    <string name="notice_room_created_by_you">Do hast de keamer oanmakke</string>
+    <string name="notice_room_created">%1$s hat de keamer oanmakke</string>
+    <string name="notice_room_invite_no_invitee_by_you">Dyn útnûging</string>
+    <string name="notice_room_invite_no_invitee">%s\'s útnûging</string>
+    <string name="summary_you_sent_sticker">Do hast in sticker stjoerd.</string>
+    <string name="summary_user_sent_sticker">%1$s hat in sticker stjoerd.</string>
+    <string name="summary_you_sent_image">Do hast in ôfbylding stjoerd.</string>
+    <string name="summary_user_sent_image">%1$s hat in ôfbylding stjoerd.</string>
+    <string name="no_valid_google_play_services_apk">Gjin jildiche Google Play Services APK fûn. Notifikaasjes kinne wol ris net wurkje.</string>
+    <string name="x_plus">%d+</string>
+    <string name="plus_x">+%d</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="generic_label">%1$s:</string>
+    <string name="show_info_area_only_errors">Allinich foar flaters</string>
+    <string name="show_info_area_messages_and_errors">Foar berjochten en flaters</string>
+    <string name="show_info_area_always">Ivich</string>
+    <string name="settings_info_area_show">Informaasje krite sjen litte</string>
+    <string name="merged_events_collapse">ynteare</string>
+    <string name="merged_events_expand">útteare</string>
+    <string name="unknown_error">Sorry, in flater die sich foar</string>
+    <string name="resource_limit_hard_contact">Graach %s om disse tsjinst brûken te blieuwen.</string>
+    <string name="room_tombstone_predecessor_link">Klik hjir om âldere berjochten te besjen</string>
+    <string name="room_tombstone_continuation_description">Disse keamer is in trochsetting fan in oar petear</string>
+    <string name="room_tombstone_continuation_link">It petear giet hjir troch</string>
+    <string name="room_tombstone_versioned_description">Disse keamer is ferfong en is net mear aktyf</string>
+    <string name="error_empty_field_your_password">Graach dyn wachtwurd ynfiere.</string>
+    <string name="error_empty_field_enter_user_name">Graach in brûkersnamme ynfiere.</string>
+    <string name="deactivate_account_submit">Akkount Útskeakelje</string>
+    <string name="deactivate_account_prompt_password">Om troch te gean, fier dyn wachtwurd yn:</string>
+    <string name="deactivate_account_delete_checkbox">Graach alle berjochten ferjitte dyt ik ferstjoerd ha wannear myn akkount útskeakele is (Warskôging: hjir troch kin oare brûkers in ûnfolslein byld fan konversaasjes krijge)</string>
+    <string name="deactivate_account_title">Akkount Deaktivearje</string>
+    <string name="dialog_user_consent_submit">No besjen</string>
+    <string name="dialog_user_consent_content">Om de %1$s thústsjinner brûken te blieuwen mast de betingsten besjen en befestigje.</string>
+    <string name="forget_room">Keamer ferjitte</string>
+    <string name="reason_colon">Reden: %1$s</string>
+    <string name="has_been_banned">Do binst út %1$s weiballe troch %2$s</string>
+    <string name="identity_server_set_default_submit">%1$s Brûke</string>
+    <string name="call_ring">Skilje…</string>
+    <string name="call_transfer_users_tab_title">Brûkers</string>
+    <string name="command_description_emote">Aksje sjen litte</string>
+    <string name="notice_member_no_changes_by_you">Do hast neat feroare</string>
+    <string name="notice_room_topic_removed_by_you">Do hast it keamer ûnderwerp fuortsmiten</string>
+    <string name="notice_room_topic_removed">%1$s hat it keamer ûnderwerp fuortsmiten</string>
+    <string name="notice_room_name_removed_by_you">Do hast de keamer namme fuortsmiten</string>
+    <string name="notice_room_name_removed">%1$s hat de keamer namme fuortsmiten</string>
+    <string name="notice_room_kick_with_reason">%1$s hat %2$s der út skopt. Reden: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Do hast %1$s fuortskopt. Reden: %2$s</string>
+    <string name="notice_direct_room_update_by_you">Do hast hjir fernijd.</string>
+    <string name="notice_direct_room_update">%s is hjir fernijd.</string>
+    <string name="notice_placed_voice_call_by_you">Do hast skille.</string>
+    <string name="choose_locale_loading_locales">Beskikbere talen ophelje…</string>
+    <string name="choose_locale_other_locales_title">Oare beskikbere talen</string>
+    <string name="command_description_topic">Jou it ûnderwerp fan de keamer oan</string>
+    <string name="report_content_spam">Dit is spam</string>
+    <string name="uploads_files_no_result">Der befyne sich gjin triemen yn disse keamer</string>
+    <string name="uploads_files_title">TRIEMEN</string>
+    <string name="uploads_media_no_result">Der befynt sich gjin media yn disse keamer</string>
+    <string name="uploads_media_title">MEDIA</string>
+    <string name="rotate_and_crop_screen_title">Omdraaie en bysnije</string>
+    <string name="attachment_type_sticker">Sticker</string>
+    <string name="attachment_type_audio">Lûd</string>
+    <string name="attachment_type_camera">Kamera</string>
+    <string name="attachment_type_contact">Kontakt</string>
+    <string name="attachment_type_file">Triem</string>
+    <string name="attachment_type_dialog_title">Ôfbylding tafoege út</string>
+    <string name="error_attachment">In flater die sich foar wylst it taheaksel ophelle waard.</string>
+    <string name="a11y_jump_to_bottom">Spring nei it ein</string>
+    <string name="a11y_hide_password">Wachtwurd net sjen litte</string>
+    <string name="a11y_image">Ôfbylding</string>
+    <string name="a11y_create_room">Nije keamer oanmeitsje</string>
+    <string name="a11y_open_chat">Petear iepenje</string>
+    <string name="a11y_video">Fideo</string>
+    <string name="settings_select_language">Taal útsykje</string>
+    <string name="settings_interface_language">Taal</string>
+    <string name="disabled_integration_dialog_content">Skakel \'integraasjes tastean\' yn Ynstellings yn om dit te dwaan.</string>
+    <string name="disabled_integration_dialog_title">Integraasjes bin útskakele</string>
+    <string name="settings_integration_manager">Integraasje Behearder</string>
+    <string name="settings_integration_allow">Integraasje tastean</string>
+    <string name="settings_identity_server">Identiteits Tsjinner</string>
+    <string name="settings_home_server">Thús Tsjinner</string>
+    <string name="settings_logged_in">Ynloggd as</string>
+    <string name="devices_delete_submit_button_label">Ferstjoere</string>
+    <string name="devices_delete_pswd">Wachtwurd:</string>
+    <string name="devices_delete_dialog_title">Authentikaasje</string>
+    <string name="devices_delete_dialog_text">Disse operaasje hat oanfullende authentikaasje nedich.
+\nFier dyn wachtwurd yn om troch te gean.</string>
+    <string name="devices_details_last_seen_title">Foar it letst sjûn</string>
+    <string name="devices_details_device_name">Iepenbiere Namme Feroarje</string>
+    <string name="devices_details_name_title">Iepenbiere Namme</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="devices_details_dialog_title">Sesje informaasje</string>
+    <string name="settings_data_save_mode">Databesparjende modus</string>
+    <string name="startup_notification_fdroid_battery_optim_button_grant">Tastimming jaan</string>
+    <string name="startup_notification_privacy_button_other">In oare opsje kieze</string>
+    <string name="startup_notification_privacy_button_grant">Tastimming jaan</string>
+    <string name="settings_discovery_manage">Dyn sichtberens ynstellings beheare.</string>
+    <string name="settings_discovery_category">Sichtberens</string>
+    <string name="settings_opt_in_of_analytics_ok">Ja, ik wol graach helpe!</string>
+    <string name="settings_phone_number">Tillefoan nûmer</string>
+    <string name="settings_general_title">Algemien</string>
+    <string name="settings_devices_list">Sesjes</string>
+    <string name="settings_pin_unread_messages">Keamers mei net lézen berjochten festsette</string>
+    <string name="settings_rageshake">Lilkensskodzje</string>
+    <string name="settings_developer_mode_summary">De ûntwikkelders modus jout ûnsichtbere funksjes frei, en kin de applikaasje minder stabiel meitsje. Allinich foar ûntwikkelders!</string>
+    <string name="settings_developer_mode">Ûntwikkelders modus</string>
+    <string name="resource_limit_contact_action">Kontakt Opnimme Mei Behearder</string>
+    <string name="report_content_inappropriate">Dit is tapasselik</string>
+    <string name="pause_video">Skoftsje</string>
+    <string name="play_video">Ôfspylje</string>
+    <string name="identity_server_set_alternative_submit">Ferstjoere</string>
+    <string name="identity_server_not_defined">Do brûkst gjin Identiteits Tsjinner</string>
+    <string name="sas_error_unknown">Ûnbekende flater</string>
+    <string name="sas_verification_request_notification_channel">Interactieve Sesje Ferifikaasje</string>
+    <string name="sas_cancelled_by_me">De ferifikaasje is ôfbrutsen.
+\nReden: %s</string>
+    <string name="sas_cancelled_by_other">De oare partij hat de ferifikaasje ôfbrutsen.
+\n%s</string>
+    <string name="sas_cancelled_dialog_title">Oanfraach Ôfbrutsen</string>
+    <string name="sas_verification_request_notification_channel_title">Kaai Ferifikaasje</string>
+    <string name="sas_legacy_verification_button_title">Brûk ferâldere ferifikaasje.</string>
+    <string name="sas_verifying_keys">Wurd der neat sjen litten\? Net eltse kliïnt kin mei interactieve ferifikaasje oerwei. Brûk ferâldere ferifikaasje.</string>
+    <string name="sas_incoming_request_notif_title">Ferifikaasje oanfraach</string>
+    <string name="sas_incoming_request_notif_content">%s wol dyn sesje ferifiearje</string>
+    <string name="sas_verified_successful_description">Feilige berjochten mei disse brûker binne ein-oant-ein fersifere, en kin net troch tredde partijen lézen wurde.</string>
+    <string name="sas_verified_successful">Do hast disse sesje mei sukses ferifieare.</string>
+    <string name="sas_verified">Ferifieare!</string>
+    <string name="sas_waiting_for_partner">Oan it wachtsjen op partner om te befêstigjen …</string>
+    <string name="sas_view_request_action">Oanfraach besjen</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Biometry ynskakelje</string>
+    <string name="settings_security_pin_code_title">PIN ynskakelje</string>
+    <string name="settings_security_application_protection_screen_title">Feiligens ynstelle</string>
+    <string name="settings_security_application_protection_summary">Tagong befeiligje troch in PIN en biometry te brûken.</string>
+    <string name="settings_security_application_protection_title">Tagong befeiligje</string>
+    <string name="auth_pin_forgot">PIN fergetten\?</string>
+    <string name="auth_pin_title">Dyn PIN ynfiere</string>
+    <string name="create_pin_confirm_title">PIN befestigje</string>
+    <string name="create_pin_title">Brûk in PIN foar feiligens</string>
+    <string name="too_many_pin_failures">Te folle flaters, do binst útlogd</string>
+    <string name="room_alias_local_address_add">Lokaal adres tafoege</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Ik ha in kopy makke</string>
+    <string name="keys_backup_setup_step3_please_make_copy">Graach in kopy meitsje</string>
+    <string name="keys_backup_setup_override_stop">Ophâlde</string>
+    <string name="keys_backup_setup_step3_button_title">Klear</string>
+    <string name="keys_backup_setup_step2_text_title">Feiligje dyn reservekopy mei in Wachtwurdssin.</string>
+    <string name="keys_backup_setup_step1_manual_export">Kaaien mei de hân eksportearje</string>
+    <string name="keys_backup_setup_step1_advanced">(Avanseare)</string>
+    <string name="keys_backup_setup_step1_title">Reitsje dyn fersifere gegevens nea kwyt</string>
+    <string name="keys_backup_no_session_error">Gjin Matrix sesje beskikber</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Graach de wachtwurdssin fuortsmite ast wolst dot ${app_name} in nije herstel kaai foar dy oanmakket.</string>
+    <string name="passphrase_empty_error_message">Graach in wachtwurdssin ynfiere</string>
+    <string name="passphrase_passphrase_does_not_match">Wachtwurdssin komt net oerien</string>
+    <string name="passphrase_enter_passphrase">Wachtwurdssin ynfiere</string>
+    <string name="passphrase_confirm_passphrase">Wachtwurdssin befestigje</string>
+    <string name="passphrase_create_passphrase">Wachtwurdssin oanmeitsje</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 2438b5d2ce..542ab5783b 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2735,4 +2735,83 @@
     <string name="initial_sync_start_server_computing">Sinc. iniziale:
 \nIn attesa di risposta dal server…</string>
     <string name="event_status_sent_message">Messaggio inviato</string>
+    <string name="labs_use_restricted_join_rule_desc">L\'avviso richiede il supporto del server e una versione di stanza sperimentale</string>
+    <string name="labs_use_restricted_join_rule">Spazio sperimentale - stanza riservata.</string>
+    <string name="you_are_invited">Sei invitato</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Gli spazi sono modi di raggruppare stanze e persone per lavoro, divertimento o solo per te stesso.</string>
+    <string name="spaces_beta_welcome_to_spaces">Benvenuti negli spazi!</string>
+    <string name="space_add_existing_rooms">Aggiungi stanze e spazi esistenti</string>
+    <string name="space_leave_prompt_msg">Vuoi veramente uscire dallo spazio\?</string>
+    <string name="leave_space">Esci dallo spazio</string>
+    <string name="space_add_child_title">Aggiungi stanze</string>
+    <string name="space_explore_activity_title">Esplora stanze</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d persona che conosci si è già unita</item>
+        <item quantity="other">%d persone che conosci si sono già unite</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Benvenuti a %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Non sei ancora in nessuna stanza. Sotto trovi alcune stanze consigliate, ma puoi vederne altre con il pulsante verde in fondo a destra.</string>
+    <string name="room_alias_preview_not_found">Questo alias non è accessibile al momento.
+\nRiprova più tardi, o chiedi ad un amministratore della stanza di controllare se hai l\'accesso.</string>
+    <string name="join_anyway">Unisciti comunque</string>
+    <string name="join_space">Unisciti ad uno spazio</string>
+    <string name="create_space">Crea spazio</string>
+    <string name="skip_for_now">Salta per adesso</string>
+    <string name="share_space_link_message">Unisciti al mio spazio %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">Non faranno parte di %s</string>
+    <string name="invite_just_to_this_room">Solo in questa stanza</string>
+    <string name="invite_to_space_with_name_desc">Potranno esplorare %s</string>
+    <string name="invite_to_space_with_name">Invita in %s</string>
+    <string name="invite_by_link">Condividi collegamento</string>
+    <string name="invite_by_mxid">Invita per nome utente</string>
+    <string name="invite_by_email">Invita per email</string>
+    <string name="invite_people_to_your_space_desc">Ci sei solo tu al momento. %s sarà ancora meglio con gli altri.</string>
+    <string name="invite_people_menu">Invita persone</string>
+    <string name="invite_people_to_your_space">Invita persone nel tuo spazio</string>
+    <string name="create_space_topic_hint">Descrizione</string>
+    <string name="create_spaces_loading_message">Creazione spazio…</string>
+    <string name="create_spaces_default_public_random_room_name">Casuale</string>
+    <string name="create_spaces_default_public_room_name">Generale</string>
+    <string name="create_spaces_room_private_header_desc">Creiamo una stanza per ognuno di esse. Puoi aggiungerne altre in seguito, incluse quelle già esistenti.</string>
+    <string name="create_spaces_room_private_header">Su quali cose stai lavorando\?</string>
+    <string name="create_spaces_room_public_header_desc">Creeremo delle stanze per ognuno di essi. Puoi aggiungerne altre in seguito.</string>
+    <string name="create_spaces_room_public_header">Di quali argomenti vorresti parlare in %s\?</string>
+    <string name="create_space_error_empty_field_space_name">Dagli un nome per continuare.</string>
+    <string name="create_spaces_details_private_header">Aggiungi alcuni dettagli per aiutare le persone ad identificarlo. Puoi modificarli in qualsiasi momento.</string>
+    <string name="create_spaces_details_public_header">Aggiungi alcuni dettagli per renderlo più distinguibile. Puoi modificarli in qualsiasi momento.</string>
+    <string name="activity_create_space_title">Crea uno spazio</string>
+    <string name="space_type_private_desc">Solo su invito, consigliato per te o i team</string>
+    <string name="space_type_private">Privato</string>
+    <string name="space_type_public_desc">Aperto a tutti, consigliato per le comunità</string>
+    <string name="space_type_public">Pubblico</string>
+    <string name="create_spaces_private_teammates">Uno spazio privato per te e i tuoi compagni</string>
+    <string name="create_spaces_me_and_teammates">Io e i miei compagni</string>
+    <string name="create_spaces_organise_rooms">Uno spazio privato per organizzare le tue stanze</string>
+    <string name="create_spaces_just_me">Solo io</string>
+    <string name="create_spaces_make_sure_access">Assicurati che le persone giuste abbiano accesso a %s. Puoi cambiarlo in seguito.</string>
+    <string name="create_spaces_who_are_you_working_with">Con chi stai lavorando\?</string>
+    <string name="create_spaces_join_info_help">Per unirti ad uno spazio esistente, ti serve un invito.</string>
+    <string name="create_spaces_you_can_change_later">Puoi cambiarlo in seguito</string>
+    <string name="create_spaces_choose_type_label">Che tipo di spazio vuoi creare\?</string>
+    <string name="create_spaces_type_header">Gli spazi sono un nuovo modo di raggruppare stanze e persone</string>
+    <string name="your_private_space">Il tuo spazio privato</string>
+    <string name="your_public_space">Il tuo spazio pubblico</string>
+    <string name="add_space">Aggiungi spazio</string>
+    <string name="command_description_leave_room">Esci dalla stanza con un dato ID (o dalla stanza attuale se vuoto)</string>
+    <string name="command_description_join_space">Unisciti allo spazio con un dato ID</string>
+    <string name="command_description_create_space">Crea uno spazio</string>
+    <string name="a11y_unchecked">Non controllato</string>
+    <string name="search_hint_room_name">Cerca nome</string>
+    <string name="room_settings_room_access_restricted_description">Chiunque in uno spazio con questa stanza può trovarla ed entrarci. Solo gli amministratori della stanza possono aggiungerla ad uno spazio.</string>
+    <string name="room_settings_room_access_restricted_title">Spazi</string>
+    <string name="room_settings_room_access_public_description">Chiunque può trovarla ed entrare</string>
+    <string name="room_settings_room_access_public_title">Pubblica</string>
+    <string name="room_settings_room_access_private_description">Solo le persone invitate possono trovarla ed entrare</string>
+    <string name="room_settings_room_access_private_title">Privata</string>
+    <string name="room_settings_room_access_entry_unknown">Impostazione di accesso sconosciuta (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Chiunque può bussare alla porta, poi i membri possono accettare o rifiutare</string>
+    <string name="room_settings_guest_access_title">Permetti l\'ingresso agli ospiti</string>
+    <string name="spaces_header">Spazi</string>
+    <string name="spaces_invited_header">Inviti</string>
+    <string name="suggested_header">Stanze suggerite</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 0a13e92972..6e2503a8b5 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -358,7 +358,7 @@
     <string name="black_theme">Melna tēma</string>
     <string name="notification_sync_in_progress">Sinhronizācija…</string>
     <string name="notification_listening_for_events">Notikumu monitorings</string>
-    <string name="notification_noisy_notifications">Skaņi paziņojumi</string>
+    <string name="notification_noisy_notifications">Skaņas paziņojumi</string>
     <string name="notification_silent_notifications">Klusi paziņojumi</string>
     <string name="title_activity_bug_report">Kļūdas atskaite</string>
     <string name="title_activity_group_details">Kopienas informācija</string>
@@ -1749,7 +1749,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
 \n
 \nMēs iesakām jums nekavējoties nomainīt paroli un atiestatīšanas atslēgu iestatījumos.</string>
     <string name="refresh">Atsvaidzināt</string>
-    <string name="share_confirm_room">Vai vēlaties sūtīt šo pielikumu uz %1$s\?</string>
+    <string name="share_confirm_room">Vai vēlaties sūtīt šo pielikumu %1$s\?</string>
     <string name="enter_secret_storage_passphrase_warning">Brīdinājums:</string>
     <string name="new_signin">Jauna pierakstīšanās</string>
     <string name="settings_account_data">Konta dati</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index ef68551dc8..543061a8eb 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2662,4 +2662,82 @@
 \nPo shkarkohen të dhëna…</string>
     <string name="initial_sync_start_server_computing">Njëkohësimi Fillestar:
 \nPo pritet për përgjigje nga shërbyesi…</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Hapësirat janë mënyra për të grupuar dhoma dhe persona për punë, zbavitje ose thjesht për veten tuaj.</string>
+    <string name="labs_use_restricted_join_rule_desc">Sinjalizimi lyp mbulim nga shërbyesi dhe version eksperimental dhome</string>
+    <string name="labs_use_restricted_join_rule">Hapësirë Eksperimentale - Dhomë e Kufizuar.</string>
+    <string name="you_are_invited">Jeni ftuar</string>
+    <string name="spaces_beta_welcome_to_spaces">Mirë se vini te Hapësira!</string>
+    <string name="space_add_existing_rooms">Shtoni dhoma ekzistuese dhe hapësira</string>
+    <string name="space_leave_prompt_msg">Jeni i sigurt se doni të dilni nga hapësira\?</string>
+    <string name="leave_space">Braktiseni Hapësirën</string>
+    <string name="space_add_child_title">Shtoni dhoma</string>
+    <string name="space_explore_activity_title">Eksploroni dhoma</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d person që e njihni është bërë pjesë tashmë</item>
+        <item quantity="other">%d persona që i njihni janë bërë pjesë tashmë</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Mirë se vini në %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Ende s’jeni në ndonjë nga dhomat. Më poshtë keni disa dhoma të sugjeruara, por mund të shihni më tepër, me butonin e gjelbër poshtë djathtas.</string>
+    <string name="room_alias_preview_not_found">Ky alias s’mund të përdoret tani.
+\nRiprovoni më vonë, ose kërkojini një përgjegjësi dhome të kontrollojë nëse keni leje për hyrje.</string>
+    <string name="join_anyway">Hyni, Sido Qoftë</string>
+    <string name="join_space">Hyni te Hapësirë</string>
+    <string name="create_space">Krijo Hapësirën</string>
+    <string name="skip_for_now">Hëpërhë anashkaloje</string>
+    <string name="share_space_link_message">Ejani në hapësirën time %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">S’do të jenë pjesë e %s</string>
+    <string name="invite_just_to_this_room">Thjesht te kjo dhomë</string>
+    <string name="invite_to_space_with_name_desc">Do të jenë në gjendje të eksplorojnë %s</string>
+    <string name="invite_to_space_with_name">Ftojeni në %s</string>
+    <string name="invite_by_link">Jepuni lidhjen</string>
+    <string name="invite_by_mxid">Ftoni përmes emri përdoruesi</string>
+    <string name="invite_by_email">Ftoni përmes email-i</string>
+    <string name="invite_people_to_your_space_desc">Vetëm ju, hëpërhë. %s do të jetë edhe më mirë me të tjerë.</string>
+    <string name="invite_people_menu">Ftoni njerëz</string>
+    <string name="invite_people_to_your_space">Ftoni njerëz te ekipi juaj</string>
+    <string name="create_space_topic_hint">Përshkrim</string>
+    <string name="create_spaces_loading_message">Po krijohe Hapësirë…</string>
+    <string name="create_spaces_default_public_random_room_name">Kuturu</string>
+    <string name="create_spaces_default_public_room_name">Të Përgjithshme</string>
+    <string name="create_spaces_room_private_header_desc">Le të krijojmë një dhomë për secilën prej tyre. Mund të shtoni të tjera më vonë, përfshi ato ekzistuese tashmë.</string>
+    <string name="create_spaces_room_private_header">Me çfarë po merreni\?</string>
+    <string name="create_spaces_room_public_header_desc">Do të krijojmë dhoma për to. Mund edhe të shtoni të tilla më vonë.</string>
+    <string name="create_spaces_room_public_header">Cilat janë disa nga gjërat që doni të diskutoni në %s\?</string>
+    <string name="create_space_error_empty_field_space_name">Jepini një emër që të vazhdohet.</string>
+    <string name="create_spaces_details_private_header">Shtoni ndonjë hollësi për të ndihmuar njerëzit ta identifikojnë. Mund t’i ndryshoni kur të doni.</string>
+    <string name="create_spaces_details_public_header">Shtoni ndonjë hollësi për të ndihmuar të dalë në pah. Këto mund t’i ndryshoni kur të doni.</string>
+    <string name="activity_create_space_title">Krijoni një hapësirë</string>
+    <string name="space_type_private_desc">Vetëm me ftesa, më e mira për ju ose ekipe</string>
+    <string name="space_type_private">Vetjake</string>
+    <string name="space_type_public_desc">E hapur për këdo, më e mira për bashkësi</string>
+    <string name="space_type_public">Publike</string>
+    <string name="create_spaces_private_teammates">Një hapësirë private për ju &amp; anëtarët e ekipit tuaj</string>
+    <string name="create_spaces_me_and_teammates">Unë dhe anëtarët e ekipit tim</string>
+    <string name="create_spaces_organise_rooms">Një hapësirë private për të sistemuar dhomat tuaja</string>
+    <string name="create_spaces_just_me">Unë vetëm</string>
+    <string name="create_spaces_make_sure_access">Siguroni që personat e duhur të kenë hyrje te %s. Këtë mund të ndryshoni më vonë.</string>
+    <string name="create_spaces_who_are_you_working_with">Me cilët po punoni\?</string>
+    <string name="create_spaces_join_info_help">Që të hyni në një hapësirë ekzistuese, ju duhet një ftesë.</string>
+    <string name="create_spaces_you_can_change_later">Këtë mund ta ndryshoni më vonë</string>
+    <string name="create_spaces_choose_type_label">Ç’lloj hapësire doni të krijoni\?</string>
+    <string name="create_spaces_type_header">Hapësirat janë një mënyrë e re për të grupuar dhoma dhe persona</string>
+    <string name="your_private_space">Hapësira juaj private</string>
+    <string name="your_public_space">Hapësira juaj publike</string>
+    <string name="add_space">Shtoni Hapësirë</string>
+    <string name="command_description_leave_room">Braktiseni dhomën me ID-në e dhënë (ose dhomën e tanishme, në qoftë nul)</string>
+    <string name="command_description_join_space">Hyni te Hapësira me ID-në e dhënë</string>
+    <string name="command_description_create_space">Krijoni një Hapësirë</string>
+    <string name="search_hint_room_name">Kërko Për Emër</string>
+    <string name="room_settings_room_access_restricted_description">Cilido në një hapësirë me këtë dhomë mund ta kërkojë dhe hyjë në të. Vetëm përgjegjësit e kësaj dhome mund ta shtojnë te një hapësirë.</string>
+    <string name="room_settings_room_access_restricted_title">Hapësira</string>
+    <string name="room_settings_room_access_public_description">Kushdo mund ta gjejë dhomën dhe të hyjë në të</string>
+    <string name="room_settings_room_access_public_title">Publike</string>
+    <string name="room_settings_room_access_private_description">Vetëm personat e ftuar mund ta gjejnë dhe hyjnë në të</string>
+    <string name="room_settings_room_access_private_title">Private</string>
+    <string name="room_settings_room_access_entry_unknown">Rregullim i panjohur hyrjesh (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Në dhomë mund të trokasë cilido, anëtarët mandej mund ta pranojnë ose jo</string>
+    <string name="room_settings_guest_access_title">Lejo vizitorë të hyjnë</string>
+    <string name="spaces_header">Hapësira</string>
+    <string name="spaces_invited_header">Ftesa</string>
+    <string name="suggested_header">Dhoma të Këshilluara</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index c1be9f5678..64b67bcc3d 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2673,4 +2673,83 @@
     <string name="event_status_a11y_sending">Skickar</string>
     <string name="settings_category_room_directory">Rumskatalog</string>
     <string name="event_status_sent_message">Meddelande skickat</string>
+    <string name="create_spaces_details_public_header">Lägg till några detaljer för att hjälpa det satt sticka ut. Du kan ändra dessa när som helst.</string>
+    <string name="activity_create_space_title">Skapa ett utrymme</string>
+    <string name="space_type_private_desc">Endast inbjudan, bäst för dig själv eller team</string>
+    <string name="space_type_private">Privat</string>
+    <string name="space_type_public_desc">Öppet för alla, bäst för gemenskaper</string>
+    <string name="space_type_public">Offentligt</string>
+    <string name="create_spaces_private_teammates">Ett privat utrymme for dig och dina teamkamrater</string>
+    <string name="create_spaces_me_and_teammates">Jag och mina teamkamrater</string>
+    <string name="create_spaces_organise_rooms">Att privat utrymme för att organisera dina rum</string>
+    <string name="create_spaces_just_me">Bara jag</string>
+    <string name="create_spaces_make_sure_access">Det till att rätt personer har åtkomst till %s. Du kan ändra detta senare.</string>
+    <string name="create_spaces_who_are_you_working_with">Vem jobbar du med\?</string>
+    <string name="create_spaces_join_info_help">För att gå med i ett existerande utrymme så behöver du en inbjudan.</string>
+    <string name="create_spaces_you_can_change_later">Detta kan ändras senare</string>
+    <string name="create_spaces_choose_type_label">Vilket sorts utrymme vill du skapa\?</string>
+    <string name="create_spaces_type_header">Utrymmen är ett nytt sätt att gruppera rum och personer</string>
+    <string name="your_private_space">Ditt privata utrymme</string>
+    <string name="your_public_space">Ditt offentliga utrymme</string>
+    <string name="add_space">Lägg till utrymme</string>
+    <string name="command_description_leave_room">Lämna rummet med det angivna ID:t (eller nuvarande rum om null)</string>
+    <string name="command_description_join_space">Gå med i utrymmet med det angivna ID:t</string>
+    <string name="command_description_create_space">Skapa ett utrymme</string>
+    <string name="a11y_unchecked">Okryssad</string>
+    <string name="search_hint_room_name">Sök efter namn</string>
+    <string name="room_settings_room_access_restricted_description">Vem som helst i ett utrymme med det här rummet kan hitta det och gå med. Bara administratörer för det här rummet kan lägga till det till ett utrymme.</string>
+    <string name="room_settings_room_access_restricted_title">Utrymmen</string>
+    <string name="room_settings_room_access_public_description">Vem som helst kan hitta rummet och gå med</string>
+    <string name="room_settings_room_access_public_title">Offentlig</string>
+    <string name="room_settings_room_access_private_description">Bara personer som bjuds in kan hitta och gå med</string>
+    <string name="room_settings_room_access_private_title">Privat</string>
+    <string name="room_settings_room_access_entry_unknown">Okänd åtkomstinställning (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Vem som helst kan knacka på, och medlemmar kan då acceptera eller avvisa</string>
+    <string name="room_settings_guest_access_title">Tillåt gäster att gå med</string>
+    <string name="spaces_header">Utrymmen</string>
+    <string name="spaces_invited_header">Inbjudningar</string>
+    <string name="suggested_header">Föreslagna rum</string>
+    <string name="invite_to_space_with_name">Bjud in till %s</string>
+    <string name="invite_by_link">Dela länk</string>
+    <string name="invite_by_mxid">Bjud in med användarnamn</string>
+    <string name="invite_by_email">Bjud in via e-post</string>
+    <string name="invite_people_to_your_space_desc">Det är bara du här för tillfället. %s kommer att vara ännu bättre med fler.</string>
+    <string name="invite_people_to_your_space">Bjud in personer till ditt utrymme</string>
+    <string name="invite_people_menu">Bjud in personer</string>
+    <string name="create_space_topic_hint">Beskrivning</string>
+    <string name="create_spaces_loading_message">Skapar utrymme…</string>
+    <string name="create_spaces_default_public_random_room_name">Slumpmässigt</string>
+    <string name="create_spaces_default_public_room_name">Allmänt</string>
+    <string name="create_spaces_room_private_header_desc">Låt oss skapa ett rum för varje. Du kan lägga till fler senare också, även redan existerande.</string>
+    <string name="create_spaces_room_private_header">Vad för saker jobbar du med\?</string>
+    <string name="create_spaces_room_public_header_desc">Vi kommer att skapa rum för dem. Du kan lägga till fler senare.</string>
+    <string name="create_spaces_room_public_header">Vad är några diskussioner du vill ha i %s\?</string>
+    <string name="create_space_error_empty_field_space_name">Ge det ett namn för att fortsätta.</string>
+    <string name="create_spaces_details_private_header">Lägg till några detaljer för att hjälpa folk att identifiera det. Du kan ändra dessa när som helst.</string>
+    <string name="invite_just_to_this_room">Bara till det här rummet</string>
+    <string name="invite_to_space_with_name_desc">De kommer att kunna utforska %s</string>
+    <string name="skip_for_now">Hoppa över för tillfället</string>
+    <string name="share_space_link_message">Gå med i mitt utrymme %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">De kommer inte att bli en del av %s</string>
+    <string name="labs_use_restricted_join_rule_desc">Varning kräver serverstöd och experimentell rumsversion</string>
+    <string name="labs_use_restricted_join_rule">Experimentellt utrymme - Begränsat rum.</string>
+    <string name="you_are_invited">Du är inbjuden</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Utrymmen är nya sätt att gruppera rum och personer för arbete, skoj eller bara för dig själv.</string>
+    <string name="spaces_beta_welcome_to_spaces">Välkommen till utrymmen!</string>
+    <string name="space_add_existing_rooms">Lägg till existerande rum och utrymme</string>
+    <string name="space_leave_prompt_msg">Är du säker på att du vill lämna utrymmet\?</string>
+    <string name="leave_space">Lämna utrymme</string>
+    <string name="space_add_child_title">Lägg till rum</string>
+    <string name="space_explore_activity_title">Utforska rum</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d person du känner har redan gått med</item>
+        <item quantity="other">%d personer du känner har redan gått med</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Välkommen till %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Du är inte i några rum än. Nedan finns några föreslagna rum, men du kan se fler med den gröna knappen nere till höger.</string>
+    <string name="room_alias_preview_not_found">Det här aliaset är inte tillgängligt för tillfället.
+\nFörsök igen senare eller be en rumsadminstratör kolla om du har åtkomst.</string>
+    <string name="join_anyway">Gå med iallafall</string>
+    <string name="join_space">Gå med i utrymme</string>
+    <string name="create_space">Skapa utrymme</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-tzm/strings.xml b/vector/src/main/res/values-tzm/strings.xml
index b8688a3c6b..3566c14f0d 100644
--- a/vector/src/main/res/values-tzm/strings.xml
+++ b/vector/src/main/res/values-tzm/strings.xml
@@ -6,7 +6,7 @@
     <string name="settings">Tisɣal</string>
     <string name="room_list_quick_actions_settings">Tisɣal</string>
     <string name="settings_text_message_sent_hint">Tangalt</string>
-    <string name="settings_profile_picture">Tawlaft n ifres</string>
+    <string name="settings_profile_picture">Tawlaft n yifres</string>
     <string name="room_settings_all_messages">Tuzinin maṛṛa</string>
     <string name="settings_general_title">Amatay</string>
     <string name="settings_theme">Asgum</string>
@@ -33,13 +33,13 @@
     <string name="room_permissions_change_settings">Ssenfel Tisɣal</string>
     <string name="global_retry">Rar</string>
     <string name="encryption_information_algorithm">Talgoritmet</string>
-    <string name="room_settings_addresses_pref_title">Tansa</string>
+    <string name="room_settings_addresses_pref_title">Tansawin</string>
     <string name="media_saving_period_forever">Abda</string>
     <string name="media_source_choose">Dɣer</string>
     <string name="compression_opt_list_choose">Dɣer</string>
     <string name="devices_delete_submit_button_label">Azen</string>
     <string name="room_sliding_menu_messages">Tuzinin</string>
-    <string name="room_recents_join">LKM</string>
+    <string name="room_recents_join">LKEM</string>
     <string name="tab_title_search_files">IFUYLA</string>
     <string name="search_hint">Rzu</string>
     <string name="room_details_files">Ifuyla</string>
@@ -50,7 +50,7 @@
         <item quantity="one">%das</item>
         <item quantity="other">%das</item>
     </plurals>
-    <string name="reject">Agey</string>
+    <string name="reject">Agy</string>
     <string name="join">Lkem</string>
     <string name="no">UHU</string>
     <string name="yes">YAH</string>
@@ -62,14 +62,14 @@
     <string name="read_receipt">Ɣer</string>
     <string name="bottom_action_notification">Tineɣmisin</string>
     <string name="dialog_title_error">Azgal</string>
-    <string name="action_close">Rgel</string>
+    <string name="action_close">Mdel</string>
     <string name="action_open">Ṛẓem</string>
     <string name="actions">Tigawin</string>
     <string name="action_exit">Ffeɣ</string>
-    <string name="decline">Agey</string>
+    <string name="decline">Agy</string>
     <string name="invite">Ɣer</string>
     <string name="or">neɣ</string>
-    <string name="ongoing_conference_call_video">Avidyu</string>
+    <string name="ongoing_conference_call_video">Afidyu</string>
     <string name="play_video">Ɣer</string>
     <string name="delete">Kkes</string>
     <string name="clear">Sfeḍ</string>
@@ -78,12 +78,29 @@
     <string name="download">Agem</string>
     <string name="resend">Ssifeḍ</string>
     <string name="send">Azen</string>
-    <string name="leave">Ffel</string>
+    <string name="leave">Ffeɣ</string>
     <string name="save">Ḥḍu</string>
     <string name="cancel">Sser</string>
     <string name="ok">WAX</string>
-    <string name="loading">Azdam…</string>
+    <string name="loading">Asali…</string>
     <string name="summary_you_sent_image">Tuzend yat twellaft.</string>
     <string name="summary_user_sent_image">yuzen %1$s yat twellafet.</string>
     <string name="summary_message">%1$s: %2$s</string>
+    <string name="tab_title_search_people">MIDDEN</string>
+    <string name="tab_title_search_messages">TUZININ</string>
+    <string name="ssl_logout_account">Ffeɣ</string>
+    <string name="room_participants_action_invite">Ɣer</string>
+    <string name="auth_skip">Nexxel</string>
+    <string name="auth_submit">Azen</string>
+    <string name="dialog_title_confirmation">Asentem</string>
+    <string name="call_notification_reject">Agy</string>
+    <string name="ignore">Ttu</string>
+    <string name="dismiss">Agy</string>
+    <string name="none">Awd yan</string>
+    <string name="redact">Sfeḍ</string>
+    <string name="stay">Qqim</string>
+    <string name="notice_room_ban_by_you">Tegdeld %1$s</string>
+    <string name="notice_room_ban">igdel %1$s %2$s</string>
+    <string name="notice_room_invite_by_you">Teɣrid-d i %1$s</string>
+    <string name="notice_room_invite">iɣra-d %1$s i %2$s</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index a1566a81d2..c6fd66bf68 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -457,4 +457,12 @@
     <string name="summary_message">%1$s: %2$s</string>
     <string name="notice_profile_change_redacted_by_you">Bạn đã cập nhật hồ sơ của bạn %1$s</string>
     <string name="notice_profile_change_redacted">%1$s đã cập nhật hồ sơ của họ %2$s</string>
+    <string name="invite_just_to_this_room_desc">Họ sẽ không ở trong %s</string>
+    <string name="invite_just_to_this_room">Chỉ vào phòng này</string>
+    <string name="invite_to_space_with_name_desc">Họ sẽ có thể khám phá %s</string>
+    <string name="invite_to_space_with_name">Mời vào %s</string>
+    <string name="invite_by_link">Chia sẻ liên kết</string>
+    <string name="room_alias_preview_not_found">Bí danh này không truy cập được vào lúc này.
+\nHãy thử lại sau, hoặc yêu cầu một quản trị viên của phòng kiểm tra xem bạn có quyền truy cập không.</string>
+    <string name="join_anyway">Vẫn tham gia</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index bd628d9bdb..beff6c35fd 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2622,4 +2622,82 @@
     <string name="settings_room_directory_show_all_rooms">顯示帶有明確內容的聊天室</string>
     <string name="settings_category_room_directory">聊天室目錄</string>
     <string name="event_status_sent_message">訊息已傳送</string>
+    <string name="labs_use_restricted_join_rule_desc">警告需要伺服器支援與實驗性聊天室版本</string>
+    <string name="labs_use_restricted_join_rule">實驗性空間 - 受限制的聊天室。</string>
+    <string name="you_are_invited">您被邀請了</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">空間是將聊天室與夥伴依工作、娛樂或是您自己的喜好分組的方式。</string>
+    <string name="spaces_beta_welcome_to_spaces">歡迎使用空間！</string>
+    <string name="space_add_existing_rooms">新增既有的聊天室與空間</string>
+    <string name="space_leave_prompt_msg">您確定您想要離開空間嗎？</string>
+    <string name="leave_space">離開空間</string>
+    <string name="space_add_child_title">新增聊天室</string>
+    <string name="space_explore_activity_title">探索聊天室</string>
+    <plurals name="space_people_you_know">
+        <item quantity="other">您認識的 %d 個人已加入</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">歡迎來到 %1$s，%2$s。</string>
+    <string name="suggested_rooms_pills_on_empty_text">您還沒有任何聊天室。下面是一些建議的聊天室，但您可以透過右下角的按鈕檢視更多。</string>
+    <string name="room_alias_preview_not_found">目前無法存取此別名。
+\n請稍後再試，或要求聊天室管理員檢查您是否有權存取。</string>
+    <string name="join_anyway">無論如何都要加入</string>
+    <string name="join_space">加入空間</string>
+    <string name="create_space">建立空間</string>
+    <string name="skip_for_now">現在略過</string>
+    <string name="share_space_link_message">加入我的空間 %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">他們不會是 %s 的一部分</string>
+    <string name="invite_just_to_this_room">剛到此聊天室</string>
+    <string name="invite_to_space_with_name_desc">他們將可以探索 %s</string>
+    <string name="invite_to_space_with_name">邀請至 %s</string>
+    <string name="invite_by_link">分享連結</string>
+    <string name="invite_by_mxid">透過使用者名稱邀請</string>
+    <string name="invite_by_email">透過電子郵件邀請</string>
+    <string name="invite_people_to_your_space_desc">此刻只有您。%s 與其他人一起會更好。</string>
+    <string name="invite_people_menu">邀請夥伴</string>
+    <string name="invite_people_to_your_space">邀請夥伴進入您的空間</string>
+    <string name="create_space_topic_hint">描述</string>
+    <string name="create_spaces_loading_message">正在建立空間……</string>
+    <string name="create_spaces_default_public_random_room_name">隨機</string>
+    <string name="create_spaces_default_public_room_name">一般</string>
+    <string name="create_spaces_room_private_header_desc">讓我們為每個主題建立一個聊天室。您也可以稍後再新增，包含既有的。</string>
+    <string name="create_spaces_room_private_header">您在忙些什麼？</string>
+    <string name="create_spaces_room_public_header_desc">我們將會為此建立聊天室。您也可以在稍後新增更多。</string>
+    <string name="create_spaces_room_public_header">您希望在 %s 中進行哪些討論？</string>
+    <string name="create_space_error_empty_field_space_name">為它命名以繼續。</string>
+    <string name="create_spaces_details_private_header">新增一些詳細資訊以協助人們識別。您隨時可以變更這些資訊。</string>
+    <string name="create_spaces_details_public_header">加入一些詳細資訊以協助其脫穎而出。您隨時都可以變更這些資料。</string>
+    <string name="activity_create_space_title">建立空間</string>
+    <string name="space_type_private_desc">僅邀請，最適合您自己或團隊</string>
+    <string name="space_type_private">私人</string>
+    <string name="space_type_public_desc">對任何人開放，最適合社群</string>
+    <string name="space_type_public">公開</string>
+    <string name="create_spaces_private_teammates">供您與您的隊友使用的私人空間</string>
+    <string name="create_spaces_me_and_teammates">我與隊友</string>
+    <string name="create_spaces_organise_rooms">用來整理您聊天室的私人空間</string>
+    <string name="create_spaces_just_me">只有我</string>
+    <string name="create_spaces_make_sure_access">確定合適的人有權存取 %s。您可以在稍後變更。</string>
+    <string name="create_spaces_who_are_you_working_with">您與誰一起工作？</string>
+    <string name="create_spaces_join_info_help">要加入既有的空間，您需要邀請。</string>
+    <string name="create_spaces_you_can_change_later">您可以稍後再更改</string>
+    <string name="create_spaces_choose_type_label">您想要建立哪種類型的空間？</string>
+    <string name="create_spaces_type_header">空間是一種將聊天室與人們分組的新方式</string>
+    <string name="your_private_space">您的私人空間</string>
+    <string name="your_public_space">您的公開空間</string>
+    <string name="add_space">新增空間</string>
+    <string name="command_description_leave_room">離開有指定 id 的聊天室（如果是 null 的話則為目前聊天室）</string>
+    <string name="command_description_join_space">使用指定的 id 加入空間</string>
+    <string name="command_description_create_space">建立空間</string>
+    <string name="a11y_unchecked">未檢查</string>
+    <string name="search_hint_room_name">搜尋名稱</string>
+    <string name="room_settings_room_access_restricted_description">擁有此聊天室空間中的任何人都可以尋找並加入。僅此聊天是的管理員可以將其新增到空間中。</string>
+    <string name="room_settings_room_access_restricted_title">空間</string>
+    <string name="room_settings_room_access_public_description">任何人都可以尋找聊天室並加入</string>
+    <string name="room_settings_room_access_public_title">公開</string>
+    <string name="room_settings_room_access_private_description">僅被邀請的夥伴可以尋找並加入</string>
+    <string name="room_settings_room_access_private_title">私人</string>
+    <string name="room_settings_room_access_entry_unknown">未知的存取設定 (%s)</string>
+    <string name="room_settings_room_access_entry_knock">任何人都可以要求加入聊天室，成員可以接受或回絕</string>
+    <string name="room_settings_guest_access_title">允許訪客加入</string>
+    <string name="spaces_header">空間</string>
+    <string name="spaces_invited_header">邀請</string>
+    <string name="suggested_header">建議的聊天室</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/font_certs.xml b/vector/src/main/res/values/font_certs.xml
index 141bfc01d9..5ce2ca424d 100644
--- a/vector/src/main/res/values/font_certs.xml
+++ b/vector/src/main/res/values/font_certs.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <array name="com_google_android_gms_fonts_certs">
         <item>@array/com_google_android_gms_fonts_certs_dev</item>
         <item>@array/com_google_android_gms_fonts_certs_prod</item>
     </array>
     <string-array name="com_google_android_gms_fonts_certs_dev">
-        <item>
+        <item tools:ignore="Typos">
             MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
         </item>
     </string-array>
     <string-array name="com_google_android_gms_fonts_certs_prod">
-        <item>
+        <item tools:ignore="Typos">
             MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
         </item>
     </string-array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 71f48bcee2..df65089afe 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2167,6 +2167,14 @@
     <string name="send_suggestion_sent">Thanks, the suggestion has been successfully sent</string>
     <string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
 
+    <string name="send_feedback_space_title">Spaces feedback</string>
+    <string name="feedback">Feedback</string>
+    <string name="send_feedback_space_info">You’re using a beta version of spaces. Your feedback will help inform the next versions. Your platform and username will be noted to help us use your feedback as much as we can.</string>
+    <string name="you_may_contact_me">You may contact me if you have any follow up questions</string>
+    <string name="feedback_sent">Thanks, your feedback has been successfully sent</string>
+    <string name="feedback_failed">The feedback failed to be sent (%s)</string>
+    <string name="give_feedback">Give Feedback</string>
+
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">"Show complete history in encrypted rooms"</string>
 
@@ -2286,6 +2294,7 @@
     <string name="a11y_show_password">Show password</string>
     <string name="a11y_hide_password">Hide password</string>
     <string name="a11y_jump_to_bottom">Jump to bottom</string>
+    <string name="a11y_beta">This feature is in beta</string>
 
     <!-- Read receipts list a11y -->
     <plurals name="two_and_some_others_read">
@@ -3253,6 +3262,7 @@
     <string name="a11y_rule_notify_silent">Notify without sound</string>
     <string name="a11y_rule_notify_off">Do not notify</string>
     <string name="a11y_view_read_receipts">View read receipts</string>
+    <string name="a11y_public_room">This room is public</string>
 
     <string name="dev_tools_menu_name">Dev Tools</string>
     <string name="dev_tools_explore_room_state">Explore Room State</string>
@@ -3315,6 +3325,7 @@
     <string name="create_space_topic_hint">Description</string>
     <string name="invite_people_to_your_space">Invite people to your space</string>
     <string name="invite_people_menu">Invite people</string>
+    <string name="invite_to_space">Invite to %s</string>
     <string name="invite_people_to_your_space_desc">It’s just you at the moment.  %s will be even better with others.</string>
     <string name="invite_by_email">Invite by email</string>
     <string name="invite_by_mxid">Invite by username</string>
@@ -3348,7 +3359,7 @@
 
     <string name="space_add_existing_rooms">Add existing rooms and space</string>
     <string name="spaces_beta_welcome_to_spaces">Welcome to Spaces!</string>
-    <string name="spaces_beta_welcome_to_spaces_desc">Spaces are ways to group rooms and people for work, fun or just yourself.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Spaces are a new way to group rooms and people.</string>
     <string name="you_are_invited">You are invited</string>
 
 
@@ -3357,4 +3368,16 @@
     <string name="user_invites_you">%s invites you</string>
 
     <string name="looking_for_someone_not_in_space">Looking for someone not in %s?</string>
+    <string name="space_settings_manage_rooms">Manage rooms</string>
+    <string name="make_this_space_public">Make this space public</string>
+    <string name="space_suggested">Suggested</string>
+    <string name="space_mark_as_suggested">Mark as suggested</string>
+    <string name="space_mark_as_not_suggested">Mark as not suggested</string>
+    <string name="space_manage_rooms_and_spaces">Manage rooms and spaces</string>
+
+
+    <string name="labs_space_show_orphan_in_home">Experimental Space - Only show orphans in Home</string>
+    <string name="spaces_feeling_experimental_subspace">Feeling experimental?\nYou can add existing spaces to a space.</string>
+    <string name="spaces_no_server_support_title">It looks like your homeserver does not support Spaces yet</string>
+    <string name="spaces_no_server_support_description">Please contact your homserver admin for further information</string>
 </resources>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index a265727522..a48cecf5f2 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -11,6 +11,13 @@
         <item name="android:background">?riotx_background</item>
     </style>
 
+    <style name="ActionModeTheme" parent="Widget.AppCompat.ActionMode">
+        <item name="background">?riotx_background</item>
+        <item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
+        <item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>
+        <item name="actionMenuTextColor">?colorOnPrimary</item>
+    </style>
+
     <style name="VectorToolbarStyle" parent="VectorToolbarStyleWithPadding">
         <item name="contentInsetStartWithNavigation">0dp</item>
     </style>
@@ -65,7 +72,7 @@
 
     <!-- actionbar icons color -->
     <style name="Vector.ActionBarTheme" parent="ThemeOverlay.MaterialComponents.ActionBar">
-        <item name="colorControlNormal">@android:color/white</item>
+        <item name="colorControlNormal">?android:attr/textColorPrimary</item>
     </style>
 
     <!-- custom action bar -->
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index d5b8a40cbb..94252622f4 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -181,6 +181,8 @@
 
         <!-- chat effect -->
         <item name="vctr_chat_effect_snow_background">@android:color/transparent</item>
+
+        <item name="actionModeStyle">@style/ActionModeTheme</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 049f8dd1db..e2b65a410e 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -183,6 +183,9 @@
 
         <!-- chat effect -->
         <item name="vctr_chat_effect_snow_background">@color/black_alpha</item>
+
+        <item name="actionModeStyle">@style/ActionModeTheme</item>
+
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
index e136ed0f80..6ded739c0e 100644
--- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml
+++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
@@ -7,6 +7,7 @@
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:key="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
+            android:icon="@drawable/ic_verification_glasses"
             android:summary="@string/settings_developer_mode_summary"
             android:title="@string/settings_developer_mode" />
 
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 607f01db35..1e0f736db2 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -52,4 +52,9 @@
         android:summary="@string/labs_use_restricted_join_rule_desc"/>
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:key="SETTINGS_LABS_SPACES_HOME_AS_ORPHAN"
+        android:title="@string/labs_space_show_orphan_in_home"/>
+
 </androidx.preference.PreferenceScreen>
\ No newline at end of file