diff --git a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
index fc77bfa236a..783d0fbb1c7 100644
--- a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
+++ b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
@@ -1621,6 +1621,7 @@ nsFontMetricsOS2::ResolveForwards(HPS                  aPS,
         fh = new nsFontOS2();
         *fh = *mFontHandle;
         fh->mFattrs.usCodePage = 1252;
+        fh->mConvertCodePage = 1252;
         fontSwitch.mFont = fh;
         while( ++currChar < lastChar )
         {
@@ -1715,6 +1716,7 @@ nsFontMetricsOS2::ResolveBackwards(HPS                  aPS,
         fh = new nsFontOS2();
         *fh = *mFontHandle;
         fh->mFattrs.usCodePage = 1252;
+        fh->mConvertCodePage = 1252;
         fontSwitch.mFont = fh;
         while( --currChar > lastChar )
         {