Fixed issues with Ender Mail