diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 72ee4349d3..28ca7abf4f 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -490,8 +490,8 @@ def get_permission_query_conditions_for_communication(user):
 			return """`tabCommunication`.communication_medium!='Email'"""
 
 		email_accounts = ['"{}"'.format(account.get("email_account")) for account in accounts]
-		return """`tabCommunication`.email_account in ({email_accounts}) or `tabCommunication`.recipients LIKE '%{user}%' or `tabCommunication`.sender LIKE '%{user}%' or `tabCommunication`.cc LIKE '%{user}%' or `tabCommunication`.bcc LIKE '%{user}%'""".format(
-			email_accounts=",".join(email_accounts), user=user
+		return """`tabCommunication`.email_account in ({email_accounts})""".format(
+			email_accounts=",".join(email_accounts)
 		)
 
 
diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index 8ad99777d9..e624d82a10 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -280,8 +280,9 @@ class EmailServer:
 		except imaplib.IMAP4.abort:
 			if self.retry_count < self.retry_limit:
 				self.connect()
-				self.get_messages(folder)
 				self.retry_count += 1
+				self.get_messages(folder)
+
 		except Exception as e:
 			if self.has_login_limit_exceeded(e):
 				raise LoginLimitExceeded(e) from e