Message body search: Skip MIME boundaries and multipart footer.

--HG--
branch : HEAD

diff --git a/src/lib-mail/message-search.c b/src/lib-mail/message-search.c
index 8e4f929670d6dcb316a5ad331a98bb894cd8773d..46bc56f6782084da5602a59a3d0750442acf4fa3 100644 (file)
--- a/src/lib-mail/message-search.c
+++ b/src/lib-mail/message-search.c
@@ -148,6 +148,11 @@ bool message_search_more(struct message_search_context *ctx,
                   content type */
                message_search_reset(ctx);
                ctx->prev_part = raw_block->part;
+
+               if (hdr == NULL) {
+                       /* we're returning to a multipart message. */
+                       ctx->content_type_text = FALSE;
+               }
        }
 
        if (hdr != NULL) {