From e48e3d33c2aedce4d1698702f5088acbaf95e825 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 12 Dec 2002 02:33:57 +0000
Subject: [PATCH] Displays external netmail address before prompting to
 forward.

---
 src/sbbs3/email.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sbbs3/email.cpp b/src/sbbs3/email.cpp
index 1329ddd393..85e7f9750e 100644
--- a/src/sbbs3/email.cpp
+++ b/src/sbbs3/email.cpp
@@ -78,10 +78,11 @@ bool sbbs_t::email(int usernumber, char *top, char *subj, long mode)
 	if(l&(DELETED|INACTIVE)) {              /* Deleted or Inactive User */
 		bputs(text[UnknownUser]);
 		return(false); }
-	if(l&NETMAIL && cfg.sys_misc&SM_FWDTONET
-		&& yesno(text[ForwardMailQ])) { /* Forward to netmail address */
+	if(l&NETMAIL && cfg.sys_misc&SM_FWDTONET) {
 		getuserrec(&cfg,usernumber,U_NETMAIL,LEN_NETMAIL,str);
-		return(netmail(str,subj,mode));
+		bprintf(text[UserNetMail],str);
+		if(yesno(text[ForwardMailQ])) /* Forward to netmail address */
+			return(netmail(str,subj,mode));
 	}
 	bprintf(text[Emailing],username(&cfg,usernumber,tmp),usernumber);
 	action=NODE_SMAL;
-- 
GitLab