diff --git a/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp b/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp
index 98b18449e71..a562842e77c 100644
--- a/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp
@@ -43,7 +43,7 @@ static NS_DEFINE_CID(kAddressBookDBCID, NS_ADDRDATABASE_CID);
 static NS_DEFINE_CID(kMsgHeaderParserCID,		NS_MSGHEADERPARSER_CID); 
 static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
 
-NS_IMPL_ISUPPORTS(nsAbAddressCollecter, NS_GET_IID(nsIAbAddressCollecter));
+NS_IMPL_ISUPPORTS1(nsAbAddressCollecter, nsIAbAddressCollecter)
 
 static const char *PREF_COLLECT_EMAIL_ADDRESS = "mail.collect_email_address";
 static const char *PREF_COLLECT_EMAIL_ADDRESS_ENABLE_SIZE_LIMIT = "mail.collect_email_address_enable_size_limit";
diff --git a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp
index 074a9172b00..77df50ad35c 100644
--- a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp
@@ -407,23 +407,21 @@ nsresult nsAbAutoCompleteSession::SearchPreviousResults(const PRUnichar *searchS
 
 	    for (i = 0, pos = 0; i < nbrOfItems; i ++, pos ++)
 	    {
-	        rv = array->QueryElementAt(pos, nsIAutoCompleteItem::GetIID(), getter_AddRefs(resultItem));
+	        rv = array->QueryElementAt(pos, NS_GET_IID(nsIAutoCompleteItem),
+                                       getter_AddRefs(resultItem));
 	        if (NS_FAILED(rv))
                 return NS_ERROR_FAILURE;
 	        
             rv = resultItem->GetParam(getter_AddRefs(item));
 	        if (NS_FAILED(rv) || !item)
                 return NS_ERROR_FAILURE;
-          
-	        rv = item->QueryInterface(nsAbAutoCompleteParam::GetIID(), (void **)&param);
-	        if (NS_FAILED(rv) || !param)
-                return NS_ERROR_FAILURE;
+
+            param = (nsAbAutoCompleteParam *)(void *)item;
             
 			MatchType matchType;
 			if (CheckEntry(searchStr, searchStrLen, param->mNickName, param->mUserName, param->mEmailAddress, &matchType))
         AddToResult(param->mNickName, param->mUserName, param->mEmailAddress, param->mNotes, param->mIsMailList, matchType, results);
 
-			NS_RELEASE(param);
 	    }
 	    return NS_OK;
     }
@@ -540,4 +538,4 @@ NS_IMETHODIMP nsAbAutoCompleteSession::SetDefaultDomain(const PRUnichar * aDefau
     return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS(nsAbAutoCompleteParam, nsAbAutoCompleteParam::GetIID());
+NS_IMPL_ISUPPORTS1(nsAbAutoCompleteParam, nsISupports)
diff --git a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.h b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.h
index b213b42331b..4e9403817b2 100644
--- a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.h
+++ b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.h
@@ -87,10 +87,14 @@ class nsAbAutoCompleteParam : public nsISupports
 {
 public:
 	NS_DECL_ISUPPORTS
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ABAUTOCOMPLETEPARAM_IID)
+    //  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ABAUTOCOMPLETEPARAM_IID)
 	
-	nsAbAutoCompleteParam(const PRUnichar* nickName, const PRUnichar* userName,const PRUnichar* emailAddress,
-    const PRUnichar* notes, PRBool isMailList, nsAbAutoCompleteSession::MatchType type)
+	nsAbAutoCompleteParam(const PRUnichar* nickName,
+                          const PRUnichar* userName,
+                          const PRUnichar* emailAddress,
+                          const PRUnichar* notes,
+                          PRBool isMailList,
+                          nsAbAutoCompleteSession::MatchType type)
 	{
 	  NS_INIT_REFCNT();
 		mNickName = nsCRT::strdup(nickName ? nickName : NS_STATIC_CAST(const PRUnichar*, NS_LITERAL_STRING("").get()));
diff --git a/mozilla/mailnews/addrbook/src/nsAbRDFDataSource.cpp b/mozilla/mailnews/addrbook/src/nsAbRDFDataSource.cpp
index 8aaef23c1de..5e941ea5d60 100644
--- a/mozilla/mailnews/addrbook/src/nsAbRDFDataSource.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAbRDFDataSource.cpp
@@ -184,7 +184,7 @@ nsresult nsAbRDFDataSource::Init()
 	return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS(nsAbRDFDataSource, NS_GET_IID(nsIRDFDataSource));
+NS_IMPL_ISUPPORTS1(nsAbRDFDataSource, nsIRDFDataSource)
 
  // nsIRDFDataSource methods
 NS_IMETHODIMP nsAbRDFDataSource::GetURI(char* *uri)
diff --git a/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp b/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
index 3fac970a89e..3ab6c8f5f54 100644
--- a/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
@@ -104,7 +104,7 @@ nsAddbookProtocolHandler::~nsAddbookProtocolHandler()
   mReportColumns = nsnull;
 }
 
-NS_IMPL_ISUPPORTS(nsAddbookProtocolHandler, NS_GET_IID(nsIProtocolHandler));
+NS_IMPL_ISUPPORTS1(nsAddbookProtocolHandler, nsIProtocolHandler)
 
 NS_METHOD
 nsAddbookProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
diff --git a/mozilla/mailnews/addrbook/src/nsAddrBookSession.cpp b/mozilla/mailnews/addrbook/src/nsAddrBookSession.cpp
index e2310030b3e..26a38d0c446 100644
--- a/mozilla/mailnews/addrbook/src/nsAddrBookSession.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAddrBookSession.cpp
@@ -30,7 +30,7 @@
 #include "nsXPIDLString.h"
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsAddrBookSession, NS_GET_IID(nsIAddrBookSession));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsAddrBookSession, nsIAddrBookSession)
     
 nsAddrBookSession::nsAddrBookSession():
   mRefCnt(0)
diff --git a/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp b/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp
index d86af2c1212..5190541cc3d 100644
--- a/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp
@@ -3447,7 +3447,7 @@ nsAddrDBEnumerator::~nsAddrDBEnumerator()
 		mRowCursor->CutStrongRef(mDB->GetEnv());
 }
 
-NS_IMPL_ISUPPORTS(nsAddrDBEnumerator, NS_GET_IID(nsIEnumerator))
+NS_IMPL_ISUPPORTS1(nsAddrDBEnumerator, nsIEnumerator)
 
 NS_IMETHODIMP nsAddrDBEnumerator::First(void)
 {
@@ -3575,7 +3575,7 @@ nsListAddressEnumerator::~nsListAddressEnumerator()
 		mListRow->CutStrongRef(mDB->GetEnv());
 }
 
