diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index 30186f9945..2e3a4c9f85 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -28,6 +28,7 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
 
 			viewQRCode: '',
 
+			capaGnuPG: SettingsCapa('GnuPG'),
 			capaOpenPGP: SettingsCapa('OpenPGP')
 		});
 
@@ -65,7 +66,8 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
 
 			adminPasswordNew2: reset,
 
-			capaOpenPGP: value => Remote.saveSetting('CapaOpenPGP', value)
+			capaGnuPG: value => Remote.saveSetting('capaGnuPG', value),
+			capaOpenPGP: value => Remote.saveSetting('capaOpenPGP', value)
 		});
 
 		this.adminTOTP(SettingsGet('adminTOTP'));
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index de9ca88871..32ff245c85 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -989,9 +989,9 @@ public function Capa(bool $bAdmin, ?Model\Account $oAccount = null): array
 				Capa::ATTACHMENTS_ACTIONS => (bool) $oConfig->Get('capa', 'attachments_actions', false),
 				Capa::CONTACTS            => (bool) $oConfig->Get('contacts', 'enable', false),
 				Capa::DANGEROUS_ACTIONS   => (bool) $oConfig->Get('capa', 'dangerous_actions', true),
-				Capa::GNUPG               => (bool) $oConfig->Get('security', 'openpgp', false) && \SnappyMail\PGP\GnuPG::isSupported(),
+				Capa::GNUPG               => (bool) $oConfig->Get('security', 'gnupg', true) && \SnappyMail\PGP\GnuPG::isSupported(),
 				Capa::IDENTITIES          => (bool) $oConfig->Get('webmail', 'allow_additional_identities', false),
-				Capa::OPENPGP             => (bool) $oConfig->Get('security', 'openpgp', false),
+				Capa::OPENPGP             => (bool) $oConfig->Get('security', 'openpgp', true),
 				Capa::SIEVE               => false,
 				Capa::THEMES              => (bool) $oConfig->Get('webmail', 'allow_themes', false),
 				Capa::USER_BACKGROUND     => (bool) $oConfig->Get('webmail', 'allow_user_background', false),
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index bfeae54dae..5e56b38812 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -92,7 +92,8 @@ public function DoAdminSettingsUpdate() : array
 		$this->setConfigFromParams($oConfig, 'CapaAttachmentThumbnails', 'interface', 'show_attachment_thumbnail', 'bool');
 		$this->setConfigFromParams($oConfig, 'CapaThemes', 'webmail', 'allow_themes', 'bool');
 		$this->setConfigFromParams($oConfig, 'CapaUserBackground', 'webmail', 'allow_user_background', 'bool');
-		$this->setConfigFromParams($oConfig, 'CapaOpenPGP', 'security', 'openpgp', 'bool');
+		$this->setConfigFromParams($oConfig, 'capaGnuPG', 'security', 'gnupg', 'bool');
+		$this->setConfigFromParams($oConfig, 'capaOpenPGP', 'security', 'openpgp', 'bool');
 
 		$this->setConfigFromParams($oConfig, 'determineUserLanguage', 'login', 'determine_user_language', 'bool');
 		$this->setConfigFromParams($oConfig, 'determineUserDomain', 'login', 'determine_user_domain', 'bool');
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index ddf8b46a77..5e4a34c9a7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -202,6 +202,7 @@ protected function defaultValues() : array
 				'custom_server_signature' => array('SnappyMail'),
 				'x_xss_protection_header' => array('1; mode=block'),
 
+				'gnupg'                   => array(true),
 				'openpgp'                 => array(true),
 				'auto_verify_signatures'  => array(false),
 
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
index 37a7311e6a..22596d711f 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Zabezpečení",
 		"LABEL_USE_IMAGE_PROXY": "Použít lokální proxy pro externí obrázky",
-		"LABEL_ALLOW_OPENPGP": "Povolit OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Zobrazit PHP informace (php_info)",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Přístupové údaje administrace",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nové heslo",
 		"LABEL_REPEAT_PASSWORD": "Znovu",
 		"LABEL_REQUIRE_VERIFICATION": "Vyžadovat ověření SSL certifikátu",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Povolit self-signed certifikáty"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
index a8646743ac..f594087c0b 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sikkerhed",
 		"LABEL_USE_IMAGE_PROXY": "Brug lokal proxy til eksterne billeder",
