diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 65c67cda0a..a440fa3242 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -187,6 +187,16 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="link.fairemail.net" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index cac60b1cc0..55e66340ba 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -193,6 +193,16 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="link.fairemail.net" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index b1f1dfe921..4bdba30a7e 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -193,6 +193,16 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="link.fairemail.net" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2166ea35fd..3d7163a133 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -186,6 +186,16 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="link.fairemail.net" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java
index 00d14a88fd..fe66f28a51 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -118,9 +118,11 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
         Intent intent = getIntent();
         Uri data = (intent == null ? null : intent.getData());
         if (data != null &&
-                "message".equals(data.getScheme()) &&
-                ("email.faircode.eu".equals(data.getHost()) ||
-                        BuildConfig.APPLICATION_ID.equals(data.getHost()))) {
+                (("message".equals(data.getScheme()) &&
+                        ("email.faircode.eu".equals(data.getHost()) ||
+                                BuildConfig.APPLICATION_ID.equals(data.getHost()))) ||
+                        ("https".equals(data.getScheme()) &&
+                                "link.fairemail.net".equals(data.getHost())))) {
             super.onCreate(savedInstanceState);
 
             Bundle args = new Bundle();
@@ -131,7 +133,8 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
                 protected EntityMessage onExecute(Context context, Bundle args) {
                     Uri data = args.getParcelable("data");
                     long id;
-                    if ("email.faircode.eu".equals(data.getHost()))
+                    if ("email.faircode.eu".equals(data.getHost()) ||
+                            "link.fairemail.net".equals(data.getHost()))
                         id = Long.parseLong(data.getFragment());
                     else {
                         String path = data.getPath();
diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index 39b3252f20..e924318adc 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -269,7 +269,7 @@ public class EntityMessage implements Serializable {
     }
 
     String getLink() {
-        return "message://email.faircode.eu/link/#" + id;
+        return "https://link.fairemail.net/#" + id;
     }
 
     boolean isPlainOnly() {
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 93da420f58..5e9b9d70a8 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -187,6 +187,16 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="link.fairemail.net" />
+            </intent-filter>
         </activity>
 
         <activity