fix up email contexts