diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b2b17e2cf1..d6f5125052 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -642,8 +642,10 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onExecuted(Bundle args, EntityMessage draft) {
-                if (draft != null)
+                if (draft != null) {
                     showDraft(draft);
+                    onAction(R.id.action_save); // Update inline images
+                }
             }
 
             @Override
@@ -727,6 +729,7 @@ public class FragmentCompose extends FragmentBase {
             protected void onExecuted(Bundle args, EntityMessage draft) {
                 plain_only = true;
                 getActivity().invalidateOptionsMenu();
+                onAction(R.id.action_save); // Update inline images
                 showDraft(draft);
             }