fix Messages