diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 2f8c7222b6..7dce5bdaf6 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1269,8 +1269,8 @@ public class HtmlHelper {
 
         // Lists
         for (Element e : document.select("ol,ul,blockquote")) {
+            Element parent = e.parent();
             if (view) {
-                Element parent = e.parent();
                 if ("blockquote".equals(e.tagName()) || parent == null ||
                         !("li".equals(parent.tagName()) ||
                                 "ol".equals(parent.tagName()) ||
@@ -1299,6 +1299,20 @@ public class HtmlHelper {
                     }
                     e.attr("dir", rtl > ltr ? "rtl" : "ltr");
                 }
+
+                // Flatten list for editor
+                if (parent != null && "li".equals(parent.tagName())) {
+                    List<Node> children = parent.childNodes();
+                    for (Node child : children) {
+                        child.remove();
+                        if (child instanceof Element &&
+                                "ol".equals(child.nodeName()) || "ul".equals(child.nodeName()))
+                            parent.before(child);
+                        else
+                            parent.before(document.createElement("li").appendChild(child));
+                    }
+                    parent.remove();
+                }
             }
         }