diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 6e306515c6d..6c9a53d83e8 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 7d329d54159..717ad88d02f 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 a1e0562b28d..1c0bebcea64 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
@@ -175,6 +175,8 @@ function searchmail()
 		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
 	}
 }
+
+
 var openPartnerHandler = {
 	onResult: function(client, context, result) {
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
@@ -197,8 +199,8 @@ var openPartnerHandler = {
                 var urlport = weburl+':'+webport
 
                 if (parseInt(partner_id) > 0){
-                    alert(partner_id)
                   var t = urlport + "/openerp/form/view?model=res.partner&id="+partner_id;
+                  alert(t);
                   window.open(t);
                 
                 }
@@ -294,18 +296,75 @@ function open_partner()
     searchPartner(senderemail);
 }
 
+function open_partner()
+{
+    if (check() == false){
+        return true
+    }
+    var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
+	var version_obj = prefService.getBranch("extensions.");
+	version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
+	version = version_obj.getCharPref("lastAppVersion");
+	version = parseInt(version[0])
+	
+	file = getPredefinedFolder(2);
+	
+	if (version > 2)
+	{
+		var emlsArray = gFolderDisplay.selectedMessages;
+	}
+	else
+	{
+		var emlsArray = GetSelectedMessages();
+	}
+
+	IETtotal = emlsArray.length;
+	IETexported = 0;
+	var msguri = emlsArray[0];
+
+	
+	//gives the selected email uri
+	var messageUri= gDBView.URIForFirstSelectedMessage;
+
+	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
+
+	//gives the selected email object 
+	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+
+	//functionality to split the author name and email
+	if(message.author.charAt(0) == '"'){
+		sendername = message.author.split('"')[1].split('"')[0];
+	}
+	else if(message.author.indexOf('<')!=-1){
+		sendername = message.author.split('<')[0];
+	}
+	else{
+		sendername = message.author;
+	}
+	if(message.author.indexOf('<')!=-1){
+		senderemail = message.author.split('<')[1].split('>')[0];
+	}
+	else{
+		senderemail = message.author
+	}
+    searchPartner(senderemail);
+}
+
 var listDocumentHandler = {
 	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
 		var res = result.QueryInterface(Components.interfaces.nsISupportsArray);
-        res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32);
-		model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString);
-         weburl = getWebServerURL();
-         webport = getwebPort();
-         var urlport = weburl+':'+webport
-         var t = urlport + "/openerp/form/view?model=" + model +"&id=" + res_id
-         alert(t)
-         window.open(t);
+        res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32);
+		model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString); 
+
+        weburl = getWebServerURL();
+        webport = getwebPort();
+        
+        var urlport = weburl+':'+webport;
+        var t = urlport + "/openerp/form/view?model=" + model +"&id=" + res_id;
+        alert(t);
+        window.open(t); 
+         
 	},
 	onFault: function (client, ctxt, fault) {
 
@@ -318,10 +377,10 @@ var listDocumentHandler = {
 
 
 function open_document()
-{
+{
     if (check() == false){
         return true
-    }
+    }
     var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
 	var version_obj = prefService.getBranch("extensions.");
 	version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
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 94758a104f8..b2e66068bfd 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
@@ -42,14 +42,6 @@
 		oncommand="searchmail();" />
 </toolbarpalette> 
 
-<toolbarpalette id="MailToolbarPalette">
-	<toolbarbutton id="GA-button1"
-		class="toolbarbutton-1"
-		image="&partnericon.value;"
-		label= "Open Contact"
-		oncommand="Address.onMenuItemCommand(event);" />
-</toolbarpalette> 
-
 <toolbarpalette id="MailToolbarPalette">
 	<toolbarbutton id="GA-button2"
 		class="toolbarbutton-1"
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 8d1b8729aca..7f7479b3839 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
@@ -1765,12 +1765,7 @@ var listLoginHandler = {
 			setUserId(login.data);
             module_install();
             alert('Successfully Login To OpenERP.');
-            if (check_module_install(5) == false){
-                alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
-            }
-			else{
-                window.close();
-            }
+            window.close();
 		}
 		else{
 			alert("Login Failed");