diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index fb6b8f90bda..ef56c97deea 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -70,9 +70,6 @@ class crm_claim(crm.crm_case, osv.osv):
                                 " mail gateway."),
         'company_id': fields.many2one('res.company', 'Company'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                # domain="[('partner_id','=',partner_id)]"
-                                 ),
         'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'partner_phone': fields.char('Phone', size=32),
@@ -89,7 +86,6 @@ class crm_claim(crm.crm_case, osv.osv):
     _defaults = {
         'user_id': crm.crm_case._get_default_user,
         'partner_id': crm.crm_case._get_default_partner,
-        'partner_address_id': crm.crm_case._get_default_partner_address,
         'email_from':crm.crm_case. _get_default_email,
         'state': lambda *a: 'draft',
         'section_id':crm.crm_case. _get_section,
@@ -105,23 +101,11 @@ class crm_claim(crm.crm_case, osv.osv):
            :param email: ignored
         """
         if not part:
-            return {'value': {'partner_address_id': False,
-                            'email_from': False,
-                            'partner_phone': False
-                            }}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
-        data = {'partner_address_id': addr['contact']}
-        data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        return {'value': data}
-
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        """This function returns value of partner email based on Partner Address
-           :param part: Partner's id
-           :param email: ignored
-        """
-        if not add:
-            return {'value': {'email_from': False}}
-        address = self.pool.get('res.partner.address').browse(cr, uid, add)
+            return {'value': {'email_from': False,
+                              'partner_phone': False
+                            }
+                   }
+        address = self.pool.get('res.partner.address').browse(cr, uid, part)
         return {'value': {'email_from': address.email, 'partner_phone': address.phone}}
 
     def case_open(self, cr, uid, ids, *args):
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index 8279e04eb6f..592e655b489 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -7,7 +7,6 @@
     -->
     
         <record id="crm_case_claim01" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_15"/>
             <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
             <field name="partner_id" ref="base.res_partner_11"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -21,7 +20,6 @@
         </record>
         
         <record id="crm_case_claim02" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_6"/>
             <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
             <field name="partner_id" ref="base.res_partner_6"/>
             <field eval="&quot;4&quot;" name="priority"/>
@@ -35,7 +33,6 @@
         </record>
         
         <record id="crm_case_claim03" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_2"/>
             <field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field eval="&quot;2&quot;" name="priority"/>
@@ -63,7 +60,6 @@
         </record>
         
         <record id="crm_case_claim05" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_10"/>
             <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
             <field name="partner_id" ref="base.res_partner_5"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -77,7 +73,6 @@
         </record>
         
         <record id="crm_case_claim06" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6bb7e089baa..edeb43a8801 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -90,8 +90,6 @@
                                     <separator colspan="2" string="Claim Reporter"/>
                                     <field name="partner_id" string="Partner"
                                         on_change="onchange_partner_id(partner_id)" />
-                                    <field name="partner_address_id" string="Contact"
-                                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                                     <field name="partner_phone"/>
                                     <field name="email_from" widget="email"/>
                                 </group>
@@ -289,15 +287,5 @@
             res_model="crm.claim"
             src_model="res.partner"/>
 
-
-        <act_window
-            domain="[('partner_address_id', '=', active_id)]"
-            context="{'default_partner_address_id': active_id}"
-            id="act_claim_partner_address"
-            name="Claims"
-            view_mode="tree,form"
-            res_model="crm.claim"
-            src_model="res.partner.address"/>
-
      </data>
 </openerp>