diff --git a/src/www_blog.c b/src/www_blog.c
index add6462..43b2ac1 100644
--- a/src/www_blog.c
+++ b/src/www_blog.c
@@ -62,7 +62,7 @@ char *www_blog() {
             strcat(page, buffer);
             len += strlen(buffer);
 
-            sprintf(buffer, "<div class=\"blog-entry\">");
+            sprintf(buffer, "<div class=\"blog-entry\"><p>");
             if (len + strlen(buffer) > max_len - 1) {
                 max_len += 4096;
                 page = (char *)realloc(page, max_len);
@@ -72,13 +72,22 @@ char *www_blog() {
 
             for (j=0;j<strlen(blog_entries[i]->body);j++) {
                 if (blog_entries[i]->body[j] == '\r') {
-                    sprintf(buffer, "<br />");
-                    if (len + strlen(buffer) > max_len - 1) {
-                        max_len += 4096;
-                        page = (char *)realloc(page, max_len);
+                    if (blog_entries[i]->body[j+1] == '\r') {
+                        sprintf(buffer, "</p><p>");
+                        if (len + strlen(buffer) > max_len - 1) {
+                            max_len += 4096;
+                            page = (char *)realloc(page, max_len);
+                        }
+                        strcat(page, buffer);
+                        len += strlen(buffer);  
+                    } else {
+                        if (len + 1 > max_len - 1) {
+                            max_len += 4096;
+                            page = (char *)realloc(page, max_len);                        
+                        }
+                        page[len++] = ' ';
+                        page[len] = '\0';                        
                     }
-                    strcat(page, buffer);
-                    len += strlen(buffer);                    
                 } else {
                     if (len + 1 > max_len - 1) {
                         max_len += 4096;
@@ -88,7 +97,7 @@ char *www_blog() {
                     page[len] = '\0';
                 }
             }
-            sprintf(buffer, "</div>");
+            sprintf(buffer, "</p></div>");
             if (len + strlen(buffer) > max_len - 1) {
                 max_len += 4096;
                 page = (char *)realloc(page, max_len);
diff --git a/src/www_msgs.c b/src/www_msgs.c
index 25d8bf6..52adc50 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -710,6 +710,22 @@ static char *www_wordwrap(char *content, int cutoff) {
 	if (ret == NULL) {
 		return NULL;
 	}
+	at = 0;
+	for (i=0;i<len;i++) {
+		if (content[i] == '\r' && content[i+1] != '\r') {
+			content[at++] = ' ';
+			content[at++] = content[i+1];
+			i++;
+		} else if (content[i] == '\r' && content[i+1] == '\r') {
+			content[at++] = '\r';
+			i++;
+		} else {
+			content[at++] = content[i];
+		}
+	}
+
+	content[at] = '\0';
+	at = 0;
 
 	for (i=0;i<len;i++) {
 		if (content[i] == '\n') {