TODO: Updated following IMAP SASL additions