Fix markup of comments

Fixes #2072
Merge pull request #2074 from jalyna/fix-mentions

Fix markup of comments