diff --git a/ChangeLog b/ChangeLog
index 09699a7dc9..78a88df360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-11  Sven Neumann  <sven@gimp.org>
+
+	* app/display/gimpdisplayshell-progress.c
+	(gimp_display_shell_progress_message): info messages go to the
+	statusbar, no matter if it's visible or not. We don't want a
+	dialog to pop up.
+
 2006-12-11  Sven Neumann  <sven@gimp.org>
 
 	* app/actions/file-commands.c: don't message "Image saved" from here.
diff --git a/app/display/gimpdisplayshell-progress.c b/app/display/gimpdisplayshell-progress.c
index 38e72654a2..db7193e465 100644
--- a/app/display/gimpdisplayshell-progress.c
+++ b/app/display/gimpdisplayshell-progress.c
@@ -109,11 +109,23 @@ gimp_display_shell_progress_message (GimpProgress        *progress,
 {
   GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (progress);
 
-  if (severity != GIMP_MESSAGE_ERROR && GTK_WIDGET_VISIBLE (shell->statusbar))
-    return gimp_progress_message (GIMP_PROGRESS (shell->statusbar), gimp,
-                                  severity, domain, message);
+  switch (severity)
+    {
+    case GIMP_MESSAGE_ERROR:
+      /* error messages are never handled here */
+      return FALSE;
 
-  return FALSE;
+    case GIMP_MESSAGE_WARNING:
+      /* warning messages go to the statusbar, if it's visible */
+      if (! GTK_WIDGET_VISIBLE (shell->statusbar))
+        return FALSE;
+      /* else fallthrough */
+
+    case GIMP_MESSAGE_INFO:
+      /* info messages go to the statusbar, no matter if it's visible or not */
+      return gimp_progress_message (GIMP_PROGRESS (shell->statusbar), gimp,
+                                    severity, domain, message);
+    }
 }
 
 void