--- a/session.c	Wed Apr 02 11:40:41 2014 +0500
+++ b/session.c	Wed Apr 02 13:14:04 2014 +0500
@@ -605,14 +605,15 @@
 {
 	struct list_res	*res = imsg->data;
 
+	res->idx += 1;	/* POP3 index is 1 based */
 	if (res->uidl)
 		if (strlen(res->u.hash))
-			session_reply(s, "%s", res->u.hash);
+			session_reply(s, "%zu %s", res->idx, res->u.hash);
 		else 
 			goto end;
 	else
 		if (res->u.sz)
-			session_reply(s, "%zu", res->u.sz);
+			session_reply(s, "%zu %zu", res->idx, res->u.sz);
 		else
 			goto end;