diff --git a/mass_mailing_exclude_opt_out/README.rst b/mass_mailing_exclude_opt_out/README.rst
new file mode 100644
index 00000000..2d7f38a6
--- /dev/null
+++ b/mass_mailing_exclude_opt_out/README.rst
@@ -0,0 +1,74 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+========================================
+Exclude opt-out contacts in mass mailing
+========================================
+
+This module was written to extend the functionality of mass mailing to display
+by default only the contacts that are available for mass mailing.
+
+This makes human error *less probable*.
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to *Marketing > Mass Mailing > Mass Mailings*.
+* Create a new one or edit any existing one.
+* Choose any kind of recipients.
+* Press *Change selection*.
+* There you will see the filter applied by default.
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/205/8.0
+
+.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt
+.. branch is "8.0" for example
+
+For further information, please visit:
+
+* https://www.odoo.com/forum/help-1
+
+Known issues / Roadmap
+======================
+
+* ...
+
+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 `here <https://github.com/OCA/
+social/issues/new?body=module:%20 mass_mailing_exclude_opt_out%0Aversion:%20
+8.0.1.0.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
+Credits
+=======
+
+Contributors
+------------
+
+* Rafael Blasco <rafabn@antiun.com>
+* Jairo Llopis <yajo.sk8@gmail.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+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.
+
+To contribute to this module, please visit http://odoo-community.org.
diff --git a/mass_mailing_exclude_opt_out/__init__.py b/mass_mailing_exclude_opt_out/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/mass_mailing_exclude_opt_out/__openerp__.py b/mass_mailing_exclude_opt_out/__openerp__.py
new file mode 100644
index 00000000..6c21a9fa
--- /dev/null
+++ b/mass_mailing_exclude_opt_out/__openerp__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# © 2015 Antiun Ingeniería, S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+{
+    "name": "Exclude opt-out contacts in mass mailing",
+    "summary": "Do it by default when selecting contacts to be mailed",
+    "version": "8.0.1.0.0",
+    "category": "Social Network",
+    "website": "https://odoo-community.org/",
+    "author": "Antiun Ingeniería, S.L., Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": [
+        "mass_mailing",
+    ],
+    "data": [
+        "views/mass_mailing.xml",
+    ],
+}
diff --git a/mass_mailing_exclude_opt_out/static/description/icon.png b/mass_mailing_exclude_opt_out/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/mass_mailing_exclude_opt_out/static/description/icon.png differ
diff --git a/mass_mailing_exclude_opt_out/views/mass_mailing.xml b/mass_mailing_exclude_opt_out/views/mass_mailing.xml
new file mode 100644
index 00000000..a1179a77
--- /dev/null
+++ b/mass_mailing_exclude_opt_out/views/mass_mailing.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view">
+            <field name="name">Exclude opt-out contacts</field>
+            <field name="model">mail.mass_mailing</field>
+            <field name="inherit_id"
+                   ref="mass_mailing.view_mail_mass_mailing_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='mailing_domain']"
+                       position="attributes">
+                    <attribute name="context">{
+                        "search_default_not_opt_out": 1,
+                    }</attribute>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>