-		"LABEL_ALLOW_OPENPGP": "Tillad OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Vis PHP informationer",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Adgangsoplysninger",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Ny adgangskode",
 		"LABEL_REPEAT_PASSWORD": "Gentag",
 		"LABEL_REQUIRE_VERIFICATION": "Kræv verifikation af brugt SSL certifikat",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Tillad selvsignerede certifikater"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
index 1a32dadaec..2c903af43e 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sicherheit",
 		"LABEL_USE_IMAGE_PROXY": "Lokalen Proxy für externe Bilder verwenden",
-		"LABEL_ALLOW_OPENPGP": "OpenPGP.js erlauben",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "PHP-Informationen anzeigen",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Adminpanel-Zugangsdaten",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Neues Passwort",
 		"LABEL_REPEAT_PASSWORD": "Wiederholen",
 		"LABEL_REQUIRE_VERIFICATION": "Verlangen, dass das verwendete SSL-Zertifikat signiert ist",
+		"CRYPTO": "Krypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Selbst-signierte Zertifikate erlauben"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json
index c045ab969b..653d97d60d 100644
--- a/snappymail/v/0.0.0/app/localization/en/admin.json
+++ b/snappymail/v/0.0.0/app/localization/en/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Security",
 		"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
-		"LABEL_ALLOW_OPENPGP": "Allow OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Show PHP information",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "New password",
 		"LABEL_REPEAT_PASSWORD": "Repeat",
 		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Allow self signed certificates"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
index e6a90a3dab..0e71c69f97 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Seguridad",
 		"LABEL_USE_IMAGE_PROXY": "Utilizar un proxy local para mostrar imágenes externas",
-		"LABEL_ALLOW_OPENPGP": "Permitir OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Mostrar información de PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciales de Acceso al panel de control",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nueva contraseña",
 		"LABEL_REPEAT_PASSWORD": "Re-ingresar",
 		"LABEL_REQUIRE_VERIFICATION": "Requerir verificación del certificado SSL",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados auto-firmados"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/eu/admin.json b/snappymail/v/0.0.0/app/localization/eu/admin.json
index 794c49e38b..102fd35ec1 100644
--- a/snappymail/v/0.0.0/app/localization/eu/admin.json
+++ b/snappymail/v/0.0.0/app/localization/eu/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Segurtasuna",
 		"LABEL_USE_IMAGE_PROXY": "Erabili proxy lokala kanpoko irudientzat",
-		"LABEL_ALLOW_OPENPGP": "Baimendu OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Erakutsi PHP informazioa",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panelerako Sarbide Kredentzialak",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Pasahitz berria",
 		"LABEL_REPEAT_PASSWORD": "Errepikatu",
 		"LABEL_REQUIRE_VERIFICATION": "SSL ziurtagiriaren baliozkotzea eskatu",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Onartu norberak sinatutako ziurtagiriak"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
index 2ebe942822..afe872e08c 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "امنیت",
 		"LABEL_USE_IMAGE_PROXY": "از پروکسی محلی برای عکسهای خارج از سرور استفاده شود",
-		"LABEL_ALLOW_OPENPGP": "فعال‌سازی OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "نمایش اطلاعات PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "اعتبار مجوز دسترسی به صفحه مدیریت",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "گذرواژه جدید",
 		"LABEL_REPEAT_PASSWORD": "تکرار",
 		"LABEL_REQUIRE_VERIFICATION": "به بررسی گواهینامه SSL نیاز داشته باشد",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "به گواهی‌نامه‌هایی که توسط خودشان امضاء شده‌اند اجازه بده"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
index c7a27b5477..dfe348b434 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Tietoturva",
 		"LABEL_USE_IMAGE_PROXY": "Käytä paikallista proxya ulkoisille kuville.",
-		"LABEL_ALLOW_OPENPGP": "Salli OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Näytä PHP tiedot",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Hallintapaneeli kirjautumistiedot",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Uusi salasana",
 		"LABEL_REPEAT_PASSWORD": "Toista",
 		"LABEL_REQUIRE_VERIFICATION": "Vaadi SSL sertifikaatin varmistus",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Salli itse-allekirjoitetut sertifikaatit"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
index cc4c4beece..96bb7ef27f 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sécurité",
 		"LABEL_USE_IMAGE_PROXY": "Utiliser un proxy local pour les images externes",
