Update options for >= Cyrus IMAP 2.5