re #835 - Search for @ in regex
Merge branch 'feature/835-mailto'