-		"LABEL_ALLOW_OPENPGP": "Autoriser OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Vérifier automatiquement les signatures",
 		"LABEL_SHOW_PHP_INFO": "Voir les informations PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Codes d'accès au panneau d'administration",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nouveau mot de passe",
 		"LABEL_REPEAT_PASSWORD": "Répéter",
 		"LABEL_REQUIRE_VERIFICATION": "S'assurer qu'un certificat SSL est utilisé",
+		"CRYPTO": "Chiffrement",
 		"LABEL_ALLOW_SELF_SIGNED": "Autoriser les certificats auto-signés"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
index 23725f8aa5..1c51ce2c3a 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Biztonság",
 		"LABEL_USE_IMAGE_PROXY": "Helyi proxy használata a külső képekhez",
-		"LABEL_ALLOW_OPENPGP": "OpenPGP.js engedélyezése",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "PHP információ megjelenítése",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin panel hozzáférés hitelesítés",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Új jelszó",
 		"LABEL_REPEAT_PASSWORD": "Újra",
 		"LABEL_REQUIRE_VERIFICATION": "A használt tanúsítvány ellenőrzés megkövetelése",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Saját aláírt tanúsítványok engedélyezése"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
index 059ce635fe..9a7b32d618 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Keamanan",
 		"LABEL_USE_IMAGE_PROXY": "Gunakan proxy lokal untuk gambar dari luar",
-		"LABEL_ALLOW_OPENPGP": "Izinkan OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Tampilkan informasi PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Hak Akses Panel Admin",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Password baru",
 		"LABEL_REPEAT_PASSWORD": "Ulangi",
 		"LABEL_REQUIRE_VERIFICATION": "Diperlukan verifikasi sertifikat SSL dengan",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Izinkan sertifikat yang dibuat sendiri"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
index 6330c43a84..fb82d88027 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sicurezza",
 		"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
-		"LABEL_ALLOW_OPENPGP": "Permetti OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Mostra informazioni PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenziali di Accesso Pannello Admin",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nuova password",
 		"LABEL_REPEAT_PASSWORD": "Ripeti",
 		"LABEL_REQUIRE_VERIFICATION": "Richiesta verifica del certificato SSL utilizzato",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Permetti certificati auto-firmati"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
index 62c35b7764..1d4aa3e8d0 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "セキュリティ",
 		"LABEL_USE_IMAGE_PROXY": "外部イメージにローカルProxyを使う",
-		"LABEL_ALLOW_OPENPGP": "OpenPGP.jsを使う",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "PHP情報を表示",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "管理画面アクセス情報",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "新しいパスワード",
 		"LABEL_REPEAT_PASSWORD": "再入力",
 		"LABEL_REQUIRE_VERIFICATION": "のSSL証明書の検証を有効にする",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "自己署名証明書を使う"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
index f27e4c8223..1dd4ccd2f7 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sauga",
 		"LABEL_USE_IMAGE_PROXY": "naudoti vietinį šliuzą (proxy) išoriniams paveikslėliams",
-		"LABEL_ALLOW_OPENPGP": "Leisti OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Rodyti PHP informaciją",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Valdymo skydo prieigos rekvizitai",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Naujas slaptažodis",
 		"LABEL_REPEAT_PASSWORD": "Pakartokite",
 		"LABEL_REQUIRE_VERIFICATION": "Reikalauti SSL sertifikato",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Leisti pačių sukurtus sertifikatus"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
index 9b60f437da..ed333bac6d 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sikkerhet",
 		"LABEL_USE_IMAGE_PROXY": "Bruk lokal mellomtjener for eksterne bilder",
-		"LABEL_ALLOW_OPENPGP": "Tillat OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Vis PHP-informasjon",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Akkreditiver for admin-panel",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nytt passord",
 		"LABEL_REPEAT_PASSWORD": "Gjenta",
 		"LABEL_REQUIRE_VERIFICATION": "Krev bekreftelse av SSL-sertifikat",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Tillat selvutstedt sertifikat"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
index 6912cf0060..a209e87afc 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
@@ -85,14 +85,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Beveiliging",
 		"LABEL_USE_IMAGE_PROXY": "Gebruik de server als proxy voor externe afbeeldingen",