-NS_IMPL_ISUPPORTS(nsListAddressEnumerator, NS_GET_IID(nsIEnumerator))
+NS_IMPL_ISUPPORTS1(nsListAddressEnumerator, nsIEnumerator)
 
 NS_IMETHODIMP nsListAddressEnumerator::First(void)
 {
diff --git a/mozilla/mailnews/base/src/nsMessageView.cpp b/mozilla/mailnews/base/src/nsMessageView.cpp
index d944512b8f9..f15ac394238 100644
--- a/mozilla/mailnews/base/src/nsMessageView.cpp
+++ b/mozilla/mailnews/base/src/nsMessageView.cpp
@@ -31,7 +31,7 @@
 
 
 
-NS_IMPL_ISUPPORTS(nsMessageView, NS_GET_IID(nsIMessageView))
+NS_IMPL_ISUPPORTS1(nsMessageView, nsIMessageView)
 
 nsMessageView::nsMessageView()
 {
diff --git a/mozilla/mailnews/base/src/nsMessageViewDataSource.cpp b/mozilla/mailnews/base/src/nsMessageViewDataSource.cpp
index 5462d4ee75c..61cde31aef7 100644
--- a/mozilla/mailnews/base/src/nsMessageViewDataSource.cpp
+++ b/mozilla/mailnews/base/src/nsMessageViewDataSource.cpp
@@ -603,7 +603,7 @@ nsMessageViewDataSource::createMessageNode(nsIMessage *message,
 //////////////////////////   nsMessageViewMessageEnumerator //////////////////
 
 
-NS_IMPL_ISUPPORTS(nsMessageViewMessageEnumerator, NS_GET_IID(nsISimpleEnumerator))
+NS_IMPL_ISUPPORTS1(nsMessageViewMessageEnumerator, nsISimpleEnumerator)
 
 nsMessageViewMessageEnumerator::nsMessageViewMessageEnumerator(nsISimpleEnumerator *srcEnumerator,
 															   PRUint32 showStatus)
@@ -719,7 +719,7 @@ nsresult nsMessageViewMessageEnumerator::MeetsCriteria(nsIMessage *message, PRBo
 //////////////////////////   nsMessageViewThreadEnumerator //////////////////
 
 
-NS_IMPL_ISUPPORTS(nsMessageViewThreadEnumerator, NS_GET_IID(nsISimpleEnumerator))
+NS_IMPL_ISUPPORTS1(nsMessageViewThreadEnumerator, nsISimpleEnumerator)
 
 nsMessageViewThreadEnumerator::nsMessageViewThreadEnumerator(nsISimpleEnumerator *threads,
 															 nsIMsgFolder *srcFolder)
diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp
index 31b91fcee79..f71a45057f3 100644
--- a/mozilla/mailnews/base/src/nsMessenger.cpp
+++ b/mozilla/mailnews/base/src/nsMessenger.cpp
@@ -255,7 +255,7 @@ nsMessenger::~nsMessenger()
 }
 
 
-NS_IMPL_ISUPPORTS(nsMessenger, NS_GET_IID(nsIMessenger))
+NS_IMPL_ISUPPORTS1(nsMessenger, nsIMessenger)
 
 NS_IMETHODIMP    
 nsMessenger::SetWindow(nsIDOMWindowInternal *aWin, nsIMsgWindow *aMsgWindow)
@@ -1344,7 +1344,7 @@ public:
   NS_IMETHOD OnStopSending(nsresult aStatus, const PRUnichar *aMsg, PRUint32 aTotalTried, PRUint32 aSuccessful);
 };
 
-NS_IMPL_ISUPPORTS(SendLaterListener, NS_GET_IID(nsIMsgSendLaterListener));
+NS_IMPL_ISUPPORTS1(SendLaterListener, nsIMsgSendLaterListener)
 
 SendLaterListener::SendLaterListener()
 {
diff --git a/mozilla/mailnews/base/src/nsMsgAccount.cpp b/mozilla/mailnews/base/src/nsMsgAccount.cpp
index ae6ec132ca7..4b6974842fd 100644
--- a/mozilla/mailnews/base/src/nsMsgAccount.cpp
+++ b/mozilla/mailnews/base/src/nsMsgAccount.cpp
@@ -42,7 +42,7 @@
 static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID);
 static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
 
-NS_IMPL_ISUPPORTS(nsMsgAccount, NS_GET_IID(nsIMsgAccount));
+NS_IMPL_ISUPPORTS1(nsMsgAccount, nsIMsgAccount)
 
 nsMsgAccount::nsMsgAccount():
   m_prefs(0),
diff --git a/mozilla/mailnews/base/src/nsMsgCopyService.cpp b/mozilla/mailnews/base/src/nsMsgCopyService.cpp
index df00ac7d3cd..acbd67d7416 100644
--- a/mozilla/mailnews/base/src/nsMsgCopyService.cpp
+++ b/mozilla/mailnews/base/src/nsMsgCopyService.cpp
@@ -274,7 +274,7 @@ nsMsgCopyService::FindRequest(nsISupports* aSupport,
   return copyRequest;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsMsgCopyService, NS_GET_IID(nsIMsgCopyService))
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsMsgCopyService, nsIMsgCopyService)
 
 NS_IMETHODIMP
 nsMsgCopyService::CopyMessages(nsIMsgFolder* srcFolder, /* UI src folder */
diff --git a/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp b/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp
index 9a640e4333d..a19ed0dac76 100644
--- a/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp
+++ b/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp
@@ -40,7 +40,7 @@ nsMsgFolderCacheElement::~nsMsgFolderCacheElement()
 }
 
 
-NS_IMPL_ISUPPORTS(nsMsgFolderCacheElement, GetIID());
+NS_IMPL_ISUPPORTS1(nsMsgFolderCacheElement, nsIMsgFolderCacheElement)
 
 NS_IMPL_GETTER_STR(nsMsgFolderCacheElement::GetKey, m_folderKey)
 NS_IMPL_SETTER_STR(nsMsgFolderCacheElement::SetKey, m_folderKey)
diff --git a/mozilla/mailnews/base/src/nsSubscribableServer.cpp b/mozilla/mailnews/base/src/nsSubscribableServer.cpp
index e7e918abe32..09cd385bb49 100644
--- a/mozilla/mailnews/base/src/nsSubscribableServer.cpp
+++ b/mozilla/mailnews/base/src/nsSubscribableServer.cpp
@@ -84,7 +84,7 @@ nsSubscribableServer::~nsSubscribableServer(void)
     NS_ASSERTION(NS_SUCCEEDED(rv),"failed to free tree");
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsSubscribableServer, NS_GET_IID(nsISubscribableServer));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsSubscribableServer, nsISubscribableServer)
 
 NS_IMETHODIMP
 nsSubscribableServer::SetIncomingServer(nsIMsgIncomingServer *aServer)
diff --git a/mozilla/mailnews/base/src/nsUrlListenerManager.cpp b/mozilla/mailnews/base/src/nsUrlListenerManager.cpp
index d7aba6d7d72..abf5555798d 100644
--- a/mozilla/mailnews/base/src/nsUrlListenerManager.cpp
+++ b/mozilla/mailnews/base/src/nsUrlListenerManager.cpp
@@ -52,7 +52,7 @@ void nsUrlListenerManager::ReleaseListeners()
 	}
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsUrlListenerManager, NS_GET_IID(nsIUrlListenerManager));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsUrlListenerManager, nsIUrlListenerManager)
 
 nsresult nsUrlListenerManager::RegisterListener(nsIUrlListener * aUrlListener)
 {
diff --git a/mozilla/mailnews/base/util/nsMsgUtils.cpp b/mozilla/mailnews/base/util/nsMsgUtils.cpp
index 0fe7fbdf34d..98fb59a7d8e 100644
--- a/mozilla/mailnews/base/util/nsMsgUtils.cpp
+++ b/mozilla/mailnews/base/util/nsMsgUtils.cpp
@@ -142,7 +142,7 @@ nsresult CreateStartupUrl(char *uri, nsIURI** aUrl)
 }
 
 
-NS_IMPL_ISUPPORTS(nsMessageFromMsgHdrEnumerator, NS_GET_IID(nsISimpleEnumerator))
+NS_IMPL_ISUPPORTS1(nsMessageFromMsgHdrEnumerator, nsISimpleEnumerator)
 
 nsMessageFromMsgHdrEnumerator::nsMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
 															 nsIMsgFolder *folder)
diff --git a/mozilla/mailnews/compose/src/nsMsgCompFields.cpp b/mozilla/mailnews/compose/src/nsMsgCompFields.cpp
index 44bfec4b42a..8c0c4811d2b 100644
--- a/mozilla/mailnews/compose/src/nsMsgCompFields.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgCompFields.cpp
@@ -52,7 +52,7 @@ nsresult NS_NewMsgCompFields(const nsIID &aIID, void ** aInstancePtrResult)
 }
 
 /* the following macro actually implement addref, release and query interface for our component. */
