diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp
index d1970a73c37..dd806561530 100644
--- a/mozilla/mailnews/base/src/nsMessenger.cpp
+++ b/mozilla/mailnews/base/src/nsMessenger.cpp
@@ -292,7 +292,6 @@ public:
 //
 nsMessenger::nsMessenger() 
 {
-  NS_INIT_ISUPPORTS();
   mScriptObject = nsnull;
   mWindow = nsnull;
   mMsgWindow = nsnull;
@@ -1448,7 +1447,6 @@ NS_IMPL_ISUPPORTS1(SendLaterListener, nsIMsgSendLaterListener)
 SendLaterListener::SendLaterListener(nsIMessenger *aMessenger)
 {
   m_messenger = getter_AddRefs(NS_GetWeakReference(aMessenger));
-  NS_INIT_ISUPPORTS();
 }
 
 SendLaterListener::~SendLaterListener()
@@ -1573,7 +1571,6 @@ NS_IMETHODIMP nsMessenger::DoPrintPreview()
 
 nsSaveMsgListener::nsSaveMsgListener(nsIFileSpec* aSpec, nsMessenger *aMessenger)
 {
-    NS_INIT_ISUPPORTS();
     if (aSpec)
       m_fileSpec = do_QueryInterface(aSpec);
     m_messenger = aMessenger;
diff --git a/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp b/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp
index 6aa790fae09..3a696dff493 100644
--- a/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp
+++ b/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp
@@ -63,7 +63,6 @@ NS_IMPL_QUERY_INTERFACE2(nsMessengerBootstrap, nsICmdLineHandler, nsIMessengerWi
 
 nsMessengerBootstrap::nsMessengerBootstrap()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsMessengerBootstrap::~nsMessengerBootstrap()
diff --git a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp
index 0c95bb7d3e2..0246b8f1724 100644
--- a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp
+++ b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp
@@ -372,8 +372,6 @@ NS_IMPL_ISUPPORTS2(nsMessengerMigrator, nsIMessengerMigrator, nsIObserver)
 nsMessengerMigrator::nsMessengerMigrator() :
   m_haveShutdown(PR_FALSE)
 {
-
-  NS_INIT_ISUPPORTS();
 }
 
 nsMessengerMigrator::~nsMessengerMigrator()
diff --git a/mozilla/mailnews/base/src/nsMessengerOS2Integration.cpp b/mozilla/mailnews/base/src/nsMessengerOS2Integration.cpp
index e076b9e1c47..9a787542211 100644
--- a/mozilla/mailnews/base/src/nsMessengerOS2Integration.cpp
+++ b/mozilla/mailnews/base/src/nsMessengerOS2Integration.cpp
@@ -59,7 +59,6 @@ nsMessengerOS2Integration::nsMessengerOS2Integration()
      pUnreadCount = (PULONG)pvObject;
   }
   *pUnreadCount = 0;
-  NS_INIT_ISUPPORTS();
 }
 
 nsMessengerOS2Integration::~nsMessengerOS2Integration()
diff --git a/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp b/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp
index 8f37ab5b275..a12a3069496 100644
--- a/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp
+++ b/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp
@@ -264,8 +264,6 @@ private:
 
 nsMessengerWinIntegration::nsMessengerWinIntegration()
 {
-  NS_INIT_ISUPPORTS();
-
   mDefaultServerAtom = getter_AddRefs(NS_NewAtom("DefaultServer"));
   mTotalUnreadMessagesAtom = getter_AddRefs(NS_NewAtom("TotalUnreadMessages"));
 
diff --git a/mozilla/mailnews/base/src/nsMsgAccount.cpp b/mozilla/mailnews/base/src/nsMsgAccount.cpp
index 541c4f5af68..63c3dc655b1 100644
--- a/mozilla/mailnews/base/src/nsMsgAccount.cpp
+++ b/mozilla/mailnews/base/src/nsMsgAccount.cpp
@@ -65,8 +65,6 @@ nsMsgAccount::nsMsgAccount():
   m_incomingServer(nsnull),
   m_defaultIdentity(nsnull)
 {
-
-  NS_INIT_ISUPPORTS();
 }
 
 nsMsgAccount::~nsMsgAccount()
diff --git a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp b/mozilla/mailnews/base/src/nsMsgAccountManager.cpp
index 591b4b4cfc5..a8af7bdbe53 100644
--- a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp
+++ b/mozilla/mailnews/base/src/nsMsgAccountManager.cpp
@@ -152,7 +152,6 @@ nsMsgAccountManager::nsMsgAccountManager() :
   m_shutdownInProgress(PR_FALSE),
   m_prefs(0)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsMsgAccountManager::~nsMsgAccountManager()
diff --git a/mozilla/mailnews/base/src/nsMsgBiffManager.cpp b/mozilla/mailnews/base/src/nsMsgBiffManager.cpp
index 865290e6850..9f456acc56a 100644
--- a/mozilla/mailnews/base/src/nsMsgBiffManager.cpp
+++ b/mozilla/mailnews/base/src/nsMsgBiffManager.cpp
@@ -55,8 +55,6 @@ void OnBiffTimer(nsITimer *timer, void *aBiffManager)
 
 nsMsgBiffManager::nsMsgBiffManager()
 {
-  NS_INIT_ISUPPORTS();
-
   mBiffArray = nsnull;
   mHaveShutdown = PR_FALSE;
   mInited = PR_FALSE;
diff --git a/mozilla/mailnews/base/src/nsMsgCopyService.cpp b/mozilla/mailnews/base/src/nsMsgCopyService.cpp
index f68f3a9ae36..b711afa82b6 100644
--- a/mozilla/mailnews/base/src/nsMsgCopyService.cpp
+++ b/mozilla/mailnews/base/src/nsMsgCopyService.cpp
@@ -142,7 +142,6 @@ nsCopyRequest::AddNewCopySource(nsIMsgFolder* srcFolder)
 
 nsMsgCopyService::nsMsgCopyService()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsMsgCopyService::~nsMsgCopyService()
diff --git a/mozilla/mailnews/base/src/nsMsgDBView.cpp b/mozilla/mailnews/base/src/nsMsgDBView.cpp
index 43028f8df08..c6d53bc4a5e 100644
--- a/mozilla/mailnews/base/src/nsMsgDBView.cpp
+++ b/mozilla/mailnews/base/src/nsMsgDBView.cpp
@@ -124,7 +124,6 @@ NS_INTERFACE_MAP_END
 
 nsMsgDBView::nsMsgDBView()
 {
-  NS_INIT_ISUPPORTS();
   /* member initializers and constructor code */
   m_sortValid = PR_FALSE;
   m_sortOrder = nsMsgViewSortOrder::none;
diff --git a/mozilla/mailnews/base/src/nsMsgFolderCache.cpp b/mozilla/mailnews/base/src/nsMsgFolderCache.cpp
index 78d3f53d27f..70eda1ecbc2 100644
--- a/mozilla/mailnews/base/src/nsMsgFolderCache.cpp
+++ b/mozilla/mailnews/base/src/nsMsgFolderCache.cpp
@@ -59,7 +59,6 @@ nsMsgFolderCache::nsMsgFolderCache()
   m_cacheElements = nsnull;
 	m_mdbEnv = nsnull;
 	m_mdbStore = nsnull;
-	NS_INIT_ISUPPORTS();
 	m_mdbAllFoldersTable = nsnull;
 }
 
diff --git a/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp b/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp
index 08511fb1a05..28e97926813 100644
--- a/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp
+++ b/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp
@@ -45,7 +45,6 @@ nsMsgFolderCacheElement::nsMsgFolderCacheElement()
 	m_mdbRow = nsnull;
 	m_owningCache = nsnull;
 	m_folderKey = nsnull;
-	NS_INIT_ISUPPORTS();
 }
 
 nsMsgFolderCacheElement::~nsMsgFolderCacheElement()
diff --git a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp
index 3ac32a6f981..829b221a5a9 100644
--- a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp
+++ b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp
@@ -67,7 +67,6 @@ NS_IMPL_ISUPPORTS5(nsFolderCompactState, nsIMsgFolderCompactor, nsIRequestObserv
 
 nsFolderCompactState::nsFolderCompactState()
 {
-  NS_INIT_ISUPPORTS();
   m_baseMessageUri = nsnull;
   m_fileStream = nsnull;
   m_size = 0;
diff --git a/mozilla/mailnews/base/src/nsMsgMailSession.cpp b/mozilla/mailnews/base/src/nsMsgMailSession.cpp
index 499a404bbde..4eff71d6fec 100644
--- a/mozilla/mailnews/base/src/nsMsgMailSession.cpp
+++ b/mozilla/mailnews/base/src/nsMsgMailSession.cpp
@@ -67,7 +67,6 @@ NS_INTERFACE_MAP_END_THREADSAFE
   
 nsMsgMailSession::nsMsgMailSession()
 {
-	NS_INIT_ISUPPORTS();
 }
 
 
diff --git a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp
index dfd618174ed..f3e18b17808 100644
--- a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp
+++ b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp
@@ -76,7 +76,6 @@ nsMsgOfflineManager::nsMsgOfflineManager() :
   m_curState(eNoState),
   m_curOperation(eNoOp)
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsMsgOfflineManager::~nsMsgOfflineManager()
diff --git a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp
index 1c4f4dacd8f..e7971532aac 100644
--- a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp
+++ b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp
@@ -75,7 +75,6 @@ nsMsgPrintEngine::nsMsgPrintEngine() :
   mMsgInx(nsIMsgPrintEngine::MNAB_START)
 {
   mCurrentlyPrintingURI = -1;
-  NS_INIT_ISUPPORTS();
 }
 
 
diff --git a/mozilla/mailnews/base/src/nsMsgProgress.cpp b/mozilla/mailnews/base/src/nsMsgProgress.cpp
index 46b647ccf78..dfbd85daeae 100644
--- a/mozilla/mailnews/base/src/nsMsgProgress.cpp
+++ b/mozilla/mailnews/base/src/nsMsgProgress.cpp
@@ -57,7 +57,6 @@ NS_INTERFACE_MAP_END_THREADSAFE
 
 nsMsgProgress::nsMsgProgress()
 {
-  NS_INIT_ISUPPORTS();
   m_closeProgress = PR_FALSE;
   m_processCanceled = PR_FALSE;
   m_pendingStateFlags = -1;
diff --git a/mozilla/mailnews/base/src/nsMsgPurgeService.cpp b/mozilla/mailnews/base/src/nsMsgPurgeService.cpp
index 1a95a164756..f53c7f24e8a 100644
--- a/mozilla/mailnews/base/src/nsMsgPurgeService.cpp
+++ b/mozilla/mailnews/base/src/nsMsgPurgeService.cpp
@@ -64,7 +64,6 @@ void OnPurgeTimer(nsITimer *timer, void *aPurgeService)
 
 nsMsgPurgeService::nsMsgPurgeService()
 {
-  NS_INIT_ISUPPORTS();
   mHaveShutdown = PR_FALSE;
 }
 
diff --git a/mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp b/mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp
index 7593b309f9d..607b77de59c 100644
--- a/mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp
+++ b/mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp
@@ -51,8 +51,6 @@ nsMsgRDFDataSource::nsMsgRDFDataSource():
     mInitialized(PR_FALSE),
     mRDFService(nsnull)
 {
-    NS_INIT_ISUPPORTS();
-
     // do one-time initialization here
     
     NS_NewISupportsArray(getter_AddRefs(mObservers));
diff --git a/mozilla/mailnews/base/src/nsMsgServiceProvider.cpp b/mozilla/mailnews/base/src/nsMsgServiceProvider.cpp
index 175036f7048..f819b2afdd7 100644
--- a/mozilla/mailnews/base/src/nsMsgServiceProvider.cpp
+++ b/mozilla/mailnews/base/src/nsMsgServiceProvider.cpp
@@ -57,7 +57,6 @@ static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID);
 
 nsMsgServiceProviderService::nsMsgServiceProviderService()
 {
-  NS_INIT_ISUPPORTS();
 }
 
 nsMsgServiceProviderService::~nsMsgServiceProviderService()