diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index c77ba00021..7aba559d1f 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -478,14 +478,13 @@ class EmailAccount(Document):
 			email_server = self.get_incoming_server(in_receive=True, email_sync_rule=email_sync_rule)
 			messages = email_server.get_messages() or {}
 		except Exception:
-			raise
 			frappe.log_error(title=_("Error while connecting to email account {0}").format(self.name))
 			return []
 
 		mails = []
 		for index, message in enumerate(messages.get("latest_messages", [])):
-			uid = messages['uid_list'][index]
-			seen_status = 1 if messages['seen_status'][uid]=='SEEN' else 0
+			uid = messages['uid_list'][index] if messages.get('uid_list') else None
+			seen_status = 1 if messages.get('seen_status', {}).get(uid)=='SEEN' else 0
 			mails.append(InboundMail(message, self, uid, seen_status))
 
 		return mails
diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index 7da4840df1..9ad560aa4a 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -738,9 +738,6 @@ class InboundMail(Email):
 		if not reference_document and self.email_account.append_to:
 			reference_document = self.match_record_by_subject_and_sender(self.email_account.append_to)
 
-			# if not reference_document:
-			# 	reference_document = Create_reference_document(self.email_account.append_to)
-
 		self._reference_document = reference_document or ''
 		return self._reference_document