diff --git a/mailnews/local/src/nsPop3Protocol.cpp b/mailnews/local/src/nsPop3Protocol.cpp
index 393c5b4ea79..7ee7f80ef65 100644
--- a/mailnews/local/src/nsPop3Protocol.cpp
+++ b/mailnews/local/src/nsPop3Protocol.cpp
@@ -642,7 +642,7 @@ nsresult nsPop3Protocol::LoadUrl(nsIURI* aURL, nsISupports * /* aConsumer */)
     if (NS_FAILED(rv))
         return rv;
 
-    rv = NS_CheckPortSafety(port, "pop3");
+    rv = NS_CheckPortSafety(port, "pop");
     if (NS_FAILED(rv))
         return rv;
 
diff --git a/mailnews/local/src/nsPop3Service.cpp b/mailnews/local/src/nsPop3Service.cpp
index a97fac23bb8..cd5f71dee49 100644
--- a/mailnews/local/src/nsPop3Service.cpp
+++ b/mailnews/local/src/nsPop3Service.cpp
@@ -314,10 +314,7 @@ NS_IMETHODIMP nsPop3Service::GetDefaultPort(PRInt32 *aDefaultPort)
 
 NS_IMETHODIMP nsPop3Service::AllowPort(PRInt32 port, const char *scheme, PRBool *_retval)
 {
-    if (port == POP3_PORT || port == 593)  // 593 is POP3/SSL
-        *_retval = PR_TRUE;
-    else
-        *_retval = PR_FALSE;
+    *_retval = PR_TRUE; // allow pop on any port
     return NS_OK;
 }
 
diff --git a/mailnews/news/src/nsNntpService.cpp b/mailnews/news/src/nsNntpService.cpp
index 28276b1811a..1af52168722 100644
--- a/mailnews/news/src/nsNntpService.cpp
+++ b/mailnews/news/src/nsNntpService.cpp
@@ -1202,10 +1202,7 @@ NS_IMETHODIMP nsNntpService::GetDefaultPort(PRInt32 *aDefaultPort)
 
 NS_IMETHODIMP nsNntpService::AllowPort(PRInt32 port, const char *scheme, PRBool *_retval)
 {
-    if (port == NEWS_PORT || port == 995 || port == 532) // port 995 is NNTP/SSL, 532 is netnews
-        *_retval = PR_TRUE;
-    else
-        *_retval = PR_FALSE;
+    *_retval = PR_TRUE; // allow news on any port
     return NS_OK;
 }