diff --git a/src/keepass2android/Properties/AndroidManifest_debug.xml b/src/keepass2android/Properties/AndroidManifest_debug.xml
index cd3e295d..43c28557 100644
--- a/src/keepass2android/Properties/AndroidManifest_debug.xml
+++ b/src/keepass2android/Properties/AndroidManifest_debug.xml
@@ -80,34 +80,112 @@
 			  </intent-filter>
 			  
 			  
-			<intent-filter android:label="@string/app_name">
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:scheme="file" />
-				<data android:mimeType="*/*" />
-				<data android:host="*" />
-				<data android:pathPattern=".*\\.kdbp" />
-				<data android:pathPattern=".*\\..*\\.kdbp" />
-				<data android:pathPattern=".*\\..*\\..*\\.kdbp" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\.kdbp" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbp" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
-				<data android:pathPattern=".*\\.kdbx" />
-				<data android:pathPattern=".*\\..*\\.kdbx" />
-				<data android:pathPattern=".*\\..*\\..*\\.kdbx" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\.kdbx" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbx" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
-				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
-			</intent-filter>
+<!-- intent filter for opening database files 
+Note that this stopped working nicely with Android 7, see e.g. https://stackoverflow.com/a/26635162/292233
+KP2A was using 
+<data android:scheme="content" />
+<data android:mimeType="*/*" />
+previously, but that leaded to complaints by users saying KP2A is showing up way too often, even when opening contacts and the like.
+
+This is why this was reduced  content with mimeType=application/octet-stream or content with pathPattern .
+
+The scheme=file is still there for old OS devices. It's also queried by apps like Dropbox to find apps for a certain file type.
+        
+-->
+
+
+<!-- This intent filter is for apps which use content with a URI containing the extension but no specific mimeType, e.g. ASTRO file manager -->
+
+      <intent-filter android:label="@string/app_name">
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="content" />
+        <data android:mimeType="*/*" />
+        <data android:host="*" />
+        <data android:pathPattern=".*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+      </intent-filter>
+
+      <!-- This intent filter is for apps which use content with a URI not containing the extension but at least specify mimeType=application/octet-stream, e.g. GoogleDrive or FolderSync -->
+<intent-filter android:label="@string/app_name">
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="content" />
+        <data android:mimeType="application/octet-stream" />
+        <data android:host="*" />
+      </intent-filter>
+
+
+      <!-- This intent filter is for old OS versions (Android 6 and below) or for apps explicitly querying intents for a certain file:-URI -->
+      <intent-filter android:label="@string/app_name">
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="file" />
+        <data android:mimeType="*/*" />
+        <data android:host="*" />
+        <data android:pathPattern=".*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+      </intent-filter>
+
 
 			<intent-filter android:label="@string/kp2a_findUrl">
 				<action android:name="android.intent.action.SEND" />
diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index 525637ca..052bbfb3 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -85,7 +85,6 @@
         <action android:name="kp2a.action.SelectCurrentDbActivity" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
-	  
 
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.SEND" />
@@ -95,12 +94,27 @@
 
         <data android:mimeType="application/*" />
       </intent-filter>
+	  
+<!-- intent filter for opening database files 
+Note that this stopped working nicely with Android 7, see e.g. https://stackoverflow.com/a/26635162/292233
+KP2A was using 
+<data android:scheme="content" />
+<data android:mimeType="*/*" />
+previously, but that leaded to complaints by users saying KP2A is showing up way too often, even when opening contacts and the like.
+
+This is why this was reduced  content with mimeType=application/octet-stream or content with pathPattern .
+
+The scheme=file is still there for old OS devices. It's also queried by apps like Dropbox to find apps for a certain file type.
+        
+-->
+
+
+<!-- This intent filter is for apps which use content with a URI containing the extension but no specific mimeType, e.g. ASTRO file manager -->
 
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="file" />
         <data android:scheme="content" />
         <data android:mimeType="*/*" />
         <data android:host="*" />
@@ -135,7 +149,59 @@
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
       </intent-filter>
-	  			<intent-filter android:label="@string/kp2a_findUrl">
+
+      <!-- This intent filter is for apps which use content with a URI not containing the extension but at least specify mimeType=application/octet-stream, e.g. GoogleDrive or FolderSync -->
+<intent-filter android:label="@string/app_name">
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="content" />
+        <data android:mimeType="application/octet-stream" />
+        <data android:host="*" />
+      </intent-filter>
+
+
+      <!-- This intent filter is for old OS versions (Android 6 and below) or for apps explicitly querying intents for a certain file:-URI -->
+      <intent-filter android:label="@string/app_name">
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="file" />
+        <data android:mimeType="*/*" />
+        <data android:host="*" />
+        <data android:pathPattern=".*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+      </intent-filter>
+
+      <intent-filter android:label="@string/kp2a_findUrl">
 				<action android:name="android.intent.action.SEND" />
 				<category android:name="android.intent.category.DEFAULT" />
 				<data android:mimeType="text/plain" />
diff --git a/src/keepass2android/Properties/AndroidManifest_nonet.xml b/src/keepass2android/Properties/AndroidManifest_nonet.xml
index f9c8cfaf..14045c61 100644
--- a/src/keepass2android/Properties/AndroidManifest_nonet.xml
+++ b/src/keepass2android/Properties/AndroidManifest_nonet.xml
@@ -69,11 +69,26 @@
         <data android:mimeType="application/*" />
       </intent-filter>
 
+<!-- intent filter for opening database files 
+Note that this stopped working nicely with Android 7, see e.g. https://stackoverflow.com/a/26635162/292233
+KP2A was using 
+<data android:scheme="content" />
+<data android:mimeType="*/*" />
+previously, but that leaded to complaints by users saying KP2A is showing up way too often, even when opening contacts and the like.
+
+This is why this was reduced  content with mimeType=application/octet-stream or content with pathPattern .
+
+The scheme=file is still there for old OS devices. It's also queried by apps like Dropbox to find apps for a certain file type.
+        
+-->
+
+
+<!-- This intent filter is for apps which use content with a URI containing the extension but no specific mimeType, e.g. ASTRO file manager -->
+
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="file" />
         <data android:scheme="content" />
         <data android:mimeType="*/*" />
         <data android:host="*" />
@@ -108,6 +123,58 @@
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
       </intent-filter>
+
+      <!-- This intent filter is for apps which use content with a URI not containing the extension but at least specify mimeType=application/octet-stream, e.g. GoogleDrive or FolderSync -->
+<intent-filter android:label="@string/app_name">
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="content" />
+        <data android:mimeType="application/octet-stream" />
+        <data android:host="*" />
+      </intent-filter>
+
+
+      <!-- This intent filter is for old OS versions (Android 6 and below) or for apps explicitly querying intents for a certain file:-URI -->
+      <intent-filter android:label="@string/app_name">
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="file" />
+        <data android:mimeType="*/*" />
+        <data android:host="*" />
+        <data android:pathPattern=".*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbp" />
+        <data android:pathPattern=".*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdbx" />
+        <data android:pathPattern=".*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
+      </intent-filter>
+
       <intent-filter>
         <action android:name="android.intent.action.VIEW"/>
         <category android:name="android.intent.category.BROWSABLE"/>