diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index 7619f7e5537a454ebd555e7af143695f295f1d0b..69e107b3cacf328b64bb75d7e63fdfdc63ecc9a6 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -5287,7 +5287,7 @@ int export_netmail(void)
 
 		msg.hdr.netattr |= MSG_SENT;
 		msg.hdr.netattr &= ~MSG_INTRANSIT;
-		if(cfg.delete_netmail || (msg.hdr.netattr&MSG_KILLSENT)) {
+		if(cfg.delete_netmail || (msg.hdr.netattr&MSG_KILLSENT) || msg.from_ext == NULL) {
 			/* Delete exported netmail */
 			msg.hdr.attr |= MSG_DELETE;
 			if((i = smb_updatemsg(email, &msg)) != SMB_SUCCESS)