diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index aa2ad5098d..94a34d7883 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1988,7 +1988,8 @@ public class HtmlHelper {
                             else {
                                 int index = 0;
                                 for (Node child : parent.childNodes()) {
-                                    if (child instanceof Element) {
+                                    if (child instanceof Element &&
+                                            child.nodeName().equals(element.tagName())) {
                                         index++;
                                         if (child == element)
                                             break;