diff --git a/src/sbbs3/qwktomsg.cpp b/src/sbbs3/qwktomsg.cpp
index 9ec43e444dbae0e0b6a953c29920007b567424d4..eb4df02bce39317f4094cf203a68f96a06c46318 100644
--- a/src/sbbs3/qwktomsg.cpp
+++ b/src/sbbs3/qwktomsg.cpp
@@ -292,7 +292,7 @@ bool sbbs_t::qwktomsg(FILE *qwk_fp, char *hdrblk, char fromhub, uint subnum
 		}
 		p=header+i+7;					/* Skip "@MSGID:" */
 		while(*p && *p<=SP) p++;		/* Skip any spaces */
-		truncsp(p);
+		truncstr(p," ");				/* Truncate at first space char */
 		smb_hfield(&msg,RFC822MSGID,strlen(p),p);
 	}
 	if(!strnicmp(header+skip,"@REPLY:",7)) {
@@ -306,7 +306,7 @@ bool sbbs_t::qwktomsg(FILE *qwk_fp, char *hdrblk, char fromhub, uint subnum
 		}
 		p=header+i+7;					/* Skip "@REPLY:" */
 		while(*p && *p<=SP) p++;		/* Skip any spaces */
-		truncsp(p);
+		truncstr(p," ");				/* Truncate at first space char */
 		smb_hfield(&msg,RFC822REPLYID,strlen(p),p);
 	}
 	if(!strnicmp(header+skip,"@TZ:",4)) {