diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d17ee9a3c3..6841df0307 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,6 +41,7 @@
         <activity
             android:name=".ActivityMain"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.Transparent">
 
@@ -68,9 +69,18 @@
 
         <activity
             android:name=".ActivityView"
-            android:exported="true"
+            android:exported="false"
             android:launchMode="singleTop"
-            android:parentActivityName=".ActivityMain">
+            android:parentActivityName=".ActivityMain" />
+
+        <activity
+            android:name=".ActivitySearch"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.Transparent">
 
             <intent-filter>
                 <action android:name="android.intent.action.PROCESS_TEXT" />
diff --git a/app/src/main/java/eu/faircode/email/ActivitySearch.java b/app/src/main/java/eu/faircode/email/ActivitySearch.java
new file mode 100644
index 0000000000..66d090bbb4
--- /dev/null
+++ b/app/src/main/java/eu/faircode/email/ActivitySearch.java
@@ -0,0 +1,18 @@
+package eu.faircode.email;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+public class ActivitySearch extends ActivityBase {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent view = new Intent(this, ActivityView.class);
+        view.putExtra(Intent.EXTRA_PROCESS_TEXT, getIntent().getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT));
+        startActivity(view);
+
+        finish();
+    }
+}
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 91e5aaed25..b63d45046c 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -288,9 +288,9 @@ public class ServiceSynchronize extends LifecycleService {
                     PackageManager pm = getPackageManager();
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
                     if (prefs.getBoolean("why", false) || why.resolveActivity(pm) == null) {
-                        Intent main = new Intent(this, ActivityView.class);
-                        main.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        startActivity(main);
+                        Intent view = new Intent(this, ActivityView.class);
+                        view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        startActivity(view);
                     } else {
                         prefs.edit().putBoolean("why", true).apply();
                         startActivity(why);
diff --git a/app/src/main/java/eu/faircode/email/Widget.java b/app/src/main/java/eu/faircode/email/Widget.java
index 43cc4e3022..57cadaba9a 100644
--- a/app/src/main/java/eu/faircode/email/Widget.java
+++ b/app/src/main/java/eu/faircode/email/Widget.java
@@ -46,10 +46,10 @@ public class Widget extends AppWidgetProvider {
     }
 
     private static void update(int[] appWidgetIds, AppWidgetManager appWidgetManager, Context context, int count) {
-        Intent intent = new Intent(context, ActivityView.class);
-        intent.setAction("unified");
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        PendingIntent pi = PendingIntent.getActivity(context, ActivityView.REQUEST_UNIFIED, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        Intent view = new Intent(context, ActivityView.class);
+        view.setAction("unified");
+        view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        PendingIntent pi = PendingIntent.getActivity(context, ActivityView.REQUEST_UNIFIED, view, PendingIntent.FLAG_UPDATE_CURRENT);
         for (int id : appWidgetIds) {
             RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget);
             views.setOnClickPendingIntent(R.id.widget, pi);