Updates to mail system to allow for multiple functions.