diff -up evolution-data-server-2.21.3/camel/providers/imap/camel-imap-search.c.maybe-fix-crash evolution-data-server-2.21.3/camel/providers/imap/camel-imap-search.c --- evolution-data-server-2.21.3/camel/providers/imap/camel-imap-search.c.maybe-fix-crash 2007-11-29 07:53:34.000000000 -0500 +++ evolution-data-server-2.21.3/camel/providers/imap/camel-imap-search.c 2007-12-03 11:51:26.000000000 -0500 @@ -344,7 +344,6 @@ sync_match(CamelImapSearch *is, struct _ } g_string_append_c (search, '"'); } - camel_search_words_free (words); /* We only try search using utf8 if its non us-ascii text? */ if ((words->type & CAMEL_SEARCH_WORD_8BIT) && (store->capabilities & IMAP_CAPABILITY_utf8_search)) { @@ -354,6 +353,8 @@ sync_match(CamelImapSearch *is, struct _ if (response == NULL) store->capabilities &= ~IMAP_CAPABILITY_utf8_search; } + camel_search_words_free (words); + if (response == NULL) response = camel_imap_command (store, folder, NULL, "UID SEARCH %s", search->str);