Mail links handling

@sinan, can you please review this fix? It is related to task https://www.pivotaltracker.com/story/show/84381294