From 480d0a9a26785bb2b35d67c41ffbdbf7bf03cfe3 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 9 Jan 2018 00:54:52 +0000
Subject: [PATCH] When showing message headers and using a msghdr.asc file,
 don't force a blank line (CRLF) after the header and before the message body.
 If you want a blank line, it must be in the msghdr.asc file. This change is
 to be consistent with the behavior in v3.16.

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

diff --git a/src/sbbs3/getmsg.cpp b/src/sbbs3/getmsg.cpp
index 40f8089e6f..a632519f6d 100644
--- a/src/sbbs3/getmsg.cpp
+++ b/src/sbbs3/getmsg.cpp
@@ -161,7 +161,9 @@ void sbbs_t::show_msghdr(smbmsg_t* msg)
 			,timestr(msg->hdr.when_written.time)
 			,smb_zonestr(msg->hdr.when_written.zone,NULL)
 			,age_of_posted_item(age, sizeof(age), msg->hdr.when_written.time - (smb_tzutc(msg->hdr.when_written.zone) * 60)));
-		CRLF;
+		if(column)
+			CRLF;
+		CRLF;	 // use a custom header file if you don't want a blank line separating the header and body
 	}
 	for(i=0;i<msg->total_hfields;i++) {
 		if(msg->hfield[i].type==SENDER)
@@ -170,7 +172,6 @@ void sbbs_t::show_msghdr(smbmsg_t* msg)
 			bprintf(text[ForwardedFrom],sender
 				,timestr(*(time32_t *)msg->hfield_dat[i])); 
 	}
-	CRLF;
 }
 
 /****************************************************************************/
-- 
GitLab