diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp
index c24dbb42988..9070b1ee533 100644
--- a/mozilla/layout/generic/nsTextFrame.cpp
+++ b/mozilla/layout/generic/nsTextFrame.cpp
@@ -633,7 +633,7 @@ TextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
         // XXX This is a one to many mapping that I think isn't handled well
         if (nsnull != aIndexes) {
           *aIndexes++ = strInx;
-          strInx++;
+        	strInx += wordLen;
         }
       }
       else if (0 == wordLen) {
diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp
index c24dbb42988..9070b1ee533 100644
--- a/mozilla/layout/html/base/src/nsTextFrame.cpp
+++ b/mozilla/layout/html/base/src/nsTextFrame.cpp
@@ -633,7 +633,7 @@ TextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
         // XXX This is a one to many mapping that I think isn't handled well
         if (nsnull != aIndexes) {
           *aIndexes++ = strInx;
-          strInx++;
+        	strInx += wordLen;
         }
       }
       else if (0 == wordLen) {