diff --git a/mailnews/mime/cthandlers/vcard/mimevcrd.cpp b/mailnews/mime/cthandlers/vcard/mimevcrd.cpp
index 0c4c2b51cb45..79725cbbb077 100644
--- a/mailnews/mime/cthandlers/vcard/mimevcrd.cpp
+++ b/mailnews/mime/cthandlers/vcard/mimevcrd.cpp
@@ -1937,7 +1937,7 @@ char *VCARD_URL = {"resource:/chrome/messenger/content/default/vcard_en.properti
 
 extern "C" 
 char *
-VCardGetStringByIDREAL(PRInt32 stringID)
+VCardGetStringByID(PRInt32 stringID)
 {
   nsresult    res = NS_OK;
   char*       propertyURL;
@@ -2029,7 +2029,7 @@ VCardGetStringByIDREAL(PRInt32 stringID)
 
 extern "C" 
 char *
-VCardGetStringByID(PRInt32 stringID)
+VCardGetStringByIDHACK(PRInt32 stringID)
 {
   if (-1000 == stringID) return PL_strdup("Application is out of memory.");
   if (1001 == stringID) return PL_strdup("State");
diff --git a/mailnews/mime/src/nsStreamConverter.cpp b/mailnews/mime/src/nsStreamConverter.cpp
index 26004b1aedc8..7629b6c1b0f3 100644
--- a/mailnews/mime/src/nsStreamConverter.cpp
+++ b/mailnews/mime/src/nsStreamConverter.cpp
@@ -442,7 +442,7 @@ NS_IMETHODIMP nsStreamConverter::Init(nsIURI *aURI, nsIStreamListener * aOutList
 	// the following output channel stream is used to fake the content type for people who later
 	// call into us..
 	NS_WITH_SERVICE(nsIIOService, netService, kIOServiceCID, &rv);
-	rv = netService->NewInputStreamChannel(aURI, mOutputFormat, nsnull, getter_AddRefs(mOutgoingChannel));
+	rv = netService->NewInputStreamChannel(aURI, mOutputFormat, nsnull, nsnull, getter_AddRefs(mOutgoingChannel));
 	
 	// We will first find an appropriate emitter in the repository that supports 
 	// the requested output format...note, the special exceptions are nsMimeMessageDraftOrTemplate