diff --git a/mailnews/db/msgdb/build/nsMsgDBFactory.cpp b/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
index 473cccca74ec..a5a7f60fdb5b 100644
--- a/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
+++ b/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
@@ -45,235 +45,24 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapMailDatabase)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgRetentionSettings)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgDownloadSettings)
 
-
-// Module implementation for the msg db library
-class nsMsgDBModule : public nsIModule
-{
-public:
-    nsMsgDBModule();
-    virtual ~nsMsgDBModule();
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_NSIMODULE
-
-protected:
-    nsresult Initialize();
-
-    void Shutdown();
-
-    PRBool mInitialized;
-    nsCOMPtr<nsIGenericFactory> mMailDBFactory;
-    nsCOMPtr<nsIGenericFactory> mNewsDBFactory;
-    nsCOMPtr<nsIGenericFactory> mImapDBFactory;
-    nsCOMPtr<nsIGenericFactory> mMsgRetentionSettingsFactory;
-    nsCOMPtr<nsIGenericFactory> mMsgDownloadSettingsFactory;
-};
-
-
-nsMsgDBModule::nsMsgDBModule()
-    : mInitialized(PR_FALSE)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-nsMsgDBModule::~nsMsgDBModule()
-{
-    Shutdown();
-}
-
-NS_IMPL_ISUPPORTS1(nsMsgDBModule, nsIModule)
-
-// Perform our one-time intialization for this module
-nsresult nsMsgDBModule::Initialize()
-{
-    if (mInitialized)
-        return NS_OK;
-
-    mInitialized = PR_TRUE;
-    return NS_OK;
-}
-
-// Shutdown this module, releasing all of the module resources
-void nsMsgDBModule::Shutdown()
-{
-	nsMsgDatabase::CleanupCache();
-    // Release the factory objects
-    mMailDBFactory = null_nsCOMPtr();
-    mNewsDBFactory = null_nsCOMPtr();
-    mImapDBFactory = null_nsCOMPtr();
-    mMsgRetentionSettingsFactory = null_nsCOMPtr();
-    mMsgDownloadSettingsFactory = null_nsCOMPtr();
-}
-
-static nsModuleComponentInfo
-  MailDbInfo = { NULL, NS_MAILDB_CID, NULL, nsMailDatabaseConstructor },
-  NewsDbInfo = { NULL, NS_NEWSDB_CID, NULL, nsNewsDatabaseConstructor },
-  ImapDbInfo = { NULL, NS_IMAPDB_CID, NULL, nsImapMailDatabaseConstructor },
-  MsgRetentionInfo = { NULL, NS_MSG_RETENTIONSETTINGS_CID, NULL,
-                       nsMsgRetentionSettingsConstructor },
-  MsgDownloadSettings = { NULL, NS_MSG_DOWNLOADSETTINGS_CID, NULL, nsMsgDownloadSettingsConstructor };                     ;
-
-// Create a factory object for creating instances of aClass.
-NS_IMETHODIMP nsMsgDBModule::GetClassObject(nsIComponentManager *aCompMgr,
-                               const nsCID& aClass,
-                               const nsIID& aIID,
-                               void** r_classObj)
-{
-    nsresult rv = NS_OK;
-
-    // Defensive programming: Initialize *r_classObj in case of error below
-    if (!r_classObj)
-        return NS_ERROR_INVALID_POINTER;
-
-    *r_classObj = NULL;
-
-    // Do one-time-only initialization if necessary
-    if (!mInitialized) 
-    {
-        rv = Initialize();
-        if (NS_FAILED(rv)) // Initialization failed! yikes!
-            return rv;
-    }
-
-    // Choose the appropriate factory, based on the desired instance
-    // class type (aClass).
-    nsCOMPtr<nsIGenericFactory> fact;
-
-    if (aClass.Equals(kCMailDB))
-    {
-        if (!mMailDBFactory)
-            rv = NS_NewGenericFactory(getter_AddRefs(mMailDBFactory),
-                                      &MailDbInfo);
-        fact = mMailDBFactory;
-    }
-    else if (aClass.Equals(kCNewsDB))
-    {
-        if (!mNewsDBFactory)
-            rv = NS_NewGenericFactory(getter_AddRefs(mNewsDBFactory),
-                                      &NewsDbInfo);
-        fact = mNewsDBFactory;
-    }
-    else if (aClass.Equals(kCImapDB))
-    {
-        if (!mImapDBFactory)
-            rv = NS_NewGenericFactory(getter_AddRefs(mImapDBFactory),
-                                      &ImapDbInfo);
-        fact = mImapDBFactory;
-    }
-    else if (aClass.Equals(kCMsgRetentionSettings))
-    {
-      if (!mMsgRetentionSettingsFactory)
-        rv = NS_NewGenericFactory(getter_AddRefs(mMsgRetentionSettingsFactory),
-                                  &MsgRetentionInfo);
-      fact = mMsgRetentionSettingsFactory;
-    }
-    else if (aClass.Equals(kCMsgDownloadSettings))
-    {
-      if (!mMsgDownloadSettingsFactory)
-        rv = NS_NewGenericFactory(getter_AddRefs(mMsgDownloadSettingsFactory), &MsgDownloadSettings);
-      fact = mMsgDownloadSettingsFactory;
-    }
-    if (fact)
-        rv = fact->QueryInterface(aIID, r_classObj);
-
-    return rv;
-}
-
-
-struct Components {
-    const char* mDescription;
-    const nsID* mCID;
-    const char* mContractID;
-};
-
 // The list of components we register
