Updated mail callback