diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf391cd6d4..f9ef53bdba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -128,6 +128,7 @@
 
         <activity
             android:name=".ActivityMain"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Translucent">
diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java
index be55f785e2..170ee90e85 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -101,7 +101,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
 
                 @Override
                 protected void onExecuted(Bundle args, EntityMessage message) {
-                    finishAndRemoveTask();
+                    finish();
 
                     if (message == null)
                         return;
@@ -139,7 +139,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
             } catch (RuntimeException ex) {
                 Log.e(ex);
                 // https://issuetracker.google.com/issues/181805603
-                finishAndRemoveTask();
+                finish();
                 startActivity(getIntent());
                 return;
             }
@@ -236,7 +236,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
                     long end = new Date().getTime();
                     Log.i("Main booted " + (end - start) + " ms");
 
-                    finishAndRemoveTask();
+                    finish();
                 }
 
                 @Override
@@ -261,7 +261,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
                             @Override
                             public void run() {
                                 try {
-                                    finishAndRemoveTask();
+                                    finish();
                                 } catch (Throwable ex) {
                                     Log.w(ex);
                                     /*
@@ -336,7 +336,7 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
     public void onBackStackChanged() {
         int count = getSupportFragmentManager().getBackStackEntryCount();
         if (count == 0)
-            finishAndRemoveTask();
+            finish();
     }
 
     @Override