diff --git a/src/www_msgs.c b/src/www_msgs.c
index cfe9671..1da264e 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -724,7 +724,9 @@ static char *www_wordwrap(char *content, int cutoff) {
 			if (content[i+1] == ' ') {
 				content[at++] = '\r';
 			} else {
-				content[at++] = ' ';
+				if (content[at-1] != '\r') {
+					content[at++] = ' ';
+				}
 			}
 		} else if (content[i] == '\r' && content[i+1] == '\r') {
 			content[at++] = '\r';