Updates to mail handling