diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 9022f347e50..fe0f585d622 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -54,7 +54,7 @@ class tinythunderbird_partner(osv.osv):
                  'date': lambda *a: time.strftime('%Y-%m-%d')
                  }
 
-    def thunderbird_mailcreate(self,cr,user,vals):
+    def thunderbird_mailcreate(self,cr,user,vals):
         dictcreate = dict(vals)
         import email
         header_name = email.Header.decode_header(dictcreate['name'])
@@ -62,7 +62,7 @@ class tinythunderbird_partner(osv.osv):
         add_obj=self.pool.get('res.partner.address')
         case_pool=self.pool.get(dictcreate.get('object','crm.case'))
         partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
-        partner=add_obj.read(cr,user,partner_ids,['partner_id','name'])
+        partner=add_obj.read(cr,user,partner_ids,['partner_id','name'])
         if partner and partner[0] and partner[0]['partner_id']:
             dictcreate.update({'partner_id':partner[0]['partner_id'][0],'partner_name':partner[0]['name']})
         create_id = case_pool.create(cr, user, dictcreate)
@@ -81,20 +81,20 @@ class tinythunderbird_partner(osv.osv):
         res = {}
         if partner:
             partner=partner[0]
-            test = address_obj.read(cr,user, partner)
+            data = address_obj.read(cr,user, partner)
             res = {
-                'partner_name': test['partner_id'] and test['partner_id'][1] or '',
-                'contactname': test['name'] or '',
-                'street': test['street'] or '',
-                'street2': test['street2'] or '',
-                'zip': test['zip'] or '',
-                'city': test['city'] or '',
-                'country': test['country_id'] and test['country_id'][0] or '',
-                'state': test['state_id'] and test['state_id'][0] or '',
-                'email': test['email'] or '',
-                'phone': test['phone'] or '',
-                'mobile': test['mobile'] or '',
-                'fax': test['fax'] or '',
+                'partner_name': data['partner_id'] and data['partner_id'][1] or '',
+                'contactname': data['name'] or '',
+                'street': data['street'] or '',
+                'street2': data['street2'] or '',
+                'zip': data['zip'] or '',
+                'city': data['city'] or '',
+                'country': data['country_id'] and data['country_id'][1] or '',
+                'state': data['state_id'] and data['state_id'][1] or '',
+                'email': data['email'] or '',
+                'phone': data['phone'] or '',
+                'mobile': data['mobile'] or '',
+                'fax': data['fax'] or '',
                 'res_id': str(partner),
             }
         return res.items()
@@ -132,7 +132,7 @@ class tinythunderbird_partner(osv.osv):
         if search_id:
             return 0
         create_id = address_obj.create(cr, user, dictcreate)
-        return create_id
+        return create_id
 
     def thunderbird_searchobject(self,cr,user,vals):
         dictcreate = dict(vals)
@@ -180,7 +180,7 @@ class tinythunderbird_partner(osv.osv):
             name_get.append('error')
             name_get.append(er_val)
         return name_get
-
+
     def thunderbird_attachment(self,cr,user,vals):
         dictcreate = dict(vals)
         datas = [dictcreate['datas']]
diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi
index 4ad25de7415..83163960319 100644
Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