diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 49ec060cb2b..1c08d3dd738 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -339,6 +339,13 @@ nsHTMLDocument::StartDocumentLoad(nsIURL *aURL,
             	charset = requestCharset;
             }
        }
+       const PRUnichar* forceCharsetFromWebShell = NULL;
+       rv = webShell->GetForceCharacterSet(&forceCharsetFromWebShell);
+       if(NS_SUCCEEDED(rv) && (nsnull != forceCharsetFromWebShell)) {
+            charset = forceCharsetFromWebShell;
+            //TODO: we should define appropriate constant for force charset
+            charsetSource = kCharsetFromPreviousLoading;  
+       }
     }
     NS_IF_RELEASE(webShell);
 #endif
diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
index 49ec060cb2b..1c08d3dd738 100644
--- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
@@ -339,6 +339,13 @@ nsHTMLDocument::StartDocumentLoad(nsIURL *aURL,
             	charset = requestCharset;
             }
        }
+       const PRUnichar* forceCharsetFromWebShell = NULL;
+       rv = webShell->GetForceCharacterSet(&forceCharsetFromWebShell);
+       if(NS_SUCCEEDED(rv) && (nsnull != forceCharsetFromWebShell)) {
+            charset = forceCharsetFromWebShell;
+            //TODO: we should define appropriate constant for force charset
+            charsetSource = kCharsetFromPreviousLoading;  
+       }
     }
     NS_IF_RELEASE(webShell);
 #endif