diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/chrome/openerp_plugin.jar
index 134e98f4ad6..342e4584438 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/address.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/address.xul
index bf1d1a67059..407821ef4db 100644
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/address.xul
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/address.xul
@@ -11,22 +11,25 @@
 <script type="text/javascript" src="chrome://openerp_plugin/content/static.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
 
-<groupbox id="gpData">
+<tabpanel id="contact">
+  <groupbox id="contact">
      <hbox>
-		<description>&emailid.value;</description>
-		<spacer width="55"/>
-		 <textbox id="txtemail" width="260" />
+        <label  align="right" id="emailid"  value="&emailid.value;" width="94" />
+		 <textbox id="txtemail" width="268" align="right"/>
          <spacer width="5"/>
          <button label="&bsearch.label;" oncommand="searchContactdetail();" image="&imagesearch.value;"/>
 	</hbox>
 	<hbox>
-		<description>&name.value;</description>
-		<spacer width="16"/>
+        <label  align="right" id="name"  value="&name.value;" width="80" />
 		<textbox id="txtname" align="right" width="270" readonly="true"/>
         <spacer width="5"/>
-         <button label="New Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);"/>
+         <button label="New Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);" width="130"/>
 	</hbox>
+   </groupbox>
+</tabpanel>
 
+<tabpanel id="address">
+  <groupbox id="address">
     <hbox>
         <caption label="&postaladdress.value;" />
         <spacer width="300"/>
@@ -36,41 +39,34 @@
     </hbox>
 
      <hbox>
-		<description>&contactname.value;</description>
-		<spacer width="15"/>
+        <label  align="right" id="contactname"  value="&contactname.value;" width="80" />
 		<textbox id="txtcontactname" align="right" width="270" />
         <spacer width="33"/>
         <vbox>
-            <description>&office.value;</description>
-            <spacer width="70"/>
+             <label  align="right" id="office"  value="&office.value;" width="50" />
         </vbox>
         <vbox>
 	        <textbox id="txtoffice" />
         </vbox>
 	</hbox>
-
+    
     <hbox>
-		<description>&street.value;</description>
-		<spacer width="68"/>
+        <label  align="right" id="street"  value="&street.value;" width="97" />
 		<textbox id="txtstreet" width="270"/>
         <spacer width="33"/>
         <vbox>
-            <description>&mobile.value;</description>
-            <spacer width="70"/>
+        <label  align="right" id="mobile"  value="&mobile.value;" width="50" />
         </vbox>
         <vbox>
 	        <textbox id="txtmobile"/>
         </vbox>
 	</hbox>
-
     <hbox>
-		<description>&street2.value;</description>
-		<spacer width="60"/>
+        <label  align="right" id="street2"  value="&street2.value;" width="97" />
 		<textbox id="txtstreet2" width="270"/>
         <spacer width="35"/>
         <vbox>
-        <description>&fax.value;</description>
-           <spacer width="68"/>
+        <label  align="right" id="fax"  value="&fax.value;" width="48" />
         </vbox>
         <vbox>
 	        <textbox id="txtfax" />
@@ -78,21 +74,18 @@
 	</hbox>
 
      <hbox>
-		<description>&zip.value;</description>
-		<spacer width="87"/>
+        <label  align="right" id="zip"  value="&zip.value;" width="97" />
 		<textbox id="txtzip" />
         <spacer width="115"/>
 	</hbox>
  
     <hbox>
-		<description>&city.value;</description>
-		<spacer width="85"/>
+        <label  align="right" id="city"  value="&city.value;" width="97" />
 		<textbox id="txtcity" />
     </hbox>
 
     <hbox>
-         <label id="lblex3" value="&country.value;"/>
-         <spacer width="60"/>
+         <label  align="right" id="countryname"  value="&country.value;" width="97" />
          <menulist id="country" width="190">
            <menupopup>
 	     <menuitem label="" value=""/>
@@ -101,8 +94,7 @@
 	</hbox>
 
      <hbox>
-         <label id="lblex4" value="&state.value;"/>
-         <spacer width="73"/>
+         <label  align="right" id="statename"  value="&state.value;" width="97" />
          <menulist id="state" width="190">
            <menupopup>
 	     <menuitem label="" value=""/>
