diff --git a/mailnews/base/resources/content/folderPane.xul b/mailnews/base/resources/content/folderPane.xul
index 0a7c82ac0848..b04c6f68d910 100644
--- a/mailnews/base/resources/content/folderPane.xul
+++ b/mailnews/base/resources/content/folderPane.xul
@@ -37,7 +37,8 @@
             flex="1"
             seltype="single">
     <outlinerbody flex="1"
-                  datasources="rdf:null"
+                  datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
+                  ref="msgaccounts:/"
                   statedatasource="rdf:mailnewsfolders"
                   ondraggesture="return BeginDragFolderOutliner(event);"
                   onselect="FolderPaneSelectionChange();">
diff --git a/mailnews/base/resources/content/msgMail3PaneWindow.js b/mailnews/base/resources/content/msgMail3PaneWindow.js
index b6abc6435643..d9e030d65377 100644
--- a/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -717,16 +717,7 @@ function OnLoadFolderPane()
 
     SortFolderPane("folderNameCol");
 
-    //Add folderDataSource and accountManagerDataSource to folderPane
-    accountManagerDataSource = accountManagerDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource);
-    folderDataSource = folderDataSource.QueryInterface(Components.interfaces.nsIRDFDataSource);
-    var database = GetFolderDatasource();
-
-    database.AddDataSource(accountManagerDataSource);
-    database.AddDataSource(folderDataSource);
     var folderOutliner = GetFolderOutliner();
-    folderOutliner.outlinerBoxObject.outlinerBody.setAttribute("ref", "msgaccounts:/");
-
     var folderOutlinerBuilder = folderOutliner.outlinerBoxObject.outlinerBody.builder.QueryInterface(Components.interfaces.nsIXULOutlinerBuilder);
     folderOutlinerBuilder.addObserver(folderObserver);
     folderOutliner.addEventListener("click",FolderPaneOnClick,true);