Merge "Clean up ImapStore and related classes."