Updates to Mail class