Fixed extra new lines

This reverts commit 72827e45bb.

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -4257,7 +4257,7 @@ public class FragmentCompose extends FragmentBase {
                         Document d;
                         if (extras != null && extras.containsKey("html")) {
                             // Save current revision
-                            Document c = HtmlHelper.sanitizeCompose(context, body, true);
+                            Document c = JsoupEx.parse(body);
 
                             for (Element e : ref)
                                 c.body().appendChild(e);
@@ -4266,7 +4266,7 @@ public class FragmentCompose extends FragmentBase {
 
                             Helper.writeText(draft.getFile(context, draft.revision), c.html());
 
-                            d = HtmlHelper.sanitizeCompose(context, extras.getString("html"), true);
+                            d = JsoupEx.parse(extras.getString("html"));
                         } else {
                             d = HtmlHelper.sanitizeCompose(context, body, true);
 

app/src/main/java/eu/faircode/email/HtmlEx.java

@@ -257,7 +257,7 @@ public class HtmlEx {
                     isInBulletList = null;
                 }
 
-                String tagType = isBulletListItem != null ? "li" : "p";
+                String tagType = isBulletListItem != null ? "li" : "span";
                 out.append("<").append(tagType)
                         .append(getTextDirection(text, i, next))
                         .append(getTextStyles(text, i, next, isBulletListItem == null, true))
@@ -268,6 +268,8 @@ public class HtmlEx {
                 out.append("</");
                 out.append(tagType);
                 out.append(">\n");
+                if (isBulletListItem == null)
+                    out.append("<br>\n");
 
                 if (next == end && isInBulletList != null) {
                     out.append(isInBulletList ? "</ul>\n" : "</ol>\n");