Fix like and mention notification. Manual cherry-pick of 466
Merge pull request #496 from enspiral/bug/mention-notification

Fix like and mention notification. Manual cherry-pick of 466