Mail api changes