Rework messages