diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
index 21ee7192..cda3e76b 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
@@ -290,7 +290,7 @@ ${html_entities.encode((message.subject) ? message.subject : '(No subject)')}
                     });
                 }
                 data += `
-${html_entities.encode(message.body).replace("\n", "<br>")}
+${html_entities.encode(message.body).replace(/\n/gi, "<br>").replace(/\r/gi, "").replace(/&apos;/gi, "'")}
 <br>
 <br>`;
                 if (message.signature) {