diff --git a/mailnews/base/util/nsMsgDBFolder.cpp b/mailnews/base/util/nsMsgDBFolder.cpp
index e07125231d8..c8fbd969a5f 100644
--- a/mailnews/base/util/nsMsgDBFolder.cpp
+++ b/mailnews/base/util/nsMsgDBFolder.cpp
@@ -155,6 +155,22 @@ nsresult nsMsgDBFolder::ReadDBFolderInfo(PRBool force)
 NS_IMETHODIMP nsMsgDBFolder::OnKeyChange(nsMsgKey aKeyChanged, PRUint32 aOldFlags, PRUint32 aNewFlags, 
                          nsIDBChangeListener * aInstigator)
 {
+	nsCOMPtr<nsIMsgDBHdr> pMsgDBHdr;
+	nsresult rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(pMsgDBHdr));
+	if(NS_SUCCEEDED(rv))
+	{
+		nsCOMPtr<nsIMessage> message;
+		rv = CreateMessageFromMsgDBHdr(pMsgDBHdr, getter_AddRefs(message));
+		if(NS_SUCCEEDED(rv))
+		{
+			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message, &rv));
+			if(NS_SUCCEEDED(rv))
+			{
+				NotifyPropertyFlagChanged(msgSupports, "Status", aOldFlags, aNewFlags);
+			}
+			UpdateSummaryTotals();
+		}
+	}
 	return NS_OK;
 }
 
diff --git a/mailnews/base/util/nsMsgFolder.cpp b/mailnews/base/util/nsMsgFolder.cpp
index ed32ef3c41c..dcd2360fbfe 100644
--- a/mailnews/base/util/nsMsgFolder.cpp
+++ b/mailnews/base/util/nsMsgFolder.cpp
@@ -31,8 +31,10 @@
 #include "nsRDFCID.h"
 #include "nsXPIDLString.h"
 #include "nsCOMPtr.h"
+#include "nsIMsgMailSession.h"
 
 static NS_DEFINE_CID(kRDFServiceCID,              NS_RDFSERVICE_CID);
+static NS_DEFINE_CID(kMsgMailSessionCID,					NS_MSGMAILSESSION_CID);
 
 
 // we need this because of an egcs 1.0 (and possibly gcc) compiler bug
@@ -45,7 +47,6 @@ nsMsgFolder::nsMsgFolder(void)
     mName(""),
     mFlags(0),
     mNumUnreadMessages(0),	mNumTotalMessages(0),
-		mListeners(nsnull),
     mCsid(0),
     mDepth(0), 
     mPrefFlags(0),
@@ -65,23 +66,8 @@ nsMsgFolder::nsMsgFolder(void)
 
 	mIsCachable = TRUE;
 
-	//The rdf:mailnewsfolders datasource is going to be a listener to all nsIMsgFolders, so add
-	//it as a listener
-    nsresult rv; 
-    NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); 
-    if (NS_SUCCEEDED(rv))
-	{
-		nsCOMPtr<nsIRDFDataSource> datasource;
-		rv = rdfService->GetDataSource("rdf:mailnewsfolders", getter_AddRefs(datasource));
-		if(NS_SUCCEEDED(rv))
-		{
-			nsCOMPtr<nsIFolderListener> folderListener(do_QueryInterface(datasource, &rv));
-			if(NS_SUCCEEDED(rv))
-			{
-				AddFolderListener(folderListener);
-			}
-		}
-	}
+	mListeners = new nsVoidArray();
+
 }
 
 nsMsgFolder::~nsMsgFolder(void)
@@ -96,12 +82,7 @@ nsMsgFolder::~nsMsgFolder(void)
 			mSubFolders->RemoveElementAt(i);
 	}
 
-  if (mListeners) {
-    for (PRInt32 i = mListeners->Count() - 1; i >= 0; --i) {
-      mListeners->RemoveElementAt(i);
-    }
     delete mListeners;
-  }
 
 }
 
