(BugID: 95396) Forum: Bad links in email messages

When a thread is added to a category a user is watching, the watchlist
email created has a link that doesn't work and an undesirable page
name.
Whitespace cleanup
Merge branch 'bugid-95396' into dev