diff --git a/mailnews/base/util/nsMsgProtocol.cpp b/mailnews/base/util/nsMsgProtocol.cpp
index 4cd34ac1ae53..9e5669c83235 100644
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -137,7 +137,7 @@ PRInt32 nsMsgProtocol::SendData(nsIURI * aURL, const char * dataBuffer)
 //	NS_PRECONDITION(m_outputStream, "oops....we don't have an output stream...how did that happen?");
 	if (dataBuffer && m_outputStream)
 	{
-		nsresult rv = m_outputStream->Write(dataBuffer, PL_strlen(dataBuffer), &writeCount);
+		status = m_outputStream->Write(dataBuffer, PL_strlen(dataBuffer), &writeCount);
 	}
 
 	return status;
diff --git a/mailnews/mime/src/nsStreamConverter.cpp b/mailnews/mime/src/nsStreamConverter.cpp
index ce3c724c59a6..d04e96f7448e 100644
--- a/mailnews/mime/src/nsStreamConverter.cpp
+++ b/mailnews/mime/src/nsStreamConverter.cpp
@@ -103,7 +103,7 @@ bridge_new_new_uri(void *bridgeStream, nsIURI *aURI)
           PR_FREEIF(msd->url_name);
           msd->url_name = PL_strdup(urlString);
           if (!(msd->url_name))
-            return MIME_OUT_OF_MEMORY;
+            return NS_ERROR_OUT_OF_MEMORY;
 
           PR_FREEIF(urlString);
         }