heartbleed bugfix for pop3
Land #3221, @Firefart's fix for pop3 starttls