- return search_id == mbox_id && regexec(search_regexp, mbox_value, 0, 0, 0) == 0;
+ return
+ (search_id == mbox_id ||
+ (search_id == ID_PARTICIPANT && (mbox_id == ID_FROM || mbox_id == ID_DEST)))
+ &&
+ regexec(search_regexp, mbox_value, 0, 0, 0) == 0;