diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 15fbe68321..8fe02c1315 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,11 +38,15 @@
         android:required="false" />
 
     <!-- Android 11: https://developer.android.com/preview/privacy/package-visibility -->
-    <!--queries>
-        <intent>
-            <action android:name="org.openintents.openpgp.IOpenPgpService2" />
-        </intent>
-    </queries-->
+    <queries>
+        <!--intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="*/*" />
+        </intent-->
+
+        <package android:name="org.sufficientlysecure.keychain" />
+        <package android:name="org.sufficientlysecure.keychain.debug" />
+    </queries>
 
     <application
         android:name=".ApplicationEx"
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index afb7d4dd4e..682c159133 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -353,7 +353,8 @@ public class Helper {
         PackageManager pm = context.getPackageManager();
         Intent view = new Intent(Intent.ACTION_VIEW, uri);
 
-        for (ResolveInfo info : pm.queryIntentActivities(view, 0)) {
+        List<ResolveInfo> ris = pm.queryIntentActivities(view, 0);
+        for (ResolveInfo info : ris) {
             Intent intent = new Intent();
             intent.setAction(ACTION_CUSTOM_TABS_CONNECTION);
             intent.setPackage(info.activityInfo.packageName);