updated settings to use settings to include mail info