Improve message view