diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 27486ca3ce0..6e02db32008 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -299,16 +299,23 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
   ListTag(out);
 
   // Output the first/last content offset
-  fprintf(out, "[%d,%d,%c] pif=%p nif=%p",
-          mFirstContentOffset, mLastContentOffset,
-          (mLastContentIsComplete ? 'T' : 'F'),
-          mPrevInFlow, mNextInFlow);
+  fprintf(out, "[%d,%d,%c] ", mFirstContentOffset, mLastContentOffset,
+          (mLastContentIsComplete ? 'T' : 'F'));
+  if (nsnull != mPrevInFlow) {
+    fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
+  }
+  if (nsnull != mNextInFlow) {
+    fprintf(out, "next-in-flow=%p ", mNextInFlow);
+  }
 
   // Output the rect
   out << mRect;
 
   // Output the children, one line at a time
   if (nsnull != mLines) {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<\n", out);
     aIndent++;
 
@@ -322,6 +329,9 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
     for (PRInt32 i = aIndent; --i >= 0; ) fputs("  ", out);
     fputs(">\n", out);
   } else {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<>\n", out);
   }
 
diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp
index 27486ca3ce0..6e02db32008 100644
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -299,16 +299,23 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
   ListTag(out);
 
   // Output the first/last content offset
-  fprintf(out, "[%d,%d,%c] pif=%p nif=%p",
-          mFirstContentOffset, mLastContentOffset,
-          (mLastContentIsComplete ? 'T' : 'F'),
-          mPrevInFlow, mNextInFlow);
+  fprintf(out, "[%d,%d,%c] ", mFirstContentOffset, mLastContentOffset,
+          (mLastContentIsComplete ? 'T' : 'F'));
+  if (nsnull != mPrevInFlow) {
+    fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
+  }
+  if (nsnull != mNextInFlow) {
+    fprintf(out, "next-in-flow=%p ", mNextInFlow);
+  }
 
   // Output the rect
   out << mRect;
 
   // Output the children, one line at a time
   if (nsnull != mLines) {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<\n", out);
     aIndent++;
 
@@ -322,6 +329,9 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
     for (PRInt32 i = aIndent; --i >= 0; ) fputs("  ", out);
     fputs(">\n", out);
   } else {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<>\n", out);
   }
 
diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h
index 27486ca3ce0..6e02db32008 100644
--- a/layout/generic/nsBlockReflowState.h
+++ b/layout/generic/nsBlockReflowState.h
@@ -299,16 +299,23 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
   ListTag(out);
 
   // Output the first/last content offset
-  fprintf(out, "[%d,%d,%c] pif=%p nif=%p",
-          mFirstContentOffset, mLastContentOffset,
-          (mLastContentIsComplete ? 'T' : 'F'),
-          mPrevInFlow, mNextInFlow);
+  fprintf(out, "[%d,%d,%c] ", mFirstContentOffset, mLastContentOffset,
+          (mLastContentIsComplete ? 'T' : 'F'));
+  if (nsnull != mPrevInFlow) {
+    fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
+  }
+  if (nsnull != mNextInFlow) {
+    fprintf(out, "next-in-flow=%p ", mNextInFlow);
+  }
 
   // Output the rect
   out << mRect;
 
   // Output the children, one line at a time
   if (nsnull != mLines) {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<\n", out);
     aIndent++;
 
@@ -322,6 +329,9 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
     for (PRInt32 i = aIndent; --i >= 0; ) fputs("  ", out);
     fputs(">\n", out);
   } else {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<>\n", out);
   }
 
diff --git a/layout/html/base/src/nsBlockFrame.cpp b/layout/html/base/src/nsBlockFrame.cpp
index 27486ca3ce0..6e02db32008 100644
--- a/layout/html/base/src/nsBlockFrame.cpp
+++ b/layout/html/base/src/nsBlockFrame.cpp
@@ -299,16 +299,23 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
   ListTag(out);
 
   // Output the first/last content offset
