diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index a94163ed20..12deec3427 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -324,7 +324,7 @@ def add_attachment(fname, fcontent, content_type=None,
 	# Set the filename parameter
 	if fname:
 		attachment_type = 'inline' if inline else 'attachment'
-		part.add_header(b'Content-Disposition', attachment_type, filename=fname.encode('utf=8'))
+		part.add_header(b'Content-Disposition', attachment_type, filename=text_type(fname))
 	if content_id:
 		part.add_header(b'Content-ID', '<{0}>'.format(content_id))