added fix for email lang defines issues