-		"LABEL_ALLOW_OPENPGP": "OpenPGP.js toestaan",
-		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
+		"LABEL_AUTO_VERIFY": "Ondertekening automatisch verifiëren",
 		"LABEL_SHOW_PHP_INFO": "PHP informatie tonen",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Toegangsgegevens beheer paneel",
 		"LABEL_CURRENT_PASSWORD": "Huidig wachtwoord",
 		"LABEL_NEW_PASSWORD": "Nieuw wachtwoord",
 		"LABEL_REPEAT_PASSWORD": "Herhaal nieuw wachtwoord",
 		"LABEL_REQUIRE_VERIFICATION": "Verificatie van SSL certificaten",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Sta zelf ondertekende certificaten toe"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
index 98b572a32d..7409ea09da 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@@ -279,7 +279,7 @@
 		"ENCRYPT": "Versleutelen",
 		"DECRYPT": "Ontsleutelen",
 		"VERIFY": "Verifiëren",
-		"GOOD_SIGNATURE": "Juiste handtekening van %USER%",
+		"GOOD_SIGNATURE": "Juiste ondertekening van %USER%",
 		"ERROR": "%TYPE% foutmelding: %ERROR%",
 		"CREATE_SELF_SIGNED": "Zelfondertekend certificaat aanmaken",
 		"VALID_UNTIL": "Geldig tot",
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
index f438bee29f..4be2608ac3 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Bezpieczeństwo",
 		"LABEL_USE_IMAGE_PROXY": "Użyj lokalnego serwera proxy dla zewnętrznych obrazów",
-		"LABEL_ALLOW_OPENPGP": "Zezwól na używanie OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Weryfikuj podpisy automatycznie",
 		"LABEL_SHOW_PHP_INFO": "Pokaż informacje o wersji PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Poświadczenia dostępu do panelu administracyjnego",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nowe hasło",
 		"LABEL_REPEAT_PASSWORD": "Powtórz hasło",
 		"LABEL_REQUIRE_VERIFICATION": "Wymagaj weryfikacji używanego certyfikatu SSL",
+		"CRYPTO": "Kryptografia",
 		"LABEL_ALLOW_SELF_SIGNED": "Zezwól na certyfikaty podpisane samodzielnie"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
index 19137bb201..c47bcc6cfa 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Segurança",
 		"LABEL_USE_IMAGE_PROXY": "Usar proxy local para imagens externas",
-		"LABEL_ALLOW_OPENPGP": "Permitir OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Mostar informações PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciais de acesso ao Painel Administrativo",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nova senha",
 		"LABEL_REPEAT_PASSWORD": "Confirmar nova senha",
 		"LABEL_REQUIRE_VERIFICATION": "Exigir verificação do certificado SSL",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados auto-assinados"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
index b33b4873ef..fd9e201829 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Segurança",
 		"LABEL_USE_IMAGE_PROXY": "Usar proxy local para imagens externas",
-		"LABEL_ALLOW_OPENPGP": "Permitir OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Mostrar informação do PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciais de acesso ao Painel de Admin",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nova palavra-passe",
 		"LABEL_REPEAT_PASSWORD": "Repetir",
 		"LABEL_REQUIRE_VERIFICATION": "Exigir a verificação dos certificados SSL",
+		"CRYPTO": "Criptografia",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados autoassinados"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
index b33b4873ef..fd9e201829 100644
--- a/snappymail/v/0.0.0/app/localization/pt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Segurança",
 		"LABEL_USE_IMAGE_PROXY": "Usar proxy local para imagens externas",
-		"LABEL_ALLOW_OPENPGP": "Permitir OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Mostrar informação do PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciais de acesso ao Painel de Admin",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nova palavra-passe",
 		"LABEL_REPEAT_PASSWORD": "Repetir",
 		"LABEL_REQUIRE_VERIFICATION": "Exigir a verificação dos certificados SSL",
+		"CRYPTO": "Criptografia",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados autoassinados"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
index a2782e8631..a9e9a83a5c 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Безопасность",
 		"LABEL_USE_IMAGE_PROXY": "Использовать локальный прокси для внешних изображений",
-		"LABEL_ALLOW_OPENPGP": "Разрешить OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Показать PHP информацию",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Учетные данные для доступа к панели администратора",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Новый пароль",
 		"LABEL_REPEAT_PASSWORD": "Повторить пароль",
 		"LABEL_REQUIRE_VERIFICATION": "Требовать проверку SSL сертификата для",
