Patches for Cyrus IMAP & SASL