diff --git a/web/root/msgs/msg.ssjs b/web/root/msgs/msg.ssjs
index 93fde236b1a568cda522435b139a7a252d5d346d..36f41dd1f8c42737d87aeb7b96dd4faeb8a07ad2 100644
--- a/web/root/msgs/msg.ssjs
+++ b/web/root/msgs/msg.ssjs
@@ -112,7 +112,7 @@ if(msg.type=="plain") {
     }
     /* Plain text */
     else {
-        template.body=word_wrap(template.body,80);
+        template.body=word_wrap(template.body);
         template.body=html_encode(template.body,true,false,false,false);
     }
 }
diff --git a/web/root/msgs/msgframe.ssjs b/web/root/msgs/msgframe.ssjs
index 376c1c9bc0189f596ad78bdb21fb7172a192a0ca..dd1294fdd36da43721f0766135c2b8713d73a6d0 100644
--- a/web/root/msgs/msgframe.ssjs
+++ b/web/root/msgs/msgframe.ssjs
@@ -49,7 +49,7 @@ if(msg.type=="plain") {
 	}
 	/* Plain text */
 	else {
-		template.body=word_wrap(template.body,80);
+		template.body=word_wrap(template.body);
 		template.body=html_encode(template.body,true,false,false,false);
 	}
 	if(template.hdr != null)  {
diff --git a/web/root/msgs/reply.ssjs b/web/root/msgs/reply.ssjs
index fabe3f50dcbc143db9dbceba215efca17f05a334..376e5868b4b808113c5da1e74c85c635d992d933 100644
--- a/web/root/msgs/reply.ssjs
+++ b/web/root/msgs/reply.ssjs
@@ -60,7 +60,9 @@ template.number=hdr.number;
 
 template.body=msgbase.get_msg_body(false,parseInt(http_request.query.reply_to),true);
 if(this.word_wrap != undefined)  {
-	template.body=quote_msg(word_wrap(template.body,79),79);
+	// quote_msg adds three chars to each line.  Re-wrap to 76 chars...
+	// with the extra three, we're still under 80 *.
+	template.body=quote_msg(word_wrap(template.body,76),79);
 }
 else  {
 	template.body=template.body.replace(/^(.)/mg,"> $1");
diff --git a/web/root/msgs/savemsg.ssjs b/web/root/msgs/savemsg.ssjs
index d3857c0dc5c1dd28ee865524c537ff21e55e59dc..2fd38dc45843f8d147d38446b871bfebe243663c 100644
--- a/web/root/msgs/savemsg.ssjs
+++ b/web/root/msgs/savemsg.ssjs
@@ -38,7 +38,7 @@ else {
 
 var body=http_request.query.body[0];
 body=body.replace(/([^\r])\n/g,"$1\r\n");
-body=word_wrap(body, 80);
+body=word_wrap(body);
 
 hdrs.from=user.alias;
 hdrs.from_ext=user.number;
diff --git a/web/root/rss.ssjs b/web/root/rss.ssjs
index a9f0e93b571a903147bae0e7e688d6b8fa427efd..36c8f1b4a0e98aa857c6bb2400b07f3893634009 100644
--- a/web/root/rss.ssjs
+++ b/web/root/rss.ssjs
@@ -84,7 +84,7 @@ if(http_request.query["item"]) {
 		}
 		/* Plain text */
 		else {
-			template.body=word_wrap(template.body,80);
+			template.body=word_wrap(template.body);
 			template.body=html_encode(template.body,true,false,false,false);
 		}
 	}