Initial rearrangement of _commonSync to ImapSync