more tweaks to messages reporting