diff --git a/src/www_msgs.c b/src/www_msgs.c
index b68930d..cfe9671 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -707,9 +707,6 @@ static char *www_wordwrap(char *content, int cutoff) {
 	char *ret;
 	int at = 0;
 	int extra = 0;
-	if (ret == NULL) {
-		return NULL;
-	}
 
 	for (i=0;i<len;i++) {
 		if (content[i] == '\n') {
@@ -717,16 +714,20 @@ static char *www_wordwrap(char *content, int cutoff) {
 		}
 		content[at++] = content[i];
 	}
+
 	content[at] = '\0';
 	at = 0;
 	len = strlen(content);
-	for (i=0;i<len-1;i++) {
 
+	for (i=0;i<len-1;i++) {
 		if (content[i] == '\r' && content[i+1] != '\r') {
-			content[at++] = ' ';
-			content[at++] = content[i+1];
-			i++;
+			if (content[i+1] == ' ') {
+				content[at++] = '\r';
+			} else {
+				content[at++] = ' ';
+			}
 		} else if (content[i] == '\r' && content[i+1] == '\r') {
+			content[at++] = '\r';
 			content[at++] = '\r';
 			i++;
 		} else {
@@ -735,10 +736,16 @@ static char *www_wordwrap(char *content, int cutoff) {
 	}
 	//content[at++] = content[i];
 	content[at] = '\0';
+
+
 	at = 0;
 
 	len = strlen(content);
 	ret = (char *)malloc(len + 1);
+	if (ret == NULL) {
+		return NULL;
+	}
+	
 	for (i=0;i<len;i++) {
 		if (content[i] != '\r') {
 			ret[at] = content[i];