diff --git a/app/src/main/java/eu/faircode/email/ImageHelper.java b/app/src/main/java/eu/faircode/email/ImageHelper.java
index ddf9d7d384..0f9e622acf 100644
--- a/app/src/main/java/eu/faircode/email/ImageHelper.java
+++ b/app/src/main/java/eu/faircode/email/ImageHelper.java
@@ -504,6 +504,15 @@ class ImageHelper {
     }
 
     static Bitmap decodeImage(File file, int scaleToPixels) {
+        try {
+            return decodeImage(file, scaleToPixels);
+        } catch (OutOfMemoryError ex) {
+            Log.e(ex);
+            return null;
+        }
+    }
+
+    private static Bitmap _decodeImage(File file, int scaleToPixels) {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inJustDecodeBounds = true;
         BitmapFactory.decodeFile(file.getAbsolutePath(), options);