Fixed mail links issue

Fixed mail links issue