rework message system