diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 981970bbd0..538e0e5975 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -246,6 +246,12 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
                     drawerLayout.closeDrawer(drawerContainer);
                     onMenuPrivacy();
                 }
+            }, new Runnable() {
+                @Override
+                public void run() {
+                    drawerLayout.closeDrawer(drawerContainer);
+                    onCleanup();
+                }
             }));
 
         menus.add(new NavMenuItem(R.drawable.baseline_info_24, R.string.menu_about, new Runnable() {
@@ -516,6 +522,21 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
         Helper.view(this, this, Helper.getIntentPrivacy());
     }
 
+    private void onCleanup() {
+        new SimpleTask<Void>() {
+            @Override
+            protected Void onExecute(Context context, Bundle args) {
+                WorkerCleanup.cleanup(context, true);
+                return null;
+            }
+
+            @Override
+            protected void onException(Bundle args, Throwable ex) {
+                Helper.unexpectedError(ActivitySetup.this, ActivitySetup.this, ex);
+            }
+        }.execute(this, new Bundle(), "cleanup:run");
+    }
+
     private void onMenuAbout() {
         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
             getSupportFragmentManager().popBackStack("about", FragmentManager.POP_BACK_STACK_INCLUSIVE);
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 45318ee239..d13861749d 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -309,12 +309,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     drawerLayout.closeDrawer(drawerContainer);
                     onMenuPrivacy();
                 }
-            }, new Runnable() {
-                @Override
-                public void run() {
-                    drawerLayout.closeDrawer(drawerContainer);
-                    onCleanup();
-                }
             }));
 
         extra.add(new NavMenuItem(R.drawable.baseline_info_24, R.string.menu_about, new Runnable() {
@@ -1025,21 +1019,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         }.execute(this, new Bundle(), "debug:info");
     }
 
-    private void onCleanup() {
-        new SimpleTask<Void>() {
-            @Override
-            protected Void onExecute(Context context, Bundle args) {
-                WorkerCleanup.cleanup(ActivityView.this, true);
-                return null;
-            }
-
-            @Override
-            protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(ActivityView.this, ActivityView.this, ex);
-            }
-        }.execute(this, new Bundle(), "cleanup:job");
-    }
-
     private void onShowLog() {
         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
             getSupportFragmentManager().popBackStack("logs", FragmentManager.POP_BACK_STACK_INCLUSIVE);