diff --git a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
index e98049cde40..607ccba581b 100644
--- a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -64,13 +64,7 @@ function OnLoadMessenger()
 
     loadStartFolder();
 
-	var mailSession = Components.classes['component://netscape/messenger/services/session'].getService();
-	if(mailSession)
-	{
-		mailSession = mailSession.QueryInterface(Components.interfaces.nsIMsgMailSession);
-		if(mailSession)
-			mailSession.AddFolderListener(folderListener);
-	}
+    getFolderListener();
 }
 
 function OnUnloadMessenger()
@@ -155,6 +149,18 @@ function loadStartFolder()
 
 }
 
+function getFolderListener()
+{
+    try {
+        var mailSession = Components.classes['component://netscape/messenger/services/session'].getService(Components.interfaces.nsIMsgMailSession);
+        
+        mailSession.AddFolderListener(folderListener);
+	} catch (ex) {
+        dump("Error adding folder listener\n");
+    }
+}
+
+
 function AddDataSources()
 {