diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/chrome/openerp_plugin.jar
index 5a74b44629e..cca77785288 100644
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js
index 8a3b226f68e..93d21f56f5c 100755
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js
@@ -56,7 +56,7 @@ var myPrefObserver =
 	register: function()
   	{
 	    appendDbList()
-    	    preferenceBranch.addObserver("", myPrefObserver, false);
+    	preferenceBranch.addObserver("", myPrefObserver, false);
 	    document.getElementById("txturl").value = getServer();
     	    var s = document.getElementById('txturl').value;
 	    var a =s.split(':');
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.xul
index 1956ebe89c2..c48dc0d70b9 100755
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.xul
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.xul
@@ -9,12 +9,12 @@
 <script type="text/javascript" src="chrome://openerp_plugin/content/exportTools.js"></script>
 
 <menupopup id="taskPopup">
-    <menuitem id="tiny-plugin" label="&tinyplugin;"
+    <menuitem id="tiny-plugin2" label="&tinyplugin;"
           oncommand="Config.onMenuItemCommand(event);"
           image="&menuicon.value;"
           class="menuitem-iconic"
           tooltiptext="&pluginconfig.value;"/>
-</menupopup>
+</menupopup>
 
 <menupopup id="taskPopup">
     <menuitem id="tiny-plugin1" label="&tinypluginconfig;"
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
index 61afb1571a1..b5057a8cd09 100755
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
@@ -970,7 +970,7 @@ var listSearchContactHandler = {
                  var t = getMobilenumber();}
 
            if(strlSearchResult=="email" && strlSearchResultValue!=''){
-                 setSenderEmail(sendername);
+                 setSenderEmail(strlSearchResultValue);
                  var t = getSenderEmail();} 
     
             if(strlSearchResult=="res_id"){
@@ -990,7 +990,8 @@ var listSearchContactHandler = {
 var listSearchContactdetailHandler = {
 	onResult: function(client, context, result) {
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-        var sendername = getSenderEmail();
+     //  var sendername = getSenderEmail();
+        var sendername = document.getElementById("txtemail").value
 		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
 		var count = arrIdList.Count();
 		for (i = 0; i < count; i++) {
@@ -1388,7 +1389,7 @@ function upload_archivemail()
     var cnt = list_documents.selectedCount
 	for(i=0;i<cnt;i++)
 	{	
-        var object = list_documents.getSelectedItem(i)
+        var object = list_documents.getSelectedItem(i);
 		var eml_string = parse_eml();
         var model = object.label;
         var res_id = object.value;
@@ -1412,9 +1413,9 @@ function upload_archivemail()
         var arrofarr = dictcontact(a,b)
         xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
         alert("Mail Archive Successfully");
+      }
 		window.close();
-	}
-	
+    
 }
 
 function create_archivemail(){
@@ -1444,8 +1445,8 @@ function create_archivemail(){
 		var arrofarr = dictcontact(a,b);
 		xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
         alert("Mail Archive Successfully");
-		window.close();
 		}
+    	window.close();
 	}
 	else
 	{
@@ -1507,7 +1508,7 @@ function createContact(){
 	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
 	strobj.data = 'thunderbird.partner';
 	var a = ['partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
-	var b = [getPartnerId(),getSenderName(),document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,getSenderEmail()];
+	var b = [getPartnerId(),getSenderName(),document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
 	var arrofarr = dictcontact(a,b);
 	xmlRpcClient.asyncCall(listCreateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
index 9a91cf11b6c..a2345f0aaaf 100755
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
@@ -2,9 +2,9 @@
 <!ENTITY tinypluginconfig "Archieve To OpenERP">
 <!ENTITY tinyarchive "Archive to OpenERP">
 <!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
-<!ENTITY menuicon.value "chrome://openerp_plugin/skin/NEWT.png">
-<!ENTITY partnericon.value "chrome://openerp_plugin/skin/Partner.png">
-<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/Archive.png">
+<!ENTITY menuicon.value "chrome://openerp_plugin/skin/openerp-icon.png">
+<!ENTITY partnericon.value "chrome://openerp_plugin/skin/partner.png">
+<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/document-new.png">
 <!ENTITY tooltip.value "Add To Archive">
 <!ENTITY pluginconfig.value "OpenERP Configuration Settings">
 <!ENTITY pluginconfigvalue.value "Archieve To OpenERP Settings">
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/document-new.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/document-new.png
new file mode 100755
index 00000000000..bdbe31c4bff
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/document-new.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/openerp-icon.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/openerp-icon.png
new file mode 100644
index 00000000000..e2b45b52211
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/openerp-icon.png differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/partner.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/partner.png
new file mode 100644
index 00000000000..37b29e13382
Binary files /dev/null and b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/partner.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index c9715e48e50..fbc5f6c8adb 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 26bdfe94a26..4973f45d091 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/loaddata.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/loaddata.js
index 8a3b226f68e..93d21f56f5c 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
@@ -56,7 +56,7 @@ var myPrefObserver =
 	register: function()
   	{
 	    appendDbList()
-    	    preferenceBranch.addObserver("", myPrefObserver, false);
+    	preferenceBranch.addObserver("", myPrefObserver, false);
 	    document.getElementById("txturl").value = getServer();
     	    var s = document.getElementById('txturl').value;
 	    var a =s.split(':');
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
index 1956ebe89c2..c48dc0d70b9 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
@@ -9,12 +9,12 @@
 <script type="text/javascript" src="chrome://openerp_plugin/content/exportTools.js"></script>
 
 <menupopup id="taskPopup">
-    <menuitem id="tiny-plugin" label="&tinyplugin;"
+    <menuitem id="tiny-plugin2" label="&tinyplugin;"
           oncommand="Config.onMenuItemCommand(event);"
           image="&menuicon.value;"
           class="menuitem-iconic"
           tooltiptext="&pluginconfig.value;"/>
-</menupopup>
+</menupopup>
 
 <menupopup id="taskPopup">
     <menuitem id="tiny-plugin1" label="&tinypluginconfig;"
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 61afb1571a1..b5057a8cd09 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
@@ -970,7 +970,7 @@ var listSearchContactHandler = {
                  var t = getMobilenumber();}
 
            if(strlSearchResult=="email" && strlSearchResultValue!=''){
-                 setSenderEmail(sendername);
+                 setSenderEmail(strlSearchResultValue);
                  var t = getSenderEmail();} 
     
             if(strlSearchResult=="res_id"){
@@ -990,7 +990,8 @@ var listSearchContactHandler = {
 var listSearchContactdetailHandler = {
 	onResult: function(client, context, result) {
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-        var sendername = getSenderEmail();
+     //  var sendername = getSenderEmail();
+        var sendername = document.getElementById("txtemail").value
 		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
 		var count = arrIdList.Count();
 		for (i = 0; i < count; i++) {
@@ -1388,7 +1389,7 @@ function upload_archivemail()
     var cnt = list_documents.selectedCount
 	for(i=0;i<cnt;i++)
 	{	
-        var object = list_documents.getSelectedItem(i)
+        var object = list_documents.getSelectedItem(i);
 		var eml_string = parse_eml();
         var model = object.label;
         var res_id = object.value;
@@ -1412,9 +1413,9 @@ function upload_archivemail()
         var arrofarr = dictcontact(a,b)
         xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
         alert("Mail Archive Successfully");
+      }
 		window.close();
-	}
-	
+    
 }
 
 function create_archivemail(){
@@ -1444,8 +1445,8 @@ function create_archivemail(){
 		var arrofarr = dictcontact(a,b);
 		xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
         alert("Mail Archive Successfully");
-		window.close();
 		}
+    	window.close();
 	}
 	else
 	{
@@ -1507,7 +1508,7 @@ function createContact(){
 	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
 	strobj.data = 'thunderbird.partner';
 	var a = ['partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
-	var b = [getPartnerId(),getSenderName(),document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,getSenderEmail()];
+	var b = [getPartnerId(),getSenderName(),document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
 	var arrofarr = dictcontact(a,b);
 	xmlRpcClient.asyncCall(listCreateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
index 9a91cf11b6c..a2345f0aaaf 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
@@ -2,9 +2,9 @@
 <!ENTITY tinypluginconfig "Archieve To OpenERP">
 <!ENTITY tinyarchive "Archive to OpenERP">
 <!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
-<!ENTITY menuicon.value "chrome://openerp_plugin/skin/NEWT.png">
-<!ENTITY partnericon.value "chrome://openerp_plugin/skin/Partner.png">
-<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/Archive.png">
+<!ENTITY menuicon.value "chrome://openerp_plugin/skin/openerp-icon.png">
+<!ENTITY partnericon.value "chrome://openerp_plugin/skin/partner.png">
+<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/document-new.png">
 <!ENTITY tooltip.value "Add To Archive">
 <!ENTITY pluginconfig.value "OpenERP Configuration Settings">
 <!ENTITY pluginconfigvalue.value "Archieve To OpenERP Settings">
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png
new file mode 100755
index 00000000000..bdbe31c4bff
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png
new file mode 100644
index 00000000000..e2b45b52211
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner.png
new file mode 100644
index 00000000000..37b29e13382
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner.png differ