diff --git a/addons/project_messages/__init__.py b/addons/project_messages/__init__.py
new file mode 100644
index 00000000000..de63635487f
--- /dev/null
+++ b/addons/project_messages/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+import messages
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_messages/__terp__.py b/addons/project_messages/__terp__.py
new file mode 100644
index 00000000000..54e1c77daeb
--- /dev/null
+++ b/addons/project_messages/__terp__.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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" : "In-Project Messaging System",
+    "version" : "1.0",
+    "depends" : ["project"],
+    "author" : "Tiny",
+    "description": """Provides the ability to send small messages to other
+    users on the project.
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_messages/messages.py b/addons/project_messages/messages.py
new file mode 100644
index 00000000000..dc505f9073f
--- /dev/null
+++ b/addons/project_messages/messages.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+from osv import fields, osv
+import netsvc
+
+class messages(osv.osv):
+    """Message from one user to another within a project
+    """
+    _name = 'project.messages'
+    logger = netsvc.Logger()
+
+    _columns = {
+        'to_id':fields.many2one('res.users', 'To', ondelete="CASCADE"),
+        'project_id':fields.many2one('project.project', 'Project',
+                                     required=True, ondelete="CASCADE"),
+        'message':fields.text('Message', required=True),
+    }
+
+    _defaults = {
+        'from_id':lambda self, cr, uid, context: uid,
+        'to_id':None,
+    }
+
+    def broadcast(self, cr, uid, project_id, message):
+        """ Send a message to all the users of a project.
+        The sender of the message is the current user.
+
+        The method returns the new message's id.
+
+        Arguments:
+        - `project_id`: the id of the project to broadcast to
+        - `message`: the message to broadcast
+        """
+        return self.create(cr, uid, {
+            'to_id':None,
+            'project_id':project_id,
+            'message':message
+        }, context=context)
+messages()
+
+class project_with_message(osv.osv):
+    _inherit = 'project.project'
+
+    _columns = {
+        'message_ids':fields.one2many(
+            'project.messages', 'project_id', 'Messages',
+            domain="[('to_id','in',[uid,False])]"),
+    }
+project_with_message()