Added IMAP annotations support - patch from #2688
Don't strip "comments" by default in headers. This is uterly braindead.
Update ChangeLog