ref #4178 - change message state fix