wrong fix, reverted plus a cleanup..

--HG--
branch : HEAD

diff --git a/src/lib-mail/message-parser.c b/src/lib-mail/message-parser.c
index 0722755024ff61d4ef4f515d5768c1baeac77f0f..3134cb4acf379e70d0fa8604f724db5b0793fa99 100644 (file)
--- a/src/lib-mail/message-parser.c
+++ b/src/lib-mail/message-parser.c
@@ -807,6 +807,8 @@ message_parse_header_next(struct message_header_parser_ctx *ctx)
                                if (ctx->hdr_size != NULL)
                                        ctx->hdr_size->virtual_size++;
                                size = i;
+                       } else {
+                               size = i-1;
                        }
 
                        ctx->skip = i+1;
@@ -816,7 +818,7 @@ message_parse_header_next(struct message_header_parser_ctx *ctx)
                startpos = i;
        }
 
-       if (size == 0 || (size == 1 && msg[0] == '\r')) {
+       if (size == 0) {
                /* end of headers */
                line->eoh = TRUE;
                line->name_len = line->value_len = line->full_value_len = 0;