- 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)));
+ }