diff --git a/src/org/thialfihar/android/apg/DecryptActivity.java b/src/org/thialfihar/android/apg/DecryptActivity.java
index 02ab2f348..e126a4c12 100644
--- a/src/org/thialfihar/android/apg/DecryptActivity.java
+++ b/src/org/thialfihar/android/apg/DecryptActivity.java
@@ -328,7 +328,7 @@ public class DecryptActivity extends BaseActivity {
         updateSource();
 
         if (mSource.getCurrentView().getId() == R.id.sourceMessage &&
-            mMessage.getText().length() > 0) {
+            (mMessage.getText().length() > 0 || mData != null)) {
              mDecryptButton.performClick();
         }
     }
diff --git a/src/org/thialfihar/android/apg/EncryptActivity.java b/src/org/thialfihar/android/apg/EncryptActivity.java
index 48f5c9f54..ac9550788 100644
--- a/src/org/thialfihar/android/apg/EncryptActivity.java
+++ b/src/org/thialfihar/android/apg/EncryptActivity.java
@@ -381,7 +381,7 @@ public class EncryptActivity extends BaseActivity {
         updateButtons();
 
         if (mReturnResult &&
-            mMessage.getText().length() > 0 &&
+            (mMessage.getText().length() > 0 || mData != null) &&
             ((mEncryptionKeyIds != null &&
               mEncryptionKeyIds.length > 0) ||
              getSecretKeyId() != 0)) {