diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index f5c5fe4451..20790d5b82 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -619,21 +619,11 @@ public class EntityMessage implements Serializable {
     }
 
     static File getFile(Context context, Long id) {
-        File root = Helper.ensureExists(new File(getRoot(context), "messages"));
+        File root = Helper.ensureExists(new File(context.getFilesDir(), "messages"));
         File dir = Helper.ensureExists(new File(root, "D" + (id / 1000)));
         return new File(dir, id.toString());
     }
 
-    static File getRoot(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        boolean external_storage = prefs.getBoolean("external_storage_message", false);
-
-        File root = (external_storage
-                ? Helper.getExternalFilesDir(context)
-                : context.getFilesDir());
-        return root;
-    }
-
     static void convert(Context context) {
         File root = new File(context.getFilesDir(), "messages");
         List<File> files = Helper.listFiles(root);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index f40047d10c..0e8a2a8375 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -1094,8 +1094,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 SharedPreferences.Editor editor = prefs.edit();
                 editor.putBoolean("external_storage", isChecked);
-                if (BuildConfig.DEBUG)
-                    editor.putBoolean("external_storage_message", isChecked);
                 editor.apply();
 
                 Bundle args = new Bundle();