diff --git a/frappe/__init__.py b/frappe/__init__.py
index fe008f82c9..1b8881a253 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1479,4 +1479,4 @@ def safe_decode(param, encoding = 'utf-8'):
 	
 def parse_json(val):
 	from frappe.utils import parse_json
-	return parse_json(val)
+	return parse_json(val)
\ No newline at end of file
diff --git a/frappe/email/queue.py b/frappe/email/queue.py
index e20b221a6f..80fce6ab1d 100755
--- a/frappe/email/queue.py
+++ b/frappe/email/queue.py
@@ -6,7 +6,7 @@ from six.moves import range
 import frappe
 from six.moves import html_parser as HTMLParser
 import smtplib, quopri, json
-from frappe import msgprint, throw, _
+from frappe import msgprint, throw, _, safe_decode
 from frappe.email.smtp import SMTPServer, get_outgoing_email_account
 from frappe.email.email_body import get_email, get_formatted_html, add_attachment
 from frappe.utils.verified_command import get_signed_params, verify_request
@@ -510,7 +510,7 @@ def prepare_message(email, recipient, recipients_list):
 		message = message.replace("<!--recipient-->", recipient)
 
 	message = (message and message.encode('utf8')) or ''
-	message = frappe.safe_decode(message)
+	message = safe_decode(message)
 	if not email.attachments:
 		return message