FEATURES: Updated following recent IMAP changes