diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index eacd09588..dea08f09b 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -39,7 +39,9 @@ module Jobs
     end
 
     def poll_pop3s
-      Net::POP3.enable_ssl(OpenSSL::SSL::VERIFY_NONE)
+      if !SiteSetting.pop3s_polling_insecure
+        Net::POP3.enable_ssl(OpenSSL::SSL::VERIFY_NONE)
+      end
       Net::POP3.start(SiteSetting.pop3s_polling_host,
                       SiteSetting.pop3s_polling_port,
                       SiteSetting.pop3s_polling_username,
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6a189d402..330720e6c 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -848,6 +848,7 @@ en:
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
 
     pop3s_polling_enabled: "Poll via POP3S for email replies"
+    pop3s_polling_insecure: "Poll using plain text POP3 without SSL"
     pop3s_polling_port: "The port to poll a POP3S account on"
     pop3s_polling_host: "The host to poll for email via POP3S"
     pop3s_polling_username: "The username for the POP3S account to poll for email"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 9e07a577f..c1438266d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -345,6 +345,7 @@ email:
   reply_by_email_enabled: false
   reply_by_email_address: ''
   pop3s_polling_enabled: false
+  pop3s_polling_insecure: false
   pop3s_polling_host: ''
   pop3s_polling_port: 995
   pop3s_polling_username: ''