diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/chrome/openerp_plugin.jar
index cca77785288..986c9fa7551 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/overlay.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.js
index 75a4b67b6e3..7d7c9098bce 100755
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.js
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.js
@@ -21,7 +21,7 @@ function searchmail()
 	setTimeout("module_install()", 10000)
 	if (getmodule_install() == "no")
 	{
-		alert("Please install the thunderbird module on your '" + getDbName() +"' database Or try again !");
+		alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
 		return false
 	}
 	var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
@@ -159,7 +159,7 @@ function searchmail()
 		att =getAttachValue()
 		if (getmodule_install() == "no")
 		{
-			alert("Please install the thunderbird module on your '" + getDbName() +"' database  Or try again !");
+			alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
 			return false
 		}
 		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
@@ -170,7 +170,7 @@ function searchmail()
 	{
 			if (getmodule_install() == "no")
 			{
-				alert("Please install the thunderbird module on your '" + getDbName() +"' database  Or try again !");
+				alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
 				return false
 			}
 		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
@@ -188,7 +188,7 @@ function open_contact()
 	setTimeout("module_install()", 10000)
 	if (getmodule_install() == "no")
 	{
-		alert("Please install the thunderbird module on your '" + getDbName() +"' database Or try again !");
+		alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
 		return false
 	}
 	if(GetNumSelectedMessages() < 1 || GetNumSelectedMessages() > 1){
@@ -235,7 +235,7 @@ function open_contact()
 
     if (getmodule_install() == "no")
 	{
-		alert("Please install the thunderbird module on your '" + getDbName() +"' database  Or try again !");
+		alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
 		return false
 	}
 	window.open("chrome://openerp_plugin/content/address.xul", "", "chrome, resizable=yes");
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
index 137bdca7904..45c552452bb 100644
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
@@ -26,7 +26,8 @@
 	  </vbox> 
 	  <hbox align="center">
 	   <image src='chrome://tiny_plugin/skin/perform.gif'/>
-	    <checkbox id="cbxselectall" oncommand="selectAllCheckbox();" label="&cbxselectall.label;" checked="false"/>
+	    <checkbox id="cbxselectall" oncommand="selectAllCheckbox();" checked="false"/>
+        <caption label="&cbxselectall.label;" />
 	    <spacer width="10"/>
       
 	  </hbox>
@@ -44,7 +45,7 @@
 	</listbox>
 	<hbox>
 	<spacer width="360"/>
-	<button label="&attach.label;" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('upload');"/>
+	<button label="&attach.label;" accesskey="u" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('upload');"/>
 	</hbox>
       </groupbox>
 
@@ -68,21 +69,19 @@
 	<label id="lblsection" value=" "/>	
 	<separator class="groove-thin" orient="horizontal" width="180"/>
 
-    <tabpanels>
-    <tabpanel id="contact">
+    
     <hbox>
 	<label id="lblsection" control="section" value="&partner.label;"/>
         <vbox>
-	    <button label="&create.label;" accesskey="r" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
+	    <button label="&create.label;" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
         </vbox>
     </hbox>
-    </tabpanel>
-    </tabpanels>
+  
  </groupbox>
   <label id="lblex" value=" "/>
   <label id="lblex" value=" "/>
   <hbox align="right">
-  <spacer width="360"/>
+  <spacer width="330"/>
 	    <button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
     </hbox>
     
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index fbc5f6c8adb..0f9243510d2 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 4973f45d091..3c322b423f5 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/overlay.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
index 75a4b67b6e3..7d7c9098bce 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
@@ -21,7 +21,7 @@ function searchmail()
 	setTimeout("module_install()", 10000)
 	if (getmodule_install() == "no")
 	{
-		alert("Please install the thunderbird module on your '" + getDbName() +"' database Or try again !");
+		alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
 		return false
 	}
 	var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
@@ -159,7 +159,7 @@ function searchmail()
 		att =getAttachValue()
 		if (getmodule_install() == "no")
 		{
-			alert("Please install the thunderbird module on your '" + getDbName() +"' database  Or try again !");
+			alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
 			return false
 		}
 		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
@@ -170,7 +170,7 @@ function searchmail()
 	{
 			if (getmodule_install() == "no")
 			{
-				alert("Please install the thunderbird module on your '" + getDbName() +"' database  Or try again !");
+				alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
 				return false
 			}
 		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
@@ -188,7 +188,7 @@ function open_contact()
 	setTimeout("module_install()", 10000)
 	if (getmodule_install() == "no")
 	{
-		alert("Please install the thunderbird module on your '" + getDbName() +"' database Or try again !");
+		alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
 		return false
 	}
 	if(GetNumSelectedMessages() < 1 || GetNumSelectedMessages() > 1){
@@ -235,7 +235,7 @@ function open_contact()
 
     if (getmodule_install() == "no")
 	{
-		alert("Please install the thunderbird module on your '" + getDbName() +"' database  Or try again !");
+		alert("Please install the thunderbird module on your '" + getDbName() +"' database  and try again !");
 		return false
 	}
 	window.open("chrome://openerp_plugin/content/address.xul", "", "chrome, resizable=yes");
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
index 137bdca7904..45c552452bb 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/plugin.xul
@@ -26,7 +26,8 @@
 	  </vbox> 
 	  <hbox align="center">
 	   <image src='chrome://tiny_plugin/skin/perform.gif'/>
-	    <checkbox id="cbxselectall" oncommand="selectAllCheckbox();" label="&cbxselectall.label;" checked="false"/>
+	    <checkbox id="cbxselectall" oncommand="selectAllCheckbox();" checked="false"/>
+        <caption label="&cbxselectall.label;" />
 	    <spacer width="10"/>
       
 	  </hbox>
@@ -44,7 +45,7 @@
 	</listbox>
 	<hbox>
 	<spacer width="360"/>
-	<button label="&attach.label;" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('upload');"/>
+	<button label="&attach.label;" accesskey="u" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('upload');"/>
 	</hbox>
       </groupbox>
 
@@ -68,21 +69,19 @@
 	<label id="lblsection" value=" "/>	
 	<separator class="groove-thin" orient="horizontal" width="180"/>
 
-    <tabpanels>
-    <tabpanel id="contact">
+    
     <hbox>
 	<label id="lblsection" control="section" value="&partner.label;"/>
         <vbox>
-	    <button label="&create.label;" accesskey="r" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
+	    <button label="&create.label;" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
         </vbox>
     </hbox>
-    </tabpanel>
-    </tabpanels>
+  
  </groupbox>
   <label id="lblex" value=" "/>
   <label id="lblex" value=" "/>
   <hbox align="right">
-  <spacer width="360"/>
+  <spacer width="330"/>
 	    <button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
     </hbox>