diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin.xpi b/addons/plugin_thunderbird/plugin/openerp_plugin.xpi
index f0255b00623..c52d0dc361f 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin.xpi and b/addons/plugin_thunderbird/plugin/openerp_plugin.xpi differ
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 05a7279eb78..a28430396e6 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
index 6ad5bc6b351..843f3c5b6d3 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
@@ -4,21 +4,12 @@
 <!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/create.dtd">
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
-	title="&title.label;" onload="load_createContact();" height="250" width="400">
+	title="&title.label;" onload="load_createContact();" >
 	<script type="text/javascript" src="chrome://openerp_plugin/content/js/tiny_xmlrpc.js"></script>
 	<script type="text/javascript" src="chrome://openerp_plugin/content/js/tools.js"></script>
 	<script type="text/javascript" src="chrome://openerp_plugin/content/js/create.js"></script>
-	<groupbox id="contact" >
-	  <hbox>
-	  	<label  align="right" id="partner"  value="&selectpartner.value;" width="90" class="text-prompt"/>
-	    <textbox id="txtselectpartner" readonly="true" value="" width="170"/>
-		<button label="&bsearch.label;" oncommand="window.open('chrome://openerp_plugin/content/selectpartner.xul', '', 'chrome', 'resizable=yes');" image="&imagesearch.value;"/> 
-	  </hbox>
-	</groupbox>
-	<groupbox id="information" style="border:1px solid black">
-		<separator class="groove-thin" orient="horizontal" width="90"/> 
-		<caption label="Contact Information" />
-		<separator class="groove-thin" orient="horizontal" width="90"/> 
+	<groupbox id="information" >
+		<caption label="Address Detail" />
 		<grid flex="1">
   			<columns>
 				<column />
@@ -38,7 +29,8 @@
 	    <separator class="groove-thin" orient="horizontal" width="90"/> 
 	</groupbox>
 	<hbox align="right">
