diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index df0beb16258..00d070fe83c 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -38,6 +38,7 @@ class thunderbird_partner(osv.osv_memory):
         dictcreate['name'] = header_name and header_name[0] and header_name[0][0]
         address_obj = self.pool.get('res.partner.address')
         case_pool = self.pool.get(dictcreate.get('object','crm.lead'))
+#        case_pool = self.pool.get(dictcreate.get('object','email.server.tools'))
         partner_ids = address_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
         partner = address_obj.read(cr,user,partner_ids,['partner_id','name'])
         if partner and partner[0] and partner[0]['partner_id']:
@@ -57,7 +58,11 @@ class thunderbird_partner(osv.osv_memory):
     def search_contact(self, cr, user, vals):
         address_obj = self.pool.get('res.partner.address')
         partner = address_obj.search(cr, user,[('email','=',vals)])
+        res1 = {}
         res = {}
+        if not partner:
+            return
+
         if partner:
             partner=partner[0]
             data = address_obj.read(cr,user, partner)
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 4a13ed76bef..797e0a653b7 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index cca4c5164bc..bda198b5a86 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul
index 3e5cadca020..bf1d1a67059 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/address.xul
@@ -117,7 +117,7 @@
   <spacer width="450"/>
 	   <button label="&create.label;" accesskey="r" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
 
-    <button label="&ok.label;" image="&imageok.value;" oncommand="createContact();"/>
+    <button label="&ok.label;" image="&imageok.value;" oncommand="UpdateContact();"/>
 
   <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
 </hbox>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
index 5de102dc73a..1d2865145f8 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
@@ -995,6 +995,7 @@ var listSearchContactdetailHandler = {
 			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
             var strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
             var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+
             if(strlSearchResult=="partner_name"){
                  document.getElementById("txtname").value =strlSearchResultValue;}
 
@@ -1022,9 +1023,7 @@ var listSearchContactdetailHandler = {
 
             if(strlSearchResult=="email"){
                 document.getElementById("txtemail").value =strlSearchResultValue;}
-            if(strlSearchResult=="email"){
-                document.getElementById("txtemailid").value =strlSearchResultValue;}
-    
+
 		}
 	},
 	onFault: function (client, ctxt, fault) {
@@ -1449,6 +1448,8 @@ var listCreateContactHandler = {
 var listUpdateContactHandler = {
 	onResult: function(client, context, result) {
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        alert("Contact Update Successfully.");
+        window.close();
 		var partnerId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
 		setResourceId(partnerId);
 		window.close();