@@ -110,16 +102,16 @@
       	  </menulist>
 	</hbox>
 </groupbox>
+</tabpanel>
 
 <description></description>
 
 <hbox>
   <spacer width="450"/>
 	   <button label="&create.label;" accesskey="r" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
-
+    <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
     <button label="&ok.label;" image="&imageok.value;" oncommand="UpdateContact();"/>
-
-  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+ 
 </hbox>
 
 </window>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.xul
index e6fb8fab211..348ef92309a 100755
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.xul
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.xul
@@ -28,7 +28,7 @@
 				<hbox align="center" id="database_option">
 				</hbox>
 				<hbox id="first">
-					<label align="right" id="lbldb_list1" control="DBlist" value="&database.label;" width="80"/>
+					<label align="right" id="lbldb_list1" control="DBlist" value="&database.label;" width="80"/> 
 					<textbox id="DBlist_text" width="300"/>
 				</hbox>
 
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul
index d37489d4c4f..d3d551d63e8 100644
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul
@@ -9,19 +9,22 @@
 <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>
-<groupbox id="gpData">
+<tabpanel id="contact">
+  <groupbox id="contact">
     <hbox>
-		<description>&selectpartner.value;</description>
-		<spacer width="60"/>
-		<textbox id="txtselectpartner" readonly="true" value=""/>
+        <label  align="right" id="partner"  value="&selectpartner.value;" width="97" />
+		<textbox id="txtselectpartner" readonly="true" value="" width="270"/>
 		<button label="&bsearch.label;" oncommand="Select.onMenuItemCommand(event);" image="&imagesearch.value;"/>
 	</hbox>
 	<hbox>
-		<description>&name.value;</description>
-		<spacer width="12"/>
+        <label  align="right" id="name"  value="&name.value;" width="80" />
 		<textbox id="txtname" align="right" width="270"/>
 	</hbox>
-    
+    </groupbox>
+    </tabpanel>    
+
+ <tabpanel id="address">
+  <groupbox id="address">
     <hbox>
         <caption label="&postaladdress.value;" />
         <spacer width="300"/>
@@ -31,55 +34,46 @@
     </hbox>
 
      <hbox>
-		<description>&street.value;</description>
-		<spacer width="63"/>
+        <label  align="right" id="street"  value="&street.value;" width="97" />
 		<textbox id="txtstreet" width="270"/>
         <spacer width="33"/>
-        <vbox>
-            <description>&office.value;</description>
+         <vbox>
+             <label  align="right" id="office"  value="&office.value;" width="50" />
         </vbox>
         <vbox>
-	        <spacer width="68"/>
 	        <textbox id="txtoffice" />
         </vbox>
 	</hbox>
 
-    <hbox>
-		<description>&street2.value;</description>
-		<spacer width="54"/>
+     <hbox>
+        <label  align="right" id="street2"  value="&street2.value;" width="97" />
 		<textbox id="txtstreet2" width="270"/>
-        <spacer width="33"/>
+        <spacer width="35"/>
         <vbox>
-            <description>&fax.value;</description>
-            <spacer width="53"/>
+        <label  align="right" id="fax"  value="&fax.value;" width="48" />
         </vbox>
         <vbox>
 	        <textbox id="txtfax" />
         </vbox>
 	</hbox>
-
-    <hbox>
-		<description>&zip.value;</description>
-		<spacer width="82"/>
+   <hbox>
+        <label  align="right" id="zip"  value="&zip.value;" width="97" />
 		<textbox id="txtzip" />
-        <spacer width="110"/>
+        <spacer width="114"/>
         <vbox>
-             <description>&mobile.value;</description>
-            <spacer width="53"/>
+        <label  align="right" id="mobile"  value="&mobile.value;" width="48" />
         </vbox>
         <vbox>
-	        <textbox id="txtmobile" />
+	        <textbox id="txtmobile"/>
         </vbox>
 	</hbox>
 
      <hbox>
-		<description>&city.value;</description>
-		<spacer width="79"/>
+        <label  align="right" id="city"  value="&city.value;" width="97"/>
 		<textbox id="txtcity" />
