diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index db41e069ec..0a76b3d572 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3907,6 +3907,13 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onExecuted(Bundle args, final Spanned body) {
+                // Show attachments
+                boolean hide_attachments = Boolean.TRUE.equals(ibExpanderAttachments.getTag());
+                if (hide_attachments) {
+                    ibExpanderAttachments.setTag(null);
+                    ownerAttachment.restart();
+                }
+
                 // Update text
                 if (body != null)
                     etBody.setText(body);
@@ -3957,6 +3964,13 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onExecuted(Bundle args, ArrayList<UriType> images) {
+                // Show attachments
+                boolean hide_attachments = Boolean.TRUE.equals(ibExpanderAttachments.getTag());
+                if (hide_attachments) {
+                    ibExpanderAttachments.setTag(null);
+                    ownerAttachment.restart();
+                }
+
                 if (images.size() == 0)
                     return;