Use canonical URLs (introduced in r94995) for all URLs in e-mails