diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index d477d090a8..b92c1373da 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -691,22 +691,29 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
         }.execute(this, args, "setup:import");
     }
 
+    private void onEditAccount(Intent intent) {
+        FragmentAccount fragment = new FragmentAccount();
+        fragment.setArguments(intent.getExtras());
+        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account");
+        fragmentTransaction.commit();
+    }
+
+    private void onEditIdentity(Intent intent) {
+        FragmentIdentity fragment = new FragmentIdentity();
+        fragment.setArguments(intent.getExtras());
+        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("identity");
+        fragmentTransaction.commit();
+    }
+
     BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (ACTION_EDIT_ACCOUNT.equals(intent.getAction())) {
-                FragmentAccount fragment = new FragmentAccount();
-                fragment.setArguments(intent.getExtras());
-                FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-                fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account");
-                fragmentTransaction.commit();
-            } else if (ACTION_EDIT_IDENTITY.equals(intent.getAction())) {
-                FragmentIdentity fragment = new FragmentIdentity();
-                fragment.setArguments(intent.getExtras());
-                FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-                fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("identity");
-                fragmentTransaction.commit();
-            }
+            if (ACTION_EDIT_ACCOUNT.equals(intent.getAction()))
+                onEditAccount(intent);
+            else if (ACTION_EDIT_IDENTITY.equals(intent.getAction()))
+                onEditIdentity(intent);
         }
     };
 }