diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index 69cff0185aeb27da98da9cb9ea72f85207792a82..12c32710c09572c90f63d25943ba708fc84a8831 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -1117,6 +1117,7 @@ int create_netmail(const char *to, const smbmsg_t* msg, const char *subject, con
 			}
 			fprintf(fp,"\r");
 		}
+		fprintf(fp, "\1MSGID: %s %08lx\r", smb_faddrtoa(&faddr, NULL), time32(NULL));
 	} else {
 		if(msg->ftn_msgid != NULL)
 			fprintf(fp, "\1MSGID: %.256s\r", msg->ftn_msgid);