diff --git a/addons/website_mail/__init__.py b/addons/website_mail/__init__.py
index e20643cc03d..708d6ce4669 100644
--- a/addons/website_mail/__init__.py
+++ b/addons/website_mail/__init__.py
@@ -20,5 +20,4 @@
 ##############################################################################
 
 import controllers
-import mail_message
-import mail_thread
+import models
diff --git a/addons/website_mail/models/__init__.py b/addons/website_mail/models/__init__.py
new file mode 100644
index 00000000000..f8d603716a2
--- /dev/null
+++ b/addons/website_mail/models/__init__.py
@@ -0,0 +1,2 @@
+import mail_message
+import mail_thread
diff --git a/addons/website_mail/mail_message.py b/addons/website_mail/models/mail_message.py
similarity index 100%
rename from addons/website_mail/mail_message.py
rename to addons/website_mail/models/mail_message.py
diff --git a/addons/website_mail/mail_thread.py b/addons/website_mail/models/mail_thread.py
similarity index 100%
rename from addons/website_mail/mail_thread.py
rename to addons/website_mail/models/mail_thread.py