Correct notification
Reminder on message composing page
Merge remote-tracking branch 'origin/master' into gh-pages