diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 502bd585f0..466ac811ae 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3629,6 +3629,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             settings.setDefaultFontSize(Math.round(textSize));
             settings.setDefaultFixedFontSize(Math.round(textSize));
             settings.setLoadsImagesAutomatically(show_images || inline);
+            settings.setBlockNetworkLoads(!show_images);
             settings.setBlockNetworkImage(!show_images);
             settings.setBuiltInZoomControls(true);
             settings.setDisplayZoomControls(false);
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 81a0368126..319afc60ba 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -337,16 +337,8 @@ public class HtmlHelper {
             Log.i("Image show=" + show + " inline=" + inline +
                     " embedded=" + embedded + " data=" + data + " source=" + source);
 
-        if (!(show || (inline && (embedded || data)))) {
-            // Show placeholder icon
-            int resid = (embedded || data ? R.drawable.baseline_photo_library_24 : R.drawable.baseline_image_24);
-            Drawable d = res.getDrawable(resid, theme);
-            d.setBounds(0, 0, px, px);
-            return d;
-        }
-
         // Embedded images
-        if (embedded) {
+        if (embedded && (show || inline)) {
             DB db = DB.getInstance(context);
             String cid = "<" + source.substring(4) + ">";
             EntityAttachment attachment = db.attachment().getAttachment(id, cid);
@@ -377,7 +369,7 @@ public class HtmlHelper {
         }
 
         // Data URI
-        if (data)
+        if (data && (show || inline))
             try {
                 return getDataDrawable(res, source);
             } catch (IllegalArgumentException ex) {
@@ -387,6 +379,14 @@ public class HtmlHelper {
                 return d;
             }
 
+        if (!show) {
+            // Show placeholder icon
+            int resid = (embedded || data ? R.drawable.baseline_photo_library_24 : R.drawable.baseline_image_24);
+            Drawable d = res.getDrawable(resid, theme);
+            d.setBounds(0, 0, px, px);
+            return d;
+        }
+
         // Get cache file name
         File dir = new File(context.getCacheDir(), "images");
         if (!dir.exists())