Updated mail handling