[MailNews] Allow ordering of accounts to respect mail.accountmanager.accounts

1 files changed, 8 insertions, 1 deletions

diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm
index 62fb7700b4..9d2918a7a9 100644
--- a/mailnews/base/util/folderUtils.jsm
+++ b/mailnews/base/util/folderUtils.jsm
@@ -12,6 +12,7 @@ this.EXPORTED_SYMBOLS = ["getFolderProperties", "getSpecialFolderString",
 
 Components.utils.import("resource:///modules/mailServices.js");
 Components.utils.import("resource:///modules/iteratorUtils.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 /**
  * Returns a string representation of a folder's "special" type.
@@ -169,8 +170,14 @@ function allAccountsSorted(aExcludeIMAccounts) {
       return a.incomingServer.type != "im";
     });
   }
+  
+  // Sort the accounts else will respect the order in mail.accountmanager.accounts
+  if (Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) {
+    accountList = accountList.sort(compareAccounts);
+  }
+
 
-  return accountList.sort(compareAccounts);
+  return accountList;
 }
 
 /**