diff --git a/src/sbbs3/echocfg.c b/src/sbbs3/echocfg.c
index b74a912cb6df2a52b5dc2a9c385dd7349ac54fce..a1d715927f9480379df975ac450b746db2f12a9a 100644
--- a/src/sbbs3/echocfg.c
+++ b/src/sbbs3/echocfg.c
@@ -693,6 +693,8 @@ int main(int argc, char **argv)
 						"in Message Base",misc&STORE_KLUDGE ? "Yes":"No");
 					sprintf(opt[i++],"%-50.50s%-3.3s","Allow Nodes to Add Areas "
 						"in the AREAS.BBS List",misc&ELIST_ONLY?"No":"Yes");
+					sprintf(opt[i++],"%-50.50s%-3.3s","Strip Line Feeds "
+						"From Outgoing Messages",misc&STRIP_LF ? "Yes":"No");
 					sprintf(opt[i++],"%-50.50s%-3.3s","Kill/Ignore Empty NetMail "
 						"Messages",misc&KILL_EMPTY_MAIL ? "Yes":"No");
 					opt[i][0]=0;
@@ -725,8 +727,13 @@ int main(int argc, char **argv)
 							misc^=ELIST_ONLY;
 							break;
 						case 7:
+							misc^=STRIP_LF;
+							break;
+						case 8:
 							misc^=KILL_EMPTY_MAIL;
-							} }
+							break;
+					} 
+				}
 				break;
 			case 8:
 	uifc.helpbuf=
@@ -1050,6 +1057,9 @@ int main(int argc, char **argv)
 					fprintf(stream,"FLO_MAILER\n");
 				if(misc&ELIST_ONLY)
 					fprintf(stream,"ELIST_ONLY\n");
+				if(misc&STRIP_LF)
+					fprintf(stream,"STRIP_LF\n");
+
 				if(cfg.areafile[0])
 					fprintf(stream,"AREAFILE %s\n",cfg.areafile);
 				if(cfg.logfile[0])
diff --git a/src/sbbs3/rechocfg.c b/src/sbbs3/rechocfg.c
index ef8d84fa0623dc699adb1993b3a1fbea9ee2f661..141695f3eb99d7e1efdca5c46f4ca454b22bcf69 100644
--- a/src/sbbs3/rechocfg.c
+++ b/src/sbbs3/rechocfg.c
@@ -287,8 +287,8 @@ void read_echo_cfg()
 			misc|=SECURE;
 			continue; }
 
-		if(!stricmp(tmp,"CHECKMEM")) {
-			misc|=CHECKMEM;
+		if(!stricmp(tmp,"STRIP_LF")) {
+			misc|=STRIP_LF;
 			continue; }
 
 		if(!stricmp(tmp,"STORE_SEENBY")) {
diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index dc5918fd1523c01662f85651cfc0a582ff53c4c2..8ac17a0c14c4b8655560076eede49894f0842019 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -3675,8 +3675,10 @@ void export_echomail(char *sub_code,faddr_t addr)
 						if(!buf[l])
 							break;
 						continue; }
-					if(buf[l]==LF)	/* Ignore line feeds */
+					
+					if(misc&STRIP_LF && buf[l]==LF)	/* Ignore line feeds */
 						continue;
+
 					if(cr) {
 						if(buf[l]=='-' && buf[l+1]=='-'
 							&& buf[l+2]=='-'
@@ -4267,10 +4269,6 @@ int main(int argc, char **argv)
 			if(fmsgbuf) {
 				FREE(fmsgbuf);
 				fmsgbuf=0; }
-#if 0
-			if(misc&CHECKMEM)
-				checkmem();
-#endif
 			if(!fread(&ch,1,1,fidomsg)) 		 /* Message type (0200h) */
 				break;
 			if(ch!=02)
diff --git a/src/sbbs3/sbbsecho.h b/src/sbbs3/sbbsecho.h
index af06de9d80a2d57f84861f81d66fa2451d48b618..6f71490bd9a2811ea3f40d10bcd259b55a6fdf5c 100644
--- a/src/sbbs3/sbbsecho.h
+++ b/src/sbbs3/sbbsecho.h
@@ -18,7 +18,7 @@
 #define IGNORE_MSGPTRS	(1L<<9)
 #define UPDATE_MSGPTRS	(1L<<10)
 #define LEAVE_MSGPTRS	(1L<<11)
-#define CHECKMEM		(1L<<12)		/* Display available memory */
+#define STRIP_LF		(1L<<12)		/* Stripl line-feeds from outgoing messages */
 #define ASCII_ONLY		(1L<<13)
 #define LOGFILE 		(1L<<14)
 #define REPORT			(1L<<15)