-NS_IMPL_THREADSAFE_ISUPPORTS(nsMsgCompFields, NS_GET_IID(nsIMsgCompFields));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsMsgCompFields, nsIMsgCompFields)
 
 nsMsgCompFields::nsMsgCompFields()
 {
diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp
index 5da0d368021..41eac57320f 100644
--- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp
@@ -151,7 +151,7 @@ nsMsgCompose::~nsMsgCompose()
 }
 
 /* the following macro actually implement addref, release and query interface for our component. */
-NS_IMPL_ISUPPORTS(nsMsgCompose, NS_GET_IID(nsMsgCompose));
+NS_IMPL_ISUPPORTS1(nsMsgCompose, nsMsgCompose)
 
 //
 // Once we are here, convert the data which we know to be UTF-8 to UTF-16
@@ -1538,7 +1538,7 @@ QuotingOutputStreamListener::SetMimeHeaders(nsIMimeHeaders * headers)
 }
 
 
-NS_IMPL_ISUPPORTS(QuotingOutputStreamListener, NS_GET_IID(nsIStreamListener));
+NS_IMPL_ISUPPORTS1(QuotingOutputStreamListener, nsIStreamListener)
 ////////////////////////////////////////////////////////////////////////////////////
 // END OF QUOTING LISTENER
 ////////////////////////////////////////////////////////////////////////////////////
@@ -1878,7 +1878,7 @@ nsMsgComposeSendListener::GetMessageId(nsCString* aMessageId)
 // is ready before we do various quoting operations
 ////////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS(nsMsgDocumentStateListener, NS_GET_IID(nsIDocumentStateListener));
+NS_IMPL_ISUPPORTS1(nsMsgDocumentStateListener, nsIDocumentStateListener)
 
 nsMsgDocumentStateListener::nsMsgDocumentStateListener(void)
 {
diff --git a/mozilla/mailnews/compose/src/nsMsgCopy.cpp b/mozilla/mailnews/compose/src/nsMsgCopy.cpp
index dc050244723..53bb2124aa2 100644
--- a/mozilla/mailnews/compose/src/nsMsgCopy.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgCopy.cpp
@@ -157,7 +157,7 @@ CopyListener::SetMsgComposeAndSendObject(nsMsgComposeAndSend *obj)
 // to listen for message copy completion and eventually notify the caller
 ////////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS(nsMsgCopy, NS_GET_IID(nsIUrlListener))
+NS_IMPL_ISUPPORTS1(nsMsgCopy, nsIUrlListener)
 
 nsMsgCopy::nsMsgCopy()
 {
diff --git a/mozilla/mailnews/compose/src/nsMsgCreate.cpp b/mozilla/mailnews/compose/src/nsMsgCreate.cpp
index d7aebdc8686..895ea623ed7 100644
--- a/mozilla/mailnews/compose/src/nsMsgCreate.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgCreate.cpp
@@ -87,7 +87,7 @@ nsMsgDraft::~nsMsgDraft()
 }
 
 /* the following macro actually implement addref, release and query interface for our component. */
-NS_IMPL_ISUPPORTS(nsMsgDraft, NS_GET_IID(nsIMsgDraft));
+NS_IMPL_ISUPPORTS1(nsMsgDraft, nsIMsgDraft)
 
 /* this function will be used by the factory to generate an Message Compose Fields Object....*/
 nsresult 
diff --git a/mozilla/mailnews/compose/src/nsMsgDeliveryListener.cpp b/mozilla/mailnews/compose/src/nsMsgDeliveryListener.cpp
index 8e02da5a4ad..f990d3a36b9 100644
--- a/mozilla/mailnews/compose/src/nsMsgDeliveryListener.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgDeliveryListener.cpp
@@ -26,7 +26,7 @@
 #include "nsIMsgMailNewsUrl.h"
 #include "nsMsgPrompts.h"
 
-NS_IMPL_ISUPPORTS(nsMsgDeliveryListener, NS_GET_IID(nsIUrlListener))
+NS_IMPL_ISUPPORTS1(nsMsgDeliveryListener, nsIUrlListener)
 
 nsresult 
 nsMsgDeliveryListener::OnStartRunningUrl(nsIURI * aUrl)
diff --git a/mozilla/mailnews/compose/src/nsMsgQuote.cpp b/mozilla/mailnews/compose/src/nsMsgQuote.cpp
index 2cbd9a02af8..0dddb0a4038 100644
--- a/mozilla/mailnews/compose/src/nsMsgQuote.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgQuote.cpp
@@ -128,7 +128,7 @@ nsMsgQuote::~nsMsgQuote()
 }
 
 /* the following macro actually implement addref, release and query interface for our component. */
-NS_IMPL_ISUPPORTS(nsMsgQuote, NS_GET_IID(nsIMsgQuote));
+NS_IMPL_ISUPPORTS1(nsMsgQuote, nsIMsgQuote)
 
 NS_IMETHODIMP nsMsgQuote::GetStreamListener(nsIStreamListener ** aStreamListener)
 {
diff --git a/mozilla/mailnews/compose/src/nsMsgRecipientArray.cpp b/mozilla/mailnews/compose/src/nsMsgRecipientArray.cpp
index c191e8d5236..f8f68079520 100644
--- a/mozilla/mailnews/compose/src/nsMsgRecipientArray.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgRecipientArray.cpp
@@ -37,7 +37,7 @@ nsMsgRecipientArray::~nsMsgRecipientArray()
 }
 
 /* the following macro actually implement addref, release and query interface for our class. */
-NS_IMPL_ISUPPORTS(nsMsgRecipientArray, NS_GET_IID(nsMsgRecipientArray));
+NS_IMPL_ISUPPORTS1(nsMsgRecipientArray, nsIMsgRecipientArray)
 
 nsresult nsMsgRecipientArray::StringAt(PRInt32 idx, PRUnichar **_retval)
 {
diff --git a/mozilla/mailnews/compose/src/nsMsgSend.cpp b/mozilla/mailnews/compose/src/nsMsgSend.cpp
index 5c431721952..7c2cdaedf89 100644
--- a/mozilla/mailnews/compose/src/nsMsgSend.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgSend.cpp
@@ -161,7 +161,7 @@ nsresult NS_NewMsgSend(const nsIID &aIID, void ** aInstancePtrResult)
 }
 
 /* the following macro actually implement addref, release and query interface for our component. */
-NS_IMPL_ISUPPORTS(nsMsgComposeAndSend, NS_GET_IID(nsIMsgSend));
+NS_IMPL_ISUPPORTS1(nsMsgComposeAndSend, nsIMsgSend)
 
 nsMsgComposeAndSend::nsMsgComposeAndSend() : 
     m_messageKey(0xffffffff)
diff --git a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp
index 6e2d6ba2fca..f2252e86c35 100644
--- a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp
@@ -325,7 +325,7 @@ nsMsgSendLater::OnStartRequest(nsIChannel *channel, nsISupports *ctxt)
 // This is the listener class for the send operation. We have to create this class 
 // to listen for message send completion and eventually notify the caller
 ////////////////////////////////////////////////////////////////////////////////////
-NS_IMPL_ISUPPORTS(SendOperationListener, NS_GET_IID(nsIMsgSendListener));
+NS_IMPL_ISUPPORTS1(SendOperationListener, nsIMsgSendListener)
 
 SendOperationListener::SendOperationListener(void) 
 { 
diff --git a/mozilla/mailnews/compose/tests/compose/test.cpp b/mozilla/mailnews/compose/tests/compose/test.cpp
index 4c0766ce53d..1ed0d93514d 100644
--- a/mozilla/mailnews/compose/tests/compose/test.cpp
+++ b/mozilla/mailnews/compose/tests/compose/test.cpp
@@ -142,7 +142,7 @@ public:
   };  
 };
 
