diff --git a/mozilla/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/htmlparser/src/nsExpatTokenizer.cpp
index a42c1429caf..973c98d87f4 100644
--- a/mozilla/htmlparser/src/nsExpatTokenizer.cpp
+++ b/mozilla/htmlparser/src/nsExpatTokenizer.cpp
@@ -312,8 +312,10 @@ void nsExpatTokenizer::HandleCharacterData(void *userData, const XML_Char *s, in
     }
     
     if(newToken) {
-      nsString& theString=newToken->GetStringValueXXX();
-      theString.Append(s,len);
+      if ((s[0] != kNewLine) && (s[0] != CR)) {
+        nsString& theString=newToken->GetStringValueXXX();
+        theString.Append(s,len);
+      }
       AddToken(newToken,NS_OK,*gTokenDeque);
     }
     else {
diff --git a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
index a42c1429caf..973c98d87f4 100644
--- a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
@@ -312,8 +312,10 @@ void nsExpatTokenizer::HandleCharacterData(void *userData, const XML_Char *s, in
     }
     
     if(newToken) {
-      nsString& theString=newToken->GetStringValueXXX();
-      theString.Append(s,len);
+      if ((s[0] != kNewLine) && (s[0] != CR)) {
+        nsString& theString=newToken->GetStringValueXXX();
+        theString.Append(s,len);
+      }
       AddToken(newToken,NS_OK,*gTokenDeque);
     }
     else {