diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index bda93fc485d..2ab391a3f02 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data noupdate="1">
 
+        <!-- Update demo user to avoid mail bombing -->
+        <record id="base.partner_demo" model="res.partner">
+            <field name="notification_email_send">none</field>
+        </record>
+
         <record id="message_blogpost0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>