From 9cefd0356bf3b37a37035aa40dc8a1b49d4253af Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 8 Oct 2019 03:01:57 +0000
Subject: [PATCH] Include the "KillSent" attribute in the displayed message
 attributes. Don't suppress the display of the "from network address" just
 because there's an '@' in the "from name" - some Internet email (e.g. SPAM)
 "From" names include '@'s to try and follow the reader. <sigh>

---
 src/sbbs3/getmsg.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sbbs3/getmsg.cpp b/src/sbbs3/getmsg.cpp
index 2f56a602a3..ad2d6a8230 100644
--- a/src/sbbs3/getmsg.cpp
+++ b/src/sbbs3/getmsg.cpp
@@ -115,6 +115,7 @@ void sbbs_t::show_msgattr(smbmsg_t* msg)
 		,auxattr&(MSG_FILEATTACH|MSG_MIMEATTACH) ? "Attach  "   :nulstr
 		,netattr&MSG_SENT						 ? "Sent  "		:nulstr
 		,netattr&MSG_INTRANSIT					 ? "InTransit  ":nulstr
+		,netattr&MSG_KILLSENT					 ? "KillSent  " :nulstr
 		);
 }
 
@@ -205,7 +206,7 @@ void sbbs_t::show_msghdr(smb_t* smb, smbmsg_t* msg, const char* subject, const c
 			bprintf(pmode, msghdr_text(msg, MsgFrom), current_msg_from);
 			if(msg->from_ext)
 				bprintf(text[MsgFromExt],msg->from_ext);
-			if(msg->from_net.addr!=NULL && (current_msg_from == NULL || strchr(current_msg_from,'@')==NULL))
+			if(msg->from_net.addr!=NULL)
 				bprintf(text[MsgFromNet],smb_netaddrstr(&msg->from_net,str));
 		}
 		if(!(msg->hdr.attr&MSG_POLL) && (msg->upvotes || msg->downvotes))
-- 
GitLab