diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 2ea4d3ad7e..7ca5d6d217 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -1052,7 +1052,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
         return intent;
     }
 
-    public static class FragmentDialogPassword extends FragmentDialogEx {
+    public static class FragmentDialogPassword extends FragmentDialogBase {
         private TextInputLayout etPassword1;
         private TextInputLayout etPassword2;
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 5f8310569e..9d2e1c54c8 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -1119,7 +1119,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         return intent;
     }
 
-    public static class FragmentDialogFirst extends FragmentDialogEx {
+    public static class FragmentDialogFirst extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -1136,7 +1136,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         }
     }
 
-    public static class FragmentDialogRate extends FragmentDialogEx {
+    public static class FragmentDialogRate extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 5101ff2338..5d91276e20 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3638,7 +3638,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         void finish();
     }
 
-    public static class FragmentDialogLink extends FragmentDialogEx {
+    public static class FragmentDialogLink extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3815,7 +3815,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentDialogImage extends FragmentDialogEx {
+    public static class FragmentDialogImage extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3851,7 +3851,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentDialogFull extends FragmentDialogEx {
+    public static class FragmentDialogFull extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3885,7 +3885,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentDialogWebView extends FragmentDialogEx {
+    public static class FragmentDialogWebView extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -4050,7 +4050,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentKeywordManage extends FragmentDialogEx {
+    public static class FragmentKeywordManage extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -4144,7 +4144,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentKeywordAdd extends FragmentDialogEx {
+    public static class FragmentKeywordAdd extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index 6d08313322..bcbf1b77b9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -265,7 +265,7 @@ public class FragmentAnswer extends FragmentBase {
         }.execute(this, args, "answer:delete");
     }
 
-    public static class FragmentInfo extends FragmentDialogEx {
+    public static class FragmentInfo extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 9b537e6f58..ada5b80058 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3400,7 +3400,7 @@ public class FragmentCompose extends FragmentBase {
         }
     };
 
-    public static class FragmentDialogContactGroup extends FragmentDialogEx {
+    public static class FragmentDialogContactGroup extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3458,7 +3458,7 @@ public class FragmentCompose extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogAnswer extends FragmentDialogEx {
+    public static class FragmentDialogAnswer extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3502,7 +3502,7 @@ public class FragmentCompose extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogLink extends FragmentDialogEx {
+    public static class FragmentDialogLink extends FragmentDialogBase {
         private EditText etLink;
 
         @Override
@@ -3554,7 +3554,7 @@ public class FragmentCompose extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogSend extends FragmentDialogEx {
+    public static class FragmentDialogSend extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java
index c0d5e99e4d..f713196666 100644
--- a/app/src/main/java/eu/faircode/email/FragmentContacts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java
@@ -164,7 +164,7 @@ public class FragmentContacts extends FragmentBase {
         Helper.viewFAQ(getContext(), 84);
     }
 
-    public static class FragmentDelete extends FragmentDialogEx {
+    public static class FragmentDelete extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java b/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java
index ce96716d09..0ed7b1247f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java
@@ -34,7 +34,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.PreferenceManager;
 
-public class FragmentDialogAsk extends FragmentDialogEx {
+public class FragmentDialogAsk extends FragmentDialogBase {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogEx.java b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
similarity index 95%
rename from app/src/main/java/eu/faircode/email/FragmentDialogEx.java
rename to app/src/main/java/eu/faircode/email/FragmentDialogBase.java
index 7a8f2dec46..a67228a07c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogEx.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
@@ -17,7 +17,7 @@ import androidx.lifecycle.OnLifecycleEvent;
 
 import static android.app.Activity.RESULT_CANCELED;
 
-public class FragmentDialogEx extends DialogFragment {
+public class FragmentDialogBase extends DialogFragment {
     private boolean once = false;
     private LifecycleOwner owner;
     private LifecycleRegistry registry;
@@ -115,8 +115,8 @@ public class FragmentDialogEx extends DialogFragment {
         fragment.getViewLifecycleOwner().getLifecycle().addObserver(new LifecycleObserver() {
             @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
             public void onDestroy() {
-                Log.i("Reset target " + FragmentDialogEx.this);
-                FragmentDialogEx.super.setTargetFragment(null, requestCode);
+                Log.i("Reset target " + FragmentDialogBase.this);
+                FragmentDialogBase.super.setTargetFragment(null, requestCode);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
index a67f3103c8..44ca93b658 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
@@ -43,7 +43,7 @@ import java.util.Date;
 import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
 
-public class FragmentDialogDuration extends FragmentDialogEx {
+public class FragmentDialogDuration extends FragmentDialogBase {
     private Calendar cal = Calendar.getInstance();
 
     @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
index 3bc834706b..12b9c5361d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
@@ -36,7 +36,7 @@ import java.util.List;
 
 import static android.app.Activity.RESULT_OK;
 
-public class FragmentDialogFolder extends FragmentDialogEx {
+public class FragmentDialogFolder extends FragmentDialogBase {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
index b256b45447..08129f0f61 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
@@ -20,7 +20,7 @@ import java.util.Locale;
 
 import io.noties.markwon.Markwon;
 
-public class FragmentDialogMarkdown extends FragmentDialogEx {
+public class FragmentDialogMarkdown extends FragmentDialogBase {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 16892e9e12..0f9f5b17f6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -1143,7 +1143,7 @@ public class FragmentIdentity extends FragmentBase {
         etSignature.setTag(html);
     }
 
-    public static class FragmentDialogHtml extends FragmentDialogEx {
+    public static class FragmentDialogHtml extends FragmentDialogBase {
         private EditText etHtml;
 
         @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 22bff716a3..610ea06b13 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4641,7 +4641,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         };
     }
 
-    public static class FragmentDialogReporting extends FragmentDialogEx {
+    public static class FragmentDialogReporting extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -4681,7 +4681,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
     }
 
-    public static class FragmentDialogAccount extends FragmentDialogEx {
+    public static class FragmentDialogAccount extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -4719,7 +4719,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
     }
 
-    public static class FragmentDialogError extends FragmentDialogEx {
+    public static class FragmentDialogError extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOperations.java b/app/src/main/java/eu/faircode/email/FragmentOperations.java
index 922a19b458..86f0c540c6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOperations.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOperations.java
@@ -126,7 +126,7 @@ public class FragmentOperations extends FragmentBase {
         Helper.viewFAQ(getContext(), 3);
     }
 
-    public static class DialogDelete extends FragmentDialogEx {
+    public static class DialogDelete extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index ae547d31c6..d8503a8fe6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -411,7 +411,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swActionbar.setChecked(prefs.getBoolean("actionbar", true));
     }
 
-    public static class FragmentDialogTheme extends FragmentDialogEx {
+    public static class FragmentDialogTheme extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
index 7300cf964e..fc24c50324 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
@@ -315,7 +315,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
         return Helper.getTimeInstance(context, SimpleDateFormat.SHORT).format(cal.getTime());
     }
 
-    public static class TimePickerFragment extends FragmentDialogEx implements TimePickerDialog.OnTimeSetListener {
+    public static class TimePickerFragment extends FragmentDialogBase implements TimePickerDialog.OnTimeSetListener {
         @NonNull
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 18e515f718..e7d4f671bd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -499,7 +499,7 @@ public class FragmentQuickSetup extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogDone extends FragmentDialogEx {
+    public static class FragmentDialogDone extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index c954c1e635..dd090d36f1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -998,7 +998,7 @@ public class FragmentRule extends FragmentBase {
         return Helper.getTimeInstance(context, SimpleDateFormat.SHORT).format(cal.getTime());
     }
 
-    public static class TimePickerFragment extends FragmentDialogEx implements TimePickerDialog.OnTimeSetListener {
+    public static class TimePickerFragment extends FragmentDialogBase implements TimePickerDialog.OnTimeSetListener {
         @NonNull
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -1027,7 +1027,7 @@ public class FragmentRule extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogCheck extends FragmentDialogEx {
+    public static class FragmentDialogCheck extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 50f2150dc5..2b213022a9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -413,7 +413,7 @@ public class FragmentSetup extends FragmentBase {
         btnPermissions.setEnabled(!has);
     }
 
-    public static class FragmentDialogDoze extends FragmentDialogEx {
+    public static class FragmentDialogDoze extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index ef21f10159..bdc2133894 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -471,7 +471,7 @@ public class Helper {
         fragment.show(manager, "error:unexpected");
     }
 
-    public static class FragmentDialogUnexpected extends FragmentDialogEx {
+    public static class FragmentDialogUnexpected extends FragmentDialogBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {