X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window-mgr.c;h=56ddbf92b94504faa4396494230794d23b8e7e1d;hp=1a7e7f01b91340e6220da56055effa8f9af0a968;hb=15653b82b80a0905f45315e241e525b1b6524a4a;hpb=b6ca27440e1f78d9e5466731fffdce4c70f0db41

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 1a7e7f0..56ddbf9 100644
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -571,15 +571,14 @@ modest_window_mgr_register_window_default (ModestWindowMgr *self,
 		const gchar *uid = modest_msg_view_window_get_message_uid
 			(MODEST_MSG_VIEW_WINDOW (window));
 
-		if (!has_uid (priv->preregistered_uids, uid)) 
-			g_debug ("weird: no uid for window (%s)", uid);
-		
 		MODEST_DEBUG_BLOCK(g_debug ("registering window for %s", uid ? uid : "<none>"););
 		
-		priv->preregistered_uids = 
-			remove_uid (priv->preregistered_uids,
-				    modest_msg_view_window_get_message_uid
-				    (MODEST_MSG_VIEW_WINDOW (window)));
+		if (has_uid (priv->preregistered_uids, uid)) {
+			priv->preregistered_uids = 
+				remove_uid (priv->preregistered_uids,
+					    modest_msg_view_window_get_message_uid
+					    (MODEST_MSG_VIEW_WINDOW (window)));
+		}
 	} else if (MODEST_IS_MSG_EDIT_WINDOW(window)) {
 		const gchar *uid = modest_msg_edit_window_get_message_uid
 			(MODEST_MSG_EDIT_WINDOW (window));