diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index c8cc3ee6fb..f1fa7221dc 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -2140,7 +2140,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         args.putString("title", getString(R.string.title_select));
         args.putLongArray("disabled", new long[0]);
 
-        FragmentDialogFolder fragment = new FragmentDialogFolder();
+        FragmentDialogSelectFolder fragment = new FragmentDialogSelectFolder();
         fragment.setArguments(args);
         fragment.setTargetActivity(this, REQUEST_RULES_FOLDER);
         fragment.show(getSupportFragmentManager(), "rules:folder");
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8f2cd81e17..bb2afaa7a2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5664,7 +5664,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             args.putBoolean("cancopy", true);
             args.putBoolean("similar", false);
 
-            FragmentDialogFolder fragment = new FragmentDialogFolder();
+            FragmentDialogSelectFolder fragment = new FragmentDialogSelectFolder();
             fragment.setArguments(args);
             fragment.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_MOVE);
             fragment.show(parentFragment.getParentFragmentManager(), "message:move");
diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java
index d9844c166a..20cb83f84e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@@ -468,7 +468,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
                     args.putLongArray("disabled", new long[]{rule.folder});
                     args.putLong("rule", rule.id);
 
-                    FragmentDialogFolder fragment = new FragmentDialogFolder();
+                    FragmentDialogSelectFolder fragment = new FragmentDialogSelectFolder();
                     fragment.setArguments(args);
                     fragment.setTargetFragment(parentFragment, FragmentRules.REQUEST_MOVE);
                     fragment.show(parentFragment.getParentFragmentManager(), "rule:move");
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogSelectFolder.java
similarity index 99%
rename from app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
rename to app/src/main/java/eu/faircode/email/FragmentDialogSelectFolder.java
index a61a7fa88e..e27396738f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSelectFolder.java
@@ -60,7 +60,6 @@ import org.json.JSONException;
 
 import java.text.Collator;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -71,7 +70,7 @@ import java.util.Map;
 
 import javax.mail.internet.InternetAddress;
 
-public class FragmentDialogFolder extends FragmentDialogBase {
+public class FragmentDialogSelectFolder extends FragmentDialogBase {
     private int result = 0;
     private AdapterFolder adapter;
     private LinearLayoutManager llm;
@@ -309,7 +308,7 @@ public class FragmentDialogFolder extends FragmentDialogBase {
 
                 FragmentDialogEditName fragment = new FragmentDialogEditName();
                 fragment.setArguments(args);
-                fragment.setTargetFragment(FragmentDialogFolder.this, REQUEST_FOLDER_NAME);
+                fragment.setTargetFragment(FragmentDialogSelectFolder.this, REQUEST_FOLDER_NAME);
                 fragment.show(getParentFragmentManager(), "folder:name");
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 312d5e32fb..d7aadb1212 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1771,7 +1771,7 @@ public class FragmentMessages extends FragmentBase
                         aargs.putLongArray("disabled", new long[]{});
                         aargs.putSerializable("criteria", criteria);
 
-                        FragmentDialogFolder fragment = new FragmentDialogFolder();
+                        FragmentDialogSelectFolder fragment = new FragmentDialogSelectFolder();
                         fragment.setArguments(aargs);
                         fragment.setTargetFragment(FragmentMessages.this, REQUEST_SEARCH);
                         fragment.show(getParentFragmentManager(), "messages:search");
@@ -2122,7 +2122,7 @@ public class FragmentMessages extends FragmentBase
                                 args.putBoolean("filter_archive", filter_archive);
                                 args.putLongArray("disabled", new long[]{folder});
 
-                                FragmentDialogFolder fragment = new FragmentDialogFolder();
+                                FragmentDialogSelectFolder fragment = new FragmentDialogSelectFolder();
                                 fragment.setArguments(args);
                                 fragment.setTargetFragment(FragmentMessages.this, REQUEST_THREAD_MOVE);
                                 fragment.show(getParentFragmentManager(), "overscroll:move");
@@ -3234,7 +3234,7 @@ public class FragmentMessages extends FragmentBase
             args.putBoolean("copy", false);
             args.putBoolean("similar", true);
 
-            FragmentDialogFolder fragment = new FragmentDialogFolder();
+            FragmentDialogSelectFolder fragment = new FragmentDialogSelectFolder();
             fragment.setArguments(args);
             fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGE_MOVE);
             fragment.show(getParentFragmentManager(), "swipe:move");
@@ -4418,7 +4418,7 @@ public class FragmentMessages extends FragmentBase
         args.putLongArray("disabled", Helper.toLongArray(disabled));
         args.putLongArray("messages", getSelection());
 
-        FragmentDialogFolder fragment = new FragmentDialogFolder();
+        FragmentDialogSelectFolder fragment = new FragmentDialogSelectFolder();
         fragment.setArguments(args);
         fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGES_MOVE);
         fragment.show(getParentFragmentManager(), "messages:move");
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index 2d47dd9ad6..9b30cc6f0b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -536,7 +536,7 @@ public class FragmentRule extends FragmentBase {
                         args.putLong("account", account);
                         args.putLongArray("disabled", new long[]{});
 
-                        FragmentDialogFolder fragment = new FragmentDialogFolder();
+                        FragmentDialogSelectFolder fragment = new FragmentDialogSelectFolder();
                         fragment.setArguments(args);
                         fragment.setTargetFragment(FragmentRule.this, REQUEST_FOLDER);
                         fragment.show(getParentFragmentManager(), "rule:folder");