diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 2b39109914f8f6eb5b956da4892c607be3c1f2f2..187155b40e52a77fc8a036ee6893bd1930e74868 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -3877,6 +3877,7 @@ static void smtp_thread(void* arg)
 					smb_hfield_add_str(&newmsg, SMTPRECEIVED, hdrfield, /* insert: */TRUE);
 
 					if(nettype == NET_FIDO) {
+						newmsg.hdr.netattr |= MSG_LOCAL;
 						char* tp = strchr(rcpt_name, '@');
 						if(tp != NULL)
 							*tp = 0;
diff --git a/src/sbbs3/netmail.cpp b/src/sbbs3/netmail.cpp
index 21165b6c644bf7b9308c68b7a21bf94130cc11c9..a28283a93c1099ffeeec4b8ed2e704743a6632b7 100644
--- a/src/sbbs3/netmail.cpp
+++ b/src/sbbs3/netmail.cpp
@@ -243,6 +243,7 @@ bool sbbs_t::netmail(const char *into, const char *title, long mode, smb_t* resm
 		} 
 	}
 
+	msg.hdr.netattr |= MSG_LOCAL; 
 	lprintf(LOG_DEBUG, "NetMail subject: %s", subj);
 	p=subj;
 	if((SYSOP || useron.exempt&FLAG('F'))