Refactoring up-imapproxy