diff --git a/py/webnotes/utils/email_lib/receive.py b/py/webnotes/utils/email_lib/receive.py
index 053f37d47f..a07ed1f6ff 100644
--- a/py/webnotes/utils/email_lib/receive.py
+++ b/py/webnotes/utils/email_lib/receive.py
@@ -153,6 +153,7 @@ class POP3Mailbox:
 		
 		self.connect()
 		num = len(self.pop.list()[1])
+		if num > 25: num = 25
 		for m in range(num):
 			msg = self.pop.retr(m+1)
 			try: