diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 6bc61460a..6c3aabeef 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         Association of file types to Keychain
         =====================================
         General remarks about file ending conventions:
-        - *.gpg for binary files
+        - *.gpg,*.pgp for binary files
         - *.asc for ascii armored files The actual content can be anything.
         
         The file ending only shows if it is binary or ascii encoded.
@@ -148,8 +148,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
 
-            <!-- Keychain's own Actions -->
-            <!-- ENCRYPT with data Uri -->
+            <!-- ENCRYPT_DATA with data Uri -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_DATA" />
 
@@ -181,8 +180,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
 
-            <!-- Keychain's own Actions -->
-            <!-- ENCRYPT with text as extra -->
+            <!-- ENCRYPT_TEXT with text as extra -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_TEXT" />
 
@@ -208,8 +206,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
 
-            <!-- Keychain's own Actions -->
-            <!-- DECRYPT with text as extra -->
+            <!-- DECRYPT_TEXT with text as extra -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_TEXT" />
 
@@ -235,7 +232,7 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.MainActivity" />
 
-            <!-- VIEW with mimeType application/octet-stream, application/pgp and text/pgp  -->
+            <!-- VIEW with mimeTypes  -->
             <intent-filter android:label="@string/intent_send_decrypt">
                 <action android:name="android.intent.action.VIEW" />
 
@@ -255,9 +252,14 @@
                 <!-- non-standard MIME types found in the wild -->
                 <data android:mimeType="application/pgp" />
                 <data android:mimeType="text/pgp" />
+
+                <!--
+                  This links to attached asc files in AOSP mail. It is deactivated because of
+                  https://github.com/open-keychain/open-keychain/issues/290
+                -->
+                <!--<data android:mimeType="text/plain" />-->
             </intent-filter>
-            <!-- Keychain's own Actions -->
-            <!-- DECRYPT with data Uri -->
+            <!-- DECRYPT_DATA with data Uri -->
             <intent-filter>
                 <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_DATA" />
 
@@ -290,7 +292,7 @@
                 <data android:scheme="file" />
                 <data android:scheme="content" />
 
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
+                <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data -->
                 <data android:pathPattern=".*\\.asc" />
                 <data android:pathPattern=".*\\..*\\.asc" />
                 <data android:pathPattern=".*\\..*\\..*\\.asc" />
@@ -352,7 +354,7 @@
 
                 <data android:mimeType="*/*" />
 
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
+                <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data -->
                 <data android:pathPattern=".*\\.asc" />
                 <data android:pathPattern=".*\\..*\\.asc" />
                 <data android:pathPattern=".*\\..*\\..*\\.asc" />
@@ -516,7 +518,7 @@
                 <data android:scheme="file" />
                 <data android:scheme="content" />
 
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
+                <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data -->
                 <data android:pathPattern=".*\\.asc" />
                 <data android:pathPattern=".*\\..*\\.asc" />
                 <data android:pathPattern=".*\\..*\\..*\\.asc" />
@@ -578,7 +580,7 @@
 
                 <data android:mimeType="*/*" />
 
-                <!-- GnuPG ASCII data, mostly keys, but sometimes signatures and encrypted data -->
+                <!-- ASCII data, mostly keys, but sometimes signatures and encrypted data -->
                 <data android:pathPattern=".*\\.asc" />
                 <data android:pathPattern=".*\\..*\\.asc" />
                 <data android:pathPattern=".*\\..*\\..*\\.asc" />
@@ -641,7 +643,6 @@
                 <data android:pathPattern="/pks/lookup.*"/>
             </intent-filter>
 
-            <!-- Keychain's own Actions -->
             <!-- IMPORT_KEY with files TODO: does this work? -->
             <intent-filter android:label="@string/intent_import_key">
                 <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" />