diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 70aa7c8f3a76c58b37ac8b5dd5b6895dafad3da5..d6da5cc4c104736227ed0d72b0d9d35b56c6f761 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -2201,13 +2201,19 @@ js_html_encode(JSContext *cx, uintN argc, jsval *arglist)
 								: tm.tm_hour>12 ? tm.tm_hour-12
 								: tm.tm_hour, tm.tm_min, tm.tm_hour>11 ? "pm":"am");
 						break;
-						
 					case 'L':
 						currrow=0;
 						hpos=0;
 						outbuf[j++]='\r';
 						outbuf[j++]='\n';
 						break;
+					case '/':	// conditional new-line
+						if(hpos > 0) {
+							hpos=0;
+							outbuf[j++]='\r';
+							outbuf[j++]='\n';
+						}
+						break;
 					case ']':
 						currrow++;
 						if(hpos!=0 && tmpbuf[i+2]!=CR && !(tmpbuf[i+2]==CTRL_A && tmpbuf[i+3]=='['))