diff --git a/src/www_msgs.c b/src/www_msgs.c
index 2205980..bf69506 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -733,6 +733,9 @@ static char *www_wordwrap(char *content, int cutoff) {
 			content[at++] = '\r';
 			i++;
 		} else {
+			if (content[i] == ' ' && at > 0 && content[at-1] == '\r') {
+				continue;
+			}
 			content[at++] = content[i];
 		}
 	}