Refactor the mail modules.
Refactor the Syncer code.