Add a link in the menu (messages)
Merge remote-tracking branch 'origin/master'