diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index a15f47af23..d3d87d84f4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2343,6 +2343,8 @@ public class FragmentCompose extends FragmentBase {
 
     private void onMenuMarkdown() {
         markdown = !markdown;
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        prefs.edit().putBoolean("markdown", markdown).apply();
 
         Bundle args = new Bundle();
         args.putBoolean("markdown", true);
@@ -5611,6 +5613,10 @@ 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 {