diff --git a/mailnews/local/src/nsPop3Sink.cpp b/mailnews/local/src/nsPop3Sink.cpp
index 567af1e35fa..004bb0b1751 100644
--- a/mailnews/local/src/nsPop3Sink.cpp
+++ b/mailnews/local/src/nsPop3Sink.cpp
@@ -179,6 +179,9 @@ nsPop3Sink::BeginMailDelivery(PRBool uidlDownload, PRBool* aBool)
 		rv = NS_OK;
 	}
 
+    if (uidlDownload && m_newMailParser)
+        m_newMailParser->DisableFilters();
+
 #ifdef DEBUG
     printf("Begin mail message delivery.\n");
 #endif 
diff --git a/mailnews/mime/src/mimei.cpp b/mailnews/mime/src/mimei.cpp
index e513b3cce09..d744d3ad364 100644
--- a/mailnews/mime/src/mimei.cpp
+++ b/mailnews/mime/src/mimei.cpp
@@ -791,6 +791,8 @@ mime_set_url_part(const char *url, char *part, PRBool append_p)
   const char *s;
   char *result;
 
+  if (!url || !part) return 0;
+
   for (s = url; *s; s++)
 	{
 	  if (*s == '?')