diff --git a/www_email.c b/www_email.c
index 5a429eb..f7bdc3b 100644
--- a/www_email.c
+++ b/www_email.c
@@ -428,12 +428,12 @@ char *www_email_display(struct user_record *user, int email) {
 		chars = 0;
 		
 		for (i=0;i<strlen(body);i++) {
-			if (body[i] == '\r' || chars == 78) {
+			if (body[i] == '\r') {
 				sprintf(buffer, "\n&gt; ");
-				if (chars == 78) {
-					sprintf(buffer, "\n&gt; %c", body[i]);
-					chars = 1;
-				}
+				chars = 0;
+			} else if (chars == 78) {
+				sprintf(buffer, "\n&gt; %c", body[i]);
+				chars = 1;
 			} else {
 				sprintf(buffer, "%c", body[i]);
 				chars ++;
diff --git a/www_msgs.c b/www_msgs.c
index 2851537..25bf0a7 100644
--- a/www_msgs.c
+++ b/www_msgs.c
@@ -512,12 +512,12 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
 			chars = 0;
 			
 			for (i=0;i<strlen(body);i++) {
-				if (body[i] == '\r' || chars == 78) {
+				if (body[i] == '\r') {
 					sprintf(buffer, "\n&gt; ");
-					if (chars == 78) {
-						sprintf(buffer, "\n&gt; %c", body[i]);
-						chars = 1;
-					}
+					chars = 0;
+				} else if (chars == 78) {
+					sprintf(buffer, "\n&gt; %c", body[i]);
+					chars = 1;
 				} else {
 					sprintf(buffer, "%c", body[i]);
 					chars ++;