diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index bef103ab2b..65c67cda0a 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -187,17 +187,6 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
-
-            <intent-filter>
-                <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:path="/link" />
-                <data android:host="email.faircode.eu" />
-            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 6c1283feaf..cac60b1cc0 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -193,17 +193,6 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
-
-            <intent-filter>
-                <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:path="/link" />
-                <data android:host="email.faircode.eu" />
-            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 299c8a8464..b1f1dfe921 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -193,17 +193,6 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
-
-            <intent-filter>
-                <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:path="/link" />
-                <data android:host="email.faircode.eu" />
-            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 19594d6592..2166ea35fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -186,17 +186,6 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
-
-            <intent-filter>
-                <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:path="/link" />
-                <data android:host="email.faircode.eu" />
-            </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 7ff8a3efcd..00d14a88fd 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -118,12 +118,9 @@ 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()))) ||
-                        ("https".equals(data.getScheme()) &&
-                                "email.faircode.eu".equals(data.getHost()) &&
-                                "link".equals(data.getPath())))) {
+                "message".equals(data.getScheme()) &&
+                ("email.faircode.eu".equals(data.getHost()) ||
+                        BuildConfig.APPLICATION_ID.equals(data.getHost()))) {
             super.onCreate(savedInstanceState);
 
             Bundle args = new Bundle();
diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index ab326ca764..39b3252f20 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 "https://email.faircode.eu/link/#" + id;
+        return "message://email.faircode.eu/link/#" + id;
     }
 
     boolean isPlainOnly() {
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index d2af4276fb..93da420f58 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -187,17 +187,6 @@
                 <data android:scheme="message" />
                 <data android:host="email.faircode.eu" />
             </intent-filter>
-
-            <intent-filter>
-                <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:path="/link" />
-                <data android:host="email.faircode.eu" />
-            </intent-filter>
         </activity>
 
         <activity