diff --git a/mozilla/mailnews/base/util/nsMessage.cpp b/mozilla/mailnews/base/util/nsMessage.cpp
index dce2e1c3c6a..ed6758c0534 100644
--- a/mozilla/mailnews/base/util/nsMessage.cpp
+++ b/mozilla/mailnews/base/util/nsMessage.cpp
@@ -539,7 +539,7 @@ NS_IMETHODIMP nsMessage::GetMsgFolder(nsIMsgFolder **aFolder)
 
 NS_IMETHODIMP nsMessage::SetMsgFolder(nsIMsgFolder *folder)
 {
-	mFolder = NS_GetWeakReference(folder);
+	mFolder = getter_AddRefs(NS_GetWeakReference(folder));
 	return NS_OK;
 }
 
diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp
index 438fef08cda..80a4ee94a7d 100644
--- a/mozilla/mailnews/base/util/nsMsgFolder.cpp
+++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp
@@ -349,7 +349,8 @@ NS_IMETHODIMP nsMsgFolder::RemoveFolderListener(nsIFolderListener * listener)
 
 NS_IMETHODIMP nsMsgFolder::SetParent(nsIFolder *aParent)
 {
-	mParent = NS_GetWeakReference(aParent);
+	mParent = getter_AddRefs(NS_GetWeakReference(aParent));
+  
 	return NS_OK;
 }
 
@@ -556,7 +557,7 @@ nsMsgFolder::parseURI(PRBool needServer)
       
     }
 
-    mServer = NS_GetWeakReference(server);
+    mServer = getter_AddRefs(NS_GetWeakReference(server));
 
   } /* !mServer */
     
diff --git a/mozilla/mailnews/base/util/nsMsgIdentity.cpp b/mozilla/mailnews/base/util/nsMsgIdentity.cpp
index 89c6599bb34..fc218a62757 100644
--- a/mozilla/mailnews/base/util/nsMsgIdentity.cpp
+++ b/mozilla/mailnews/base/util/nsMsgIdentity.cpp
@@ -441,7 +441,7 @@ nsMsgIdentity::SetSmtpServer(nsISmtpServer *aServer)
 {
   nsresult rv;
   
-  m_smtpServer = NS_GetWeakReference(aServer, &rv);
+  m_smtpServer = getter_AddRefs(NS_GetWeakReference(aServer, &rv));
 
   if (aServer) {
     nsXPIDLCString smtpServerKey;