diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index b714cf0a63..08f494739e 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -1253,10 +1253,9 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
     }
 
     private void onImportCertificate(Intent intent) {
-        Intent open = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        Intent open = new Intent(Intent.ACTION_GET_CONTENT);
         open.addCategory(Intent.CATEGORY_OPENABLE);
         open.setType("*/*");
-        Helper.openAdvanced(open);
         if (open.resolveActivity(getPackageManager()) == null)
             ToastEx.makeText(this, R.string.title_no_saf, Toast.LENGTH_LONG).show();
         else
@@ -1286,10 +1285,9 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
     }
 
     private static Intent getIntentImport() {
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
         intent.addCategory(Intent.CATEGORY_OPENABLE);
         intent.setType("*/*");
-        Helper.openAdvanced(intent);
         return intent;
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b6c69d8232..665c0fabba 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1378,10 +1378,9 @@ public class FragmentCompose extends FragmentBase {
     }
 
     private void onActionImage() {
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
         intent.addCategory(Intent.CATEGORY_OPENABLE);
         intent.setType("image/*");
-        Helper.openAdvanced(intent);
         PackageManager pm = getContext().getPackageManager();
         if (intent.resolveActivity(pm) == null)
             noStorageAccessFramework();
@@ -1390,11 +1389,10 @@ public class FragmentCompose extends FragmentBase {
     }
 
     private void onActionAttachment() {
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
         intent.addCategory(Intent.CATEGORY_OPENABLE);
         intent.setType("*/*");
         intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
-        Helper.openAdvanced(intent);
         PackageManager pm = getContext().getPackageManager();
         if (intent.resolveActivity(pm) == null)
             noStorageAccessFramework();