diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp
index dee54a0a21e..0b81d8a6a67 100644
--- a/mozilla/htmlparser/src/nsParser.cpp
+++ b/mozilla/htmlparser/src/nsParser.cpp
@@ -2503,7 +2503,9 @@ nsresult nsParser::OnStopRequest(nsIRequest *request, nsISupports* aContext,
 
   nsresult result=NS_OK;
   
-  if(eOnStart==mParserContext->mStreamListenerState) {
+  if((eOnStart==mParserContext->mStreamListenerState)  &&
+     (!mParserContext->mMimeType.EqualsWithConversion(kPlainTextContentType)))
+  {
 
     //If you're here, then OnDataAvailable() never got called. 
     //Prior to necko, we never dealt with this case, but the problem may have existed.
diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp
index dee54a0a21e..0b81d8a6a67 100644
--- a/mozilla/parser/htmlparser/src/nsParser.cpp
+++ b/mozilla/parser/htmlparser/src/nsParser.cpp
@@ -2503,7 +2503,9 @@ nsresult nsParser::OnStopRequest(nsIRequest *request, nsISupports* aContext,
 
   nsresult result=NS_OK;
   
-  if(eOnStart==mParserContext->mStreamListenerState) {
+  if((eOnStart==mParserContext->mStreamListenerState)  &&
+     (!mParserContext->mMimeType.EqualsWithConversion(kPlainTextContentType)))
+  {
 
     //If you're here, then OnDataAvailable() never got called. 
     //Prior to necko, we never dealt with this case, but the problem may have existed.