@@ -193,21 +174,14 @@ nsMsgFolder::GetHasSubFolders(PRBool *_retval)
 
 NS_IMETHODIMP nsMsgFolder::AddFolderListener(nsIFolderListener * listener)
 {
-  if (! mListeners)
-	{
-		mListeners = new nsVoidArray();
-		if(!mListeners)
-			return NS_ERROR_OUT_OF_MEMORY;
-  }
-  mListeners->AppendElement(listener);
-  return NS_OK;
+	mListeners->AppendElement(listener);
+	return NS_OK;
 
 }
 
 NS_IMETHODIMP nsMsgFolder::RemoveFolderListener(nsIFolderListener * listener)
 {
-  if (! mListeners)
-    return NS_OK;
+
   mListeners->RemoveElement(listener);
   return NS_OK;
 
@@ -1202,12 +1176,39 @@ nsresult nsMsgFolder::NotifyPropertyChanged(char *property, char *oldValue, char
 			nsIFolderListener* listener =(nsIFolderListener*)mListeners->ElementAt(i);
 			listener->OnItemPropertyChanged(supports, property, oldValue, newValue);
 		}
+
+		//Notify listeners who listen to every folder
+		nsresult rv;
+		NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); 
+		if(NS_SUCCEEDED(rv))
+			mailSession->NotifyFolderItemPropertyChanged(supports, property, oldValue, newValue);
+
 	}
 
 	return NS_OK;
 
 }
 
+nsresult nsMsgFolder::NotifyPropertyFlagChanged(nsISupports *item, char *property, PRUint32 oldValue,
+												PRUint32 newValue)
+{
+	PRInt32 i;
+	for(i = 0; i < mListeners->Count(); i++)
+	{
+		//Folderlistener's aren't refcounted.
+		nsIFolderListener *listener = (nsIFolderListener*)mListeners->ElementAt(i);
+		listener->OnItemPropertyFlagChanged(item, property, oldValue, newValue);
+	}
+
+	//Notify listeners who listen to every folder
+	nsresult rv;
+	NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); 
+	if(NS_SUCCEEDED(rv))
+		mailSession->NotifyFolderItemPropertyFlagChanged(item, property, oldValue, newValue);
+
+	return NS_OK;
+}
+
 nsresult nsMsgFolder::NotifyItemAdded(nsISupports *item)
 {
 
@@ -1219,6 +1220,12 @@ nsresult nsMsgFolder::NotifyItemAdded(nsISupports *item)
 		listener->OnItemAdded(this, item);
 	}
 
+	//Notify listeners who listen to every folder
+	nsresult rv;
+	NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); 
+	if(NS_SUCCEEDED(rv))
+		mailSession->NotifyFolderItemAdded(this, item);
+
 	return NS_OK;
 
 }
@@ -1233,6 +1240,11 @@ nsresult nsMsgFolder::NotifyItemDeleted(nsISupports *item)
 		nsIFolderListener *listener = (nsIFolderListener*)mListeners->ElementAt(i);
 		listener->OnItemRemoved(this, item);
 	}
+	//Notify listeners who listen to every folder
+	nsresult rv;
+  NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); 
+	if(NS_SUCCEEDED(rv))
+		mailSession->NotifyFolderItemDeleted(this, item);
 
 	return NS_OK;
 
diff --git a/mailnews/base/util/nsMsgFolder.h b/mailnews/base/util/nsMsgFolder.h
index 87a518ec87e..34a068a5e9b 100644
--- a/mailnews/base/util/nsMsgFolder.h
+++ b/mailnews/base/util/nsMsgFolder.h
@@ -260,6 +260,8 @@ public:
 
 protected:
 	nsresult NotifyPropertyChanged(char *property, char* oldValue, char* newValue);
+	nsresult NotifyPropertyFlagChanged(nsISupports *item, char *property, PRUint32 oldValue,
+												PRUint32 newValue);
 	nsresult NotifyItemAdded(nsISupports *item);
 	nsresult NotifyItemDeleted(nsISupports *item);