diff --git a/fetchmail_thread_default/README.rst b/fetchmail_thread_default/README.rst
new file mode 100644
index 000000000..130398b9b
--- /dev/null
+++ b/fetchmail_thread_default/README.rst
@@ -0,0 +1,113 @@
+===================================
+Default Thread For Unbounded Emails
+===================================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
+    :target: https://github.com/OCA/social/tree/12.0/fetchmail_thread_default
+    :alt: OCA/social
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-fetchmail_thread_default
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/205/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module extends the functionality of mail fetching to support choosing a
+mail thread that acts as a mail sink and gathers all mail messages that Odoo
+does not know where to put.
+
+Dangling emails are really a problem because if you do not care about them,
+SPAM can enter your inbox and keep increasing fetchmail process network quota
+because Odoo would gather them every time it runs the fetchmail process.
+
+Before this, your only choice was to create a new record for those unbounded
+emails. That could be useful under some circumstances, like creating a
+``crm.lead`` for them, but what happens if you do not want to have lots of
+spammy leads? Or if you do not need Odoo's CRM at all?
+
+Here we come to the rescue. This simple addons adds almost none dependencies
+and allows you to direct those mails somewhere you can handle or ignore at
+wish.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+#. Go to *Settings > General Settings > Configure the incoming email gateway*.
+#. Create or edit a record.
+#. Configure properly.
+#. Under *Default mail thread*, choose a model and record.
+
+   Tip: if you do not know what to choose, we suggest you to use a mail
+   channel.
+
+Usage
+=====
+
+To use this module, you need to:
+
+#. Subscribe to the thread you chose as the *Default mail thread*.
+#. You will be notified when a new unbound email lands in that thread.
+#. Do what you want with it.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/social/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/social/issues/new?body=module:%20fetchmail_thread_default%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Tecnativa
+
+Contributors
+~~~~~~~~~~~~
+
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Jairo Llopis
+  * David Vidal
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/social <https://github.com/OCA/social/tree/12.0/fetchmail_thread_default>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fetchmail_thread_default/__init__.py b/fetchmail_thread_default/__init__.py
new file mode 100644
index 000000000..0650744f6
--- /dev/null
+++ b/fetchmail_thread_default/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/fetchmail_thread_default/__manifest__.py b/fetchmail_thread_default/__manifest__.py
new file mode 100644
index 000000000..47454639a
--- /dev/null
+++ b/fetchmail_thread_default/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright 2017 Tecnativa - Jairo Llopis <jairo.llopis@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    "name": "Default Thread For Unbounded Emails",
+    "summary": "Post unkonwn messages to an existing thread",
+    "version": "12.0.1.0.0",
+    "category": "Discuss",
+    "website": "https://www.github.com/social",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": [
+        "fetchmail",
+    ],
+    "data": [
+        "views/fetchmail_server_view.xml",
+    ],
+    "demo": [
+        "demo/data.xml",
+    ],
+}
diff --git a/fetchmail_thread_default/demo/data.xml b/fetchmail_thread_default/demo/data.xml
new file mode 100644
index 000000000..0e16d30dc
--- /dev/null
+++ b/fetchmail_thread_default/demo/data.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Tecnativa - Jairo Llopis <jairo.llopis@tecnativa.com>
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <record id="demo_sink" model="mail.channel">
+        <field name="name">mailsink</field>
+        <field name="email_send" eval="True"/>
+        <field name="description">Unbounded email sink</field>
+        <field name="alias_contact">everyone</field>
+        <field name="public">private</field>
+        <field name="group_ids" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+
+    <record id="demo_server" model="fetchmail.server">
+        <field name="name">Demo server</field>
+        <field name="type">pop</field>
+        <field name="server">pop3.example.com</field>
+        <field name="default_thread_id" eval="'mail.channel,%d' % ref('demo_sink')"/>
+        <!-- <field name="default_thread_id">mail.channel,%(demo_sink)d</field> -->
+    </record>
+
+</odoo>
diff --git a/fetchmail_thread_default/i18n/.empty b/fetchmail_thread_default/i18n/.empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/fetchmail_thread_default/i18n/ca.po b/fetchmail_thread_default/i18n/ca.po
new file mode 100644
index 000000000..a034c5b09
--- /dev/null
+++ b/fetchmail_thread_default/i18n/ca.po
@@ -0,0 +1,45 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# Marc Tormo i Bochaca <mtbochaca@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: Marc Tormo i Bochaca <mtbochaca@gmail.com>, 2017\n"
+"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr "Tema del Correu electrònic "
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/de.po b/fetchmail_thread_default/i18n/de.po
new file mode 100644
index 000000000..64da60f57
--- /dev/null
+++ b/fetchmail_thread_default/i18n/de.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Rudolf Schnapka <rs@techno-flex.de>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>, 2017\n"
+"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr "Email-Thread"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP-Server"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/es.po b/fetchmail_thread_default/i18n/es.po
new file mode 100644
index 000000000..0816e1988
--- /dev/null
+++ b/fetchmail_thread_default/i18n/es.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
+"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr "Hilo de mensajes"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMP"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/fetchmail_thread_default.pot b/fetchmail_thread_default/i18n/fetchmail_thread_default.pot
new file mode 100644
index 000000000..a431c5d1e
--- /dev/null
+++ b/fetchmail_thread_default/i18n/fetchmail_thread_default.pot
@@ -0,0 +1,40 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* fetchmail_thread_default
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
+
diff --git a/fetchmail_thread_default/i18n/fr.po b/fetchmail_thread_default/i18n/fr.po
new file mode 100644
index 000000000..502edbf43
--- /dev/null
+++ b/fetchmail_thread_default/i18n/fr.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Christophe CHAUVET <christophe.chauvet@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: Christophe CHAUVET <christophe.chauvet@gmail.com>, 2017\n"
+"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr "Discussion de courriel"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Serveur POP/IMAP"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/hr.po b/fetchmail_thread_default/i18n/hr.po
new file mode 100644
index 000000000..9ceabfe98
--- /dev/null
+++ b/fetchmail_thread_default/i18n/hr.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# Bole <bole@dajmi5.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>, 2017\n"
+"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/it.po b/fetchmail_thread_default/i18n/it.po
new file mode 100644
index 000000000..57bbf2cc1
--- /dev/null
+++ b/fetchmail_thread_default/i18n/it.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Paolo Valier <paolo.valier@hotmail.it>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: Paolo Valier <paolo.valier@hotmail.it>, 2017\n"
+"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr "Discussione Email"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Server POP/IMAP"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/pt_BR.po b/fetchmail_thread_default/i18n/pt_BR.po
new file mode 100644
index 000000000..57a7f6909
--- /dev/null
+++ b/fetchmail_thread_default/i18n/pt_BR.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr "Processo Email"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/pt_PT.po b/fetchmail_thread_default/i18n/pt_PT.po
new file mode 100644
index 000000000..7d9faa7be
--- /dev/null
+++ b/fetchmail_thread_default/i18n/pt_PT.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
+"teams/23907/pt_PT/)\n"
+"Language: pt_PT\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr "Tópico de Email"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/sl.po b/fetchmail_thread_default/i18n/sl.po
new file mode 100644
index 000000000..f3d38c6d9
--- /dev/null
+++ b/fetchmail_thread_default/i18n/sl.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr "E-poštni niz"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP strežnik"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/tr.po b/fetchmail_thread_default/i18n/tr.po
new file mode 100644
index 000000000..7bcd3940e
--- /dev/null
+++ b/fetchmail_thread_default/i18n/tr.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017\n"
+"Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr "Eposta konuşması"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP sunucu"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/i18n/zh_CN.po b/fetchmail_thread_default/i18n/zh_CN.po
new file mode 100644
index 000000000..7039e98cd
--- /dev/null
+++ b/fetchmail_thread_default/i18n/zh_CN.po
@@ -0,0 +1,46 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * fetchmail_thread_default
+#
+# Translators:
+# Jeffery CHEN <jeffery9@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-10 02:46+0000\n"
+"PO-Revision-Date: 2017-06-10 02:46+0000\n"
+"Last-Translator: Jeffery CHEN <jeffery9@gmail.com>, 2017\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/"
+"zh_CN/)\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,field_description:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid "Default mail thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model.fields,help:fetchmail_thread_default.field_fetchmail_server_default_thread_id
+msgid ""
+"Messages with no clear route will be posted as a new message to this thread."
+msgstr ""
+
+#. module: fetchmail_thread_default
+#: model:ir.model,name:fetchmail_thread_default.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP 服务器"
+
+#. module: fetchmail_thread_default
+#: model:mail.channel,name:fetchmail_thread_default.demo_sink
+msgid "mailsink"
+msgstr ""
diff --git a/fetchmail_thread_default/models/__init__.py b/fetchmail_thread_default/models/__init__.py
new file mode 100644
index 000000000..670ea5d42
--- /dev/null
+++ b/fetchmail_thread_default/models/__init__.py
@@ -0,0 +1,2 @@
+from . import fetchmail_server
+from . import mail_thread
diff --git a/fetchmail_thread_default/models/fetchmail_server.py b/fetchmail_thread_default/models/fetchmail_server.py
new file mode 100644
index 000000000..57bc8ecb2
--- /dev/null
+++ b/fetchmail_thread_default/models/fetchmail_server.py
@@ -0,0 +1,43 @@
+# Copyright 2017 Tecnativa - Jairo Llopis <jairo.llopis@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class FetchmailServer(models.Model):
+    _inherit = "fetchmail.server"
+
+    default_thread_id = fields.Reference(
+        selection="_get_thread_models",
+        string="Default mail thread",
+        help="Messages with no clear route will be posted as a new message "
+             "to this thread.",
+    )
+
+    @api.model
+    def _get_thread_models(self):
+        """Get list of available ``mail.thread`` submodels.
+
+        :return [(model, name), ...]:
+            Tuple list of available models that can receive messages.
+        """
+        models = self.env["ir.model.fields"].search([
+            ("name", "=", "message_partner_ids"),
+        ]).mapped("model_id")
+        # Exclude AbstractModel
+        return [(m.model, m.name) for m in models
+                if m.model in self.env and getattr(self.env[m.model], "_auto")]
+
+    @api.onchange('type', 'is_ssl', 'object_id')
+    def onchange_server_type(self):
+        """Remove :attr:`default_thread_id` if there is :attr:`object_id`."""
+        if self.object_id:
+            self.default_thread_id = False
+        return super(FetchmailServer, self).onchange_server_type()
+
+    @api.multi
+    @api.onchange("default_thread_id")
+    def _onchange_remove_object_id(self):
+        """Remove :attr:`object_id` if there is :attr:`default_thread_id`."""
+        if self.default_thread_id:
+            self.object_id = False
diff --git a/fetchmail_thread_default/models/mail_thread.py b/fetchmail_thread_default/models/mail_thread.py
new file mode 100644
index 000000000..d0797d9ab
--- /dev/null
+++ b/fetchmail_thread_default/models/mail_thread.py
@@ -0,0 +1,29 @@
+# Copyright 2017 Tecnativa - Jairo Llopis <jairo.llopis@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class MailThread(models.AbstractModel):
+    _inherit = "mail.thread"
+
+    @api.model
+    def message_process(self, model, message, custom_values=None,
+                        save_original=False, strip_attachments=False,
+                        thread_id=None):
+        server = self.env["fetchmail.server"].browse(
+            self.env.context.get("fetchmail_server_id"))
+        if server.default_thread_id and not (model or thread_id):
+            model = server.default_thread_id._name
+            thread_id = server.default_thread_id.id
+        return super(
+            MailThread,
+            self.with_context(mail_create_nosubscribe=True)
+        ).message_process(
+            model,
+            message,
+            custom_values,
+            save_original,
+            strip_attachments,
+            thread_id,
+        )
diff --git a/fetchmail_thread_default/readme/CONFIGURE.rst b/fetchmail_thread_default/readme/CONFIGURE.rst
new file mode 100644
index 000000000..b163b948c
--- /dev/null
+++ b/fetchmail_thread_default/readme/CONFIGURE.rst
@@ -0,0 +1,9 @@
+To configure this module, you need to:
+
+#. Go to *Settings > General Settings > Configure the incoming email gateway*.
+#. Create or edit a record.
+#. Configure properly.
+#. Under *Default mail thread*, choose a model and record.
+
+   Tip: if you do not know what to choose, we suggest you to use a mail
+   channel.
diff --git a/fetchmail_thread_default/readme/CONTRIBUTORS.rst b/fetchmail_thread_default/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000..4b1737940
--- /dev/null
+++ b/fetchmail_thread_default/readme/CONTRIBUTORS.rst
@@ -0,0 +1,4 @@
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Jairo Llopis
+  * David Vidal
diff --git a/fetchmail_thread_default/readme/DESCRIPTION.rst b/fetchmail_thread_default/readme/DESCRIPTION.rst
new file mode 100644
index 000000000..9d335296b
--- /dev/null
+++ b/fetchmail_thread_default/readme/DESCRIPTION.rst
@@ -0,0 +1,16 @@
+This module extends the functionality of mail fetching to support choosing a
+mail thread that acts as a mail sink and gathers all mail messages that Odoo
+does not know where to put.
+
+Dangling emails are really a problem because if you do not care about them,
+SPAM can enter your inbox and keep increasing fetchmail process network quota
+because Odoo would gather them every time it runs the fetchmail process.
+
+Before this, your only choice was to create a new record for those unbounded
+emails. That could be useful under some circumstances, like creating a
+``crm.lead`` for them, but what happens if you do not want to have lots of
+spammy leads? Or if you do not need Odoo's CRM at all?
+
+Here we come to the rescue. This simple addons adds almost none dependencies
+and allows you to direct those mails somewhere you can handle or ignore at
+wish.
diff --git a/fetchmail_thread_default/readme/USAGE.rst b/fetchmail_thread_default/readme/USAGE.rst
new file mode 100644
index 000000000..486d7c075
--- /dev/null
+++ b/fetchmail_thread_default/readme/USAGE.rst
@@ -0,0 +1,5 @@
+To use this module, you need to:
+
+#. Subscribe to the thread you chose as the *Default mail thread*.
+#. You will be notified when a new unbound email lands in that thread.
+#. Do what you want with it.
diff --git a/fetchmail_thread_default/static/description/icon.png b/fetchmail_thread_default/static/description/icon.png
new file mode 100644
index 000000000..3a0328b51
Binary files /dev/null and b/fetchmail_thread_default/static/description/icon.png differ
diff --git a/fetchmail_thread_default/static/description/index.html b/fetchmail_thread_default/static/description/index.html
new file mode 100644
index 000000000..60dee8a84
--- /dev/null
+++ b/fetchmail_thread_default/static/description/index.html
@@ -0,0 +1,462 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>Default Thread For Unbounded Emails</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="default-thread-for-unbounded-emails">
+<h1 class="title">Default Thread For Unbounded Emails</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/social/tree/12.0/fetchmail_thread_default"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-12-0/social-12-0-fetchmail_thread_default"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module extends the functionality of mail fetching to support choosing a
+mail thread that acts as a mail sink and gathers all mail messages that Odoo
+does not know where to put.</p>
+<p>Dangling emails are really a problem because if you do not care about them,
+SPAM can enter your inbox and keep increasing fetchmail process network quota
+because Odoo would gather them every time it runs the fetchmail process.</p>
+<p>Before this, your only choice was to create a new record for those unbounded
+emails. That could be useful under some circumstances, like creating a
+<tt class="docutils literal">crm.lead</tt> for them, but what happens if you do not want to have lots of
+spammy leads? Or if you do not need Odoo’s CRM at all?</p>
+<p>Here we come to the rescue. This simple addons adds almost none dependencies
+and allows you to direct those mails somewhere you can handle or ignore at
+wish.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<p>To configure this module, you need to:</p>
+<ol class="arabic">
+<li><p class="first">Go to <em>Settings &gt; General Settings &gt; Configure the incoming email gateway</em>.</p>
+</li>
+<li><p class="first">Create or edit a record.</p>
+</li>
+<li><p class="first">Configure properly.</p>
+</li>
+<li><p class="first">Under <em>Default mail thread</em>, choose a model and record.</p>
+<p>Tip: if you do not know what to choose, we suggest you to use a mail
+channel.</p>
+</li>
+</ol>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ol class="arabic simple">
+<li>Subscribe to the thread you chose as the <em>Default mail thread</em>.</li>
+<li>You will be notified when a new unbound email lands in that thread.</li>
+<li>Do what you want with it.</li>
+</ol>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20fetchmail_thread_default%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Tecnativa</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
+<li>Jairo Llopis</li>
+<li>David Vidal</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/12.0/fetchmail_thread_default">OCA/social</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/fetchmail_thread_default/tests/__init__.py b/fetchmail_thread_default/tests/__init__.py
new file mode 100644
index 000000000..6d46f4287
--- /dev/null
+++ b/fetchmail_thread_default/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_fetchmail
diff --git a/fetchmail_thread_default/tests/test_fetchmail.py b/fetchmail_thread_default/tests/test_fetchmail.py
new file mode 100644
index 000000000..9cc355c9c
--- /dev/null
+++ b/fetchmail_thread_default/tests/test_fetchmail.py
@@ -0,0 +1,59 @@
+# Copyright 2017 Tecnativa - Jairo Llopis <jairo.llopis@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.addons.test_mail.tests.test_mail_gateway import MAIL_TEMPLATE
+from odoo.tests.common import SavepointCase
+from odoo.tools import mute_logger
+
+
+class FetchmailCase(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(FetchmailCase, cls).setUpClass()
+        cls.server = cls.env.ref("fetchmail_thread_default.demo_server")
+        cls.sink = cls.env.ref("fetchmail_thread_default.demo_sink")
+        cls.MailThread = cls.env["mail.thread"]
+
+    def test_available_models(self):
+        """Non-``mail.thread`` models don't appear."""
+        for record in self.server._get_thread_models():
+            self.assertNotEqual(record[0], "mail.message")
+
+    def test_emptying_default_thread(self):
+        """Choosing an ``object_id`` empties ``default_thread_id``."""
+        self.server.write({'object_id': 1})
+        self.server.onchange_server_type()
+        self.assertFalse(self.server.default_thread_id)
+
+    def test_emptying_object(self):
+        """Choosing a ``default_thread_id`` empties ``object_id``."""
+        self.server.object_id = self.env["ir.model"].search([], limit=1)
+        self.server._onchange_remove_object_id()
+        self.assertFalse(self.server.object_id)
+
+    @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models')
+    def test_unbound_incoming_email(self):
+        """An unbound incoming email gets posted to the sink."""
+        # Imitate what self.server.feth_mail() would do
+        result = (
+            self.MailThread.with_context(fetchmail_server_id=self.server.id)
+            .message_process(
+                self.server.object_id.model,
+                MAIL_TEMPLATE.format(
+                    email_from="spambot@example.com",
+                    to="you@example.com",
+                    cc="nobody@example.com",
+                    subject="I'm a robot, hello",
+                    extra="",
+                    msg_id="<fitter.happier.more.productive@example.com>",
+                ),
+                save_original=self.server.original,
+                strip_attachments=not self.server.attach,
+            )
+        )
+        self.assertEqual(self.server.default_thread_id, self.sink)
+        self.assertEqual(result, self.sink.id)
+        # Nobody subscribed
+        self.assertFalse(self.sink.message_partner_ids)
+        # Message entered channel
+        self.assertEqual(self.sink.message_ids.subject, "I'm a robot, hello")
diff --git a/fetchmail_thread_default/views/fetchmail_server_view.xml b/fetchmail_thread_default/views/fetchmail_server_view.xml
new file mode 100644
index 000000000..ee7f84d3a
--- /dev/null
+++ b/fetchmail_thread_default/views/fetchmail_server_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Tecnativa - Jairo Llopis <jairo.llopis@tecnativa.com>
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <record id="view_email_server_form" model="ir.ui.view">
+        <field name="name">Add default thread</field>
+        <field name="model">fetchmail.server</field>
+        <field name="inherit_id" ref="fetchmail.view_email_server_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='object_id']" position="after">
+                <field name="default_thread_id"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>