more email adjustments