* CC: support for message creation, and IMAP. Not tested.

[citadel.git] / citadel / imap_search.c

diff --git a/citadel/imap_search.c b/citadel/imap_search.c
index 50bf6dd785fe3f1f0aab9d082697810e497c3db8..dbb0b89d29e38710cd02b63e1eb72dd70a39ecb3 100644 (file)
--- a/citadel/imap_search.c
+++ b/citadel/imap_search.c
@@ -151,12 +151,20 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
                        msg = CtdlFetchMessage(IMAP->msgids[seq-1], 1);
                        need_to_free_msg = 1;
                }
-               fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Cc");
+               fieldptr = msg->cm_fields['Y'];
                if (fieldptr != NULL) {
                        if (bmstrcasestr(fieldptr, itemlist[pos+1])) {
                                match = 1;
                        }
-                       free(fieldptr);
+               }
+               else {
+                       fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Cc");
+                       if (fieldptr != NULL) {
+                               if (bmstrcasestr(fieldptr, itemlist[pos+1])) {
+                                       match = 1;
+                               }
+                               free(fieldptr);
+                       }
                }
                pos += 2;
        }