diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cfb9881e3..7a6d5b2e1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -69,7 +69,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:mimeType="*/*" /> <!-- needed for android 5 -->
+                <data android:mimeType="*/*" /> <!-- needed for aosp-derived ROMs? -->
 
                 <data android:host="*" />
                 <data android:scheme="file" />
@@ -87,16 +87,51 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
 
+                <data android:pathPattern=".*\\.pbw" />
+                <data android:pathPattern=".*\\..*\\.pbw" />
+                <data android:pathPattern=".*\\..*\\..*\\.pbw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.pbw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pbw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbw" />
+
+                <data android:pathPattern=".*\\.pbz" />
+                <data android:pathPattern=".*\\..*\\.pbz" />
+                <data android:pathPattern=".*\\..*\\..*\\.pbz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.pbz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.pbz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.pbz" />
+
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
 
+                <!-- no mimeType filter, needed for CM-derived ROMs? -->
+
                 <data android:host="*" />
                 <data android:scheme="file" />
 
                 <!-- as seen on openkeychain repo: https://github.com/open-keychain/open-keychain/blob/master/OpenKeychain/src/main/AndroidManifest.xml -->
 
+                <data android:pathPattern=".*\\.fw" />
+                <data android:pathPattern=".*\\..*\\.fw" />
+                <data android:pathPattern=".*\\..*\\..*\\.fw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.fw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.fw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.fw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fw" />
+
                 <data android:pathPattern=".*\\.pbw" />
                 <data android:pathPattern=".*\\..*\\.pbw" />
                 <data android:pathPattern=".*\\..*\\..*\\.pbw" />