* src/procmsg.c

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index 9e89c0bf4d6994a87be663db10068a321e7650ff..5270bcb5908a3cef2bf9cc74cd08e769e8a93df4 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1140,13 +1140,14 @@ gint procmsg_send_message_queue(const gchar *file)
                else
                        tokens = g_strsplit(fwdmessageid, "\x7f", 0);
                item = folder_find_item_from_identifier(tokens[0]);
                else
                        tokens = g_strsplit(fwdmessageid, "\x7f", 0);
                item = folder_find_item_from_identifier(tokens[0]);

-               if (item != NULL) {
+
+               /* check if queued message has valid folder and message id */
+               if (item != NULL && tokens[2] != NULL) {

                        MsgInfo *msginfo;
                        
                        msginfo = folder_item_get_msginfo(item, atoi(tokens[1]));
                        MsgInfo *msginfo;
                        
                        msginfo = folder_item_get_msginfo(item, atoi(tokens[1]));

-                       
-                       /*!< note that if the message has no msgid (maybe it was invalid), 
-                       * we also refuse to do something with the reply to flag */
+               
+                       /* check if referring message exists and has a message id */

                        if ((msginfo != NULL) && 
                            (msginfo->msgid != NULL) &&
                            (strcmp(msginfo->msgid, tokens[2]) != 0)) {
                        if ((msginfo != NULL) && 
                            (msginfo->msgid != NULL) &&
                            (strcmp(msginfo->msgid, tokens[2]) != 0)) {