diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 74184823df..8b5fe5a966 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1725,6 +1725,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     if (link.length != 0) {
                         String url = link[0].getURL();
                         Uri uri = Uri.parse(url);
+                        if (uri.getScheme() == null)
+                            uri = Uri.parse("https://" + url);
                         onOpenLink(uri);
                         return true;
                     }
@@ -1768,11 +1770,7 @@ 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;
-                                    if (TextUtils.isEmpty(uri.getScheme()))
-                                        host = Uri.parse("https://" + uri.toString()).getHost();
-                                    else
-                                        host = uri.getHost();
+                                    String host = uri.getHost();
                                     return (TextUtils.isEmpty(host) ? null : Helper.getOrganization(host));
                                 }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 61e50bc1a9..8c82bb29bc 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -630,7 +630,6 @@ public class FragmentMessages extends FragmentBase {
                 if (!Helper.getNetworkState(context).isSuitable())
                     throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
 
-
                 DB db = DB.getInstance(context);
                 try {
                     db.beginTransaction();