diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 7bcd9d8a5..8d14c03bd 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -793,7 +793,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             this.binding.textInputHint.setVisibility(View.GONE);
             this.binding.textinput.setHint(R.string.send_corrected_message);
         } else if (multi && conversation.getNextCounterpart() != null) {
-            this.binding.textinput.setHint(R.string.send_unencrypted_message);
+            this.binding.textinput.setHint(R.string.send_message);
             this.binding.textInputHint.setVisibility(View.VISIBLE);
             this.binding.textInputHint.setText(getString(
                     R.string.send_private_message_to,
diff --git a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
index 900246591..8703af89e 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
@@ -102,9 +102,7 @@ public class ConversationMenuConfigurator {
 			return;
 		}
 
-		if (conversation.getNextEncryption() != Message.ENCRYPTION_NONE) {
-			menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
-		}
+		menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
 
 		pgp.setVisible(Config.supportOpenPgp());
 		none.setVisible(Config.supportUnencrypted() || conversation.getMode() == Conversation.MODE_MULTI);
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 26732b501..f7befe66f 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -544,7 +544,7 @@ public class UIHelper {
         switch (conversation.getNextEncryption()) {
             case Message.ENCRYPTION_NONE:
                 if (Config.multipleEncryptionChoices()) {
-                    return context.getString(R.string.send_unencrypted_message);
+                    return context.getString(R.string.send_message);
                 } else {
                     return context.getString(R.string.send_message_to_x, conversation.getName());
                 }
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 197b23a26..9306280a2 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -140,7 +140,7 @@
     <string name="account_status_incompatible_server">لا يتوافق مع السيرفر</string>
     <string name="account_status_stream_error">خطأ في التدفق</string>
     <string name="account_status_stream_opening_error">خطأ عند فتح التدفق</string>
-    <string name="encryption_choice_unencrypted">غير مشفر</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">رسالة مشفرة عبر OTR</string>
     <string name="encryption_choice_pgp">رسالة مشفرة عبر OpenPGP</string>
     <string name="encryption_choice_omemo">أوميمو OMEMO</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index d4603cc3c..2ccedd236 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Несъвместим сървър</string>
     <string name="account_status_stream_error">Поточна грешка</string>
     <string name="account_status_stream_opening_error">Проблем при отварянето на потока</string>
-    <string name="encryption_choice_unencrypted">Нешифровано</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 452c1423d..53091f165 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -164,7 +164,7 @@
     <string name="account_status_incompatible_server">Servidor incompatible</string>
     <string name="account_status_stream_error">Error de transmissió</string>
     <string name="account_status_stream_opening_error">Error d\'obertura de la transmissió</string>
-    <string name="encryption_choice_unencrypted">Sense xifrar</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index d0ddfa604..b5c2b3429 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -176,7 +176,7 @@
     <string name="account_status_incompatible_server">Nekompatibilní server</string>
     <string name="account_status_stream_error">Chyba přenosu</string>
     <string name="account_status_stream_opening_error">Chyba při otevírání proudu</string>
-    <string name="encryption_choice_unencrypted">Nešifrováno</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml
index 22f4bce2d..7287b2d47 100644
--- a/src/main/res/values-da-rDK/strings.xml
+++ b/src/main/res/values-da-rDK/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Inkompatibel server</string>
     <string name="account_status_stream_error">Strømfejl</string>
     <string name="account_status_stream_opening_error">Fejl ved streamåbning</string>
-    <string name="encryption_choice_unencrypted">Ukrypteret</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index aba514c43..028f51876 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Inkompatibler Server</string>
     <string name="account_status_stream_error">Stream-Fehler</string>
     <string name="account_status_stream_opening_error">Fehler beim Öffnen des Streams</string>
-    <string name="encryption_choice_unencrypted">Unverschlüsselt</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index d6a8cd209..7d56c4d80 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Μη συμβατός διακομιστής</string>
     <string name="account_status_stream_error">Σφάλμα μετάδοσης</string>
     <string name="account_status_stream_opening_error">Σφάλμα στην εκκίνηση μετάδοσης</string>
-    <string name="encryption_choice_unencrypted">Μη κρυπτογραφημένο</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index c958b30b2..6c962997c 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Servidor incompatible</string>
     <string name="account_status_stream_error">Error de flujo</string>
     <string name="account_status_stream_opening_error">Error al abrir la secuencia</string>
-    <string name="encryption_choice_unencrypted">Sin cifrado</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 4d2fde773..94a700ca4 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -135,7 +135,7 @@
     <string name="account_status_incompatible_server">Zerbitzari ez bateragarria</string>
     <string name="account_status_stream_error">Akatsa korrontean</string>
     <string name="account_status_stream_opening_error">Akatsa korrontea irekitzerakoan</string>
-    <string name="encryption_choice_unencrypted">Enkriptatu gabe</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml
index 9ba3e4d45..9c10dc123 100644
--- a/src/main/res/values-fa-rIR/strings.xml
+++ b/src/main/res/values-fa-rIR/strings.xml
@@ -108,7 +108,7 @@
     <string name="account_status_policy_violation">نقض سیاست</string>
     <string name="account_status_incompatible_server">سرور ناسازگار</string>
     <string name="account_status_stream_error">خطا در ارتباط</string>
-    <string name="encryption_choice_unencrypted">رمز نشده</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 9a03e5808..d9c2a616c 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -167,7 +167,7 @@
     <string name="account_status_tls_error">TLS-kättely epäonnistui</string>
     <string name="account_status_tls_error_domain">Verkkotunnuksen varmentaminen epäonnistui</string>
     <string name="account_status_incompatible_server">Yhteensopimaton palvelin</string>
-    <string name="encryption_choice_unencrypted">Salaamaton</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 8e177693e..295ac6c48 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -171,7 +171,7 @@
     <string name="account_status_incompatible_server">Serveur incompatible</string>
     <string name="account_status_stream_error">Erreur de flux</string>
     <string name="account_status_stream_opening_error">Erreur d\'ouverture du flux</string>
-    <string name="encryption_choice_unencrypted">Non chiffré</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 234d5807e..847e27cf7 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Servidor incompatible</string>
     <string name="account_status_stream_error">Erro de fluxo</string>
     <string name="account_status_stream_opening_error">Fallo ao abrir o fluxo</string>
-    <string name="encryption_choice_unencrypted">Non cifrado</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 162212928..64ccccc5c 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Nem kompatibilis kiszolgáló</string>
     <string name="account_status_stream_error">Adatfolyamhiba</string>
     <string name="account_status_stream_opening_error">Adatfolyam megnyitási hiba</string>
-    <string name="encryption_choice_unencrypted">Titkosítatlan</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index f2a621876..4677feb00 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -161,7 +161,7 @@
     <string name="account_status_incompatible_server">Server tidak cocok</string>
     <string name="account_status_stream_error">Kesalahan stream</string>
     <string name="account_status_stream_opening_error">Kesalahan pembukaan stream</string>
-    <string name="encryption_choice_unencrypted">Tidak terenkripsi</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 6fb2bc823..7021f865a 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Server non compatibile</string>
     <string name="account_status_stream_error">Errore di stream</string>
     <string name="account_status_stream_opening_error">Errore apertura flusso</string>
-    <string name="encryption_choice_unencrypted">Non cifrato</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 8488cce22..d79130bd4 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -97,7 +97,7 @@
     <string name="account_status_regis_conflict">שם משתמש כבר בשימוש</string>
     <string name="account_status_regis_success">הרשמה הושלמה</string>
     <string name="account_status_incompatible_server">שרת לא מתאים</string>
-    <string name="encryption_choice_unencrypted">לא מוצפן</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index f94eb51e4..0a2eca3c5 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -169,7 +169,7 @@
     <string name="account_status_incompatible_server">互換性のないサーバー</string>
     <string name="account_status_stream_error">ストリーム エラー</string>
     <string name="account_status_stream_opening_error">ストリームを開く際にエラー</string>
-    <string name="encryption_choice_unencrypted">暗号化されていない</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index f6589435a..e64aa6a2d 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -114,7 +114,7 @@
     <string name="account_status_policy_violation">정책 위반</string>
     <string name="account_status_incompatible_server">호환되지 않는 서버 </string>
     <string name="account_status_stream_error">스트림 오류</string>
-    <string name="encryption_choice_unencrypted">암호화되지 않음</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP </string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-ml/strings.xml b/src/main/res/values-ml/strings.xml
index 7adca9d89..2d0bca638 100644
--- a/src/main/res/values-ml/strings.xml
+++ b/src/main/res/values-ml/strings.xml
@@ -112,7 +112,7 @@
     <string name="account_status_regis_conflict">ഉപയോക്തൃനാമം ഇതിനകം നിലവിലുണ്ട്</string>
     <string name="account_status_regis_success">രജിസ്ട്രേഷൻ പൂർത്തിയായി</string>
     <string name="account_status_policy_violation">നയ ലംഘനം</string>
-    <string name="encryption_choice_unencrypted">സുരക്ഷിതമല്ലാത്ത</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index fdbb541d8..87c19035c 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -122,7 +122,7 @@
     <string name="account_status_policy_violation">Praksisbrudd</string>
     <string name="account_status_incompatible_server">Ukompatibel tjener</string>
     <string name="account_status_stream_error">Strømmingsfeil</string>
-    <string name="encryption_choice_unencrypted">Ukryptert</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 32915d274..fed3428b3 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -145,7 +145,7 @@
     <string name="account_status_incompatible_server">Incompatibele server</string>
     <string name="account_status_stream_error">Fout bij stream</string>
     <string name="account_status_stream_opening_error">Fout bij openen van stream</string>
-    <string name="encryption_choice_unencrypted">Onversleuteld</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index b1c0db084..721e637f8 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -178,7 +178,7 @@
     <string name="account_status_incompatible_server">Serwer niekompatybilny</string>
     <string name="account_status_stream_error">Błąd strumienia</string>
     <string name="account_status_stream_opening_error">Błąd otwierania strumienia</string>
-    <string name="encryption_choice_unencrypted">Bez szyfrowania</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 2fbbc4809..a69d6384d 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Servidor incompatível</string>
     <string name="account_status_stream_error">Erro de fluxo</string>
     <string name="account_status_stream_opening_error">Erro na abertura do fluxo</string>
-    <string name="encryption_choice_unencrypted">Descriptografada</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 1d7ea055f..786ee19e9 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -118,7 +118,7 @@
     <string name="account_status_regis_conflict">O nome de utilizador já está em uso</string>
     <string name="account_status_regis_success">Registo efetuado com sucesso</string>
     <string name="account_status_incompatible_server">Servidor incompatível</string>
-    <string name="encryption_choice_unencrypted">Não cifrado</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 253c97ad1..8c1e34ed9 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -175,7 +175,7 @@
     <string name="account_status_incompatible_server">Server incompatibil</string>
     <string name="account_status_stream_error">Eroare de date</string>
     <string name="account_status_stream_opening_error">Eroare deschidere flux de date</string>
-    <string name="encryption_choice_unencrypted">Necriptat</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenGPG</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index d9d728049..060daea1c 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -178,7 +178,7 @@
     <string name="account_status_incompatible_server">Несовместимый сервер</string>
     <string name="account_status_stream_error">Ошибка потока</string>
     <string name="account_status_stream_opening_error">Ошибка открытия потока</string>
-    <string name="encryption_choice_unencrypted">Без шифра</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 25e10cd61..72663f6b0 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -174,7 +174,7 @@
     <string name="account_status_tls_error_domain">Doména sa nedá overiť</string>
     <string name="account_status_policy_violation">Porušenie pravidiel</string>
     <string name="account_status_incompatible_server">Nekompatibilný server</string>
-    <string name="encryption_choice_unencrypted">Nezašifrovaný</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index cd39b9369..95db80c9e 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -171,7 +171,7 @@
     <string name="account_status_incompatible_server">Некомпатибилан сервер</string>
     <string name="account_status_stream_error">Грешка тока</string>
     <string name="account_status_stream_opening_error">Грешка при отварању тока</string>
-    <string name="encryption_choice_unencrypted">Нешифровано</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">ОТР</string>
     <string name="encryption_choice_pgp">ОпенПГП</string>
     <string name="encryption_choice_omemo">ОМЕМО</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index d73433c36..0cda9fb71 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Inkompatibel server</string>
     <string name="account_status_stream_error">Strömningsfel</string>
     <string name="account_status_stream_opening_error">Fel vid öppning av ström</string>
-    <string name="encryption_choice_unencrypted">Okrypterat</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index f3e135b6b..3e086a5cc 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -172,7 +172,7 @@
     <string name="account_status_incompatible_server">Sunucu uyuşmazlığı</string>
     <string name="account_status_stream_error">Akış hatası</string>
     <string name="account_status_stream_opening_error">Akış açılım hatası</string>
-    <string name="encryption_choice_unencrypted">Şifrelenmemiş</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 4a96a344e..1702a3ace 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -156,7 +156,7 @@
     <string name="account_status_incompatible_server">Несумісний сервер</string>
     <string name="account_status_stream_error">Помилка потоку</string>
     <string name="account_status_stream_opening_error">Не вдалося відкрити мережевий потік</string>
-    <string name="encryption_choice_unencrypted">Без шифрування</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 76eb33c37..a025dbf6f 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -169,7 +169,7 @@
     <string name="account_status_incompatible_server">Máy chủ không tương thích</string>
     <string name="account_status_stream_error">Lỗi truyền phát</string>
     <string name="account_status_stream_opening_error">Lỗi khi mở luồng truyền</string>
-    <string name="encryption_choice_unencrypted">Không mã hoá</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index fe11961a4..cf5fcb5d5 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -169,7 +169,7 @@
     <string name="account_status_incompatible_server">服务器不兼容</string>
     <string name="account_status_stream_error">流错误</string>
     <string name="account_status_stream_opening_error">流打开错误</string>
-    <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index c2ca60d1a..ca4b696fc 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -115,7 +115,7 @@
     <string name="account_status_policy_violation">違反政策</string>
     <string name="account_status_incompatible_server">伺服器不相容</string>
     <string name="account_status_stream_error">流錯誤</string>
-    <string name="encryption_choice_unencrypted">未加密</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 47fb59b6e..3d15606ea 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -171,7 +171,7 @@
     <string name="account_status_incompatible_server">Incompatible server</string>
     <string name="account_status_stream_error">Stream error</string>
     <string name="account_status_stream_opening_error">Stream opening error</string>
-    <string name="encryption_choice_unencrypted">Unencrypted</string>
+    <string name="encryption_choice_unencrypted">TLS</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>