From d529a310b877a8952da7b25edaf123d9128ceff3 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Fri, 1 May 2020 00:08:23 +0000
Subject: [PATCH] Always delete exported netmail if there's no SENDEREXT
(from_ext) as this could result in orphaned sent-mail otherwise.
---
src/sbbs3/sbbsecho.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index 7619f7e553..69e107b3ca 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)
--
GitLab