diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 51eb529bdf6..619e9b65cd0 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -305,6 +305,9 @@ public:
   nsresult CreatePluginHost(PRBool aAllowPlugins);
   nsresult DestroyPluginHost(void);
 
+  NS_IMETHOD GetDefaultCharacterSet (const PRUnichar** aDefaultCharacterSet);
+  NS_IMETHOD SetDefaultCharacterSet (const PRUnichar*  aDefaultCharacterSet);
+
 protected:
   void InitFrameData();
   nsresult CheckForTrailingSlash(nsIURL* aURL);
@@ -326,6 +329,7 @@ protected:
   nsIWebShell* mParent;
   nsVoidArray mChildren;
   nsString mName;
+  nsString mDefaultCharacterSet;
 
   nsVoidArray mHistory;
   PRInt32 mHistoryIndex;
@@ -2494,6 +2498,19 @@ nsWebShell::SelectNone(void)
   return NS_ERROR_FAILURE;
 }
 
+NS_IMETHODIMP 
+nsWebShell::GetDefaultCharacterSet (const PRUnichar** aDefaultCharacterSet)
+{
+  *aDefaultCharacterSet = mDefaultCharacterSet;
+  return NS_OK;
+}
+NS_IMETHODIMP 
+nsWebShell::SetDefaultCharacterSet (const PRUnichar*  aDefaultCharacterSet)  
+{
+  mDefaultCharacterSet = aDefaultCharacterSet;
+  return NS_OK;
+}
+
 //----------------------------------------------------
 NS_IMETHODIMP
 nsWebShell::FindNext(const PRUnichar * aSearchStr, PRBool aMatchCase, PRBool aSearchDown, PRBool &aIsFound)
diff --git a/mozilla/webshell/public/nsIWebShell.h b/mozilla/webshell/public/nsIWebShell.h
index a05578c248a..09e050d7664 100644
--- a/mozilla/webshell/public/nsIWebShell.h
+++ b/mozilla/webshell/public/nsIWebShell.h
@@ -336,6 +336,8 @@ public:
   NS_IMETHOD SetIsFrame(PRBool aIsFrame)       = 0;
   NS_IMETHOD GetIsFrame(PRBool& aIsFrame)      = 0;
 
+  NS_IMETHOD GetDefaultCharacterSet (const PRUnichar** aDefaultCharacterSet) = 0;
+  NS_IMETHOD SetDefaultCharacterSet (const PRUnichar*  aDefaultCharacterSet)  = 0;
   /**
     * Finds text in content
    */
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 51eb529bdf6..619e9b65cd0 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -305,6 +305,9 @@ public:
   nsresult CreatePluginHost(PRBool aAllowPlugins);
   nsresult DestroyPluginHost(void);
 
+  NS_IMETHOD GetDefaultCharacterSet (const PRUnichar** aDefaultCharacterSet);
+  NS_IMETHOD SetDefaultCharacterSet (const PRUnichar*  aDefaultCharacterSet);
+
 protected:
   void InitFrameData();
   nsresult CheckForTrailingSlash(nsIURL* aURL);
@@ -326,6 +329,7 @@ protected:
   nsIWebShell* mParent;
   nsVoidArray mChildren;
   nsString mName;
+  nsString mDefaultCharacterSet;
 
   nsVoidArray mHistory;
   PRInt32 mHistoryIndex;
@@ -2494,6 +2498,19 @@ nsWebShell::SelectNone(void)
   return NS_ERROR_FAILURE;
 }
 
+NS_IMETHODIMP 
+nsWebShell::GetDefaultCharacterSet (const PRUnichar** aDefaultCharacterSet)
+{
+  *aDefaultCharacterSet = mDefaultCharacterSet;
+  return NS_OK;
+}
+NS_IMETHODIMP 
+nsWebShell::SetDefaultCharacterSet (const PRUnichar*  aDefaultCharacterSet)  
+{
+  mDefaultCharacterSet = aDefaultCharacterSet;
+  return NS_OK;
+}
+
 //----------------------------------------------------
 NS_IMETHODIMP
 nsWebShell::FindNext(const PRUnichar * aSearchStr, PRBool aMatchCase, PRBool aSearchDown, PRBool &aIsFound)