diff --git a/website_mail_snippet_table_edit/README.rst b/website_mail_snippet_table_edit/README.rst
new file mode 100644
index 00000000..721c2f28
--- /dev/null
+++ b/website_mail_snippet_table_edit/README.rst
@@ -0,0 +1,81 @@
+.. 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
+
+=======================================
+Edit Table Rows in Website Mail Designer
+=======================================
+
+This module extends the functionality of ``website_mail`` to support
+duplication and deletion of table rows (``<tr>`` elements) and allow you to
+have a beter UX when using table-based templates or snippets.
+
+Installation
+============
+
+To see the effect of this module, you need to install another module that uses
+the website mail designer, and you need to have some table-based snippets for
+that, i.e. these modules:
+
+* ``mass_mailing``.
+* ``website_mail_snippet_fixed``.
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Edit an email with the website editor.
+* Use a table-based template or snippet.
+* Select any table row. You can now copy or delete it.
+
+.. 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
+
+Known issues / Roadmap
+======================
+
+* You cannot drag & drop table rows among tables, and that's because of the
+  inner design of Odoo's drag & drop engine, that does not allow that easily.
+
+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:%20
+website_mail_snippet_table_edit%0Aversion:%20
+8.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+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 https://odoo-community.org.
diff --git a/website_mail_snippet_table_edit/__init__.py b/website_mail_snippet_table_edit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/website_mail_snippet_table_edit/__openerp__.py b/website_mail_snippet_table_edit/__openerp__.py
new file mode 100644
index 00000000..1dd77103
--- /dev/null
+++ b/website_mail_snippet_table_edit/__openerp__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# © 2016 Antiun Ingeniería S.L. - Jairo Llopis
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+{
+    "name": "Edit Table Rows in Website Mail Designer",
+    "summary": "Allows you to edit any <tr> element in any snippet/template",
+    "version": "8.0.1.0.0",
+    "category": "Social Network",
+    "website": "http://www.antiun.com",
+    "author": "Antiun Ingeniería S.L., Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": [
+        "website_mail",
+    ],
+    "data": [
+        "views/snippets.xml",
+    ],
+}
diff --git a/website_mail_snippet_table_edit/static/description/icon.png b/website_mail_snippet_table_edit/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/website_mail_snippet_table_edit/static/description/icon.png differ
diff --git a/website_mail_snippet_table_edit/views/snippets.xml b/website_mail_snippet_table_edit/views/snippets.xml
new file mode 100644
index 00000000..758afd59
--- /dev/null
+++ b/website_mail_snippet_table_edit/views/snippets.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- © 2016 Antiun Ingeniería S.L. - Jairo Llopis
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
+
+<openerp>
+<data>
+
+    <template id="email_designer_snippets"
+              inherit_id="website_mail.email_designer_snippets">
+        <xpath expr="//div[@id='snippet_options']">
+            <div data-snippet-option-id='tr_editor'
+                data-selector="[data-oe-field='body_html'] tr">
+            </div>
+        </xpath>
+    </template>
+
+</data>
+</openerp>