diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 444bd312a0..8b6b2defbc 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -531,6 +531,16 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
         return false;
     }
 
+    @Override
+    public boolean shouldUpRecreateTask(Intent targetIntent) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q + 1) {
+            ComponentName cn = targetIntent.getComponent();
+            if (cn != null && BuildConfig.APPLICATION_ID.equals(cn.getPackageName()))
+                return false;
+        }
+        return super.shouldUpRecreateTask(targetIntent);
+    }
+
     public interface IKeyPressedListener {
         boolean onKeyPressed(KeyEvent event);