- if (header) {
- if (!message_reader (self, priv, header, NULL, NULL, priv->row_reference))
+ folder = tny_header_get_folder (header);
+ g_object_unref (header);
+
+ if (!folder)
+ return;
+
+ msg_uid = modest_msg_view_window_get_message_uid (self);
+ if (msg_uid)
+ if (!message_reader (self, priv, NULL, msg_uid, folder, priv->row_reference))