diff --git a/mozilla/lib/mac/UserInterface/CProgressListener.cp b/mozilla/lib/mac/UserInterface/CProgressListener.cp
index 372fdf14a62..f44465ed7c8 100644
--- a/mozilla/lib/mac/UserInterface/CProgressListener.cp
+++ b/mozilla/lib/mac/UserInterface/CProgressListener.cp
@@ -21,7 +21,7 @@
 
 #include "CProgressListener.h"
 
-#include "CPatternProgressBar.h"
+#include "CProgressCaption.h"
 #include "CNSContext.h"	// for progress messages
 #include "xp.h"
 
@@ -35,7 +35,7 @@ CProgressListener::CProgressListener(LView* super, LBroadcaster* context)
 {
 	Assert_(super);
 	Assert_(context);
-	mProgressCaption = dynamic_cast<CPatternProgressCaption*>(super->FindPaneByID('Stat'));
+	mProgressCaption = dynamic_cast<CProgressCaption*>(super->FindPaneByID('Stat'));
 	mProgressLastTicks = 0;
 	mMessageLastTicks = 0;
 	mPercentLastTicks = 0;
@@ -74,9 +74,10 @@ void CProgressListener::ListenToMessage(MessageT inMessage, void *ioParam)
 
 		case msg_NSCProgressEnd:
 		case msg_NSCAllConnectionsComplete:
+		case msg_NSCFinishedLayout:
 			if (mLaziness == lazy_VeryButForThisCommandOnly)
 				mLaziness = mPreviousLaziness;
-			mProgressCaption->SetValue(CPatternProgressCaption::eSeamless);
+			mProgressCaption->SetValue(0);
 			mProgressCaption->SetDescriptor("\p");
 			break;
 
@@ -88,7 +89,6 @@ void CProgressListener::ListenToMessage(MessageT inMessage, void *ioParam)
 					mProgressLastTicks = ::TickCount(); 
 					CContextProgress* progress = (CContextProgress*)ioParam;
 					mProgressCaption->SetDescriptor(progress->mMessage);
-//					mProgressCaption->SetValue(progress->mPercent);
 				}
 			}
 			break;
@@ -109,6 +109,7 @@ void CProgressListener::ListenToMessage(MessageT inMessage, void *ioParam)
 					mProgressCaption->SetDescriptor("\p");
 			}
 			break;
+
 		case msg_NSCProgressPercentChanged:
 			if (::TickCount() - mPercentLastTicks >= MIN_TICKS)
 			{
diff --git a/mozilla/lib/mac/UserInterface/CProgressListener.h b/mozilla/lib/mac/UserInterface/CProgressListener.h
index 14b08710cf3..cc1b81e79ec 100644
--- a/mozilla/lib/mac/UserInterface/CProgressListener.h
+++ b/mozilla/lib/mac/UserInterface/CProgressListener.h
@@ -24,8 +24,8 @@
 #include <LListener.h>
 
 class LCaption;
-class CPatternProgressCaption;
 class LBroadcaster;
+class CProgressCaption;
 
 //======================================
 class CProgressListener : public LListener
@@ -61,7 +61,7 @@ public:
 		lazy_VeryButForThisCommandOnly
 	};
 
-	CProgressListener(CPatternProgressCaption* progressCaption)
+	CProgressListener(CProgressCaption* progressCaption)
 	: mProgressCaption(progressCaption) {}
 	CProgressListener(LView* superview, LBroadcaster* broadcaster);
 		// The broadcaster is the one to listen to.
@@ -70,12 +70,11 @@ public:
 	void SetLaziness(ProgressBarLaziness inLaziness);
 
 protected:
-//	LCaption* mCaption;
-//	CProgressBar* mProgressBar;
-	CPatternProgressCaption* mProgressCaption;
-	unsigned long			 mProgressLastTicks;
-	unsigned long			 mMessageLastTicks;
-	unsigned long			 mPercentLastTicks;
-	ProgressBarLaziness		 mLaziness;
-	ProgressBarLaziness		 mPreviousLaziness;
+	CProgressCaption*		mProgressCaption;
+	unsigned long			mProgressLastTicks;
+	unsigned long			mMessageLastTicks;
+	unsigned long			mPercentLastTicks;
+	ProgressBarLaziness		mLaziness;
+	ProgressBarLaziness		mPreviousLaziness;
+
 }; // class ProgressListener