Fixed message body display issues. Added a few more events to display