Index: e-shell-settings-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-settings-dialog.c,v
retrieving revision 1.37
diff -u -p -r1.37 e-shell-settings-dialog.c
--- e-shell-settings-dialog.c	14 Nov 2005 18:50:44 -0000	1.37
+++ e-shell-settings-dialog.c	20 Dec 2005 13:22:35 -0000
@@ -63,9 +63,9 @@ set_dialog_size (EShellSettingsDialog *d
 
 	pango_layout_get_pixel_size (layout, &width, NULL);
 
-	width *= 60;
+	width *= 78;
 	height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics)
-			       + pango_font_metrics_get_descent (metrics)) * 30;
+			       + pango_font_metrics_get_descent (metrics)) * 39;
 
 	gtk_window_set_default_size((GtkWindow *)dialog, width, height);
 	g_object_unref (layout);
Index: e-shell.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell.c,v
retrieving revision 1.267
diff -u -p -r1.267 e-shell.c
--- e-shell.c	18 Aug 2005 04:35:31 -0000	1.267
+++ e-shell.c	20 Dec 2005 13:22:36 -0000
@@ -1219,6 +1219,14 @@ e_shell_send_receive (EShell *shell)
 }
 
 
+static gboolean
+show_dialog_delay (GtkWidget *dialog)
+{
+	gtk_widget_show (dialog);
+
+	return FALSE;
+}
+
 void
 e_shell_show_settings (EShell *shell,
 		       const char *type,
@@ -1245,7 +1254,7 @@ e_shell_show_settings (EShell *shell,
 	g_object_add_weak_pointer (G_OBJECT (priv->settings_dialog), (void **) & priv->settings_dialog);
 
 	gtk_window_set_transient_for (GTK_WINDOW (priv->settings_dialog), GTK_WINDOW (shell_window));
-	gtk_widget_show (priv->settings_dialog);
+	g_timeout_add (50, show_dialog_delay, priv->settings_dialog);
 }
 
 
