diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 55dcf542ad..a2dd9cb024 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -5386,6 +5386,7 @@ public class FragmentCompose extends FragmentBase {
             boolean suggest_sent = prefs.getBoolean("suggest_sent", true);
             boolean suggest_received = prefs.getBoolean("suggest_received", false);
             boolean forward_new = prefs.getBoolean("forward_new", true);
+            boolean markdown = prefs.getBoolean("markdown", false);
 
             Log.i("Load draft action=" + action + " id=" + id + " reference=" + reference);
 
@@ -5615,10 +5616,6 @@ public class FragmentCompose extends FragmentBase {
                             }
                         }
 
-                        boolean markdown = prefs.getBoolean("markdown", false);
-                        if (markdown)
-                            document.body().attr("markdown", Boolean.toString(markdown));
-
                         data.draft.signature = prefs.getBoolean("signature_new", true);
                         addSignature(context, document, data.draft, selected);
                     } else {
@@ -6006,6 +6003,9 @@ public class FragmentCompose extends FragmentBase {
                         }
                     }
 
+                    if (markdown)
+                        document.body().attr("markdown", Boolean.toString(markdown));
+
                     EntityFolder drafts = db.folder().getFolderByType(selected.account, EntityFolder.DRAFTS);
                     if (drafts == null)
                         throw new IllegalArgumentException(context.getString(R.string.title_no_drafts));