--- /pop3d.c	2012-03-31 23:01:50.000000000 +0200
+++ imap/pop3d.c	2012-04-01 01:34:58.000000000 +0200
@@ -1069,13 +1069,13 @@
 		    prot_printf(popd_out, "-ERR No such message\r\n");
 		}
 		else if (mboxstruct.options & OPT_POP3_NEW_UIDL) {
-			    prot_printf(popd_out, "+OK %u %lu.%u\r\n", msg, 
+			    prot_printf(popd_out, "+OK %u %lu.%.10u\r\n", msg, 
 					mboxstruct.uidvalidity,
 					popd_msg[msg].uid);
 		}
 		else {
 		    /* old uidl format */
-		    prot_printf(popd_out, "+OK %u %u\r\n", 
+		    prot_printf(popd_out, "+OK %u %.10u\r\n", 
 				msg, popd_msg[msg].uid);
 		}
 	    }
@@ -1084,11 +1084,11 @@
 		for (msg = 1; msg <= popd_exists; msg++) {
 		    if (!popd_msg[msg].deleted) {
 			if (mboxstruct.options & OPT_POP3_NEW_UIDL) {
-			    prot_printf(popd_out, "%u %lu.%u\r\n", msg, 
+			    prot_printf(popd_out, "%u %lu.%.10u\r\n", msg, 
 					mboxstruct.uidvalidity,
 					popd_msg[msg].uid);
 			} else {
-			    prot_printf(popd_out, "%u %u\r\n", msg, 
+			    prot_printf(popd_out, "%u %.10u\r\n", msg, 
 					popd_msg[msg].uid);
 			}
 		    }