diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index 7f7533e3df..dbbad5f82c 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -715,21 +715,21 @@ public class StyleHelper {
                 String url = (String) args[0];
                 String title = (String) args[1];
 
-                if (TextUtils.isEmpty(url))
-                    return false;
-                if (TextUtils.isEmpty(title))
-                    title = url;
-
                 URLSpan[] spans = edit.getSpans(start, end, URLSpan.class);
                 for (URLSpan span : spans)
                     edit.removeSpan(span);
 
-                if (start == end)
-                    edit.insert(start, title);
-                else if (!title.equals(edit.subSequence(start, end).toString()))
-                    edit.replace(start, end, title);
+                if (!TextUtils.isEmpty(url)) {
+                    if (TextUtils.isEmpty(title))
+                        title = url;
+
+                    if (start == end)
+                        edit.insert(start, title);
+                    else if (!title.equals(edit.subSequence(start, end).toString()))
+                        edit.replace(start, end, title);
 
-                edit.setSpan(new URLSpan(url), start, start + title.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    edit.setSpan(new URLSpan(url), start, start + title.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
 
                 etBody.setText(edit);
                 etBody.setSelection(start + title.length());