diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index fa3875f04..d792c4dcc 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -1975,6 +1975,16 @@ public class MessageCompose extends K9Activity implements OnClickListener,
                 }
                 return;
             }
+
+            if (mPgpData.hasEncryptionKeys() || mPgpData.hasSignatureKey()) {
+                if (mPgpData.getEncryptedData() == null) {
+                    String text = buildText(false).getText();
+                    mPreventDraftSaving = true;
+                    crypto.encrypt(this, text, mPgpData);
+                    return;
+                }
+            }
+
         }
         sendMessage();