diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f89685d3c5..6e27cb43b8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3764,7 +3764,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             properties.setAttachments(message.id, attachments);
 
             boolean hide_attachments = properties.getValue("hide_attachments", message.id, hide_attachments_default);
-            boolean show_inline = properties.getValue("inline", message.id);
+            boolean show_inline = properties.getValue("inline", message.id, prefs.getBoolean("view_show_inline", false));
             boolean svg = prefs.getBoolean("svg", true);
             boolean webp = prefs.getBoolean("webp", true);
 
@@ -4969,6 +4969,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             int id = compoundButton.getId();
             if (id == R.id.cbInline) {
+                if (isChecked)
+                    prefs.edit().putBoolean("view_show_inline", true).apply();
+                else
+                    prefs.edit().remove("view_show_inline").apply();
                 onShowInlineAttachments(message, isChecked);
             }
         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 2a4f4f57dd..b63a585bec 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -352,7 +352,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             "motd",
             "outlook_last_checked", "outlook_checked",
             "send_archive",
-            "compose_hide_attachments"
+            "compose_hide_attachments", "view_show_inline"
     };
 
     @Override