diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm
index 9d2918a7a9..06e8e4bf2b 100644
--- a/mailnews/base/util/folderUtils.jsm
+++ b/mailnews/base/util/folderUtils.jsm
@@ -176,6 +176,10 @@ function allAccountsSorted(aExcludeIMAccounts) {
     accountList = accountList.sort(compareAccounts);
   }
 
+  // Set "Local Folders" as always the first displayed account
+  if (Services.prefs.getBoolPref("mail.accountmanager.localfolderfirst", false)) {
+    accountList.unshift(accountList.splice(accountList.findIndex(item => item.key === "account1"), 1)[0]);
+  }
 
   return accountList;
 }
diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
index 7aa83c6257..afb5ac7f20 100644
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -432,6 +432,7 @@ pref("mail.default_sendlater_uri", "mailbox://nobody@Local%20Folders/Unsent%20Me
 pref("mail.smtpservers", "");
 pref("mail.accountmanager.accounts", "");
 pref("mail.accountmanager.accounts.ordered", true); 
+pref("mail.accountmanager.localfolderfirst", false);
 
 // Last used account key value
 pref("mail.account.lastKey", 0);