diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 7284efb3f72e71ed9c238ccce23ba321a217c9d5..1148fa7280ed6119eade6ed8f74f10fdf3606acc 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -2536,6 +2536,11 @@ static void sendmail_thread(void* arg)
 				p=strrchr(to,'>');	/* Truncate '>' */
 				if(p!=NULL) *p=0;
 
+				/* truncate at first white-space char */
+				p=to;
+				while(*p && *p>' ') p++;
+				*p=0;
+
 				p=strrchr(to,'@');
 				if(p==NULL) {
 					lprintf("0000 !SEND INVALID destination address: %s", to);