--- a/src/lib-mail/rfc822-parser.c	Fri Jul 20 08:31:06 2007 +0300
+++ b/src/lib-mail/rfc822-parser.c	Fri Jul 20 08:28:26 2007 +0300
@@ -308,7 +308,7 @@
 		} else if (*ctx->data == ']') {
 			ctx->data++;
 			str_append_n(str, start, ctx->data - start);
-			return ctx->data != ctx->end;
+			return rfc822_skip_lwsp(ctx);
 		}
 	}
 
@@ -329,13 +329,8 @@
 	if (rfc822_skip_lwsp(ctx) <= 0)
 		return -1;
 
-	if (*ctx->data == '[') {
-		if (rfc822_parse_domain_literal(ctx, str) < 0)
-			return -1;
-	} else {
-		if (rfc822_parse_dot_atom(ctx, str) < 0)
-			return -1;
-	}
-
-	return ctx->data != ctx->end;
+	if (*ctx->data == '[')
+		return rfc822_parse_domain_literal(ctx, str);
+	else
+		return rfc822_parse_dot_atom(ctx, str);
 }