improve mail entry