X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=c02403bec8304fd7bb12f0e6450763ebb0b1d92f;hp=9b9e3b9f32bed37d813bb6cc3946ffa2a632e778;hb=8102dae163b20cc022c109d99a8c98be39a51fc4;hpb=21ffdb4ebcc04396c77fd80e586b1258b5048069

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 9b9e3b9..c02403b 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -1100,9 +1100,22 @@ message_reader (ModestMsgViewWindow *window,
 {
 	ModestMailOperation *mail_op = NULL;
 	ModestMailOperationTypeOperation op_type;
+	gboolean already_showing = FALSE;
+	ModestWindow *msg_window = NULL;
+	ModestWindowMgr *mgr;
 
 	g_return_val_if_fail (path != NULL, FALSE);
 
+	mgr = modest_runtime_get_window_mgr ();
+	already_showing = modest_window_mgr_find_registered_header (mgr, header, &msg_window);
+	if (already_showing && (msg_window != MODEST_WINDOW (window))) {
+		gboolean retval;
+		if (msg_window)
+			gtk_window_present (GTK_WINDOW (msg_window));
+		g_signal_emit_by_name (G_OBJECT (window), "delete-event", NULL, &retval);
+		return TRUE;
+	}
+
 	/* Msg download completed */
 	if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) {
 		op_type = MODEST_MAIL_OPERATION_TYPE_OPEN;