diff --git a/content/shared/public/nsXULAtomList.h b/content/shared/public/nsXULAtomList.h
index 325cb398a7fc..e4bd1dfaaaab 100644
--- a/content/shared/public/nsXULAtomList.h
+++ b/content/shared/public/nsXULAtomList.h
@@ -260,6 +260,7 @@ XUL_ATOM(content, "content")
 XUL_ATOM(coalesceduplicatearcs, "coalesceduplicatearcs")
 XUL_ATOM(allownegativeassertions, "allownegativeassertions")
 XUL_ATOM(datasources, "datasources")
+XUL_ATOM(statedatasource,"statedatasource")
 XUL_ATOM(commandupdater, "commandupdater")
 XUL_ATOM(keyset, "keyset")
 XUL_ATOM(element, "element")
diff --git a/content/xul/templates/src/nsXULOutlinerBuilder.cpp b/content/xul/templates/src/nsXULOutlinerBuilder.cpp
index 47d340a8dcf3..5ccf9fbde38d 100644
--- a/content/xul/templates/src/nsXULOutlinerBuilder.cpp
+++ b/content/xul/templates/src/nsXULOutlinerBuilder.cpp
@@ -53,6 +53,9 @@
 #include "nsXULTemplateBuilder.h"
 #include "nsVoidArray.h"
 
