Email class adjustments.