diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ce665ffb8c..8a83f6052a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -60,6 +60,8 @@ import android.view.TouchDelegate;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -190,6 +192,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvNoInternetHeaders;
 
         private RecyclerView rvAttachment;
+        private CheckBox cbInline;
         private Button btnDownloadAttachments;
         private Button btnSaveAttachments;
         private TextView tvNoInternetAttachments;
@@ -266,6 +269,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             adapterAttachment = new AdapterAttachment(context, owner, true);
             rvAttachment.setAdapter(adapterAttachment);
 
+            cbInline = itemView.findViewById(R.id.cbInline);
             btnDownloadAttachments = itemView.findViewById(R.id.btnDownloadAttachments);
             btnSaveAttachments = itemView.findViewById(R.id.btnSaveAttachments);
             tvNoInternetAttachments = itemView.findViewById(R.id.tvNoInternetAttachments);
@@ -388,6 +392,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             pbHeaders.setVisibility(View.GONE);
             tvNoInternetHeaders.setVisibility(View.GONE);
 
+            cbInline.setVisibility(View.GONE);
             btnDownloadAttachments.setVisibility(View.GONE);
             btnSaveAttachments.setVisibility(View.GONE);
             tvNoInternetAttachments.setVisibility(View.GONE);
@@ -548,6 +553,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivBrowsed.setVisibility(message.ui_browsed ? View.VISIBLE : View.GONE);
             ivAnswered.setVisibility(message.ui_answered ? View.VISIBLE : View.GONE);
             ivAttachments.setVisibility(message.attachments > 0 ? View.VISIBLE : View.GONE);
+            cbInline.setVisibility(View.GONE);
             btnDownloadAttachments.setVisibility(View.GONE);
             btnSaveAttachments.setVisibility(View.GONE);
             tvNoInternetAttachments.setVisibility(View.GONE);
@@ -705,24 +711,44 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             attachments = new ArrayList<>();
                         idAttachments.put(message.id, attachments);
 
-                        adapterAttachment.set(attachments);
+                        boolean show_inline = properties.getValue("inline", message.id);
+                        Log.i("Show inline=" + show_inline);
 
+                        boolean inline = false;
                         boolean download = false;
                         boolean save = (attachments.size() > 1);
                         boolean downloading = false;
+                        List<EntityAttachment> a = new ArrayList<>();
                         for (EntityAttachment attachment : attachments) {
+                            if (attachment.isInline())
+                                inline = true;
                             if (attachment.progress == null && !attachment.available)
                                 download = true;
                             if (!attachment.available)
                                 save = false;
                             if (attachment.progress != null)
                                 downloading = true;
+                            if (show_inline || !attachment.isInline())
+                                a.add(attachment);
                         }
+                        adapterAttachment.set(a);
 
+                        cbInline.setOnCheckedChangeListener(null);
+                        cbInline.setChecked(show_inline);
+                        cbInline.setVisibility(inline ? View.VISIBLE : View.GONE);
                         btnDownloadAttachments.setVisibility(download && internet ? View.VISIBLE : View.GONE);
                         btnSaveAttachments.setVisibility(save ? View.VISIBLE : View.GONE);
                         tvNoInternetAttachments.setVisibility(downloading && !internet ? View.VISIBLE : View.GONE);
 
+                        cbInline.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                            @Override
+                            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                                properties.setValue("inline", message.id, isChecked);
+                                liveAttachments.removeObserver(observerAttachments);
+                                liveAttachments.observe(owner, observerAttachments);
+                            }
+                        });
+
                         List<EntityAttachment> images = new ArrayList<>();
                         for (EntityAttachment attachment : attachments)
                             if (attachment.type.startsWith("image/") && !attachment.isInline())
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 3f72f1f7a4..925d76dfbc 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -597,6 +597,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
 
+        <CheckBox
+            android:id="@+id/cbInline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/title_show_inline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rvAttachment" />
+
         <Button
             android:id="@+id/btnDownloadAttachments"
             style="?android:attr/buttonStyleSmall"
@@ -606,7 +615,7 @@
             android:minHeight="0dp"
             android:text="@string/title_download_all"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+            app:layout_constraintTop_toBottomOf="@id/cbInline" />
 
         <Button
             android:id="@+id/btnSaveAttachments"
@@ -617,7 +626,7 @@
             android:minHeight="0dp"
             android:text="@string/title_save_all"
             app:layout_constraintEnd_toEndOf="@id/rvAttachment"
-            app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+            app:layout_constraintTop_toBottomOf="@id/cbInline" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/barrier_internet"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 0d64f97d9b..9e43757237 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -589,6 +589,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
 
+        <CheckBox
+            android:id="@+id/cbInline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/title_show_inline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rvAttachment" />
+
         <Button
             android:id="@+id/btnDownloadAttachments"
             style="?android:attr/buttonStyleSmall"
@@ -598,7 +607,7 @@
             android:minHeight="0dp"
             android:text="@string/title_download_all"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+            app:layout_constraintTop_toBottomOf="@id/cbInline" />
 
         <Button
             android:id="@+id/btnSaveAttachments"
@@ -609,7 +618,7 @@
             android:minHeight="0dp"
             android:text="@string/title_save_all"
             app:layout_constraintEnd_toEndOf="@id/rvAttachment"
-            app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
+            app:layout_constraintTop_toBottomOf="@id/cbInline" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/barrier_internet"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 334163f5cd..85ec736799 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -280,6 +280,7 @@
     <string name="title_raw_save">Save raw message</string>
     <string name="title_manage_keywords">Manage keywords</string>
     <string name="title_add_keyword">Add keyword</string>
+    <string name="title_show_inline">Show inline attachments</string>
     <string name="title_download_all">Download all</string>
     <string name="title_save_all">Save all</string>
     <string name="title_show_html">Show original</string>