diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 2049b3a8cc9..52ac01ad80b 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -66,7 +66,6 @@ Creates a dashboard for CRM that includes:
     ],
     'init_xml': [
         'crm_data.xml',
-        'crm_meeting_data.xml',
         'crm_lead_data.xml',
         'crm_meeting_data.xml',
         'crm_phonecall_data.xml',
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index ae1d2c8c7d0..19ec87666da 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -189,6 +189,31 @@ class crm_base(object):
         - ``state`` (selection field)
     """
 
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+        """ This function returns value of partner email based on Partner Address
+            :param add: Id of Partner's address
+            :param email: Partner's email ID
+        """
+        data = {'value': {'email_from': False, 'phone':False}}
+        if add:
+            address = self.pool.get('res.partner').browse(cr, uid, add)
+            data['value'] = {'email_from': address and address.email or False ,
+                             'phone':  address and address.phone or False}
+        if 'phone' not in self._columns:
+            del data['value']['phone']
+        return data
+
+    def onchange_partner_id(self, cr, uid, ids, part, email=False):
+        """ This function returns value of partner address based on partner
+            :param part: Partner's id
+            :param email: Partner's email ID
+        """
+        data={}
+        if  part:
+            addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
+            data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
+        return {'value': data}
+
     def case_open(self, cr, uid, ids, context=None):
         """ Opens case """
         cases = self.browse(cr, uid, ids, context=context)
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 1880f2fbcb9..833178af6e5 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -20,12 +20,16 @@
 ##############################################################################
 
 from base_calendar import base_calendar
-from crm import crm_base
+from crm import crm_base, crm_case
 import logging
 from osv import fields, osv
 import tools
 from tools.translate import _
 
+class crm_lead(crm_case, osv.osv):
+        """ CRM Leads """
+        _name = 'crm.lead'
+
 class crm_meeting(crm_base, osv.Model):
     """ Model for CRM meetings """
     _name = 'crm.meeting'