Mail Server still sends legacy URLs in emails - Causes bad redirects

Problem description: Artifactory's Mail Server integration fails to send emails with the correct URLs. The emails received by a 7.6.3 Artifactory clearly use the 6.X URL pattern for its hyperlinks.

What is the expected behavior? Artifactory's emails send working URLs, so that people who Watch repositories can use the URLs generated by emails.

Steps to reproduce: 

1] Install and set up a mail server. I found the easiest test server to use was MailSlurper.

2] Configure Artifactory 7.X to use the local mail server

3] Have an Artifactory User watch a repository by clicking the "Follow" button in the Artifacts Browser (Found in the upper right hand corner in the "Actions" dropdown)

4] Perform an action that would cause an email to be sent, such as uploading a file to the watched repository

5] Check the email that is received by MailSlurper, observe that the URL pattern is the legacy 6.X URL:

Email sends "http://artifactory.com:8081/artifactory/webapp/#/artifacts/browse/tree/General/builds/TEST-system-build-TEST-1/file10.txt" 

When followed, the URL is redirected by the Frontend incorrectly:

Redirects to "http://artifactory.com:8082/ui/packages#%2Fartifacts%2Fbrowse%2Ftree%2FGeneral%2Fbuilds%2FTEST-system-build-TEST-1%2Ffile10.txt"

The proper URL to use is "http://artifactory.com:8082/ui/repos/tree/General/builds%2FTEST-system-build-TEST-0%2Ffile10.txt" 

Possible workaround: A reverse proxy may be able to redirect the "/artifactory/artifacts/browse" part to "/ui/repos/tree"