diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 69d3cc4ff5..2a190552ab 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -388,7 +388,9 @@ public class FragmentBase extends Fragment {
                         return;
                     }
 
-                if (ex instanceof IllegalArgumentException || ex instanceof FileNotFoundException)
+                if (ex instanceof IllegalArgumentException ||
+                        ex instanceof FileNotFoundException ||
+                        ex instanceof SecurityException)
                     ToastEx.makeText(getContext(), ex.getMessage(), Toast.LENGTH_LONG).show();
                 else
                     Log.unexpectedError(getParentFragmentManager(), ex);
@@ -407,6 +409,11 @@ public class FragmentBase extends Fragment {
                 long id = args.getLong("id");
                 Uri uri = args.getParcelable("uri");
 
+                if (!"content".equals(uri.getScheme())) {
+                    Log.w("Save attachment uri=" + uri);
+                    throw new IllegalArgumentException(context.getString(R.string.title_no_stream));
+                }
+
                 DB db = DB.getInstance(context);
                 DocumentFile tree = DocumentFile.fromTreeUri(context, uri);
                 List<EntityAttachment> attachments = db.attachment().getAttachments(id);
@@ -470,7 +477,9 @@ public class FragmentBase extends Fragment {
                         return;
                     }
 
-                if (ex instanceof FileNotFoundException)
+                if (ex instanceof IllegalArgumentException ||
+                        ex instanceof FileNotFoundException ||
+                        ex instanceof SecurityException)
                     ToastEx.makeText(getContext(), ex.getMessage(), Toast.LENGTH_LONG).show();
                 else
                     Log.unexpectedError(getParentFragmentManager(), ex);