Updated mail helper class