diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index f1abe5cebe..1c6c4931c3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3718,6 +3718,11 @@ public class FragmentCompose extends FragmentBase {
                                                         remove = true;
                                                     else {
                                                         Node next = node.nextSibling();
+                                                        if (next == null) {
+                                                            Node parent = node.parent();
+                                                            if (parent != null)
+                                                                next = parent.nextSibling();
+                                                        }
                                                         if (next != null && "br".equals(next.nodeName()))
                                                             remove = true;
                                                     }