Updated mail library