diff --git a/ChangeLog b/ChangeLog
index e7c3a5772b..3e5b6359e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-05-10  Sven Neumann  <sven@gimp.org>
+
+	* app/config/gimpdisplayconfig.c (DEFAULT_IMAGE_TITLE_FORMAT):
+	removed the display scale from the default image title because
+	it's now displayed in the statusbar. Show the image pixel size
+	instead.
+
+	* app/gui/preferences-dialog.c: include a preset for the title
+	format string that shows the image size (bug #141720).
+
 2004-05-10  Michael Natterer  <mitch@gimp.org>
 
 	Prepare for making an interface out of GimpContainerView:
diff --git a/app/config/gimpdisplayconfig.c b/app/config/gimpdisplayconfig.c
index 7fc688d89a..5c121266ec 100644
--- a/app/config/gimpdisplayconfig.c
+++ b/app/config/gimpdisplayconfig.c
@@ -62,7 +62,7 @@ static void  gimp_display_config_fullscreen_notify (GObject    *object,
                                                     gpointer    data);
 
 
-#define DEFAULT_IMAGE_TITLE_FORMAT  "%D*%f-%p.%i (%t, %L) %z%%"
+#define DEFAULT_IMAGE_TITLE_FORMAT  "%D*%f-%p.%i (%t, %L) %wx%h"
 #define DEFAULT_IMAGE_STATUS_FORMAT "%n (%m)"
 #define DEFAULT_ACTIVATE_ON_FOCUS   TRUE
 
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 3db6d8d8c4..53d7099ae3 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1116,7 +1116,7 @@ prefs_dialog_new (Gimp       *gimp,
   }
 
   editor = gimp_template_editor_new (core_config->default_image, gimp, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), editor, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), editor, FALSE, FALSE, 0);
   gtk_widget_show (editor);
 
   table = prefs_table_new (1, GTK_CONTAINER (vbox), TRUE);
@@ -1543,7 +1543,7 @@ prefs_dialog_new (Gimp       *gimp,
       "%f-%p.%i (%t)",
       "%f-%p.%i (%t) %z%%",
       "%f-%p.%i (%t) %d:%s",
-      "%f-%p.%i (%t) %s:%d",
+      "%f-%p.%i (%t) %wx%h",
       "%f-%p.%i (%t) %m"
     };
 
@@ -1553,7 +1553,7 @@ prefs_dialog_new (Gimp       *gimp,
       N_("Standard"),
       N_("Show zoom percentage"),
       N_("Show zoom ratio"),
-      N_("Show reversed zoom ratio"),
+      N_("Show image size"),
       N_("Show memory usage")
     };
 
diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c
index 3db6d8d8c4..53d7099ae3 100644
--- a/app/gui/preferences-dialog.c
+++ b/app/gui/preferences-dialog.c
@@ -1116,7 +1116,7 @@ prefs_dialog_new (Gimp       *gimp,
   }
 
   editor = gimp_template_editor_new (core_config->default_image, gimp, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), editor, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), editor, FALSE, FALSE, 0);
   gtk_widget_show (editor);
 
   table = prefs_table_new (1, GTK_CONTAINER (vbox), TRUE);
@@ -1543,7 +1543,7 @@ prefs_dialog_new (Gimp       *gimp,
       "%f-%p.%i (%t)",
       "%f-%p.%i (%t) %z%%",
       "%f-%p.%i (%t) %d:%s",
-      "%f-%p.%i (%t) %s:%d",
+      "%f-%p.%i (%t) %wx%h",
       "%f-%p.%i (%t) %m"
     };
 
@@ -1553,7 +1553,7 @@ prefs_dialog_new (Gimp       *gimp,
       N_("Standard"),
       N_("Show zoom percentage"),
       N_("Show zoom ratio"),
-      N_("Show reversed zoom ratio"),
+      N_("Show image size"),
       N_("Show memory usage")
     };