diff --git a/app/src/main/java/eu/faircode/email/ActivityError.java b/app/src/main/java/eu/faircode/email/ActivityError.java
index 635700a0f8..1dfde92629 100644
--- a/app/src/main/java/eu/faircode/email/ActivityError.java
+++ b/app/src/main/java/eu/faircode/email/ActivityError.java
@@ -59,11 +59,10 @@ public class ActivityError extends ActivityBase {
         ibSetting.setVisibility(account < 0 ? View.GONE : View.VISIBLE);
         ibSetting.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), ActivitySetup.class)
-                        .setAction("target:accounts")
-                        .putExtra("target", "accounts");
-                startActivity(intent);
+            public void onClick(View v) {
+                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra("target", "accounts"));
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java
index 326837db31..27012fb775 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -176,7 +176,8 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
                             }
                         }, SERVICE_START_DELAY);
                     } else
-                        startActivity(new Intent(ActivityMain.this, ActivitySetup.class));
+                        startActivity(new Intent(ActivityMain.this, ActivitySetup.class)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
 
                     long end = new Date().getTime();
                     Log.i("Main booted " + (end - start) + " ms");
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 44fe237cbc..d15ca752dd 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -365,7 +365,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     public boolean onMenuItemClick(MenuItem item) {
                         String tab = FragmentOptions.TAB_LABELS.get(item.getOrder());
                         startActivity(new Intent(ActivityView.this, ActivitySetup.class)
-                                .setAction(tab)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                                 .putExtra("tab", tab));
                         return true;
                     }
@@ -1543,7 +1543,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     }
 
     private void onMenuSetup() {
-        startActivity(new Intent(ActivityView.this, ActivitySetup.class));
+        startActivity(new Intent(ActivityView.this, ActivitySetup.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
     }
 
     private void onMenuLegend() {
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index bf64722054..e3811f37f3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -757,10 +757,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                         .setGestureInsetBottomIgnored(true);
                                 snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                                     @Override
-                                    public void onClick(View view) {
-                                        context.startActivity(
-                                                new Intent(context, ActivitySetup.class)
-                                                        .putExtra("tab", "connection"));
+                                    public void onClick(View v) {
+                                        v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                                .putExtra("tab", "connection"));
                                     }
                                 });
                                 snackbar.show();
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e60dacb89e..9cb7c78267 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4197,11 +4197,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     .setNeutralButton(R.string.title_setup, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            Intent privacy = new Intent(context, ActivitySetup.class)
-                                    .setAction("privacy")
-                                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                    .putExtra("tab", "privacy");
-                            context.startActivity(privacy);
+                            context.startActivity(new Intent(context, ActivitySetup.class)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .putExtra("tab", "privacy"));
                         }
                     })
                     .create();
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index 792eb89be1..1c425bf9f8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -414,10 +414,10 @@ public class FragmentAccounts extends FragmentBase {
                             .setGestureInsetBottomIgnored(true);
                     snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                         @Override
-                        public void onClick(View view) {
-                            startActivity(
-                                    new Intent(getContext(), ActivitySetup.class)
-                                            .putExtra("tab", "connection"));
+                        public void onClick(View v) {
+                            v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .putExtra("tab", "connection"));
                         }
                     });
                     snackbar.show();
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 37881e102d..69f567f76e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3483,9 +3483,9 @@ public class FragmentCompose extends FragmentBase {
                         @Override
                         public void onClick(View v) {
                             if (ex.getCause() instanceof CertificateException)
-                                startActivity(
-                                        new Intent(getContext(), ActivitySetup.class)
-                                                .putExtra("tab", "encryption"));
+                                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                        .putExtra("tab", "encryption"));
                             else {
                                 PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), vwAnchor);
                                 popupMenu.getMenu().add(Menu.NONE, R.string.title_send_dialog, 1, R.string.title_send_dialog);
@@ -3504,9 +3504,9 @@ public class FragmentCompose extends FragmentBase {
                                             fragment.show(getParentFragmentManager(), "compose:send");
                                             return true;
                                         } else if (itemId == R.string.title_advanced_manage_certificates) {
-                                            startActivity(
-                                                    new Intent(getContext(), ActivitySetup.class)
-                                                            .putExtra("tab", "encryption"));
+                                            startActivity(new Intent(getContext(), ActivitySetup.class)
+                                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                                    .putExtra("tab", "encryption"));
                                             return true;
                                         }
                                         return false;
