Feature/email2.1 fixing

Yeah again!!