diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 85d164212eb781b3582b727329e3957a3d6a3b70..c4e01ca6de136938b8112848c77c94129821a467 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -5620,9 +5620,9 @@ static void sendmail_thread(void* arg)
 				continue;
 			}
 			if(msg.from_net.type==NET_INTERNET && msg.reverse_path!=NULL)
-				SAFECOPY(fromaddr, msg.reverse_path);
+				angle_bracket(fromaddr, sizeof(fromaddr), msg.reverse_path);
 			else 
-				SAFEPRINTF(fromaddr, "<%s>", usermailaddr(&scfg, str, msg.from));
+				angle_bracket(fromaddr, sizeof(fromaddr), usermailaddr(&scfg, str, msg.from));
 
 			char sender_info[512];
 			if(msg.from_ext != NULL)