-        <spacer width="110"/>
+        <spacer width="112"/>
         <vbox>
-              <description>&email.value;</description>
-            <spacer width="58"/>
+          <label  align="right" id="emailid"  value="&email.value;" width="50" />
         </vbox>
         <vbox>
 	        <textbox id="txtemail" width="260" />
@@ -87,8 +81,7 @@
 	</hbox>
  
     <hbox>
-         <label id="lblex3" value="&country.value;"/>
-         <spacer width="54"/>
+         <label  align="right" id="countryname"  value="&country.value;" width="97" />
          <menulist id="country" width="190">
            <menupopup>
 	     <menuitem label="" value=""/>
@@ -97,8 +90,7 @@
 	</hbox>
 
      <hbox>
-         <label id="lblex4" value="&state.value;"/>
-         <spacer width="68"/>
+         <label  align="right" id="statename"  value="&state.value;" width="97" />
          <menulist id="state" width="190">
            <menupopup>
 	     <menuitem label="" value=""/>
@@ -106,6 +98,7 @@
       	  </menulist>
 	</hbox>
 </groupbox>
+</tabpanel>
 <description></description>
 <hbox>
   <spacer width="580"/>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
index 648f2488919..d715714f3ef 100644
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
@@ -80,14 +80,10 @@
     </tabpanels>
 
      </groupbox>
-<hbox align="center">
-	<spacer flex="1"/>
-	<button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
+    <hbox align="right">
+	    <button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
+    </hbox>
+  </vbox>
 </hbox>
-    </vbox>
-</hbox>
-<vbox width="220">
-
-</vbox>
 
 </window>
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd
index 8134c113ef9..23cd94efa05 100755
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd
+++ b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd
@@ -1,7 +1,7 @@
 <!ENTITY title.label "OpenERP Configuration">
 <!ENTITY separate.label "Configuration Login for OpenERP!">
 <!ENTITY close.label "Cancel">
-<!ENTITY database.label "Database: ">
+<!ENTITY database.label "Database:">
 <!ENTITY ok.label "OK">
 <!ENTITY connection.label "Connect">
 <!ENTITY txturl.label "Server: ">
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 125d900a0d9..23aa7b71686 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 b5b3543f29a..63f026004c2 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 bf1d1a67059..407821ef4db 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
@@ -11,22 +11,25 @@
 <script type="text/javascript" src="chrome://openerp_plugin/content/static.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
 
-<groupbox id="gpData">
+<tabpanel id="contact">
+  <groupbox id="contact">
      <hbox>
-		<description>&emailid.value;</description>
-		<spacer width="55"/>
-		 <textbox id="txtemail" width="260" />
+        <label  align="right" id="emailid"  value="&emailid.value;" width="94" />
+		 <textbox id="txtemail" width="268" align="right"/>
          <spacer width="5"/>
          <button label="&bsearch.label;" oncommand="searchContactdetail();" image="&imagesearch.value;"/>
 	</hbox>
 	<hbox>
-		<description>&name.value;</description>
-		<spacer width="16"/>
+        <label  align="right" id="name"  value="&name.value;" width="80" />
 		<textbox id="txtname" align="right" width="270" readonly="true"/>
         <spacer width="5"/>
-         <button label="New Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);"/>
+         <button label="New Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);" width="130"/>
 	</hbox>
+   </groupbox>
+</tabpanel>
 
+<tabpanel id="address">
+  <groupbox id="address">
     <hbox>
         <caption label="&postaladdress.value;" />
         <spacer width="300"/>
@@ -36,41 +39,34 @@
     </hbox>
 
      <hbox>
-		<description>&contactname.value;</description>
-		<spacer width="15"/>
+        <label  align="right" id="contactname"  value="&contactname.value;" width="80" />
 		<textbox id="txtcontactname" align="right" width="270" />
         <spacer width="33"/>
         <vbox>
-            <description>&office.value;</description>
-            <spacer width="70"/>
+             <label  align="right" id="office"  value="&office.value;" width="50" />
         </vbox>
         <vbox>
 	        <textbox id="txtoffice" />
         </vbox>
 	</hbox>
-
+    
     <hbox>
