From 93a3921f1dbd568dde49879ba5d72b9485de97a1 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Thu, 8 Mar 2018 17:11:52 +0530
Subject: [PATCH] [FIX] safe decode for 3

---
 frappe/email/receive.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index 585aeb6ef7..b236ad8255 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -396,10 +396,10 @@ class Email:
 		_subject = decode_header(self.mail.get("Subject", "No Subject"))
 		self.subject = _subject[0][0] or ""
 		if _subject[0][1]:
-			self.subject = self.subject.decode(_subject[0][1])
+			self.subject = safe_decode(self.subject, _subject[0][1])
 		else:
 			# assume that the encoding is utf-8
-			self.subject = self.subject.decode("utf-8")[:140]
+			self.subject = safe_decode(subject)[:140]
 
 		if not self.subject:
 			self.subject = "No Subject"