Bug 880464 - Setting up an RSS account first should not make it the default account. r=bwinton, r=IanN

mailnews/base/prefs/content/AccountWizard.js

@@ -186,7 +186,7 @@ function FinishAccount()
     
     setupCopiesAndFoldersServer(gCurrentAccount, getCurrentServerIsDeferred(pageData), accountData);
 
-    if (!serverIsNntp(pageData))
+    if (gCurrentAccount.incomingServer.canBeDefaultServer)
       EnableCheckMailAtStartUpIfNeeded(gCurrentAccount);
 
     if (!document.getElementById("downloadMsgs").hidden) {

mailnews/base/prefs/content/accountcreation/createInBackend.js

@@ -166,7 +166,9 @@ function createAccountInBackend(config)
   let account = MailServices.accounts.createAccount();
   account.addIdentity(identity);
   account.incomingServer = inServer;
-  if (!MailServices.accounts.defaultAccount)
+  if (inServer.canBeDefaultServer && (!MailServices.accounts.defaultAccount ||
+                                      !MailServices.accounts.defaultAccount
+                                       .incomingServer.canBeDefaultServer))
     MailServices.accounts.defaultAccount = account;
 
   verifyLocalFoldersAccount(MailServices.accounts);