diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js
index f25ef526..9f0bfc31 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js
@@ -509,7 +509,7 @@ cellspacing=0 cellpadding=0>
 <tr>
 <td abswidth=6>
 <td abswidth=93 absheight=26>
-<table href="wtv-mail:/sendmail?discuss=true&message_subject=${encodeURIComponent("Re: " + response.article.headers.SUBJECT)}&group=${response.article.headers.NEWSGROUPS}&discuss-prefix=${service_name}&article=${request_headers.query.article}"
+<table href="wtv-mail:/sendmail?discuss=true&message_subject=${escape("Re: " + response.article.headers.SUBJECT)}&group=${response.article.headers.NEWSGROUPS}&discuss-prefix=${service_name}&article=${request_headers.query.article}"
 cellspacing=0 cellpadding=0>
 <tr>
 <td abswidth=5>
diff --git a/zefie_wtvp_minisrv/includes/classes/WTVShared.js b/zefie_wtvp_minisrv/includes/classes/WTVShared.js
index f2c27c21..5c579bf9 100644
--- a/zefie_wtvp_minisrv/includes/classes/WTVShared.js
+++ b/zefie_wtvp_minisrv/includes/classes/WTVShared.js
@@ -3,6 +3,7 @@
  */
 const CryptoJS = require('crypto-js');
 const WTVShenanigans = require('./WTVShenanigans.js');
+const e = require('express');
 
 class WTVShared {
 
@@ -53,6 +54,14 @@ class WTVShared {
         }
     }
 
+    escape(string) {
+        return encodeURIComponent(string).replace(/'/g, "%27").replace(/"/g, "%22");
+    }
+
+    unescape(string) {
+        return decodeURIComponent(string.replace(/\+/g, " "));
+    }
+
     /**
      * convert a CryptoJS.lib.WordArray to a Javascript Buffer
      * @param {CryptoJS.lib.WordArray} wordArray