diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 7bcd9d8a577451df5f1d7acacd17b08b26f3ce6b..8d14c03bd266e5993b55caa301635cd57c2b9f52 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 9002465913c71c4a25f5709dffbead505f49aaf4..8703af89e33bbff81f98af69078bd82a882217f6 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 26732b501e45733b3738f2fa20edb72ab3a64fb0..f7befe66f2ab4284e7416820bf3e0d376147c7e9 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 197b23a2657801549a9ca3190332e0c6244cb3b5..9306280a261317bf3ad347aecbfa1039aee6a849 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 d4603cc3ce107ef661e2019745758c0a0bdeb3ec..2ccedd2363e0f86cbd887b4e530ca13774718ad9 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 452c1423d5399372264154b29464be5da8bba971..53091f1658472d9766017d95dc76c0888b4c024b 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 d0ddfa60471dde0e8ef8d4fa309e95b6aeb5ea6d..b5c2b342972713e8999326f663f67739df6a6d28 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 22f4bce2d0e9c6620cf977755be1f645ad30b253..7287b2d474359e2eda2dc42071f64b22c0b3e3af 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 aba514c436c480c283aa9c13e1029f1efaefdb23..028f51876feac3144d55207c33625377e94f7240 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 d6a8cd209f3dd9c1d276fbb0ba9873d61f10cdc7..7d56c4d80b9aa888a721fdcd39b67d1bc904f45f 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 c958b30b2c3333f34df43749f8eefdfb8b5f2c3c..6c962997c2e5891e63ca39b6f924891ebe44271c 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 4d2fde7731a89314fabff6aa3e1b878d77392f5d..94a700ca4e1657b0e7ecd54e76ad616291249199 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 9ba3e4d45a8e239f94e2dbdda88756849836e042..9c10dc123d8705e7c28ca088afb2cb4e2b3e8584 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 9a03e5808711665939ad0298859234aae5139765..d9c2a616cc2633fa55940e9cc838d390902ecb59 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 8e177693e2926e7113289f68911d4a9c40ac043b..295ac6c48d4a08a949dde95e1c5207e1da2325f3 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 234d5807ecd90ced35331d21bfee225ffd67b017..847e27cf7a7d184e15e6d79b36ed1322c6d4cece 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 162212928314f90fae219975deb5a3112dd316a6..64ccccc5cac9102bbff3446dd6c9999c2bd6d644 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 f2a62187614f18544715e70780491c225bcfce52..4677feb00ddf3dde02622fd405588bdd6e05e182 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 6fb2bc8239e62c29f3d232ecf5dcc7ff8b2ab990..7021f865ab0190c657fa54eeaef5a5f99b686bfe 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 8488cce22c74ed0ff3aece70b2728d6b9680f028..d79130bd47d45cd981e718394bd6194d1630c381 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 f94eb51e47ccaaf08f58835e55d0566e99a71f9d..0a2eca3c5bd8e0ed578554a06fcf64ae56f71376 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 f6589435a70c65033da1b2890df34cac4f994a7b..e64aa6a2d0d60c721da4c663b2d3bec7112ba108 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 7adca9d89d252a4945f75279628366118facb29a..2d0bca6381cf68444ca7b2589fa3306bafd59b85 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 fdbb541d86d576d564cc1662204f4748906d83dd..87c19035c24bc92546ac62c44d749e432f4fd9e3 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 32915d274528d69212640bb8aad4377342caa95e..fed3428b3c6d69b935077cb0c1d090455a055d96 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 b1c0db084bd0d47a6d7fecbb39c7c800ae4e819d..721e637f8984a0e1c33b0801bc90ea74508c2237 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 2fbbc480918dbda9e6e75dca071ff7d22732a743..a69d6384dbbb5ee123d5118e11cd1de47409b23a 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 1d7ea055fa14230bda1f1da8e70ee50962698d7c..786ee19e97c76a00c6b3d98fa2ca0c1467629c60 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 253c97ad1620f1a091256493fb5394246834e480..8c1e34ed979804ea2f4a42907375a7d416ae3dde 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 d9d728049080d44c4a2c8b4a3d936be5ba8672e7..060daea1c07148be25ed2fd3d018e4e9a30a8fab 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 25e10cd611ca10f39f246df3bcfd7cd4224b7fd5..72663f6b024b2e50bca87219c84702d0690cc943 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 cd39b936972887c555397175ae352c4961472d9d..95db80c9e17a5381540588d475df082f1bb5000e 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 d73433c363bfa7391a1adb9be1da07a7b9359d91..0cda9fb71e14c3df9aa061d227b01a7c7ac2802a 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 f3e135b6b4a20b1d8d81dbf98919562fcd38fd08..3e086a5cc306ca161151ed0ee29e14b200a90edc 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 4a96a344e51fbf21294f4d4d5e8353fbf66f5e09..1702a3ace40d9e49a486c9daf5fc428424c9dcc4 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 76eb33c371973e3a2ee283327baea1c6cc210888..a025dbf6f73a64b6bab13fb5f9a5d9f9d5e3a181 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 fe11961a4cad6627e2dfd18a7ad0b51a21f536a5..cf5fcb5d5266c8d79e4f356721e64af3744a9366 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 c2ca60d1a248ddb8ab0952eea1c90eb24cb199be..ca4b696fcaff761da1cd811c083c4f582a67225f 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 47fb59b6e8acd9c22e583138d3ceb42469f290d7..3d15606ea58ba4e90fa837018438f339f757d0bb 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>