Fix synctoimap integration according to new scheme.