diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index d3d87d84f4..5d853926f4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -7759,11 +7759,11 @@ public class FragmentCompose extends FragmentBase {
                 markdown = args.getBoolean("markdown");
                 invalidateOptionsMenu();
 
-                if (markwonWatcher != null)
+                if (markwonWatcher != null) {
+                    etBody.removeTextChangedListener(markwonWatcher);
                     if (markdown)
                         etBody.addTextChangedListener(markwonWatcher);
-                    else
-                        etBody.removeTextChangedListener(markwonWatcher);
+                }
 
                 etBody.setText(text[0]);
                 etBody.setTag(text[0]);