From db770e154b1c025021465917bcb065f4e8b21e4b Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Tue, 20 Apr 2004 23:35:41 +0000
Subject: [PATCH] Bug 86132 Show some disk space settings for local folders
 p=ian@arlen.demon.co.uk r=bienvenu sr=mscott

---
 .../prefs/resources/content/am-offline.xul    |   22 +-
 mailnews/base/src/nsMsgAccountManagerDS.cpp   | 1085 +++++++++--------
 2 files changed, 554 insertions(+), 553 deletions(-)

diff --git a/mailnews/base/prefs/resources/content/am-offline.xul b/mailnews/base/prefs/resources/content/am-offline.xul
index 4840a16ca7e3..6006888f2c13 100644
--- a/mailnews/base/prefs/resources/content/am-offline.xul
+++ b/mailnews/base/prefs/resources/content/am-offline.xul
@@ -62,28 +62,28 @@
 
     <dialogheader id="headertitle"/>
 
-    <groupbox id="offline.titlebox" hidefor="movemail,pop3">
+    <groupbox id="offline.titlebox" hidefor="movemail,pop3,none">
       <caption label="&offlineGroupTitle.label;"/>
 
     <description hidefor="movemail,pop3">&offlineDesc.label;</description>
 
-    <checkbox hidefor="movemail,pop3,nntp" 
+    <checkbox hidefor="movemail,pop3,nntp,none" 
               id="offline.downloadBodiesOnGetNewMail" wsm_persist="true" 
               label="&makeInboxMsgsAvailable.label;" 
               accesskey="&makeInboxMsgsAvailable.accesskey;"/>
 
-    <checkbox hidefor="movemail,pop3,nntp" 
+    <checkbox hidefor="movemail,pop3,nntp,none" 
               id="offline.newFolder" label="&offlineNewFolder.label;" 
               accesskey="&offlineNewFolder.accesskey;"/>
 
-    <separator class="thin" hidefor="movemail,pop3,nntp"/>
+    <separator class="thin" hidefor="movemail,pop3,nntp,none"/>
 
-    <hbox hidefor="movemail,pop3,nntp" align="right">
+    <hbox hidefor="movemail,pop3,nntp,none" align="right">
         <button label="&offlineSelectImap.label;" accesskey="&offlineSelect.accesskey;"
                 oncommand="onClickSelect()" id="selectImapFoldersButton" class="selectForOfflineUseButton"/>
     </hbox>
 
-    <hbox hidefor="movemail,pop3,imap" align="right">
+    <hbox hidefor="movemail,pop3,imap,none" align="right">
         <button label="&offlineSelectNntp.label;" accesskey="&offlineSelect.accesskey;"
                 oncommand="onClickSelect()" id="selectNewsgroupsButton" class="selectForOfflineUseButton"/>
     </hbox>
@@ -93,22 +93,22 @@
     <groupbox id="diskspace.titlebox">
       <caption label="&diskspaceGroupTitle.label;"/>
 
-    <description hidefor="pop3,movemail">&doNotDownload.label;</description>
-    <description hidefor="imap,nntp">&doNotDownloadPop3Movemail.label;</description>
+    <description hidefor="pop3,movemail,none">&doNotDownload.label;</description>
+    <description hidefor="imap,nntp,none">&doNotDownloadPop3Movemail.label;</description>
     
     <hbox align="center" class="indent">
-        <checkbox hidefor="movemail,pop3,imap" wsm_persist="true" id="nntp.notDownloadRead"
+        <checkbox hidefor="movemail,pop3,imap,none" wsm_persist="true" id="nntp.notDownloadRead"
                   label="&nntpNotDownloadRead.label;" accesskey="&nntpNotDownloadRead.accesskey;"/>
     </hbox>
 
-    <hbox align="center" class="indent">
+    <hbox align="center" class="indent" hidefor="none">
         <checkbox  wsm_persist="true" id="offline.notDownload"
             label="&offlineNotDownload.label;" accesskey="&offlineNotDownload.accesskey;" oncommand="onCheckItem('bc_notDownload', 'offline.notDownload');"/>
         <textbox wsm_persist="true" id="offline.notDownloadMin" size="2" value="50"  observes="bc_notDownload"/> 
         <label value="&kb.label;"/>
     </hbox>
 
-    <hbox align="center" class="indent" hidefor="movemail,pop3,imap">
+    <hbox align="center" class="indent" hidefor="movemail,pop3,imap,none">
         <checkbox wsm_persist="true" id="nntp.downloadMsg" label="&nntpDownloadMsg.label;" accesskey="&nntpDownloadMsg.accesskey;" oncommand="onCheckItem('bc_downloadMsg', 'nntp.downloadMsg');"/>
         <textbox wsm_persist="true" id="nntp.downloadMsgMin" size="2" value="30" observes="bc_downloadMsg"/>
         <label value="&daysOld.label;"/>
diff --git a/mailnews/base/src/nsMsgAccountManagerDS.cpp b/mailnews/base/src/nsMsgAccountManagerDS.cpp
index 0de776ba378a..1ddd6cfd4dc6 100644
--- a/mailnews/base/src/nsMsgAccountManagerDS.cpp
+++ b/mailnews/base/src/nsMsgAccountManagerDS.cpp
@@ -89,8 +89,8 @@ typedef struct _serverCreationParams {
 } serverCreationParams;
 
 typedef struct {
-    const char* serverKey;
-    PRBool found;
+  const char* serverKey;
+  PRBool found;
 } findServerByKeyEntry;
 
 // the root resource (msgaccounts:/)
@@ -156,165 +156,164 @@ nsMsgAccountManagerDataSource::nsMsgAccountManagerDataSource()
 #ifdef DEBUG_amds
   printf("nsMsgAccountManagerDataSource() being created\n");
 #endif
-  
+
   // do per-class initialization here
   if (gAccountManagerResourceRefCnt++ == 0) {
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_CHILD), &kNC_Child);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_NAME), &kNC_Name);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_FOLDERTREENAME),
-                                   &kNC_FolderTreeName);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_FOLDERTREESIMPLENAME),
-                                   &kNC_FolderTreeSimpleName);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_NAME_SORT), &kNC_NameSort);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_FOLDERTREENAME_SORT),
-                                   &kNC_FolderTreeNameSort);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETAG), &kNC_PageTag);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_ISDEFAULTSERVER),
-                                   &kNC_IsDefaultServer);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_SUPPORTSFILTERS),
-                                   &kNC_SupportsFilters);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_CANGETMESSAGES),
-                                   &kNC_CanGetMessages);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_CANGETINCOMINGMESSAGES),
-                                   &kNC_CanGetIncomingMessages);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_ACCOUNT), &kNC_Account);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_SERVER), &kNC_Server);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_IDENTITY), &kNC_Identity);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_MAIN),
-                                   &kNC_PageTitleMain);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_SERVER),
-                                   &kNC_PageTitleServer);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_COPIES),
-                                   &kNC_PageTitleCopies);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_OFFLINEANDDISKSPACE),
-                                   &kNC_PageTitleOfflineAndDiskSpace);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_DISKSPACE),
-                                   &kNC_PageTitleDiskSpace);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_ADDRESSING),
-                                   &kNC_PageTitleAddressing);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_ADVANCED),
-                                   &kNC_PageTitleAdvanced);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_SMTP),
-                                   &kNC_PageTitleSMTP);
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_FAKEACCOUNT),
-                                   &kNC_PageTitleFakeAccount);
-      
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_ACCOUNTROOT),
-                                   &kNC_AccountRoot);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_CHILD), &kNC_Child);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_NAME), &kNC_Name);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_FOLDERTREENAME),
+                                 &kNC_FolderTreeName);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_FOLDERTREESIMPLENAME),
+                                 &kNC_FolderTreeSimpleName);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_NAME_SORT), &kNC_NameSort);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_FOLDERTREENAME_SORT),
+                                 &kNC_FolderTreeNameSort);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETAG), &kNC_PageTag);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_ISDEFAULTSERVER),
+                                 &kNC_IsDefaultServer);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_SUPPORTSFILTERS),
+                                 &kNC_SupportsFilters);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_CANGETMESSAGES),
+                                 &kNC_CanGetMessages);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_CANGETINCOMINGMESSAGES),
+                                 &kNC_CanGetIncomingMessages);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_ACCOUNT), &kNC_Account);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_SERVER), &kNC_Server);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_IDENTITY), &kNC_Identity);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_MAIN),
+                                 &kNC_PageTitleMain);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_SERVER),
+                                 &kNC_PageTitleServer);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_COPIES),
+                                 &kNC_PageTitleCopies);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_OFFLINEANDDISKSPACE),
+                                 &kNC_PageTitleOfflineAndDiskSpace);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_DISKSPACE),
+                                 &kNC_PageTitleDiskSpace);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_ADDRESSING),
+                                 &kNC_PageTitleAddressing);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_ADVANCED),
+                                 &kNC_PageTitleAdvanced);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_SMTP),
+                                 &kNC_PageTitleSMTP);
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_FAKEACCOUNT),
+                                 &kNC_PageTitleFakeAccount);
 
