diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 65c67cda0a..bef103ab2b 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -187,6 +187,17 @@
                 <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 cac60b1cc0..6c1283feaf 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -193,6 +193,17 @@
                 <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 b1f1dfe921..299c8a8464 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -193,6 +193,17 @@
                 <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 2166ea35fd..19594d6592 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -186,6 +186,17 @@
                 <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 00d14a88fd..7ff8a3efcd 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -118,9 +118,12 @@ 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()) &&
+                                "email.faircode.eu".equals(data.getHost()) &&
+                                "link".equals(data.getPath())))) {
             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 39b3252f20..ab326ca764 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://email.faircode.eu/link/#" + id;
     }
 
     boolean isPlainOnly() {
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 93da420f58..d2af4276fb 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -187,6 +187,17 @@
                 <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