#983 - update email contexts