diff --git a/ChangeLog b/ChangeLog
index be1a025aff..9425a8cf03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-10  Sven Neumann  <sven@gimp.org>
+
+	* app/display/gimpstatusbar.c (gimp_statusbar_update): while the
+	statusbar is being used as a progress bar, only show progress
+	messages.
+
 2007-03-10  Sven Neumann  <sven@gimp.org>
 
 	* app/plug-in/gimppluginprocedure.[ch]: cache the result of
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index cda68bfaf5..e9c3f6de39 100644
--- a/app/display/gimpstatusbar.c
+++ b/app/display/gimpstatusbar.c
@@ -417,6 +417,16 @@ gimp_statusbar_update (GimpStatusbar *statusbar)
     {
       GimpStatusbarMsg *msg = statusbar->messages->data;
 
+      /*  only allow progress messages while the progress is active  */
+      if (statusbar->progress_active)
+        {
+          guint context_id = gimp_statusbar_get_context_id (statusbar,
+                                                            "progress");
+ 
+          if (context_id != msg->context_id)
+            return;
+        }
+
       text = msg->text;
     }