Rework message reporting