diff --git a/src/www_msgs.c b/src/www_msgs.c
index da8dc75..3761b5e 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -791,7 +791,11 @@ static char *www_wordwrap(char *content, int cutoff) {
 				if (at > 0 && content[at-1] != '\r' && content[at-1] != ' ' && cutoff - line_count < z) {
 					content[at++] = ' ';
 					line_count++;
-				} 
+				} else {
+					content[at++] = '\r';
+					line_count = 0;
+					quote_line = 0;						
+				}
 			} else if (quote_line == 1) {
 				content[at++] = '\r';
 				line_count = 0;