@@ -4978,8 +4978,9 @@ public class FragmentCompose extends FragmentBase {
                         .setGestureInsetBottomIgnored(true);
                 snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                     @Override
-                    public void onClick(View view) {
-                        startActivity(new Intent(getContext(), ActivitySetup.class));
+                    public void onClick(View v) {
+                        v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
                         getActivity().finish();
                     }
                 });
@@ -6476,7 +6477,8 @@ public class FragmentCompose extends FragmentBase {
             btnFixSent.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                    v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                             .putExtra("target", "accounts"));
                 }
             });
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
index a902869f0d..711c7fbfd4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
@@ -58,10 +58,10 @@ public class FragmentDialogForwardRaw extends FragmentDialogBase {
 
         tvOption.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                startActivity(
-                        new Intent(getContext(), ActivitySetup.class)
-                                .putExtra("tab", "connection"));
+            public void onClick(View v) {
+                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra("tab", "connection"));
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java b/app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java
index 6c78af7ff1..fd04790c18 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java
@@ -90,7 +90,8 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
             @Override
             public void onClick(View v) {
                 prefs.edit().putBoolean("identities_primary_hint", true).apply();
-                startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                         .putExtra("manual", true));
                 tvPrimaryHint.setVisibility(View.GONE);
             }
@@ -106,7 +107,8 @@ public class FragmentDialogIdentity extends FragmentDialogBase {
         btnFix.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(getContext(), ActivitySetup.class));
+                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
                 getActivity().finish();
                 dismiss();
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
index 52c0297494..d420576e67 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
@@ -413,11 +413,9 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
         btnSettings.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent privacy = new Intent(v.getContext(), ActivitySetup.class)
-                        .setAction("privacy")
-                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                        .putExtra("tab", "privacy");
-                v.getContext().startActivity(privacy);
+                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra("tab", "privacy"));
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 75522a8d4f..498a9ff6df 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -253,9 +253,9 @@ public class FragmentFolders extends FragmentBase {
         fabError.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(v.getContext(), ActivitySetup.class)
-                        .putExtra("target", "accounts");
-                startActivity(intent);
+                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra("target", "accounts"));
             }
         });
 
@@ -434,10 +434,10 @@ public class FragmentFolders extends FragmentBase {
                             .setGestureInsetBottomIgnored(true);
                     snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                         @Override
-                        public void onClick(View view) {
-                            startActivity(
-                                    new Intent(getContext(), ActivitySetup.class)
-                                            .putExtra("tab", "connection"));
+                        public void onClick(View v) {
+                            v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .putExtra("tab", "connection"));
                         }
                     });
                     snackbar.show();
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 8bffbe5bee..7fdc202395 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1617,10 +1617,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             .setGestureInsetBottomIgnored(true);
                     snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                         @Override
-                        public void onClick(View view) {
-                            startActivity(
-                                    new Intent(getContext(), ActivitySetup.class)
-                                            .putExtra("tab", "connection"));
+                        public void onClick(View v) {
+                            v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .putExtra("tab", "connection"));
                         }
                     });
                     snackbar.show();
@@ -4115,7 +4115,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(context, ActivitySetup.class));
+                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
             }
         });
         snackbar.show();
@@ -5001,10 +5002,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             .setGestureInsetBottomIgnored(true);
                     snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                         @Override
-                        public void onClick(View view) {
-                            startActivity(
-                                    new Intent(getContext(), ActivitySetup.class)
-                                            .putExtra("tab", "connection"));
+                        public void onClick(View v) {
+                            v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .putExtra("tab", "connection"));
                         }
                     });
                     snackbar.show();
@@ -7713,10 +7714,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             .setGestureInsetBottomIgnored(true);
                     snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                         @Override
-                        public void onClick(View view) {
-                            Intent intent = new Intent(getContext(), ActivitySetup.class)
-                                    .putExtra("target", "accounts");
-                            startActivity(intent);
+                        public void onClick(View v) {
+                            v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .putExtra("target", "accounts"));
                         }
                     });
                     snackbar.show();
diff --git a/app/src/main/java/eu/faircode/email/FragmentPro.java b/app/src/main/java/eu/faircode/email/FragmentPro.java
index 4012cf957d..0bfc1ea4c4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPro.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPro.java
@@ -98,7 +98,8 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
         btnBackup.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(getContext(), ActivitySetup.class)
+                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                         .putExtra("navigate", true));
             }
         });