diff --git a/addons/website_mail/models/__init__.py b/addons/website_mail/models/__init__.py
index fcf3edd02fe..e4f2ed11911 100644
--- a/addons/website_mail/models/__init__.py
+++ b/addons/website_mail/models/__init__.py
@@ -2,5 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import mail_message
-import mail_thread
 import update
diff --git a/addons/website_mail/models/mail_thread.py b/addons/website_mail/models/mail_thread.py
deleted file mode 100644
index 5c0ace6722d..00000000000
--- a/addons/website_mail/models/mail_thread.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-# TODO for trunk, remove me
-class MailThread(models.AbstractModel):
-    _inherit = 'mail.thread'
-
-    website_message_ids = fields.One2many('mail.message', 'res_id',
-        domain=lambda self: ['&', ('model', '=', self._name), ('message_type', '=', 'comment')],
-        string='Website Messages', help="Website communication history")
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index 14fe0c49706..8941071eaac 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -75,7 +75,6 @@ class ProductTemplate(models.Model):
     _name = 'product.template'
     _mail_post_access = 'read'
 
-    # TODO FIXME tde: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
     website_message_ids = fields.One2many(
         'mail.message', 'res_id',
         domain=lambda self: ['&', ('model', '=', self._name), ('message_type', '=', 'comment')],