X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=34778ba88e02fa7f6307d3bd03861f5cfac2c1f1;hp=4f1f13953e39c0c3a00c87813ce0aad4374352b9;hb=6011f47430718f4b1b0fe5fd74484b5153103f53;hpb=627c4af6ac85444cc3256fa568baf4a8d62178ae

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 4f1f139..34778ba 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -1425,6 +1425,7 @@ modest_msg_view_window_toggle_find_toolbar (GtkToggleAction *toggle,
 		hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
 	} else {
 		gtk_widget_hide (priv->find_toolbar);
+		modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
 	}
 
 	/* update the toggle buttons status */
@@ -2653,7 +2654,7 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window,
 			msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, attachment_uid);
 			modest_window_set_zoom (MODEST_WINDOW (msg_win), 
 						modest_window_get_zoom (MODEST_WINDOW (window)));
-			modest_window_mgr_register_window (mgr, msg_win);
+			modest_window_mgr_register_window (mgr, msg_win, MODEST_WINDOW (window));
 			gtk_widget_show_all (GTK_WIDGET (msg_win));
 		}
 	}