diff --git a/addons/mail/doc/index.rst b/addons/mail/doc/index.rst
new file mode 100644
index 00000000000..b9217c42443
--- /dev/null
+++ b/addons/mail/doc/index.rst
@@ -0,0 +1,6 @@
+:orphan:
+
+Mail module documentation
+=========================
+
+.. include:: index.rst.inc
diff --git a/addons/mail/doc/index.rst.inc b/addons/mail/doc/index.rst.inc
new file mode 100644
index 00000000000..700c91c7d4f
--- /dev/null
+++ b/addons/mail/doc/index.rst.inc
@@ -0,0 +1,8 @@
+
+Mail Module
+'''''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   mail_thread
diff --git a/addons/mail/doc/mail.rst b/addons/mail/doc/mail.rst
deleted file mode 100644
index 8b137891791..00000000000
--- a/addons/mail/doc/mail.rst
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/addons/mail/doc/mail_thread.rst b/addons/mail/doc/mail_thread.rst
new file mode 100644
index 00000000000..2e5348dd374
--- /dev/null
+++ b/addons/mail/doc/mail_thread.rst
@@ -0,0 +1,6 @@
+.. _mail_thread:
+
+OpenChatter
+===========
+
+TODO