2 files changed, 16 insertions, 22 deletions

diff --git a/src/lib-imap/imap-envelope.c b/src/lib-imap/imap-envelope.c
index 87297f4..da31770 100644
--- a/src/lib-imap/imap-envelope.c
+++ b/src/lib-imap/imap-envelope.c
@@ -1,6 +1,7 @@
 /* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
+#include "llist.h"
 #include "istream.h"
 #include "str.h"
 #include "message-address.h"
@@ -66,17 +67,17 @@ void imap_envelope_write(struct message_part_envelope *data,
 	}
 
 	str_append_c(str, ' ');
-	imap_write_address(str, data->from);
+	imap_write_address(str, data->from.head);
 	str_append_c(str, ' ');
-	imap_write_address(str, NVL(data->sender, data->from));
+	imap_write_address(str, NVL(data->sender.head, data->from.head));
 	str_append_c(str, ' ');
-	imap_write_address(str, NVL(data->reply_to, data->from));
+	imap_write_address(str, NVL(data->reply_to.head, data->from.head));
 	str_append_c(str, ' ');
-	imap_write_address(str, data->to);
+	imap_write_address(str, data->to.head);
 	str_append_c(str, ' ');
-	imap_write_address(str, data->cc);
+	imap_write_address(str, data->cc.head);
 	str_append_c(str, ' ');
-	imap_write_address(str, data->bcc);
+	imap_write_address(str, data->bcc.head);
 
 	str_append_c(str, ' ');
 	imap_append_nstring_nolf(str, data->in_reply_to);
@@ -125,32 +126,25 @@ imap_envelope_parse_address(const struct imap_arg *arg,
 
 static bool
 imap_envelope_parse_addresses(const struct imap_arg *arg,
-	pool_t pool, struct message_address **addrs_r)
+	pool_t pool, struct message_address_list *addrs_r)
 {
-	struct message_address *first, *addr, *prev;
+	struct message_address *addr;
 	const struct imap_arg *list_args;
 
-	if (arg->type == IMAP_ARG_NIL) {
-		*addrs_r = NULL;
+	i_zero(addrs_r);
+	if (arg->type == IMAP_ARG_NIL)
 		return TRUE;
-	}
 
 	if (!imap_arg_get_list(arg, &list_args))
 		return FALSE;
 
-	first = addr = prev = NULL;
+	addr = NULL;
 	for (; !IMAP_ARG_IS_EOL(list_args); list_args++) {
 		if (!imap_envelope_parse_address
 			(list_args, pool, &addr))
 			return FALSE;
-		if (first == NULL)
-			first = addr;
-		if (prev != NULL)
-			prev->next = addr;
-		prev = addr;
+		DLLIST2_APPEND(&addrs_r->head, &addrs_r->tail, addr);
 	}
-
-	*addrs_r = first;
 	return TRUE;
 }
 
diff --git a/src/lib-imap/test-imap-envelope.c b/src/lib-imap/test-imap-envelope.c
index 1f295e5..c9b92b4 100644
--- a/src/lib-imap/test-imap-envelope.c
+++ b/src/lib-imap/test-imap-envelope.c
@@ -157,7 +157,7 @@ static void test_imap_envelope_write(void)
 		envlp = msg_parse(pool, test->message);
 
 		imap_envelope_write(envlp, str);
-		test_assert(strcmp(str_c(str), test->envelope) == 0);
+		test_assert_idx(strcmp(str_c(str), test->envelope) == 0, i);
 
 		pool_unref(&pool);
 		test_end();
@@ -179,12 +179,12 @@ static void test_imap_envelope_parse(void)
 		test_begin(t_strdup_printf("imap envelope parser [%u]", i));
 
 		ret = imap_envelope_parse(test->envelope, pool, &envlp, &error);
-		test_assert(ret);
+		test_assert_idx(ret, i);
 
 		if (ret) {
 			str_truncate(str, 0);
 			imap_envelope_write(envlp, str);
-			test_assert(strcmp(str_c(str), test->envelope) == 0);
+			test_assert_idx(strcmp(str_c(str), test->envelope) == 0, i);
 		} else {
 			i_error("Invalid envelope: %s", error);
 		}