-		<description>&street.value;</description>
-		<spacer width="68"/>
+        <label  align="right" id="street"  value="&street.value;" width="97" />
 		<textbox id="txtstreet" width="270"/>
         <spacer width="33"/>
         <vbox>
-            <description>&mobile.value;</description>
-            <spacer width="70"/>
+        <label  align="right" id="mobile"  value="&mobile.value;" width="50" />
         </vbox>
         <vbox>
 	        <textbox id="txtmobile"/>
         </vbox>
 	</hbox>
-
     <hbox>
-		<description>&street2.value;</description>
-		<spacer width="60"/>
+        <label  align="right" id="street2"  value="&street2.value;" width="97" />
 		<textbox id="txtstreet2" width="270"/>
         <spacer width="35"/>
         <vbox>
-        <description>&fax.value;</description>
-           <spacer width="68"/>
+        <label  align="right" id="fax"  value="&fax.value;" width="48" />
         </vbox>
         <vbox>
 	        <textbox id="txtfax" />
@@ -78,21 +74,18 @@
 	</hbox>
 
      <hbox>
-		<description>&zip.value;</description>
-		<spacer width="87"/>
+        <label  align="right" id="zip"  value="&zip.value;" width="97" />
 		<textbox id="txtzip" />
         <spacer width="115"/>
 	</hbox>
  
     <hbox>
-		<description>&city.value;</description>
-		<spacer width="85"/>
+        <label  align="right" id="city"  value="&city.value;" width="97" />
 		<textbox id="txtcity" />
     </hbox>
 
     <hbox>
-         <label id="lblex3" value="&country.value;"/>
-         <spacer width="60"/>
+         <label  align="right" id="countryname"  value="&country.value;" width="97" />
          <menulist id="country" width="190">
            <menupopup>
 	     <menuitem label="" value=""/>
@@ -101,8 +94,7 @@
 	</hbox>
 
      <hbox>
-         <label id="lblex4" value="&state.value;"/>
-         <spacer width="73"/>
+         <label  align="right" id="statename"  value="&state.value;" width="97" />
          <menulist id="state" width="190">
            <menupopup>
 	     <menuitem label="" value=""/>
@@ -110,16 +102,16 @@
       	  </menulist>
 	</hbox>
 </groupbox>
+</tabpanel>
 
 <description></description>
 
 <hbox>
   <spacer width="450"/>
 	   <button label="&create.label;" accesskey="r" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
-
+    <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
     <button label="&ok.label;" image="&imageok.value;" oncommand="UpdateContact();"/>
-
-  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
+ 
 </hbox>
 
 </window>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul
index e6fb8fab211..348ef92309a 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul
@@ -28,7 +28,7 @@
 				<hbox align="center" id="database_option">
 				</hbox>
 				<hbox id="first">
-					<label align="right" id="lbldb_list1" control="DBlist" value="&database.label;" width="80"/>
+					<label align="right" id="lbldb_list1" control="DBlist" value="&database.label;" width="80"/> 
 					<textbox id="DBlist_text" width="300"/>
 				</hbox>
 
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
index d37489d4c4f..d3d551d63e8 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
@@ -9,19 +9,22 @@
 <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>
-<groupbox id="gpData">
+<tabpanel id="contact">
+  <groupbox id="contact">
     <hbox>
-		<description>&selectpartner.value;</description>
-		<spacer width="60"/>
-		<textbox id="txtselectpartner" readonly="true" value=""/>
+        <label  align="right" id="partner"  value="&selectpartner.value;" width="97" />
+		<textbox id="txtselectpartner" readonly="true" value="" width="270"/>
 		<button label="&bsearch.label;" oncommand="Select.onMenuItemCommand(event);" image="&imagesearch.value;"/>
 	</hbox>
 	<hbox>
-		<description>&name.value;</description>
-		<spacer width="12"/>
+        <label  align="right" id="name"  value="&name.value;" width="80" />
 		<textbox id="txtname" align="right" width="270"/>
 	</hbox>
-    
+    </groupbox>
+    </tabpanel>    
+
+ <tabpanel id="address">
+  <groupbox id="address">
     <hbox>
         <caption label="&postaladdress.value;" />
         <spacer width="300"/>
