diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 74155540fe8..ca3f40a7023 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 2544935b0a4..51ba3578f9a 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.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
index ac6c0b56560..458a0a5503a 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
@@ -1,8 +1,10 @@
 
 function config_close()
 {
-	window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+   window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+	window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
 }
+
 //set the value of the configuration fields
 function config_change_load()
 {
@@ -58,10 +60,12 @@ function config_ok()
 	}
 	setServer("http://"+document.getElementById('txtcurl').value +":" + document.getElementById('txtcport').value);
 	window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+    window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
 }
 function openConfigChange()
 {
-	window.open("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
+    window.close("chrome://openerp_plugin/content/config.xul", "", "chrome");
+    window.open("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
 }
 
 function appendDbList()
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 79af8564da5..9f6243d4c76 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
@@ -3,13 +3,16 @@
 <!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/config_change.dtd">
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"  onload="config_change_load()"
-	title="Server" height="140" width="240">
+	title="Openerp Connection" height="140" width="280">
 <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>
 <script type="text/javascript" src="chrome://openerp_plugin/content/loaddata.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/static.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
-	<description>Connect To OpenERP Server</description>
+    <hbox>
+    <spacer width="70"/>
+	<description>Openerp Connection</description>
+    </hbox>
 <groupbox id="gpData" width="200">
 	<hbox >
 		<label id="lblurl" control="txtcurl" value="&lblurl.label;" width="80"/>
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 c39e0e80f58..4a43dcd1d42 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
@@ -45,7 +45,6 @@ var myPrefObserver =
 	//set the initial value of name and email field of create contact window
 	createContact: function()
 	{
-		//document.getElementById("txtselectpartner").value= getPartnerName();
         document.getElementById("txtname").value= getSenderName();
         document.getElementById("txtemail").value= getSenderEmail();
         document.getElementById("country").value=getAllCountry();
@@ -122,13 +121,10 @@ var myPrefObserver =
     	// aData is the name of the pref that's been changed (relative to aSubject)
     	switch (aData) {
       		case "serverport":
-        	// extensions.myextension.pref1 was changed
         	break;
       	case "serverurl":
-      		// extensions.myextension.pref2 was changed
         	break;
       	case "serverdbname":
-      		// extensions.myextension.pref2 was changed
         	break;
     	}
   	},
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 9be5ff74f7b..998e5357737 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
@@ -246,7 +246,6 @@ function open_contact()
 //function to open the configuration window
 var Config = {
   onLoad: function() {
-    // initialization code
     this.initialized = true;
   },
 
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 6cb92fc875b..240ab6afb04 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
@@ -396,7 +396,6 @@ function getPassword(){
 //get serverservice
 function getServerService(){
 	return strServerService;
-     // return getPref().getCharPref('strServerService');
 }
 
 //get sender email
@@ -1342,11 +1341,9 @@ var listCreateContactHandler = {
 		window.close();
 	},
 	onFault: function (client, ctxt, fault) {
-		alert('XML-RPC Fault: '+fault);
 	},
 
 	onError: function (client, ctxt, status, errorMsg) {
-		alert('Error: '+errorMsg);
 	}
 }
 
@@ -1629,11 +1626,9 @@ var listcreateLoginHandler = {
 		}
 	},
 	onFault: function (client, ctxt, fault) {
-		alert('XML-RPC Fault: '+fault);
 	},
 
 	onError: function (client, ctxt, status, errorMsg) {
-		setconnect_server("false")
 	}
 }
 
@@ -1659,7 +1654,6 @@ var listCreatePartnerHandler = {
 		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
 		
 		if(typeof(createId.data) == 'number' && createId!=0){
-//			alert("Partner Created Successfully");
 			window.close();
 		}
 		if(createId == 0){
@@ -1847,7 +1841,6 @@ var listsearchAttachmentHandler = {
 
 //function to create a new attachment record
 function listSearchDocumentAttachment(){
-	//alert("AA:")
 	var branchobj = getPref();
 	setServerService('xmlrpc/object');
 	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
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 560b414567a..037e0b9219d 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,4 +1,4 @@
-<!ENTITY title.label "OpenERP &amp; Thunderbird Integration!">
+<!ENTITY title.label "OpenERP Configuration">
 <!ENTITY separate.label "Configuration Login for OpenERP!">
 <!ENTITY close.label "Cancel">
 <!ENTITY database.label "Database: ">