-NS_IMPL_ISUPPORTS(SendOperationListener, NS_GET_IID(nsIMsgSendListener));
+NS_IMPL_ISUPPORTS1(SendOperationListener, nsIMsgSendListener)
 ////////////////////////////////////////////////////////////////////////////////////
 // This is the listener class for the send operation. We have to create this class 
 // to listen for message send completion and eventually notify the caller
diff --git a/mozilla/mailnews/compose/tests/compose2/test2.cpp b/mozilla/mailnews/compose/tests/compose2/test2.cpp
index dcc1edbfb9a..72264bc2cbd 100644
--- a/mozilla/mailnews/compose/tests/compose2/test2.cpp
+++ b/mozilla/mailnews/compose/tests/compose2/test2.cpp
@@ -219,7 +219,7 @@ private:
 // This is the listener class for the send operation. We have to create this class 
 // to listen for message send completion and eventually notify the caller
 ////////////////////////////////////////////////////////////////////////////////////
-NS_IMPL_ISUPPORTS(SendOperationListener, NS_GET_IID(nsIMsgSendListener));
+NS_IMPL_ISUPPORTS1(SendOperationListener, nsIMsgSendListener)
 
 SendOperationListener::SendOperationListener(void) 
 { 
diff --git a/mozilla/mailnews/compose/tests/geturl/geturl.cpp b/mozilla/mailnews/compose/tests/geturl/geturl.cpp
index c836dfdd986..d58c8945166 100644
--- a/mozilla/mailnews/compose/tests/geturl/geturl.cpp
+++ b/mozilla/mailnews/compose/tests/geturl/geturl.cpp
@@ -155,7 +155,7 @@ public:
         return NS_OK;
     }
 };
-NS_IMPL_ISUPPORTS(ConsoleOutputStreamImpl, NS_GET_IID(nsIOutputStream));
+NS_IMPL_ISUPPORTS1(ConsoleOutputStreamImpl, nsIOutputStream)
 ////////////////////////////////////////////////////////////////////////////////////
 // END OF CONSUMER STREAM
 ////////////////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.cpp b/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.cpp
index c32a4c89ae5..abd4123de0e 100644
--- a/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.cpp
+++ b/mozilla/mailnews/compose/tests/geturl/nsURLFetcher.cpp
@@ -60,7 +60,7 @@ nsresult NS_NewURLFetcher(nsURLFetcher ** aInstancePtrResult)
 
 // The following macros actually implement addref, release and 
 // query interface for our component. 
