[MERGE] forward port branch saas-16 up to 104dfe3c07d

1 files changed, 3 insertions, 4 deletions

diff --git a/addons/mass_mailing/models/mail_mail.py b/addons/mass_mailing/models/mail_mail.py
index 1772cdaf1ff..e5072060fd5 100644
--- a/addons/mass_mailing/models/mail_mail.py
+++ b/addons/mass_mailing/models/mail_mail.py
@@ -60,15 +60,14 @@ class MailMail(models.Model):
         self.ensure_one()
         body = super(MailMail, self).send_get_mail_body(partner=partner)
 
-        links_blacklist = ['/unsubscribe_from_list']
-
         if self.mailing_id and body and self.statistics_ids:
             for match in re.findall(URL_REGEX, self.body_html):
-
                 href = match[0]
                 url = match[1]
 
-                if not [s for s in links_blacklist if s in href]:
+                parsed = urlparse.urlparse(url, scheme='http')
+
+                if parsed.scheme.startswith('http') and parsed.path.startswith('/r/'):
                     new_href = href.replace(url, url + '/m/' + str(self.statistics_ids[0].id))
                     body = body.replace(href, new_href)