diff --git a/mass_mailing_newsletter_welcome_mail/README.rst b/mass_mailing_newsletter_welcome_mail/README.rst
new file mode 100644
index 00000000..22987577
--- /dev/null
+++ b/mass_mailing_newsletter_welcome_mail/README.rst
@@ -0,0 +1,69 @@
+=============================================
+Welcome mail for new suscribers on newsletter
+=============================================
+
+This module was written to extend the functionality of the website popup newsletter subscription form
+to support sending to new subscribers an automatic welcome email and allow
+you to customize it.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+#. Go to **Settings > Technical > Automation > Automated actions > Welcome mail to newsletter subscribers** and edit anything there.
+
+Quicker way to just change the email template (something that most likely you
+will want to do):
+
+#. Go to **Settings > Technical > Email > Templates**
+#. Edit the template called **Welcome mail - Newsletter**.
+
+
+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:%20mass_mailing_welcome_mail%0Aversion:%2011.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>`__:
+
+  * Cristina Martin R.
+
+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/website <https://github.com/OCA/social/tree/11.0/mass_mailing_welcome_mail>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/mass_mailing_newsletter_welcome_mail/__init__.py b/mass_mailing_newsletter_welcome_mail/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/mass_mailing_newsletter_welcome_mail/__manifest__.py b/mass_mailing_newsletter_welcome_mail/__manifest__.py
new file mode 100644
index 00000000..04d42342
--- /dev/null
+++ b/mass_mailing_newsletter_welcome_mail/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright 2019 Tecnativa - Cristina Martin R.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    'name': "Welcome mail to new subscribers",
+    "summary": "Send an automated welcome mail to new newsletter subscribers",
+    'license': 'AGPL-3',
+    'author': 'Tecnativa, '
+              'Odoo Community Association (OCA)',
+    'category': 'Social',
+    'version': '11.0.1.0.0',
+    'website': 'https://github.com/OCA/social',
+    'depends': [
+        'mass_mailing',
+        'base_automation',
+    ],
+    'data': [
+        "data/base_automation_data.xml",
+    ],
+    'application': False,
+    'installable': True,
+}
diff --git a/mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml b/mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml
new file mode 100644
index 00000000..07103f23
--- /dev/null
+++ b/mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+    <data>
+        <record id="email_template" model="mail.template">
+            <field name="name">Welcome mail to newsletter subscribers</field>
+            <field name="model_id" ref="mass_mailing.model_mail_mass_mailing_contact"/>
+            <field name="use_default_to" eval="True"/>
+            <field name="lang">${object.env.context.get("lang")}</field>
+            <field name="subject">Welcome to the mailing list ${object.list_id.name}</field>
+            <field name="body_html" type="html">
+                <div>Dear <b>${object.name}</b>,
+                    <br/>
+                    <h3>Thanks for signing up for our newsletter!</h3>
+                    <p>Regards,</p>
+                </div>
+            </field>
+        </record>
+    </data>
+
+    <data>
+        <record id="automated_action" model="base.automation">
+            <field name="name">Send Welcome Mail to new subscribers on Newsletter</field>
+            <field name="model_id" ref="mass_mailing.model_mail_mass_mailing_contact"/>
+            <field name="state">email</field>
+            <field name="trigger">on_create</field>
+            <field name="active" eval="True"/>
+            <field name="template_id" ref="email_template"/>
+            <field name="filter_domain" eval="[['list_ids', '=', ref('mass_mailing.mass_mail_list_1')]]"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot b/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot
new file mode 100644
index 00000000..c0b01b4c
--- /dev/null
+++ b/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot
@@ -0,0 +1,30 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* mass_mailing_welcome_mail
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.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: mass_mailing_welcome_mail
+#: model:mail.template,body_html:mass_mailing_welcome_mail.email_template
+msgid "<div>Dear <b>${object.name}</b>,
+                    <br/>
+                    <h3>Thanks for signing up for our newsletter!</h3>
+                    <p>Regards,</p>
+                </div>\n"
+"            "
+msgstr ""
+
+#. module: mass_mailing_welcome_mail
+#: model:base.automation,name:mass_mailing_welcome_mail.automated_action
+#: model:ir.actions.server,name:mass_mailing_welcome_mail.automated_action
+msgid "Send Welcome Mail to new subscribers"
+msgstr ""
diff --git a/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst b/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst
new file mode 100755
index 00000000..134ebe50
--- /dev/null
+++ b/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst
@@ -0,0 +1,9 @@
+To configure this module, you need to:
+
+#. Go to **Settings > Technical > Automation > Automated actions > Welcome mail to New subscribers in Nesletter Mailing List** and edit anything there.
+
+Quicker way to just change the email template (something that most likely you
+will want to do):
+
+#. Go to **Settings > Technical > Email > Templates**
+#. Edit the template called **Welcome mail - Newsletter Mailing List**.
diff --git a/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst b/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst
new file mode 100755
index 00000000..e81b810d
--- /dev/null
+++ b/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst
@@ -0,0 +1,4 @@
+
+* `Tecnativa <https://www.tecnativa.com>`__:
+
+  * Cristina Martin R.
diff --git a/mass_mailing_newsletter_welcome_mail/readme/DESCRIPTION.rst b/mass_mailing_newsletter_welcome_mail/readme/DESCRIPTION.rst
new file mode 100755
index 00000000..37477214
--- /dev/null
+++ b/mass_mailing_newsletter_welcome_mail/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+This module was written to extend the functionality of the website popup
+newsletter subscription form to support sending to new subscribers an
+automatic welcome email and allow you to customize it.
diff --git a/mass_mailing_newsletter_welcome_mail/static/description/icon.png b/mass_mailing_newsletter_welcome_mail/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/mass_mailing_newsletter_welcome_mail/static/description/icon.png differ