-  fprintf(out, "[%d,%d,%c] pif=%p nif=%p",
-          mFirstContentOffset, mLastContentOffset,
-          (mLastContentIsComplete ? 'T' : 'F'),
-          mPrevInFlow, mNextInFlow);
+  fprintf(out, "[%d,%d,%c] ", mFirstContentOffset, mLastContentOffset,
+          (mLastContentIsComplete ? 'T' : 'F'));
+  if (nsnull != mPrevInFlow) {
+    fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
+  }
+  if (nsnull != mNextInFlow) {
+    fprintf(out, "next-in-flow=%p ", mNextInFlow);
+  }
 
   // Output the rect
   out << mRect;
 
   // Output the children, one line at a time
   if (nsnull != mLines) {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<\n", out);
     aIndent++;
 
@@ -322,6 +329,9 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
     for (PRInt32 i = aIndent; --i >= 0; ) fputs("  ", out);
     fputs(">\n", out);
   } else {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<>\n", out);
   }
 
diff --git a/layout/html/base/src/nsBlockReflowState.cpp b/layout/html/base/src/nsBlockReflowState.cpp
index 27486ca3ce0..6e02db32008 100644
--- a/layout/html/base/src/nsBlockReflowState.cpp
+++ b/layout/html/base/src/nsBlockReflowState.cpp
@@ -299,16 +299,23 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
   ListTag(out);
 
   // Output the first/last content offset
-  fprintf(out, "[%d,%d,%c] pif=%p nif=%p",
-          mFirstContentOffset, mLastContentOffset,
-          (mLastContentIsComplete ? 'T' : 'F'),
-          mPrevInFlow, mNextInFlow);
+  fprintf(out, "[%d,%d,%c] ", mFirstContentOffset, mLastContentOffset,
+          (mLastContentIsComplete ? 'T' : 'F'));
+  if (nsnull != mPrevInFlow) {
+    fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
+  }
+  if (nsnull != mNextInFlow) {
+    fprintf(out, "next-in-flow=%p ", mNextInFlow);
+  }
 
   // Output the rect
   out << mRect;
 
   // Output the children, one line at a time
   if (nsnull != mLines) {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<\n", out);
     aIndent++;
 
@@ -322,6 +329,9 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
     for (PRInt32 i = aIndent; --i >= 0; ) fputs("  ", out);
     fputs(">\n", out);
   } else {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<>\n", out);
   }
 
diff --git a/layout/html/base/src/nsBlockReflowState.h b/layout/html/base/src/nsBlockReflowState.h
index 27486ca3ce0..6e02db32008 100644
--- a/layout/html/base/src/nsBlockReflowState.h
+++ b/layout/html/base/src/nsBlockReflowState.h
@@ -299,16 +299,23 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
   ListTag(out);
 
   // Output the first/last content offset
-  fprintf(out, "[%d,%d,%c] pif=%p nif=%p",
-          mFirstContentOffset, mLastContentOffset,
-          (mLastContentIsComplete ? 'T' : 'F'),
-          mPrevInFlow, mNextInFlow);
+  fprintf(out, "[%d,%d,%c] ", mFirstContentOffset, mLastContentOffset,
+          (mLastContentIsComplete ? 'T' : 'F'));
+  if (nsnull != mPrevInFlow) {
+    fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
+  }
+  if (nsnull != mNextInFlow) {
+    fprintf(out, "next-in-flow=%p ", mNextInFlow);
+  }
 
   // Output the rect
   out << mRect;
 
   // Output the children, one line at a time
   if (nsnull != mLines) {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<\n", out);
     aIndent++;
 
@@ -322,6 +329,9 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
     for (PRInt32 i = aIndent; --i >= 0; ) fputs("  ", out);
     fputs(">\n", out);
   } else {
+    if (0 != mState) {
+      fprintf(out, " [state=%08x]", mState);
+    }
     fputs("<>\n", out);
   }