-  		<button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
-  		<button label="&ok.label;" image="&imageok.value;" oncommand="createContact();"/>
+  		<button label="cancel" image="&imagecancel.value;" oncommand="close();" />
+  		<button label="create partner" image="&imageok.value;" oncommand="createContact();"/>
+  		<button label="link to a partner" image="&imageok.value;" oncommand="window.open('chrome://openerp_plugin/content/selectpartner.xul', '', 'chrome', resizable='yes');"/>
 	</hbox>
 </window>
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js
index 21faf9f7949..6670002c9af 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js
@@ -109,6 +109,7 @@ var listCreateContactHandler = {
 
 //function to create a new contact
 function createContact(){
+    window.close();
     setServerService('xmlrpc/object');
     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
     var xmlRpcClient = getXmlRpc();
@@ -123,4 +124,4 @@ function createContact(){
     var b = [document.getElementById("txtname").value, document.getElementById("txtemail").value];
     var arrofarr = dictcontact(a,b);
     xmlRpcClient.asyncCall(listCreateContactHandler,null,'execute',[strDbName,struid,strpass,strobj,strmethod,arrofarr, strpartnerid], 7);
-}
\ No newline at end of file
+}
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
index 6a57a82a85d..2995a48fa84 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
@@ -2,3 +2,19 @@ function load_contact_dialog() {
 	log_message("load contact dialog")
 	
 }
+function load_document(){
+        if (getPreference('statutdoc')=='open'){
+            document.getElementById('open_document').hidden=false;
+            document.getElementById('open').hidden=true; 
+            }
+        else{           
+            document.getElementById('open_document').hidden=true;
+            document.getElementById('open').hidden=false;
+            }
+    
+}
+
+function message_setlabel(){
+    log_message(getPreference('subject'));
+    document.getElementById('message_label').value=getPreference('subject');    
+    }
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js
index 2607614e7c8..c85e735374e 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js
@@ -96,6 +96,7 @@ var openPartnerHandler = {
         open_url(res[URL])
         
         
+        
     },
     onFault: function (client, ctxt, fault) {
 		log_message(fault);
@@ -159,14 +160,15 @@ var listDocumentHandler = {
     onResult: function(client, context, result) {
         res = extract_data(result)
         log_message("open document")
+        window.open('chrome://openerp_plugin/content/push_dialog.xul', '', 'chrome', resizable='yes');
         if(res[RES_ID]==0) {
-            alert("Document is not available.");
-            window.open('chrome://openerp_plugin/content/push_dialog.xul', '', 'chrome', resizable='yes');
-            document.getElementById('message_label').setAttribute('value', 'No document was found');
+            setPreference('statutdoc','create');
         }
         else {
-    		open_url(res[URL])
-        }
+            setPreference('statutdoc', 'open');
+            setPreference('urldoc', res[URL]);
+        } 
+       setPreference('message_label',setPreference('subject'));// to have the subject to print on the push dialog       
 
     },
     onFault: function (client, ctxt, fault) {
@@ -198,6 +200,7 @@ function open_document() {
     var strobj = get_rpc_string(xmlRpcClient, 'plugin.handler');
     
     var eml_string = getMessage(messageUri);
+    setPreference('email_text', eml_string);
     var email = get_rpc_string(xmlRpcClient, eml_string);
     xmlRpcClient.asyncCall(listDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod, email],6);
-}
\ No newline at end of file
+}
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js
index 86596397c99..a20ea17e8a1 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js
@@ -155,6 +155,7 @@ var pushHandler = {
 
 
 function push() {
+    window.close();
 	var model_name = document.getElementById('menu_model_list').selectedItem.value;
 	var res_id = 0;
 	if(getOperation() == "add") {
@@ -184,4 +185,3 @@ function push() {
 }
 
 
-
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
index 44b984ac383..c0dad694450 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
@@ -31,6 +31,7 @@ function createMenuItem(aLabel, aValue) {
     return item;
 }
 
+    
 function clear_search_box(element) {
 	var cmbSearchList = document.getElementById(element);
 	count = cmbSearchList.itemCount
@@ -39,7 +40,6 @@ function clear_search_box(element) {
 	}
 }
 
-
 function open_url(url) {
 	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
     messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
@@ -78,4 +78,4 @@ function check_connection(callback) {
     	}
     	return callback()
 	}
-}
\ No newline at end of file
+}
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
index 0df20fc039b..6e2f1ee875a 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
@@ -12,53 +12,35 @@
 <menubar id="mail-menubar" >
     <menu insertafter="messageMenu" id="menu_openerp" label="&openerpMenu.label;" accesskey="&openerpMenu.accesskey;"> 
         <menupopup id="taskPopup">
-            <menuitem id="tiny-plugin3" label="&tinyplugin;"
-                      oncommand="window.open('chrome://openerp_plugin/content/config.xul', '', 'chrome', 'resizable=yes');"
-                      image="&menuicon.settings;"
-                      class="menuitem-iconic"
-                      tooltiptext="&pluginconfig.value;"
-                      />
-            <menuseparator/>
-            <menuitem id="tiny-plugin4" label="&tinypluginconfig;"
-                      oncommand="check(searchmail);"
-                      image="&menuicon.value;"
-                      class="menuitem-iconic"
-                      tooltiptext="&pluginconfigvalue.value;"
-                      />
-            <menuseparator/>
-            <menuitem id="tiny-openpartner" label="&openpartner.value;"
+            <menuitem id="tiny-openpartner" label="Contact"
                       oncommand="check(open_partner);"
                       image="&menuicon.value;"
                       class="menuitem-iconic"
                       tooltiptext="&openpartnertooltip.value;"
                       />
 
-            <menuitem id="tiny-opendocument" label="&opendocument.value;"
+            <menuitem id="tiny-opendocument" label="Documents"
                       oncommand="check(open_document);"
                       image="&menuicon.value;"
                       class="menuitem-iconic"
                       tooltiptext="&opendocumenttooltip.value;"
                       />
-            
+            <menuitem id="tiny-plugin3" label="Configuration"
+                      oncommand="window.open('chrome://openerp_plugin/content/config.xul', '', 'chrome', 'resizable=yes');"
+                      image="&menuicon.settings;"
+                      class="menuitem-iconic"
+                      tooltiptext="&pluginconfig.value;"
+                      />
         </menupopup>
     </menu>
 </menubar>
 
 
-
-<toolbarpalette id="MailToolbarPalette">
-    <toolbarbutton id="GA-button"
-        class="toolbarbutton-1"
-        image="&menuicon.value;"
-        label= "Push"
-        oncommand="check(searchmail);" />
-</toolbarpalette> 
-
 <toolbarpalette id="MailToolbarPalette">
     <toolbarbutton id="GA-button2"
         class="toolbarbutton-1"
         image="&partnericon.value;"
-        label= "Partner"
+        label= "Contact"
         oncommand="check(open_partner);"
           />
 </toolbarpalette>
@@ -66,7 +48,7 @@
     <toolbarbutton id="GA-button3"
         class="toolbarbutton-1"
         image="&imagearchive.value;"
-        label= "Document"
+        label= "Documents"
         oncommand="check(open_document);"  />
 </toolbarpalette> 
 
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
index b9a17df485f..e3d2150899e 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
@@ -28,12 +28,9 @@
 	                        </menulist>
     					</row>
     					<row>
-	    					<label id="lblex3" align="right" width="135" control="section" value="Operation :" class="text-prompt"/>
-	                        <menulist id="operation" width="150" oncommand="changeForm()">
+	    					<menulist id="operation" hidden="true" width="150" oncommand="changeForm()">
 	                            <menupopup>
-	                            	<menuitem label="Attach to an existing one" value="add"/>
-	                                <menuitem label="Create a new one" value="create"/>
-	                                
+	                            	<menuitem label="Attach to an existing one" value="add"/>	                                
 	                            </menupopup>
 	                        </menulist>
     					</row>
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
index a8d7531e470..dcbcc84be2b 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
@@ -1,19 +1,22 @@
 <?xml version="1.0"?>  
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>  
 <!-- Extremely recommended to keep this css include!! -->  
-<window id="rootWnd" title="Register Online!"   onload="load_contact_dialog();" 
+<window id="rootWnd" title="push box"  onload="load_contact_dialog();load_document();message_setlabel();" 
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">  
     <script type="text/javascript" src="chrome://openerp_plugin/content/js/tiny_xmlrpc.js"></script>
     <script type="text/javascript" src="chrome://openerp_plugin/content/js/tools.js"></script>
     <script type="text/javascript" src="chrome://openerp_plugin/content/js/dialog.js"></script>
+    <script type="text/javascript" src="chrome://openerp_plugin/content/js/overlay.js"></script>
 	<vbox>  
-    	<hbox>  
+    	<hbox height="50px">  
+            <caption label="Subject:" />
         	<label value="Message" id="message_label"/>  
         </hbox>  
-        <hbox>  
+        <hbox align="right">  
         	<button label="Cancel" accesskey="c" oncommand="window.close();"/>
-        	<button id="push_new" label="Push Email" accesskey="a" oncommand="window.open('chrome://openerp_plugin/content/push.xul', '', 'chrome', resizable='yes');"/>
-        	<button id="open" label="Open Document" accesskey="c" oncommand="window.close();"/>
+        	<button id="push_new" label="Push Email" accesskey="a" oncommand=" window.close();window.open('chrome://openerp_plugin/content/push.xul', '', 'chrome', resizable='yes');"/>
+        	<button id="open" label="Create Document" accesskey="c" oncommand="window.close();window.open('chrome://openerp_plugin/content/create_new.xul', '', 'chrome', resizable='yes');"/>
+        	<button id="open_document" label="Open Document" accesskey="d" oncommand="open_url(getPreference('urldoc'));window.close();"/>
         </hbox>  
     </vbox>  
-</window>  
\ No newline at end of file
+</window>  
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
index b999bc8c33d..97d636ee6fe 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
@@ -24,8 +24,8 @@
 <description></description>
 <hbox>
   <spacer width="45"/>
-  <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
-  <button label="&select.label;" image="&imageok.value;" oncommand="selectPartner();close();"/>
+  <button label="cancel" image="&imagecancel.value;" oncommand="close();" />
+  <button label="link" image="&imageok.value;" oncommand="createContact();window.close();"/>
 </hbox>
 
 </window>
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
index 1e12ff712d8..9a21e9a6f6c 100644
--- a/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
+++ b/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
@@ -9,6 +9,8 @@ pref("extensions.tiny.username","admin");
 pref("extensions.tiny.password","admin");
 pref("extensions.tiny.senderemail","");
 pref("extensions.tiny.sendername","");
+pref("extensions.tiny.statutdoc","");// add to have a statut to hidde or not the button
+pref("extensions.tiny.message_label","");// add to message in push dialog
 pref("extensions.tiny.receiveremail","");
 pref("extensions.tiny.subject","");
 pref("extensions.tiny.receiveddate","");