diff --git a/core/doctype/communication/communication.py b/core/doctype/communication/communication.py
index 1544f28c8a..20e44b3930 100644
--- a/core/doctype/communication/communication.py
+++ b/core/doctype/communication/communication.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import webnotes
+from webnotes.utils import scrub_urls
 
 class DocType():
 	def __init__(self, doc, doclist=[]):
@@ -108,6 +109,7 @@ def send_comm_email(d, name, sent_via=None, print_html=None, attachments='[]', s
 		mail.cc.append(webnotes.conn.get_value("Profile", webnotes.session.user, "email"))
 	
 	if print_html:
+		print_html = scrub_urls(print_html)
 		mail.add_attachment(name.replace(' ','').replace('/','-') + '.html', print_html)
 
 	for a in loads(attachments):
diff --git a/webnotes/utils/__init__.py b/webnotes/utils/__init__.py
index 2df91cd98d..6f30274107 100644
--- a/webnotes/utils/__init__.py
+++ b/webnotes/utils/__init__.py
@@ -933,7 +933,7 @@ def expand_relative_urls(html):
 def quote_urls(html):
 	def _quote_url(match):
 		groups = list(match.groups())
-		groups[2] = urllib.quote(groups[2], safe="/:")
+		groups[2] = urllib.quote(groups[2], safe="~@#$&()*!+=:;,.?/'")
 		return "".join(groups)
 	return re.sub('(href|src){1}([\s]*=[\s]*[\'"]?)((?:http)[^\'">]+)([\'"]?)',
 		_quote_url, html)