diff --git a/src/sbbs3/wordwrap.c b/src/sbbs3/wordwrap.c
index 2b9f143f69e7288e37e6ba3497e0d389d06f4c08..59dc417f193073e41a3c07c16d70d83e9df9db9c 100644
--- a/src/sbbs3/wordwrap.c
+++ b/src/sbbs3/wordwrap.c
@@ -376,14 +376,14 @@ fprintf(stderr, "CR\n");
 							continue;
 						}
 						else {		/* Not a hard CR... add space if needed */
-							if(ocol > 1 && (l<1 || !isspace((unsigned char)linebuf[l-1]))) {
+							if(ocol > prefix_len+1 && (l<1 || !isspace((unsigned char)linebuf[l-1]))) {
 								linebuf[l++]=' ';
 								ocol++;
 							}
 						}
 					}
 					else {			/* Not a hard CR... add space if needed */
-						if(ocol > 1 && (l<1 || !isspace((unsigned char)linebuf[l-1]))) {
+						if(ocol > prefix_len+1 && (l<1 || !isspace((unsigned char)linebuf[l-1]))) {
 							linebuf[l++]=' ';
 							ocol++;
 						}