Bugfix Email class