diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 1f1bd74391a..688a3f00738 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -30,7 +30,7 @@
             <field name="name">Direct Sales</field>
             <field name="code">DM</field>
             <field name="use_leads">True</field>
-            <field name="alias_name">info</field>
+            <field name="alias_name">salesinfo</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
@@ -56,6 +56,13 @@
             <field name="section_id" ref="crm.section_sales_department"/>
         </record>
 
+        <!--default alias for leads-->
+        <record id="mail_alias_lead_info" 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"/>
+        </record>
+
         <!-- notify all employees of module installation -->
         <record model="mail.message" id="module_install_notification">
             <field name="model">mail.group</field>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index eaf51293355..9a08b0d8d43 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -965,6 +965,11 @@ class crm_lead(format_address, osv.osv):
         default['stage_id'] = self._get_default_stage_id(cr, uid, local_context)
         return super(crm_lead, self).copy(cr, uid, id, default, context=context)
 
+    def get_empty_list_help(self, cr, uid, help, context=None):
+        context['empty_list_help_model'] = 'crm.case.section'
+        context['empty_list_help_id'] = context.get('default_section_id', None)
+        return super(crm_lead, self).get_empty_list_help(cr, uid, help, context=context)
+
     # ----------------------------------------
     # Mail Gateway
     # ----------------------------------------
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 5f3ffe272e7..1fda9ed41d4 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -66,7 +66,48 @@ class crm_configuration(osv.TransientModel):
         'group_multi_salesteams': fields.boolean("Organize Sales activities into multiple Sales Teams",
             implied_group='base.group_multi_salesteams',
             help="""Allows you to use Sales Teams to manage your leads and opportunities."""),
+        'alias_prefix': fields.char('Default Alias Name for Leads'),
+        'alias_domain' : fields.char('Alias Domain'),
     }
 
+    def get_default_alias_prefix(self, cr, uid, ids, context=None):
+        alias_name = ''
+        mail_alias = self.pool.get('mail.alias')
+        try:
+            alias_name = self.pool.get('ir.model.data').get_object(cr, uid, 'crm', 'mail_alias_lead_info').alias_name
+        except Exception:
+            model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.lead')], context=context)
+            alias_ids = mail_alias.search(cr, uid, [('alias_model_id', '=', model_ids[0]),('alias_defaults', '=', '{}')], context=context)
+            if alias_ids:
+                alias_name = mail_alias.browse(cr, uid, alias_ids[0], context=context).alias_name
+        return {'alias_prefix': alias_name}
+
+    def set_default_alias_prefix(self, cr, uid, ids, context=None):
+        mail_alias = self.pool.get('mail.alias')
+        record = self.browse(cr, uid, ids[0], context=context)
+        default_alias_prefix = self.get_default_alias_prefix(cr, uid, ids, context=context)['alias_prefix']
+        if record.alias_prefix != default_alias_prefix:
+            try:
+                alias = self.pool.get('ir.model.data').get_object(cr, uid, 'crm', 'mail_alias_lead_info')
+                if alias:
+                    alias.write({'alias_name': record.alias_prefix})
+            except Exception:
+                model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.lead')], context=context)
+                alias_ids = mail_alias.search(cr, uid, [('alias_model_id', '=', model_ids[0]),('alias_defaults', '=', '{}')], context=context)
+                if alias_ids:
+                    mail_alias.write(cr, uid, alias_ids[0], {'alias_name': record.alias_prefix}, context=context)
+                else:
+                    mail_alias.create_unique_alias(cr, uid, {'alias_name': record.alias_prefix}, model_name="crm.lead", context=context)
+        return True
+
+    def get_default_alias_domain(self, cr, uid, ids, context=None):
+        alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
+        if not alias_domain:
+            domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context)
+            try:
+                alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0]
+            except Exception:
+                pass
+        return {'alias_domain': alias_domain}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 9fd542c9dbd..ef1da644a6a 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -25,10 +25,18 @@
                     <separator string="Sales Teams"/>
                     <group>
                         <label for="id" string="Manage Sales Teams"/>
+                        <div>
                         <div>
                             <field name="group_multi_salesteams" class="oe_inline"/>
                             <label for="group_multi_salesteams"/>
                         </div>
+                        <div attrs="{'invisible': [('alias_domain', '=', False)]}">
+                            <label string="Default Lead email address"/>
+                            <field name="alias_prefix" class="oe_inline" attrs="{'required': [('alias_domain', '!=', False)]}"/>
+                            @
+                            <field name="alias_domain" class="oe_inline" readonly="1"/>
+                        </div>
+                        </div>
                     </group>
 	            </div>
             </field>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 57950376beb..e12bb85c631 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -113,10 +113,10 @@ class mail_thread(osv.AbstractModel):
                     object_id.alias_id.alias_model_id.model == self._name and \
                     object_id.alias_id.alias_force_thread_id == 0:
                 alias = object_id.alias_id
-        elif catchall_domain and model:  # no specific res_id given -> generic help message, take an example alias (i.e. alias of some section_id)
+        if catchall_domain and model and not alias:  #check for example alias if res_id not given or given res_id dose not contain alias-> generic help message, take an example alias (i.e. alias of some section_id)
             model_id = self.pool.get('ir.model').search(cr, uid, [("model", "=", self._name)], context=context)[0]
             alias_obj = self.pool.get('mail.alias')
-            alias_ids = alias_obj.search(cr, uid, [("alias_model_id", "=", model_id), ("alias_name", "!=", False), ('alias_force_thread_id', '=', 0)], context=context, order='id ASC')
+            alias_ids = alias_obj.search(cr, uid, [("alias_model_id", "=", model_id), ("alias_name", "!=", False), ('alias_force_thread_id', '=', False), ('alias_parent_thread_id', '=', False)], context=context, order='id ASC')
             if alias_ids and len(alias_ids) == 1:  # if several aliases -> incoherent to propose one guessed from nowhere, therefore avoid if several aliases
                 alias = alias_obj.browse(cr, uid, alias_ids[0], context=context)