diff --git a/CHANGELOG-upstream.md b/CHANGELOG-upstream.md
index 7f1533a06..b740e8c36 100644
--- a/CHANGELOG-upstream.md
+++ b/CHANGELOG-upstream.md
@@ -1,6 +1,7 @@
 # Delta Chat Android Changelog
 
-## Unreleased
+## v2.50.0
+2026-05
 
 * Better incoming call system integration
 * Calls are not experimental anymore and don't need to be manually enabled
@@ -19,13 +20,24 @@
 * Allow to open links in messages via actions in TalkBack menu
 * Allow to open map if user clicks "Location streaming enabled" system message
 * Allow to disable incoming calls notifications
+* Add an option to process unencrypted messages; by default, only encrypted messages can be sent or received
 * Fix: do not accidentally set draft in chats that don't allow sending messages
 * Fix swipe navigation between tabs in RTL languages
-* Remove legacy option
+* Remove "Move to DeltaChat folder", in case you are using the option, a device message shows how to proceed
+* Remove "Only fetch from DeltaChat folder" option, the functionality is preserved for existing profiles
+* Remove "Delete Messages from Server" option, this is now up to the server:
+  Chatmail handles that automatically, classic email servers used as relay often have lots of storage or options themselves
+* Remove "Show Email" options, all messages are shown by default, shared usage of email account is not supported
+* Allow otherwise invalid TLS connections if the key is unchanged
+* Adapt quota warning to automatic cleanup.
 * Don't show non-delivery-notfications in broadcast channels
-* Resend the last 10 messages to new broadcast member
-* Enable PQC (Post-Quantum Cryptography) decrypting support for incoming messages
+* Resend the last 10 messages to new broadcast channel member
+* Enable PQC (Post-Quantum Cryptography) support. We do not generate PQC keys yet, this step is needed for forward compatibility
+* Improve avatar quality
 * Fix: avoid invalid empty "~" notifications when some peer is streaming location
+* Fix: Improve detection of stickers
+* Fix text direction issues for RTL languages in "Show full message" view
+* Fix: Reconnect when removing a relay
 * Update to core 2.50.0
 
 ## v2.49.0
diff --git a/build.gradle b/build.gradle
index dbd437a81..bbe183663 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,8 +34,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 30000742
-        versionName "2.49.0"
+        versionCode 30000743
+        versionName "2.50.0"
 
         applicationId "chat.delta.lite"
         multiDexEnabled true
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
index 6228adfcb..18ca30b64 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -23,7 +23,6 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -61,7 +60,6 @@ public class ConversationListFragment extends BaseConversationListFragment
   private RecyclerView list;
   private View emptyState;
   private TextView emptySearch;
-  private final String queryFilter = "";
   private boolean archive;
   private Timer reloadTimer;
   private boolean chatlistJustLoaded;
@@ -285,22 +283,17 @@ public class ConversationListFragment extends BaseConversationListFragment
       Log.w(TAG, "Ignoring call to loadChatlist()");
       return;
     }
