diff --git a/app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java b/app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
index 61c963836b3cc8cb7df10f5ee1b051aa9f13d21b..dc2b2a9f330da14ffbee525953d0e8b66e7d58b1 100644
--- a/app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
+++ b/app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java
@@ -102,16 +102,11 @@ public class PgpMessageBuilder extends MessageBuilder {
             return;
         }
 
-        if (openPgpKeyId == null) {
+        if (openPgpKeyId == null || !cryptoStatus.isProviderStateOk()) {
             queueMessageBuildSuccess(currentProcessedMimeMessage);
             return;
         }
 
-        if (!cryptoStatus.isProviderStateOk()) {
-            queueMessageBuildException(new MessagingException("OpenPGP Provider is not ready!"));
-            return;
-        }
-
         addAutocryptHeaderIfAvailable(openPgpKeyId);
         if (isDraft()) {
             addDraftStateHeader();