diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 81719794f69..47e3efdcb17 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -62,12 +62,12 @@ The main features are:
         'mail_thread_view.xml',
         'mail_group_view.xml',
         'res_partner_view.xml',
+        'res_users_view.xml',
+        'data/mail_data.xml',
+        'data/mail_group_data.xml',
         'report/mail_message_report_view.xml',
         'security/mail_security.xml',
         'security/ir.model.access.csv',
-        'mail_data.xml',
-        'mail_group_data.xml',
-        'res_users_view.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mail/mail_data.xml b/addons/mail/data/mail_data.xml
similarity index 100%
rename from addons/mail/mail_data.xml
rename to addons/mail/data/mail_data.xml
diff --git a/addons/mail/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
similarity index 100%
rename from addons/mail/mail_group_data.xml
rename to addons/mail/data/mail_group_data.xml