-    DcChatlist chatlist =
-        DcHelper.getContext(context)
-            .getChatlist(listflags, queryFilter.isEmpty() ? null : queryFilter, 0);
+    long startMs = System.currentTimeMillis();
+    DcChatlist chatlist = DcHelper.getContext(context).getChatlist(listflags, null, 0);
+    Log.i(TAG, "⏰ getChatlist(): " + (System.currentTimeMillis() - startMs) + "ms");
 
     Util.runOnMain(
         () -> {
-          if (chatlist.getCnt() <= 0 && TextUtils.isEmpty(queryFilter)) {
+          if (chatlist.getCnt() <= 0) {
             list.setVisibility(View.INVISIBLE);
             emptyState.setVisibility(View.VISIBLE);
             emptySearch.setVisibility(View.INVISIBLE);
             fab.startPulse(3 * 1000);
-          } else if (chatlist.getCnt() <= 0 && !TextUtils.isEmpty(queryFilter)) {
-            list.setVisibility(View.INVISIBLE);
-            emptyState.setVisibility(View.GONE);
-            emptySearch.setVisibility(View.VISIBLE);
-            emptySearch.setText(getString(R.string.search_no_result_for_x, queryFilter));
           } else {
             list.setVisibility(View.VISIBLE);
             emptyState.setVisibility(View.GONE);
diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
index a35650af5..b15cbdccf 100644
--- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
+++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
@@ -55,6 +55,7 @@ public class DcHelper {
   public static final String CONFIG_PRIVATE_TAG = "private_tag";
   public static final String CONFIG_STATS_SENDING = "stats_sending";
   public static final String CONFIG_STATS_ID = "stats_id";
+  public static final String CONFIG_FORCE_ENCRYPTION = "force_encryption";
 
   public static DcContext getContext(@NonNull Context context) {
     return ApplicationContext.getInstance(context).getDcContext();
diff --git a/src/main/java/org/thoughtcrime/securesms/relay/EditRelayActivity.java b/src/main/java/org/thoughtcrime/securesms/relay/EditRelayActivity.java
index 6a9c09d39..6d4e7dff2 100644
--- a/src/main/java/org/thoughtcrime/securesms/relay/EditRelayActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/relay/EditRelayActivity.java
@@ -23,6 +23,7 @@ import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.SwitchCompat;
 import androidx.constraintlayout.widget.Group;
 import chat.delta.rpc.Rpc;
 import chat.delta.rpc.RpcException;
@@ -75,6 +76,7 @@ public class EditRelayActivity extends BaseActionBarActivity
   Spinner imapSecurity;
   Spinner smtpSecurity;
   Spinner certCheck;
+  private SwitchCompat enforceE2eeSwitch;
 
   Rpc rpc;
   int accId;
@@ -110,6 +112,7 @@ public class EditRelayActivity extends BaseActionBarActivity
     imapSecurity = findViewById(R.id.imap_security);
     smtpSecurity = findViewById(R.id.smtp_security);
     certCheck = findViewById(R.id.cert_check);
+    enforceE2eeSwitch = findViewById(R.id.enforce_e2ee_switch);
 
     String addr = getIntent().getStringExtra(EXTRA_ADDR);
     EnteredLoginParam config = null;
@@ -173,6 +176,10 @@ public class EditRelayActivity extends BaseActionBarActivity
     boolean expandAdvanced = false;
     int intVal;
 
+    intVal = getContext(this).getConfigInt(DcHelper.CONFIG_FORCE_ENCRYPTION);
+    enforceE2eeSwitch.setChecked(intVal == 1);
+    expandAdvanced = expandAdvanced || intVal == 0;
+
     if (config != null) { // configured
       emailInput.setText(config.addr);
       if (!TextUtils.isEmpty(config.addr)) {
@@ -500,9 +507,12 @@ public class EditRelayActivity extends BaseActionBarActivity
     param.smtpPassword = getParam(R.id.smtp_password_text, false);
     param.certificateChecks = certificateChecksFromInt(certCheck.getSelectedItemPosition());
 
+    final String forceEncryption = enforceE2eeSwitch.isChecked() ? "1" : "0";
+
     new Thread(
             () -> {
               try {
+                rpc.setConfig(accId, DcHelper.CONFIG_FORCE_ENCRYPTION, forceEncryption);
                 rpc.addOrUpdateTransport(accId, param);
                 DcHelper.getEventCenter(this).endCaptureNextError();
                 progressDialog.dismiss();
diff --git a/src/main/res/layout/activity_edittransport.xml b/src/main/res/layout/activity_edittransport.xml
index 72d8ea39a..f36687791 100644
--- a/src/main/res/layout/activity_edittransport.xml
+++ b/src/main/res/layout/activity_edittransport.xml
@@ -129,7 +129,7 @@
                 android:visibility="gone"
                 tools:visibility="visible"
                 app:constraint_referenced_ids="inbox, imap_login, imap_server, imap_port, imap_security_label, imap_security, outbox_view_spacer_top,
-            outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, cert_check_label, cert_check, view_log_button" />
+            outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, cert_check_label, cert_check, view_log_button, enforce_e2ee_switch" />
 
             <ImageView
                 android:id="@+id/advanced_icon"
@@ -362,6 +362,17 @@
                 app:layout_constraintStart_toStartOf="@id/guideline_root_start"
                 app:layout_constraintTop_toBottomOf="@id/cert_check_label" />
 
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/enforce_e2ee_switch"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:text="@string/enforce_e2ee"
+                app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
+                app:layout_constraintStart_toStartOf="@id/guideline_root_start"
+                app:layout_constraintTop_toBottomOf="@id/cert_check" />
+
             <TextView
                 android:id="@+id/view_log_button"
                 android:layout_width="0dp"
@@ -375,7 +386,7 @@
                 android:paddingBottom="32dp"
                 app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
                 app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-                app:layout_constraintTop_toBottomOf="@id/cert_check" />
+                app:layout_constraintTop_toBottomOf="@id/enforce_e2ee_switch" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 7c0fe6983..032e7d6fb 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -461,6 +461,7 @@
     <string name="connectivity_connected">Свързани сте</string>
     <string name="sending">Изпращане…</string>
     <string name="last_msg_sent_successfully">Последното съобщение беше изпратено успешно.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Не се поддържа от Вашия доставчик.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Съобщения</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index eea5ede31..76fbc3d81 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -607,6 +607,7 @@
     <string name="connectivity_connected">Connectat</string>
     <string name="sending">Enviant...</string>
     <string name="last_msg_sent_successfully">Últim missatge enviat bé.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">No suportat pel vostre proveïdor.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Missatges</string>
@@ -643,7 +644,6 @@
     <string name="welcome_chat_over_email">Xat segur i descentralitzat</string>
     <string name="scan_invitation_code">Escaneja el Codi d\'Invitació</string>
     <string name="login_title">Identifiqueu-vos</string>
-    <string name="login_advanced_hint">Aquest inici de sessió és per a usuaris avançats:\n\n• No feu servir una adreça que utilitzeu a una altra app.\n\n• Les adreces de correu tradicional admeten xats sense xifrar d\'extrem a extrem, indicades amb una icona de correu.</string>
     <string name="login_inbox">Safata d\'entrada</string>
     <string name="login_imap_login">Nom d\'identificació IMAP</string>
     <string name="login_imap_server">Servidor IMAP</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 1456f109d..25288544c 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -615,6 +615,7 @@
     <string name="connectivity_connected">Připojeno</string>
     <string name="sending">Odesílání...</string>
     <string name="last_msg_sent_successfully">Poslední zpráva úspěšně odeslána.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Nepodporováno vaším poskytovatelem.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Zprávy</string>
@@ -651,7 +652,6 @@
     <string name="welcome_chat_over_email">Zabezpečený decentralizovaný chat</string>
     <string name="scan_invitation_code">Naskenovat kód pozvánky</string>
     <string name="login_title">Přihlaš se</string>
-    <string name="login_advanced_hint">Toto přihlášení je určeno pro pokročilé uživatele: \n\n Nepoužívejte adresu, kterou používáte v jiné aplikaci. \n\n- Klasický e-mailový server umožňuje chatování bez koncového šifrování označeného ikonou pošty.</string>
     <string name="login_inbox">Příchozí</string>
     <string name="login_imap_login">IMAP uživatelské jméno</string>
     <string name="login_imap_server">IMAP server</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 1928ee863..f994640f3 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -438,6 +438,7 @@
     <string name="call_answered_elsewhere">Anruf auf einem anderen Gerät beantwortet</string>
     <string name="call_requires_camera_permission">Kamerazugriff für Videoanrufe erforderlich</string>
     <string name="call_requires_mic_permission">Mikrofonzugriff für Anrufe erforderlich</string>
+    <string name="call_requires_connection">Anruf kann nicht gestartet werden. Stelle sicher, dass dein Gerät mit dem Internet verbunden ist, und versuche es erneut.</string>
     <!-- Used e.g. in a notifications to describe an ongoing call. "Call" is a noun here, in the meaning of "This is the call with ..." where the placeholder is replaced by the name of the contact. -->
     <string name="call_with">Anruf mit %1$s</string>
     <!-- Use e.g. in a notifications during ringing. Placeholder is relaced by the name of the contact being called. -->
@@ -635,6 +636,7 @@
     <string name="connectivity_connected">Verbunden</string>
     <string name="sending">Sende…</string>
     <string name="last_msg_sent_successfully">Letzte Nachricht erfolgreich versandt.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Nicht unterstützt von deinem Anbieter.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Nachrichten</string>
@@ -671,7 +673,7 @@
     <string name="welcome_chat_over_email">Sicherer dezentraler Chat</string>
     <string name="scan_invitation_code">Einladungscode scannen</string>
     <string name="login_title">Login</string>
-    <string name="login_advanced_hint">Für fortgeschrittene Benutzer:\n\n• Verwende keine Adresse, die du bereits in einer anderen App nutzt.\n\n• Klassische E-Mail-Server ermöglichen Chats ohne Ende-zu-Ende-Verschlüsselung, gekennzeichnet durch ein E-Mail-Symbol.</string>
+    <string name="login_advanced_hint">Für fortgeschrittene Benutzer:\n\nVerwende keine Adresse, die du bereits in einer anderen App nutzt.</string>
     <string name="login_inbox">Posteingang</string>
     <string name="login_imap_login">IMAP-Anmeldename</string>
     <string name="login_imap_server">IMAP-Server</string>
@@ -706,6 +708,7 @@
     <string name="used_for_sending">Zum Senden verwendet</string>
     <string name="hide_from_contacts">Vor Kontakten verstecken</string>
     <string name="hidden_from_contacts">Vor Kontakten versteckt</string>
+    <string name="enforce_e2ee">Verschlüsselung für alle Relays erzwingen</string>
     <!-- Hint for the list of relays -->
     <string name="transport_list_hint">Nachrichten werden auf allen Relays empfangen.\n\n⚠️ Wenn Sie hier Änderungen vornehmen, stellen Sie sicher, dass auf allen Ihren Geräten mindestens Version 2.47.0 installiert ist. Andernfalls könnten auf älteren Versionen Nachrichten verloren gehen.</string>
     <!-- shown if a QR code was scanned that can be used as a relay -->
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 76e341a37..b0eca6c74 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -401,6 +401,7 @@
     <string name="connectivity_connected">Συνδεδεμένο</string>
     <string name="sending">Στέλνεται…</string>
     <string name="last_msg_sent_successfully">Το τελευταίο μήνυμα στάλθηκε με επιτυχία.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Δεν υποστηρίζεται από τον πάροχο σας.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Μηνύματα</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index e406e5e3a..2f02add06 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -218,6 +218,8 @@
     <string name="capture">Capturar</string>
     <!-- Switch eg. from front to back camera -->
     <string name="switch_camera">Alternar cámara</string>
+    <!-- Toggle camera on/off eg. during an video call -->
+    <string name="toggle_camera">Alternar cámara</string>
     <string name="toggle_fullscreen">Alternar modo pantalla completa</string>
     <string name="location">Ubicación</string>
     <string name="locations">Ubicaciones</string>
@@ -421,6 +423,8 @@
     <string name="answer_call">Contestar</string>
     <!-- the action "to decline" a call, not: "the decline" -->
     <string name="end_call">Rechazar</string>
+    <!-- the action to end a call -->
+    <string name="end_call2">Finalizar llamada</string>
     <!-- Used in call bubbles, summaries, notifications -->
     <string name="audio_call">Llamada</string>
     <!-- Used in call bubbles, summaries, notifications -->
@@ -444,7 +448,9 @@
     <string name="missed_call">Llamada perdida</string>
     <string name="already_in_call">Ya estás en una llamada</string>
     <string name="call_answered_elsewhere">Llamada contestada en otro dispositivo</string>
+    <string name="call_requires_camera_permission">Se requiere permiso de cámara para las videollamadas</string>
     <string name="call_requires_mic_permission">Se requiere permiso de micrófono para las llamadas</string>
+    <string name="call_requires_connection">No se puede iniciar la llamada. Asegúrese de que su dispositivo tenga conexión a Internet e inténtelo de nuevo.</string>
     <!-- Used e.g. in a notifications to describe an ongoing call. "Call" is a noun here, in the meaning of "This is the call with ..." where the placeholder is replaced by the name of the contact. -->
     <string name="call_with">Llamada con %1$s</string>
     <!-- Use e.g. in a notifications during ringing. Placeholder is relaced by the name of the contact being called. -->
@@ -465,6 +471,12 @@
         <item quantity="many">¿Eliminar %d mensajes de todos tus dispositivos?</item>
         <item quantity="other">¿Eliminar %d mensajes de todos tus dispositivos?</item>
     </plurals>
+    <!-- First placeholder gets replaced by the number of messages to forward. Second placeholder gets replaced by the name of the destination chat -->
+    <plurals name="ask_forward_messages">
+        <item quantity="one">¿Reenviar mensaje a %2$s?</item>
+        <item quantity="many">¿Reenviar %1$d mensajes a %2$s?</item>
+        <item quantity="other">¿Reenviar %1$d mensajes a %2$s?</item>
+    </plurals>
     <!-- deprecated, use ask_forward_messages -->
     <string name="ask_forward">¿Reenviar mensajes a %1$s?</string>
     <string name="ask_forward_multiple">¿Reenviar mensajes a %1$d chats?</string>
@@ -642,6 +654,7 @@
     <string name="connectivity_connected">Conectado</string>
     <string name="sending">Enviando…</string>
     <string name="last_msg_sent_successfully">El último mensaje fue enviado satisfactoriamente.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">No soportado por tu proveedor.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Mensajes</string>
@@ -678,7 +691,7 @@
     <string name="welcome_chat_over_email">Chat seguro y descentralizado</string>
     <string name="scan_invitation_code">Escanear código de invitación</string>
     <string name="login_title">Iniciar sesión</string>
-    <string name="login_advanced_hint">Este inicio de sesión es para usuarios avanzados:\n\n• No utilice una cuenta que esté usando en otra app.\n\n• El servidor de correo electrónico clásico permite chats sin cifrado de extremo a extremo, los cuales están marcados por un icono de correo.</string>
+    <string name="login_advanced_hint">Este inicio de sesión es para usuarios avanzados.\n\nNo utilice una dirección de correo que esté utilizando en otra aplicación.</string>
     <string name="login_inbox">Bandeja de entrada</string>
     <string name="login_imap_login">Nombre de usuario IMAP</string>
     <string name="login_imap_server">Servidor IMAP</string>
@@ -713,6 +726,7 @@
     <string name="used_for_sending">Usado para enviar</string>
     <string name="hide_from_contacts">Ocultar de los contactos</string>
     <string name="hidden_from_contacts">Ocultado de los contactos</string>
+    <string name="enforce_e2ee">Exigir el cifrado para todos los retransmisores</string>
     <!-- Hint for the list of relays -->
     <string name="transport_list_hint">Los mensajes se reciben en todos los retransmisores.\n\n⚠️ Si cambias algo aquí, asegúrese de que todos sus dispositivos ejecutan al menos la versión 2.47.0. De lo contrario, los dispositivos más antiguos pueden perder algunos mensajes.</string>
     <!-- shown if a QR code was scanned that can be used as a relay -->
@@ -1008,7 +1022,7 @@
     <string name="chat_unencrypted_explanation">Los mensajes en este chat usan el correo electrónico clásico y no están cifrados de extremo a extremo.</string>
     <string name="messages_are_e2ee">Los mensajes están cifrados de extremo a extremo.</string>
     <string name="chat_protection_enabled_tap_to_learn_more">A partir de ahora se garantiza que los mensajes están cifrados de extremo a extremo . Toca para obtener más información.</string>
-    <string name="chat_protection_enabled_explanation">Ahora se garantiza que todos los mensajes en este chat están cifrados de extremo a extremo.\n\nEl cifrado de extremo a extremo mantiene los mensajes privados entre tú y tus compañeros de chat. Ni siquiera tu proveedor de correo electrónico puede leerlos.</string>
+    <string name="chat_protection_enabled_explanation">Todos los mensajes de este chat están cifrados de extremo a extremo.\n\nEl cifrado de extremo a extremo mantiene los mensajes privados entre tú y tus interlocutores. Ni siquiera los servidores, proveedores o retransmisores pueden leerlos.</string>
     <string name="invalid_unencrypted_tap_to_learn_more">⚠️ %1$s requiere cifrado de extremo a extremo que aún no está configurado para este chat. Toca para obtener más información.</string>
     <string name="invalid_unencrypted_explanation">Para establecer un cifrado de extremo a extremo, puede reunirse con los contactos en persona y escanear su código QR.</string>
     <string name="learn_more">Aprender más</string>
diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index c9741b5b4..23fe72896 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -438,6 +438,7 @@
     <string name="call_answered_elsewhere">Kõne on vastatud muus seadmes</string>
     <string name="call_requires_camera_permission">Videokõnede tegemiseks peab rakendusel olema õigus kasutada kaamerat</string>
     <string name="call_requires_mic_permission">Helistamiseks peab rakendusel olema õigus kasutada mikrofoni</string>
+    <string name="call_requires_connection">Helistamine (kõne algatamine) ei õnnestu. Palun kontrolli, et sinu nutiseadme internetiühendus toimib ja proovi uuesti.</string>
     <!-- Used e.g. in a notifications to describe an ongoing call. "Call" is a noun here, in the meaning of "This is the call with ..." where the placeholder is replaced by the name of the contact. -->
     <string name="call_with">Kõne kasutajaga %1$s</string>
     <!-- Use e.g. in a notifications during ringing. Placeholder is relaced by the name of the contact being called. -->
@@ -635,6 +636,7 @@
     <string name="connectivity_connected">Ühendatud</string>
     <string name="sending">Saadan…</string>
     <string name="last_msg_sent_successfully">Viimase sõnumi saatmine õnnestus.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Sinu teenusepakkuja ei toeta seda võimalust.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Sõnumid</string>
@@ -671,7 +673,7 @@
     <string name="welcome_chat_over_email">Turvaline hajutatud vestluslahendus</string>
     <string name="scan_invitation_code">Skaneeri kutsekoodi</string>
     <string name="login_title">Logi sisse</string>
-    <string name="login_advanced_hint">See sisselogimine sobib oskuskasutajatele:\n\n• Ära kasuta kontot, mis juba on kasutusel mõnes muus rakenduses.\n\n• Klassikaline e-posti server võimaldab vestlemist vaid ilma läbiva krüptimiseta ja seda märgistab kirja ikoon.</string>
+    <string name="login_advanced_hint">See sisselogimise viis on mõeldud oskuskasutajatele.\n\nPalun ära kasuta aadressi, mida kasutad juba teises rakenduses.</string>
     <string name="login_inbox">Saabuvad kirjad</string>
     <string name="login_imap_login">IMAP-i kasutajanimi</string>
     <string name="login_imap_server">IMAP-i server</string>
@@ -706,6 +708,7 @@
     <string name="used_for_sending">Kasutatud saatmiseks</string>
     <string name="hide_from_contacts">Peida kontaktidest</string>
     <string name="hidden_from_contacts">Peidetud kontaktidest</string>
+    <string name="enforce_e2ee">Kasuta kõikide alusühenduste (edastusserverite) puhul krüptimist</string>
     <!-- Hint for the list of relays -->
     <string name="transport_list_hint">Sõnumid saavad kõik alusühendused (edastusserverid).\n\n⚠️ Kui muudad siin midagi, siis palun kontrolli, et kõikides sinu seadmetes on kasutusel vähemalt versioon 2.47.0. Vastasel juhul võivad vanema tarkvaraga seadmetes jääda sõnumid saabumata.</string>
     <!-- shown if a QR code was scanned that can be used as a relay -->
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 849d8b90d..66204b1cf 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -607,6 +607,7 @@
     <string name="connectivity_connected">Konektatuta</string>
     <string name="sending">Bidaltzen...</string>
     <string name="last_msg_sent_successfully">Azken mezua ondo bidali da.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Zure hornitzaileak ez du onartzen.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Mezuak</string>
@@ -643,7 +644,6 @@
     <string name="welcome_chat_over_email">Txat deszentralizatu segurua</string>
     <string name="scan_invitation_code">Eskaneatu gonbidapen kodea</string>
     <string name="login_title">Hasi saioa</string>
-    <string name="login_advanced_hint">Saio-hasiera hau erabiltzaile aurreratuentzat da:\n\n• Ez erabili beste aplikazio batean erabiltzen ari zaren helbiderik.\n\n• Posta elektronikoko zerbitzari klasikoak txatak baimentzen ditu, muturretik muturrera zifratu gabe, posta-ikono batek markatuta.</string>
     <string name="login_inbox">Sarrera ontzia</string>
     <string name="login_imap_login">IMAP erabiltzaile-izena</string>
     <string name="login_imap_server">IMAP zerbitzaria</string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index cf823f4f9..09bb842d5 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -577,6 +577,7 @@
     <string name="connectivity_connected">متصل شد</string>
     <string name="sending">در حال ارسال...</string>
     <string name="last_msg_sent_successfully">آخرین پیام با موفقیت ارسال شد.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">ارائه دهنده شما از این پشتیبانی نمی‌کند</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">پیام‌ها</string>
@@ -613,7 +614,6 @@
     <string name="welcome_chat_over_email">گفتگو غیرمتمرکز و ایمن</string>
     <string name="scan_invitation_code">اسکن کردن کد دعوت</string>
     <string name="login_title">ورود</string>
-    <string name="login_advanced_hint">این برای کاربر‌های حرفه‌ای است:\n\n • از یک آدرس که در برنامه‌ای دیگر استفاده می‌کنید استفاده نکنید.\n\n • ارائه‌دهندهٔ رایانامه کلاسیک اجازه خواهد داد که گپ‌ها بدون رمزنگاری سراسری باشند. این گپ‌ها به وسیلهٔ یک نماد نامه نشانه‌گذاری می‌شوند.</string>
     <string name="login_inbox">ورودی</string>
     <string name="login_imap_login">IMAP Login Name</string>
     <string name="login_imap_server">IMAP Server</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 231947280..945f6597b 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -465,6 +465,7 @@
     <string name="connectivity_connected">Yhdistetty</string>
     <string name="sending">Lähetetään</string>
     <string name="last_msg_sent_successfully">Viimeinen viesti lähetetty onnistuneesti.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Ei tuettu palveluntarjoajallasi.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Viestit</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index f3237a37e..f99db09bb 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -624,6 +624,7 @@
     <string name="connectivity_connected">Connecté</string>
     <string name="sending">Envoi...</string>
     <string name="last_msg_sent_successfully">Dernier message envoyé avec succès.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Non pris en charge par votre fournisseur de mail.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Messages</string>
@@ -660,7 +661,6 @@
     <string name="welcome_chat_over_email">Messagerie décentralisée sécurisée</string>
     <string name="scan_invitation_code">Scanner le code d\'invitation</string>
     <string name="login_title">Connexion</string>
-    <string name="login_advanced_hint">Ce type de connexion est réservé aux utilisateurs avancés.\n\n• N\'utilisez pas une adresse déjà employée dans une autre appli.\n\n• Les serveurs de courriel classiques autorisent les discussions non chiffrées de bout en bout, lesquelles sont représentées par une icône enveloppe.</string>
     <string name="login_inbox">Boîte de réception</string>
     <string name="login_imap_login">Utilisateur IMAP</string>
     <string name="login_imap_server">Serveur IMAP</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 3385387cb..968eacc00 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -546,6 +546,7 @@
     <string name="connectivity_connected">Conectado</string>
     <string name="sending">Enviando...</string>
     <string name="last_msg_sent_successfully">Enviouse correctamente a última mensaxe.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">O teu provedor non ten soporte</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Mensaxes</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 673baf3f9..5c7d6411e 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -565,6 +565,7 @@
     <string name="connectivity_connected">Kapcsolódott</string>
     <string name="sending">Küldés…</string>
     <string name="last_msg_sent_successfully">Utolsó üzenet sikeresen elküldve.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Az Ön szolgáltatója nem támogatja.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Üzenetek</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 6f6e81a43..989eab042 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -218,6 +218,8 @@
     <string name="capture">Cattura</string>
     <!-- Switch eg. from front to back camera -->
     <string name="switch_camera">Cambia Fotocamera</string>
+    <!-- Toggle camera on/off eg. during an video call -->
+    <string name="toggle_camera">Attiva/Disattiva Fotocamera</string>
     <string name="toggle_fullscreen">Attiva/Disattiva Modalità Schermo Intero</string>
     <string name="location">Posizione</string>
     <string name="locations">Posizioni</string>
@@ -421,6 +423,8 @@
     <string name="answer_call">Rispondi</string>
     <!-- the action "to decline" a call, not: "the decline" -->
     <string name="end_call">Rifiuta</string>
+    <!-- the action to end a call -->
+    <string name="end_call2">Fine Chiamata</string>
     <!-- Used in call bubbles, summaries, notifications -->
     <string name="audio_call">Chiamata audio</string>
     <!-- Used in call bubbles, summaries, notifications -->
@@ -444,6 +448,7 @@
     <string name="missed_call">Chiamata persa</string>
     <string name="already_in_call">Già in chiamata</string>
     <string name="call_answered_elsewhere">Chiamata risposta su un altro dispositivo</string>
+    <string name="call_requires_camera_permission">Per le videochiamate è necessaria l\'autorizzazione per l\'utilizzo della fotocamera.</string>
     <string name="call_requires_mic_permission">Per le chiamate è necessaria l\'autorizzazione per l\'utilizzo del microfono.</string>
     <!-- Used e.g. in a notifications to describe an ongoing call. "Call" is a noun here, in the meaning of "This is the call with ..." where the placeholder is replaced by the name of the contact. -->
     <string name="call_with">Chiama con %1$s</string>
@@ -465,6 +470,12 @@
         <item quantity="many">Cancella %d messaggi su tutti i tuoi dispositivi?</item>
         <item quantity="other">Cancella %d messaggi su tutti i tuoi dispositivi?</item>
     </plurals>
+    <!-- First placeholder gets replaced by the number of messages to forward. Second placeholder gets replaced by the name of the destination chat -->
+    <plurals name="ask_forward_messages">
+        <item quantity="one">Inoltra messaggio a %2$s?</item>
+        <item quantity="many">Inoltra %1$d messaggi a %2$s?</item>
+        <item quantity="other">Inoltra %1$d messaggi a %2$s?</item>
+    </plurals>
     <!-- deprecated, use ask_forward_messages -->
     <string name="ask_forward">Inoltrare messaggi a %1$s?</string>
     <string name="ask_forward_multiple">Inoltra messaggi a %1$d chat?</string>
@@ -642,6 +653,7 @@
     <string name="connectivity_connected">Connesso</string>
     <string name="sending">Invio...</string>
     <string name="last_msg_sent_successfully">Ultimo messaggio inviato con successo.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Non supportato dal tuo fornitore.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Messaggi</string>
@@ -678,7 +690,6 @@
     <string name="welcome_chat_over_email">Chat Decentralizzata Sicura</string>
     <string name="scan_invitation_code">Scansiona Codice Invito</string>
     <string name="login_title">Accedi</string>
-    <string name="login_advanced_hint">Questo accesso è per utenti avanzati:\n\n• Non utilizzare un account che stai utilizzando in un\'altra app.\n\n• Il server e-mail classico consente chat senza crittografia end-to-end, contrassegnate da un\'icona di posta.</string>
     <string name="login_inbox">In Arrivo</string>
     <string name="login_imap_login">Nome Accesso IMAP</string>
     <string name="login_imap_server">Server IMAP</string>
@@ -1193,6 +1204,9 @@
     <string name="a11y_message_context_menu_btn_label">Azioni messaggio</string>
     <string name="a11y_background_preview_label">Anteprima sfondo</string>
     <string name="a11y_disappearing_messages_activated">Messaggi che scompaiono attivati</string>
+    <!-- The placeholder will be replaced by a link, eg. "Open https://delta.chat". Used e.g. in for accessibility. -->
+    <string name="open_link">Apri %1$s</string>
+
     <!-- iOS specific strings, developers: please take care to remove strings that are no longer used! -->
     <string name="stop_sharing_location">Smetti di condividere la posizione</string>
     <string name="a11y_voice_message_hint_ios">Dopo la registrazione, doppio tocco per inviare. Per scartare la registrazione, striscia con due dita.</string>
diff --git a/src/main/res/values-kab/strings.xml b/src/main/res/values-kab/strings.xml
index 1a9e5a366..ec8cf2e84 100644
--- a/src/main/res/values-kab/strings.xml
+++ b/src/main/res/values-kab/strings.xml
@@ -605,6 +605,7 @@
     <string name="connectivity_connected">Yettwaqqen</string>
     <string name="sending">Tuzna...</string>
     <string name="last_msg_sent_successfully">Izen aneggaru yettwazen akken iwata. </string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">ur yettusefrak ara ɣer usaǧǧaw-ik·im.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Iznan</string>
@@ -641,7 +642,6 @@
     <string name="welcome_chat_over_email">Adiwenni Aɣelsan Aruslemmas</string>
     <string name="scan_invitation_code">Ḍumm tangalt n tinnubga</string>
     <string name="login_title">Kcem</string>
-    <string name="login_advanced_hint">Tuqqna-agi i yiseqdacen leqqayen:\n\n• Ur sseqdac ara tansa i tseqdaceḍ deg usnas nniḍen.\n\n• Aqeddac n yimayl aklasik yesirig anekcum war awgelhen seg yixef ɣer yixef yettwacerḍen s tignit n yimayl.</string>
     <string name="login_inbox">Tanaka n urmas</string>
     <string name="login_imap_login">Isem n tuqqna IMAP. </string>
     <string name="login_imap_server">Aqeddac IMAP</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 7b5042163..73a7bac61 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -384,6 +384,7 @@
     <string name="connectivity_connected">연결됨</string>
     <string name="sending">전송중...</string>
     <string name="last_msg_sent_successfully">마지막 메시지 전송됨.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">공급자가 지원하지 않습니다.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">메시지</string>
diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
index f9f89f06a..c333987e8 100644
--- a/src/main/res/values-lt/strings.xml
+++ b/src/main/res/values-lt/strings.xml
@@ -555,6 +555,7 @@
     <string name="connectivity_connected">Prisijungta</string>
     <string name="sending">Siunčiama…</string>
     <string name="last_msg_sent_successfully">Paskutinė žinutė sėkmingai išsiųsta.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Jūsų teikėjas nepalaiko šios ypatybės.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Žinutės</string>
@@ -589,7 +590,6 @@
     <string name="welcome_chat_over_email">Saugūs decentralizuoti pokalbiai</string>
     <string name="scan_invitation_code">Skenuoti pakvietimo kodą</string>
     <string name="login_title">Prisijungti</string>
-    <string name="login_advanced_hint">Šis prisijungimas skirtas patyrusiems naudotojams:\n\n• Nenaudokite adreso, kurį naudojate kitoje programoje.\n\n• Klasikinis el. pašto serveris leidžia pokalbius be ištisinio šifravimo, pažymėtus voko piktograma.</string>
     <string name="login_inbox">Gauta</string>
     <string name="login_imap_login">IMAP prisijungimo vardas</string>
     <string name="login_imap_server">IMAP serveris</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 233064657..fb2b8a3ac 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -635,6 +635,7 @@
     <string name="connectivity_connected">Verbonden</string>
     <string name="sending">Bezig met versturen…</string>
     <string name="last_msg_sent_successfully">Het nieuwste bericht is verstuurd.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Wordt niet ondersteund door je provider.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Berichten</string>
@@ -671,7 +672,6 @@
     <string name="welcome_chat_over_email">Veilige, gedecentraliseerde gesprekken</string>
     <string name="scan_invitation_code">Uitnodigingscode scannen</string>
     <string name="login_title">Inloggen</string>
-    <string name="login_advanced_hint">Deze inlogfunctie is bedoeld voor gevorderden:\n\n• Gebruik géén account dat je al in een andere app gebruikt;\n\n• Op klassieke e-mailservers worden gesprekken zonder eind-tot-eindversleuteling aangeduid met een envelopje.</string>
     <string name="login_inbox">Postvak in</string>
     <string name="login_imap_login">IMAP-inlognaam</string>
     <string name="login_imap_server">IMAP-server</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 3b7ac9295..2b7f1696e 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -659,6 +659,7 @@
     <string name="connectivity_connected">Połączony</string>
     <string name="sending">Wysyłanie…</string>
     <string name="last_msg_sent_successfully">Twoja ostatnia wiadomość została pomyślnie wysłana</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Nieobsługiwane przez twojego dostawcę.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Wiadomości</string>
@@ -695,7 +696,6 @@
     <string name="welcome_chat_over_email">Bezpieczny zdecentralizowany czat</string>
     <string name="scan_invitation_code">Zeskanuj kod zaproszenia</string>
     <string name="login_title">Zaloguj się</string>
-    <string name="login_advanced_hint">To logowanie jest przeznaczone dla zaawansowanych użytkowników:\n\n• Nie używaj adresu, z którego korzystasz w innej aplikacji.\n\n• Klasyczny serwer pocztowy umożliwia rozmowy bez szyfrowania end-to-end, oznaczone ikoną poczty.</string>
     <string name="login_inbox">Skrzynka odbiorcza</string>
     <string name="login_imap_login">Nazwa użytkownika IMAP</string>
     <string name="login_imap_server">Serwer IMAP</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index a346240cd..de0b68733 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -461,6 +461,7 @@
     <string name="connectivity_connected">Conectado</string>
     <string name="sending">Enviando...</string>
     <string name="last_msg_sent_successfully">Última mensagem enviada com sucesso.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Não suportado pelo seu provedor. </string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Mensagens</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 0cd44d962..45873ced2 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -445,6 +445,7 @@
     <string name="connectivity_connected">Conectat</string>
     <string name="sending">Trimitere…</string>
     <string name="last_msg_sent_successfully">Ultimul mesaj a fost trimis cu succes.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Nu este suportat de furnizorul dumneavoastră.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Mesaje</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index d870b58d2..0d147873f 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -671,6 +671,7 @@
     <string name="connectivity_connected">Соединено</string>
     <string name="sending">Отправка…</string>
     <string name="last_msg_sent_successfully">Последнее сообщение отправлено успешно.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Не поддерживается вашим провайдером.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Сообщения</string>
@@ -707,7 +708,6 @@
     <string name="welcome_chat_over_email">Безопасный децентрализованный чат</string>
     <string name="scan_invitation_code">Сканировать код приглашения</string>
     <string name="login_title">Войти</string>
-    <string name="login_advanced_hint">Этот способ входа предназначен для опытных пользователей:\n\n• Не используйте адрес, который вы уже используете в другом приложении.\n\n• Обычный почтовый сервер позволяет вести чаты без сквозного шифрования, (такие чаты помечаются значком конверта).</string>
     <string name="login_inbox">Входящие</string>
     <string name="login_imap_login">Имя пользователя IMAP</string>
     <string name="login_imap_server">Сервер IMAP</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index e061bea31..05db30e9b 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -548,6 +548,7 @@
     <string name="connectivity_connected">Pripojené</string>
     <string name="sending">Odosielam...</string>
     <string name="last_msg_sent_successfully">Posledná správa odoslaná úspešne.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Nie je podporovaná vaším poskytovateľom.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Správy</string>
diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
index 195943cce..b9c016db2 100644
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@@ -627,6 +627,7 @@
     <string name="connectivity_connected">I lidhur</string>
     <string name="sending">Po dërgohet…</string>
     <string name="last_msg_sent_successfully">Mesazhi i fundit i dërguar me sukses.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">I pambuluar nga furnizuesi juaj i shërbimit</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Mesazhe</string>
@@ -663,7 +664,6 @@
     <string name="welcome_chat_over_email">Fjalosje e Decentralizuar, e Parrezik</string>
     <string name="scan_invitation_code">Skanoni Kod Ftese</string>
     <string name="login_title">Hyni</string>
-    <string name="login_advanced_hint">Kjo hyrje është për përdorues të përparuar:\n\n• Mos përdorni një llogari që po e përdorni me një aplikacion tjetër.\n\n• Shërbyesi klasik i email-eve lejon fjalosje pa fshehtëzim skaj-më-skaj, shënuar me një ikonë poste.</string>
     <string name="login_inbox">Të marrë</string>
     <string name="login_imap_login">Emër Hyrjeje në IMAP</string>
     <string name="login_imap_server">Shërbyes IMAP</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index b4a0fdec3..7824667db 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -460,6 +460,7 @@
     <string name="connectivity_connected">Повезани</string>
     <string name="sending">Слање...</string>
     <string name="last_msg_sent_successfully">Последња порука је успешно послата.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Није подржано од вашег провајдера.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Поруке</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 75c8437cc..efa3b840a 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -597,6 +597,7 @@
     <string name="connectivity_connected">Ansluten</string>
     <string name="sending">Skickar...</string>
     <string name="last_msg_sent_successfully">Senaste meddelandet skickat felfritt.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Stöds ej av din leverantör.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Meddelanden</string>
@@ -633,7 +634,6 @@
     <string name="welcome_chat_over_email">Säker decentraliserad chatt</string>
     <string name="scan_invitation_code">Skanna inbjudningskod</string>
     <string name="login_title">Logga in</string>
-    <string name="login_advanced_hint">Denna inloggning är för avancerade användare:\n\n- Använd inte en adress som du använder i en annan app.\n\n- Klassisk e-postserver tillåter chattar utan totalsträckskryptering, markerad med en e-postikon.</string>
     <string name="login_inbox">Inkorg</string>
     <string name="login_imap_login">IMAP inloggningsnamn</string>
     <string name="login_imap_server">IMAP server</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 36984779d..52b7b0b94 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -618,6 +618,7 @@
     <string name="connectivity_connected">Bağlı</string>
     <string name="sending">Gönderiliyor…</string>
     <string name="last_msg_sent_successfully">Son ileti başarıyla gönderildi.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Sağlayıcınız tarafından desteklenmiyor.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">İletiler</string>
@@ -654,7 +655,6 @@
     <string name="welcome_chat_over_email">Güvenli Merkezi Olmayan Sohbet</string>
     <string name="scan_invitation_code">Çağrı Kodunu Tara</string>
     <string name="login_title">Giriş Yap</string>
-    <string name="login_advanced_hint">Bu giriş gelişmiş kullanıcılar içindir:\n\n• Başka bir uygulamada kullandığınız bir hesabı kullanmayın.\n\n• Klasik e-posta sunucusu, bir posta simgesiyle işaretlenerek uçtan uca şifreleme olmayan sohbetlere izin verir.</string>
     <string name="login_inbox">Gelen Kutusu</string>
     <string name="login_imap_login">IMAP Giriş Adı</string>
     <string name="login_imap_server">IMAP Sunucusu</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 7aa036c14..4c51d5d15 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -641,6 +641,7 @@
     <string name="connectivity_connected">Підключено</string>
     <string name="sending">Шлеться…</string>
     <string name="last_msg_sent_successfully">Останнє повідомлення успішно надіслано.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Не підтримується вашим провайдером електронної пошти.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Повідомлення</string>
@@ -677,7 +678,6 @@
     <string name="welcome_chat_over_email">Безпечний децентралізований чат</string>
     <string name="scan_invitation_code">Сканувати код запрошення</string>
     <string name="login_title">Увійти</string>
-    <string name="login_advanced_hint">Цей спосіб входу призначений для досвідчених користувачів:\n\n• Не використовуйте обліковий запис, який ви вже використовуєте в іншому застосунку.\n\n• Класичний поштовий сервер дозволяє чати без наскрізного шифрування — вони позначені піктограмою листа.</string>
     <string name="login_inbox">Вхідні</string>
     <string name="login_imap_login">IMAP-логін</string>
     <string name="login_imap_server">IMAP-сервер</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 21b8aebbd..6289bd62f 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -449,6 +449,7 @@
     <string name="connectivity_connected">Đã kết nối</string>
     <string name="sending">Đang gửi…</string>
     <string name="last_msg_sent_successfully">Tin nhắn cuối cùng được gửi thành công.</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">Không được nhà cung cấp của bạn hỗ trợ.</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">Tin nhắn</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index ad58f7ab3..129955697 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -617,6 +617,7 @@
     <string name="connectivity_connected">已连接</string>
     <string name="sending">发送中…</string>
     <string name="last_msg_sent_successfully">最后一条消息已成功发送。</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">不被您的邮件提供商支持。</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">消息</string>
@@ -653,7 +654,6 @@
     <string name="welcome_chat_over_email">安全的去中心化聊天</string>
     <string name="scan_invitation_code">扫描邀请码</string>
     <string name="login_title">登录</string>
-    <string name="login_advanced_hint">此登录适用于高级用户：\n\n• 请勿使用您在其他应用中已使用的地址。\n\n• 传统电子邮件服务器允许进行未端到端加密的聊天，此类聊天以邮件图标标记。</string>
     <string name="login_inbox">收件箱</string>
     <string name="login_imap_login">IMAP 登录名</string>
     <string name="login_imap_server">IMAP 服务器</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 7a0e49c38..7d103ae89 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -587,6 +587,7 @@
     <string name="connectivity_connected">已連接</string>
     <string name="sending">傳送中…</string>
     <string name="last_msg_sent_successfully">已成功送出上一條消息。</string>
+    <!-- deprecated -->
     <string name="not_supported_by_provider">您的供應商不支援。</string>
     <!-- Subtitle in quota context of "Connectivity" view. Should be be plural always, no number is prefixed. -->
     <string name="messages">訊息</string>
@@ -623,7 +624,6 @@
     <string name="welcome_chat_over_email">安全的去中心化聊天</string>
     <string name="scan_invitation_code">掃描邀請碼</string>
     <string name="login_title">登入</string>
-    <string name="login_advanced_hint">此登入適用於進階使用者：\n\n• 不要使用你在其他應用程式中使用的位址。\n\n• 傳統的電子郵件伺服器允許未使用端對端加密的聊天，並以郵件圖示標示。</string>
     <string name="login_inbox">收件匣</string>
     <string name="login_imap_login">IMAP 帳號</string>
     <string name="login_imap_server">IMAP 伺服器</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8f0cc479a..2f3ae5b75 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -673,7 +673,7 @@
     <string name="welcome_chat_over_email">Secure Decentralized Chat</string>
     <string name="scan_invitation_code">Scan Invitation Code</string>
     <string name="login_title">Log In</string>
-    <string name="login_advanced_hint">This login is for advanced users:\n\n• Do not use an address you\'re using in another app.\n\n• Classic email server allow chats without end-to-end encryption marked by a mail icon.</string>
+    <string name="login_advanced_hint">This login is for advanced users.\n\nDo not use an address you\'re using in another app.</string>
     <string name="login_inbox">Inbox</string>
     <string name="login_imap_login">IMAP Login Name</string>
     <string name="login_imap_server">IMAP Server</string>
@@ -708,6 +708,7 @@
     <string name="used_for_sending">Used for sending</string>
     <string name="hide_from_contacts">Hide from Contacts</string>
     <string name="hidden_from_contacts">Hidden from contacts</string>
+    <string name="enforce_e2ee">Enforce Encryption for All Relays</string>
     <!-- Hint for the list of relays -->
     <string name="transport_list_hint">Messages are received on all relays.\n\n⚠️ If you change anything here, make sure all your devices run at least version 2.47.0. Otherwise older devices may miss messages.</string>
     <!-- shown if a QR code was scanned that can be used as a relay -->