added last fix to Email