diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
index 418703954ca..00bdce1e0b5 100644
--- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
+++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
@@ -946,7 +946,7 @@ void BasicTableLayoutStrategy::SetMinAndMaxTableContentWidths()
   for (PRInt32 colX = 0; colX < mNumCols; colX++) { 
     nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX);
     mMinTableContentWidth += colFrame->GetMinWidth();
-    mMaxTableContentWidth += colFrame->GetDesWidth();
+    mMaxTableContentWidth += PR_MAX(colFrame->GetDesWidth(), colFrame->GetFixWidth());
     if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) {
       mMaxTableContentWidth += spacingX;
       mMinTableContentWidth += spacingX;
diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp
index 418703954ca..00bdce1e0b5 100644
--- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp
+++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp
@@ -946,7 +946,7 @@ void BasicTableLayoutStrategy::SetMinAndMaxTableContentWidths()
   for (PRInt32 colX = 0; colX < mNumCols; colX++) { 
     nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX);
     mMinTableContentWidth += colFrame->GetMinWidth();
-    mMaxTableContentWidth += colFrame->GetDesWidth();
+    mMaxTableContentWidth += PR_MAX(colFrame->GetDesWidth(), colFrame->GetFixWidth());
     if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) {
       mMaxTableContentWidth += spacingX;
       mMinTableContentWidth += spacingX;