diff --git a/py/webnotes/utils/email_lib/form_email.py b/py/webnotes/utils/email_lib/form_email.py
index f4508998f5..65f0b35417 100644
--- a/py/webnotes/utils/email_lib/form_email.py
+++ b/py/webnotes/utils/email_lib/form_email.py
@@ -147,12 +147,13 @@ class FormEmail:
 
 		# footer
 		footer = get_footer()
-		if footer: 
+		if footer:
+			footer = footer.encode('utf-8')
 			html_message += footer
 			text_message += footer
 
 		# message as text
-		self.email.set_text(html2text(text_message))
+		self.email.set_text(html2text(unicode(text_message, 'utf-8')))
 		self.email.set_html(html_message)
 					
 	def send(self):
@@ -181,4 +182,4 @@ class FormEmail:
 			self.email.cc = [self.cc]
 		
 		self.email.send(send_now=1)
-		webnotes.msgprint('Sent')
\ No newline at end of file
+		webnotes.msgprint('Sent')
diff --git a/py/webnotes/utils/email_lib/html2text.py b/py/webnotes/utils/email_lib/html2text.py
index 6130552f81..5529ba781c 100644
--- a/py/webnotes/utils/email_lib/html2text.py
+++ b/py/webnotes/utils/email_lib/html2text.py
@@ -469,7 +469,7 @@ def html2text_file(html, out=wrapwrite, baseurl=''):
     return h.close()
 
 def html2text(html, baseurl=''):
-    txt = html2text_file(html, None, baseurl)    
+    txt = html2text_file(html, None, baseurl)
     return optwrap(txt) #.encode('utf-8'))    
 
 if __name__ == "__main__":
diff --git a/py/webnotes/utils/email_lib/send.py b/py/webnotes/utils/email_lib/send.py
index a33b917568..ff906737d1 100644
--- a/py/webnotes/utils/email_lib/send.py
+++ b/py/webnotes/utils/email_lib/send.py
@@ -61,9 +61,9 @@ class EMail:
 			Attach message in the text portion of multipart/alternative
 		"""
 		from email.mime.text import MIMEText
-		#if type(message) is not unicode:
-		#	message = unicode(message, 'utf-8')
-		part = MIMEText(message.encode('utf-8'), 'plain', 'UTF-8')		
+		if isinstance(message, unicode):
+			message = message.encode('utf-8')
+		part = MIMEText(message, 'plain', 'utf-8')		
 		self.msg_multipart.attach(part)
 		
 	def set_html(self, message):
@@ -71,9 +71,9 @@ class EMail:
 			Attach message in the html portion of multipart/alternative
 		"""
 		from email.mime.text import MIMEText		
-		#if type(message) is not unicode:
-		#	message = unicode(message, 'utf-8')
-		part = MIMEText(message.encode('utf-8'), 'html')
+		if isinstance(message, unicode):
+			message = message.encode('utf-8')
+		part = MIMEText(message, 'html', 'utf-8')
 		self.msg_multipart.attach(part)
 	
 	def set_message(self, message, mime_type='text/html', as_attachment=0, filename='attachment.html'):