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 b8499f9a8..72558cd44 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1190,9 +1190,9 @@ class Actions
 
 		if ($oConfig->Get('security', 'openpgp', false)) {
 			$aResult[] = Enumerations\Capa::OPEN_PGP;
-		}
-		if (\SnappyMail\PGP\GnuPG::isSupported()) {
-			$aResult[] = Enumerations\Capa::GNUPG;
+			if (\SnappyMail\PGP\GnuPG::isSupported()) {
+				$aResult[] = Enumerations\Capa::GNUPG;
+			}
 		}
 
 		if ($bAdmin || ($oAccount && $oAccount->Domain()->UseSieve())) {