diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index fb1a1d2f983..c02668b826c 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 c6ca0eaada1..507057f7cc0 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/config_change.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
index 574fe244f2a..86f777ccb75 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
@@ -24,7 +24,7 @@
     
 </groupbox>
 <hbox align="right">
-  <button label="Cancel" image="&imagecancel.value;" oncommand="config_close();" />
+  <button label="Close" image="&imagecancel.value;" oncommand="config_close();" />
   <button label="OK" image="&imageok.value;" oncommand="config_ok()"/>
 </hbox>
 
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/loaddata.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/loaddata.js
index 4bf92728a06..0bee6e705a6 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/loaddata.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/loaddata.js
@@ -33,6 +33,7 @@ function selectPartner(){
 	}
 }
 
+
 //function for the intialization procedure //used while loading and unloading of the window
 var myPrefObserver =
 {
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
index 30ddf20b402..96f4a43b578 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
@@ -472,7 +472,8 @@ var Address = {
 	},
 
 	onMenuItemCommand: function(){
-       open_contact();
+       open_contact();
+       
 	}
 };
 
@@ -484,10 +485,11 @@ var Select = {
 	},
 
 	onMenuItemCommand: function(){
-         //document.getElementById("txtselectpartner").value="";
-		 window.open("chrome://openerp_plugin/content/selectpartner.xul", "", "chrome");
+        // document.getElementById("txtselectpartner").value="";
+		 window.open("chrome://openerp_plugin/content/selectpartner.xul", "", "chrome");
     }
-};
+};
+
 
 var CreatePartner = {
 	onLoad: function(){
@@ -495,7 +497,7 @@ var CreatePartner = {
 	},
 
 	onMenuItemCommand: function(){
-		window.open("chrome://openerp_plugin/content/createpartner.xul", "", "chrome");
+		window.open("chrome://openerp_plugin/content/createpartner.xul", "", "chrome");
 	}
 };
 window.addEventListener("load", function(e) { CreatePartner.onLoad(e); }, false);
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
index f0c44cd6555..ca35f02cc2a 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/selectpartner.dtd">
-<window id="partnerwindowsid" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	xmlns:html="http://www.w3.org/1999/xhtml" onload="getPartnerList()"
+<window id="partnerwindowsid" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" onload="getPartnerList()"
 	title="&title.label;" height="500" width="375">
 <script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/config.js"></script>
@@ -29,7 +28,7 @@
   <button label="Create Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);"/>
   <spacer width="45"/>
   <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
-  <button label="&select.label;" image="&imageok.value;" oncommand="selectPartner();close()"/>
+  <button label="&select.label;" image="&imageok.value;" oncommand="selectPartner();close();"/>
 </hbox>
 
 </window>
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 85080d575e7..2a4f09ff673 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
@@ -1329,7 +1329,9 @@ var listPartnerHandler = {
 	  			listItem.value = arrPartnerList[i][0];
 	  			cmdPartnerList.appendChild(listItem);
 			}
+
 		}
+ 
 	},
 	onFault: function (client, ctxt, fault) {
 
@@ -1368,7 +1370,6 @@ function getPartnerList(){
 }
 
 
-
 //function to create the xmlrpc supported variables for xmlrpc request
 function dictcontact(a,b){
 	var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
index 23cd94efa05..26495872037 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
@@ -1,6 +1,6 @@
 <!ENTITY title.label "OpenERP Configuration">
 <!ENTITY separate.label "Configuration Login for OpenERP!">
-<!ENTITY close.label "Cancel">
+<!ENTITY close.label "Close">
 <!ENTITY database.label "Database:">
 <!ENTITY ok.label "OK">
 <!ENTITY connection.label "Connect">