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 7ec33874f..c48ccc500 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
@@ -135,7 +135,7 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
                     || contentType != null
                         && !contentType.startsWith("multipart/")
                         && !contentType.startsWith("text/")
-                        && !contentType.startsWith("application/")) {
+                        && !"application/octet-stream".equals(contentType)) {
                 skipMimeParsing = true;
             }
         }