diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 8d69baeb6b2c06796976edc1d7137e5afb703c1b..7215f0b3ef95b9ec127a184a5a8c7b5d4df5dcec 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -1303,7 +1303,7 @@ static void pop3_thread(void* arg)
 			smb_unlockmsghdr(&smb,&msg);
 			if(i!=0) {
 				lprintf(LOG_ERR,"%04d !POP3 <%s> ERROR %d (%s) line %u, msg #%u"
-					,socket, user.alias, i, smb.last_error, __LINE__, mail[l].number);
+					,socket, user.alias, i, smb.last_error, __LINE__, msg.idx.number);
 				break;
 			}
 			bytes+=smb_getmsgtxtlen(&msg);
@@ -1359,7 +1359,7 @@ static void pop3_thread(void* arg)
 					if((i=smb_getmsghdr(&smb,&msg))!=SMB_SUCCESS) {
 						smb_unlockmsghdr(&smb,&msg);
 						lprintf(LOG_ERR,"%04d !POP3 <%s> ERROR %d (%s) line %u, msg #%u"
-							,socket, user.alias, i, smb.last_error, __LINE__, msg.hdr.number);
+							,socket, user.alias, i, smb.last_error, __LINE__, msg.idx.number);
 						break;
 					}
 					msg.hdr.attr=mail[l].attr;
@@ -1412,7 +1412,7 @@ static void pop3_thread(void* arg)
 					if(i!=0) {
 						smb_freemsgmem(&msg);
 						lprintf(LOG_ERR,"%04d !POP3 <%s> ERROR %d (%s) line %u, msg #%u"
-							,socket, user.alias, i, smb.last_error, __LINE__, msg.hdr.number);
+							,socket, user.alias, i, smb.last_error, __LINE__, msg.idx.number);
 						sockprintf(socket,session,"-ERR %d getting message header",i);
 						continue;
 					}
@@ -1445,7 +1445,7 @@ static void pop3_thread(void* arg)
 					if(i!=0) {
 						smb_freemsgmem(&msg);
 						lprintf(LOG_ERR,"%04d !POP3 <%s> ERROR %d (%s) line %u, msg #%u"
-							,socket, user.alias, i, smb.last_error, __LINE__, msg.hdr.number);
+							,socket, user.alias, i, smb.last_error, __LINE__, msg.idx.number);
 						break;
 					}
 					if(!strnicmp(buf, "LIST",4)) {
@@ -1506,7 +1506,7 @@ static void pop3_thread(void* arg)
 				smb_unlockmsghdr(&smb,&msg);
 				if(i!=0) {
 					lprintf(LOG_ERR,"%04d !POP3 <%s> ERROR %d (%s) line %u, msg #%u"
-						,socket, user.alias, i, smb.last_error, __LINE__, msg.hdr.number);
+						,socket, user.alias, i, smb.last_error, __LINE__, msg.idx.number);
 					sockprintf(socket,session,"-ERR %d getting message header",i);
 					continue;
 				}
@@ -1603,7 +1603,7 @@ static void pop3_thread(void* arg)
 					smb_unlockmsghdr(&smb,&msg);
 					smb_unlocksmbhdr(&smb);
 					lprintf(LOG_ERR,"%04d !POP3 <%s> ERROR %d (%s) line %u, msg #%u"
-						,socket, user.alias, i, smb.last_error, __LINE__, msg.hdr.number);
+						,socket, user.alias, i, smb.last_error, __LINE__, msg.idx.number);
 					sockprintf(socket,session,"-ERR %d getting message header",i);
 					continue;
 				}