-NS_IMPL_ISUPPORTS(nsURLFetcher, NS_GET_IID(nsIStreamListener));
+NS_IMPL_ISUPPORTS1(nsURLFetcher, nsIStreamListener)
 
 /* 
  * Inherited methods for nsMimeConverter
diff --git a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
index 6be29e45413..e7e42bbd2c0 100644
--- a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
+++ b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
@@ -75,7 +75,7 @@ nsMsgDBModule::~nsMsgDBModule()
     Shutdown();
 }
 
-NS_IMPL_ISUPPORTS(nsMsgDBModule, NS_GET_IID(nsIModule))
+NS_IMPL_ISUPPORTS1(nsMsgDBModule, nsIModule)
 
 // Perform our one-time intialization for this module
 nsresult nsMsgDBModule::Initialize()
diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
index bfcca6a59ec..26311e8381d 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
@@ -2095,7 +2095,7 @@ nsMsgDBEnumerator::~nsMsgDBEnumerator()
 	NS_IF_RELEASE(mResultHdr);
 }
 
-NS_IMPL_ISUPPORTS(nsMsgDBEnumerator, NS_GET_IID(nsISimpleEnumerator))
+NS_IMPL_ISUPPORTS1(nsMsgDBEnumerator, nsISimpleEnumerator)
 
 nsresult nsMsgDBEnumerator::GetRowCursor()
 {
@@ -2288,7 +2288,7 @@ nsMsgDBThreadEnumerator::~nsMsgDBThreadEnumerator()
     NS_RELEASE(mDB);
 }
 
-NS_IMPL_ISUPPORTS(nsMsgDBThreadEnumerator, NS_GET_IID(nsISimpleEnumerator))
+NS_IMPL_ISUPPORTS1(nsMsgDBThreadEnumerator, nsISimpleEnumerator)
 
 nsresult nsMsgDBThreadEnumerator::GetTableCursor(void)
 {
diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
index 966eda17324..751705baf8b 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
@@ -30,7 +30,7 @@
 #include "nsIMimeConverter.h"
 #include "nsXPIDLString.h"
 
-NS_IMPL_ISUPPORTS(nsMsgHdr, NS_GET_IID(nsIMsgDBHdr))
+NS_IMPL_ISUPPORTS1(nsMsgHdr, nsIMsgDBHdr)
 
 static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
 
diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp
index 70ac4014c4e..a6dbcce1d88 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp
@@ -26,7 +26,7 @@
 #include "nsMsgDatabase.h"
 #include "nsCOMPtr.h"
 
-NS_IMPL_ISUPPORTS(nsMsgThread, NS_GET_IID(nsMsgThread))
+NS_IMPL_ISUPPORTS1(nsMsgThread, nsMsgThread)
 
 nsMsgThread::nsMsgThread()
 {
@@ -683,7 +683,7 @@ nsMsgThreadEnumerator::~nsMsgThreadEnumerator()
     NS_RELEASE(mThread);
 }
 
-NS_IMPL_ISUPPORTS(nsMsgThreadEnumerator, NS_GET_IID(nsISimpleEnumerator))
+NS_IMPL_ISUPPORTS1(nsMsgThreadEnumerator, nsISimpleEnumerator)
 
 
 PRInt32 nsMsgThreadEnumerator::MsgKeyFirstChildIndex(nsMsgKey inMsgKey)
diff --git a/mozilla/mailnews/imap/build/nsImapFactory.cpp b/mozilla/mailnews/imap/build/nsImapFactory.cpp
index c5f6588b289..bc54f55e59d 100644
--- a/mozilla/mailnews/imap/build/nsImapFactory.cpp
+++ b/mozilla/mailnews/imap/build/nsImapFactory.cpp
@@ -91,7 +91,7 @@ nsMsgImapModule::~nsMsgImapModule()
     Shutdown();
 }
 
-NS_IMPL_ISUPPORTS(nsMsgImapModule, NS_GET_IID(nsIModule))
+NS_IMPL_ISUPPORTS1(nsMsgImapModule, nsIModule)
 
 // Perform our one-time intialization for this module
 nsresult nsMsgImapModule::Initialize()
diff --git a/mozilla/mailnews/imap/src/nsImapProxyEvent.cpp b/mozilla/mailnews/imap/src/nsImapProxyEvent.cpp
index 28814d892ef..3d30dd5dba3 100644
--- a/mozilla/mailnews/imap/src/nsImapProxyEvent.cpp
+++ b/mozilla/mailnews/imap/src/nsImapProxyEvent.cpp
@@ -122,7 +122,7 @@ nsImapExtensionSinkProxy::~nsImapExtensionSinkProxy()
     NS_IF_RELEASE (m_realImapExtensionSink);
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsImapExtensionSinkProxy, NS_GET_IID(nsIImapExtensionSink));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsImapExtensionSinkProxy, nsIImapExtensionSink);
 
 NS_IMETHODIMP
 nsImapExtensionSinkProxy::ClearFolderRights(nsIImapProtocol* aProtocol,
@@ -352,7 +352,7 @@ nsImapMiscellaneousSinkProxy::~nsImapMiscellaneousSinkProxy()
     NS_IF_RELEASE (m_realImapMiscellaneousSink);
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsImapMiscellaneousSinkProxy, NS_GET_IID(nsIImapMiscellaneousSink));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsImapMiscellaneousSinkProxy, nsIImapMiscellaneousSink)
 
 NS_IMETHODIMP
 nsImapMiscellaneousSinkProxy::GetArbitraryHeaders(nsIImapProtocol* aProtocol,
diff --git a/mozilla/mailnews/imap/src/nsImapUtils.cpp b/mozilla/mailnews/imap/src/nsImapUtils.cpp
index c436a623c98..5a088842ce0 100644
--- a/mozilla/mailnews/imap/src/nsImapUtils.cpp
+++ b/mozilla/mailnews/imap/src/nsImapUtils.cpp
@@ -249,7 +249,7 @@ nsresult nsCreateImapBaseMessageURI(const char *baseURI, char **baseMessageURI)
 
 // nsImapMailboxSpec stuff
 
-NS_IMPL_ISUPPORTS(nsImapMailboxSpec, NS_GET_IID(nsIMailboxSpec));
+NS_IMPL_ISUPPORTS1(nsImapMailboxSpec, nsIMailboxSpec)
 
 nsImapMailboxSpec::nsImapMailboxSpec()
 {
diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp
index 514e2aa4e0a..f0bfea52681 100644
--- a/mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp
+++ b/mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp
@@ -130,7 +130,7 @@ public:
 };
 
 
-NS_IMPL_ISUPPORTS( SendListener, nsCOMTypeInfo<nsIMsgSendListener>::GetIID())
+NS_IMPL_ISUPPORTS1( SendListener, nsIMsgSendListener)
 
 nsresult SendListener::CreateSendListener( nsIMsgSendListener **ppListener)
 {
diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp
index 7794383dd91..12647f469b4 100644
--- a/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp
+++ b/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp
@@ -195,7 +195,7 @@ nsEudoraImport::~nsEudoraImport()
 
 
 
-NS_IMPL_ISUPPORTS(nsEudoraImport, NS_GET_IID(nsIImportModule));
+NS_IMPL_ISUPPORTS1(nsEudoraImport, nsIImportModule)
 
 
 NS_IMETHODIMP nsEudoraImport::GetName( PRUnichar **name)
@@ -339,7 +339,7 @@ ImportMailImpl::~ImportMailImpl()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(ImportMailImpl, NS_GET_IID(nsIImportMail));
+NS_IMPL_THREADSAFE_ISUPPORTS1(ImportMailImpl, nsIImportMail)
 
 NS_IMETHODIMP ImportMailImpl::GetDefaultLocation( nsIFileSpec **ppLoc, PRBool *found, PRBool *userVerify)
 {
@@ -557,7 +557,7 @@ ImportAddressImpl::~ImportAddressImpl()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(ImportAddressImpl, NS_GET_IID(nsIImportAddressBooks));
+NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
 
 	
 NS_IMETHODIMP ImportAddressImpl::GetAutoFind(PRUnichar **description, PRBool *_retval)
diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraSettings.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraSettings.cpp
index 05d2c6c4d91..ebb3c18d11f 100644
--- a/mozilla/mailnews/import/eudora/src/nsEudoraSettings.cpp
+++ b/mozilla/mailnews/import/eudora/src/nsEudoraSettings.cpp
@@ -65,7 +65,7 @@ nsEudoraSettings::~nsEudoraSettings()
 	NS_IF_RELEASE( m_pLocation);
 }
 
-NS_IMPL_ISUPPORTS(nsEudoraSettings, NS_GET_IID(nsIImportSettings));
+NS_IMPL_ISUPPORTS1(nsEudoraSettings, nsIImportSettings)
 
 NS_IMETHODIMP nsEudoraSettings::AutoLocate(PRUnichar **description, nsIFileSpec **location, PRBool *_retval)
 {
diff --git a/mozilla/mailnews/import/oexpress/nsOEImport.cpp b/mozilla/mailnews/import/oexpress/nsOEImport.cpp
index adb22e760bc..e887c641de6 100644
--- a/mozilla/mailnews/import/oexpress/nsOEImport.cpp
+++ b/mozilla/mailnews/import/oexpress/nsOEImport.cpp
@@ -176,7 +176,7 @@ nsOEImport::~nsOEImport()
 
 
 
-NS_IMPL_ISUPPORTS(nsOEImport, NS_GET_IID(nsIImportModule));
+NS_IMPL_ISUPPORTS1(nsOEImport, nsIImportModule)
 
 
 NS_IMETHODIMP nsOEImport::GetName( PRUnichar **name)
@@ -320,7 +320,7 @@ ImportMailImpl::~ImportMailImpl()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(ImportMailImpl, NS_GET_IID(nsIImportMail));
+NS_IMPL_THREADSAFE_ISUPPORTS1(ImportMailImpl, nsIImportMail)
 
 NS_IMETHODIMP ImportMailImpl::GetDefaultLocation( nsIFileSpec **ppLoc, PRBool *found, PRBool *userVerify)
 {
@@ -539,7 +539,7 @@ ImportAddressImpl::~ImportAddressImpl()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(ImportAddressImpl, NS_GET_IID(nsIImportAddressBooks));
+NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
 
 	
 NS_IMETHODIMP ImportAddressImpl::GetAutoFind(PRUnichar **description, PRBool *_retval)
diff --git a/mozilla/mailnews/import/oexpress/nsOESettings.cpp b/mozilla/mailnews/import/oexpress/nsOESettings.cpp
index 2a2b1e5a5b4..cfb09ba923b 100644
--- a/mozilla/mailnews/import/oexpress/nsOESettings.cpp
+++ b/mozilla/mailnews/import/oexpress/nsOESettings.cpp
@@ -94,7 +94,7 @@ nsOESettings::~nsOESettings()
 {
 }
 
-NS_IMPL_ISUPPORTS(nsOESettings, NS_GET_IID(nsIImportSettings));
+NS_IMPL_ISUPPORTS1(nsOESettings, nsIImportSettings)
 
 NS_IMETHODIMP nsOESettings::AutoLocate(PRUnichar **description, nsIFileSpec **location, PRBool *_retval)
 {
diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp
index d46a46770f1..16783dfa939 100644
--- a/mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp
+++ b/mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp
@@ -128,7 +128,7 @@ public:
 };
 
 
-NS_IMPL_ISUPPORTS( SendListener, nsCOMTypeInfo<nsIMsgSendListener>::GetIID())
+NS_IMPL_ISUPPORTS1( SendListener, nsIMsgSendListener)
 
 nsresult SendListener::CreateSendListener( nsIMsgSendListener **ppListener)
 {
diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp
index 3136b4963fb..f29ffeeb0fb 100644
--- a/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp
+++ b/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp
@@ -179,7 +179,7 @@ nsOutlookImport::~nsOutlookImport()
 
 
 
-NS_IMPL_ISUPPORTS(nsOutlookImport, NS_GET_IID(nsIImportModule));
+NS_IMPL_ISUPPORTS1(nsOutlookImport, nsIImportModule)
 
 
 NS_IMETHODIMP nsOutlookImport::GetName( PRUnichar **name)
@@ -322,7 +322,7 @@ ImportMailImpl::~ImportMailImpl()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(ImportMailImpl, NS_GET_IID(nsIImportMail));
+NS_IMPL_THREADSAFE_ISUPPORTS1(ImportMailImpl, nsIImportMail)
 
 NS_IMETHODIMP ImportMailImpl::GetDefaultLocation( nsIFileSpec **ppLoc, PRBool *found, PRBool *userVerify)
 {
@@ -520,7 +520,7 @@ ImportAddressImpl::~ImportAddressImpl()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(ImportAddressImpl, NS_GET_IID(nsIImportAddressBooks));
+NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
 
 	
 NS_IMETHODIMP ImportAddressImpl::GetAutoFind(PRUnichar **description, PRBool *_retval)
diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookSettings.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookSettings.cpp
index 140059bb595..363a5f90615 100644
--- a/mozilla/mailnews/import/outlook/src/nsOutlookSettings.cpp
+++ b/mozilla/mailnews/import/outlook/src/nsOutlookSettings.cpp
@@ -92,7 +92,7 @@ nsOutlookSettings::~nsOutlookSettings()
 {
 }
 
-NS_IMPL_ISUPPORTS(nsOutlookSettings, NS_GET_IID(nsIImportSettings));
+NS_IMPL_ISUPPORTS1(nsOutlookSettings, nsIImportSettings)
 
 NS_IMETHODIMP nsOutlookSettings::AutoLocate(PRUnichar **description, nsIFileSpec **location, PRBool *_retval)
 {
diff --git a/mozilla/mailnews/import/src/nsImportABDescriptor.cpp b/mozilla/mailnews/import/src/nsImportABDescriptor.cpp
index f5b0c52e42a..c2f8dff18c0 100644
--- a/mozilla/mailnews/import/src/nsImportABDescriptor.cpp
+++ b/mozilla/mailnews/import/src/nsImportABDescriptor.cpp
@@ -44,7 +44,7 @@ NS_METHOD nsImportABDescriptor::Create( nsISupports *aOuter, REFNSIID aIID, void
   return rv;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsImportABDescriptor, NS_GET_IID(nsIImportABDescriptor));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportABDescriptor, nsIImportABDescriptor)
 
 nsImportABDescriptor::nsImportABDescriptor() 
 { 
diff --git a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp
index 354deb38cfe..eb2d32c3e73 100644
--- a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp
+++ b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp
@@ -217,7 +217,7 @@ nsImportGenericAddressBooks::~nsImportGenericAddressBooks()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsImportGenericAddressBooks, NS_GET_IID(nsIImportGeneric));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportGenericAddressBooks, nsIImportGeneric)
 
 
 NS_IMETHODIMP nsImportGenericAddressBooks::GetData(const char *dataId, nsISupports **_retval)
diff --git a/mozilla/mailnews/import/src/nsImportFieldMap.cpp b/mozilla/mailnews/import/src/nsImportFieldMap.cpp
index 6186872d6ad..9e199b27ed1 100644
--- a/mozilla/mailnews/import/src/nsImportFieldMap.cpp
+++ b/mozilla/mailnews/import/src/nsImportFieldMap.cpp
@@ -50,7 +50,7 @@ NS_METHOD nsImportFieldMap::Create( nsISupports *aOuter, REFNSIID aIID, void **a
   return rv;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsImportFieldMap, NS_GET_IID(nsIImportFieldMap));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportFieldMap, nsIImportFieldMap)
 
 nsImportFieldMap::nsImportFieldMap() 
 { 
diff --git a/mozilla/mailnews/import/src/nsImportMail.cpp b/mozilla/mailnews/import/src/nsImportMail.cpp
index 94db4bcb5e4..4e66fee636a 100644
--- a/mozilla/mailnews/import/src/nsImportMail.cpp
+++ b/mozilla/mailnews/import/src/nsImportMail.cpp
@@ -214,7 +214,7 @@ nsImportGenericMail::~nsImportGenericMail()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsImportGenericMail, NS_GET_IID(nsIImportGeneric));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportGenericMail, nsIImportGeneric)
 
 
 NS_IMETHODIMP nsImportGenericMail::GetData(const char *dataId, nsISupports **_retval)
diff --git a/mozilla/mailnews/import/src/nsImportMailboxDescriptor.cpp b/mozilla/mailnews/import/src/nsImportMailboxDescriptor.cpp
index 369df511e8f..4507ee77ade 100644
--- a/mozilla/mailnews/import/src/nsImportMailboxDescriptor.cpp
+++ b/mozilla/mailnews/import/src/nsImportMailboxDescriptor.cpp
@@ -44,7 +44,7 @@ NS_METHOD nsImportMailboxDescriptor::Create( nsISupports *aOuter, REFNSIID aIID,
   return rv;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsImportMailboxDescriptor, NS_GET_IID(nsIImportMailboxDescriptor));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportMailboxDescriptor, nsIImportMailboxDescriptor)
 
 nsImportMailboxDescriptor::nsImportMailboxDescriptor() 
 { 
diff --git a/mozilla/mailnews/import/src/nsImportMimeEncode.cpp b/mozilla/mailnews/import/src/nsImportMimeEncode.cpp
index b1f511b2e0c..cf99cdf320d 100644
--- a/mozilla/mailnews/import/src/nsImportMimeEncode.cpp
+++ b/mozilla/mailnews/import/src/nsImportMimeEncode.cpp
@@ -404,7 +404,7 @@ NS_METHOD nsIImportMimeEncodeImpl::Create( nsISupports *aOuter, REFNSIID aIID, v
 }
 
 
-NS_IMPL_ISUPPORTS(nsIImportMimeEncodeImpl, NS_GET_IID(nsIImportMimeEncode));
+NS_IMPL_ISUPPORTS1(nsIImportMimeEncodeImpl, nsIImportMimeEncode)
 
 NS_METHOD nsIImportMimeEncodeImpl::EncodeFile(nsIFileSpec *inFile, nsIFileSpec *outFile, const char *fileName, const char *mimeType)
 {
diff --git a/mozilla/mailnews/import/src/nsImportService.cpp b/mozilla/mailnews/import/src/nsImportService.cpp
index 3ab69faa4f8..1c00f425211 100644
--- a/mozilla/mailnews/import/src/nsImportService.cpp
+++ b/mozilla/mailnews/import/src/nsImportService.cpp
@@ -201,7 +201,7 @@ nsImportService::~nsImportService()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(nsImportService, NS_GET_IID(nsIImportService));
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportService, nsIImportService)
 
 
 NS_IMETHODIMP nsImportService::DiscoverModules( void)
diff --git a/mozilla/mailnews/import/text/src/nsTextImport.cpp b/mozilla/mailnews/import/text/src/nsTextImport.cpp
index f74b73bac41..cdc8f8e75b0 100644
--- a/mozilla/mailnews/import/text/src/nsTextImport.cpp
+++ b/mozilla/mailnews/import/text/src/nsTextImport.cpp
@@ -141,7 +141,7 @@ nsTextImport::~nsTextImport()
 
 
 
-NS_IMPL_ISUPPORTS(nsTextImport, NS_GET_IID(nsIImportModule));
+NS_IMPL_ISUPPORTS1(nsTextImport, nsIImportModule)
 
 
 NS_IMETHODIMP nsTextImport::GetName( PRUnichar **name)
@@ -263,7 +263,7 @@ ImportAddressImpl::~ImportAddressImpl()
 
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS(ImportAddressImpl, NS_GET_IID(nsIImportAddressBooks));
+NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
 
 	
 NS_IMETHODIMP ImportAddressImpl::GetAutoFind(PRUnichar **addrDescription, PRBool *_retval)
diff --git a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp
index 2fcd8e89f55..a5b980beccb 100644
--- a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp
+++ b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp
@@ -129,7 +129,7 @@ nsMsgLocalModule::~nsMsgLocalModule()
     Shutdown();
 }
 
-NS_IMPL_ISUPPORTS(nsMsgLocalModule, NS_GET_IID(nsIModule))
+NS_IMPL_ISUPPORTS1(nsMsgLocalModule, nsIModule)
 
 // Perform our one-time intialization for this module
 nsresult nsMsgLocalModule::Initialize()
diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp
index 14d47b5a163..5b7ef197af2 100644
--- a/mozilla/mailnews/local/src/nsParseMailbox.cpp
+++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp
@@ -425,7 +425,7 @@ PRInt32 nsMsgMailboxParser::HandleLine(char *line, PRUint32 lineLength)
 
 }
 
-NS_IMPL_ISUPPORTS(nsParseMailMessageState, NS_GET_IID(nsIMsgParseMailMsgState));
+NS_IMPL_ISUPPORTS1(nsParseMailMessageState, nsIMsgParseMailMsgState)
 
 nsParseMailMessageState::nsParseMailMessageState()
 {
diff --git a/mozilla/mailnews/local/src/nsPop3Sink.cpp b/mozilla/mailnews/local/src/nsPop3Sink.cpp
index f11100c35b6..26065365e23 100644
--- a/mozilla/mailnews/local/src/nsPop3Sink.cpp
+++ b/mozilla/mailnews/local/src/nsPop3Sink.cpp
@@ -35,7 +35,7 @@
 #include "nsMsgLocalFolderHdrs.h"
 #include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later...
 
-NS_IMPL_ISUPPORTS(nsPop3Sink, NS_GET_IID(nsIPop3Sink));
+NS_IMPL_ISUPPORTS1(nsPop3Sink, nsIPop3Sink)
 
 nsPop3Sink::nsPop3Sink()
 {
diff --git a/mozilla/mailnews/local/tests/pop3/pop3Test.cpp b/mozilla/mailnews/local/tests/pop3/pop3Test.cpp
index 53fb16ad484..dc894297f8d 100644
--- a/mozilla/mailnews/local/tests/pop3/pop3Test.cpp
+++ b/mozilla/mailnews/local/tests/pop3/pop3Test.cpp
@@ -134,7 +134,7 @@ protected:
 	PRBool		m_runningURL;	// are we currently running a url? this flag is set to false on exit...
 };
 
-NS_IMPL_ISUPPORTS(nsPop3TestDriver, NS_GET_IID(nsIUrlListener))
+NS_IMPL_ISUPPORTS1(nsPop3TestDriver, nsIUrlListener)
 
 nsPop3TestDriver::nsPop3TestDriver(nsIEventQueue *queue)
 {
diff --git a/mozilla/mailnews/mime/build/nsMimeModule.cpp b/mozilla/mailnews/mime/build/nsMimeModule.cpp
index 5f5c7eacf3e..fce494290ca 100644
--- a/mozilla/mailnews/mime/build/nsMimeModule.cpp
+++ b/mozilla/mailnews/mime/build/nsMimeModule.cpp
@@ -83,7 +83,7 @@ nsMimeModule::~nsMimeModule()
     Shutdown();
 }
 
-NS_IMPL_ISUPPORTS(nsMimeModule, NS_GET_IID(nsIModule))
+NS_IMPL_ISUPPORTS1(nsMimeModule, nsIModule)
 
 // Perform our one-time intialization for this module
 nsresult nsMimeModule::Initialize()
diff --git a/mozilla/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.cpp b/mozilla/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.cpp
index 49c052914c4..71aaf0ba7a1 100644
--- a/mozilla/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.cpp
+++ b/mozilla/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.cpp
@@ -53,9 +53,7 @@ nsresult NS_NewMimeContentTypeHandler(nsIMimeContentTypeHandler ** aInstancePtrR
  * The following macros actually implement addref, release and 
  * query interface for our component. 
  */
