Message repair