diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index 57bf808adfff0440911e999ab3803bfa1f87fbf7..8d37050821c5d5aa2811e38639bebb85ded83d60 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -4319,6 +4319,11 @@ int pkt_to_msg(FILE* fidomsg, fmsghdr_t* hdr, const char* info, const char* inbo
 			SAFECOPY(fname, getfname(hdr->subj));
 			SAFEPRINTF2(hdr->subj, "%s%s", inbound, fname);	/* Fix the file path in the subject */
 		}
+		const uint16_t remove_attrs = FIDO_CRASH | FIDO_LOCAL | FIDO_HOLD;
+		if(hdr->attr&remove_attrs) {
+			lprintf(LOG_DEBUG, "%s Removing attributes: %04hX", info, hdr->attr&remove_attrs);
+			hdr->attr &= ~remove_attrs;
+		}
 		(void)write(file,hdr,sizeof(fmsghdr_t));
 		(void)write(file,fmsgbuf,l+1); /* Write the '\0' terminator too */
 		close(file);