Fixed issues with email A2