diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 658508f2bc..61b4aced4c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -6715,18 +6715,21 @@ public class FragmentCompose extends FragmentBase {
 
             boolean dirty = false;
             String body;
-            if (markdown ^ extras.getBoolean("markdown")) {
-                String text = spanned.toString().replace('\u00a0', ' ');
-                String html = Markdown.toHtml(text);
-
+            boolean convertMarkdown = extras.getBoolean("markdown");
+            if (markdown) {
+                String html = (convertMarkdown
+                        ? HtmlHelper.toHtml(spanned, context)
+                        : Markdown.toHtml(spanned.toString()));
                 Document doc = JsoupEx.parse(html);
                 doc.body().attr("markdown", Boolean.toString(markdown));
                 body = doc.html();
-
-                if (markdown != extras.getBoolean("markdown"))
-                    dirty = true;
-            } else
-                body = HtmlHelper.toHtml(spanned, context);
+            } else {
+                body = (convertMarkdown
+                        ? Markdown.toHtml(spanned.toString())
+                        : HtmlHelper.toHtml(spanned, context));
+            }
+            if (markdown ^ convertMarkdown)
+                dirty = true;
 
             EntityMessage draft;
 
@@ -7689,7 +7692,7 @@ public class FragmentCompose extends FragmentBase {
 
                 Spanned spannedBody;
                 if (markdown) {
-                    String md = Markdown.fromHtml(doc);
+                    String md = Markdown.fromHtml(doc.body().html());
                     spannedBody = new SpannableStringBuilder(md);
                 } else {
                     HtmlHelper.clearAnnotations(doc); // Legacy left-overs
diff --git a/app/src/main/java/eu/faircode/email/Markdown.java b/app/src/main/java/eu/faircode/email/Markdown.java
index 5ed0188eb4..291279a21b 100644
--- a/app/src/main/java/eu/faircode/email/Markdown.java
+++ b/app/src/main/java/eu/faircode/email/Markdown.java
@@ -32,6 +32,7 @@ import java.util.List;
 
 public class Markdown {
     static String toHtml(String markdown) {
+        markdown = markdown.replace('\u00a0', ' ');
         List<Extension> extensions = Arrays.asList(
                 TablesExtension.create(),
                 StrikethroughExtension.create());
@@ -45,7 +46,7 @@ public class Markdown {
         return r.render(d);
     }
 
-    static String fromHtml(Document d) {
+    static String fromHtml(String html) {
         // TODO: HTML to Markdown
         throw new IllegalArgumentException("Not implemented");
     }