diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 38cabd60ac..6db18d0d39 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -289,6 +289,12 @@ public class HtmlHelper {
     static Document sanitizeCompose(Context context, String html, boolean show_images) {
         try {
             Document parsed = JsoupEx.parse(html);
+
+            // Prevent extra newline at end
+            Element body = parsed.body();
+            if (body != null && body.childrenSize() == 1 && "p".equals(body.child(0).tagName()))
+                body.child(0).tagName("span").appendChild(new Element("br"));
+
             return sanitize(context, parsed, false, show_images);
         } catch (Throwable ex) {
             // OutOfMemoryError