diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp
index 85560d7e0a1..0dfb603a30c 100644
--- a/mozilla/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/htmlparser/src/CNavDTD.cpp
@@ -326,12 +326,7 @@ CNavDTD::CanParse(CParserContext& aParserContext,
 {
   eAutoDetectResult result=eUnknownDetect;
 
-  if(eViewSource==aParserContext.mParserCommand) {
-    if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
-      result=ePrimaryDetect;
-    }
-  }     
-  else {
+  if(aParserContext.mParserCommand != eViewSource) {
     if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kHTMLTextContentType)) {
       result=ePrimaryDetect;
     }
diff --git a/mozilla/htmlparser/src/COtherDTD.cpp b/mozilla/htmlparser/src/COtherDTD.cpp
index 5969ebc9d00..67b0a3daa46 100644
--- a/mozilla/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/htmlparser/src/COtherDTD.cpp
@@ -274,12 +274,7 @@ COtherDTD::CanParse(CParserContext& aParserContext, const nsString& aBuffer,
   eAutoDetectResult result=eUnknownDetect;
 
   if(mEnableStrict) {
-    if(eViewSource==aParserContext.mParserCommand) {
-      if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
-        result=eValidDetect;
-      }
-    }
-    else {
+    if(aParserContext.mParserCommand != eViewSource) {
       if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
         result=eValidDetect;
       }
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp
index 85560d7e0a1..0dfb603a30c 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp
@@ -326,12 +326,7 @@ CNavDTD::CanParse(CParserContext& aParserContext,
 {
   eAutoDetectResult result=eUnknownDetect;
 
-  if(eViewSource==aParserContext.mParserCommand) {
-    if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
-      result=ePrimaryDetect;
-    }
-  }     
-  else {
+  if(aParserContext.mParserCommand != eViewSource) {
     if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kHTMLTextContentType)) {
       result=ePrimaryDetect;
     }
diff --git a/mozilla/parser/htmlparser/src/COtherDTD.cpp b/mozilla/parser/htmlparser/src/COtherDTD.cpp
index 5969ebc9d00..67b0a3daa46 100644
--- a/mozilla/parser/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/parser/htmlparser/src/COtherDTD.cpp
@@ -274,12 +274,7 @@ COtherDTD::CanParse(CParserContext& aParserContext, const nsString& aBuffer,
   eAutoDetectResult result=eUnknownDetect;
 
   if(mEnableStrict) {
-    if(eViewSource==aParserContext.mParserCommand) {
-      if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
-        result=eValidDetect;
-      }
-    }
-    else {
+    if(aParserContext.mParserCommand != eViewSource) {
       if(PR_TRUE==aParserContext.mMimeType.EqualsWithConversion(kPlainTextContentType)) {
         result=eValidDetect;
       }