diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ec6f6fdf57..5b7e97beeb 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4343,7 +4343,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             if (!ActivityBilling.isPro(getContext())) {
-                                getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
+                                startActivity(new Intent(getContext(), ActivityBilling.class));
                                 return;
                             }
 
@@ -4420,7 +4420,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             if (!ActivityBilling.isPro(getContext())) {
-                                getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
+                                startActivity(new Intent(getContext(), ActivityBilling.class));
                                 return;
                             }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index f27f267473..f27f030e50 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -346,7 +346,7 @@ public class FragmentAccounts extends FragmentBase {
                     snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            getContext().startActivity(
+                            startActivity(
                                     new Intent(getContext(), ActivitySetup.class)
                                             .putExtra("tab", "connection"));
                         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index d06ef9f2ca..d6286df08f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -118,6 +118,13 @@ public class FragmentBase extends Fragment {
             finish = true;
     }
 
+    protected void restart() {
+        Intent intent = new Intent(getContext(), ActivityMain.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        startActivity(intent);
+        Runtime.getRuntime().exit(0);
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         Log.i("Save instance " + this);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 6c4c7169a8..8e8c39c013 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1068,7 +1068,7 @@ public class FragmentCompose extends FragmentBase {
 
     private void onMenuAnswer() {
         if (!ActivityBilling.isPro(getContext())) {
-            getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
+            startActivity(new Intent(getContext(), ActivityBilling.class));
             return;
         }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
index a163af95cb..640e710f05 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
@@ -181,7 +181,7 @@ public class FragmentDialogDuration extends FragmentDialogBase {
     protected void sendResult(int result) {
         if (result == RESULT_OK) {
             if (!ActivityBilling.isPro(getContext())) {
-                getActivity().startActivity(new Intent(getContext(), ActivityBilling.class));
+                startActivity(new Intent(getContext(), ActivityBilling.class));
                 result = RESULT_CANCELED;
             }
         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 2f874c25bc..4beddaef0d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -360,7 +360,7 @@ public class FragmentFolders extends FragmentBase {
                     snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            getContext().startActivity(
+                            startActivity(
                                     new Intent(getContext(), ActivitySetup.class)
                                             .putExtra("tab", "connection"));
                         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 65bfb79d10..5861a13fc3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -387,7 +387,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         tvSupport.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
+                startActivity(new Intent(getContext(), ActivityBilling.class));
             }
         });
 
@@ -1187,7 +1187,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            getContext().startActivity(
+                            startActivity(
                                     new Intent(getContext(), ActivitySetup.class)
                                             .putExtra("tab", "connection"));
                         }
@@ -2993,7 +2993,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            getContext().startActivity(
+                            startActivity(
                                     new Intent(getContext(), ActivitySetup.class)
                                             .putExtra("tab", "connection"));
                         }
@@ -3695,7 +3695,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 case REQUEST_MESSAGES_COLOR:
                     if (resultCode == RESULT_OK && data != null) {
                         if (!ActivityBilling.isPro(getContext())) {
-                            getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
+                            startActivity(new Intent(getContext(), ActivityBilling.class));
                             return;
                         }
 
@@ -4149,7 +4149,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
     private void onColor(long id, int color) {
         if (!ActivityBilling.isPro(getContext())) {
-            getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
+            startActivity(new Intent(getContext(), ActivityBilling.class));
             return;
         }
 
@@ -4234,7 +4234,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
     private void onSnoozeSelection(Bundle args) {
         if (!ActivityBilling.isPro(getContext())) {
-            getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
+            startActivity(new Intent(getContext(), ActivityBilling.class));
             return;
         }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 7a1cda19aa..2dbaec4cec 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -22,7 +22,6 @@ package eu.faircode.email;
 import android.app.ActivityManager;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Paint;
 import android.os.Bundle;
@@ -333,11 +332,4 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                 getString(R.string.title_advanced_last_cleanup,
                         time < 0 ? "-" : DTF.format(time)));
     }
-
-    private void restart() {
-        Intent intent = new Intent(getContext(), ActivityMain.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        startActivity(intent);
-        Runtime.getRuntime().exit(0);
-    }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index 315028ac47..9a77704869 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -496,7 +496,7 @@ public class FragmentRule extends FragmentBase {
                 case REQUEST_COLOR:
                     if (resultCode == RESULT_OK && data != null) {
                         if (!ActivityBilling.isPro(getContext())) {
-                            getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
+                            startActivity(new Intent(getContext(), ActivityBilling.class));
                             return;
                         }
 
@@ -773,7 +773,7 @@ public class FragmentRule extends FragmentBase {
 
     private void onActionSave() {
         if (!ActivityBilling.isPro(getContext())) {
-            getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
+            startActivity(new Intent(getContext(), ActivityBilling.class));
             return;
         }