diff --git a/web_send_message_popup/__init__.py b/web_send_message_popup/__init__.py
new file mode 100644
index 00000000..40a96afc
--- /dev/null
+++ b/web_send_message_popup/__init__.py
@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-
diff --git a/web_send_message_popup/__openerp__.py b/web_send_message_popup/__openerp__.py
new file mode 100644
index 00000000..2cbc0557
--- /dev/null
+++ b/web_send_message_popup/__openerp__.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{'name': 'Web Send Message as Popup',
+ 'version': '1.0',
+ 'author': 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'license': 'AGPL-3',
+ 'category': 'Hidden',
+ 'depends': ['web',
+             ],
+ 'description': """
+Web Send Message as Popup
+=========================
+
+In the email/notes threads below the form views, the link 'Send a
+message' unfold a text field. From there, a button allows to open the
+text field in a full featured email popup with the subject, templates,
+attachments and followers.
+
+This module changes the link 'Send a message' so it opens directly the
+full featured popup instead of the text field, avoiding an extra click
+if the popup is always wanted.
+
+ """,
+ 'website': 'http://www.camptocamp.com',
+ 'qweb': ['static/src/xml/mail.xml',
+          ],
+ 'installable': True,
+ 'auto_install': False,
+}
diff --git a/web_send_message_popup/static/src/xml/mail.xml b/web_send_message_popup/static/src/xml/mail.xml
new file mode 100644
index 00000000..21029a47
--- /dev/null
+++ b/web_send_message_popup/static/src/xml/mail.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+  <t t-extend="mail.compose_message">
+    <t t-jquery="a.oe_compose_post:eq(0)" t-operation="replace">
+      <a class="oe_compose_post oe_full" t-if="widget.options.compose_placeholder"><t t-raw="widget.options.compose_placeholder"/></a>
+    </t>
+    <t t-jquery="a.oe_compose_post:eq(1)" t-operation="replace">
+      <a class="oe_compose_post oe_full" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox">Send a message</a>
+    </t>
+  </t>
+</template>