diff --git a/mozilla/widget/src/mac/nsMacControl.cpp b/mozilla/widget/src/mac/nsMacControl.cpp
index 25f898d1cad..030262d6cfb 100644
--- a/mozilla/widget/src/mac/nsMacControl.cpp
+++ b/mozilla/widget/src/mac/nsMacControl.cpp
@@ -29,6 +29,11 @@
 #include "nsColor.h"
 #include "nsFontMetricsMac.h"
 
+#include "nsIServiceManager.h"
+#define NS_IMPL_IDS
+#include "nsIPlatformCharset.h"
+#undef NS_IMPL_IDS
+
 #if TARGET_CARBON
 #include <ControlDefinitions.h>
 #endif
@@ -38,6 +43,12 @@
 #include <UnicodeConverter.h>
 #include <Fonts.h>
 
+static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
+// TODO: leaks, need to release when unloading the dll
+nsIUnicodeEncoder * nsMacControl::mUnicodeEncoder = nsnull;
+nsIUnicodeDecoder * nsMacControl::mUnicodeDecoder = nsnull;
+
+
 //-------------------------------------------------------------------------
 //
 //
@@ -380,12 +391,35 @@ void nsMacControl::SetupMacControlFont()
 void nsMacControl::StringToStr255(const nsString& aText, Str255& aStr255)
 {
 	char buffer[256];
+	nsresult rv = NS_OK;
 	
-	aText.ToCString(buffer,255);
-		
-	PRInt32 len = strlen(buffer);
-	memcpy(&aStr255[1],buffer,len);
-	aStr255[0] = len;
+	// get file system charset and create a unicode encoder
+	if (nsnull == mUnicodeEncoder) {
+		nsAutoString fileSystemCharset;
+		GetFileSystemCharset(fileSystemCharset);
+
+		NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); 
+		if (NS_SUCCEEDED(rv)) {
+			rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder);
+		}
+	}
+
+	// converts from unicode to the file system charset
+	if (NS_SUCCEEDED(rv)) {
+		PRInt32 inLength = aText.Length();
+		PRInt32 outLength = 255;
+		rv = mUnicodeEncoder->Convert(aText.GetUnicode(), &inLength, (char *) &aStr255[1], &outLength);
+		if (NS_SUCCEEDED(rv))
+			aStr255[0] = outLength;
+	}
+
+	if (NS_FAILED(rv)) {
+		NS_ASSERTION(0, "error: charset covnersion");
+		aText.ToCString(buffer, 255);
+		PRInt32 len = nsCRT::strlen(buffer);
+		memcpy(&aStr255[1], buffer, len);
+		aStr255[0] = len;
+	}
 }
 
 //-------------------------------------------------------------------------
@@ -395,13 +429,34 @@ void nsMacControl::StringToStr255(const nsString& aText, Str255& aStr255)
 
 void nsMacControl::Str255ToString(const Str255& aStr255, nsString& aText)
 {
-	char 		buffer[256];
-	PRInt32 len = aStr255[0];
-  
-	memcpy(buffer,&aStr255[1],len);
-	buffer[len] = 0;
+	nsresult rv = NS_OK;
+	
+	// get file system charset and create a unicode encoder
+	if (nsnull == mUnicodeDecoder) {
+		nsAutoString fileSystemCharset;
+		GetFileSystemCharset(fileSystemCharset);
 
-	aText = buffer;		
+		NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); 
+		if (NS_SUCCEEDED(rv)) {
+			rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder);
+		}
+	}
+  
+	// converts from the file system charset to unicode
+	if (NS_SUCCEEDED(rv)) {
+		PRUnichar buffer[512];
+		PRInt32 inLength = aStr255[0];
+		PRInt32 outLength = 512;
+		rv = mUnicodeDecoder->Convert((char *) &aStr255[1], &inLength, buffer, &outLength);
+		if (NS_SUCCEEDED(rv)) {
+			aText.SetString(buffer, outLength);
+		}
+	}
+	
+	if (NS_FAILED(rv)) {
+		NS_ASSERTION(0, "error: charset covnersion");
+		aText.SetString((char *) &aStr255[1], aStr255[0]);
+	}
 }
 
 //-------------------------------------------------------------------------
@@ -528,4 +583,26 @@ void nsMacControl::SetupMacControlFontForScript(short theScript)
 	fontStyleRec.style = theStyle.tsFace;
 	::SetControlFontStyle(mControl, &fontStyleRec);
 }
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+void nsMacControl::GetFileSystemCharset(nsString & fileSystemCharset)
+{
+  static nsAutoString aCharset;
+  nsresult rv;
+
+  if (aCharset.Length() < 1) {
+	  nsCOMPtr <nsIPlatformCharset> platformCharset;
+	  rv = nsComponentManager::CreateInstance(NS_PLATFORMCHARSET_PROGID, nsnull, 
+	                                          NS_GET_IID(nsIPlatformCharset), getter_AddRefs(platformCharset));
+	  if (NS_SUCCEEDED(rv)) 
+		  rv = platformCharset->GetCharset(kPlatformCharsetSel_FileName, aCharset);
+
+    NS_ASSERTION(NS_SUCCEEDED(rv), "error getting platform charset");
+	  if (NS_FAILED(rv)) 
+		  aCharset.SetString("x-mac-roman");
+  }
+  fileSystemCharset = aCharset;
+}
 	
\ No newline at end of file
diff --git a/mozilla/widget/src/mac/nsMacControl.h b/mozilla/widget/src/mac/nsMacControl.h
index 1af4b6858fb..e4e92b3c115 100644
--- a/mozilla/widget/src/mac/nsMacControl.h
+++ b/mozilla/widget/src/mac/nsMacControl.h
@@ -23,6 +23,10 @@
 #ifndef nsMacControl_h__
 #define nsMacControl_h__
 
+#include "nsIServiceManager.h"
+#define NS_IMPL_IDS
+#include "nsICharsetConverterManager.h"
+#undef NS_IMPL_IDS
 #include "nsChildWindow.h"
 #include <Controls.h>
 
@@ -68,6 +72,7 @@ protected:
 	void				ControlChanged(PRInt32 aNewValue);
 	void				NSStringSetControlTitle(ControlHandle theControl, nsString title);
 	void				SetupMacControlFontForScript(short theScript);
+	static void			GetFileSystemCharset(nsString & fileSystemCharset);
 	
 	nsString			mLabel;
 	PRBool				mWidgetArmed;
@@ -83,6 +88,9 @@ protected:
 	nsRect				mLastBounds;
 	PRInt32				mLastValue;
 	PRInt16				mLastHilite;
+
+	static nsIUnicodeEncoder*     mUnicodeEncoder;
+	static nsIUnicodeDecoder*     mUnicodeDecoder;
 };
 
 #endif // nsMacControl_h__