diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 9db88d811f3f332b59e7ad880ad9faf3d4b81a73..020bd871a65f5408c5dd28552e643066d5431f75 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -3015,13 +3015,16 @@ static void smtp_thread(void* arg)
 				mailproc_match[i]=FALSE;
 				if(mailproc_list[i].to!=NULL) {
 					for(j=0;mailproc_list[i].to[j]!=NULL;j++) {
-						if(stricmp(p,mailproc_list[i].to[j])==0)
+						if(stricmp(p,mailproc_list[i].to[j])==0) {
 							mailproc_match[i]=TRUE;
+							if(!mailproc_list[i].passthru)
+								break;
+						}
 					}
 				}
 			}
 			/* destined for an external mail processor */
-			if(i<mailproc_count && !mailproc_list[i].passthru) {
+			if(i<mailproc_count) {
 				fprintf(rcptlst,"[%u]\n",rcpt_count++);
 				fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(RECIPIENT),rcpt_addr);
 #if 0	/* should we fall-through to the sysop account? */