Fixes to mark new messages again
Fix exceptions when loading messages
Remove a TODO and fix potential shadowing issue
Some clean up in the listing classes