diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 5472bd2c937..e61a59df30e 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -120,6 +120,13 @@ ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'we
 class res_partner(osv.osv):
     _description='Partner'
     _name = "res.partner"
+
+    def _address_display(self, cr, uid, ids, name, args, context=None):
+        res={}
+        for addr in self.browse(cr, uid, ids, context):
+            res[addr.id] =self._display_address(cr,uid,addr,context)
+        return res
+
     _order = "name"
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
@@ -165,6 +172,8 @@ class res_partner(osv.osv):
         'photo': fields.binary('Photo'),
         'company_id': fields.many2one('res.company', 'Company', select=1),
         'color': fields.integer('Color Index'),
+        'contact_address': fields.function(_address_display,  type='char', string='Address format'),
+
     }
 
     def _default_category(self, cr, uid, context=None):
@@ -243,7 +252,7 @@ class res_partner(osv.osv):
         if isinstance(ids, (int, long)):
             ids = [ids]
         if vals.get('is_company')==False:
-            vals.update({'child_ids' : [(5,)]}) 
+            vals.update({'child_ids' : [(5,)]})
         for partner in self.browse(cr, uid, ids, context=context):
             update_ids = []
             if partner.is_company:
@@ -299,8 +308,8 @@ class res_partner(osv.osv):
         if name and operator in ('=', 'ilike', '=ilike', 'like'):
             # search on the name of the contacts and of its company
             name2 = operator == '=' and name or '%' + name + '%'
-            cr.execute('''SELECT partner.id FROM res_partner partner 
-                          LEFT JOIN res_partner company ON partner.parent_id = company.id 
+            cr.execute('''SELECT partner.id FROM res_partner partner
+                          LEFT JOIN res_partner company ON partner.parent_id = company.id
                           WHERE partner.name || ' (' || COALESCE(company.name,'') || ')'
                           ''' + operator + ''' %s ''', (name2,))
             ids = map(lambda x: x[0], cr.fetchall())
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 064a1e468a3..cb71aa37f95 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -540,16 +540,8 @@
                                                         <h4><a type="edit"><field name="name"/></a>
                                                             <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
                                                         </h4>
-                                                            <i><div t-if="record.street.raw_value"><field name="street"/><br/></div>
-                                                            <div t-if="record.street2.raw_value">
-                                                            <field name="street2"/><br/></div>
-                                                            <div t-if="record.city.raw_value"><field name="city"/><span>,</span>
-                                                            <field name="zip"/><br/></div>
-                                                            <div t-if="record.state_id.raw_value">
-                                                            <field name="state_id"/><br/>
-                                                            </div>
-                                                            <div t-if="record.country_id.raw_value">
-                                                            <field name="country_id"/><br/></div><div t-if="record.email.raw_value">
+                                                            <i><div t-if="record.contact_address.raw_value"><field name="contact_address"/><br/></div>
+															<div t-if="record.email.raw_value">
                                                             <field name="email"/><br/></div>
                                                             <div t-if="record.mobile.raw_value">
                                                             <field name="mobile"/><br/>