-NS_IMPL_ADDREF(nsMimeContentTypeHandler)
-NS_IMPL_RELEASE(nsMimeContentTypeHandler)
-NS_IMPL_QUERY_INTERFACE(nsMimeContentTypeHandler, NS_GET_IID(nsIMimeContentTypeHandler)); /* we need to pass in the interface ID of this interface */
+NS_IMPL_ISUPPORTS1(nsMimeContentTypeHandler, nsIMimeContentTypeHandler)
 
 /*
  * nsIMimeEmitter definitions....
diff --git a/mozilla/mailnews/mime/cthandlers/smimestub/nsMimeContentTypeHandler.cpp b/mozilla/mailnews/mime/cthandlers/smimestub/nsMimeContentTypeHandler.cpp
index 27ad4fad2de..c1d1e536640 100644
--- a/mozilla/mailnews/mime/cthandlers/smimestub/nsMimeContentTypeHandler.cpp
+++ b/mozilla/mailnews/mime/cthandlers/smimestub/nsMimeContentTypeHandler.cpp
@@ -52,9 +52,7 @@ nsresult NS_NewMimeContentTypeHandler(nsIMimeContentTypeHandler ** aInstancePtrR
  * The following macros actually implement addref, release and 
  * query interface for our component. 
  */
-NS_IMPL_ADDREF(nsMimeContentTypeHandler)
-NS_IMPL_RELEASE(nsMimeContentTypeHandler)
-NS_IMPL_QUERY_INTERFACE(nsMimeContentTypeHandler, NS_GET_IID(nsIMimeContentTypeHandler)); /* we need to pass in the interface ID of this interface */
+NS_IMPL_ISUPPORTS1(nsMimeContentTypeHandler, nsIMimeContentTypeHandler)
 
 /*
  * nsIMimeEmitter definitions....
diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsMimeContentTypeHandler.cpp b/mozilla/mailnews/mime/cthandlers/vcard/nsMimeContentTypeHandler.cpp
index 49c052914c4..71aaf0ba7a1 100644
--- a/mozilla/mailnews/mime/cthandlers/vcard/nsMimeContentTypeHandler.cpp
+++ b/mozilla/mailnews/mime/cthandlers/vcard/nsMimeContentTypeHandler.cpp
@@ -53,9 +53,7 @@ nsresult NS_NewMimeContentTypeHandler(nsIMimeContentTypeHandler ** aInstancePtrR
  * The following macros actually implement addref, release and 
  * query interface for our component. 
  */
