changes for mail and sync.