Index: src/crash.c
===================================================================
RCS file: //claws/src/crash.c,v
retrieving revision 1.23.2.38
retrieving revision 1.23.2.39
diff -u -r1.23.2.38 -r1.23.2.39
--- src/crash.c	7 Jul 2012 07:09:27 -0000	1.23.2.38
+++ src/crash.c	27 Jul 2012 18:25:38 -0000	1.23.2.39
@@ -53,6 +53,7 @@
 #include "filesel.h"
 #include "version.h"
 #include "prefs_common.h"
+#include "manage_window.h"
 
 /*
  * NOTE: the crash dialog is called when claws is not 
@@ -272,6 +273,8 @@
 	g_signal_connect(G_OBJECT(button5), "clicked",
 			 G_CALLBACK(crash_create_bug_report), NULL);
 
+	MANAGE_WINDOW_SIGNALS_CONNECT(window1);
+
 	gtk_widget_show(window1);
 
 	gtk_main();
Index: src/mimeview.c
===================================================================
RCS file: //claws/src/mimeview.c,v
retrieving revision 1.83.2.191
retrieving revision 1.83.2.192
diff -u -r1.83.2.191 -r1.83.2.192
--- src/mimeview.c	7 Jul 2012 07:09:28 -0000	1.83.2.191
+++ src/mimeview.c	27 Jul 2012 18:25:38 -0000	1.83.2.192
@@ -55,6 +55,7 @@
 #include "gtk/gtkvscrollbutton.h"
 #include "gtk/logwindow.h"
 #include "timing.h"
+#include "manage_window.h"
 
 #ifdef MAEMO
 #include <libosso.h>
@@ -1893,6 +1894,7 @@
 	else
 		startdir = g_strdup(get_home_dir());
 
+	manage_window_focus_in(gtk_widget_get_ancestor(mimeview->hbox, GTK_TYPE_WINDOW), NULL, NULL);
 	dirname = filesel_select_file_save_folder(_("Select destination folder"), startdir);
 	if (!dirname) {
 		g_free(startdir);
@@ -2006,6 +2008,7 @@
 
 	g_free(partname);
 
+	manage_window_focus_in(gtk_widget_get_ancestor(mimeview->hbox, GTK_TYPE_WINDOW), NULL, NULL);
 	filename = filesel_select_file_save(_("Save as"), filepath);
 	if (!filename) {
 		g_free(filepath);