Mail links handling

@sinan, can you please review this fix?