-      getRDFService()->GetLiteral(NS_LITERAL_STRING("true").get(),
-                                  &kTrueLiteral);
-      
-      // eventually these need to exist in some kind of array
-      // that's easily extensible
-      getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_SETTINGS), &kNC_Settings);
-      
-      kDefaultServerAtom = NS_NewAtom("DefaultServer");
-   }
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_ACCOUNTROOT),
+                                 &kNC_AccountRoot);
 
-   nsCOMPtr<nsIPrefBranchInternal> prefBranchInternal;
-   nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-   if (prefs) {
-     nsCOMPtr<nsIPrefBranch> prefBranch;
-     prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
-     if (prefBranch) {
-       prefBranchInternal = do_QueryInterface(prefBranch);
-       prefBranchInternal->AddObserver(PREF_SHOW_FAKE_ACCOUNT, this, PR_FALSE);
-     }
-   }
+    getRDFService()->GetLiteral(NS_LITERAL_STRING("true").get(),
+                                &kTrueLiteral);
+
+    // eventually these need to exist in some kind of array
+    // that's easily extensible
+    getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_SETTINGS), &kNC_Settings);
+
+    kDefaultServerAtom = NS_NewAtom("DefaultServer");
+  }
+
+  nsCOMPtr<nsIPrefBranchInternal> prefBranchInternal;
+  nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
+  if (prefs) {
+    nsCOMPtr<nsIPrefBranch> prefBranch;
+    prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
+    if (prefBranch) {
+      prefBranchInternal = do_QueryInterface(prefBranch);
+      prefBranchInternal->AddObserver(PREF_SHOW_FAKE_ACCOUNT, this, PR_FALSE);
+    }
+  }
 }
 
 nsMsgAccountManagerDataSource::~nsMsgAccountManagerDataSource()
 {
-    nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager);
-    if (am)
-      am->RemoveIncomingServerListener(this);
-    
-	if (--gAccountManagerResourceRefCnt == 0)
-	{
-      NS_IF_RELEASE(kNC_Child);
-      NS_IF_RELEASE(kNC_Name);
-      NS_IF_RELEASE(kNC_FolderTreeName);
-      NS_IF_RELEASE(kNC_FolderTreeSimpleName);
-      NS_IF_RELEASE(kNC_NameSort);
-      NS_IF_RELEASE(kNC_FolderTreeNameSort);
-      NS_IF_RELEASE(kNC_PageTag);
-      NS_IF_RELEASE(kNC_IsDefaultServer);
-      NS_IF_RELEASE(kNC_SupportsFilters);
-      NS_IF_RELEASE(kNC_CanGetMessages);
-      NS_IF_RELEASE(kNC_CanGetIncomingMessages);
-      NS_IF_RELEASE(kNC_Account);
-      NS_IF_RELEASE(kNC_Server);
-      NS_IF_RELEASE(kNC_Identity);
-      NS_IF_RELEASE(kNC_PageTitleMain);
-      NS_IF_RELEASE(kNC_PageTitleServer);
-      NS_IF_RELEASE(kNC_PageTitleCopies);
-      NS_IF_RELEASE(kNC_PageTitleOfflineAndDiskSpace);
-      NS_IF_RELEASE(kNC_PageTitleDiskSpace);
-      NS_IF_RELEASE(kNC_PageTitleAddressing);
-      NS_IF_RELEASE(kNC_PageTitleAdvanced);
-      NS_IF_RELEASE(kNC_PageTitleSMTP);
-      NS_IF_RELEASE(kNC_PageTitleFakeAccount);
-      NS_IF_RELEASE(kTrueLiteral);
-      
-      NS_IF_RELEASE(kNC_AccountRoot);
-      
-      // eventually these need to exist in some kind of array
-      // that's easily extensible
-      NS_IF_RELEASE(kNC_Settings);
+  nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager);
+  if (am)
+    am->RemoveIncomingServerListener(this);
+
+  if (--gAccountManagerResourceRefCnt == 0) {
+    NS_IF_RELEASE(kNC_Child);
+    NS_IF_RELEASE(kNC_Name);
+    NS_IF_RELEASE(kNC_FolderTreeName);
+    NS_IF_RELEASE(kNC_FolderTreeSimpleName);
+    NS_IF_RELEASE(kNC_NameSort);
+    NS_IF_RELEASE(kNC_FolderTreeNameSort);
+    NS_IF_RELEASE(kNC_PageTag);
+    NS_IF_RELEASE(kNC_IsDefaultServer);
+    NS_IF_RELEASE(kNC_SupportsFilters);
+    NS_IF_RELEASE(kNC_CanGetMessages);
+    NS_IF_RELEASE(kNC_CanGetIncomingMessages);
+    NS_IF_RELEASE(kNC_Account);
+    NS_IF_RELEASE(kNC_Server);
+    NS_IF_RELEASE(kNC_Identity);
+    NS_IF_RELEASE(kNC_PageTitleMain);
+    NS_IF_RELEASE(kNC_PageTitleServer);
+    NS_IF_RELEASE(kNC_PageTitleCopies);
+    NS_IF_RELEASE(kNC_PageTitleOfflineAndDiskSpace);
+    NS_IF_RELEASE(kNC_PageTitleDiskSpace);
+    NS_IF_RELEASE(kNC_PageTitleAddressing);
+    NS_IF_RELEASE(kNC_PageTitleAdvanced);
+    NS_IF_RELEASE(kNC_PageTitleSMTP);
+    NS_IF_RELEASE(kNC_PageTitleFakeAccount);
+    NS_IF_RELEASE(kTrueLiteral);
+
+    NS_IF_RELEASE(kNC_AccountRoot);
+
+    // eventually these need to exist in some kind of array
+    // that's easily extensible
+    NS_IF_RELEASE(kNC_Settings);
 
 
-      NS_IF_RELEASE(kDefaultServerAtom);
-      mAccountArcsOut = nsnull;
-      mAccountRootArcsOut = nsnull;
-	}
+    NS_IF_RELEASE(kDefaultServerAtom);
+    mAccountArcsOut = nsnull;
+    mAccountRootArcsOut = nsnull;
+  }
 
 }
 
 NS_IMPL_ADDREF_INHERITED(nsMsgAccountManagerDataSource, nsMsgRDFDataSource)
 NS_IMPL_RELEASE_INHERITED(nsMsgAccountManagerDataSource, nsMsgRDFDataSource)
 NS_INTERFACE_MAP_BEGIN(nsMsgAccountManagerDataSource)
-    NS_INTERFACE_MAP_ENTRY(nsIIncomingServerListener)
-    NS_INTERFACE_MAP_ENTRY(nsIFolderListener)
+  NS_INTERFACE_MAP_ENTRY(nsIIncomingServerListener)
+  NS_INTERFACE_MAP_ENTRY(nsIFolderListener)
 NS_INTERFACE_MAP_END_INHERITING(nsMsgRDFDataSource)
 
 nsresult
 nsMsgAccountManagerDataSource::Init()
 {
-    nsresult rv;
+  nsresult rv;
 
-    rv = nsMsgRDFDataSource::Init();
-    if (NS_FAILED(rv)) return rv;
-    
-    nsCOMPtr<nsIMsgAccountManager> am;
+  rv = nsMsgRDFDataSource::Init();
+  if (NS_FAILED(rv)) return rv;
 
-    // get a weak ref to the account manager
-    if (!mAccountManager) {
-        am = do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv);
-        mAccountManager = do_GetWeakReference(am);
-    } else
-        am = do_QueryReferent(mAccountManager);
+  nsCOMPtr<nsIMsgAccountManager> am;
 
-    if (am) {
-        am->AddIncomingServerListener(this);
-        am->AddRootFolderListener(this);
-    }
-    
+  // get a weak ref to the account manager
+  if (!mAccountManager) {
+    am = do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv);
+    mAccountManager = do_GetWeakReference(am);
+  }
+  else
+    am = do_QueryReferent(mAccountManager);
 
-    return NS_OK;
+  if (am) {
+    am->AddIncomingServerListener(this);
+    am->AddRootFolderListener(this);
+  }
+
+
+  return NS_OK;
 }
 
 void nsMsgAccountManagerDataSource::Cleanup()
 {
-    nsCOMPtr<nsIMsgAccountManager> am =
-        do_QueryReferent(mAccountManager);
+  nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager);
 
-    if (am) {
-        am->RemoveIncomingServerListener(this);
-        am->RemoveRootFolderListener(this);
-    }
+  if (am) {
+    am->RemoveIncomingServerListener(this);
+    am->RemoveRootFolderListener(this);
+  }
 
-	nsMsgRDFDataSource::Cleanup();
+  nsMsgRDFDataSource::Cleanup();
 }
 
 /* nsIRDFNode GetTarget (in nsIRDFResource aSource, in nsIRDFResource property, in boolean aTruthValue); */
