diff --git a/node/utils/ExportHtml.js b/node/utils/ExportHtml.js
index ef85d51f..c699c411 100644
--- a/node/utils/ExportHtml.js
+++ b/node/utils/ExportHtml.js
@@ -292,7 +292,7 @@ function getHTMLFromAtext(pad, atext)
         var url = urlData[1];
         var urlLength = url.length;
         processNextChars(startIndex - idx);
-        assem.append('<a href="' + url.replace(/\"/g, '&quot;') + '">');
+        assem.append('<a href="' + _escapeHTML(url) + '">');
         processNextChars(urlLength);
         assem.append('</a>');
       });
diff --git a/static/js/domline.js b/static/js/domline.js
index b0fbcc8c..3456419c 100644
--- a/static/js/domline.js
+++ b/static/js/domline.js
@@ -162,7 +162,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
         {
           href = "http://"+href;
         }
-        extraOpenTags = extraOpenTags + '<a href="' + href.replace(/\"/g, '&quot;') + '">';
+        extraOpenTags = extraOpenTags + '<a href="' + domline.escapeHTML(href) + '">';
         extraCloseTags = '</a>' + extraCloseTags;
       }
       if (simpleTags)
diff --git a/static/js/domline_client.js b/static/js/domline_client.js
index a152412c..cac753b9 100644
--- a/static/js/domline_client.js
+++ b/static/js/domline_client.js
@@ -158,7 +158,7 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
     {
       if (href)
       {
-        extraOpenTags = extraOpenTags + '<a href="' + href.replace(/\"/g, '&quot;') + '">';
+        extraOpenTags = extraOpenTags + '<a href="' + domline.escapeHTML(href) + '">';
         extraCloseTags = '</a>' + extraCloseTags;
       }
       if (simpleTags)
diff --git a/static/js/pad_utils.js b/static/js/pad_utils.js
index bd028485..9083fa9b 100644
--- a/static/js/pad_utils.js
+++ b/static/js/pad_utils.js
@@ -187,7 +187,7 @@ var padutils = {
         var startIndex = urls[j][0];
         var href = urls[j][1];
         advanceTo(startIndex);
-        pieces.push('<a ', (target ? 'target="' + target + '" ' : ''), 'href="', href.replace(/\"/g, '&quot;'), '">');
+        pieces.push('<a ', (target ? 'target="' + target + '" ' : ''), 'href="', padutils.escapeHtml(href), '">');
         advanceTo(startIndex + href.length);
         pieces.push('</a>');
       }