diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 850c0683d..88e5f801f 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -91,8 +91,7 @@ public class HttpDownloadConnection implements Transferable {
             final AbstractConnectionManager.Extension extension = AbstractConnectionManager.Extension.of(mUrl.encodedPath());
             if (VALID_CRYPTO_EXTENSIONS.contains(extension.main)) {
                 this.message.setEncryption(Message.ENCRYPTION_PGP);
-            } else if (message.getEncryption() != Message.ENCRYPTION_OTR
-                    && message.getEncryption() != Message.ENCRYPTION_AXOLOTL) {
+            } else if (message.getEncryption() != Message.ENCRYPTION_AXOLOTL) {
                 this.message.setEncryption(Message.ENCRYPTION_NONE);
             }
             final String ext = extension.getExtension();
diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index e2366dd48..ef51b9af4 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -123,8 +123,7 @@ public class HttpUploadConnection implements Transferable, AbstractConnectionMan
         final long originalFileSize = file.getSize();
         this.delayed = delay;
         if (Config.ENCRYPT_ON_HTTP_UPLOADED
-                || message.getEncryption() == Message.ENCRYPTION_AXOLOTL
-                || message.getEncryption() == Message.ENCRYPTION_OTR) {
+                || message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
             this.key = new byte[44];
             SECURE_RANDOM.nextBytes(this.key);
             this.file.setKeyAndIv(this.key);
diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
index 85ea2bb86..34f5caccf 100644
--- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
@@ -6,6 +6,8 @@ import android.os.Bundle;
 import android.util.Base64;
 import android.util.Pair;
 
+import androidx.annotation.StringRes;
+
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x500.style.BCStyle;
 import org.bouncycastle.asn1.x500.style.IETFUtils;
@@ -262,19 +264,15 @@ public final class CryptoHelper {
         }
     }
 
-    public static int encryptionTypeToText(int encryption) {
-        switch (encryption) {
-            case Message.ENCRYPTION_OTR:
-                return R.string.encryption_choice_otr;
-            case Message.ENCRYPTION_AXOLOTL:
-            case Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE:
-            case Message.ENCRYPTION_AXOLOTL_FAILED:
-                return R.string.encryption_choice_omemo;
-            case Message.ENCRYPTION_NONE:
-                return R.string.encryption_choice_unencrypted;
-            default:
-                return R.string.encryption_choice_pgp;
-        }
+    public static @StringRes int encryptionTypeToText(final int encryption) {
+        return switch (encryption) {
+            case Message.ENCRYPTION_OTR -> R.string.encryption_choice_otr;
+            case Message.ENCRYPTION_AXOLOTL,
+                    Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE,
+                    Message.ENCRYPTION_AXOLOTL_FAILED -> R.string.encryption_choice_omemo;
+            case Message.ENCRYPTION_PGP -> R.string.encryption_choice_pgp;
+            default -> R.string.encryption_choice_unencrypted;
+        };
     }
 
     public static boolean isPgpEncryptedUrl(String url) {
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 9fcf508d2..e1996440c 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -457,26 +457,25 @@ public class UIHelper {
         }
     }
 
-    public static String getMessageHint(Context context, Conversation conversation) {
-        switch (conversation.getNextEncryption()) {
-            case Message.ENCRYPTION_NONE:
+    public static String getMessageHint(final Context context,final  Conversation conversation) {
+        return switch (conversation.getNextEncryption()) {
+            case Message.ENCRYPTION_NONE -> {
                 if (Config.multipleEncryptionChoices()) {
-                    return context.getString(R.string.send_unencrypted_message);
+                    yield context.getString(R.string.send_unencrypted_message);
                 } else {
-                    return context.getString(R.string.send_message_to_x, conversation.getName());
+                    yield context.getString(R.string.send_message_to_x, conversation.getName());
                 }
-            case Message.ENCRYPTION_AXOLOTL:
-                AxolotlService axolotlService = conversation.getAccount().getAxolotlService();
+            }
+            case Message.ENCRYPTION_AXOLOTL -> {
+                final AxolotlService axolotlService = conversation.getAccount().getAxolotlService();
                 if (axolotlService != null && axolotlService.trustedSessionVerified(conversation)) {
-                    return context.getString(R.string.send_omemo_x509_message);
+                    yield context.getString(R.string.send_omemo_x509_message);
                 } else {
-                    return context.getString(R.string.send_omemo_message);
+                    yield context.getString(R.string.send_encrypted_message);
                 }
-            case Message.ENCRYPTION_PGP:
-                return context.getString(R.string.send_pgp_message);
-            default:
-                return "";
-        }
+            }
+            default -> context.getString(R.string.send_encrypted_message);
+        };
     }
 
     public static String getDisplayedMucCounterpart(final Jid counterpart) {
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 62cb7bf7f..32b4ab142 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -76,9 +76,7 @@
     <string name="send_unencrypted_message">إرسال رسالة غير مشفرة</string>
     <string name="send_message">إبعث رسالة</string>
     <string name="send_message_to_x">إبعث رسالة إلى %s</string>
-    <string name="send_omemo_message">إرسال رسالة مشفرة عبر OMEMO</string>
     <string name="send_omemo_x509_message">إبعث رسالة مشفَّرة بـ أومي مو OMEMO</string>
-    <string name="send_pgp_message">إرسال رسالة مشفرة عبر OpenPGP</string>
     <string name="your_nick_has_been_changed">إسم مستخدم جديد تحت الإستعمال</string>
     <string name="send_unencrypted">إرسال بدون تشفير</string>
     <string name="decryption_failed">فشل فك التشفير. ربما ليس لديك المفتاح الخاص الصحيح.</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index eb8a71721..00e645282 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -87,9 +87,7 @@
     <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
     <string name="send_message">Изпращане на съобщение</string>
     <string name="send_message_to_x">Изпращане на съобщение до %s</string>
-    <string name="send_omemo_message">Изпр. на съобщение, шифр. чрез OMEMO</string>
     <string name="send_omemo_x509_message">Изпр. на съобщение, шифр. чрез v\\OMEMO</string>
-    <string name="send_pgp_message">Изпр. на съобщение, шифр. чрез OpenPGP</string>
     <string name="your_nick_has_been_changed">Новият псевдоним е зает</string>
     <string name="send_unencrypted">Изпращане нешифровано</string>
     <string name="decryption_failed">Неуспешно дешифроване. Възможно е да нямате правилния частен ключ.</string>
diff --git a/src/main/res/values-bn-rIN/strings.xml b/src/main/res/values-bn-rIN/strings.xml
index cffaa14ae..f87d6df06 100644
--- a/src/main/res/values-bn-rIN/strings.xml
+++ b/src/main/res/values-bn-rIN/strings.xml
@@ -83,9 +83,7 @@
     <string name="send_unencrypted_message">অসাঙ্কেতিক বার্তাই পাঠানো হোক</string>
     <string name="send_message">বার্তা পাঠানো হোক</string>
     <string name="send_message_to_x">%s-কে বার্তা পাঠানো হোক</string>
-    <string name="send_omemo_message">OMEMO সাঙ্কেতিক বার্তা পাঠানো হোক</string>
     <string name="send_omemo_x509_message">v\\OMEMO সাঙ্কেতিক বার্তা পাঠানো হোক</string>
-    <string name="send_pgp_message">OpenPGP সাঙ্কেতিক বার্তা পাঠানো হোক</string>
     <string name="your_nick_has_been_changed">নতুন নাম ব্যবহার করা হচ্ছে</string>
     <string name="send_unencrypted">এনক্রিপ্ট না করেই পাঠানো হোক</string>
     <string name="decryption_failed">ডিক্রিপ্ট করা যায়নি। হয়তো আপনার কাছে সঠিক Private Key নেই।</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index a4c203f2e..3f681dffa 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -88,9 +88,7 @@
     <string name="send_unencrypted_message">Envia un missatge no xifrat</string>
     <string name="send_message">Envia un missatge</string>
     <string name="send_message_to_x">Envia un missatge a %s</string>
-    <string name="send_omemo_message">Envia un missatge xifrat amb OMEMO</string>
     <string name="send_omemo_x509_message">Envia un missatge xifrat amb v\\OMEMO</string>
-    <string name="send_pgp_message">Envia un missatge xifrat amb OpenPGP</string>
     <string name="your_nick_has_been_changed">Nou sobrenom en ús</string>
     <string name="send_unencrypted">Envia sense xifrar</string>
     <string name="decryption_failed">El desxiframent ha fallat. Potser no teniu la clau privada apropiada.</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 46b92abe9..4905b019b 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -90,9 +90,7 @@
     <string name="send_unencrypted_message">Odeslat nešifrovanou zprávu</string>
     <string name="send_message">Odeslat zprávu</string>
     <string name="send_message_to_x">Odeslat zprávu pro %s</string>
-    <string name="send_omemo_message">Poslat OMEMO šifrovanou zprávu</string>
     <string name="send_omemo_x509_message">Odeslat v\\OMEMO šifrovanou zprávu</string>
-    <string name="send_pgp_message">Poslat OpenPGP šifrovanou zprávu</string>
     <string name="your_nick_has_been_changed">Přezdívka změněna</string>
     <string name="send_unencrypted">Poslat nešifrované</string>
     <string name="decryption_failed">Zašifrování se nezdařilo. Možná nemáte správný privátní klíč.</string>
diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml
index 80d0fd863..f9cde7131 100644
--- a/src/main/res/values-da-rDK/strings.xml
+++ b/src/main/res/values-da-rDK/strings.xml
@@ -89,9 +89,7 @@
     <string name="send_unencrypted_message">Send ukrypteret besked</string>
     <string name="send_message">Send besked</string>
     <string name="send_message_to_x">Send besked til %s</string>
-    <string name="send_omemo_message">Send OMEMO-krypteret besked</string>
     <string name="send_omemo_x509_message">Send v\\OMEMO-krypteret besked</string>
-    <string name="send_pgp_message">Send OpenPGP krypteret besked</string>
     <string name="your_nick_has_been_changed">Nyt kaldenavn i brug</string>
     <string name="send_unencrypted">Send ukrypteret</string>
     <string name="decryption_failed">Dekryptering mislykkes. Måske du ikke har den rette private nøgle.</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 9a1e24c07..3658283e6 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -89,9 +89,7 @@
     <string name="send_unencrypted_message">Unverschlüsselt schreiben…</string>
     <string name="send_message">Nachricht senden</string>
     <string name="send_message_to_x">Nachricht an %s senden</string>
-    <string name="send_omemo_message">OMEMO-verschlüsselt schreiben…</string>
     <string name="send_omemo_x509_message">v\\OMEMO-verschlüsselte Nachricht senden</string>
-    <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben…</string>
     <string name="your_nick_has_been_changed">Neuer Nickname wird jetzt verwendet</string>
     <string name="send_unencrypted">Unverschlüsselt senden</string>
     <string name="decryption_failed">Entschlüsselung fehlgeschlagen. Vielleicht hast du nicht den richtigen privaten Schlüssel.</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 599ed4201..703fe3b99 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -87,9 +87,7 @@
     <string name="send_unencrypted_message">Αποστολή μη κρυπτογραφημένου μηνύματος</string>
     <string name="send_message">Αποστολή μηνύματος</string>
     <string name="send_message_to_x">Αποστολή μηνύματος στον/στην %s</string>
-    <string name="send_omemo_message">Αποστολή κρυπτογραφημένου μηνύματος OMEMO</string>
     <string name="send_omemo_x509_message">Αποστολή v\\κρυπτογραφημένου μηνύματος OMEMO</string>
-    <string name="send_pgp_message">Αποστολή κρυπτογραφημένου μηνύματος OpenPGP</string>
     <string name="your_nick_has_been_changed">Χρήση νέου ψευδωνύμου</string>
     <string name="send_unencrypted">Αποστολή χωρίς κρυπτογράφηση</string>
     <string name="decryption_failed">Η αποκρυπτογράφηση απέτυχε. Ίσως δεν κατέχετε το σωστό ιδιωτικό κλειδί.</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index f13ba36b8..bb65ebf16 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -90,9 +90,7 @@
     <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
     <string name="send_message">Enviar mensaje</string>
     <string name="send_message_to_x">Enviar mensaje a %s</string>
-    <string name="send_omemo_message">Enviar mensaje cifrado con OMEMO </string>
     <string name="send_omemo_x509_message">Enviar mensaje cifrado v\\OMEMO</string>
-    <string name="send_pgp_message">Enviar mensaje cifrado con OpenPGP</string>
     <string name="your_nick_has_been_changed">El apodo ha sido modificado</string>
     <string name="send_unencrypted">Enviar sin cifrar</string>
     <string name="decryption_failed">Falló el descifrado. Tal vez no tengas la clave privada apropiada.</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 3c0a2130d..80b4af042 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -71,9 +71,7 @@
     <string name="send_unencrypted_message">Enkriptatu gabeko mezua bidali</string>
     <string name="send_message">Mezua bidali</string>
     <string name="send_message_to_x">%s(r)i mezua bidali</string>
-    <string name="send_omemo_message">OMEMOz enkriptatutako mezua bidali</string>
     <string name="send_omemo_x509_message">v\\OMEMOz enkriptatutako mezua bidali</string>
-    <string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
     <string name="send_unencrypted">Enkriptatu gabe bidali</string>
     <string name="decryption_failed">Desenkriptazioak huts egin du. Agian ez duzu gako pribatu egokia.</string>
     <string name="openkeychain_required">OpenKeychain</string>
diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml
index 8c274f212..e7ced4f7c 100644
--- a/src/main/res/values-fa-rIR/strings.xml
+++ b/src/main/res/values-fa-rIR/strings.xml
@@ -59,9 +59,7 @@
     <string name="send_unencrypted_message">پیام رمز نشده ارسال کن</string>
     <string name="send_message">ارسال پیام</string>
     <string name="send_message_to_x">ارسال پیام به  %s</string>
-    <string name="send_omemo_message">ارسال پیام رمز شده با OMEMO</string>
     <string name="send_omemo_x509_message">ارسال پیام رمز شده با OMEMO</string>
-    <string name="send_pgp_message">ارسال پیام رمز شده با OpenPGP</string>
     <string name="send_unencrypted">ارسال رمز نشده</string>
     <string name="decryption_failed">رمزگشایی موفق نبود. شاید شما کلید محرمانه صحیح را در اختیار ندارید.</string>
     <string name="openkeychain_required">OpenKeychain</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 80b928ef8..c1ef9fd48 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -88,9 +88,7 @@
     <string name="send_unencrypted_message">Lähetä salaamaton viesti</string>
     <string name="send_message">Lähetä viesti</string>
     <string name="send_message_to_x">Lähetä viesti henkilölle %s</string>
-    <string name="send_omemo_message">Lähetä OMEMO-salattu viesti</string>
     <string name="send_omemo_x509_message">Lähetä v\\OMEMO-salattu viesti</string>
-    <string name="send_pgp_message">Lähetä OpenPGP-salattu viesti</string>
     <string name="your_nick_has_been_changed">Uusi nimimerkki on jo varattu</string>
     <string name="send_unencrypted">Lähetä salaamaton</string>
     <string name="decryption_failed">Salauksen purku epäonnistui. Sinulle ei varmaan ole oikeaa salaista avainta.</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 7b0507db5..7433936de 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -90,9 +90,7 @@
     <string name="send_unencrypted_message">Envoyer un message en clair</string>
     <string name="send_message">Envoyer le message</string>
     <string name="send_message_to_x">Envoyer un message à %s</string>
-    <string name="send_omemo_message">Envoyer un message chiffré avec OMEMO</string>
     <string name="send_omemo_x509_message">Envoyer un message chiffré avec \\OMEMO</string>
-    <string name="send_pgp_message">Envoyer un message chiffré avec OpenPGP</string>
     <string name="your_nick_has_been_changed">Votre identifiant a été changé</string>
     <string name="send_unencrypted">Envoyer en clair</string>
     <string name="decryption_failed">Échec du déchiffrement. Avez-vous la bonne clé privée ?</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 8a64f99e2..3936f3de0 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -89,9 +89,7 @@
     <string name="send_unencrypted_message">Enviar mensaxe non cifrada</string>
     <string name="send_message">Enviar mensaxe</string>
     <string name="send_message_to_x">Enviar mensaxe a 1%s</string>
-    <string name="send_omemo_message">Enviar mensaxe cifrada con OMEMO</string>
     <string name="send_omemo_x509_message">Enviar mensaxe cifrada v\\OMEMO</string>
-    <string name="send_pgp_message">Enviar mensaxe cifrada con OpenPGP</string>
     <string name="your_nick_has_been_changed">Novo alcume en uso</string>
     <string name="send_unencrypted">Enviar sen cifrar</string>
     <string name="decryption_failed">Fallou o desencriptado. Quizais non teñas a chave privada apropiada.</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 5df2980ff..4e20e6947 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -87,9 +87,7 @@
     <string name="send_unencrypted_message">Titkosítatlan üzenet küldése</string>
     <string name="send_message">Üzenet küldése</string>
     <string name="send_message_to_x">Üzenet küldése %s számára</string>
-    <string name="send_omemo_message">OMEMO titkosítású üzenet küldése</string>
     <string name="send_omemo_x509_message">v\\OMEMO titkosítású üzenet küldése</string>
-    <string name="send_pgp_message">OpenPGP titkosítású üzenet küldése</string>
     <string name="your_nick_has_been_changed">Új becenév használva</string>
     <string name="send_unencrypted">Küldés titkosítatlanul</string>
     <string name="decryption_failed">A visszafejtés sikertelen. Talán nem rendelkezik a megfelelő személyes kulccsal.</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 95fcd8708..181ceabb4 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -84,9 +84,7 @@
     <string name="send_unencrypted_message">Kirim pesan tak-terenkripsi</string>
     <string name="send_message">Kirim pesan</string>
     <string name="send_message_to_x">Kirimkan pesan ke %s</string>
-    <string name="send_omemo_message">Kirim pesan terenkripsi OMEMO</string>
     <string name="send_omemo_x509_message">Mengirim pesan terenkripsi v\\OMEMO</string>
-    <string name="send_pgp_message">Kirim pesan terenskripsi OpenPGP</string>
     <string name="your_nick_has_been_changed">Nama panggilan sudah dipakai</string>
     <string name="send_unencrypted">Kirim tidak terenkripsi</string>
     <string name="decryption_failed">Dekripsi gagal. Mungkin Anda tidak memiliki kunci pribadi yang tepat.</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 678fa12d3..f0dccd7a0 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -88,9 +88,7 @@
     <string name="send_unencrypted_message">Invia messaggio non cifrato</string>
     <string name="send_message">Invia messaggio</string>
     <string name="send_message_to_x">Invia messaggio a %s</string>
-    <string name="send_omemo_message">Invia messaggio cifrato OMEMO</string>
     <string name="send_omemo_x509_message">Invia messaggio cifrato v\\OMEMO</string>
-    <string name="send_pgp_message">Messaggio OpenPGP</string>
     <string name="your_nick_has_been_changed">Nuovo nome utente in uso</string>
     <string name="send_unencrypted">Invia non cifrato</string>
     <string name="decryption_failed">Decifrazione fallita. Forse non disponi della chiave privata corretta.</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 98642dfc0..afee25582 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -52,8 +52,6 @@
     <string name="action_clear_history">נקה היסטוריה</string>
     <string name="clear_conversation_history">נקה היסטוריית שיחה</string>
     <string name="send_unencrypted_message">שלח הודעה בלתי מוצפנת</string>
-    <string name="send_omemo_message">של הודעה בהצפנת OMEMO</string>
-    <string name="send_pgp_message">שלח הודעה בהצפנת OpenPGP</string>
     <string name="send_unencrypted">שלח ללא הצפנה</string>
     <string name="decryption_failed">פענוח נכשל. אולי אין לך את המפתח הפרטי המתאים.</string>
     <string name="openkeychain_required">OpenKeychain</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index fb203f40b..727e81db8 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -86,9 +86,7 @@
     <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
     <string name="send_message">メッセージを送信</string>
     <string name="send_message_to_x">メッセージを %s に送信</string>
-    <string name="send_omemo_message">OMEMO 暗号化メッセージを送信</string>
     <string name="send_omemo_x509_message">v\\OMEMO 暗号化メッセージを送信</string>
-    <string name="send_pgp_message">OpenPGP 暗号化メッセージを送信</string>
     <string name="your_nick_has_been_changed">ニックネームが変更されました</string>
     <string name="send_unencrypted">暗号化せずに送信</string>
     <string name="decryption_failed">復号に失敗しました。適切な秘密鍵を持っていないのかもしれません。</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 5cce30f91..5c9a3f7f3 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -56,9 +56,7 @@
     <string name="choose_presence">기기 선택</string>
     <string name="send_unencrypted_message">암호화하지 않은 메세지 전송</string>
     <string name="send_message_to_x">%s 에게 매세지 보내기 </string>
-    <string name="send_omemo_message">OMEMO로 암호화된 메세지</string>
     <string name="send_omemo_x509_message">v\\OMEMO로 암호화된 메세지 전송</string>
-    <string name="send_pgp_message">OpenPGP 암호화된 메세지 전송 </string>
     <string name="send_unencrypted">암호화하지 않고 전송 </string>
     <string name="decryption_failed">복호화 실패. 올바른 개인 키를 가지고 있지 않은 것 같습니다. </string>
     <string name="openkeychain_required">OpenKeychain </string>
diff --git a/src/main/res/values-ml/strings.xml b/src/main/res/values-ml/strings.xml
index 1ba9b24c5..fde9a5692 100644
--- a/src/main/res/values-ml/strings.xml
+++ b/src/main/res/values-ml/strings.xml
@@ -65,9 +65,7 @@
     <string name="send_unencrypted_message">സുരക്ഷിതമല്ലാത്ത സന്ദേശം അയയ്കൂ</string>
     <string name="send_message">സന്ദേശം അയയ്ക്കൂ</string>
     <string name="send_message_to_x">%s-ന് (ക്ക്) സന്ദേശം അയയ്ക്കൂ</string>
-    <string name="send_omemo_message">OMEMO സുരക്ഷിതമാക്കിയ സന്ദേശം അയയ്ക്കൂ</string>
     <string name="send_omemo_x509_message">v\\OMEMO സുരക്ഷിതമാക്കിയ സന്ദേശം അയയ്ക്കൂ</string>
-    <string name="send_pgp_message">OpenPGP സുരക്ഷിതമാക്കിയ സന്ദേശം അയയ്ക്കൂ</string>
     <string name="your_nick_has_been_changed">പുതിയ വിളിപ്പേര് ഉപയോഗത്തിലുള്ളതാണ്</string>
     <string name="openkeychain_required">OpenKeychain</string>
     <string name="restart">പുനരാരംഭിക്കൂ</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 97bdcae5a..c2d44f898 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -62,9 +62,7 @@
     <string name="send_unencrypted_message">Send ukryptert melding</string>
     <string name="send_message">Send melding</string>
     <string name="send_message_to_x">Send melding til %s</string>
-    <string name="send_omemo_message">Send OMEMO-kryptert melding</string>
     <string name="send_omemo_x509_message">Send \\OMEMO-kryptert melding</string>
-    <string name="send_pgp_message">Send OpenPGP-kryptert melding</string>
     <string name="send_unencrypted">Send ukryptert</string>
     <string name="decryption_failed">Dekryptering feilet. Kanskje du ikke lenger har den rette private nøkkelen.</string>
     <string name="openkeychain_required">OpenKeychain</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 6a1a6b837..109e0a7d5 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -84,9 +84,7 @@
     <string name="send_unencrypted_message">Verstuur onversleuteld bericht</string>
     <string name="send_message">Verstuur bericht</string>
     <string name="send_message_to_x">Bericht sturen naar %s</string>
-    <string name="send_omemo_message">Verstuur OMEMO-versleuteld bericht</string>
     <string name="send_omemo_x509_message">Verstuur v\\OMEMO-versleuteld bericht</string>
-    <string name="send_pgp_message">Verstuur OpenPGP-versleuteld bericht</string>
     <string name="your_nick_has_been_changed">Nieuwe bijnaam in gebruik</string>
     <string name="send_unencrypted">Verstuur onversleuteld</string>
     <string name="decryption_failed">Ontsleutelen mislukt. Misschien heb je niet de juiste private sleutel.</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 13ff9d516..743a5d6a7 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -91,9 +91,7 @@
     <string name="send_unencrypted_message">Wyślij wiadomość bez szyfrowania</string>
     <string name="send_message">Wyślij wiadomość</string>
     <string name="send_message_to_x">Wyślij wiadomość do %s</string>
-    <string name="send_omemo_message">Wyślij wiadomość zaszyfrowaną OMEMO</string>
     <string name="send_omemo_x509_message">Wyślij wiadomość zaszyfrowaną v\\OMEMO</string>
-    <string name="send_pgp_message">Wyślij zaszyfrowaną wiadomość (OpenPGP)</string>
     <string name="your_nick_has_been_changed">Nowy pseudonim jest już użyciu</string>
     <string name="send_unencrypted">Wyślij bez szyfrowania</string>
     <string name="decryption_failed">Nie można odszyfrować. Sprawdź poprawność klucza prywatnego.</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 5bdd80536..fa046f760 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -88,9 +88,7 @@
     <string name="send_unencrypted_message">Enviar mensagem não criptografada</string>
     <string name="send_message">Enviar mensagem</string>
     <string name="send_message_to_x">Enviar mensagem para %s</string>
-    <string name="send_omemo_message">Enviar mensagem criptografada via OMEMO</string>
     <string name="send_omemo_x509_message">Enviar mensagem criptografada via v\\OMEMO</string>
-    <string name="send_pgp_message">Enviar mensagem criptografada via OpenPGP</string>
     <string name="your_nick_has_been_changed">Novo apelido em uso</string>
     <string name="send_unencrypted">Enviar descriptografada</string>
     <string name="decryption_failed">Não foi possível descriptografar. Talvez você não tenha a chave privada apropriada.</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index b33d8fce0..d20287ff0 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -62,9 +62,7 @@
     <string name="send_unencrypted_message">Enviar mensagem não cifrada</string>
     <string name="send_message">Enviar mensagem</string>
     <string name="send_message_to_x">Enviar mensagem para %s</string>
-    <string name="send_omemo_message">Enviar mensagem cifrada com OMEMO</string>
     <string name="send_omemo_x509_message">Enviar mensagem cifrada com v\\OMEMO</string>
-    <string name="send_pgp_message">Enviar mensagem cifrada com OpenPGP</string>
     <string name="send_unencrypted">Enviar não cifrada</string>
     <string name="decryption_failed">A decifragem falhou. Talvez  não tenha a chave privada correta.</string>
     <string name="openkeychain_required">OpenKeychain</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index a76f33ab6..d7b679123 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -90,9 +90,7 @@
     <string name="send_unencrypted_message">Trimite mesaje necriptate</string>
     <string name="send_message">Trimite mesaj</string>
     <string name="send_message_to_x">Trimite mesaj către %s</string>
-    <string name="send_omemo_message">Trimite mesaj criptat cu OMEMO</string>
     <string name="send_omemo_x509_message">Trimite mesaj criptat cu v\\OMEMO</string>
-    <string name="send_pgp_message">Trimite mesaj criptat cu OpenPGP</string>
     <string name="your_nick_has_been_changed">Numele de utilizator este deja alocat</string>
     <string name="send_unencrypted">Trimite necriptat</string>
     <string name="decryption_failed">Decriptarea a eșuat. Poate nu aveți cheia privată corectă.</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index f2573c11d..3709130c1 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -91,9 +91,7 @@
     <string name="send_unencrypted_message">Нешифрованное сообщение</string>
     <string name="send_message">Сообщение</string>
     <string name="send_message_to_x">Сообщение для %s</string>
-    <string name="send_omemo_message">OMEMO-зашифр. сообщение</string>
     <string name="send_omemo_x509_message">v\\OMEMO-зашифр. сообщение</string>
-    <string name="send_pgp_message">OpenPGP зашифр. сообщение</string>
     <string name="your_nick_has_been_changed">Используется новое имя</string>
     <string name="send_unencrypted">Отправить в незашифрованном виде</string>
     <string name="decryption_failed">Расшифровка не удалась. Вероятно, что у вас нет надлежащего ключа.</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 5821b7d45..436c08730 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -88,9 +88,7 @@
     <string name="send_unencrypted_message">Poslať nezašifrovanú správu</string>
     <string name="send_message">Poslať správu</string>
     <string name="send_message_to_x">Poslať správu na %s</string>
-    <string name="send_omemo_message">Poslať OMEMO šifrovanú správu</string>
     <string name="send_omemo_x509_message">Poslať v\\OMEMO šifrovanú správu</string>
-    <string name="send_pgp_message">Poslať OpenPGP šifrovanú správu</string>
     <string name="your_nick_has_been_changed">Používa sa nová prezývka</string>
     <string name="send_unencrypted">Poslať nešifrované</string>
     <string name="decryption_failed">Zašifrovanie zlyhalo. Možno nemáte správny privátny kľúč.</string>
diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 092a9342e..894127990 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -71,9 +71,7 @@
     <string name="send_unencrypted_message">Dërgoni mesazh të pafshehtëzuar</string>
     <string name="send_message">Dërgoni mesazh</string>
     <string name="send_message_to_x">Dërgoje mesazhin për %s</string>
-    <string name="send_omemo_message">Dërgoni një mesazh të fshehtëzuar me OMEMO</string>
     <string name="send_omemo_x509_message">Dërgoni një mesazh të fshehtëzuar me v\\OMEMO</string>
-    <string name="send_pgp_message">Dërgoni një mesazh të fshehtëzuar me OpenPGP</string>
     <string name="your_nick_has_been_changed">Nofkë e re në përdorim</string>
     <string name="send_unencrypted">Dërgoje të pafshehtëzuar</string>
     <string name="install">Instaloje</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 738f0a045..5c9d59b34 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -88,9 +88,7 @@
     <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
     <string name="send_message">Пошаљи поруку</string>
     <string name="send_message_to_x">Пошаљи поруку за %s</string>
-    <string name="send_omemo_message">Пошаљи ОМЕМО шифровану поруку</string>
     <string name="send_omemo_x509_message">Пошаљи v\\ОМЕМО шифровану поруку</string>
-    <string name="send_pgp_message">Пошаљи ОпенПГП шифровану поруку</string>
     <string name="your_nick_has_been_changed">Нови надимак је у употреби</string>
     <string name="send_unencrypted">Пошаљи нешифровано</string>
     <string name="decryption_failed">Шифровање није успело. Можда немате одговарајући лични кључ.</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 5d58c4c15..20a6b823d 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -89,9 +89,7 @@
     <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
     <string name="send_message">Skicka meddelande</string>
     <string name="send_message_to_x">Skicka meddelande till %s</string>
-    <string name="send_omemo_message">Skicka OMEMO-krypterat meddelande</string>
     <string name="send_omemo_x509_message">Skicka v\\OMEMO-krypterat meddelande</string>
-    <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
     <string name="your_nick_has_been_changed">Nytt smeknamn är nu i bruk</string>
     <string name="send_unencrypted">Skicka okrypterat</string>
     <string name="decryption_failed">Dekrypteringen misslyckades. Du har kanske inte rätt privat nyckel.</string>
diff --git a/src/main/res/values-szl/strings.xml b/src/main/res/values-szl/strings.xml
index 8c1aac69f..e1de036bb 100644
--- a/src/main/res/values-szl/strings.xml
+++ b/src/main/res/values-szl/strings.xml
@@ -90,9 +90,7 @@
     <string name="send_unencrypted_message">Wyślij wiadōmość bez szyfrowanio</string>
     <string name="send_message">Wyślij wiadōmość</string>
     <string name="send_message_to_x">Wyślij wiadōmość do kōntaktu %s</string>
-    <string name="send_omemo_message">Wyślij wiadōmość zaszyfrowano OMEMO</string>
     <string name="send_omemo_x509_message">Wyślij wiadōmość zaszyfrowano v\\OMEMO</string>
-    <string name="send_pgp_message">Wyślij zaszyfrowano wiadōmość (OpenPGP)</string>
     <string name="your_nick_has_been_changed">Przemianek je umiyniōny</string>
     <string name="send_unencrypted">Wyślij bez szyfrowanio</string>
     <string name="decryption_failed">Niy idzie ôdszyfrować. Możno niy mosz noleznego prywatnego klucza.</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 517750e7c..3815ac77a 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -87,9 +87,7 @@
     <string name="send_unencrypted_message">Şifrelenmemiş ileti gönder</string>
     <string name="send_message">Mesajı gönder</string>
     <string name="send_message_to_x">%s kişisine ileti gönder</string>
-    <string name="send_omemo_message">OMEMO ile şifrelenmiş ileti gönder</string>
     <string name="send_omemo_x509_message">v\\OMEMO ile şifrelenmiş ileti gönder</string>
-    <string name="send_pgp_message">OpenPGP ile şifrelenmiş ileti gönder</string>
     <string name="your_nick_has_been_changed">Yeni rumuz kullanımda</string>
     <string name="send_unencrypted">Şifrelenmemiş gönder</string>
     <string name="decryption_failed">Deşifre edilemedi. Uygun bir özel anahtarınız olmayabilir.</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 88b783e10..d70236c94 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -83,9 +83,7 @@
     <string name="send_unencrypted_message">Незашифроване повідомлення</string>
     <string name="send_message">Надіслати повідомлення</string>
     <string name="send_message_to_x">Повідомлення %s</string>
-    <string name="send_omemo_message">Повідомлення, зашифроване OMEMO</string>
     <string name="send_omemo_x509_message">Повідомлення, зашифроване v\\OMEMO</string>
-    <string name="send_pgp_message">Повідомлення зашифроване OpenPGP</string>
     <string name="your_nick_has_been_changed">Ваше прізвисько змінено</string>
     <string name="send_unencrypted">Надіслати без шифрування</string>
     <string name="decryption_failed">Не вдалося розшифрувати. Можливо, у Вас відсутній потрібний приватний ключ.</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 905d7f339..915c4924f 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -88,9 +88,7 @@
     <string name="send_unencrypted_message">Gửi tin nhắn không mã hoá</string>
     <string name="send_message">Gửi tin nhắn</string>
     <string name="send_message_to_x">Gửi tin nhắn đến %s</string>
-    <string name="send_omemo_message">Gửi tin nhắn mã hoá OMEMO</string>
     <string name="send_omemo_x509_message">Gửi tin nhắn mã hoá v\\OMEMO</string>
-    <string name="send_pgp_message">Gửi tin nhắn mã hoá OpenPGP</string>
     <string name="your_nick_has_been_changed">Biệt danh mới đang được sử dụng</string>
     <string name="send_unencrypted">Gửi dạng không mã hoá</string>
     <string name="decryption_failed">Giải mã thất bại. Có lẽ bạn không có đúng khoá cá nhân.</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index cca4befab..72c01f943 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -88,9 +88,7 @@
     <string name="send_unencrypted_message">发送未加密消息</string>
     <string name="send_message">发送消息</string>
     <string name="send_message_to_x">发送消息至 %s</string>
-    <string name="send_omemo_message">发送 OMEMO 加密消息</string>
     <string name="send_omemo_x509_message">发送 v\\OMEMO 加密消息</string>
-    <string name="send_pgp_message">发送 OpenPGP 加密消息</string>
     <string name="your_nick_has_been_changed">正在使用新昵称</string>
     <string name="send_unencrypted">发送未加密的</string>
     <string name="decryption_failed">解密失败。也许您没有正确的私钥。</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 7422821ec..48a03b6a4 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -81,9 +81,7 @@
     <string name="send_unencrypted_message">傳送未加密的訊息</string>
     <string name="send_message">傳送訊息</string>
     <string name="send_message_to_x">傳送訊息至 %s</string>
-    <string name="send_omemo_message">傳送 OMEMO 加密訊息</string>
     <string name="send_omemo_x509_message">傳送 v\\OMEMO 加密訊息</string>
-    <string name="send_pgp_message">傳送 OpenPGP 加密訊息</string>
     <string name="your_nick_has_been_changed">新暱稱已被使用</string>
     <string name="send_unencrypted">不加密傳送</string>
     <string name="decryption_failed">解密失敗，可能是私密金鑰不正確。</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7486969ea..3da83cb6c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -89,14 +89,13 @@
     <string name="delete_file_dialog_msg">Are you sure you want to delete this file?\n\n<b>Warning:</b> This will not delete copies of this file that are stored on other devices or servers. </string>
     <string name="archive_this_chat">Archive this chat</string>
     <string name="choose_presence">Choose device</string>
-    <string name="send_unencrypted_message">Send unencrypted message</string>
+    <string name="send_unencrypted_message">Send clear text message</string>
     <string name="send_message">Send message</string>
     <string name="send_message_to_x">Send message to %s</string>
-    <string name="send_omemo_message">Send OMEMO encrypted message</string>
+    <string name="send_encrypted_message">Send encrypted message</string>
     <string name="send_omemo_x509_message">Send v\\OMEMO encrypted message</string>
-    <string name="send_pgp_message">Send OpenPGP encrypted message</string>
     <string name="your_nick_has_been_changed">New nickname in use</string>
-    <string name="send_unencrypted">Send unencrypted</string>
+    <string name="send_unencrypted">Send clear text</string>
     <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string>
     <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long"><![CDATA[%1$s uses <b>OpenKeychain</b> to encrypt and decrypt messages and manage your public keys.<br><br>It is licensed under GPLv3+ and available on F-Droid and Google Play.<br><br><small>(Please restart %1$s afterwards.)</small>]]></string>
@@ -171,7 +170,7 @@
     <string name="account_status_incompatible_client">Incompatible client</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">Clear text</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
@@ -883,7 +882,7 @@
     <string name="discover_channels">Discover channels</string>
     <string name="search_channels">Search channels</string>
     <string name="channel_discovery_opt_in_title">Possible privacy violation!</string>
-    <string name="channel_discover_opt_in_message"><![CDATA[Channel discovery uses a third party service called <a href="https://search.jabber.network">search.jabber.network</a>.<br><br>Using this feature will transmit your IP address and search terms to that service. See their <a href="https://search.jabber.network/privacy">Privacy Policy</a> for more information.]]></string>
+    <string name="channel_discover_opt_in_message">Channel discovery uses a third party service called &lt;a href=&quot;https://search.jabber.network&quot;>search.jabber.network&lt;/a>.&lt;br>&lt;br>Using this feature will transmit your IP address and search terms to that service. See their &lt;a href=&quot;https://search.jabber.network/privacy&quot;>Privacy Policy&lt;/a> for more information.</string>
     <string name="i_already_have_an_account">I already have an account</string>
     <string name="add_existing_account">Add existing account</string>
     <string name="register_new_account">Register new account</string>