Make email notification contents more useful

Here's an email notification I got recently. It is not very useful in letting me know what was said. The subject has the user who mentioned me, and the body lists the channel that it was in, and there's a link to view messages. The link goes to somewhere else in the channel history - not to the specific message where I was mentioned. 

Suggestions:

1. Include the text of the message in the email
2. Make the "view messages" link go to the specific message where I was mentioned.