Enhanced mail api