diff --git a/mozilla/mailnews/local/src/nsMailboxUrl.cpp b/mozilla/mailnews/local/src/nsMailboxUrl.cpp
index 2293428329c..beb11485d86 100644
--- a/mozilla/mailnews/local/src/nsMailboxUrl.cpp
+++ b/mozilla/mailnews/local/src/nsMailboxUrl.cpp
@@ -694,7 +694,7 @@ nsresult nsMailboxUrl::SetRef(const char *aNewRef)
 nsresult nsMailboxUrl::GetHostPort(PRUint32 *result) const
 {
     NS_LOCK_INSTANCE();
-    *result = -1;
+    *result = 0xFFFFFFFF;
     NS_UNLOCK_INSTANCE();
     return NS_OK;
 }
diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp
index 2fc5838dc1a..80c86173d36 100644
--- a/mozilla/mailnews/local/src/nsParseMailbox.cpp
+++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp
@@ -933,7 +933,7 @@ nsresult nsParseMailMessageState::InternRfc822 (struct message_header *header,
 									 char **ret_name)
 {
 	char	*s;
-	nsresult ret;
+	nsresult ret=NS_OK;
 
 	if (!header || header->length == 0)
 		return NS_OK;