diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index 273667cac15..d232f87c3de 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -39,8 +39,9 @@ module Jobs
       end
 
       pop3.start(SiteSetting.pop3_polling_username, SiteSetting.pop3_polling_password) do |pop|
-        pop.delete_all do |p|
+        pop.each_mail do |p|
           process_popmail(p)
+          p.delete if SiteSetting.pop3_polling_delete_from_server?
         end
       end
     rescue Net::OpenTimeout => e