diff --git a/playwright/e2e/settings/room-settings/room-security-tab.spec.ts b/playwright/e2e/settings/room-settings/room-security-tab.spec.ts
index 605d38abc2a..69440673264 100644
--- a/playwright/e2e/settings/room-settings/room-security-tab.spec.ts
+++ b/playwright/e2e/settings/room-settings/room-security-tab.spec.ts
@@ -74,9 +74,7 @@ test.describe("Roles & Permissions room settings tab", () => {
 
             await settingsGroupAccess.getByText("Private (invite only)").click();
             // Element should have automatically set the room to "sharing" history visibility
-            await expect(
-                settingsGroupHistory.getByText("Members only (since the point in time of selecting this option)"),
-            ).toBeChecked();
+            await expect(settingsGroupHistory.getByText("Members (full history)")).toBeChecked();
         },
     );
 
diff --git a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png
index 6149e4fe556..d06cf34517f 100644
Binary files a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png and b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-linux.png differ
diff --git a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png
index fb48a558792..216af8f7e1c 100644
Binary files a/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png and b/playwright/snapshots/settings/room-settings/room-security-tab.spec.ts/room-security-settings-world-readable-linux.png differ
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index 5f71ecd81ab..17ea6470feb 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -419,36 +419,60 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         const state = this.props.room.currentState;
         const canChangeHistory = state?.mayClientSendStateEvent(EventType.RoomHistoryVisibility, client);
 
-        const options = [
-            {
-                value: HistoryVisibility.Shared,
-                label: _t("room_settings|security|history_visibility_shared"),
-            },
-            {
+        // Map 'joined' to 'invited' for display purposes
+        const displayHistory = history === HistoryVisibility.Joined ? HistoryVisibility.Invited : history;
+
+        const isPublicRoom = this.props.room.getJoinRule() === JoinRule.Public;
+        const isEncrypted = this.state.encrypted;
+
+        const options: Array<{ value: HistoryVisibility; label: string }> = [];
+
+        // Show "invited" when room's join rule is NOT public OR E2EE is turned on, or if currently selected
+        if (
+            !isPublicRoom ||
+            isEncrypted ||
+            history === HistoryVisibility.Invited ||
+            history === HistoryVisibility.Joined
+        ) {
+            options.push({
                 value: HistoryVisibility.Invited,
                 label: _t("room_settings|security|history_visibility_invited"),
-            },
-            {
-                value: HistoryVisibility.Joined,
-                label: _t("room_settings|security|history_visibility_joined"),
-            },
-        ];
+            });
+        }
 
-        // World readable doesn't make sense for encrypted rooms
-        if (!this.state.encrypted || history === HistoryVisibility.WorldReadable) {
-            options.unshift({
+        // Always show "shared" option
+        options.push({
+            value: HistoryVisibility.Shared,
+            label: _t("room_settings|security|history_visibility_shared"),
+        });
+
+        // Show "world_readable" when (is public AND not encrypted) OR currently selected
+        if ((isPublicRoom && !isEncrypted) || history === HistoryVisibility.WorldReadable) {
+            options.push({
                 value: HistoryVisibility.WorldReadable,
                 label: _t("room_settings|security|history_visibility_world_readable"),
             });
         }
 
-        const description = _t("room_settings|security|history_visibility_warning");
+        const description = (
+            <>
+                {_t(
+                    "room_settings|security|history_visibility_warning",
+                    {},
+                    {
+                        a: (sub) => (
+                            <ExternalLink href="https://element.io/en/help#e2ee-history-sharing">{sub}</ExternalLink>
+                        ),
+                    },
+                )}
+            </>
+        );
 
         return (
             <SettingsFieldset legend={_t("room_settings|security|history_visibility_legend")} description={description}>
                 <StyledRadioGroup
                     name="historyVis"
-                    value={history}
+                    value={displayHistory}
                     onChange={this.onHistoryRadioToggle}
                     disabled={!canChangeHistory}
                     definitions={options}
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 19f2321f14b..980d4d02712 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2414,7 +2414,6 @@
             "error_join_rule_change_unknown": "Neznámá chyba",
             "guest_access_warning": "Lidé s podporovanými klienty se budou moci do místnosti připojit, aniž by měli registrovaný účet.",
             "history_visibility_invited": "Pouze členové (od chvíle jejich pozvání)",
-            "history_visibility_joined": "Pouze členové (od chvíle jejich vstupu)",
             "history_visibility_legend": "Kdo může číst historii?",
             "history_visibility_shared": "Pouze členové (od chvíle vybrání této volby)",
             "history_visibility_warning": "Viditelnost stávající historie se nezmění.",
diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json
index e1f8ea0e3ea..0a90dbc0d1a 100644
--- a/src/i18n/strings/cy.json
+++ b/src/i18n/strings/cy.json
@@ -2387,7 +2387,6 @@
             "error_join_rule_change_unknown": "Methiant anhysbys",
             "guest_access_warning": "Bydd pobl â chleientiaid a gefnogir yn gallu ymuno â'r ystafell heb fod â chyfrif cofrestredig.",
             "history_visibility_invited": "Aelodau yn unig (ers iddynt gael eu gwahodd)",
-            "history_visibility_joined": "Aelodau yn unig (ers iddynt ymuno)",
             "history_visibility_legend": "Pwy all ddarllen hanes?",
             "history_visibility_shared": "Aelodau yn unig (ers yr adeg pan ddewiswyd yr opsiwn hwn)",
             "history_visibility_warning": "Ni fydd gwelededd hanes presennol yn cael ei newid.",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 00bc5734a85..9615dfc7d77 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -2073,7 +2073,6 @@
             "error_join_rule_change_unknown": "Ukendt fejl",
             "guest_access_warning": "Personer med understøttede klienter, vil kunne tilslutte sig rummet uden at have en registreret konto.",
             "history_visibility_invited": "Kun medlemmer (siden de blev inviteret)",
-            "history_visibility_joined": "Kun medlemmer (fra de kom ind)",
             "history_visibility_legend": "Hvem kan læse historikken?",
             "history_visibility_shared": "Kun medlemmer (siden det tidspunkt, hvor denne indstilling blev valgt)",
             "history_visibility_warning": "Synligheden af ​​den eksisterende historik vil ikke blive ændret.",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ecdd47ccace..9aed47566d5 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2405,7 +2405,6 @@
             "error_join_rule_change_unknown": "Unbekannter Fehler",
             "guest_access_warning": "Personen mit unterstützter Anwendung werden diesem Chat ohne registriertes Konto beitreten können.",
             "history_visibility_invited": "Mitglieder (ab Einladung)",
-            "history_visibility_joined": "Mitglieder (ab Betreten)",
             "history_visibility_legend": "Wer kann den bisherigen Verlauf lesen?",
             "history_visibility_shared": "Mitglieder",
             "history_visibility_warning": "Die Sichtbarkeit des existierenden Nachrichtenverlaufs bleibt unverändert.",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 8289ac73476..e07e8f54bf9 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -1854,7 +1854,6 @@
             "error_join_rule_change_unknown": "Άγνωστο σφάλμα",
             "guest_access_warning": "Τα άτομα με υποστηριζόμενες εφαρμογές θα μπορούν να συμμετάσχουν στην αίθουσα χωρίς να έχουν εγγεγραμμένο λογαριασμό.",
             "history_visibility_invited": "Μόνο μέλη (από τη στιγμή που προσκλήθηκαν)",
-            "history_visibility_joined": "Μόνο μέλη (από τη στιγμή που έγιναν μέλη)",
             "history_visibility_legend": "Ποιος μπορεί να διαβάσει το ιστορικό;",
             "history_visibility_shared": "Μόνο μέλη (από τη στιγμή που ορίστηκε αυτή η επιλογή)",
             "history_visibility_warning": "Οι αλλαγές στα άτομα που μπορούν να διαβάσουν το ιστορικό θα ισχύουν μόνο για μελλοντικά μηνύματα σε αυτό το δωμάτιο. Η ορατότητα της υπάρχουσας ιστορίας θα παραμείνει αμετάβλητη.",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d80ea12d035..0df53ee79b2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2429,12 +2429,11 @@
             "error_join_rule_change_title": "Failed to update the join rules",
             "error_join_rule_change_unknown": "Unknown failure",
             "guest_access_warning": "People with supported clients will be able to join the room without having a registered account.",
-            "history_visibility_invited": "Members only (since they were invited)",
-            "history_visibility_joined": "Members only (since they joined)",
+            "history_visibility_invited": "Members since invited",
             "history_visibility_legend": "Who can read history?",
-            "history_visibility_shared": "Members only (since the point in time of selecting this option)",
-            "history_visibility_warning": "The visibility of existing history will not be changed.",
-            "history_visibility_world_readable": "Anyone",
+            "history_visibility_shared": "Members (full history)",
+            "history_visibility_warning": "Changes won't affect past messages, only new ones. <a>Learn more</a>",
+            "history_visibility_world_readable": "Anyone (history is public)\n",
             "join_rule_description": "Decide who can join %(roomName)s.",
             "join_rule_invite": "Private (invite only)",
             "join_rule_invite_description": "Only invited people can join.",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 35564116382..bd4a0298563 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1490,7 +1490,6 @@
             "error_join_rule_change_unknown": "Nekonata malsukceso",
             "guest_access_warning": "Personoj kun subtenataj klientoj povos aliĝi al la ĉambro sen registrita konto.",
             "history_visibility_invited": "Nur ĉambranoj (ekde la invito)",
-            "history_visibility_joined": "Nur ĉambranoj (ekde la aliĝo)",
             "history_visibility_legend": "Kiu povas legi la historion?",
             "history_visibility_shared": "Nur ĉambranoj (ekde ĉi tiu elekto)",
             "history_visibility_warning": "Ŝanĝoj al legebleco de historio nur efektiviĝos por osaj mesaĝoj de ĉi tiu ĉambro. La videbleco de jama historio ne ŝanĝiĝos.",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index c23bc8c5fae..50fd91900dd 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1982,7 +1982,6 @@
             "error_join_rule_change_unknown": "Fallo desconocido",
             "guest_access_warning": "Las personas con una aplicación compatible podrán unirse a la sala sin tener que registrar una cuenta.",
             "history_visibility_invited": "Solo participantes (desde que fueron invitados)",
-            "history_visibility_joined": "Solo participantes (desde que se unieron a la sala)",
             "history_visibility_legend": "¿Quién puede leer el historial?",
             "history_visibility_shared": "Solo participantes (desde el momento en que se selecciona esta opción)",
             "history_visibility_warning": "Los cambios que se hagan sobre quién puede leer el historial se aplicarán solo a nuevos mensajes. La visibilidad del historial actual no cambiará.",
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 54bc4576e43..669c9a694f3 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -579,6 +579,7 @@
         "someone": "Keegi",
         "space": "Tühikuklahv",
         "spaces": "Kogukonnakeskused",
+        "state_encryption_enabled": "Katseline olekusündmuste krüptimine on kasutusel",
         "sticker": "Kleeps",
         "stickerpack": "Kleepsupakk",
         "success": "Õnnestus",
@@ -686,6 +687,8 @@
         "join_rule_restricted_label": "Kõik <SpaceName/> kogukonna liikmed saavad seda jututuba leida ning võivad temaga liituda.",
         "name_validation_required": "Palun sisesta jututoa nimi",
         "room_visibility_label": "Jututoa nähtavus",
+        "state_encrypted_warning": "Sellega võtad kasutusele olekusündmuste krüptimise, mis võimaldab serverist peita metateabe, nagu jututubade nimed ja teemad. See metateave pole nähtav ka jututoaga hiljem liitujatele ning neile, kelle kliendid ei toeta MSC4362 spetsifikatsiooni.",
+        "state_encryption_label": "Krüptitud olekusündmused",
         "title_private_room": "Loo omavaheline jututuba",
         "title_public_room": "Loo avalik jututuba",
         "title_video_room": "Loo uus videotuba",
@@ -1525,6 +1528,8 @@
         "dynamic_room_predecessors": "Jututoa dünaamilised eellased",
         "dynamic_room_predecessors_description": "Võta kasutusele MSC3946 (jututoa ajaloo aeglane laadimine)",
         "element_call_video_rooms": "Element Call videotoad",
+        "encrypted_state_events": "Krüptitud olekusündmused (MSC4362)",
+        "encrypted_state_events_description": "Sellega võtad kasutusele olekusündmuste krüptimise, mis võimaldab serverist peita metateabe, nagu jututubade nimed ja teemad. See metateave pole nähtav ka jututoaga hiljem liitujatele ning neile, kelle kliendid ei toeta MSC4362 spetsifikatsiooni.",
         "exclude_insecure_devices": "Sõnumite saatmisel ja vastuvõtmisel välista ebaturvalised seadmed",
         "exclude_insecure_devices_description": "Kui see režiim on kasutusel, siis krüptitud sõnumeid ei jagata verifitseerimata seadmetega ja verifitseerimata seadmetest saabunud sõnumite puhul näidatakse vaid veateadet. Palun arvesta, et selle töörežiimi puhul sa ilmselt ei saa suhelda kasutajatega, kes pole kõiki oma seadmeid korrektselt verifitseerinud.",
         "experimental_description": "Soovid katsetada? Proovi meie uusimaid arendusmõtteid. Need funktsionaalsused pole üldsegi veel valmis, nad võivad toimida puudulikult, võivad muutuda või sootuks lõpetamata jääda. <a>Lisateavet leiad siit</a>.",
@@ -2424,12 +2429,11 @@
             "error_join_rule_change_title": "Liitumisreeglite uuendamine ei õnnestunud",
             "error_join_rule_change_unknown": "Määratlemata viga",
             "guest_access_warning": "Kõik kes kasutavad sobilikke klientrakendusi, saavad jututoaga liituda ilma kasutajakonto registreerimiseta.",
-            "history_visibility_invited": "Ainult liikmetele (alates nende kutsumise ajast)",
-            "history_visibility_joined": "Ainult liikmetele (alates liitumisest)",
+            "history_visibility_invited": "Liikmetele alates nende kutsumise ajast",
             "history_visibility_legend": "Kes võivad lugeda ajalugu?",
-            "history_visibility_shared": "Ainult liikmetele (alates selle seadistuse kasutuselevõtmisest)",
-            "history_visibility_warning": "Senise ajaloo nähtavus ei muutu.",
-            "history_visibility_world_readable": "Kõik kasutajad",
+            "history_visibility_shared": "Ainult liikmetele (kogu ajalugu)",
+            "history_visibility_warning": "Muudatused ei mõjuta senise ajaloo nähtavust, vaid uute oma. <a>Lisateave</a>",
+            "history_visibility_world_readable": "Kõik kasutajad (ajalugu on avalik)\n",
             "join_rule_description": "Vali, kes saavad liituda %(roomName)s jututoaga.",
             "join_rule_invite": "Privaatne jututuba (eeldab kutset)",
             "join_rule_invite_description": "Liitumine toimub vaid kutse alusel.",
@@ -3558,6 +3562,7 @@
             "enabled_dm": "Sõnumid siin vestluses on läbivalt krüptitud. Klõpsides tunnuspilti saad verifitseerida kasutaja %(displayName)s.",
             "enabled_local": "Sõnumid siin vestluses on läbivalt krüptitud.",
             "parameters_changed": "Mõned krüptimise parameetrid on muutunud.",
+            "state_enabled": "Selle jututoa sõnumid ja olekusündmused on läbivalt krüptitud. Kui uued kasutajad liituvad, siis saad nad verifitseerida tunnuspildile klõpsates.",
             "unsupported": "Selles jututoas kasutatud krüptimine ei ole toetatud."
         },
         "m.room.guest_access": {
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 3738aa3b408..e2f6a4a97fd 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -1343,7 +1343,6 @@
             "enable_encryption_confirm_title": "رمزنگاری را فعال می‌کنید؟",
             "encryption_permanent": "زمانی که رمزنگاری فعال شود، امکان غیرفعال‌کردن آن برای اتاق وجود ندارد.",
             "history_visibility_invited": "فقط اعضاء (از زمانی که دعوت شده‌اند)",
-            "history_visibility_joined": "فقط اعصاء (از زمانی که به اتاق پیوسته‌اند)",
             "history_visibility_legend": "چه افرادی بتوانند تاریخچه اتاق را مشاهده کنند؟",
             "history_visibility_shared": "فقط اعضاء (از زمانی که این تنظیم اعمال می‌شود)",
             "history_visibility_warning": "تغییر تنظیمات اینکه چه کاربرانی سابقه‌ی پیام‌ها را مشاهده کنند، تنها برای پیام‌های آتی اتاق اعمال میشود. پیام‌های قبلی متناسب با تنظیمات گذشته نمایش داده می‌شوند.",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 32f609f6838..58ff612687b 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1999,7 +1999,6 @@
             "error_join_rule_change_unknown": "Tuntematon virhe",
             "guest_access_warning": "Käyttäjät, joilla on tuettu asiakasohjelma, voivat liittyä huoneeseen ilman rekisteröityä käyttäjätiliä.",
             "history_visibility_invited": "Vain jäsenet (kutsumisestaan lähtien)",
-            "history_visibility_joined": "Vain jäsenet (liittymisestään lähtien)",
             "history_visibility_legend": "Ketkä voivat lukea historiaa?",
             "history_visibility_shared": "Vain jäsenet (tämän valinnan tekemisestä lähtien)",
             "history_visibility_warning": "Muutokset historian lukuoikeuksiin pätevät vain tuleviin viesteihin tässä huoneessa. Nykyisen historian näkyvyys ei muutu.",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 159f4f450a6..1e5f0edb94f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -579,6 +579,7 @@
         "someone": "Quelqu’un",
         "space": "Espace",
         "spaces": "Espaces",
+        "state_encryption_enabled": "Chiffrement expérimental de l'état activé",
         "sticker": "Autocollant",
         "stickerpack": "Jeu d’autocollants",
         "success": "Succès",
@@ -686,6 +687,8 @@
         "join_rule_restricted_label": "Tout le monde dans <SpaceName/> pourra trouver et rejoindre ce salon.",
         "name_validation_required": "Veuillez renseigner un nom pour le salon",
         "room_visibility_label": "Visibilité du salon",
+        "state_encrypted_warning": "Active la prise en charge expérimentale du chiffrement des événements d'état, masquant ainsi les métadonnées telles que les noms des salons et les sujets de discussion auprès du serveur. Ces métadonnées seront également masquées pour les personnes rejoignant les salons ultérieurement, ainsi que pour les applications ne prennant pas en charge MSC4362.",
+        "state_encryption_label": "Événements d'état du chiffrement",
         "title_private_room": "Créer un salon privé",
         "title_public_room": "Créer un salon public",
         "title_video_room": "Créer un salon visio",
@@ -846,6 +849,7 @@
         "number_of_users": "Nombre d’utilisateurs",
         "only_joined_members": "Seuls les utilisateurs membres",
         "original_event_source": "Évènement source original",
+        "restore_from_backup": "Restaurer depuis la sauvegarde",
         "room_encrypted": "Le salon est <strong>chiffré ✅</strong>",
         "room_id": "Identifiant du salon : %(roomId)s",
         "room_not_encrypted": "Le salon <strong>n’est pas chiffré 🚨</strong>",
@@ -955,6 +959,7 @@
         "bootstrap_title": "Configuration des clés",
         "confirm_encryption_setup_body": "Cliquez sur le bouton ci-dessous pour confirmer la configuration du chiffrement.",
         "confirm_encryption_setup_title": "Confirmer la configuration du chiffrement",
+        "continue_with_reset": "Continuer avec la réinitialisation",
         "cross_signing_room_normal": "Ce salon est chiffré de bout en bout",
         "cross_signing_room_verified": "Tout le monde dans ce salon est vérifié",
         "cross_signing_room_warning": "Quelqu’un utilise une session inconnue",
@@ -970,6 +975,7 @@
         "event_shield_reason_unverified_identity": "Chiffré par un utilisateur non vérifié.",
         "export_unsupported": "Votre navigateur ne prend pas en charge les extensions cryptographiques nécessaires",
         "forgot_recovery_key": "Clé de récupération oubliée ?",
+        "identity_needs_reset_description": "Vous devez réinitialiser votre identité cryptographique pour garantir l'accès à votre historique de messages.",
         "import_invalid_keyfile": "Fichier de clé %(brand)s non valide",
         "import_invalid_passphrase": "Erreur d’authentification : mot de passe incorrect ?",
         "key_storage_out_of_sync": "Le stockage de vos clés n'est pas synchronisé.",
@@ -1522,6 +1528,8 @@
         "dynamic_room_predecessors": "Prédécesseurs de salon dynamique",
         "dynamic_room_predecessors_description": "Active MSC3946 (pour prendre en charge les archives de salon après création)",
         "element_call_video_rooms": "Salons vidéo Element Call",
+        "encrypted_state_events": "Événements d'état chiffrés (MSC4362)",
+        "encrypted_state_events_description": "Active la prise en charge expérimentale du chiffrement des événements d'état, masquant ainsi les métadonnées telles que les noms des salons et les sujets de discussion auprès du serveur. Ces métadonnées seront également masquées pour les personnes rejoignant les salons ultérieurement, ainsi que pour les applications ne prennant pas en charge MSC4362.",
         "exclude_insecure_devices": "Exclure les appareils non sécurisés lors de l'envoi/de la réception de messages",
         "exclude_insecure_devices_description": "Lorsque ce mode est activé, les messages chiffrés ne seront pas partagés avec des appareils non vérifiés et les messages provenant d'appareils non vérifiés seront affichés comme une erreur. Notez que si vous activez ce mode, il se peut que vous ne puissiez pas communiquer avec les utilisateurs qui n'ont pas vérifié leurs appareils.",
         "experimental_description": "Envie d’expériences ? Essayez nos dernières idées en développement. Ces fonctionnalités ne sont pas terminées ; elles peuvent changer, être instables, ou être complètement abandonnées. <a>En savoir plus</a>.",
@@ -2421,11 +2429,10 @@
             "error_join_rule_change_unknown": "Erreur inconnue",
             "guest_access_warning": "Les personnes utilisant un client pris en charge pourront rejoindre le salon sans compte.",
             "history_visibility_invited": "Seulement les membres (depuis leur invitation)",
-            "history_visibility_joined": "Seulement les membres (depuis leur arrivée)",
             "history_visibility_legend": "Qui peut lire l’historique ?",
-            "history_visibility_shared": "Seulement les membres (depuis la sélection de cette option)",
-            "history_visibility_warning": "La visibilité de l’historique existant ne sera pas modifiée.",
-            "history_visibility_world_readable": "N’importe qui",
+            "history_visibility_shared": "Membres (historique complet)",
+            "history_visibility_warning": "Les changements n'affecteront pas les messages passés, juste les nouveaux. <a>En savoir plus</a>",
+            "history_visibility_world_readable": "Tout le monde (l'historique est public)\n",
             "join_rule_description": "Choisir qui peut rejoindre %(roomName)s.",
             "join_rule_invite": "Privé (sur invitation)",
             "join_rule_invite_description": "Seules les personnes invitées peuvent venir.",
@@ -3554,6 +3561,7 @@
             "enabled_dm": "Les messages ici sont chiffrés de bout en bout. Vérifiez %(displayName)s dans son profil - cliquez sur son image de profil.",
             "enabled_local": "Les messages de cette conversation seront chiffrés de bout en bout.",
             "parameters_changed": "Certains paramètres de chiffrement ont été changés.",
+            "state_enabled": "Les messages et les événements de ce salon sont chiffrés de bout en bout. Lorsque des personnes rejoignent le salon, vous pouvez les vérifier dans leur profil en cliquant sur leur photo de profil.",
             "unsupported": "Le chiffrement utilisé par ce salon n’est pas pris en charge."
         },
         "m.room.guest_access": {
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index ea7522a155e..00d921d0c99 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1731,7 +1731,6 @@
             "error_join_rule_change_unknown": "Fallo descoñecido",
             "guest_access_warning": "As persoas con clientes habilitados poderán unirse a sala sen ter que posuir unha conta rexistrada.",
             "history_visibility_invited": "Só participantes (desde que foron convidadas)",
-            "history_visibility_joined": "Só participantes (desde que se uniron)",
             "history_visibility_legend": "Quen pode ler o histórico?",
             "history_visibility_shared": "Só participantes (desde o momento en que se selecciona esta opción)",
             "history_visibility_warning": "Os cambios sobre quen pode ler o historial só se aplicarán as mensaxes futuras nesta sala. A visibilidade do historial precedente non cambiará.",
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 0b7f1986dee..d0d747d4852 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -1428,7 +1428,6 @@
             "error_join_rule_change_unknown": "כשל לא ידוע",
             "guest_access_warning": "אורחים בעלי תוכנת התחברות מתאימה יוכלו להצטרף לחדר גם אם אין להם חשבון משתמש.",
             "history_visibility_invited": "חברים בלבד (מאז שהוזמנו)",
-            "history_visibility_joined": "חברים בלבד (מאז שהצטרפו)",
             "history_visibility_legend": "למי מותר לקרוא הסטוריה?",
             "history_visibility_shared": "חברים בלבד (מרגע בחירת אפשרות זו)",
             "history_visibility_warning": "שינויים במי שיכול לקרוא היסטוריה יחולו רק על הודעות עתידיות בחדר זה. נראות ההיסטוריה הקיימת לא תשתנה.",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 9c10c95a4e3..70724e24787 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2390,7 +2390,6 @@
             "error_join_rule_change_unknown": "Ismeretlen hiba",
             "guest_access_warning": "A támogatott klienseket használó emberek még regisztrált fiók nélkül is beléphetnek a szobába.",
             "history_visibility_invited": "Csak tagoknak (a meghívásuk idejétől)",
-            "history_visibility_joined": "Csak tagoknak (amióta csatlakoztak)",
             "history_visibility_legend": "Ki olvashatja a régi üzeneteket?",
             "history_visibility_shared": "Csak tagok számára (a beállítás kiválasztásától)",
             "history_visibility_warning": "A régi üzenetek láthatósága nem fog változni.",
diff --git a/src/i18n/strings/hy.json b/src/i18n/strings/hy.json
index 228adbdcf8a..1498b18f170 100644
--- a/src/i18n/strings/hy.json
+++ b/src/i18n/strings/hy.json
@@ -2350,7 +2350,6 @@
             "error_join_rule_change_unknown": "Անհայտ ձախողում",
             "guest_access_warning": "Աջակցվող ծրագրեր ունեցող մարդիկ կկարողանան միանալ սենյակին՝ առանց գրանցված հաշիվ ունենալու:",
             "history_visibility_invited": "Միայն անդամներ (քանի որ նրանք հրավիրված էին)",
-            "history_visibility_joined": "Միայն անդամներ (քանի որ նրանք միացել էին)",
             "history_visibility_legend": "Ո՞վ կարող է կարդալ պատմությունը:",
             "history_visibility_shared": "Միայն անդամներ (այս տարբերակն ընտրելու պահից ի վեր)",
             "history_visibility_warning": "Պատմությունը կարդալու իրավունք ունեցողների փոփոխությունները կկիրառվեն միայն այս սենյակի ապագա հաղորդագրություններին։ Գոյություն ունեցող պատմության տեսանելիությունը չի փոխվի։",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 66ed598c41b..e67e8aba2dc 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -2400,7 +2400,6 @@
             "error_join_rule_change_unknown": "Kesalahan yang tidak diketahui",
             "guest_access_warning": "Orang-orang dengan klien yang didukung akan dapat bergabung ruangan ini tanpa harus memiliki sebuah akun yang terdaftar.",
             "history_visibility_invited": "Anggota saja (sejak mereka diundang)",
-            "history_visibility_joined": "Anggota saja (sejak mereka bergabung)",
             "history_visibility_legend": "Siapa yang dapat membaca riwayat?",
             "history_visibility_shared": "Anggota saja (sejak memilih opsi ini)",
             "history_visibility_warning": "Visibilitas riwayat yang ada tidak akan berubah.",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 0cd458dfc81..73df562e5e8 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -1652,7 +1652,6 @@
             "error_join_rule_change_title": "Mistókst að uppfæra reglur fyrir þátttöku",
             "error_join_rule_change_unknown": "Óþekkt bilun",
             "history_visibility_invited": "Einungis meðlimir (síðan þeim var boðið)",
-            "history_visibility_joined": "Einungis meðlimir (síðan þeir skráðu sig)",
             "history_visibility_legend": "Hver getur lesið ferilskráningu?",
             "history_visibility_shared": "Einungis meðlimir (síðan þessi kostur var valinn)",
             "history_visibility_world_readable": "Hver sem er",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index affa7e56567..6ab57cc4f3a 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2048,7 +2048,6 @@
             "error_join_rule_change_unknown": "Errore sconosciuto",
             "guest_access_warning": "Le persone con client supportati potranno entrare nella stanza senza avere un account registrato.",
             "history_visibility_invited": "Solo i membri (da quando sono stati invitati)",
-            "history_visibility_joined": "Solo i membri (da quando sono entrati)",
             "history_visibility_legend": "Chi può leggere la cronologia?",
             "history_visibility_shared": "Solo i membri (dal momento in cui selezioni questa opzione)",
             "history_visibility_warning": "Le modifiche a chi può leggere la cronologia si applicheranno solo ai messaggi futuri in questa stanza. La visibilità della cronologia esistente rimarrà invariata.",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 0bdb4d18ff9..05d96f4cce2 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1867,7 +1867,6 @@
             "error_join_rule_change_unknown": "不明なエラー",
             "guest_access_warning": "サポートしているクライアントから、登録済のアカウントを使用せずルームに参加できるようになります。",
             "history_visibility_invited": "メンバーのみ（招待を送った時点から）",
-            "history_visibility_joined": "メンバーのみ（参加した時点から）",
             "history_visibility_legend": "履歴の閲覧権限",
             "history_visibility_shared": "メンバーのみ（この設定を選択した時点から）",
             "history_visibility_warning": "履歴の閲覧権限に関する変更は、今後、このルームで表示されるメッセージにのみ適用されます。既存の履歴の見え方には影響しません。",
diff --git a/src/i18n/strings/ka.json b/src/i18n/strings/ka.json
index f7413dc8219..06aa3621ec6 100644
--- a/src/i18n/strings/ka.json
+++ b/src/i18n/strings/ka.json
@@ -1526,7 +1526,6 @@
             "error_join_rule_change_unknown": "უცნობი მარცხი",
             "guest_access_warning": "მხარდაჭერილი კლიენტების მქონე პირები შეძლებენ ოთახში გაწევრიანებას რეგისტრირებული ანგარიშის გარეშე.",
             "history_visibility_invited": "მხოლოდ წევრები (რადგან ისინი მოწვეულნი იყვნენ)",
-            "history_visibility_joined": "მხოლოდ წევრები (მას შემდეგ, რაც ისინი შეუერთდნენ)",
             "history_visibility_legend": "ვის შეუძლია ისტორიის წაკითხვა?",
             "history_visibility_shared": "მხოლოდ წევრები (ამ ვარიანტის არჩევის მომენტიდან)",
             "history_visibility_warning": "ცვლილებები იმაში, ვისაც შეუძლია ისტორიის წაკითხვა, გავრცელდება მხოლოდ ამ ოთახში მომავალ შეტყობინებებზე. არსებული ისტორიის ხილვადობა უცვლელი იქნება.",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 7ff568c5606..1250fcc4fcc 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -2386,7 +2386,6 @@
             "error_join_rule_change_unknown": "알 수 없는 오류",
             "guest_access_warning": "지원되는 클라이언트를 사용하는 사용자는 등록된 계정이 없어도 방에 참여할 수 있습니다.",
             "history_visibility_invited": "구성원만(구성원이 초대받은 시점부터)",
-            "history_visibility_joined": "구성원만(구성원들이 참여한 시점부터)",
             "history_visibility_legend": "누가 기록을 읽을 수 있나요?",
             "history_visibility_shared": "구성원만(이 설정을 선택한 시점부터)",
             "history_visibility_warning": "기존 기록의 공개 설정은 변경되지 않습니다",
diff --git a/src/i18n/strings/lo.json b/src/i18n/strings/lo.json
index 14ed5f7f1fa..ab6a2338e3f 100644
--- a/src/i18n/strings/lo.json
+++ b/src/i18n/strings/lo.json
@@ -1696,7 +1696,6 @@
             "error_join_rule_change_unknown": "ຄວາມລົ້ມເຫຼວທີ່ບໍ່ຮູ້ສາເຫດ",
             "guest_access_warning": "ຄົນທີ່ມີລູກຄ້າສະຫນັບສະຫນູນຈະສາມາດເຂົ້າຮ່ວມຫ້ອງໄດ້ໂດຍບໍ່ຕ້ອງມີບັນຊີລົງທະບຽນ.",
             "history_visibility_invited": "ສະເພາະສະມາຊິກເທົ່ານັ້ນ (ນັບແຕ່ພວກເຂົາຖືກເຊີນ)",
-            "history_visibility_joined": "ສະເພາະສະມາຊິກເທົ່ານັ້ນ (ນັບແຕ່ພວກເຂົາເຂົ້າຮ່ວມ)",
             "history_visibility_legend": "ຜູ້ໃດອ່ານປະຫວັດໄດ້?",
             "history_visibility_shared": "(ນັບແຕ່ຊ່ວງເວລາຂອງການເລືອກນີ້) ສຳລັບສະມາຊິກເທົ່ານັ້ນ",
             "history_visibility_warning": "ການປ່ຽນແປງຜູ້ທີ່ອ່ານປະຫວັດຈະມີຜົນກັບຂໍ້ຄວາມໃນອະນາຄົດທີ່ຢູ່ໃນຫ້ອງນີ້ເທົ່ານັ້ນ.",
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 8f3add6d433..965b9b8ad66 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1276,7 +1276,6 @@
             "error_join_rule_change_unknown": "Nežinomas sutrikimas",
             "guest_access_warning": "Žmonės su palaikomais klientais galės prisijungti prie kambario neturėdami registruotos paskyros.",
             "history_visibility_invited": "Tik nariai (nuo jų pakvietimo)",
-            "history_visibility_joined": "Tik nariai (nuo jų prisijungimo)",
             "history_visibility_legend": "Kas gali skaityti istoriją?",
             "history_visibility_shared": "Tik nariai (nuo šios parinkties pasirinkimo momento)",
             "history_visibility_warning": "Kas gali skaityti istoriją nustatymų pakeitimai bus taikomi tik būsimoms šio kambario žinutėms. Esamos istorijos matomumas nepakis.",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 951a5bae1e0..3d62f08e020 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1981,7 +1981,6 @@
             "error_join_rule_change_unknown": "Nezināma kļūme",
             "guest_access_warning": "Cilvēki ar atbalstītām lietotnēm varēs pievienoties istabai bez reģistrēta konta.",
             "history_visibility_invited": "Tikai dalībnieki (no to uzaicināšanas brīža)",
-            "history_visibility_joined": "Tikai dalībnieki (kopš pievienošanās)",
             "history_visibility_legend": "Kas var lasīt vēsturi?",
             "history_visibility_shared": "Tikai dalībnieki (no šī parametra iestatīšanas brīža)",
             "history_visibility_warning": "Izmaiņas attiecībā uz to, kas var lasīt vēsturi, attieksies tikai uz nākamajiem ziņām šajā istabā. Esošās vēstures redzamība nemainīsies.",
diff --git a/src/i18n/strings/mg_MG.json b/src/i18n/strings/mg_MG.json
index d68e1454d64..d13b12fd87b 100644
--- a/src/i18n/strings/mg_MG.json
+++ b/src/i18n/strings/mg_MG.json
@@ -2032,7 +2032,6 @@
             "error_join_rule_change_unknown": "Tsy fahombiazana tsy fantatra",
             "guest_access_warning": "Ny olona manana mpanjifa tohanana dia afaka miditra ao amin'ny efitrano tsy manana kaonty misoratra anarana.",
             "history_visibility_invited": "Mpikambana ihany (hatramin'ny nanasana azy ireo)",
-            "history_visibility_joined": "Mpikambana ihany (hatramin'ny nidirany)",
             "history_visibility_legend": "Iza no mahay mamaky tantara?",
             "history_visibility_shared": "Mpikambana ihany (hatramin&#39;ny fotoana nifidianana ity safidy ity)",
             "history_visibility_warning": "Ny fanovana aminy olona afaka mamaky tantara dia tsy mihatra afa-tsy amin'ny hafatra ho avy ato amin'ity efitrano ity. Tsy hiova ny fahitana ny tantara efa misy.",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 4a8e4d9aee6..01be03a367d 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -2421,7 +2421,6 @@
             "error_join_rule_change_unknown": "Ukjent feil",
             "guest_access_warning": "Personer med støttede klienter vil kunne bli med i rommet uten å ha en registrert konto.",
             "history_visibility_invited": "Kun medlemmer (f.o.m. da de ble invitert)",
-            "history_visibility_joined": "Kun medlemmer (f.o.m. de ble med)",
             "history_visibility_legend": "Hvem kan lese historikken?",
             "history_visibility_shared": "Kun medlemmer (f.o.m. da denne innstillingen ble valgt)",
             "history_visibility_warning": "Endringer for hvem som kan lese historikken, vil kun bli benyttet for fremtidige meldinger i dette rommet. Synligheten til den eksisterende historikken vil forbli uendret.",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 723b8b3a6dd..3eae7b8d43d 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1744,7 +1744,6 @@
             "error_join_rule_change_unknown": "Onbekende fout",
             "guest_access_warning": "Personen met geschikte apps zullen aan de kamer kunnen deelnemen zonder een account te hebben.",
             "history_visibility_invited": "Alleen deelnemers (vanaf het moment dat ze uitgenodigd zijn)",
-            "history_visibility_joined": "Alleen deelnemers (vanaf het moment dat ze toegetreden zijn)",
             "history_visibility_legend": "Wie kan de geschiedenis lezen?",
             "history_visibility_shared": "Alleen deelnemers (vanaf het moment dat deze optie wordt geselecteerd)",
             "history_visibility_warning": "Wijzigingen aan de leesregels van de geschiedenis gelden alleen voor toekomstige berichten in deze kamer. De zichtbaarheid van de bestaande geschiedenis blijft ongewijzigd.",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 53032886e33..01bcc4310b0 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -2397,7 +2397,6 @@
             "error_join_rule_change_unknown": "Nieznany błąd",
             "guest_access_warning": "Osoby ze wspieranymi klientami będą mogli dołączyć do pokoju bez posiadania konta.",
             "history_visibility_invited": "Tylko członkowie (od kiedy zostali zaproszeni)",
-            "history_visibility_joined": "Tylko członkowie (od kiedy dołączyli)",
             "history_visibility_legend": "Kto może czytać historię?",
             "history_visibility_shared": "Tylko członkowie (od momentu włączenia tej opcji)",
             "history_visibility_warning": "Widoczność istniejącej historii nie ulegnie zmianie.",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 2ed647b43ef..2bb6df9aa03 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -2262,7 +2262,6 @@
             "error_join_rule_change_unknown": "Falha desconhecida",
             "guest_access_warning": "As pessoas com clientes apoiados poderão juntar-se à sala sem terem uma conta registada.",
             "history_visibility_invited": "Apenas membros (desde que tenham sido convidados)",
-            "history_visibility_joined": "Apenas membros (desde que aderiram)",
             "history_visibility_legend": "Quem pode ler o histórico da sala?",
             "history_visibility_shared": "Apenas membros (desde o momento em que seleccionas esta opção)",
             "history_visibility_warning": "As alterações a quem pode ler o histórico só se aplicam a mensagens futuras nesta sala. A visibilidade do histórico existente permanecerá inalterada.",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 9f2e9f5879d..24445733316 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -2407,7 +2407,6 @@
             "error_join_rule_change_unknown": "Falha desconhecida",
             "guest_access_warning": "Pessoas com clientes suportados poderão entrar na sala sem ter uma conta registrada.",
             "history_visibility_invited": "Somente membros (desde que tenham sido convidados)",
-            "history_visibility_joined": "Apenas participantes (desde que entraram na sala)",
             "history_visibility_legend": "Quem pode ler o histórico da sala?",
             "history_visibility_shared": "Apenas participantes (a partir do momento em que esta opção for selecionada)",
             "history_visibility_warning": "A visibilidade do histórico existente não será alterada.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index a4d54eddebf..14fba03896e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -2416,7 +2416,6 @@
             "error_join_rule_change_unknown": "Неизвестная ошибка",
             "guest_access_warning": "Люди с поддерживаемыми клиентами смогут присоединиться к комнате, не имея зарегистрированной учётной записи.",
             "history_visibility_invited": "Только участники (с момента их приглашения)",
-            "history_visibility_joined": "Только участники (с момента их входа)",
             "history_visibility_legend": "Кто может читать историю?",
             "history_visibility_shared": "Только участники (с момента выбора этого параметра)",
             "history_visibility_warning": "Видимость существующей истории сообщений в этой комнате не изменится.",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 64a49eed525..d64fcee0cd5 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -2457,7 +2457,6 @@
             "error_join_rule_change_unknown": "Neznáme zlyhanie",
             "guest_access_warning": "Ľudia s podporovanými klientmi sa budú môcť pripojiť do miestnosti bez toho, aby mali zaregistrovaný účet.",
             "history_visibility_invited": "Len členovia (odkedy boli pozvaní)",
-            "history_visibility_joined": "Len členovia (odkedy vstúpili)",
             "history_visibility_legend": "Kto môže čítať históriu?",
             "history_visibility_shared": "Len členovia (odkedy je aktívna táto voľba)",
             "history_visibility_warning": "Viditeľnosť existujúcej histórie sa nezmení.",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 30200eeae9b..a32b987268c 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1918,7 +1918,6 @@
             "error_join_rule_change_unknown": "Dështim i panjohur",
             "guest_access_warning": "Persona me klientë të mbuluar do të jenë në gjendje të hyjnë te dhoma pa pasur ndonjë llogari të regjistruar.",
             "history_visibility_invited": "Vetëm anëtarë (që kur qenë ftuar)",
-            "history_visibility_joined": "Vetëm anëtarë (që kur janë bërë pjesë)",
             "history_visibility_legend": "Kush mund të lexojë historikun?",
             "history_visibility_shared": "Vetëm anëtarët (që nga çasti i përzgjedhjes së kësaj mundësie)",
             "history_visibility_warning": "Ndryshime se cilët mund të lexojnë historikun do të vlejnë vetëm për mesazhe të ardhshëm në këtë dhomë. Dukshmëria e historikut ekzistues nuk do të ndryshohet.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 31033980330..1772959cf81 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -2348,7 +2348,6 @@
             "error_join_rule_change_unknown": "Okänt fel",
             "guest_access_warning": "Personer med stödda klienter kommer kunna gå med i rummet utan ett registrerat konto.",
             "history_visibility_invited": "Endast medlemmar (från när de blev inbjudna)",
-            "history_visibility_joined": "Endast medlemmar (från när de gick med)",
             "history_visibility_legend": "Vilka kan läsa historik?",
             "history_visibility_shared": "Endast medlemmar (från tidpunkten för när denna inställning valdes)",
             "history_visibility_warning": "Ändringar av vem som kan läsa historiken gäller endast för framtida meddelanden i detta rum. Synligheten för befintlig historik kommer att vara oförändrad.",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index ecd80897a2d..03513f79ff2 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -2238,7 +2238,6 @@
             "error_join_rule_change_unknown": "Bilinmeyen hata",
             "guest_access_warning": "Desteklenen istemciye sahip kişiler, kayıtlı bir hesaba sahip olmadan odaya katılabilecekler.",
             "history_visibility_invited": "Sadece üyeler (davet edildiklerinden beri)",
-            "history_visibility_joined": "Sadece üyeler (katıldıklarından beri)",
             "history_visibility_legend": "Geçmişi kimler okuyabilir ?",
             "history_visibility_shared": "Sadece üyeler ( bu seçeneği seçtiğinizden itibaren)",
             "history_visibility_warning": "Geçmişi kimin okuyabileceğini değiştirmek yalnızca odadaki yeni iletileri etkiler. Var olan geçmiş değişmeden kalacaktır.",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 864d8b89b4d..a2450192c33 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -2425,7 +2425,6 @@
             "error_join_rule_change_unknown": "Невідомий збій",
             "guest_access_warning": "Люди з підтримуваними клієнтами зможуть приєднуватись до кімнати без реєстрації.",
             "history_visibility_invited": "Лише учасники (від часу їхнього запрошення)",
-            "history_visibility_joined": "Лише учасники (від часу приєднання)",
             "history_visibility_legend": "Хто може читати історію?",
             "history_visibility_shared": "Лише учасники (від часу вибору цієї опції)",
             "history_visibility_warning": "Видимість наявної історії не зміниться.",
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index 2fedb71c847..44eea96ae03 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -1857,7 +1857,6 @@
             "error_join_rule_change_unknown": "Thất bại không xác định",
             "guest_access_warning": "Những người có khách hàng được hỗ trợ sẽ có thể tham gia phòng mà không cần đăng ký tài khoản.",
             "history_visibility_invited": "Chỉ dành cho thành viên (từ thời điểm được mời)",
-            "history_visibility_joined": "Chỉ dành cho thành viên (từ thời điểm tham gia)",
             "history_visibility_legend": "Ai có thể đọc lịch sử phòng chat?",
             "history_visibility_shared": "Chỉ dành cho thành viên (từ thời điểm chọn thiết lập này)",
             "history_visibility_warning": "Thay đổi ai có thể đọc lịch sử phòng chat chỉ được áp dụng đối với các tin nhắn từ thời điểm này.",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 489e56ca53c..ce5671de25f 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -1837,7 +1837,6 @@
             "error_join_rule_change_unknown": "未知失败",
             "guest_access_warning": "拥有受支持客户端的人无需注册账户即可加入房间。",
             "history_visibility_invited": "只有成员（从他们被邀请开始）",
-            "history_visibility_joined": "只有成员（从他们加入开始）",
             "history_visibility_legend": "谁可以阅读历史消息？",
             "history_visibility_shared": "仅成员（从选中此选项时开始）",
             "history_visibility_warning": "历史记录阅读权限的更改只会应用到此房间中将来的消息。既有历史记录的可见性将不会更改。",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 5094d81d180..57ffa0e268e 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2009,7 +2009,6 @@
             "error_join_rule_change_unknown": "未知錯誤",
             "guest_access_warning": "有受支援的客戶端的夥伴不需要註冊帳號就可以加入聊天室。",
             "history_visibility_invited": "僅限成員（自他們被邀請開始）",
-            "history_visibility_joined": "僅限成員（自他們加入開始）",
             "history_visibility_legend": "誰可以閱讀紀錄？",
             "history_visibility_shared": "僅限成員（自選取此選項開始）",
             "history_visibility_warning": "對可閱讀訊息紀錄的使用者的變更，僅適用於此聊天室的新訊息。現有訊息的顯示狀態將保持不變。",
diff --git a/test/unit-tests/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
index bf702f81996..d7679c63776 100644
--- a/test/unit-tests/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
@@ -377,6 +377,76 @@ describe("<SecurityRoomSettingsTab />", () => {
             expect(screen.getByDisplayValue(HistoryVisibility.Shared)).toBeChecked();
             expect(logger.error).toHaveBeenCalledWith("oups");
         });
+
+        it("maps 'joined' history visibility to 'invited' for display", () => {
+            const room = new Room(roomId, client, userId);
+            setRoomStateEvents(room, undefined, undefined, HistoryVisibility.Joined);
+
+            getComponent(room);
+
+            // Should display as 'invited' even though underlying value is 'joined'
+            expect(screen.getByDisplayValue(HistoryVisibility.Invited)).toBeChecked();
+            // Should not have a 'joined' option visible
+            expect(screen.queryByDisplayValue(HistoryVisibility.Joined)).not.toBeInTheDocument();
+        });
+
+        it("shows 'invited' option for non-public rooms", () => {
+            const room = new Room(roomId, client, userId);
+            setRoomStateEvents(room, JoinRule.Invite);
+
+            getComponent(room);
+
+            expect(screen.getByDisplayValue(HistoryVisibility.Invited)).toBeInTheDocument();
+        });
+
+        it("shows 'invited' option for encrypted rooms even if public", async () => {
+            const room = new Room(roomId, client, userId);
+            jest.spyOn(client.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(true);
+            setRoomStateEvents(room, JoinRule.Public);
+
+            getComponent(room);
+
+            await waitFor(() => expect(screen.getByDisplayValue(HistoryVisibility.Invited)).toBeInTheDocument());
+        });
+
+        it("does not show 'invited' option for public unencrypted rooms unless selected", async () => {
+            const room = new Room(roomId, client, userId);
+            setRoomStateEvents(room, JoinRule.Public, undefined, HistoryVisibility.Shared);
+
+            getComponent(room);
+
+            await waitFor(() => expect(screen.queryByDisplayValue(HistoryVisibility.Invited)).not.toBeInTheDocument());
+        });
+
+        it("shows 'world_readable' option for public unencrypted rooms", async () => {
+            const room = new Room(roomId, client, userId);
+            setRoomStateEvents(room, JoinRule.Public);
+
+            getComponent(room);
+
+            await waitFor(() => expect(screen.getByDisplayValue(HistoryVisibility.WorldReadable)).toBeInTheDocument());
+        });
+
+        it("does not show 'world_readable' option for private encrypted rooms unless selected", async () => {
+            const room = new Room(roomId, client, userId);
+            jest.spyOn(client.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(true);
+            setRoomStateEvents(room, JoinRule.Invite);
+
+            getComponent(room);
+
+            await waitFor(() =>
+                expect(screen.queryByDisplayValue(HistoryVisibility.WorldReadable)).not.toBeInTheDocument(),
+            );
+        });
+
+        it("always shows 'shared' option", () => {
+            const room = new Room(roomId, client, userId);
+            setRoomStateEvents(room);
+
+            getComponent(room);
+
+            expect(screen.getByDisplayValue(HistoryVisibility.Shared)).toBeInTheDocument();
+        });
     });
 
     describe("encryption", () => {
diff --git a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
index 920ef3c0bf6..2ad77d58c09 100644
--- a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
@@ -15,7 +15,32 @@ exports[`<SecurityRoomSettingsTab /> history visibility uses shared as default h
     <div
       class="mx_SettingsSubsection_text"
     >
-      The visibility of existing history will not be changed.
+      <span>
+        Changes won't affect past messages, only new ones. 
+        <a
+          class="mx_ExternalLink"
+          href="https://element.io/en/help#e2ee-history-sharing"
+          rel="noreferrer noopener"
+          target="_blank"
+        >
+          Learn more
+          <svg
+            class="mx_ExternalLink_icon"
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"
+            />
+            <path
+              d="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L17.586 5H15a1 1 0 1 1 0-2"
+            />
+          </svg>
+        </a>
+      </span>
     </div>
   </div>
   <div
@@ -25,10 +50,10 @@ exports[`<SecurityRoomSettingsTab /> history visibility uses shared as default h
       class="mx_StyledRadioButton mx_StyledRadioButton_enabled"
     >
       <input
-        id="historyVis-world_readable"
+        id="historyVis-invited"
         name="historyVis"
         type="radio"
-        value="world_readable"
+        value="invited"
       />
       <div>
         <div />
@@ -36,7 +61,7 @@ exports[`<SecurityRoomSettingsTab /> history visibility uses shared as default h
       <div
         class="mx_StyledRadioButton_content"
       >
-        Anyone
+        Members since invited
       </div>
       <div
         class="mx_StyledRadioButton_spacer"
@@ -58,49 +83,7 @@ exports[`<SecurityRoomSettingsTab /> history visibility uses shared as default h
       <div
         class="mx_StyledRadioButton_content"
       >
-        Members only (since the point in time of selecting this option)
-      </div>
-      <div
-        class="mx_StyledRadioButton_spacer"
-      />
-    </label>
-    <label
-      class="mx_StyledRadioButton mx_StyledRadioButton_enabled"
-    >
-      <input
-        id="historyVis-invited"
-        name="historyVis"
-        type="radio"
-        value="invited"
-      />
-      <div>
-        <div />
-      </div>
-      <div
-        class="mx_StyledRadioButton_content"
-      >
-        Members only (since they were invited)
-      </div>
-      <div
-        class="mx_StyledRadioButton_spacer"
-      />
-    </label>
-    <label
-      class="mx_StyledRadioButton mx_StyledRadioButton_enabled"
-    >
-      <input
-        id="historyVis-joined"
-        name="historyVis"
-        type="radio"
-        value="joined"
-      />
-      <div>
-        <div />
-      </div>
-      <div
-        class="mx_StyledRadioButton_content"
-      >
-        Members only (since they joined)
+        Members (full history)
       </div>
       <div
         class="mx_StyledRadioButton_spacer"