diff --git a/src/www_msgs.c b/src/www_msgs.c
index bf69506..56e70a3 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -724,7 +724,7 @@ static char *www_wordwrap(char *content, int cutoff) {
 			if (content[i+1] == ' ') {
 				content[at++] = '\r';
 			} else {
-				if (at > 0 && content[at-1] != '\r') {
+				if (at > 0 && content[at-1] != '\r' && content[at-1] != ' ') {
 					content[at++] = ' ';
 				}
 			}
@@ -733,9 +733,6 @@ 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];
 		}
 	}