diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 2624494ff0..e3b670699c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1534,6 +1534,8 @@ public class FragmentCompose extends FragmentBase {
                 ibExpanderAttachments.setTag(hide_attachments);
                 ibExpanderAttachments.setImageLevel(hide_attachments ? 1 /* more */ : 0 /* less */);
                 ownerAttachment.restart();
+                if (!hide_attachments)
+                    prefs.edit().remove("compose_hide_attachments").apply();
             }
         });
         ibExpanderAttachments.setOnLongClickListener(new View.OnLongClickListener() {