diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 00d070fe83c..593dc03b23f 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -38,7 +38,6 @@ class thunderbird_partner(osv.osv_memory):
         dictcreate['name'] = header_name and header_name[0] and header_name[0][0]
         address_obj = self.pool.get('res.partner.address')
         case_pool = self.pool.get(dictcreate.get('object','crm.lead'))
-#        case_pool = self.pool.get(dictcreate.get('object','email.server.tools'))
         partner_ids = address_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
         partner = address_obj.read(cr,user,partner_ids,['partner_id','name'])
         if partner and partner[0] and partner[0]['partner_id']:
@@ -58,10 +57,13 @@ class thunderbird_partner(osv.osv_memory):
     def search_contact(self, cr, user, vals):
         address_obj = self.pool.get('res.partner.address')
         partner = address_obj.search(cr, user,[('email','=',vals)])
-        res1 = {}
         res = {}
+        res1 = {}
         if not partner:
-            return
+            res1 = {
+                'email': '',
+                    }
+            return res1.items()
 
         if partner:
             partner=partner[0]
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 797e0a653b7..cb7b78ba005 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 bda198b5a86..c0d8e4c753a 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 0f34f60910f..75a4b67b6e3 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
@@ -83,10 +83,10 @@ function searchmail()
 		sendername = message.author;
 	}
 	if(message.author.indexOf('<')!=-1){
-		senderemail = message.author.split('<')[1].split('>')[0];
+		senderemail = message.author.split('<')[1].split('>')[0];
 	}
 	else{
-		senderemail = message.author
+		senderemail = message.author
 	}
 
 	//gives the receiver email address
@@ -209,20 +209,20 @@ function open_contact()
 		sendername = message.author.split('"')[1].split('"')[0];
 	}
 	else if(message.author.indexOf('<')!=-1){
-		sendername = message.author.split('<')[0];
+		sendername = message.author.split('<')[0];
 	}
 	else{
-		sendername = message.author;
+		sendername = message.author;
 	}
 	if(message.author.indexOf('<')!=-1){
-		senderemail = message.author.split('<')[1].split('>')[0];
+		senderemail = message.author.split('<')[1].split('>')[0];
 	}
 	else{
-		senderemail = message.author
+		senderemail = message.author
 	}
 
 	//set the initial information for the selected email
-	setSenderEmail(senderemail);
+	setSenderEmail(senderemail);
 	setSenderName(sendername);
     setPartnerName("");
     setStreet("");
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 1d2865145f8..224dc69e655 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
@@ -926,6 +926,7 @@ function module_install()
 var listSearchContactHandler = {
 	onResult: function(client, context, result) {
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var sendername = getSenderEmail();
 		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
 		var count = arrIdList.Count();
 		for (i = 0; i < count; i++) {
@@ -968,8 +969,8 @@ var listSearchContactHandler = {
                  setMobilenumber(strlSearchResultValue);
                  var t = getMobilenumber();}
 
-            if(strlSearchResult=="email"){
-                 setSenderEmail(strlSearchResultValue);
+            if(strlSearchResult=="email" && strlSearchResultValue!=''){
+                 setSenderEmail(sendername);
                  var t = getSenderEmail();}
     
             if(strlSearchResult=="res_id"){
@@ -989,13 +990,18 @@ var listSearchContactHandler = {
 var listSearchContactdetailHandler = {
 	onResult: function(client, context, result) {
 		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var sendername = getSenderEmail();
 		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
 		var count = arrIdList.Count();
 		for (i = 0; i < count; i++) {
 			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
             var strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
             var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-
+            if(strlSearchResult=="email" && strlSearchResultValue=='')
+            {
+                alert("Partner is not Available")
+                document.getElementById("txtemail").value = sendername;
+            } 
             if(strlSearchResult=="partner_name"){
                  document.getElementById("txtname").value =strlSearchResultValue;}
 
@@ -1021,7 +1027,7 @@ var listSearchContactdetailHandler = {
             if(strlSearchResult=="mobile"){
                  document.getElementById("txtmobile").value =strlSearchResultValue;}
 
-            if(strlSearchResult=="email"){
+            if(strlSearchResult=="email"&& strlSearchResultValue!=''){
                 document.getElementById("txtemail").value =strlSearchResultValue;}
 
 		}