diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 42b7144ebfc..f43700311f9 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -39,7 +39,7 @@
             <field name="city"></field>
             <field name="zip"></field>
             <field name="phone"></field>
-            <field name="email">info@yourcompany.com</field>
+            <field name="email">info@yourcompany.example.com</field>
             <field name="website">www.yourcompany.com</field>
         </record>
 
@@ -68,7 +68,7 @@
             <field name="name">Administrator</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
-            <field name="email">admin@example.com</field>
+            <field name="email">admin@yourcompany.example.com</field>
         </record>
 
         <record model="res.users" id="base.user_root">
diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index b0f9a359889..0804a8fd100 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -6,7 +6,7 @@
             <field name="name">Demo User</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
-            <field name="email">demo@example.com</field>
+            <field name="email">demo@yourcompany.example.com</field>
         </record>
 
         <record id="main_partner" model="res.partner">
@@ -16,7 +16,7 @@
             <field name="zip">18540</field>
             <field name="country_id" ref="us"/>
             <field name="phone">+1 555 123 8069</field>
-            <field name="email">info@example.com</field>
+            <field name="email">info@yourcompany.example.com</field>
             <field name="website">www.example.com</field>
             <field name="image">iVBORw0KGgoAAAANSUhEUgAAALQAAAAuCAYAAACBMDMXAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A
 /wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sDCAo7GWN31l0AAA1fSURBVHja
@@ -169,7 +169,7 @@ gk//2Q==</field>
         </record>
 
         <record model="res.partner" id="base.partner_root">
-            <field name="email">admin@example.com</field>
+            <field name="email">admin@yourcompany.example.com</field>
             <field name="tz">Europe/Brussels</field>
             <field name="image">/9j/4AAQSkZJRgABAQEBLAEsAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEP
 ERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4e
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 666662aa5a8..54c987751d9 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -477,6 +477,7 @@
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="use_parent_address">1</field>
             <field name="function">Production Supervisor</field>
+            <field name="email">richard.ellis@deltapc.example.com</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
         </record>
@@ -485,6 +486,7 @@
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="use_parent_address">1</field>
             <field name="function">Line Mechanic</field>
+            <field name="email">paul.williams@deltapc.example.com</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
         </record>
@@ -493,6 +495,7 @@
             <field name="parent_id" eval="ref('res_partner_4')"/>
             <field name="use_parent_address">1</field>
             <field name="function">Computer Technician</field>
+            <field name="email">brian.williams@deltapc.example.com</field>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
         </record>
diff --git a/openerp/addons/base/res/res_partner_demo.yml b/openerp/addons/base/res/res_partner_demo.yml
index 9a4fb3b41ea..10b468a5061 100644
--- a/openerp/addons/base/res/res_partner_demo.yml
+++ b/openerp/addons/base/res/res_partner_demo.yml
@@ -4,173 +4,182 @@
     parent_id: base.res_partner_2
     use_parent_address: True
     function: Functional Consultant
-    email: p.thomas@agrolait.com
+    email: thomas.passot@agrolait.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_4}:
     name: Michel Fletcher
     parent_id: base.res_partner_2
     use_parent_address: True
     function: Analyst
-    email: m.fletcher@agrolait.com
+    email: michel.fletcher@agrolait.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_5}:
     name: Chao Wang
     parent_id: base.res_partner_3
     use_parent_address: True
     function: Marketing Manager
-    email: chao_wang@chinaexport.com
+    email: chao.wang@chinaexport.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_6}:
     name: Zhi Ch'ang
     parent_id: base.res_partner_3
     use_parent_address: True
     function: Supervisor
-    email: zhi_chang@chinaexport.com
+    email: zhi.chang@chinaexport.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_10}:
     name: David Simpson
     parent_id: base.res_partner_5
     use_parent_address: True
     function: Senior Consultant
-    email: david.s@tech.info
+    email: david.simpson@epic.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_11}:
     name: John M. Brown
     parent_id: base.res_partner_5
     use_parent_address: True
     function: Director
-    email: john.b@tech.info
+    email: john.brown@epic.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_13}:
     name: Charlie Bernard
     parent_id: base.res_partner_7
     use_parent_address: True
     function: Senior Associate
