diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index a5d69534284..c53b05df811 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,35 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+    <data noupdate="1">
+        <record id="mail_alias_marketing_department" model="mail.alias">
+            <field name="alias_name">info</field>
+            <field name="alias_model_id" ref="model_crm_lead"/>
+            <field name="alias_user_id" ref="base.user_root"/>
+            <field name="alias_defaults">{'type':'lead'}</field>
+        </record>
+    </data>
+
     <data>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
         </record>
 
-    <record id="ir_ui_view_sc_calendar_demo" model="ir.ui.view_sc">
-        <field name="name">Meetings</field>
-        <field name="resource">ir.ui.menu</field>
-        <field name="user_id" ref="base.user_demo"/>
-        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
-    </record>
+        <record id="ir_ui_view_sc_calendar_demo" model="ir.ui.view_sc">
+            <field name="name">Meetings</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+        </record>
 
-    <record id="mail_alias_marketing_department" model="mail.alias">
-        <field name="alias_name">info</field>
-        <field name="alias_model_id" ref="model_crm_lead"/>
-        <field name="alias_user_id" ref="base.user_root"/>
-        <field name="alias_defaults">{'type':'lead'}</field>
-    </record>
-    
-    <record model="crm.case.section" id="section_sales_marketing_department">
-            <field name="name">Sales Marketing Department</field>
-            <field name="code">Sales Marketing</field>
-            <field name="parent_id" ref="crm.section_sales_department"></field>
-            <field name="alias_id" ref="mail_alias_marketing_department"/>
-    </record>
+        <record model="crm.case.section" id="section_sales_marketing_department">
+                <field name="name">Sales Marketing Department</field>
+                <field name="code">Sales Marketing</field>
+                <field name="parent_id" ref="crm.section_sales_department"></field>
+                <field name="alias_id" ref="mail_alias_marketing_department"/>
+        </record>
 
-    <record model="crm.segmentation" id="crm_segmentation0">
-		<field name="name">OpenERP partners</field>
-		<field name="exclusif">True</field>
-		<field name="categ_id" ref="base.res_partner_category_2"/>
-	</record>
+        <record model="crm.segmentation" id="crm_segmentation0">
+		    <field name="name">OpenERP partners</field>
+		    <field name="exclusif">True</field>
+		    <field name="categ_id" ref="base.res_partner_category_2"/>
+	    </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 5b3a02f0f27..7f41df641b3 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -71,12 +71,12 @@
                             <field name="name" colspan="2"/>
                             <field name="parent_id"/>
                             <field name="code"/>
+                            <field name="alias_id" required="0" domain="[('alias_model_id', '=','crm.lead')]"/>
                         </group>
                         <group>
                             <field name="user_id"/>
                             <field name="resource_calendar_id"/>
                             <field name="active"/>
-                            <field name="alias_id" required="0" domain="[('alias_model_id', '=','crm.lead')]"/>
                         </group>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 011e8b27dc5..d4146271a29 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -5,3 +5,5 @@ access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
 access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
 access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
+access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
+access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1