diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index efaa743f9c7..564d20c6c58 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -47,7 +47,7 @@ module Jobs
           client_message = RejectionMailer.send_rejection(message.from, message.body, message.to, message_template)
           Email::Sender.new(client_message, message_template).send
         else
-          Discourse.handle_exception(e, { context: "incoming email", mail: mail_string })
+          Discourse.handle_exception(e, { code: "unknown error for incoming email", mail: mail_string} )
         end
       ensure
         mail.delete
@@ -70,9 +70,7 @@ module Jobs
         pop.finish
       end
     rescue Net::POPAuthenticationError => e
-      # inform admins about the error (1 message per hour to prevent too much SPAM)
-      data = { limit_once_per: 1.hour, message_params: { error: e }}
-      GroupMessage.create(Group[:admins].name, :email_error_notification, data)
+      Discourse.handle_exception(e, { code: "signing in for incoming email" } )
     end
 
   end
diff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rb
index 543edabb261..f83b25404af 100644
--- a/spec/jobs/poll_mailbox_spec.rb
+++ b/spec/jobs/poll_mailbox_spec.rb
@@ -28,12 +28,13 @@ describe Jobs::PollMailbox do
 
   describe ".poll_pop3s" do
 
-    it "informs admins on pop authentication error" do
+    it "logs an error on pop authentication error" do
       error = Net::POPAuthenticationError.new
       data = { limit_once_per: 1.hour, message_params: { error: error }}
 
       Net::POP3.expects(:start).raises(error)
-      GroupMessage.expects(:create).with("admins", :email_error_notification, data)
+
+      Discourse.expects(:handle_exception)
 
       poller.poll_pop3s
     end