+// For security check
+#include "nsIDocument.h"
+
 /**
  * A XUL template builder that serves as an outliner view, allowing
  * (pretty much) arbitrary RDF to be presented in an outliner.
@@ -604,13 +607,50 @@ nsXULOutlinerBuilder::SetOutliner(nsIOutlinerBoxObject* outliner)
 
         LoadDataSources();
 
-        // So we can remember open state.
-        //
-        // XXX We should fix this so that if the document is
-        // ``trusted'', we use the localstore.
-        mPersistStateStore =
-            do_CreateInstance("@mozilla.org/rdf/datasource;1?name=in-memory-datasource");
+        nsCOMPtr<nsIDocument> doc;
+        mRoot->GetDocument(*getter_AddRefs(doc));
+        NS_ASSERTION(doc, "element has no document");
+        if (!doc)
+            return NS_ERROR_UNEXPECTED;
 
+        // Grab the doc's principal...
+        nsCOMPtr<nsIPrincipal> docPrincipal;
+        nsresult rv = doc->GetPrincipal(getter_AddRefs(docPrincipal));
+        if (NS_FAILED(rv)) 
+            return rv;
+
+        PRBool isTrusted = PR_FALSE;
+        rv = IsSystemPrincipal(docPrincipal.get(), &isTrusted);
+        if (NS_SUCCEEDED(rv) && isTrusted) {
+            // Get the datasource we intend to use to remember open state.
+            nsAutoString datasourceStr;
+            mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::statedatasource, datasourceStr);
+
+            // since we are trusted, use the user specified datasource
+            // if non specified, use localstore, which gives us
+            // persistance across sessions
+            if (datasourceStr.Length()) {
+                gRDFService->GetDataSource(NS_ConvertUCS2toUTF8(datasourceStr).get(),
+                                           getter_AddRefs(mPersistStateStore));
+            }
+            else {
+                gRDFService->GetDataSource("rdf:local-store",
+                                           getter_AddRefs(mPersistStateStore));
+            }
+        }
+
+        // Either no specific datasource was specified, or we failed
+        // to get one because we are not trusted.
+        //
+        // XXX if it were possible to ``write an arbitrary datasource
+        // back'', then we could also allow an untrusted document to
+        // use a statedatasource from the same codebase.
+        if (! mPersistStateStore) {
+            mPersistStateStore =
+                do_CreateInstance("@mozilla.org/rdf/datasource;1?name=in-memory-datasource");
+        }
+
+        NS_ASSERTION(mPersistStateStore, "failed to get a persistant state store");
         if (! mPersistStateStore)
             return NS_ERROR_FAILURE;
 
@@ -986,11 +1026,13 @@ nsXULOutlinerBuilder::ReplaceMatch(nsIRDFResource* aMember,
             // Use the persist store to remember if the container
             // is open or closed.
             PRBool open = PR_FALSE;
-            mPersistStateStore->HasAssertion(container,
-                                             nsXULContentUtils::NC_open,
-                                             nsXULContentUtils::true_,
-                                             PR_TRUE,
-                                             &open);
+
+            if (mPersistStateStore)
+                mPersistStateStore->HasAssertion(container,
+                                                 nsXULContentUtils::NC_open,
+                                                 nsXULContentUtils::true_,
+                                                 PR_TRUE,
+                                                 &open);
 
             if (open) {
                 parent = mRows.EnsureSubtreeFor(iter);
diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp
index 64b9a3294f29..9556c2292a3e 100644
--- a/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp
@@ -779,7 +779,11 @@ nsXULTemplateBuilder::LoadDataSources()
     rv = doc->GetPrincipal(getter_AddRefs(docPrincipal));
     if (NS_FAILED(rv)) return rv;
 
-    if (docPrincipal.get() == gSystemPrincipal) {
+    PRBool isTrusted = PR_FALSE;
+    rv = IsSystemPrincipal(docPrincipal.get(), &isTrusted);
+    if (NS_FAILED(rv)) return rv;
+
+    if (isTrusted) {
         // If we're a privileged (e.g., chrome) document, then add the
         // local store as the first data source in the db. Note that
         // we _might_ not be able to get a local store if we haven't
@@ -829,7 +833,7 @@ nsXULTemplateBuilder::LoadDataSources()
         // protocol) leaves uriStr unaltered.
         NS_MakeAbsoluteURI(uriStr, uriStr, docurl);
 
-        if (docPrincipal.get() != gSystemPrincipal) {
+        if (!isTrusted) {
             // Our document is untrusted, so check to see if we can
             // load the datasource that they've asked for.
             nsCOMPtr<nsIURI> uri;
@@ -2391,3 +2395,13 @@ nsXULTemplateBuilder::CanSetProperty(const nsIID * iid, const PRUnichar *propert
   return NS_OK;
 }
 
+nsresult 
+nsXULTemplateBuilder::IsSystemPrincipal(nsIPrincipal *principal, PRBool *result)
+{
+  if (!gSystemPrincipal)
+    return NS_ERROR_UNEXPECTED;
+
+  *result = (principal == gSystemPrincipal);
+  return NS_OK;
+}
+
diff --git a/content/xul/templates/src/nsXULTemplateBuilder.h b/content/xul/templates/src/nsXULTemplateBuilder.h
index 8173b1ca33ee..e24b39021008 100644
--- a/content/xul/templates/src/nsXULTemplateBuilder.h
+++ b/content/xul/templates/src/nsXULTemplateBuilder.h
@@ -331,6 +331,9 @@ public:
     nsresult
     CheckContainer(nsIRDFResource* aTargetResource, PRBool* aIsContainer, PRBool* aIsEmpty);
 
+    nsresult 
+    IsSystemPrincipal(nsIPrincipal *principal, PRBool *result);
+
 #ifdef PR_LOGGING
     nsresult
     Log(const char* aOperation,
diff --git a/content/xul/templates/src/nsXULTreeBuilder.cpp b/content/xul/templates/src/nsXULTreeBuilder.cpp
index 47d340a8dcf3..5ccf9fbde38d 100644
--- a/content/xul/templates/src/nsXULTreeBuilder.cpp
+++ b/content/xul/templates/src/nsXULTreeBuilder.cpp
@@ -53,6 +53,9 @@
 #include "nsXULTemplateBuilder.h"
 #include "nsVoidArray.h"
 
+// For security check
+#include "nsIDocument.h"
+
 /**
  * A XUL template builder that serves as an outliner view, allowing
  * (pretty much) arbitrary RDF to be presented in an outliner.
@@ -604,13 +607,50 @@ nsXULOutlinerBuilder::SetOutliner(nsIOutlinerBoxObject* outliner)
 
         LoadDataSources();
 
-        // So we can remember open state.
-        //
-        // XXX We should fix this so that if the document is
-        // ``trusted'', we use the localstore.
-        mPersistStateStore =
-            do_CreateInstance("@mozilla.org/rdf/datasource;1?name=in-memory-datasource");
+        nsCOMPtr<nsIDocument> doc;
+        mRoot->GetDocument(*getter_AddRefs(doc));
+        NS_ASSERTION(doc, "element has no document");
+        if (!doc)
+            return NS_ERROR_UNEXPECTED;
 
+        // Grab the doc's principal...
+        nsCOMPtr<nsIPrincipal> docPrincipal;
+        nsresult rv = doc->GetPrincipal(getter_AddRefs(docPrincipal));
+        if (NS_FAILED(rv)) 
+            return rv;
+
+        PRBool isTrusted = PR_FALSE;
+        rv = IsSystemPrincipal(docPrincipal.get(), &isTrusted);
+        if (NS_SUCCEEDED(rv) && isTrusted) {
+            // Get the datasource we intend to use to remember open state.
+            nsAutoString datasourceStr;
+            mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::statedatasource, datasourceStr);
+
+            // since we are trusted, use the user specified datasource
+            // if non specified, use localstore, which gives us
+            // persistance across sessions
+            if (datasourceStr.Length()) {
+                gRDFService->GetDataSource(NS_ConvertUCS2toUTF8(datasourceStr).get(),
+                                           getter_AddRefs(mPersistStateStore));
+            }
+            else {
+                gRDFService->GetDataSource("rdf:local-store",
+                                           getter_AddRefs(mPersistStateStore));
+            }
+        }
+
+        // Either no specific datasource was specified, or we failed
+        // to get one because we are not trusted.
+        //
+        // XXX if it were possible to ``write an arbitrary datasource
+        // back'', then we could also allow an untrusted document to
+        // use a statedatasource from the same codebase.
+        if (! mPersistStateStore) {
+            mPersistStateStore =
+                do_CreateInstance("@mozilla.org/rdf/datasource;1?name=in-memory-datasource");
+        }
+
+        NS_ASSERTION(mPersistStateStore, "failed to get a persistant state store");
         if (! mPersistStateStore)
             return NS_ERROR_FAILURE;
 
@@ -986,11 +1026,13 @@ nsXULOutlinerBuilder::ReplaceMatch(nsIRDFResource* aMember,
             // Use the persist store to remember if the container
             // is open or closed.
             PRBool open = PR_FALSE;
-            mPersistStateStore->HasAssertion(container,
-                                             nsXULContentUtils::NC_open,
-                                             nsXULContentUtils::true_,
-                                             PR_TRUE,
-                                             &open);
+
+            if (mPersistStateStore)
+                mPersistStateStore->HasAssertion(container,
+                                                 nsXULContentUtils::NC_open,
+                                                 nsXULContentUtils::true_,
+                                                 PR_TRUE,
+                                                 &open);
 
             if (open) {
                 parent = mRows.EnsureSubtreeFor(iter);
diff --git a/mailnews/base/public/nsIMsgIncomingServer.idl b/mailnews/base/public/nsIMsgIncomingServer.idl
index ae706982d809..0dc0197554c8 100644
--- a/mailnews/base/public/nsIMsgIncomingServer.idl
+++ b/mailnews/base/public/nsIMsgIncomingServer.idl
@@ -119,7 +119,7 @@ interface nsIMsgIncomingServer : nsISupports {
 
   /* are we already getting new Messages on the current server..
      This is used to help us prevent multiple get new msg commands from
-	 going off at the same time. */
+     going off at the same time. */
   attribute boolean serverBusy;
 
   /* should we use a secure channel? */
