filter-branch'ed version of cyrus-imapd