diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
index e46596f003..49af818dc4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
@@ -455,6 +455,8 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
                         final TextView tvHost = dview.findViewById(R.id.tvHost);
                         final TextView tvWhois = dview.findViewById(R.id.tvWhois);
 
+                        tvWhois.setMovementMethod(LinkMovementMethod.getInstance());
+
                         tvHost.setText(args.getString("host"));
                         tvWhois.setText(whois);
 
diff --git a/app/src/main/res/layout/dialog_whois.xml b/app/src/main/res/layout/dialog_whois.xml
index 3ee18aa672..8424811daa 100644
--- a/app/src/main/res/layout/dialog_whois.xml
+++ b/app/src/main/res/layout/dialog_whois.xml
@@ -39,6 +39,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
+            android:autoLink="web|email"
             android:fontFamily="monospace"
             android:text="Whois"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"