message MDL-24771 another big commit of messaging fixes