diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 82b1f6ef2f..dcf461bb48 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -214,6 +214,15 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/plain" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="eu.faircode.email.search" />
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/java/eu/faircode/email/ActivitySearch.java b/app/src/main/java/eu/faircode/email/ActivitySearch.java
index dbb85b2f7a..b1ee5b41eb 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySearch.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySearch.java
@@ -20,20 +20,31 @@ package eu.faircode.email;
 */
 
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 
 import androidx.annotation.RequiresApi;
 
 public class ActivitySearch extends ActivityBase {
+    private static final String SEARCH_SCHEME = "eu.faircode.email.search";
 
     @Override
     @RequiresApi(api = Build.VERSION_CODES.M)
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        CharSequence query;
+
+        Uri uri = getIntent().getData();
+        if (uri == null || !SEARCH_SCHEME.equals(uri.getScheme()))
+            query = getIntent().getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT);
+        else
+            query = uri.toString().substring(SEARCH_SCHEME.length() + 1);
+
+        Log.i("External search query=" + query);
         Intent view = new Intent(this, ActivityView.class);
-        view.putExtra(Intent.EXTRA_PROCESS_TEXT, getIntent().getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT));
+        view.putExtra(Intent.EXTRA_PROCESS_TEXT, query);
         startActivity(view);
 
         finish();