Bug 342632 - Allow defaultAccount to return success with nullptr result when there is no usable account.

Tag #1273

1 files changed, 5 insertions, 3 deletions

diff --git a/mailnews/base/search/content/searchWidgets.xml b/mailnews/base/search/content/searchWidgets.xml
index 80ebe38c4..69f3b2ae2 100644
--- a/mailnews/base/search/content/searchWidgets.xml
+++ b/mailnews/base/search/content/searchWidgets.xml
@@ -224,10 +224,12 @@
             let identitiesRaw = MailServices.accounts
               .getIdentitiesForServer(gFilterList.folder.server);
             let identities = Array.from(this.fixIterator(identitiesRaw,
-                                          Components.interfaces.nsIMsgIdentity));
+                                                         Ci.nsIMsgIdentity));
 
-            if (!identities.length) // typically if this is Local Folders
-              identities.push(MailServices.accounts.defaultAccount.defaultIdentity);
+            if (identities.length == 0) { // typically if this is Local Folders
+              if (MailServices.accounts.defaultAccount)
+                identities.push(MailServices.accounts.defaultAccount.defaultIdentity);
+            }
 
             let templateFound = false;
             let foldersScanned = [];