diff --git a/src/www_msgs.c b/src/www_msgs.c
index 255f1d5..d0a175d 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -716,17 +716,13 @@ static char *www_wordwrap(char *content, int cutoff) {
 				last_space = &ret[at];
 			}
 			at++;
-			ret[at] = '\0';
+			
 		} else {
-			ret[at] = ' ';
-			last_space = &ret[at++];
-			ret[at] = '\0';
+			ret[at++] = content[i];
 		}
+		ret[at] = '\0';
 		
-		if (content[i] == '\r' && content[i+1] == '\r') {
-			i+=2;
-			ret[at++] = '\r';
-			ret[at] = '\0';
+		if (content[i] == '\r') {
 			line_count = 0;
 			last_space = NULL;
 		} else if (line_count == cutoff) {