changed Messages to Inbox. Added new message link
Solved merge conflict