Enhanced mail support