Those two ideas are good - but really at the end of the day I think people expect messages to be more like email than topics, so having the UI look more like gmail would be welcomed. Or at least provide a way to click back to the messages list from the message.
At the very least like this:
Or like this:
