diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6ce8c2562d..931da401d1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2520,6 +2520,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             }
 
                     HtmlHelper.cleanup(document);
+                    HtmlHelper.removeRelativeLinks(document);
 
                     // Check for inline encryption
                     boolean iencrypted = HtmlHelper.contains(document, new String[]{
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 23b6b799d5..297ebe2374 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -914,7 +914,9 @@ public class HtmlHelper {
         // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/q
         for (Element q : document.select("q")) {
             q.tagName("a");
-            q.attr("href", q.attr("cite"));
+            String cite = q.attr("cite");
+            if (!TextUtils.isEmpty(cite) && !cite.trim().startsWith("#"))
+                q.attr("href", cite);
             q.removeAttr("cite");
         }
 
@@ -1159,7 +1161,7 @@ public class HtmlHelper {
                         while (p != null && !linked)
                             if ("a".equals(p.tagName())) {
                                 String href = p.attr("href");
-                                if (TextUtils.isEmpty(href) || href.equals("#"))
+                                if (TextUtils.isEmpty(href))
                                     break;
                                 if (!TextUtils.isEmpty(p.text()))
                                     break;
@@ -1237,6 +1239,14 @@ public class HtmlHelper {
         return document;
     }
 
+    static void removeRelativeLinks(Document document){
+        for (Element a : document.select("a"))
+            if (a.attr("href").trim().startsWith("#")) {
+                a.tagName("span");
+                a.removeAttr("href");
+            }
+    }
+
     static void autoLink(Document document) {
         // https://en.wikipedia.org/wiki/List_of_URI_schemes
         // xmpp:[<user>]@<host>[:<port>]/[<resource>][?<query>]