Updated most of the mail system