-NS_IMPL_ADDREF(nsMimeContentTypeHandler)
-NS_IMPL_RELEASE(nsMimeContentTypeHandler)
-NS_IMPL_QUERY_INTERFACE(nsMimeContentTypeHandler, NS_GET_IID(nsIMimeContentTypeHandler)); /* we need to pass in the interface ID of this interface */
+NS_IMPL_ISUPPORTS1(nsMimeContentTypeHandler, nsIMimeContentTypeHandler)
 
 /*
  * nsIMimeEmitter definitions....
diff --git a/mozilla/mailnews/mime/src/mimemoz2.h b/mozilla/mailnews/mime/src/mimemoz2.h
index 800fbb35e56..cc051433917 100644
--- a/mozilla/mailnews/mime/src/mimemoz2.h
+++ b/mozilla/mailnews/mime/src/mimemoz2.h
@@ -24,6 +24,7 @@
 #define _MIMEMOZ_H_
 
 #ifdef __cplusplus
+#include "nsIFileSpec.h"
 extern "C" {
 #endif /* __cplusplus */
 
diff --git a/mozilla/mailnews/mime/src/nsMimeConverter.cpp b/mozilla/mailnews/mime/src/nsMimeConverter.cpp
index 164ea9e7f9d..aa8693a3891 100644
--- a/mozilla/mailnews/mime/src/nsMimeConverter.cpp
+++ b/mozilla/mailnews/mime/src/nsMimeConverter.cpp
@@ -29,7 +29,7 @@
 #include "prmem.h"
 #include "plstr.h"
 
-NS_IMPL_ISUPPORTS(nsMimeConverter, NS_GET_IID(nsIMimeConverter));
+NS_IMPL_ISUPPORTS1(nsMimeConverter, nsIMimeConverter)
 
 /*
  * nsMimeConverter definitions....
diff --git a/mozilla/mailnews/mime/src/nsMimeHeaders.cpp b/mozilla/mailnews/mime/src/nsMimeHeaders.cpp
index 0b704912586..7e0dde10741 100644
--- a/mozilla/mailnews/mime/src/nsMimeHeaders.cpp
+++ b/mozilla/mailnews/mime/src/nsMimeHeaders.cpp
@@ -37,7 +37,7 @@ nsMimeHeaders::~nsMimeHeaders()
 		MimeHeaders_free(mHeaders);
 }
 
-NS_IMPL_ISUPPORTS(nsMimeHeaders, NS_GET_IID(nsIMimeHeaders))
+NS_IMPL_ISUPPORTS1(nsMimeHeaders, nsIMimeHeaders)
 
 nsresult nsMimeHeaders::Initialize(const char * aAllHeaders, PRInt32 allHeadersSize)
 {
diff --git a/mozilla/mailnews/mime/src/nsMimeObjectClassAccess.cpp b/mozilla/mailnews/mime/src/nsMimeObjectClassAccess.cpp
index 23a4b8901d0..c683a8f3499 100644
--- a/mozilla/mailnews/mime/src/nsMimeObjectClassAccess.cpp
+++ b/mozilla/mailnews/mime/src/nsMimeObjectClassAccess.cpp
@@ -28,7 +28,7 @@
  * The following macros actually implement addref, release and 
  * query interface for our component. 
  */