+		"CRYPTO": "Шифрование",
 		"LABEL_ALLOW_SELF_SIGNED": "Разрешить самоподписанные сертификаты"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
index 41fbcb4078..50be714a80 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Bezpečnosť",
 		"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
-		"LABEL_ALLOW_OPENPGP": "Povoliť OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Zobraziť informácie o PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nové heslo",
 		"LABEL_REPEAT_PASSWORD": "Opakovať",
 		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Allow self signed certificates"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
index 4f0f7e6580..3ba99e933d 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Varnost",
 		"LABEL_USE_IMAGE_PROXY": "Uporabni lokalni posredniški strežnik za zunanje slike",
-		"LABEL_ALLOW_OPENPGP": "Dovoli OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Prikaz PHP informacij",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Prijavni podatki za administracijsko ploščo",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Novo geslo",
 		"LABEL_REPEAT_PASSWORD": "Ponovno",
 		"LABEL_REQUIRE_VERIFICATION": "Obvezno overjanje uporabljenega SSL certifikata",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Dovoli samopodpisane certifikate"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
index 19fcf18f1a..af27b057af 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Säkerhet",
 		"LABEL_USE_IMAGE_PROXY": "Använd lokal proxy för externa bilder",
-		"LABEL_ALLOW_OPENPGP": "Tillåt OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Visa PHP-information",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Administrativsuppgifter",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Nytt lösenord",
 		"LABEL_REPEAT_PASSWORD": "Upprepa",
 		"LABEL_REQUIRE_VERIFICATION": "Kräver verifiering av SSL-certifikat som används",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Låt självsignerade certifikat"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
index 3b1e3bbf2e..a0d522084f 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "An ninh",
 		"LABEL_USE_IMAGE_PROXY": "Sử dụng proxy tại máy chủ cho những hình ảnh tải ngoài về",
-		"LABEL_ALLOW_OPENPGP": "Cho phép OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Hiển thị thông tin PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Thông tin truy cập bảng quản trị",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "Mật khẩu mới",
 		"LABEL_REPEAT_PASSWORD": "Lập lại mật khẩu",
 		"LABEL_REQUIRE_VERIFICATION": "Yêu cầu xác minh chứng chỉ SSL được dùng",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Cho phép chứng chỉ tự ký"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
index 6233f27743..ae35c5bce1 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
@@ -85,7 +85,6 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "安全",
 		"LABEL_USE_IMAGE_PROXY": "对外部图片使用本地代理",
-		"LABEL_ALLOW_OPENPGP": "允许使用 OpenPGP.js",
 		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "显示 PHP 信息",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "管理员面板访问凭据",
@@ -93,6 +92,7 @@
 		"LABEL_NEW_PASSWORD": "新密码",
 		"LABEL_REPEAT_PASSWORD": "重复输入新密码",
 		"LABEL_REQUIRE_VERIFICATION": "要求验证 SSL 证书",
+		"CRYPTO": "加密",
 		"LABEL_ALLOW_SELF_SIGNED": "允许自签名证书"
 	},
 	"TAB_PACKAGES": {
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index 5ae1f3effd..1b7fa65e32 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -1,18 +1,30 @@
 <div class="legend" data-i18n="TAB_SECURITY/LEGEND_SECURITY"></div>
+<div class="form-horizontal">
+	<div class="control-group">
+		<div data-bind="component: {
+			name: 'Checkbox',
+			params: {
+				label: 'TAB_SECURITY/LABEL_USE_IMAGE_PROXY',
+				value: useLocalProxyForExternalImages
+			}
+		}"></div>
+	</div>
+</div>
+<div class="legend" data-i18n="TAB_SECURITY/CRYPTO"></div>
 <div class="form-horizontal">
 	<div class="control-group">
 		<div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'TAB_SECURITY/LABEL_USE_IMAGE_PROXY',
-					value: useLocalProxyForExternalImages
+					label: 'GnuPG',
+					value: capaGnuPG
 				}
 			}"></div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'TAB_SECURITY/LABEL_ALLOW_OPENPGP',
+					label: 'OpenPGP.js',
 					value: capaOpenPGP
 				}
 			}"></div>