Moving SMTP to plugin