diff --git a/mailnews/base/src/nsMsgFolderCacheElement.cpp b/mailnews/base/src/nsMsgFolderCacheElement.cpp
index 3dfbd76c96f2..ba5ad759d18f 100644
--- a/mailnews/base/src/nsMsgFolderCacheElement.cpp
+++ b/mailnews/base/src/nsMsgFolderCacheElement.cpp
@@ -30,7 +30,8 @@ nsMsgFolderCacheElement::nsMsgFolderCacheElement()
 nsMsgFolderCacheElement::~nsMsgFolderCacheElement()
 {
 	NS_IF_RELEASE(m_mdbRow);
-	NS_IF_RELEASE(m_owningCache);
+	// circular reference, don't do it.
+//	NS_IF_RELEASE(m_owningCache);
 	PR_FREEIF(m_folderURI);
 }
 
@@ -43,8 +44,9 @@ NS_IMPL_SETTER_STR(nsMsgFolderCacheElement::SetURI, m_folderURI)
 void nsMsgFolderCacheElement::SetOwningCache(nsMsgFolderCache *owningCache)
 {
 	m_owningCache = owningCache;
-	if (owningCache)
-		NS_ADDREF(owningCache);
+	// circular reference, don't do it.
+//	if (owningCache)
+//		NS_ADDREF(owningCache);
 }
 
 NS_IMETHODIMP 	 nsMsgFolderCacheElement::GetStringProperty(const char *propertyName, char **result)
diff --git a/mailnews/base/src/nsMsgNotificationManager.cpp b/mailnews/base/src/nsMsgNotificationManager.cpp
index 006ba1ec291e..f8c6755ca911 100644
--- a/mailnews/base/src/nsMsgNotificationManager.cpp
+++ b/mailnews/base/src/nsMsgNotificationManager.cpp
@@ -258,7 +258,7 @@ nsresult nsMsgNotificationManager::AddNewMailNotification(nsIMsgFolder *folder)
 	if(NS_SUCCEEDED(rv) && folderDescription)
 	{
 		sourceString = folderDescription;
-		delete[] folderDescription;
+		nsAllocator::Free(folderDescription);
 	}
 	rv = rdfService->GetLiteral(sourceString.GetUnicode(), getter_AddRefs(source));
 	if(NS_SUCCEEDED(rv))