diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index a07325a39..f1bfbd9b0 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -240,8 +240,17 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 -->
+                <!-- preferred MIME type for encrypted data (non-standard right now) -->
+                <data android:mimeType="application/pgp-message" />
+
+                <!--
+                  MIME type as defined in http://tools.ietf.org/html/rfc3156, but too generic
+                  NOTE: application/pgp-encrypted is not registered here, because it does not contain the actual data
+                        application/pgp-signature is not registered here, it only contains a detached signature, which is useless without the message
+                -->
                 <data android:mimeType="application/octet-stream" />
+
+                <!-- non-standard MIME types found in the wild -->
                 <data android:mimeType="application/pgp" />
                 <data android:mimeType="text/pgp" />
             </intent-filter>
@@ -460,10 +469,13 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 -->
+                <!-- preferred MIME type as defined in http://tools.ietf.org/html/rfc3156 -->
                 <data android:mimeType="application/pgp-keys" />
-                <!-- also link to text/plain, AOSP mail and K-9 mail only give mimeType text/plain
-                when the key file has been manually attached -->
+
+                <!--
+                  also link to text/plain, AOSP mail and K-9 mail only give mimeType text/plain
+                  when the key file has been manually attached
+                -->
                 <data android:mimeType="text/plain" />
             </intent-filter>
             <!-- NFC: Handle NFC tags detected from outside our application -->
@@ -471,7 +483,7 @@
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
 
                 <category android:name="android.intent.category.DEFAULT" />
-                <!-- mime type as defined in http://tools.ietf.org/html/rfc3156 -->
+                <!-- MIME type as defined in http://tools.ietf.org/html/rfc3156 -->
                 <data android:mimeType="application/pgp-keys" />
             </intent-filter>
             <!-- VIEW with file endings: *.gpg (e.g. to import from OI File Manager) -->
@@ -607,7 +619,7 @@
                 <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" />
 
                 <category android:name="android.intent.category.DEFAULT" />
-                <!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 -->
+                <!-- MIME type as defined in http://tools.ietf.org/html/rfc3156, section 7 -->
                 <data android:mimeType="application/pgp-keys" />
             </intent-filter>
             <!-- IMPORT_KEY without mimeType to allow import with extras Bundle -->