diff --git a/src/sbbs3/writemsg.cpp b/src/sbbs3/writemsg.cpp
index 6b10ffd292737eb601efae12b1cf865e386eee02..397aed951b2a95b7654c799a23b78663da17c56f 100644
--- a/src/sbbs3/writemsg.cpp
+++ b/src/sbbs3/writemsg.cpp
@@ -315,12 +315,10 @@ bool sbbs_t::writemsg(char *fname, char *top, char *title, long mode, int subnum
 	}
 
 
-	else if((online==ON_LOCAL && cfg.node_misc&NM_LCL_EDIT && cfg.node_editor[0])
-		|| useron.xedit) {
+	else if(useron.xedit) {
 
 		if(useron.xedit && cfg.xedit[useron.xedit-1]->misc&IO_INTS) {
-			if(online==ON_REMOTE)
-				ex_mode|=(EX_OUTR|EX_INR);
+			ex_mode|=(EX_OUTR|EX_INR);
 			if(cfg.xedit[useron.xedit-1]->misc&WWIVCOLOR)
 				ex_mode|=EX_WWIV; 
 		}
@@ -335,21 +333,12 @@ bool sbbs_t::writemsg(char *fname, char *top, char *title, long mode, int subnum
 			qlen=flength(msgtmp);
 			qtime=fdate(msgtmp); 
 		}
-		if(online==ON_LOCAL) {
-			if(cfg.node_misc&NM_LCL_EDIT && cfg.node_editor[0])
-				external(cmdstr(cfg.node_editor,msgtmp,nulstr,NULL)
-					,0,cfg.node_dir); 
-			else
-				external(cmdstr(cfg.xedit[useron.xedit-1]->lcmd,msgtmp,nulstr,NULL)
-					,ex_mode,cfg.node_dir); 
-		}
 
-		else {
-			CLS;
-			rioctl(IOCM|PAUSE|ABORT);
-			external(cmdstr(cfg.xedit[useron.xedit-1]->rcmd,msgtmp,nulstr,NULL),ex_mode,cfg.node_dir);
-			rioctl(IOSM|PAUSE|ABORT); 
-		}
+		CLS;
+		rioctl(IOCM|PAUSE|ABORT);
+		external(cmdstr(cfg.xedit[useron.xedit-1]->rcmd,msgtmp,nulstr,NULL),ex_mode,cfg.node_dir);
+		rioctl(IOSM|PAUSE|ABORT); 
+
 		checkline();
 		if(!fexistcase(msgtmp) || !online
 			|| (linesquoted && qlen==flength(msgtmp) && qtime==fdate(msgtmp))) {
@@ -592,10 +581,8 @@ ulong sbbs_t::msgeditor(char *buf, char *top, char *title)
 	char	path[MAX_PATH+1];
     ulong	l,m;
 
-	if(online==ON_REMOTE) {
-		rioctl(IOCM|ABORT);
-		rioctl(IOCS|ABORT); 
-	}
+	rioctl(IOCM|ABORT);
+	rioctl(IOCS|ABORT); 
 
 	maxlines=cfg.level_linespermsg[useron.level];
 
@@ -612,8 +599,7 @@ ulong sbbs_t::msgeditor(char *buf, char *top, char *title)
 			for(i=0;i<lines;i++)
 				free(str[i]);
 			free(str);
-			if(online==ON_REMOTE)
-				rioctl(IOSM|ABORT);
+			rioctl(IOSM|ABORT);
 			return(0); 
 		}
 		for(i=0;i<79 && l<m;i++,l++) {
@@ -664,8 +650,7 @@ ulong sbbs_t::msgeditor(char *buf, char *top, char *title)
 		CRLF; 
 	}
 	SYNC;
-	if(online==ON_REMOTE)
-		rioctl(IOSM|ABORT);
+	rioctl(IOSM|ABORT);
 	while(online && !done) {
 		checkline();
 		if(line==lines) {
@@ -901,8 +886,7 @@ void sbbs_t::editfile(char *str)
 		if(cfg.xedit[useron.xedit-1]->misc&XTRN_SH)
 			mode|=EX_SH;
 		if(cfg.xedit[useron.xedit-1]->misc&IO_INTS) {
-			if(online==ON_REMOTE)
-				mode|=(EX_OUTR|EX_INR);
+			mode|=(EX_OUTR|EX_INR);
 			if(cfg.xedit[useron.xedit-1]->misc&WWIVCOLOR)
 				mode|=EX_WWIV; 
 		}