diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fb34be078f..0d8048b2af 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,9 +50,15 @@
 
         <activity
             android:name=".ActivityView"
-            android:exported="false"
+            android:exported="true"
             android:launchMode="singleTop"
-            android:parentActivityName=".ActivityMain" />
+            android:parentActivityName=".ActivityMain">
+            <intent-filter>
+                <action android:name="android.intent.action.PROCESS_TEXT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".ActivityCompose"
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 6a57c6f926..833e7e17d7 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -310,6 +310,45 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             intent.putExtra("thread", action.split(":", 2)[1]);
             onViewThread(intent);
         }
+
+        if (getIntent().hasExtra(Intent.EXTRA_PROCESS_TEXT)) {
+            String search = getIntent().getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT).toString();
+
+            intent.removeExtra(Intent.EXTRA_PROCESS_TEXT);
+            setIntent(intent);
+
+            Bundle args = new Bundle();
+            args.putString("search", search);
+
+            new SimpleTask<Long>() {
+                @Override
+                protected Long onLoad(Context context, Bundle args) {
+                    EntityFolder archive = DB.getInstance(context).folder().getPrimaryArchive();
+                    if (archive == null)
+                        throw new IllegalArgumentException(getString(R.string.title_no_archive));
+                    return archive.id;
+                }
+
+                @Override
+                protected void onLoaded(Bundle args, Long archive) {
+                    Bundle sargs = new Bundle();
+                    sargs.putLong("folder", archive);
+                    sargs.putString("search", args.getString("search"));
+
+                    FragmentMessages fragment = new FragmentMessages();
+                    fragment.setArguments(sargs);
+
+                    FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+                    fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("search");
+                    fragmentTransaction.commit();
+                }
+
+                @Override
+                protected void onException(Bundle args, Throwable ex) {
+                    Helper.unexpectedError(ActivityView.this, ex);
+                }
+            }.load(this, args);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index bcb54ebbf8..3485a37c41 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -96,6 +96,11 @@ public interface DaoFolder {
             " WHERE `primary` AND type = '" + EntityFolder.DRAFTS + "'")
     EntityFolder getPrimaryDrafts();
 
+    @Query("SELECT folder.* FROM folder" +
+            " JOIN account ON account.id = folder.account" +
+            " WHERE `primary` AND type = '" + EntityFolder.ARCHIVE + "'")
+    EntityFolder getPrimaryArchive();
+
     @Query("SELECT * FROM folder WHERE type = '" + EntityFolder.OUTBOX + "'")
     EntityFolder getOutbox();
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 4a68d5d3c8..627912c81a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -657,12 +657,9 @@ public class FragmentMessages extends FragmentEx {
 
                         @Override
                         protected void onLoaded(Bundle args, Void data) {
-                            Intent intent = new Intent();
-                            intent.putExtra("folder", args.getLong("folder", folder));
-                            intent.putExtra("search", args.getString("search"));
-
                             FragmentMessages fragment = new FragmentMessages();
-                            fragment.setArguments(intent.getExtras());
+                            fragment.setArguments(args);
+
                             FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
                             fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("search");
                             fragmentTransaction.commit();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85e5fad3c3..211cf43473 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -124,7 +124,8 @@
     <string name="title_no_host">Host name missing</string>
     <string name="title_no_user">User name missing</string>
     <string name="title_no_password">Password missing</string>
-    <string name="title_no_drafts">Drafts folder missing</string>
+    <string name="title_no_drafts">No primary account or no drafts folder</string>
+    <string name="title_no_archive">No primary account or no archive folder</string>
     <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
     <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
     <string name="title_account_delete">Delete this account permanently?</string>