diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp
index 13c5590bf2c..cc017619a88 100644
--- a/mozilla/layout/generic/nsLineLayout.cpp
+++ b/mozilla/layout/generic/nsLineLayout.cpp
@@ -857,6 +857,14 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
           else {
             AddFloater((nsPlaceholderFrame*)aFrame);
           }
+          nsIAtom* oofft;
+          outOfFlowFrame->GetFrameType(&oofft);
+          if (oofft) {
+            if (oofft == nsLayoutAtoms::letterFrame) {
+              mFirstLetterStyleOK = PR_FALSE;
+            }
+            NS_RELEASE(oofft);
+          }
         }
       }
     }
diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp
index 13c5590bf2c..cc017619a88 100644
--- a/mozilla/layout/html/base/src/nsLineLayout.cpp
+++ b/mozilla/layout/html/base/src/nsLineLayout.cpp
@@ -857,6 +857,14 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
           else {
             AddFloater((nsPlaceholderFrame*)aFrame);
           }
+          nsIAtom* oofft;
+          outOfFlowFrame->GetFrameType(&oofft);
+          if (oofft) {
+            if (oofft == nsLayoutAtoms::letterFrame) {
+              mFirstLetterStyleOK = PR_FALSE;
+            }
+            NS_RELEASE(oofft);
+          }
         }
       }
     }