diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 048d4cccd36a0c692d59430dd3807e23fbdafccf..602541da95d893fc4972eb2ee783ae1a2193f418 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -2761,6 +2761,7 @@ static void sendmail_thread(void* arg)
 	ulong		dns;
 	ulong		lines;
 	BOOL		success;
+	BOOL		first_cycle=TRUE;
 	SOCKET		sock=INVALID_SOCKET;
 	SOCKADDR_IN	addr;
 	SOCKADDR_IN	server_addr;
@@ -2801,7 +2802,10 @@ static void sendmail_thread(void* arg)
 
 		smb_freemsgmem(&msg);
 
-		if(last_scan)
+		/* Don't delay on first loop */
+		if(first_cycle)
+			first_cycle=FALSE;
+		else
 			mswait(3000);
 
 		sprintf(smb.file,"%smail",scfg.data_dir);