diff --git a/mozilla/mailnews/base/build/nsMsgBaseCID.h b/mozilla/mailnews/base/build/nsMsgBaseCID.h
index 67957bcc608..8f807a41525 100644
--- a/mozilla/mailnews/base/build/nsMsgBaseCID.h
+++ b/mozilla/mailnews/base/build/nsMsgBaseCID.h
@@ -89,4 +89,9 @@
 { 0x4a374e7e, 0x190f, 0x11d3,							\
     { 0x8a, 0x88, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0xd2 } }
 
+/* 7C601F60-1EF3-11d3-9574-006097222B83 */
+#define NS_MSGNOTIFICATIONMANAGER_CID							\
+{ 0x7c601f60, 0x1ef3, 0x11d3,							\
+    { 0x95, 0x74, 0x0, 0x60, 0x97, 0x22, 0x2b, 0x83 } }
+
 #endif // nsMessageBaseCID_h__
diff --git a/mozilla/mailnews/base/build/nsMsgFactory.cpp b/mozilla/mailnews/base/build/nsMsgFactory.cpp
index 9316c117fae..0fef51ec137 100644
--- a/mozilla/mailnews/base/build/nsMsgFactory.cpp
+++ b/mozilla/mailnews/base/build/nsMsgFactory.cpp
@@ -50,6 +50,7 @@
 #include "nsMsgIdentityDataSource.h"
 
 #include "nsMsgBiffManager.h"
+#include "nsMsgNotificationManager.h"
 
 #ifdef DEBUG_bienvenu
 #include "nsMsgFilterService.h"
@@ -86,8 +87,9 @@ static NS_DEFINE_CID(kMsgServerDataSourceCID, NS_MSGSERVERDATASOURCE_CID);
 static NS_DEFINE_CID(kMsgSearchSessionCID, NS_MSGSEARCHSESSION_CID);
 static NS_DEFINE_CID(kMsgFilterServiceCID, NS_MSGFILTERSERVICE_CID);
 
-// Biff
+// Biff and notifications
 static NS_DEFINE_CID(kMsgBiffManagerCID, NS_MSGBIFFMANAGER_CID);
+static NS_DEFINE_CID(kMsgNotificationManagerCID, NS_MSGNOTIFICATIONMANAGER_CID);
 
 ////////////////////////////////////////////////////////////
 //
@@ -290,6 +292,9 @@ nsMsgFactory::CreateInstance(nsISupports * /* aOuter */,
   else if (mClassID.Equals(kMsgBiffManagerCID)){
     rv = NS_NewMsgBiffManager(aIID, aResult);
   }
+  else if (mClassID.Equals(kMsgNotificationManagerCID)){
+    rv = NS_NewMsgNotificationManager(aIID, aResult);
+  }
 
   return rv;
 }  
@@ -452,6 +457,13 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
                                   path,
                                   PR_TRUE, PR_TRUE);
   if (NS_FAILED(rv)) finalResult = rv;
+
+	rv = compMgr->RegisterComponent(kMsgNotificationManagerCID,
+                                  "Mail/News Notification Manager",
+                                  NS_RDF_DATASOURCE_PROGID_PREFIX "msgnotifications",
+                                  path, PR_TRUE, PR_TRUE);
+  if (NS_FAILED(rv)) finalResult = rv;
+
 #ifdef NS_DEBUG
   printf("mailnews registering from %s\n",path);
 #endif
@@ -503,6 +515,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
   //Biff
   rv = compMgr->UnregisterComponent(kMsgBiffManagerCID, path);
   if (NS_FAILED(rv)) finalResult = rv;
+  rv = compMgr->UnregisterComponent(kMsgNotificationManagerCID, path);
+  if (NS_FAILED(rv)) finalResult = rv;
   return finalResult;
 }