Updated mail implementation.