diff --git a/web/root/msgs/attachments.ssjs b/web/root/msgs/attachments.ssjs
index cd0b308f193d643016e4f6886fc4d47e357bd6bc..f49a07ae5caa1cdb9232d49333d7eacd57cd2be7 100644
--- a/web/root/msgs/attachments.ssjs
+++ b/web/root/msgs/attachments.ssjs
@@ -24,7 +24,7 @@ hdr=msgbase.get_msg_header(false,id);
 if(hdr==undefined) {
 	error("No such message!");
 }
-body=msgbase.get_msg_body(false,id,true,true);
+body=msgbase.get_msg_body(false,id);
 if(path==undefined) {
 	error("Can not read message body!");
 }
diff --git a/web/root/msgs/inline.ssjs b/web/root/msgs/inline.ssjs
index 0b43f9730a6c50819c2de2cdbd6bcbf36becd894..bcd93b0ea58a60e6958a4562c12535daae10e8d5 100644
--- a/web/root/msgs/inline.ssjs
+++ b/web/root/msgs/inline.ssjs
@@ -24,7 +24,7 @@ hdr=msgbase.get_msg_header(false,id);
 if(hdr==undefined) {
 	error("No such message!");
 }
-body=msgbase.get_msg_body(false,id,true,true);
+body=msgbase.get_msg_body(false,id);
 if(path==undefined) {
 	error("Can not read message body!");
 }
diff --git a/web/root/msgs/msg.ssjs b/web/root/msgs/msg.ssjs
index 00220ac65f582ac766545b0470ace2cc24b94ed2..a1b73807e35f9f5aaa7b4be48a3dac58179b4d3b 100644
--- a/web/root/msgs/msg.ssjs
+++ b/web/root/msgs/msg.ssjs
@@ -30,7 +30,7 @@ template.idx=msgbase.get_msg_index(false,m);
 if(sub=='mail' && template.idx.to!=user.number)
 	error("You can only read e-mail messages addressed to yourself!");
 template.hdr=msgbase.get_msg_header(false,m);
-template.body=msgbase.get_msg_body(false,m,true,true);
+template.body=msgbase.get_msg_body(false,m);
 
 msg=mime_decode(template.hdr,template.body);
 template.body=msg.body;
diff --git a/web/root/msgs/msgframe.ssjs b/web/root/msgs/msgframe.ssjs
index d87c23b2e288d0d9370fc4ce424d6969534da389..b3a8f3c90e411ad1cd78ea6caecd40b3d15aa223 100644
--- a/web/root/msgs/msgframe.ssjs
+++ b/web/root/msgs/msgframe.ssjs
@@ -38,7 +38,7 @@ else {
 }
 
 template.hdr=msgbase.get_msg_header(false,id);
-template.body=msgbase.get_msg_body(false,id,true,true);
+template.body=msgbase.get_msg_body(false,id);
 
 msg=mime_decode(template.hdr,template.body);
 template.body=msg.body;
diff --git a/web/root/msgs/msgs.ssjs b/web/root/msgs/msgs.ssjs
index 761cad1dc0aba0b199f5ff56eb58c7fa3a1b482c..dd63e7519437057b64c2f9bbb9d90a5ef1740d70 100644
--- a/web/root/msgs/msgs.ssjs
+++ b/web/root/msgs/msgs.ssjs
@@ -113,7 +113,7 @@ for(displayed=0;displayed<max_messages && last_offset >= 0;last_offset--) {
 	if(hdr.subject=='')
 		hdr.subject="-- No Subject --";
 	template.messages[displayed.toString()]=hdr;
-	template.messages[displayed.toString()].attachments=count_attachments(msgarray[last_offset].hdr,msgbase.get_msg_body(true,msgarray[last_offset].offset,true,true));
+	template.messages[displayed.toString()].attachments=count_attachments(msgarray[last_offset].hdr,msgbase.get_msg_body(true,msgarray[last_offset].offset));
 	template.messages[displayed.toString()].offset=msgarray[last_offset].offset;
 	displayed++;
 }
diff --git a/web/root/msgs/reply.ssjs b/web/root/msgs/reply.ssjs
index 0daad14791a5498bbf6efe35050f12a911c69487..4de903af9a1d085758645dca163fbabab46b35f9 100644
--- a/web/root/msgs/reply.ssjs
+++ b/web/root/msgs/reply.ssjs
@@ -36,7 +36,7 @@ else
 
 template.number=hdr.number;
 
-template.body=msgbase.get_msg_body(false,parseInt(http_request.query.reply_to),true,true);
+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);
 }