Render messages correctly based on session issue #39