@@ -325,114 +324,113 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
                                          nsIRDFNode **target)
 {
   nsresult rv;
-    
+
 
   rv = NS_RDF_NO_VALUE;
 
   nsAutoString str;
-  if (property == kNC_Name || property == kNC_FolderTreeName || property == kNC_FolderTreeSimpleName) {
+  if (property == kNC_Name || property == kNC_FolderTreeName ||
+      property == kNC_FolderTreeSimpleName) {
 
-      rv = getStringBundle();
-      NS_ENSURE_SUCCESS(rv, rv);
-      
-      nsXPIDLString pageTitle;
-      if (source == kNC_PageTitleServer)
-          mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-server").get(),
-                                           getter_Copies(pageTitle));
-      
-      else if (source == kNC_PageTitleCopies)
-          mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-copies").get(),
-                                           getter_Copies(pageTitle));
-      else if (source == kNC_PageTitleOfflineAndDiskSpace)
-          mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-offline-and-diskspace").get(),
-                                           getter_Copies(pageTitle));
-      else if (source == kNC_PageTitleDiskSpace)
-          mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-diskspace").get(),
-                                           getter_Copies(pageTitle));
-      else if (source == kNC_PageTitleAddressing)
-          mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-addressing").get(),
-                                           getter_Copies(pageTitle));
+    rv = getStringBundle();
+    NS_ENSURE_SUCCESS(rv, rv);
 
-      else if (source == kNC_PageTitleAdvanced)
-          mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-advanced").get(),
-                                           getter_Copies(pageTitle));
+    nsXPIDLString pageTitle;
+    if (source == kNC_PageTitleServer)
+      mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-server").get(),
+                                       getter_Copies(pageTitle));
 
-      else if (source == kNC_PageTitleSMTP)
-          mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-smtp").get(),
-                                           getter_Copies(pageTitle));
+    else if (source == kNC_PageTitleCopies)
+      mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-copies").get(),
+                                       getter_Copies(pageTitle));
+    else if (source == kNC_PageTitleOfflineAndDiskSpace)
+      mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-offline-and-diskspace").get(),
+                                       getter_Copies(pageTitle));
+    else if (source == kNC_PageTitleDiskSpace)
+      mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-diskspace").get(),
+                                       getter_Copies(pageTitle));
+    else if (source == kNC_PageTitleAddressing)
+      mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-addressing").get(),
+                                       getter_Copies(pageTitle));
 
-      else if (source == kNC_PageTitleFakeAccount) {
-        nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
-        nsCOMPtr<nsIPrefBranch> prefBranch;
+    else if (source == kNC_PageTitleAdvanced)
+      mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-advanced").get(),
+                                       getter_Copies(pageTitle));
+
+    else if (source == kNC_PageTitleSMTP)
+      mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-smtp").get(),
+                                       getter_Copies(pageTitle));
+
+    else if (source == kNC_PageTitleFakeAccount) {
+      nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
+      nsCOMPtr<nsIPrefBranch> prefBranch;
+      if (NS_SUCCEEDED(rv))
+        rv = prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
+      PRBool showFakeAccount;
+      rv = prefBranch->GetBoolPref(PREF_SHOW_FAKE_ACCOUNT, &showFakeAccount);
+      if (showFakeAccount) {
+        nsCOMPtr<nsIStringBundleService> strBundleService =
+          do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
+        if (NS_FAILED(rv)) return rv;
+        nsCOMPtr<nsIStringBundle> bundle;
+        rv = strBundleService->CreateBundle("chrome://messenger/locale/fakeAccount.properties",
+                                             getter_AddRefs(bundle));
         if (NS_SUCCEEDED(rv))
-          rv = prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
-        PRBool showFakeAccount;
-        rv = prefBranch->GetBoolPref(PREF_SHOW_FAKE_ACCOUNT, &showFakeAccount);
-        if (showFakeAccount) {
-          nsCOMPtr<nsIStringBundleService> strBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
-          if (NS_FAILED(rv)) return rv;
-          nsCOMPtr<nsIStringBundle> bundle;
-          rv = strBundleService->CreateBundle("chrome://messenger/locale/fakeAccount.properties",
-                                               getter_AddRefs(bundle));
-          if (NS_SUCCEEDED(rv))
-              bundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-fake-account").get(), 
-                                               getter_Copies(pageTitle));
-        }
+          bundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-fake-account").get(),
+                                    getter_Copies(pageTitle));
       }
+    }
 
+    else {
+      // if it's a server, use the pretty name
+      nsCOMPtr<nsIMsgFolder> folder = do_QueryInterface(source, &rv);
+      if (NS_SUCCEEDED(rv) && folder) {
+        PRBool isServer;
+        rv = folder->GetIsServer(&isServer);
+        if (NS_SUCCEEDED(rv) && isServer)
+          rv = folder->GetPrettyName(getter_Copies(pageTitle));
+      }
       else {
-          // if it's a server, use the pretty name
-          nsCOMPtr<nsIMsgFolder> folder = do_QueryInterface(source, &rv);
-          if (NS_SUCCEEDED(rv) && folder) {
-              PRBool isServer;
-              rv = folder->GetIsServer(&isServer);
-              if(NS_SUCCEEDED(rv) && isServer)
-                  rv = folder->GetPrettyName(getter_Copies(pageTitle));
-          }
-          else {
-            // allow for the accountmanager to be dynamically extended.
+        // allow for the accountmanager to be dynamically extended.
 
-            nsCOMPtr<nsIStringBundleService> strBundleService =
-                do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
-            NS_ENSURE_SUCCESS(rv,rv);
+        nsCOMPtr<nsIStringBundleService> strBundleService =
+          do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
+        NS_ENSURE_SUCCESS(rv,rv);
 
-            const char *sourceValue;
-            rv = source->GetValueConst(&sourceValue);
-            NS_ENSURE_SUCCESS(rv,rv);
+        const char *sourceValue;
+        rv = source->GetValueConst(&sourceValue);
+        NS_ENSURE_SUCCESS(rv,rv);
 
-            // make sure the pointer math we're about to do is safe.
-            NS_ENSURE_TRUE(sourceValue && (strlen(sourceValue) > strlen(NC_RDF_PAGETITLE_PREFIX)), NS_ERROR_UNEXPECTED);
+        // make sure the pointer math we're about to do is safe.
+        NS_ENSURE_TRUE(sourceValue && (strlen(sourceValue) > strlen(NC_RDF_PAGETITLE_PREFIX)), NS_ERROR_UNEXPECTED);
 
-            nsCOMPtr<nsIMsgAccountManager> am =
-              do_QueryReferent(mAccountManager, &rv);
-            NS_ENSURE_SUCCESS(rv, PR_FALSE);
-            
-            // turn NC#PageTitlefoobar into foobar, so we can get the am-foobar.properties bundle
-            nsXPIDLCString chromePackageName;
-            rv = am->GetChromePackageName((sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX)), getter_Copies(chromePackageName));
-            NS_ENSURE_SUCCESS(rv,rv);
+        nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager, &rv);
+        NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
-            nsCAutoString bundleURL;
-            bundleURL = "chrome://";
-            bundleURL += chromePackageName;
-            bundleURL += "/locale/am-";
-            bundleURL += (sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX));
-            bundleURL += ".properties";
+        // turn NC#PageTitlefoobar into foobar, so we can get the am-foobar.properties bundle
+        nsXPIDLCString chromePackageName;
+        rv = am->GetChromePackageName((sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX)), getter_Copies(chromePackageName));
+        NS_ENSURE_SUCCESS(rv,rv);
 
-            nsCOMPtr <nsIStringBundle> bundle;
-            rv = strBundleService->CreateBundle(bundleURL.get(),
-                                        getter_AddRefs(bundle));
+        nsCAutoString bundleURL;
+        bundleURL = "chrome://";
+        bundleURL += chromePackageName;
+        bundleURL += "/locale/am-";
+        bundleURL += (sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX));
+        bundleURL += ".properties";
 
-            NS_ENSURE_SUCCESS(rv,rv);
+        nsCOMPtr <nsIStringBundle> bundle;
+        rv = strBundleService->CreateBundle(bundleURL.get(), getter_AddRefs(bundle));
 
-            nsAutoString panelTitleName;
-            panelTitleName = NS_LITERAL_STRING("prefPanel-");
-            panelTitleName.AppendWithConversion(sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX));
-            bundle->GetStringFromName(panelTitleName.get(),
-                getter_Copies(pageTitle));
+        NS_ENSURE_SUCCESS(rv,rv);
+
+        nsAutoString panelTitleName;
+        panelTitleName = NS_LITERAL_STRING("prefPanel-");
+        panelTitleName.AppendWithConversion(sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX));
+        bundle->GetStringFromName(panelTitleName.get(), getter_Copies(pageTitle));
       }
