Updated the mailing feature