-NS_IMPL_ISUPPORTS(nsMimeObjectClassAccess, NS_GET_IID(nsIMimeObjectClassAccess));
+NS_IMPL_ISUPPORTS1(nsMimeObjectClassAccess, nsIMimeObjectClassAccess)
 
 /*
  * nsMimeObjectClassAccess definitions....
diff --git a/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp b/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp
index d8576da6058..8a748b8f38a 100644
--- a/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp
+++ b/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp
@@ -235,7 +235,7 @@ nsMsgHeaderParser::~nsMsgHeaderParser()
 	delete m_USAsciiToUtf8CharsetConverter;
 }
 
-NS_IMPL_ISUPPORTS(nsMsgHeaderParser, NS_GET_IID(nsIMsgHeaderParser));
+NS_IMPL_ISUPPORTS1(nsMsgHeaderParser, nsIMsgHeaderParser)
 
 MimeCharsetConverterClass *nsMsgHeaderParser::GetUSAsciiToUtf8CharsetConverter()
 {
diff --git a/mozilla/mailnews/news/src/nsNNTPArticleList.cpp b/mozilla/mailnews/news/src/nsNNTPArticleList.cpp
index 1bd2ff47ca0..53bf055448b 100644
--- a/mozilla/mailnews/news/src/nsNNTPArticleList.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPArticleList.cpp
@@ -28,7 +28,7 @@
 #include "nsMsgKeySet.h"
 #include "nsNNTPArticleList.h"
 
-NS_IMPL_ISUPPORTS(nsNNTPArticleList, GetIID())
+NS_IMPL_ISUPPORTS1(nsNNTPArticleList, nsINNTPArticleList)
 
 nsNNTPArticleList::nsNNTPArticleList()
 {
diff --git a/mozilla/mailnews/news/src/nsNNTPCategoryContainer.cpp b/mozilla/mailnews/news/src/nsNNTPCategoryContainer.cpp
index 3479a6f89dd..445ccec4298 100644
--- a/mozilla/mailnews/news/src/nsNNTPCategoryContainer.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPCategoryContainer.cpp
@@ -26,7 +26,7 @@
 
 #include "nsNNTPCategoryContainer.h"
 
-NS_IMPL_ISUPPORTS(nsNNTPCategoryContainer, NS_GET_IID(nsINNTPCategoryContainer));
+NS_IMPL_ISUPPORTS1(nsNNTPCategoryContainer, nsINNTPCategoryContainer)
 
 nsNNTPCategoryContainer::nsNNTPCategoryContainer()
 {
diff --git a/mozilla/mailnews/news/src/nsNNTPCategoryContainer.h b/mozilla/mailnews/news/src/nsNNTPCategoryContainer.h
index 3d9b0f81aae..9cf8bf53014 100644
--- a/mozilla/mailnews/news/src/nsNNTPCategoryContainer.h
+++ b/mozilla/mailnews/news/src/nsNNTPCategoryContainer.h
@@ -33,15 +33,13 @@
 #include "prmem.h"
 //#include <stdio.h>
 
-class nsNNTPCategoryContainer : public nsISupports {
+class nsNNTPCategoryContainer : public nsINNTPCategoryContainer {
  public: 
 	nsNNTPCategoryContainer();
 	virtual ~nsNNTPCategoryContainer();
 	 
 	NS_DECL_ISUPPORTS
-	NS_IMETHOD GetRootCategory(nsINNTPNewsgroup * *aRootCategory);
-	NS_IMETHOD SetRootCategory(nsINNTPNewsgroup * aRootCategory);
-    NS_IMETHOD Initialize(nsINNTPNewsgroup * aRootCategory);
+    NS_DECL_NSINNTPCATEGORYCONTAINER
     
 protected:
     nsINNTPNewsgroup * m_newsgroup;
diff --git a/mozilla/mailnews/news/src/nsNNTPHost.cpp b/mozilla/mailnews/news/src/nsNNTPHost.cpp
index 6955e97af17..6d38298a122 100644
--- a/mozilla/mailnews/news/src/nsNNTPHost.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPHost.cpp
@@ -40,7 +40,7 @@ static const char LINEBREAK_START = '\015';
 
 nsNNTPHost * nsNNTPHost::M_FileOwner = nsnull;
 
-NS_IMPL_ISUPPORTS(nsNNTPHost, GetIID())
+NS_IMPL_ISUPPORTS1(nsNNTPHost, nsINNTPHost)
 
 
 nsNNTPHost::nsNNTPHost()
diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroup.cpp b/mozilla/mailnews/news/src/nsNNTPNewsgroup.cpp
index 43f8193c4cc..0ef5e794337 100644
--- a/mozilla/mailnews/news/src/nsNNTPNewsgroup.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPNewsgroup.cpp
@@ -51,7 +51,7 @@ nsNNTPNewsgroup::~nsNNTPNewsgroup()
 	PR_FREEIF(m_prettyName);
 }
 
-NS_IMPL_ISUPPORTS(nsNNTPNewsgroup, NS_GET_IID(nsINNTPNewsgroup));
+NS_IMPL_ISUPPORTS1(nsNNTPNewsgroup, nsINNTPNewsgroup)
 
 nsresult nsNNTPNewsgroup::GetName(char ** aName)
 {
diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp
index 06ce2d08b2b..0ffaafabe17 100644
--- a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp
@@ -114,7 +114,7 @@ nsNNTPNewsgroupList::~nsNNTPNewsgroupList()
 	CleanUp();
 }
 
-NS_IMPL_ISUPPORTS(nsNNTPNewsgroupList, NS_GET_IID(nsINNTPNewsgroupList));
+NS_IMPL_ISUPPORTS1(nsNNTPNewsgroupList, nsINNTPNewsgroupList)
 
 
 nsresult
diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.cpp b/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.cpp
index 2e3327ef891..6e9a2af036f 100644
--- a/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.cpp
@@ -56,7 +56,7 @@ const char* nsNNTPNewsgroupPost::m_headerName[HEADER_LAST+1]=
     "Message-ID: ",
 };
     
-NS_IMPL_ISUPPORTS(nsNNTPNewsgroupPost, NS_GET_IID(nsINNTPNewsgroupPost));
+NS_IMPL_ISUPPORTS1(nsNNTPNewsgroupPost, nsINNTPNewsgroupPost)
 
 nsNNTPNewsgroupPost::nsNNTPNewsgroupPost()
 {
diff --git a/mozilla/mailnews/news/src/nsNewsDownloadDialogArgs.cpp b/mozilla/mailnews/news/src/nsNewsDownloadDialogArgs.cpp
index 4f3620250a4..2b8a2a5bfbf 100644
--- a/mozilla/mailnews/news/src/nsNewsDownloadDialogArgs.cpp
+++ b/mozilla/mailnews/news/src/nsNewsDownloadDialogArgs.cpp
@@ -39,7 +39,7 @@ nsNewsDownloadDialogArgs::~nsNewsDownloadDialogArgs()
 {
 }
 
-NS_IMPL_ISUPPORTS(nsNewsDownloadDialogArgs, NS_GET_IID(nsINewsDownloadDialogArgs));
+NS_IMPL_ISUPPORTS1(nsNewsDownloadDialogArgs, nsINewsDownloadDialogArgs)
 
 NS_IMETHODIMP nsNewsDownloadDialogArgs::GetGroupName(char * *aGroupName)
 {