-  }
-      str = pageTitle.get();
+    }
+    str = pageTitle.get();
   }
   else if (property == kNC_PageTag) {
     // do NOT localize these strings. these are the urls of the XUL files
@@ -440,23 +438,24 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
       str = NS_LITERAL_STRING("am-server.xul");
     else if (source == kNC_PageTitleCopies)
       str = NS_LITERAL_STRING("am-copies.xul");
-    else if ((source == kNC_PageTitleOfflineAndDiskSpace) || (source == kNC_PageTitleDiskSpace))
+    else if ((source == kNC_PageTitleOfflineAndDiskSpace) ||
+             (source == kNC_PageTitleDiskSpace))
       str = NS_LITERAL_STRING("am-offline.xul");
     else if (source == kNC_PageTitleAddressing)
       str = NS_LITERAL_STRING("am-addressing.xul");
     else if (source == kNC_PageTitleAdvanced)
       str = NS_LITERAL_STRING("am-advanced.xul");
-    else if (source == kNC_PageTitleSMTP) 
+    else if (source == kNC_PageTitleSMTP)
       str = NS_LITERAL_STRING("am-smtp.xul");
-    else if (source == kNC_PageTitleFakeAccount) 
+    else if (source == kNC_PageTitleFakeAccount)
       str = NS_LITERAL_STRING("am-fakeaccount.xul");
     else {
       nsCOMPtr<nsIMsgFolder> folder = do_QueryInterface(source, &rv);
       if (NS_SUCCEEDED(rv) && folder) {
-      /* if this is a server, with no identities, then we show a special panel */
-      nsCOMPtr<nsIMsgIncomingServer> server;
-      rv = getServerForFolderNode(source, getter_AddRefs(server));
-      if (server) {
+        /* if this is a server, with no identities, then we show a special panel */
+        nsCOMPtr<nsIMsgIncomingServer> server;
+        rv = getServerForFolderNode(source, getter_AddRefs(server));
+        if (server) {
           PRBool hasIdentities;
           rv = serverHasIdentities(server, &hasIdentities);
           if (NS_SUCCEEDED(rv) && !hasIdentities) {
@@ -475,10 +474,10 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
         const char *sourceValue;
         rv = source->GetValueConst(&sourceValue);
         NS_ENSURE_SUCCESS(rv,rv);
-        
+
         // make sure the pointer math we're about to do is safe.
         NS_ENSURE_TRUE(sourceValue && (strlen(sourceValue) > strlen(NC_RDF_PAGETITLE_PREFIX)), NS_ERROR_UNEXPECTED);
-        
+
         // turn NC#PageTitlefoobar into foobar, so we can get the am-foobar.xul file
         str = NS_LITERAL_STRING("am-");
         str.AppendWithConversion((sourceValue + strlen(NC_RDF_PAGETITLE_PREFIX)));
@@ -505,28 +504,27 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
     nsCOMPtr<nsIMsgIncomingServer> server;
     rv = getServerForFolderNode(source, getter_AddRefs(server));
 
-    if (NS_SUCCEEDED(rv) && server) {     
+    if (NS_SUCCEEDED(rv) && server) {
       PRInt32 accountNum;
-      nsCOMPtr<nsIMsgAccountManager> am =
-        do_QueryReferent(mAccountManager);
-      
+      nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager);
+
       if (isDefaultServer(server))
         str = NS_LITERAL_STRING("0000");
       else {
         rv = am->FindServerIndex(server, &accountNum);
         if (NS_FAILED(rv)) return rv;
-        
+
         // this is a hack for now - hardcode server order by type
         nsXPIDLCString serverType;
         server->GetType(getter_Copies(serverType));
-        
+
         if (nsCRT::strcasecmp(serverType, "none")==0)
           accountNum += 2000;
         else if (nsCRT::strcasecmp(serverType, "nntp")==0)
           accountNum += 3000;
         else
           accountNum += 1000;     // default is to appear at the top
-        
+
         str.AppendInt(accountNum);
       }
     }
@@ -534,7 +532,7 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
       const char *sourceValue;
       rv = source->GetValueConst(&sourceValue);
       NS_ENSURE_SUCCESS(rv, NS_RDF_NO_VALUE);
-      
+
       // if this is a page (which we determine by the prefix of the URI)
       // we want to generate a sort value
       // so that we can sort the categories in the account manager tree
@@ -576,7 +574,7 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
     nsCOMPtr<nsIMsgFolder> folder = do_QueryInterface(source,&rv);
     if (NS_FAILED(rv))
       return NS_RDF_NO_VALUE;
-    
+
     PRBool isServer=PR_FALSE;
     folder->GetIsServer(&isServer);
     // no need to localize this!
@@ -585,37 +583,37 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
   }
 
   else if (property == kNC_IsDefaultServer) {
-      nsCOMPtr<nsIMsgIncomingServer> thisServer;
-      rv = getServerForFolderNode(source, getter_AddRefs(thisServer));
-      if (NS_FAILED(rv) || !thisServer) return NS_RDF_NO_VALUE;
+    nsCOMPtr<nsIMsgIncomingServer> thisServer;
+    rv = getServerForFolderNode(source, getter_AddRefs(thisServer));
+    if (NS_FAILED(rv) || !thisServer) return NS_RDF_NO_VALUE;
 
-      if (isDefaultServer(thisServer))
-          str = NS_LITERAL_STRING("true");
+    if (isDefaultServer(thisServer))
+      str = NS_LITERAL_STRING("true");
   }
 
   else if (property == kNC_SupportsFilters) {
-      nsCOMPtr<nsIMsgIncomingServer> server;
-      rv = getServerForFolderNode(source, getter_AddRefs(server));
-      if (NS_FAILED(rv) || !server) return NS_RDF_NO_VALUE;
+    nsCOMPtr<nsIMsgIncomingServer> server;
+    rv = getServerForFolderNode(source, getter_AddRefs(server));
+    if (NS_FAILED(rv) || !server) return NS_RDF_NO_VALUE;
 
-      if (supportsFilters(server))
-          str = NS_LITERAL_STRING("true");
+    if (supportsFilters(server))
+      str = NS_LITERAL_STRING("true");
   }
   else if (property == kNC_CanGetMessages) {
-      nsCOMPtr<nsIMsgIncomingServer> server;
-      rv = getServerForFolderNode(source, getter_AddRefs(server));
-      if (NS_FAILED(rv) || !server) return NS_RDF_NO_VALUE;
+    nsCOMPtr<nsIMsgIncomingServer> server;
+    rv = getServerForFolderNode(source, getter_AddRefs(server));
+    if (NS_FAILED(rv) || !server) return NS_RDF_NO_VALUE;
 
-      if (canGetMessages(server))
-          str = NS_LITERAL_STRING("true");
+    if (canGetMessages(server))
+      str = NS_LITERAL_STRING("true");
   }
   else if (property == kNC_CanGetIncomingMessages) {
-      nsCOMPtr<nsIMsgIncomingServer> server;
-      rv = getServerForFolderNode(source, getter_AddRefs(server));
-      if (NS_FAILED(rv) || !server) return NS_RDF_NO_VALUE;
+    nsCOMPtr<nsIMsgIncomingServer> server;
+    rv = getServerForFolderNode(source, getter_AddRefs(server));
+    if (NS_FAILED(rv) || !server) return NS_RDF_NO_VALUE;
 
-      if (canGetIncomingMessages(server))
-          str = NS_LITERAL_STRING("true");
+    if (canGetIncomingMessages(server))
+      str = NS_LITERAL_STRING("true");
   }
   else if (property == kNC_PageTitleFakeAccount) {
     if (source == kNC_PageTitleFakeAccount)
@@ -624,10 +622,10 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
   if (!str.IsEmpty())
     rv = createNode(str.get(), target, getRDFService());
 
-  //if we have an empty string and we don't have an error value, then 
+  //if we have an empty string and we don't have an error value, then
   //we don't have a value for RDF.
   else if(NS_SUCCEEDED(rv))
-	rv = NS_RDF_NO_VALUE;
+    rv = NS_RDF_NO_VALUE;
 
   return rv;
 }
@@ -637,9 +635,9 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
 /* nsISimpleEnumerator GetTargets (in nsIRDFResource aSource, in nsIRDFResource property, in boolean aTruthValue); */
 NS_IMETHODIMP
 nsMsgAccountManagerDataSource::GetTargets(nsIRDFResource *source,
-                                   nsIRDFResource *property,
-                                   PRBool aTruthValue,
-                                   nsISimpleEnumerator **_retval)
+                                          nsIRDFResource *property,
+                                          PRBool aTruthValue,
+                                          nsISimpleEnumerator **_retval)
 {
   nsresult rv = NS_RDF_NO_VALUE;
 
@@ -659,20 +657,20 @@ nsMsgAccountManagerDataSource::GetTargets(nsIRDFResource *source,
   nsXPIDLCString property_arc;
   rv = property->GetValue(getter_Copies(property_arc));
   if (NS_FAILED(rv)) return rv;
-  
+
   printf("GetTargets(%s with arc %s...)\n",
          (const char*)source_value,
          (const char*)property_arc);
 #endif
-  
+
   if (source == kNC_AccountRoot)
-      rv = createRootResources(property, nodes);
+    rv = createRootResources(property, nodes);
   else if (property == kNC_Settings)
-      rv = createSettingsResources(source, nodes);
+    rv = createSettingsResources(source, nodes);
 
   if (NS_FAILED(rv))
-      return NS_RDF_NO_VALUE;
-    
+    return NS_RDF_NO_VALUE;
+
   return NS_OK;
 }
 
@@ -681,44 +679,43 @@ nsresult
 nsMsgAccountManagerDataSource::createRootResources(nsIRDFResource *property,
                                                    nsISupportsArray* aNodeArray)
 {
-    nsresult rv = NS_OK;
-    if (isContainment(property)) {
-        
-        nsCOMPtr<nsIMsgAccountManager> am =
-            do_QueryReferent(mAccountManager);
-        if (!am) return NS_ERROR_FAILURE;
-        
-        nsCOMPtr<nsISupportsArray> servers;
-        rv = am->GetAllServers(getter_AddRefs(servers));
-        if (NS_FAILED(rv)) return rv;
-        
-        // fill up the nodes array with the RDF Resources for the servers
-        serverCreationParams params = { aNodeArray, getRDFService() };
-        servers->EnumerateForwards(createServerResources, (void*)&params);
+  nsresult rv = NS_OK;
+  if (isContainment(property)) {
+
+    nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager);
+    if (!am) return NS_ERROR_FAILURE;
+
+    nsCOMPtr<nsISupportsArray> servers;
+    rv = am->GetAllServers(getter_AddRefs(servers));
+    if (NS_FAILED(rv)) return rv;
+
+    // fill up the nodes array with the RDF Resources for the servers
+    serverCreationParams params = { aNodeArray, getRDFService() };
+    servers->EnumerateForwards(createServerResources, (void*)&params);
 #ifdef DEBUG_amds
-        PRUint32 nodecount;
-        aNodeArray->Count(&nodecount);
-        printf("GetTargets(): added %d servers on %s\n", nodecount,
-               (const char*)property_arc);
+    PRUint32 nodecount;
+    aNodeArray->Count(&nodecount);
+    printf("GetTargets(): added %d servers on %s\n", nodecount,
+           (const char*)property_arc);
 #endif
-        // for the "settings" arc, we also want to add SMTP setting and the fake account (if required)
-        if (property == kNC_Settings) {
-            aNodeArray->AppendElement(kNC_PageTitleSMTP);
-            if (IsFakeAccountRequired())
-              aNodeArray->AppendElement(kNC_PageTitleFakeAccount);            
-        } 
-        else if (property == kNC_Child && IsFakeAccountRequired()) {
-            aNodeArray->AppendElement(kNC_PageTitleFakeAccount);
-        }
+    // for the "settings" arc, we also want to add SMTP setting and the fake account (if required)
+    if (property == kNC_Settings) {
+      aNodeArray->AppendElement(kNC_PageTitleSMTP);
+      if (IsFakeAccountRequired())
+        aNodeArray->AppendElement(kNC_PageTitleFakeAccount);
     }
+    else if (property == kNC_Child && IsFakeAccountRequired()) {
+      aNodeArray->AppendElement(kNC_PageTitleFakeAccount);
+    }
+  }
 
 #ifdef DEBUG_amds
-    else {
-        printf("unknown arc %s on msgaccounts:/\n", (const char*)property_arc);
-    }
+  else {
+    printf("unknown arc %s on msgaccounts:/\n", (const char*)property_arc);
+  }
 #endif
 
-    return rv;
+  return rv;
 }
 
 nsresult
@@ -735,26 +732,27 @@ nsMsgAccountManagerDataSource::appendGenericSettingsResources(nsIMsgIncomingServ
     while (PR_TRUE) {
       nsCOMPtr<nsISupportsCString> catEntry;
       rv = e->GetNext(getter_AddRefs(catEntry));
-      if (NS_FAILED(rv) || !catEntry) 
+      if (NS_FAILED(rv) || !catEntry)
         break;
 
       nsCAutoString entryString;
       rv = catEntry->GetData(entryString);
       if (NS_FAILED(rv))
-         break;
+        break;
 
       nsXPIDLCString contractidString;
       rv = catman->GetCategoryEntry(MAILNEWS_ACCOUNTMANAGER_EXTENSIONS, entryString.get(), getter_Copies(contractidString));
-      if (NS_FAILED(rv)) 
+      if (NS_FAILED(rv))
         break;
 
-      nsCOMPtr <nsIMsgAccountManagerExtension> extension = do_GetService(contractidString.get(), &rv);
+      nsCOMPtr <nsIMsgAccountManagerExtension> extension =
+        do_GetService(contractidString.get(), &rv);
       if (NS_FAILED(rv) || !extension)
         break;
-      
+
       PRBool showPanel;
       rv = extension->ShowPanel(server, &showPanel);
-      if (NS_FAILED(rv)) 
+      if (NS_FAILED(rv))
         break;
 
       if (showPanel) {
@@ -762,7 +760,7 @@ nsMsgAccountManagerDataSource::appendGenericSettingsResources(nsIMsgIncomingServ
         rv = extension->GetName(getter_Copies(name));
         if (NS_FAILED(rv))
           break;
-      
+
         rv = appendGenericSetting(name.get(), aNodeArray);
         if (NS_FAILED(rv))
           break;
@@ -772,8 +770,9 @@ nsMsgAccountManagerDataSource::appendGenericSettingsResources(nsIMsgIncomingServ
   return NS_OK;
 }
 
-nsresult 
-nsMsgAccountManagerDataSource::appendGenericSetting(const char *name, nsISupportsArray *aNodeArray)
+nsresult
+nsMsgAccountManagerDataSource::appendGenericSetting(const char *name,
+                                                    nsISupportsArray *aNodeArray)
 {
   NS_ENSURE_ARG_POINTER(name);
   NS_ENSURE_ARG_POINTER(aNodeArray);
@@ -797,85 +796,82 @@ nsresult
 nsMsgAccountManagerDataSource::createSettingsResources(nsIRDFResource *aSource,
                                                        nsISupportsArray *aNodeArray)
 {
-    nsresult rv;
-    if (aSource == kNC_PageTitleSMTP) {
-        // aNodeArray->AppendElement(kNC_PageTitleAdvanced);
-    } else {
+  nsresult rv;
+  if (aSource == kNC_PageTitleSMTP) {
+    // aNodeArray->AppendElement(kNC_PageTitleAdvanced);
+  }
+  else {
 
-        /* if this is a server, then support the settings */
-        nsCOMPtr<nsIMsgIncomingServer> server;
-        rv = getServerForFolderNode(aSource, getter_AddRefs(server));
-        if (NS_FAILED(rv)) return rv;
-        if (server) {
-        
-            PRBool hasIdentities;
-            rv = serverHasIdentities(server, &hasIdentities);
-            if (NS_FAILED(rv)) return rv;
-            
-            if (hasIdentities) {
-                aNodeArray->AppendElement(kNC_PageTitleServer);
-                aNodeArray->AppendElement(kNC_PageTitleCopies);
-                aNodeArray->AppendElement(kNC_PageTitleAddressing);
+    /* if this is a server, then support the settings */
+    nsCOMPtr<nsIMsgIncomingServer> server;
+    rv = getServerForFolderNode(aSource, getter_AddRefs(server));
+    if (NS_FAILED(rv)) return rv;
+    if (server) {
 
-		// XXX todo, these should not be in the if block for
-		// hasIdentities.  "Local Folders", which doesn't have any
-		// identities, still has disk space settings
-		// see bug #86132
+      PRBool hasIdentities;
+      rv = serverHasIdentities(server, &hasIdentities);
+      if (NS_FAILED(rv)) return rv;
 
-                // Check the offline capability before adding 
-                // offline item 
-                PRInt32 offlineSupportLevel = 0;
-                rv = server->GetOfflineSupportLevel(&offlineSupportLevel); 
-                NS_ENSURE_SUCCESS(rv,rv);
+      if (hasIdentities) {
+        aNodeArray->AppendElement(kNC_PageTitleServer);
+        aNodeArray->AppendElement(kNC_PageTitleCopies);
+        aNodeArray->AppendElement(kNC_PageTitleAddressing);
+      }
 
-                PRBool supportsDiskSpace;
-                rv = server->GetSupportsDiskSpace(&supportsDiskSpace); 
-                NS_ENSURE_SUCCESS(rv,rv);
-                  
-	        // currently there is no offline without diskspace
-                if (offlineSupportLevel >= OFFLINE_SUPPORT_LEVEL_REGULAR) {
-                   aNodeArray->AppendElement(kNC_PageTitleOfflineAndDiskSpace);
-                }
-                else if (supportsDiskSpace) {
-                   aNodeArray->AppendElement(kNC_PageTitleDiskSpace);
-                }
-                
-                // extensions come after the default panels
-                rv = appendGenericSettingsResources(server, aNodeArray);
-                NS_ASSERTION(NS_SUCCEEDED(rv), "failed to add generic panels");
-            }
-        }
+      // Check the offline capability before adding
+      // offline item
+      PRInt32 offlineSupportLevel = 0;
+      rv = server->GetOfflineSupportLevel(&offlineSupportLevel);
+      NS_ENSURE_SUCCESS(rv,rv);
+
+      PRBool supportsDiskSpace;
+      rv = server->GetSupportsDiskSpace(&supportsDiskSpace);
+      NS_ENSURE_SUCCESS(rv,rv);
+
+      // currently there is no offline without diskspace
+      if (offlineSupportLevel >= OFFLINE_SUPPORT_LEVEL_REGULAR) {
+        aNodeArray->AppendElement(kNC_PageTitleOfflineAndDiskSpace);
+      }
+      else if (supportsDiskSpace) {
+        aNodeArray->AppendElement(kNC_PageTitleDiskSpace);
+      }
+
+      if (hasIdentities) {
+        // extensions come after the default panels
+        rv = appendGenericSettingsResources(server, aNodeArray);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to add generic panels");
+      }
     }
+  }
 
-    return NS_OK;
+  return NS_OK;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::serverHasIdentities(nsIMsgIncomingServer* aServer,
                                                    PRBool *aResult)
 {
-    nsresult rv;
-    *aResult = PR_FALSE;
-    
-    nsCOMPtr<nsIMsgAccountManager> am =
-        do_QueryReferent(mAccountManager, &rv);
-    
-    if (NS_FAILED(rv)) return rv;
-    
-    nsCOMPtr<nsISupportsArray> identities;
-    rv = am->GetIdentitiesForServer(aServer, getter_AddRefs(identities));
-    
-    // no identities just means no arcs
-    if (NS_FAILED(rv)) return NS_OK;
-    
-    PRUint32 count;
-    rv = identities->Count(&count);
-    if (NS_FAILED(rv)) return NS_OK;
+  nsresult rv;
+  *aResult = PR_FALSE;
 
-    if (count >0)
-        *aResult = PR_TRUE;
+  nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager, &rv);
 
-    return NS_OK;
+  if (NS_FAILED(rv)) return rv;
+
+  nsCOMPtr<nsISupportsArray> identities;
+  rv = am->GetIdentitiesForServer(aServer, getter_AddRefs(identities));
+
+  // no identities just means no arcs
+  if (NS_FAILED(rv)) return NS_OK;
+
+  PRUint32 count;
+  rv = identities->Count(&count);
+  if (NS_FAILED(rv)) return NS_OK;
+
+  if (count >0)
+    *aResult = PR_TRUE;
+
+  return NS_OK;
 }
 
 // enumeration function to convert each server (element)
@@ -895,87 +891,100 @@ nsMsgAccountManagerDataSource::createServerResources(nsISupports *element,
   nsCOMPtr<nsIMsgIncomingServer> server = do_QueryInterface(element, &rv);
   if (NS_FAILED(rv)) return PR_TRUE;
 
-	nsCOMPtr <nsIMsgFolder> serverFolder;
-	rv = server->GetRootFolder(getter_AddRefs(serverFolder));
-	if(NS_FAILED(rv)) return PR_TRUE;
+  nsCOMPtr <nsIMsgFolder> serverFolder;
+  rv = server->GetRootFolder(getter_AddRefs(serverFolder));
+  if(NS_FAILED(rv)) return PR_TRUE;
 
   // add the resource to the array
   nsCOMPtr<nsIRDFResource> serverResource = do_QueryInterface(serverFolder);
-	if(!serverResource)
-		return PR_TRUE;
+  if(!serverResource)
+    return PR_TRUE;
 
   rv = servers->AppendElement(serverResource);
   if (NS_FAILED(rv)) return PR_TRUE;
-  
+
   return PR_TRUE;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::getAccountArcs(nsISupportsArray **aResult)
 {
-    nsresult rv;
-    if (!mAccountArcsOut) {
+  nsresult rv;
+  if (!mAccountArcsOut) {
 
-        rv = NS_NewISupportsArray(getter_AddRefs(mAccountArcsOut));
-        NS_ENSURE_SUCCESS(rv, rv);
-        
-        mAccountArcsOut->AppendElement(kNC_Settings);
-        mAccountArcsOut->AppendElement(kNC_Name);
-        mAccountArcsOut->AppendElement(kNC_FolderTreeName);
-        mAccountArcsOut->AppendElement(kNC_FolderTreeSimpleName);
-        mAccountArcsOut->AppendElement(kNC_NameSort);
-        mAccountArcsOut->AppendElement(kNC_FolderTreeNameSort);
-        mAccountArcsOut->AppendElement(kNC_PageTag);
-    }
+    rv = NS_NewISupportsArray(getter_AddRefs(mAccountArcsOut));
+    NS_ENSURE_SUCCESS(rv, rv);
 
-    *aResult = mAccountArcsOut;
-    NS_IF_ADDREF(*aResult);
-    return NS_OK;
+    mAccountArcsOut->AppendElement(kNC_Settings);
+    mAccountArcsOut->AppendElement(kNC_Name);
+    mAccountArcsOut->AppendElement(kNC_FolderTreeName);
+    mAccountArcsOut->AppendElement(kNC_FolderTreeSimpleName);
+    mAccountArcsOut->AppendElement(kNC_NameSort);
+    mAccountArcsOut->AppendElement(kNC_FolderTreeNameSort);
+    mAccountArcsOut->AppendElement(kNC_PageTag);
+  }
+
+  *aResult = mAccountArcsOut;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::getAccountRootArcs(nsISupportsArray **aResult)
 {
-    nsresult rv;
-    if (!mAccountRootArcsOut) {
+  nsresult rv;
+  if (!mAccountRootArcsOut) {
 
-        rv = NS_NewISupportsArray(getter_AddRefs(mAccountRootArcsOut));
-        NS_ENSURE_SUCCESS(rv, rv);
-        
-        mAccountRootArcsOut->AppendElement(kNC_Server);
-        mAccountRootArcsOut->AppendElement(kNC_Child);
-        
-        mAccountRootArcsOut->AppendElement(kNC_Settings);
-        mAccountRootArcsOut->AppendElement(kNC_Name);
-        mAccountRootArcsOut->AppendElement(kNC_FolderTreeName);
-        mAccountRootArcsOut->AppendElement(kNC_FolderTreeSimpleName);
-        mAccountRootArcsOut->AppendElement(kNC_NameSort);
-        mAccountRootArcsOut->AppendElement(kNC_FolderTreeNameSort);
-        mAccountRootArcsOut->AppendElement(kNC_PageTag);
-    }
+    rv = NS_NewISupportsArray(getter_AddRefs(mAccountRootArcsOut));
+    NS_ENSURE_SUCCESS(rv, rv);
 
-    *aResult = mAccountRootArcsOut;
-    NS_IF_ADDREF(*aResult);
-    return NS_OK;
+    mAccountRootArcsOut->AppendElement(kNC_Server);
+    mAccountRootArcsOut->AppendElement(kNC_Child);
+
+    mAccountRootArcsOut->AppendElement(kNC_Settings);
+    mAccountRootArcsOut->AppendElement(kNC_Name);
+    mAccountRootArcsOut->AppendElement(kNC_FolderTreeName);
+    mAccountRootArcsOut->AppendElement(kNC_FolderTreeSimpleName);
+    mAccountRootArcsOut->AppendElement(kNC_NameSort);
+    mAccountRootArcsOut->AppendElement(kNC_FolderTreeNameSort);
+    mAccountRootArcsOut->AppendElement(kNC_PageTag);
+  }
+
+  *aResult = mAccountRootArcsOut;
+  NS_IF_ADDREF(*aResult);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsMsgAccountManagerDataSource::HasArcOut(nsIRDFResource *source, nsIRDFResource *aArc, PRBool *result)
 {
-    nsresult rv = NS_OK;
-    if (aArc == kNC_Settings) {
-      // based on createSettingsResources()
-      // we only have settings for servers with identities
-      nsCOMPtr<nsIMsgIncomingServer> server;
-      rv = getServerForFolderNode(source, getter_AddRefs(server));
-      if (server) {
-          // this is not complete, see bug #86132
-          return serverHasIdentities(server, result);
+  nsresult rv = NS_OK;
+  if (aArc == kNC_Settings) {
+    // based on createSettingsResources()
+    // we only have settings for local folders and servers with identities
+    nsCOMPtr<nsIMsgIncomingServer> server;
+    rv = getServerForFolderNode(source, getter_AddRefs(server));
+    if (server) {
+      // Check the offline capability before adding arc
+      PRInt32 offlineSupportLevel = 0;
+      (void) server->GetOfflineSupportLevel(&offlineSupportLevel);
+      if (offlineSupportLevel >= OFFLINE_SUPPORT_LEVEL_REGULAR) {
+        *result = PR_TRUE;
+        return NS_OK;
       }
-	}
-	
-	*result = PR_FALSE;
-	return NS_OK;
+
+      PRBool supportsDiskSpace;
+      (void) server->GetSupportsDiskSpace(&supportsDiskSpace);
+      if (supportsDiskSpace) {
+        *result = PR_TRUE;
+        return NS_OK;
+      }
+      return serverHasIdentities(server, result);
+    }
+  }
+
+  *result = PR_FALSE;
+  return NS_OK;
 }
 
 /* nsISimpleEnumerator ArcLabelsOut (in nsIRDFResource aSource); */
@@ -988,18 +997,18 @@ nsMsgAccountManagerDataSource::ArcLabelsOut(nsIRDFResource *source,
   // we have to return something, so always create the array/enumerators
   nsCOMPtr<nsISupportsArray> arcs;
   if (source == kNC_AccountRoot)
-      rv = getAccountRootArcs(getter_AddRefs(arcs));
+    rv = getAccountRootArcs(getter_AddRefs(arcs));
   else
-      rv = getAccountArcs(getter_AddRefs(arcs));
+    rv = getAccountArcs(getter_AddRefs(arcs));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = NS_NewArrayEnumerator(_retval, arcs);
   if (NS_FAILED(rv)) return rv;
-  
+
 #ifdef DEBUG_amds_
   printf("GetArcLabelsOut(%s): Adding child, settings, and name arclabels\n", value);
 #endif
-  
+
   return NS_OK;
 }
 
@@ -1024,7 +1033,7 @@ nsMsgAccountManagerDataSource::HasAssertion(nsIRDFResource *aSource,
   //   answer if it's a server.. any failure falls through to the default case
   //
   // short-circuit on property, so objects like filters, etc, don't get queried
-  else if (aProperty == kNC_IsDefaultServer || aProperty == kNC_CanGetMessages || 
+  else if (aProperty == kNC_IsDefaultServer || aProperty == kNC_CanGetMessages ||
            aProperty == kNC_CanGetIncomingMessages || aProperty == kNC_SupportsFilters) {
     nsCOMPtr<nsIMsgIncomingServer> server;
     rv = getServerForFolderNode(aSource, getter_AddRefs(server));
@@ -1053,9 +1062,9 @@ nsMsgAccountManagerDataSource::HasAssertionServer(nsIMsgIncomingServer *aServer,
     *_retval = (aTarget == kTrueLiteral) ? isDefaultServer(aServer) : !isDefaultServer(aServer);
   else if (aProperty == kNC_SupportsFilters)
     *_retval = (aTarget == kTrueLiteral) ? supportsFilters(aServer) : !supportsFilters(aServer);
-  else if (aProperty == kNC_CanGetMessages) 
-   *_retval = (aTarget == kTrueLiteral) ? canGetMessages(aServer) : !canGetMessages(aServer); 
-  else if (aProperty == kNC_CanGetIncomingMessages) 
+  else if (aProperty == kNC_CanGetMessages)
+   *_retval = (aTarget == kTrueLiteral) ? canGetMessages(aServer) : !canGetMessages(aServer);
+  else if (aProperty == kNC_CanGetIncomingMessages)
     *_retval = (aTarget == kTrueLiteral) ? canGetIncomingMessages(aServer) : !canGetIncomingMessages(aServer);
   else
     *_retval = PR_FALSE;
@@ -1065,41 +1074,40 @@ nsMsgAccountManagerDataSource::HasAssertionServer(nsIMsgIncomingServer *aServer,
 PRBool
 nsMsgAccountManagerDataSource::isDefaultServer(nsIMsgIncomingServer *aServer)
 {
-    nsresult rv;
-    if (!aServer) return PR_FALSE;
-    
-    nsCOMPtr<nsIMsgAccountManager> am =
-        do_QueryReferent(mAccountManager, &rv);
-    NS_ENSURE_SUCCESS(rv, PR_FALSE);
-    
-    nsCOMPtr<nsIMsgAccount> defaultAccount;
-    rv = am->GetDefaultAccount(getter_AddRefs(defaultAccount));
-    NS_ENSURE_SUCCESS(rv, PR_FALSE);
-    if (!defaultAccount) return PR_FALSE;
+  nsresult rv;
+  if (!aServer) return PR_FALSE;
 
-    // in some weird case that there is no default and they asked
-    // for the default
-    nsCOMPtr<nsIMsgIncomingServer> defaultServer;
-    rv = defaultAccount->GetIncomingServer(getter_AddRefs(defaultServer));
-    NS_ENSURE_SUCCESS(rv, PR_FALSE);
-    if (!defaultServer) return PR_FALSE;
+  nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager, &rv);
+  NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
-    PRBool isEqual;
-    rv = defaultServer->Equals(aServer, &isEqual);
-    NS_ENSURE_SUCCESS(rv, PR_FALSE);
+  nsCOMPtr<nsIMsgAccount> defaultAccount;
+  rv = am->GetDefaultAccount(getter_AddRefs(defaultAccount));
+  NS_ENSURE_SUCCESS(rv, PR_FALSE);
+  if (!defaultAccount) return PR_FALSE;
 
-    return isEqual;
+  // in some weird case that there is no default and they asked
+  // for the default
+  nsCOMPtr<nsIMsgIncomingServer> defaultServer;
+  rv = defaultAccount->GetIncomingServer(getter_AddRefs(defaultServer));
+  NS_ENSURE_SUCCESS(rv, PR_FALSE);
+  if (!defaultServer) return PR_FALSE;
+
+  PRBool isEqual;
+  rv = defaultServer->Equals(aServer, &isEqual);
+  NS_ENSURE_SUCCESS(rv, PR_FALSE);
+
+  return isEqual;
 }
 
 
 PRBool
 nsMsgAccountManagerDataSource::supportsFilters(nsIMsgIncomingServer *aServer)
 {
-    PRBool supportsFilters;
-    nsresult rv = aServer->GetCanHaveFilters(&supportsFilters);
-    NS_ENSURE_SUCCESS(rv, PR_FALSE);
+  PRBool supportsFilters;
+  nsresult rv = aServer->GetCanHaveFilters(&supportsFilters);
+  NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
-    return supportsFilters;
+  return supportsFilters;
 }
 
 PRBool
@@ -1108,17 +1116,16 @@ nsMsgAccountManagerDataSource::canGetMessages(nsIMsgIncomingServer *aServer)
   nsXPIDLCString type;
   nsresult rv = aServer->GetType(getter_Copies(type));
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
-  
+
   nsCAutoString contractid(NS_MSGPROTOCOLINFO_CONTRACTID_PREFIX);
   contractid.Append(type);
-  
-  nsCOMPtr<nsIMsgProtocolInfo> protocolInfo =
-    do_GetService(contractid.get(), &rv);
+
+  nsCOMPtr<nsIMsgProtocolInfo> protocolInfo = do_GetService(contractid.get(), &rv);
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
-  
+
   PRBool canGetMessages = PR_FALSE;
   protocolInfo->GetCanGetMessages(&canGetMessages);
-  
+
   return canGetMessages;
 }
 
@@ -1128,17 +1135,16 @@ nsMsgAccountManagerDataSource::canGetIncomingMessages(nsIMsgIncomingServer *aSer
   nsXPIDLCString type;
   nsresult rv = aServer->GetType(getter_Copies(type));
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
-  
+
   nsCAutoString contractid(NS_MSGPROTOCOLINFO_CONTRACTID_PREFIX);
   contractid.Append(type);
-  
-  nsCOMPtr<nsIMsgProtocolInfo> protocolInfo =
-    do_GetService(contractid.get(), &rv);
+
+  nsCOMPtr<nsIMsgProtocolInfo> protocolInfo = do_GetService(contractid.get(), &rv);
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
-  
+
   PRBool canGetIncomingMessages = PR_FALSE;
   protocolInfo->GetCanGetIncomingMessages(&canGetIncomingMessages);
-  
+
   return canGetIncomingMessages;
 }
 
@@ -1153,7 +1159,7 @@ nsMsgAccountManagerDataSource::HasAssertionAccountRoot(nsIRDFResource *aProperty
 
   // set up default
   *_retval = PR_FALSE;
-  
+
   // for child and settings arcs, just make sure it's a valid server:
   if (isContainment(aProperty)) {
 
@@ -1163,11 +1169,10 @@ nsMsgAccountManagerDataSource::HasAssertionAccountRoot(nsIRDFResource *aProperty
 
     nsXPIDLCString serverKey;
     server->GetKey(getter_Copies(serverKey));
-    
-    nsCOMPtr<nsIMsgAccountManager> am =
-        do_QueryReferent(mAccountManager, &rv);
+
+    nsCOMPtr<nsIMsgAccountManager> am = do_QueryReferent(mAccountManager, &rv);
     if (NS_FAILED(rv)) return rv;
-    
+
     nsCOMPtr<nsISupportsArray> serverArray;
     rv = am->GetAllServers(getter_AddRefs(serverArray));
     if (NS_FAILED(rv)) return rv;
@@ -1178,15 +1183,16 @@ nsMsgAccountManagerDataSource::HasAssertionAccountRoot(nsIRDFResource *aProperty
 
     serverArray->EnumerateForwards(findServerByKey, &entry);
     (*_retval) = entry.found;
-    
+
   }
-  
+
   return NS_OK;
 }
 
 PRBool
-nsMsgAccountManagerDataSource::isContainment(nsIRDFResource *aProperty) {
-  
+nsMsgAccountManagerDataSource::isContainment(nsIRDFResource *aProperty)
+{
+
   if (aProperty == kNC_Child ||
       aProperty == kNC_Settings)
     return PR_TRUE;
@@ -1198,7 +1204,7 @@ nsresult
 nsMsgAccountManagerDataSource::getServerForFolderNode(nsIRDFNode *aResource,
                                                       nsIMsgIncomingServer **aResult)
 {
-    return getServerForObject(aResource, aResult);
+  return getServerForObject(aResource, aResult);
 }
 
 nsresult
@@ -1206,13 +1212,12 @@ nsMsgAccountManagerDataSource::getServerForObject(nsISupports *aObject,
                                                   nsIMsgIncomingServer **aResult)
 {
   nsresult rv;
-  nsCOMPtr<nsIMsgFolder> folder =
-    do_QueryInterface(aObject, &rv);
+  nsCOMPtr<nsIMsgFolder> folder = do_QueryInterface(aObject, &rv);
   if (NS_SUCCEEDED(rv)) {
     PRBool isServer;
     rv = folder->GetIsServer(&isServer);
     if (NS_SUCCEEDED(rv) && isServer) {
-        return folder->GetServer(aResult);
+      return folder->GetServer(aResult);
     }
   }
   return NS_ERROR_FAILURE;
@@ -1222,36 +1227,36 @@ PRBool
 nsMsgAccountManagerDataSource::findServerByKey(nsISupports *aElement,
                                                void *aData)
 {
-    nsresult rv;
-    findServerByKeyEntry *entry = (findServerByKeyEntry*)aData;
-    
-    nsCOMPtr<nsIMsgIncomingServer> server = do_QueryInterface(aElement, &rv);
-    if (NS_FAILED(rv)) return PR_TRUE;
+  nsresult rv;
+  findServerByKeyEntry *entry = (findServerByKeyEntry*)aData;
 
-    nsXPIDLCString key;
-    server->GetKey(getter_Copies(key));
-    if (nsCRT::strcmp(key, entry->serverKey)==0) {
-        entry->found = PR_TRUE;
-        return PR_FALSE;        // stop when found
-    }
-    
-    return PR_TRUE;
+  nsCOMPtr<nsIMsgIncomingServer> server = do_QueryInterface(aElement, &rv);
+  if (NS_FAILED(rv)) return PR_TRUE;
+
+  nsXPIDLCString key;
+  server->GetKey(getter_Copies(key));
+  if (nsCRT::strcmp(key, entry->serverKey)==0) {
+    entry->found = PR_TRUE;
+    return PR_FALSE;        // stop when found
+  }
+
+  return PR_TRUE;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::getStringBundle()
 {
-    if (mStringBundle) return NS_OK;
+  if (mStringBundle) return NS_OK;
 
-    nsresult rv;
+  nsresult rv;
 
-    nsCOMPtr<nsIStringBundleService> strBundleService =
-        do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
-    if (NS_FAILED(rv)) return rv;
+  nsCOMPtr<nsIStringBundleService> strBundleService =
+      do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) return rv;
 
-    rv = strBundleService->CreateBundle("chrome://messenger/locale/prefs.properties",
-                                        getter_AddRefs(mStringBundle));
-    return rv;
+  rv = strBundleService->CreateBundle("chrome://messenger/locale/prefs.properties",
+                                      getter_AddRefs(mStringBundle));
+  return rv;
 }
 
 NS_IMETHODIMP
@@ -1263,8 +1268,7 @@ nsMsgAccountManagerDataSource::OnServerLoaded(nsIMsgIncomingServer* aServer)
   rv = aServer->GetRootFolder(getter_AddRefs(serverFolder));
   if (NS_FAILED(rv)) return rv;
 
-  nsCOMPtr<nsIRDFResource> serverResource =
-    do_QueryInterface(serverFolder,&rv);
+  nsCOMPtr<nsIRDFResource> serverResource = do_QueryInterface(serverFolder,&rv);
   if (NS_FAILED(rv)) return rv;
 
 #ifdef DEBUG_alecf_
@@ -1272,7 +1276,7 @@ nsMsgAccountManagerDataSource::OnServerLoaded(nsIMsgIncomingServer* aServer)
   serverResource->GetValue(getter_Copies(serverUri));
   printf("nsMsgAccountmanagerDataSource::OnServerLoaded(%s)\n", (const char*)serverUri);
 #endif
-  
+
   NotifyObservers(kNC_AccountRoot, kNC_Child, serverResource, PR_TRUE, PR_FALSE);
   NotifyObservers(kNC_AccountRoot, kNC_Settings, serverResource, PR_TRUE, PR_FALSE);
 
@@ -1291,23 +1295,22 @@ NS_IMETHODIMP
 nsMsgAccountManagerDataSource::OnServerUnloaded(nsIMsgIncomingServer* aServer)
 {
   nsresult rv;
-  
+
   nsCOMPtr<nsIMsgFolder> serverFolder;
   rv = aServer->GetRootFolder(getter_AddRefs(serverFolder));
   if (NS_FAILED(rv)) return rv;
 
-  nsCOMPtr<nsIRDFResource> serverResource =
-    do_QueryInterface(serverFolder,&rv);
+  nsCOMPtr<nsIRDFResource> serverResource = do_QueryInterface(serverFolder,&rv);
   if (NS_FAILED(rv)) return rv;
 
-  
+
   NotifyObservers(kNC_AccountRoot, kNC_Child, serverResource, PR_FALSE, PR_FALSE);
   NotifyObservers(kNC_AccountRoot, kNC_Settings, serverResource, PR_FALSE, PR_FALSE);
 
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsMsgAccountManagerDataSource::OnServerChanged(nsIMsgIncomingServer *server)
 {
   return NS_OK;
@@ -1316,31 +1319,31 @@ nsMsgAccountManagerDataSource::OnServerChanged(nsIMsgIncomingServer *server)
 nsresult
 nsMsgAccountManagerDataSource::OnItemPropertyChanged(nsISupports *, nsIAtom *, char const *, char const *)
 {
-    return NS_OK;
+  return NS_OK;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::OnItemUnicharPropertyChanged(nsISupports *, nsIAtom *, const PRUnichar *, const PRUnichar *)
 {
-    return NS_OK;
+  return NS_OK;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::OnItemRemoved(nsIRDFResource *, nsISupports *)
 {
-    return NS_OK;
+  return NS_OK;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::OnItemPropertyFlagChanged(nsISupports *, nsIAtom *, PRUint32, PRUint32)
 {
-    return NS_OK;
+  return NS_OK;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::OnItemAdded(nsIRDFResource *, nsISupports *)
 {
-    return NS_OK;
+  return NS_OK;
 }
 
 
@@ -1350,40 +1353,38 @@ nsMsgAccountManagerDataSource::OnItemBoolPropertyChanged(nsISupports *aItem,
                                                          PRBool aOldValue,
                                                          PRBool aNewValue)
 {
-    nsresult rv;
+  nsresult rv;
 
-    // server properties
-    // check property first because that's fast
-    if (aProperty == kDefaultServerAtom) {
+  // server properties
+  // check property first because that's fast
+  if (aProperty == kDefaultServerAtom) {
 
-        nsCOMPtr<nsIMsgIncomingServer> server;
-        rv = getServerForObject(aItem, getter_AddRefs(server));
-        if (NS_FAILED(rv))
-            return NS_OK;
+    nsCOMPtr<nsIMsgIncomingServer> server;
+    rv = getServerForObject(aItem, getter_AddRefs(server));
+    if (NS_FAILED(rv))
+      return NS_OK;
 
-        // tricky - turn aItem into a resource -
-        // aItem should be an nsIMsgFolder
-        nsCOMPtr<nsIRDFResource> serverResource =
-            do_QueryInterface(aItem, &rv);
-        if (NS_FAILED(rv)) return NS_OK;
+    // tricky - turn aItem into a resource -
+    // aItem should be an nsIMsgFolder
+    nsCOMPtr<nsIRDFResource> serverResource = do_QueryInterface(aItem, &rv);
+    if (NS_FAILED(rv)) return NS_OK;
 
-        NotifyObservers(serverResource, kNC_IsDefaultServer, kTrueLiteral,
-                        aNewValue, PR_FALSE);
-        
-    }    
-    return NS_OK;
+    NotifyObservers(serverResource, kNC_IsDefaultServer, kTrueLiteral, aNewValue, PR_FALSE);
+
+  }
+  return NS_OK;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::OnItemEvent(nsIMsgFolder *, nsIAtom *)
 {
-    return NS_OK;
+  return NS_OK;
 }
 
 nsresult
 nsMsgAccountManagerDataSource::OnItemIntPropertyChanged(nsISupports *, nsIAtom *, PRInt32, PRInt32)
 {
-    return NS_OK;
+  return NS_OK;
 }
 
 PRBool
@@ -1405,10 +1406,10 @@ nsMsgAccountManagerDataSource::IsFakeAccountRequired()
   rv = GetFakeAccountHostName(getter_Copies(fakeHostName));
   NS_ENSURE_SUCCESS(rv,rv);
 
-  nsCOMPtr<nsIMsgAccountManager> accountManager  = do_QueryReferent(mAccountManager);
-  if (!accountManager) 
+  nsCOMPtr<nsIMsgAccountManager> accountManager = do_QueryReferent(mAccountManager);
+  if (!accountManager)
     return NS_ERROR_FAILURE;
-  
+
   nsCOMPtr<nsIMsgIncomingServer> server;
 
   if (!fakeHostName.IsEmpty()) {
@@ -1425,7 +1426,7 @@ nsMsgAccountManagerDataSource::IsIncomingServerForFakeAccount(nsIMsgIncomingServ
 {
   NS_ENSURE_ARG_POINTER(aServer);
   NS_ENSURE_ARG_POINTER(aResult);
-  
+
   nsresult rv;
   nsXPIDLCString fakeAccountHostName;
   rv = GetFakeAccountHostName(getter_Copies(fakeAccountHostName));
@@ -1463,7 +1464,7 @@ NS_IMETHODIMP
 nsMsgAccountManagerDataSource::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData)
 {
   nsMsgRDFDataSource::Observe(aSubject, aTopic, aData);
-  
+
   if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
     nsDependentString prefName(aData);
     if (prefName.Equals(NS_LITERAL_STRING(PREF_SHOW_FAKE_ACCOUNT))) {