diff --git a/ChangeLog b/ChangeLog
index 92866e71fa..0ff9efac47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-02-26  Matthias Clasen <mclasen@redhat.com>
+
+	Merge from trunk:
+
+	Apply a patch by Carlos Garnacho to fix several problems
+	with filechooser size handling (#325477, #151169, 143213,
+	#153785)
+
+	* gtk/gtkfilechooserdefault.c: Increase NUM_LINES slightly.
+	(browse_widgets_create): Don't force
+	the paned position to 200.
+	(find_good_size_from_style):
+	Take the size of the extra widget into account.
+
+	* gtk/gtkfilechooserdialog.c (file_chooser_widget_update_hints):
+	Accept a minimal width parameter.  Update all callers.
+
 2007-02-26  Matthias Clasen <mclasen@redhat.com>
 
 	Merge from trunk:
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 4f434c45fc..267618b37e 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
 /* GTK - The GIMP Toolkit
  * gtkfilechooserdefault.c: Default implementation of GtkFileChooser
  * Copyright (C) 2003, Red Hat, Inc.
@@ -242,7 +243,7 @@ typedef enum {
 #define FALLBACK_ICON_SIZE 16
 
 #define PREVIEW_HBOX_SPACING 12
-#define NUM_LINES 40
+#define NUM_LINES 45
 #define NUM_CHARS 60
 
 static void gtk_file_chooser_default_iface_init       (GtkFileChooserIface        *iface);
@@ -4654,7 +4655,6 @@ browse_widgets_create (GtkFileChooserDefault *impl)
   /* Paned widget */
   hpaned = gtk_hpaned_new ();
   gtk_widget_show (hpaned);
-  gtk_paned_set_position (GTK_PANED (hpaned), 200); /* FIXME: this sucks */
   gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0);
 
   widget = shortcuts_pane_create (impl, size_group);
@@ -7139,7 +7139,6 @@ find_good_size_from_style (GtkWidget *widget,
   gint default_width, default_height;
   int font_size;
   GtkRequisition req;
-  GtkRequisition preview_req;
 
   g_assert (widget->style != NULL);
   impl = GTK_FILE_CHOOSER_DEFAULT (widget);
@@ -7150,15 +7149,20 @@ find_good_size_from_style (GtkWidget *widget,
   default_width = font_size * NUM_CHARS;
   default_height = font_size * NUM_LINES;
 
-  /* Use at least the requisition size not including the preview widget */
-  gtk_widget_size_request (widget, &req);
-
   if (impl->preview_widget_active && impl->preview_widget)
-    gtk_widget_size_request (impl->preview_box, &preview_req);
-  else
-    preview_req.width = 0;
+    {
+      gtk_widget_size_request (impl->preview_box, &req);
+      default_width += PREVIEW_HBOX_SPACING + req.width;
+    }
 
-  default_width = MAX (default_width, (req.width - (preview_req.width + PREVIEW_HBOX_SPACING)));
+  if (impl->extra_widget)
+    {
+      gtk_widget_size_request (impl->extra_align, &req);
+      default_height += GTK_BOX (widget)->spacing + req.height;
+    }
+
+  gtk_widget_size_request (widget, &req);
+  default_width = MAX (default_width, req.width);
   default_height = MAX (default_height, req.height);
 
   *width = default_width;
@@ -7173,11 +7177,7 @@ gtk_file_chooser_default_get_default_size (GtkFileChooserEmbed *chooser_embed,
   GtkFileChooserDefault *impl;
 
   impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
-
   find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height);
-
-  if (impl->preview_widget_active && impl->preview_widget)
-    *default_width += impl->preview_box->requisition.width + PREVIEW_HBOX_SPACING;
 }
 
 static void
diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 0c57e66a99..71e01f0968 100644
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
 /* GTK - The GIMP Toolkit
  * gtkfilechooserdialog.c: File selector dialog
  * Copyright (C) 2003, Red Hat, Inc.
@@ -150,14 +151,15 @@ file_chooser_widget_file_activated (GtkFileChooser       *chooser,
 }
 
 static void
-file_chooser_widget_update_hints (GtkFileChooserDialog *dialog)
+file_chooser_widget_update_hints (GtkFileChooserDialog *dialog,
+				  gint                  width)
 {
   GtkFileChooserDialogPrivate *priv;
   GdkGeometry geometry;
 
   priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
 
-  geometry.min_width = -1;
+  geometry.min_width = (!priv->resize_horizontally ? width : -1);
   geometry.min_height = -1;
   geometry.max_width = (priv->resize_horizontally?G_MAXSHORT:-1);
   geometry.max_height = (priv->resize_vertically?G_MAXSHORT:-1);
@@ -247,7 +249,7 @@ file_chooser_widget_default_realized_size_changed (GtkWidget            *widget,
     {
       update_hints = TRUE;
     }
-  
+
   if (resize_vertically && priv->resize_vertically)
     {
       dy = default_height - priv->default_height;
@@ -280,7 +282,7 @@ file_chooser_widget_default_realized_size_changed (GtkWidget            *widget,
 
   /* Only store the size if we can resize in that direction. */
   if (update_hints)
-    file_chooser_widget_update_hints (dialog);
+    file_chooser_widget_update_hints (dialog, width);
 }
 
 static void
@@ -305,7 +307,7 @@ file_chooser_widget_default_unrealized_size_changed (GtkWidget            *widge
   height = priv->default_height + GTK_WIDGET (dialog)->requisition.height - priv->widget->requisition.height;
 
   gtk_window_set_default_size (GTK_WINDOW (dialog), width, height);
-  file_chooser_widget_update_hints (dialog);
+  file_chooser_widget_update_hints (dialog, width);
 }
 
 static void