diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 991cf106c4..d0f5b59642 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -312,7 +312,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                 if (account < 0 && !primary)
                     tvType.setText(folder.accountName);
                 else
-                    tvType.setText(Helper.localizeFolderType(context, folder.type));
+                    tvType.setText(EntityFolder.localizeType(context, folder.type));
 
                 tvTotal.setText(folder.total == null ? "" : NF.format(folder.total));
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
index b5352b046d..a1cbebac72 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
@@ -95,10 +95,10 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
                 count = folder.unseen;
 
             if (count == 0)
-                tvItem.setText(Helper.localizeFolderType(context, folder.type));
+                tvItem.setText(EntityFolder.localizeType(context, folder.type));
             else
                 tvItem.setText(context.getString(R.string.title_name_count,
-                        Helper.localizeFolderType(context, folder.type), NF.format(count)));
+                        EntityFolder.localizeType(context, folder.type), NF.format(count)));
 
             tvItem.setTextColor(count == 0 ? textColorSecondary : colorUnread);
             tvItem.setTypeface(count == 0 ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index 04c91b03ec..9eba14ac2c 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -295,14 +295,14 @@ public class EntityFolder extends EntityOrder implements Serializable {
     }
 
     String getDisplayName(Context context) {
-        return (display == null ? Helper.localizeFolderName(context, name) : display);
+        return (display == null ? localizeName(context, name) : display);
     }
 
     String getDisplayName(Context context, EntityFolder parent) {
         String n = name;
         if (parent != null && name.startsWith(parent.name))
             n = n.substring(parent.name.length() + 1);
-        return (display == null ? Helper.localizeFolderName(context, n) : display);
+        return (display == null ? localizeName(context, n) : display);
     }
 
     @Override
@@ -432,6 +432,23 @@ public class EntityFolder extends EntityOrder implements Serializable {
         }
     }
 
+    static String localizeType(Context context, String type) {
+        int resid = context.getResources().getIdentifier(
+                "title_folder_" + type.toLowerCase(Locale.ROOT),
+                "string",
+                context.getPackageName());
+        return (resid > 0 ? context.getString(resid) : type);
+    }
+
+    static String localizeName(Context context, String name) {
+        if (name != null && "INBOX".equals(name.toUpperCase(Locale.ROOT)))
+            return context.getString(R.string.title_folder_inbox);
+        else if ("OUTBOX".equals(name))
+            return context.getString(R.string.title_folder_outbox);
+        else
+            return name;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof EntityFolder) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 4ad99710f5..d82e8d6af7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -247,7 +247,7 @@ public class FragmentFolder extends FragmentBase {
                     int interval = args.getInt("interval", EntityAccount.DEFAULT_KEEP_ALIVE_INTERVAL);
                     etName.setText(folder == null ? null : folder.name);
                     etDisplay.setText(folder == null ? null : folder.display);
-                    etDisplay.setHint(folder == null ? null : Helper.localizeFolderName(getContext(), folder.name));
+                    etDisplay.setHint(folder == null ? null : EntityFolder.localizeName(getContext(), folder.name));
                     btnColor.setColor(folder == null ? null : folder.color);
                     cbHide.setChecked(folder == null ? false : folder.hide);
                     cbUnified.setChecked(folder == null ? false : folder.unified);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 25a8ee6611..2b58748918 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3841,7 +3841,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             if (type == null)
                 name = getString(R.string.title_folder_unified);
             else
-                name = Helper.localizeFolderType(getContext(), type);
+                name = EntityFolder.localizeType(getContext(), type);
         else {
             name = (folders.size() > 0 ? folders.get(0).getDisplayName(getContext()) : "");
             if (folders.size() == 1) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index fa9395f0f7..c68fe93bca 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -1066,7 +1066,7 @@ public class FragmentRule extends FragmentBase {
         public AccountFolder(EntityAccount account, EntityFolder folder, Context context) {
             this.account = account;
             this.folder = folder;
-            this.name = account.name + "/" + Helper.localizeFolderName(context, folder.name);
+            this.name = account.name + "/" + EntityFolder.localizeName(context, folder.name);
         }
 
         @NonNull
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 0520e72720..31af3b7bf5 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -718,23 +718,6 @@ public class Helper {
             return DateUtils.getRelativeTimeSpanString(context, millis);
     }
 
-    static String localizeFolderType(Context context, String type) {
-        int resid = context.getResources().getIdentifier(
-                "title_folder_" + type.toLowerCase(Locale.ROOT),
-                "string",
-                context.getPackageName());
-        return (resid > 0 ? context.getString(resid) : type);
-    }
-
-    static String localizeFolderName(Context context, String name) {
-        if (name != null && "INBOX".equals(name.toUpperCase(Locale.ROOT)))
-            return context.getString(R.string.title_folder_inbox);
-        else if ("OUTBOX".equals(name))
-            return context.getString(R.string.title_folder_outbox);
-        else
-            return name;
-    }
-
     static void linkPro(final TextView tv) {
         if (ActivityBilling.isPro(tv.getContext()) && !BuildConfig.DEBUG)
             hide(tv);
diff --git a/app/src/main/java/eu/faircode/email/TupleMessageEx.java b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
index b9b9c3190e..d9f03c0755 100644
--- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
@@ -68,7 +68,7 @@ public class TupleMessageEx extends EntityMessage {
 
     String getFolderName(Context context) {
         return (folderDisplay == null
-                ? Helper.localizeFolderName(context, folderName)
+                ? EntityFolder.localizeName(context, folderName)
                 : folderDisplay);
     }