Patch to allow the user to pick the SMTP authentication type and to allow them to use the same username for IMAP and SMTP