@@ -143,7 +143,7 @@ interface nsIMsgIncomingServer : nsISupports {
   readonly attribute boolean serverRequiresPasswordForBiff;
   
   /* this gets called when the server is expanded in the folder pane */
-  void PerformExpand(in nsIMsgWindow aMsgWindow);
+  void performExpand(in nsIMsgWindow aMsgWindow);
 
   /* Write out all known folder data to panacea.dat */
   void WriteToFolderCache(in nsIMsgFolderCache folderCache);
@@ -238,7 +238,7 @@ interface nsIMsgIncomingServer : nsISupports {
 
   /* create pretty name for migrated accounts */
   wstring generatePrettyNameForMigration(); 
-	
+
   /* does this server have disk space settings? */
   readonly attribute boolean supportsDiskSpace;
 
diff --git a/mailnews/base/resources/content/folderPane.xul b/mailnews/base/resources/content/folderPane.xul
index 6925a219df62..06e350363f87 100644
--- a/mailnews/base/resources/content/folderPane.xul
+++ b/mailnews/base/resources/content/folderPane.xul
@@ -37,6 +37,7 @@
             seltype="single">
     <outlinerbody flex="1"
                   datasources="rdf:null"
+                  statedatasource="rdf:mailnewsfolders"
                   ondraggesture="return BeginDragFolderOutliner(event);"
                   onselect="FolderPaneSelectionChange();">
       <template>
diff --git a/mailnews/base/resources/content/mailWindow.js b/mailnews/base/resources/content/mailWindow.js
index 12f84fe49785..6182202eb9f1 100644
--- a/mailnews/base/resources/content/mailWindow.js
+++ b/mailnews/base/resources/content/mailWindow.js
@@ -52,7 +52,6 @@ var gBrandBundle;
 var datasourceContractIDPrefix = "@mozilla.org/rdf/datasource;1?name=";
 var accountManagerDSContractID = datasourceContractIDPrefix + "msgaccountmanager";
 var folderDSContractID         = datasourceContractIDPrefix + "mailnewsfolders";
-var messageDSContractID        = datasourceContractIDPrefix + "mailnewsmessages";
 
 var accountManagerDataSource;
 var folderDataSource;
diff --git a/mailnews/base/resources/content/msgMail3PaneWindow.js b/mailnews/base/resources/content/msgMail3PaneWindow.js
index 20547ca3beed..2ae6ec14d92c 100644
--- a/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -24,8 +24,6 @@
 
 /* This is where functions related to the 3 pane window are kept */
 
-const MSG_FOLDER_FLAG_ELIDED = 0x0010;
-
 var showPerformance = false;
 
 var gFolderOutliner; 
@@ -449,8 +447,10 @@ function OnUnloadMessenger()
 function Create3PaneGlobals()
 {
 }
-
-function OpenAndExpandElidedServers()
+ 
+// because the "open" state persists, we'll call
+// PerformExpand() for all servers that are open at startup.            
+function PerformExpandForAllOpenServers()
 {
     var folderOutliner = GetFolderOutliner();
     var view = folderOutliner.outlinerBoxObject.view;
@@ -460,17 +460,18 @@ function OpenAndExpandElidedServers()
         {
             var folderResource = GetFolderResource(folderOutliner, i);
             var msgFolder = folderResource.QueryInterface(Components.interfaces.nsIMsgFolder);
-            var open = msgFolder.getFlag(MSG_FOLDER_FLAG_ELIDED)
-            if (open)
+            var isServer = GetFolderAttribute(folderOutliner, folderResource, "IsServer"); 
+            if (isServer == "true")
             {
-                view.toggleOpenState(i);
-                var isServer = GetFolderAttribute(folderOutliner, folderResource, "IsServer"); 
-                if (isServer == "true")
+                if (view.isContainerOpen(i))
                 {
                     var server = msgFolder.server;
                     // Don't do this for imap servers. See bug #41943
                     if (server.type != "imap")
-                        server.PerformExpand(msgWindow);
+                    {
+                        dump("perform expand #1" + msgFolder.URI + "\n");
+                        server.performExpand(msgWindow);
+                    }
                 }
             }
         }
@@ -479,8 +480,6 @@ function OpenAndExpandElidedServers()
 
 function loadStartFolder(initialUri)
 {
-    OpenAndExpandElidedServers();
-
     var folderOutliner = GetFolderOutliner();
     var defaultServer = null;
     var startFolderResource = null;
@@ -557,6 +556,10 @@ function loadStartFolder(initialUri)
                    defaultServer.PerformBiff();
             }
         } 
+
+        // because the "open" state persists, we'll call
+        // PerformExpand() for all servers that are open at startup.
+        PerformExpandForAllOpenServers();
     }
     catch(ex)
     {
@@ -577,7 +580,7 @@ function OpenTwistyForServer(folderOutliner, server)
     if (folderIndex >= 0)
     {
         var isContainerOpen = folderOutliner.outlinerBoxObject.view.isContainerOpen(folderIndex);
-        if (! isContainerOpen)
+        if (!isContainerOpen)
             folderOutliner.outlinerBoxObject.view.toggleOpenState(folderIndex);
     }
 }
@@ -820,16 +823,13 @@ function FolderPaneOnClick(event)
         var folderResource = GetFolderResource(folderOutliner, row.value);
         var msgFolder = folderResource.QueryInterface(Components.interfaces.nsIMsgFolder);
 
-        if (folderOutliner.outlinerBoxObject.view.isContainerOpen(row.value))
-            msgFolder.clearFlag(MSG_FOLDER_FLAG_ELIDED);
-        else
+        if (!(folderOutliner.outlinerBoxObject.view.isContainerOpen(row.value)))
         {
-            msgFolder.setFlag(MSG_FOLDER_FLAG_ELIDED);
             var isServer = GetFolderAttribute(folderOutliner, folderResource, "IsServer");
             if (isServer == "true")
             {
                 var server = msgFolder.server;
-                server.PerformExpand(msgWindow);
+                server.performExpand(msgWindow);
             }
             else
             {
@@ -861,13 +861,10 @@ function FolderPaneDoubleClick(folderIndex, event)
 
     if (isServer == "true")
     {
-      if (folderOutliner.outlinerBoxObject.view.isContainerOpen(folderIndex))
-        msgFolder.clearFlag(MSG_FOLDER_FLAG_ELIDED);
-      else 
+      if (!(folderOutliner.outlinerBoxObject.view.isContainerOpen(folderIndex)))
       {
-        msgFolder.setFlag(MSG_FOLDER_FLAG_ELIDED);
         var server = msgFolder.server;
-        server.PerformExpand(msgWindow);
+        server.performExpand(msgWindow);
       }
     }
     else 
diff --git a/mailnews/base/resources/content/msgSynchronize.js b/mailnews/base/resources/content/msgSynchronize.js
index 6c8e5de403a6..73981bd987a6 100644
--- a/mailnews/base/resources/content/msgSynchronize.js
+++ b/mailnews/base/resources/content/msgSynchronize.js
@@ -167,7 +167,7 @@ function onSynchronizeClick(event)
 
             if (GetFolderAttribute(gSynchronizeOutliner, folderResource, "IsServer") == "true") {
                 var server = msgFolder.server;
-                server.PerformExpand(gMsgWindow);
+                server.performExpand(gMsgWindow);
             }
             else {
                 var imapFolder = folderResource.QueryInterface(Components.interfaces.nsIMsgImapMailFolder);
diff --git a/mailnews/base/search/resources/content/SearchDialog.xul b/mailnews/base/search/resources/content/SearchDialog.xul
index 4dee99ff4443..8f5a1e579d32 100644
--- a/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mailnews/base/search/resources/content/SearchDialog.xul
@@ -105,7 +105,7 @@ Rights Reserved.
        <vbox>
             <spring flex="1" />
             <button label="&openButton.label;" id="openButton" command="cmd_open" />
-            <menubutton id="fileMessageButton" label="&fileButton.label;"
+            <menubutton class="push" id="fileMessageButton" label="&fileButton.label;"
                         observes="file_message_button"
                         oncommand="MoveMessageInSearch(event.target)" 
                         datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
diff --git a/mailnews/base/src/nsMsgFolderDataSource.cpp b/mailnews/base/src/nsMsgFolderDataSource.cpp
index 2296fca34765..8cc5e4bd407a 100644
--- a/mailnews/base/src/nsMsgFolderDataSource.cpp
+++ b/mailnews/base/src/nsMsgFolderDataSource.cpp
@@ -54,6 +54,7 @@ static NS_DEFINE_CID(kMsgCopyServiceCID,		NS_MSGCOPYSERVICE_CID);
 nsIRDFResource* nsMsgFolderDataSource::kNC_Child = nsnull;
 nsIRDFResource* nsMsgFolderDataSource::kNC_Folder= nsnull;
 nsIRDFResource* nsMsgFolderDataSource::kNC_Name= nsnull;
+nsIRDFResource* nsMsgFolderDataSource::kNC_Open = nsnull;
 nsIRDFResource* nsMsgFolderDataSource::kNC_FolderTreeName= nsnull;
 nsIRDFResource* nsMsgFolderDataSource::kNC_FolderTreeSimpleName= nsnull;
 nsIRDFResource* nsMsgFolderDataSource::kNC_NameSort= nsnull;
@@ -105,7 +106,7 @@ nsIAtom * nsMsgFolderDataSource::kTotalMessagesAtom = nsnull;
 nsIAtom * nsMsgFolderDataSource::kTotalUnreadMessagesAtom = nsnull;
 nsIAtom * nsMsgFolderDataSource::kNameAtom = nsnull;
 nsIAtom * nsMsgFolderDataSource::kSynchronizeAtom = nsnull;
-
+nsIAtom * nsMsgFolderDataSource::kOpenAtom = nsnull;
 
 nsMsgFolderDataSource::nsMsgFolderDataSource()
 {
@@ -116,6 +117,7 @@ nsMsgFolderDataSource::nsMsgFolderDataSource()
     rdf->GetResource(NC_RDF_CHILD,   &kNC_Child);
     rdf->GetResource(NC_RDF_FOLDER,  &kNC_Folder);
     rdf->GetResource(NC_RDF_NAME,    &kNC_Name);
+    rdf->GetResource(NC_RDF_OPEN,    &kNC_Open);
     rdf->GetResource(NC_RDF_FOLDERTREENAME,    &kNC_FolderTreeName);
     rdf->GetResource(NC_RDF_FOLDERTREESIMPLENAME,    &kNC_FolderTreeSimpleName);
     rdf->GetResource(NC_RDF_NAME_SORT,    &kNC_NameSort);
@@ -166,6 +168,7 @@ nsMsgFolderDataSource::nsMsgFolderDataSource()
     kNewMessagesAtom             = NS_NewAtom("NewMessages");
     kNameAtom                    = NS_NewAtom("Name");
     kSynchronizeAtom             = NS_NewAtom("Synchronize");
+	kOpenAtom                    = NS_NewAtom("open");
   }
   
 	CreateLiterals(rdf);
@@ -181,6 +184,7 @@ nsMsgFolderDataSource::~nsMsgFolderDataSource (void)
 		NS_RELEASE2(kNC_Child, refcnt);
 		NS_RELEASE2(kNC_Folder, refcnt);
 		NS_RELEASE2(kNC_Name, refcnt);
+		NS_RELEASE2(kNC_Open, refcnt);
 		NS_RELEASE2(kNC_FolderTreeName, refcnt);
 		NS_RELEASE2(kNC_FolderTreeSimpleName, refcnt);
 		NS_RELEASE2(kNC_NameSort, refcnt);
@@ -230,6 +234,7 @@ nsMsgFolderDataSource::~nsMsgFolderDataSource (void)
     NS_RELEASE(kNewMessagesAtom);
     NS_RELEASE(kNameAtom);
     NS_RELEASE(kSynchronizeAtom);
+	NS_RELEASE(kOpenAtom);
 	}
 
 }
@@ -411,6 +416,7 @@ NS_IMETHODIMP nsMsgFolderDataSource::GetTargets(nsIRDFResource* source,
 			}
     }
     else if ((kNC_Name == property) ||
+             (kNC_Open == property) ||
              (kNC_FolderTreeName == property) ||
              (kNC_FolderTreeSimpleName == property) ||
              (kNC_SpecialFolder == property) ||
@@ -465,7 +471,10 @@ NS_IMETHODIMP nsMsgFolderDataSource::Unassert(nsIRDFResource* source,
                         nsIRDFResource* property,
                         nsIRDFNode* target)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  nsresult rv;
+  nsCOMPtr<nsIMsgFolder> folder(do_QueryInterface(source, &rv));
+  NS_ENSURE_SUCCESS(rv,rv);
+  return DoFolderUnassert(folder, property, target);
 }
 
 
@@ -502,6 +511,7 @@ nsMsgFolderDataSource::HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc,
 	nsCOMPtr<nsIMsgFolder> folder(do_QueryInterface(aSource, &rv));
 	if (NS_SUCCEEDED(rv)) {
     *result = (aArc == kNC_Name ||
+               aArc == kNC_Open ||
                aArc == kNC_FolderTreeName ||
                aArc == kNC_FolderTreeSimpleName ||
                aArc == kNC_SpecialFolder ||
@@ -565,6 +575,7 @@ nsMsgFolderDataSource::getFolderArcLabelsOut(nsISupportsArray **arcs)
 		return rv;
   
   (*arcs)->AppendElement(kNC_Name);
+  (*arcs)->AppendElement(kNC_Open);
   (*arcs)->AppendElement(kNC_FolderTreeName);
   (*arcs)->AppendElement(kNC_FolderTreeSimpleName);
   (*arcs)->AppendElement(kNC_SpecialFolder);
@@ -893,6 +904,9 @@ nsMsgFolderDataSource::OnItemBoolPropertyChanged(nsISupports *item,
     else if (kSynchronizeAtom == property) {
       NotifyPropertyChanged(resource, kNC_Synchronize, literalNode); 
     }
+	else if (kOpenAtom == property) {
+      NotifyPropertyChanged(resource, kNC_Open, literalNode);
+	}
   } 
 
   return rv;
@@ -956,6 +970,8 @@ nsresult nsMsgFolderDataSource::createFolderNode(nsIMsgFolder* folder,
     rv = createFolderTreeSimpleNameNode(folder, target, PR_TRUE);
   else if (kNC_Name == property)
     rv = createFolderNameNode(folder, target, PR_FALSE);
+  else if(kNC_Open == property)
+    rv = createFolderOpenNode(folder, target);
   else if (kNC_FolderTreeName == property)
     rv = createFolderTreeNameNode(folder, target, PR_FALSE);
   else if (kNC_FolderTreeSimpleName == property)
@@ -1277,6 +1293,32 @@ nsMsgFolderDataSource::createFolderSyncDisabledNode(nsIMsgFolder* folder,
 }
 
 
+nsresult
+nsMsgFolderDataSource::createFolderOpenNode(nsIMsgFolder *folder, nsIRDFNode **target)
+{
+  NS_ENSURE_ARG_POINTER(target);
+
+  // call GetSubFolders() to ensure mFlags is set correctly 
+  // from the folder cache on startup
+  nsCOMPtr<nsIEnumerator> subFolders;
+  nsresult rv = folder->GetSubFolders(getter_AddRefs(subFolders));
+  if (NS_FAILED(rv))
+    return NS_RDF_NO_VALUE;
+
+  PRBool closed;
+  rv = folder->GetFlag(MSG_FOLDER_FLAG_ELIDED, &closed);		
+  if (NS_FAILED(rv)) 
+    return rv;
+
+  if (closed)
+    *target = kFalseLiteral;
+  else
+    *target = kTrueLiteral;
+
+  NS_IF_ADDREF(*target);
+  return NS_OK;
+}
+
 nsresult
 nsMsgFolderDataSource::createFolderIsSecureNode(nsIMsgFolder* folder,
                                                   nsIRDFNode **target)
@@ -1887,29 +1929,45 @@ nsresult nsMsgFolderDataSource::DoNewFolder(nsIMsgFolder *folder, nsISupportsArr
 
 nsresult nsMsgFolderDataSource::DoFolderAssert(nsIMsgFolder *folder, nsIRDFResource *property, nsIRDFNode *target)
 {
-	nsresult rv = NS_ERROR_FAILURE;
+  nsresult rv = NS_ERROR_FAILURE;
 
-	if((kNC_Charset == property))
-	{
-		nsCOMPtr<nsIRDFLiteral> literal(do_QueryInterface(target));
-		if(literal)
-		{
-			PRUnichar *value;
-			rv = literal->GetValue(&value);
-			if(NS_SUCCEEDED(rv))
-			{
-				rv = folder->SetCharset(value);
-				nsMemory::Free(value);
-			}
-		}
-		else
-			rv = NS_ERROR_FAILURE;
-	}
-
-	return rv;
+  if((kNC_Charset == property))
+  {
+    nsCOMPtr<nsIRDFLiteral> literal(do_QueryInterface(target));
+    if(literal)
+    {
+      PRUnichar *value;
+      rv = literal->GetValue(&value);
+      if(NS_SUCCEEDED(rv))
+      {
+        rv = folder->SetCharset(value);
+        nsMemory::Free(value);
+      }
+    }
+    else
+      rv = NS_ERROR_FAILURE;
+  }
+  else if ((kNC_Open == property)) 
+  {
+	if (target == kTrueLiteral)
+      rv = folder->ClearFlag(MSG_FOLDER_FLAG_ELIDED);
+  }
 
+  return rv;
 }
 
+nsresult nsMsgFolderDataSource::DoFolderUnassert(nsIMsgFolder *folder, nsIRDFResource *property, nsIRDFNode *target)
+{
+  nsresult rv = NS_ERROR_FAILURE;
+
+  if((kNC_Open == property))
+  {
+    if (target == kTrueLiteral)
+      rv = folder->SetFlag(MSG_FOLDER_FLAG_ELIDED);
+  }
+
+  return rv;
+}
 
 nsresult nsMsgFolderDataSource::DoFolderHasAssertion(nsIMsgFolder *folder,
                                                      nsIRDFResource *property,
@@ -1941,6 +1999,7 @@ nsresult nsMsgFolderDataSource::DoFolderHasAssertion(nsIMsgFolder *folder,
 		}
 	}
 	else if ((kNC_Name == property) ||
+           (kNC_Open == property) ||
            (kNC_FolderTreeName == property) ||
            (kNC_FolderTreeSimpleName == property) ||
            (kNC_SpecialFolder == property) ||
diff --git a/mailnews/base/src/nsMsgFolderDataSource.h b/mailnews/base/src/nsMsgFolderDataSource.h
index 150a100e3ceb..490e4c1ed674 100644
--- a/mailnews/base/src/nsMsgFolderDataSource.h
+++ b/mailnews/base/src/nsMsgFolderDataSource.h
@@ -112,6 +112,7 @@ protected:
   nsresult createFolderNode(nsIMsgFolder *folder, nsIRDFResource* property,
                             nsIRDFNode **target);
   nsresult createFolderNameNode(nsIMsgFolder *folder, nsIRDFNode **target, PRBool sort);
+  nsresult createFolderOpenNode(nsIMsgFolder *folder,nsIRDFNode **target);
   nsresult createFolderTreeNameNode(nsIMsgFolder *folder, nsIRDFNode **target, PRBool sort);
   nsresult createFolderTreeSimpleNameNode(nsIMsgFolder *folder, nsIRDFNode **target, PRBool sort);
   nsresult createFolderSpecialNode(nsIMsgFolder *folder, nsIRDFNode **target);
@@ -166,6 +167,7 @@ protected:
 							  nsISupportsArray *arguments);
 
   nsresult DoFolderAssert(nsIMsgFolder *folder, nsIRDFResource *property, nsIRDFNode *target);
+  nsresult DoFolderUnassert(nsIMsgFolder *folder, nsIRDFResource *property, nsIRDFNode *target);
 
   nsresult DoFolderHasAssertion(nsIMsgFolder *folder, nsIRDFResource *property, nsIRDFNode *target,
 													 PRBool tv, PRBool *hasAssertion);
@@ -193,6 +195,7 @@ protected:
   static nsIRDFResource* kNC_Child;
   static nsIRDFResource* kNC_Folder;
   static nsIRDFResource* kNC_Name;
+  static nsIRDFResource* kNC_Open;
   static nsIRDFResource* kNC_FolderTreeName;
   static nsIRDFResource* kNC_FolderTreeSimpleName;
   static nsIRDFResource* kNC_NameSort;
@@ -249,7 +252,8 @@ protected:
   static nsIAtom* kNewMessagesAtom;
   static nsIAtom* kNameAtom;
   static nsIAtom* kSynchronizeAtom;
-  
+  static nsIAtom* kOpenAtom;
+
   static nsrefcnt gFolderResourceRefCnt;
 
 	nsCOMPtr<nsISupportsArray> kFolderArcsOutArray;
diff --git a/mailnews/base/src/nsMsgRDFUtils.h b/mailnews/base/src/nsMsgRDFUtils.h
index dc780ef834a9..e425e3ea63e4 100644
--- a/mailnews/base/src/nsMsgRDFUtils.h
+++ b/mailnews/base/src/nsMsgRDFUtils.h
@@ -60,6 +60,7 @@ typedef struct _nsMsgRDFNotification {
 
 #define NC_RDF_CHILD				NC_NAMESPACE_URI "child"
 #define NC_RDF_NAME					NC_NAMESPACE_URI "Name"
+#define NC_RDF_OPEN					NC_NAMESPACE_URI "open"
 #define NC_RDF_FOLDERTREENAME		NC_NAMESPACE_URI "FolderTreeName"
 #define NC_RDF_FOLDERTREESIMPLENAME		NC_NAMESPACE_URI "FolderTreeSimpleName"
 #define NC_RDF_FOLDER				NC_NAMESPACE_URI "Folder"
diff --git a/mailnews/base/util/nsMsgFolder.cpp b/mailnews/base/util/nsMsgFolder.cpp
index 1415a210c980..2312d3952ac7 100644
--- a/mailnews/base/util/nsMsgFolder.cpp
+++ b/mailnews/base/util/nsMsgFolder.cpp
@@ -84,6 +84,7 @@ nsIAtom * nsMsgFolder::kFlaggedAtom	= nsnull;
 nsIAtom * nsMsgFolder::kStatusAtom	= nsnull;
 nsIAtom * nsMsgFolder::kNameAtom	= nsnull;
 nsIAtom * nsMsgFolder::kSynchronizeAtom = nsnull;
+nsIAtom * nsMsgFolder::kOpenAtom = nsnull;
 
 #ifdef MSG_FASTER_URI_PARSING
 nsCOMPtr<nsIURL> nsMsgFolder::mParsingURL;
@@ -128,6 +129,7 @@ nsMsgFolder::nsMsgFolder(void)
     kStatusAtom              = NS_NewAtom("Status");
     kFlaggedAtom             = NS_NewAtom("Flagged");
     kSynchronizeAtom         = NS_NewAtom("Synchronize");
+    kOpenAtom                = NS_NewAtom("open");
 
     initializeStrings();
 
@@ -169,6 +171,7 @@ nsMsgFolder::~nsMsgFolder(void)
       NS_IF_RELEASE(kStatusAtom);
       NS_IF_RELEASE(kNameAtom);
       NS_IF_RELEASE(kSynchronizeAtom);
+	  NS_IF_RELEASE(kOpenAtom);
 
       CRTFREEIF(kInboxName);
       CRTFREEIF(kTrashName);
@@ -1597,6 +1600,11 @@ NS_IMETHODIMP nsMsgFolder::OnFlagChange(PRUint32 flag)
         rv = NotifyBoolPropertyChanged(kSynchronizeAtom, !newValue, newValue);
         NS_ENSURE_SUCCESS(rv,rv);
       }
+	  else if (flag & MSG_FOLDER_FLAG_ELIDED) {
+        PRBool newValue = mFlags & MSG_FOLDER_FLAG_ELIDED;
+        rv = NotifyBoolPropertyChanged(kOpenAtom, newValue, !newValue);
+        NS_ENSURE_SUCCESS(rv,rv);
+      }
   }
   folderInfo = nsnull;
   return rv;
diff --git a/mailnews/base/util/nsMsgFolder.h b/mailnews/base/util/nsMsgFolder.h
index 2c063f6ab095..0ea7bb39c5e6 100644
--- a/mailnews/base/util/nsMsgFolder.h
+++ b/mailnews/base/util/nsMsgFolder.h
@@ -296,6 +296,7 @@ protected:
   static nsIAtom* kFlaggedAtom;
   static nsIAtom* kNameAtom;
   static nsIAtom* kSynchronizeAtom;
+  static nsIAtom* kOpenAtom;
 
 #ifdef MSG_FASTER_URI_PARSING
   // cached parsing URL object