eMail fix #2