@@ -31,55 +34,46 @@
     </hbox>
 
      <hbox>
-		<description>&street.value;</description>
-		<spacer width="63"/>
+        <label  align="right" id="street"  value="&street.value;" width="97" />
 		<textbox id="txtstreet" width="270"/>
         <spacer width="33"/>
-        <vbox>
-            <description>&office.value;</description>
+         <vbox>
+             <label  align="right" id="office"  value="&office.value;" width="50" />
         </vbox>
         <vbox>
-	        <spacer width="68"/>
 	        <textbox id="txtoffice" />
         </vbox>
 	</hbox>
 
-    <hbox>
-		<description>&street2.value;</description>
-		<spacer width="54"/>
+     <hbox>
+        <label  align="right" id="street2"  value="&street2.value;" width="97" />
 		<textbox id="txtstreet2" width="270"/>
-        <spacer width="33"/>
+        <spacer width="35"/>
         <vbox>
-            <description>&fax.value;</description>
-            <spacer width="53"/>
+        <label  align="right" id="fax"  value="&fax.value;" width="48" />
         </vbox>
         <vbox>
 	        <textbox id="txtfax" />
         </vbox>
 	</hbox>
-
-    <hbox>
-		<description>&zip.value;</description>
-		<spacer width="82"/>
+   <hbox>
+        <label  align="right" id="zip"  value="&zip.value;" width="97" />
 		<textbox id="txtzip" />
-        <spacer width="110"/>
+        <spacer width="114"/>
         <vbox>
-             <description>&mobile.value;</description>
-            <spacer width="53"/>
+        <label  align="right" id="mobile"  value="&mobile.value;" width="48" />
         </vbox>
         <vbox>
-	        <textbox id="txtmobile" />
+	        <textbox id="txtmobile"/>
         </vbox>
 	</hbox>
 
      <hbox>
-		<description>&city.value;</description>
-		<spacer width="79"/>
+        <label  align="right" id="city"  value="&city.value;" width="97"/>
 		<textbox id="txtcity" />
-        <spacer width="110"/>
+        <spacer width="112"/>
         <vbox>
-              <description>&email.value;</description>
-            <spacer width="58"/>
+          <label  align="right" id="emailid"  value="&email.value;" width="50" />
         </vbox>
         <vbox>
 	        <textbox id="txtemail" width="260" />
@@ -87,8 +81,7 @@
 	</hbox>
  
     <hbox>
-         <label id="lblex3" value="&country.value;"/>
-         <spacer width="54"/>
+         <label  align="right" id="countryname"  value="&country.value;" width="97" />
          <menulist id="country" width="190">
            <menupopup>
 	     <menuitem label="" value=""/>
@@ -97,8 +90,7 @@
 	</hbox>
 
      <hbox>
-         <label id="lblex4" value="&state.value;"/>
-         <spacer width="68"/>
+         <label  align="right" id="statename"  value="&state.value;" width="97" />
          <menulist id="state" width="190">
            <menupopup>
 	     <menuitem label="" value=""/>
@@ -106,6 +98,7 @@
       	  </menulist>
 	</hbox>
 </groupbox>
+</tabpanel>
 <description></description>
 <hbox>
   <spacer width="580"/>
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 648f2488919..d715714f3ef 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
@@ -80,14 +80,10 @@
     </tabpanels>
 
      </groupbox>
-<hbox align="center">
-	<spacer flex="1"/>
-	<button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
+    <hbox align="right">
+	    <button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
+    </hbox>
+  </vbox>
 </hbox>
-    </vbox>
-</hbox>
-<vbox width="220">
-
-</vbox>
 
 </window>
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 8134c113ef9..23cd94efa05 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,7 +1,7 @@
 <!ENTITY title.label "OpenERP Configuration">
 <!ENTITY separate.label "Configuration Login for OpenERP!">
 <!ENTITY close.label "Cancel">
-<!ENTITY database.label "Database: ">
+<!ENTITY database.label "Database:">
 <!ENTITY ok.label "OK">
 <!ENTITY connection.label "Connect">
 <!ENTITY txturl.label "Server: ">