Fixed issues with sending weird email