diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b198effd1b..10e3c7cabd 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1768,7 +1768,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                 @Override
                                 protected String onExecute(Context context, Bundle args) throws Throwable {
                                     Uri uri = args.getParcelable("uri");
-                                    String host = uri.getHost();
+                                    String host;
+                                    if (TextUtils.isEmpty(uri.getScheme()))
+                                        host = Uri.parse("https://" + uri.toString()).getHost();
+                                    else
+                                        host = uri.getHost();
                                     return (TextUtils.isEmpty(host) ? null : Helper.getOrganization(host));
                                 }
 
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index d32b379b9b..b59e27174d 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1140,6 +1140,7 @@ public class Helper {
         }
         InetAddress address = InetAddress.getByName(host);
         URL url = new URL("https://ipinfo.io/" + address.getHostAddress() + "/org");
+        Log.i("GET " + url);
         HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
         connection.setRequestMethod("GET");
         connection.setReadTimeout(15 * 1000);
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 3a81d2ae1b..a981341e53 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -291,7 +291,7 @@ public class HtmlHelper {
                             if (BuildConfig.DEBUG)
                                 Log.i("Web url=" + matcher.group() + " linked=" + linked + " scheme=" + scheme);
 
-                            if (linked || scheme == null)
+                            if (linked)
                                 span.appendText(text.substring(pos, matcher.end()));
                             else {
                                 span.appendText(text.substring(pos, matcher.start()));