diff --git a/ChangeLog b/ChangeLog
index 75a495129a..6d805e91d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-12  Michael Natterer  <mitch@gimp.org>
+
+	* libgimpwidgets/gimpquerybox.c (create_query_box): set proper
+	alignments for the GtkImage and GtkLabel of the query_box.
+
 2003-11-12  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimppropwidgets.c: set the boundaries for the
diff --git a/libgimpwidgets/gimpquerybox.c b/libgimpwidgets/gimpquerybox.c
index f79134c90c..28449b93d5 100644
--- a/libgimpwidgets/gimpquerybox.c
+++ b/libgimpwidgets/gimpquerybox.c
@@ -153,19 +153,16 @@ create_query_box (const gchar   *title,
     {
       GtkWidget *image;
 
+      hbox = gtk_hbox_new (FALSE, 10);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
+      gtk_container_add (GTK_CONTAINER (GTK_DIALOG (query_box->qbox)->vbox),
+                         hbox);
+      gtk_widget_show (hbox);
+
       image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG);
-
-      if (image)
-        {
-          hbox = gtk_hbox_new (FALSE, 10);
-          gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
-          gtk_container_add (GTK_CONTAINER (GTK_DIALOG (query_box->qbox)->vbox),
-                             hbox);
-          gtk_widget_show (hbox);
-
-          gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
-          gtk_widget_show (image);
-        }
+      gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+      gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+      gtk_widget_show (image);
     }
 
   query_box->vbox = gtk_vbox_new (FALSE, 6);
@@ -189,6 +186,7 @@ create_query_box (const gchar   *title,
   if (message)
     {
       label = gtk_label_new (message);
+      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
       gtk_box_pack_start (GTK_BOX (query_box->vbox), label, FALSE, FALSE, 0);
       gtk_widget_show (label);
     }