Re: Refactoring up-imapproxy