Email Configuration

Changes to the Email library