-    email: charlie.bernard@wealthyandsons.com
+    email: charlie.bernard@wealthyandsons.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_14}:
     name: Jessica Dupont
     parent_id: base.res_partner_7
     use_parent_address: True
     function: Analyst
-    email: jessica.dupont@wealthyandsons.com
+    email: jessica.dupont@wealthyandsons.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_15}:
     name: Phillipp Miller
     parent_id: base.res_partner_8
     use_parent_address: True
     function: Creative Director
+    email: phillipp.miller@mediapole.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_16}:
     name: Ayaan Agarwal
     parent_id: base.res_partner_9
     use_parent_address: True
     function: Director
+    email: ayaan.agarwal@bestdesigners.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_17}:
     name: Daniel Jackson
     parent_id: base.res_partner_10
     use_parent_address: True
     function: Managing Partner
-    email: daniel@jackson.com
+    email: daniel.jackson@jackson.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_18}:
     name: William Thomas
     parent_id: base.res_partner_10
     use_parent_address: True
     function: Senior Consultant
-    email: william@jackson.com
+    email: william.jackson@jackson.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_19}:
     name: Sergio Pérez
     parent_id: base.res_partner_11
     use_parent_address: True
     function: Accountant
-    email:
+    email: sergio.perez@luminous.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_20}:
     name: Laura Castro
     parent_id: base.res_partner_11
     use_parent_address: True
     function: Goods Supervisor
-    email:
+    email: laura.castro@luminous.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_21}:
     name: Luc Maurer
     parent_id: base.res_partner_12
     use_parent_address: True
     function: Director
+    email: luc.maurer@camptocamp.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_22}:
     name: Laith Jubair
     parent_id: base.res_partner_13
     use_parent_address: True
     function: Director
+    email: laith.jubair@axelor.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_23}:
     name: Angel Cook
     parent_id: base.res_partner_14
     use_parent_address: True
     function: General Manager
-    email: angel.cook@chamberworks.com
+    email: angel.cook@chamberworks.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_24}:
     name: Robert Anderson
     parent_id: base.res_partner_14
     use_parent_address: True
     function: System Analyst
-    email: robert.anderson@chamberworks.com
+    email: robert.anderson@chamberworks.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_25}:
     name: Jacob Taylor
     parent_id: base.res_partner_15
     use_parent_address: True
     function: Order Clerk
+    email: jacob.taylor@millennium.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_28}:
     name: Benjamin Flores
     parent_id: base.res_partner_17
     use_parent_address: True
     function: Business Executive
-    email: ben@nebula.ar
+    email: benjamin.flores@nebula.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_29}:
     name: George Wilson
     parent_id: base.res_partner_18
     use_parent_address: True
     function: Chief Information Officer (CIO)
-    email:
+    email: george.wilson@thinkbig.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_30}:
     name: Lucas Jones
     parent_id: base.res_partner_18
     use_parent_address: True
     function: Functional Consultant
-    email: jones@thinkbig.com
+    email: lucas.jones@thinkbig.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_32}:
     name: Robin Smith
     parent_id: base.res_partner_21
     use_parent_address: True
     function: Sales Manager
+    email: robin.smith@globalsolutions.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_33}:
     name: Morgan Rose
     parent_id: base.res_partner_21
     use_parent_address: True
     function: Financial Manager
+    email: morgan.rose@globalsolutions.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_34}:
     name: Kevin Clarke
     parent_id: base.res_partner_21
     use_parent_address: True
     function: Knowledge Manager
+    email: kevin.clarke@globalsolutions.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_address_36}:
     name: Nhomar Hernandez
     parent_id: base.res_partner_23
     use_parent_address: True
     function: Chief Executive Officer
+    email: nhomar.hernandez@vauxoo.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_main1}:
     name: Mark Davis
@@ -178,7 +187,7 @@
     parent_id: base.main_partner
     use_parent_address: True
     function: Chief Executive Officer (CEO)
-    email: mark@yourcompany.com
+    email: mark.davis@yourcompany.example.com
 -
   !record {model: 'res.partner', id: base.res_partner_main2}:
     name: Roger Scott
@@ -186,4 +195,4 @@
     parent_id: base.main_partner
     use_parent_address: True
     function: Chief Operations Officer (COO)
-    email: roger@yourcompany.com
+    email: roger.scott@yourcompany.example.com