1 files changed, 11 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
index a09cf4f27..bb8d6ad73 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
@@ -110,10 +110,9 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
             if (decryptResult.isPending()) {
                 return new InputDataResult(log, decryptResult);
             }
-            log.addByMerge(decryptResult, 2);
+            log.addByMerge(decryptResult, 1);
 
-            if (!decryptResult.success()) {
-                log.add(LogType.MSG_DATA_ERROR_OPENPGP, 1);
+            if ( ! decryptResult.success()) {
                 return new InputDataResult(InputDataResult.RESULT_ERROR, log);
             }
 
@@ -165,6 +164,7 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
         parser.setContentDecoding(true);
         parser.setRecurse();
         parser.setContentHandler(new AbstractContentHandler() {
+            private boolean mFoundHeaderWithFields = false;
             private Uri uncheckedSignedDataUri;
             String mFilename;
 
@@ -221,11 +221,19 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
             }
 
             @Override
+            public void endHeader() throws MimeException {
+                if ( ! mFoundHeaderWithFields) {
+                    parser.stop();
+                }
+            }
+
+            @Override
             public void field(Field field) throws MimeException {
                 field = DefaultFieldParser.getParser().parse(field, DecodeMonitor.SILENT);
                 if (field instanceof ContentDispositionField) {
                     mFilename = ((ContentDispositionField) field).getFilename();
                 }
+                mFoundHeaderWithFields = true;
             }
 
             private void bodySignature(BodyDescriptor bd, InputStream is) throws MimeException, IOException {