Renamed mailAccountStorage