-static Components gComponents[] = {
-    { "Mail DB", &kCMailDB,
-      nsnull },
-    { "News DB", &kCNewsDB,
-      nsnull },    
-    { "Imap DB", &kCImapDB,
-      nsnull },
-    { "Msg Retention Settings", &kCMsgRetentionSettings,
-    NS_MSG_RETENTIONSETTINGS_CONTRACTID},
-    { "Msg Download Settings", &kCMsgDownloadSettings,
-    NS_MSG_DOWNLOADSETTINGS_CONTRACTID}
+static nsModuleComponentInfo msgDB_components[] = {
+    { "Mail DB", NS_MAILDB_CID, nsnull, nsMailDatabaseConstructor },
+    { "News DB", NS_NEWSDB_CID, nsnull, nsNewsDatabaseConstructor },
+    { "Imap DB", NS_IMAPDB_CID, nsnull, nsImapMailDatabaseConstructor },
+    { "Msg Retention Settings", NS_MSG_RETENTIONSETTINGS_CID,
+      NS_MSG_RETENTIONSETTINGS_CONTRACTID, nsMsgRetentionSettingsConstructor },
+    { "Msg Download Settings", NS_MSG_DOWNLOADSETTINGS_CID,
+      NS_MSG_DOWNLOADSETTINGS_CONTRACTID, nsMsgDownloadSettingsConstructor }
 };
 
-
-#define NUM_COMPONENTS (sizeof(gComponents) / sizeof(gComponents[0]))
-
-NS_IMETHODIMP nsMsgDBModule::RegisterSelf(nsIComponentManager *aCompMgr,
-                                          nsIFile* aPath,
-                                          const char* registryLocation,
-                                          const char* componentType)
+PR_STATIC_CALLBACK(void)
+msgDBModuleDtor(nsIModule* self)
 {
-    nsresult rv = NS_OK;
-
-    Components* cp = gComponents;
-    Components* end = cp + NUM_COMPONENTS;
-    while (cp < end) 
-    {
-        rv = aCompMgr->RegisterComponentSpec(*cp->mCID, cp->mDescription,
-                                             cp->mContractID, aPath, PR_TRUE,
-                                             PR_TRUE);
-        if (NS_FAILED(rv)) 
-            break;
-        cp++;
-    }
-
-    return rv;
+    nsMsgDatabase::CleanupCache();
 }
 
-NS_IMETHODIMP nsMsgDBModule::UnregisterSelf(nsIComponentManager* aCompMgr, nsIFile* aPath, 
-                                            const char* registryLocation)
-{
-    Components* cp = gComponents;
-    Components* end = cp + NUM_COMPONENTS;
-    while (cp < end) 
-    {
-        aCompMgr->UnregisterComponentSpec(*cp->mCID, aPath);
-        cp++;
-    }
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsMsgDBModule, msgDB_components, msgDBModuleDtor)
 
-    return NS_OK;
-}
 
-NS_IMETHODIMP nsMsgDBModule::CanUnload(nsIComponentManager *aCompMgr, PRBool *okToUnload)
-{
-    if (!okToUnload)
-        return NS_ERROR_INVALID_POINTER;
 
-    *okToUnload = PR_FALSE;
-    return NS_ERROR_FAILURE;
-}
-
-//----------------------------------------------------------------------
-
-static nsMsgDBModule *gModule = NULL;
-
-extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
-                                          nsIFile* aPath,
-                                          nsIModule** return_cobj)
-{
-    nsresult rv = NS_OK;
-
-    NS_ASSERTION(return_cobj, "Null argument");
-    NS_ASSERTION(gModule == NULL, "nsMsgDBModule: Module already created.");
-
-    // Create an initialize the imap module instance
-    nsMsgDBModule *module = new nsMsgDBModule();
-    if (!module)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    // Increase refcnt and store away nsIModule interface to m in return_cobj
-    rv = module->QueryInterface(NS_GET_IID(nsIModule), (void**)return_cobj);
-    if (NS_FAILED(rv)) 
-    {
-        delete module;
-        module = nsnull;
-    }
-    gModule = module;                  // WARNING: Weak Reference
-    return rv;
-}