diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index c995742686..9ed9c73727 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -129,7 +129,6 @@
 
         <activity
             android:name=".ActivityMain"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Translucent">
@@ -220,7 +219,6 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -246,7 +244,6 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -360,7 +357,6 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index bf7601be36..3c929b3f2c 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -128,7 +128,6 @@
 
         <activity
             android:name=".ActivityMain"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Translucent">
@@ -219,7 +218,6 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -245,7 +243,6 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -359,7 +356,6 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index bf7601be36..3c929b3f2c 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -128,7 +128,6 @@
 
         <activity
             android:name=".ActivityMain"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Translucent">
@@ -219,7 +218,6 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -245,7 +243,6 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -359,7 +356,6 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf391cd6d4..e7208572bd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -218,7 +218,6 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -244,7 +243,6 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -358,7 +356,6 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/app/src/main/java/eu/faircode/email/ActivityAnswer.java b/app/src/main/java/eu/faircode/email/ActivityAnswer.java
index 2eb79acf09..9d61ff9f20 100644
--- a/app/src/main/java/eu/faircode/email/ActivityAnswer.java
+++ b/app/src/main/java/eu/faircode/email/ActivityAnswer.java
@@ -49,7 +49,7 @@ public class ActivityAnswer extends ActivityBase {
 
         Intent intent = getIntent();
         if (intent == null) {
-            finish();
+            finishAndRemoveTask();
             return;
         }
 
@@ -96,7 +96,7 @@ public class ActivityAnswer extends ActivityBase {
                     setResult(RESULT_OK, result);
                 }
 
-                finish();
+                finishAndRemoveTask();
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityRationale.java b/app/src/main/java/eu/faircode/email/ActivityRationale.java
index 021f3c5b8b..60579f6f2d 100644
--- a/app/src/main/java/eu/faircode/email/ActivityRationale.java
+++ b/app/src/main/java/eu/faircode/email/ActivityRationale.java
@@ -29,6 +29,6 @@ public class ActivityRationale extends ActivityBase {
         // https://developer.android.com/training/permissions/explaining-access
 
         Helper.viewFAQ(this, 1);
-        finish();
+        finishAndRemoveTask();
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/ActivitySearch.java b/app/src/main/java/eu/faircode/email/ActivitySearch.java
index c457877f77..23a8f9ce24 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySearch.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySearch.java
@@ -50,6 +50,6 @@ public class ActivitySearch extends ActivityBase {
             view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         startActivity(view);
 
-        finish();
+        finishAndRemoveTask();
     }
 }
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 3e56968b6a..c5b275d1a6 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -129,7 +129,6 @@
 
         <activity
             android:name=".ActivityMain"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Translucent">
@@ -220,7 +219,6 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -246,7 +244,6 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -360,7 +357,6 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"