Email class fix