diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index c2e2927a22..cfcb8e7db4 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1262,6 +1262,12 @@ public class HtmlHelper {
         String base = (b.size() > 0 ? b.get(0).attr("href") : null);
         for (Element a : document.select("a")) {
             String href = a.attr("href");
+
+            if (href.contains(" ")) {
+                href = href.replace(" ", "%20");
+                a.attr("href", href);
+            }
+
             if (!TextUtils.isEmpty(base))
                 try {
                     // https://developer.android.com/reference/java/net/URI