Use new ExtraStorage system when requesting a mail change

Use correct method names on MailChangeToken too