diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index a6b6a0dd0b8..14964cb92a0 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 2e1be02ec67..302e9d7e39d 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/create.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
index 0aeb4a9f16b..71a4baf0872 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
@@ -3,101 +3,104 @@
 <!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="myPrefObserver.createContact();" height="460" width="860">
+	title="&title.label;" onload="myPrefObserver.createContact();" height="415" width="720">
 <script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/config.js"></script>
 <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>
 <tabpanel id="contact">
-  <groupbox id="contact" style="border:1px solid black">
-    <separator class="groove-thin" orient="horizontal" width="94"/> 
-    <hbox>
-        <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;"/> 
-        <button label="Create Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);"/>
-	</hbox>
-	<hbox>
-        <label  align="right" id="name"  value="&name.value;" width="80" />
-		<textbox id="txtname" align="right" width="270"/>
-	</hbox>
-    <separator class="groove-thin" orient="horizontal" width="94"/> 
-    </groupbox>
-    </tabpanel>    
-  <separator class="groove-thin" orient="horizontal" width="94"/> 
- <tabpanel id="address">
-  <groupbox id="address" style="border:1px solid black">
-    <hbox>
-        <caption label="&postaladdress.value;" />
-    </hbox>
-     <separator class="groove-thin" orient="horizontal" width="94"/> 
-     <hbox>
-        <label  align="right" id="street"  value="&street.value;" width="97" />
-		<textbox id="txtstreet" width="270" align="right"/>
-       <spacer width="33"/>
-	</hbox>
+  <groupbox id="contact" >
+        <separator class="groove-thin" orient="horizontal" width="94"/> 
+            <hbox>
+                <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;"/> 
+                <button label="Create Partner" image="&imagecreate.value;" oncommand="CreatePartner.onMenuItemCommand(event);"/>
+        </hbox>
 
-     <hbox>
-        <label  align="right" id="street2"  value="&street2.value;" width="97" />
-		<textbox id="txtstreet2" width="270" align="right"/>
-        <spacer width="35"/>
-	</hbox>
-   <hbox>
-        <label  align="right" id="zip"  value="&zip.value;" width="97" />
-		<textbox id="txtzip" align="right" />
-        <spacer width="114"/>
-	</hbox>
+         <separator class="groove-thin" orient="horizontal" width="80"/> 
+            </groupbox>
+            </tabpanel>    
+        <tabpanel id="address">
+        
+        <groupbox id="address" style="border:1px solid black">
+            <hbox>
+                <caption label="&postaladdress.value;" />
+            </hbox>
+            <separator class="groove-thin" orient="horizontal" width="94"/> 
+            <hbox>
+                <label  align="right" id="name"  value="&name.value;" width="97" />
+                <textbox id="txtname" align="right" />
+            </hbox>
+            <hbox>
+                <label  align="right" id="street"  value="&street.value;" width="97" />
+                <textbox id="txtstreet" align="right"/>
+                <spacer width="33"/>
+            </hbox>
 
-     <hbox>
-        <label  align="right" id="city"  value="&city.value;" width="97"/>
-		<textbox id="txtcity" align="right" />
-        <spacer width="112"/>
-	</hbox>
- 
-    <hbox>
-         <label  align="right" id="countryname"  value="&country.value;" width="97" />
-         <menulist id="country" width="190" oncommand= "getAllState();" >
-           <menupopup>
-	     <menuitem label="" value=""/>
-   	    </menupopup>
-      	  </menulist>
-	</hbox>
+            <hbox>
+                <label  align="right" id="street2"  value="&street2.value;" width="97" />
+                <textbox id="txtstreet2"  align="right"/>
+                <spacer width="33"/>
+            </hbox>
+            <hbox>
+                <label  align="right" id="zip"  value="&zip.value;" width="97" />
+                <textbox id="txtzip" align="right" />
+                <spacer width="33"/>
+            </hbox>
 
-     <hbox>
-         <label  align="right" id="statename"  value="&state.value;" width="97" />
-         <menulist id="state" width="190">
-           <menupopup>
-	     <menuitem label="" value=""/>
-   	    </menupopup>
-      	  </menulist>
-	</hbox>
-  <separator class="groove-thin" orient="horizontal" width="94"/> 
-</groupbox>
-<groupbox id="communication" style="border:1px solid black">
-   <vbox>
-        <caption label="&communication.value;" />
-     </vbox>
-     <separator class="groove-thin" orient="horizontal" width="94"/> 
-     <hbox>
-        <label  align="right" id="office"  value="&office.value;" width="97" />
-	    <textbox id="txtoffice" align="right" />
-    </hbox>
-    <hbox>
-        <label  align="right" id="mobile"  value="&mobile.value;" width="97" />
-	    <textbox id="txtmobile" align="right"/>
-    </hbox> 
-    <hbox>
-        <label  align="right" id="fax"  value="&fax.value;" width="97" />
-	    <textbox id="txtfax" align="right" />
-    </hbox> 
-    <hbox>
-        <label  align="right" id="emailid"  value="&email.value;" width="97" />
-	    <textbox id="txtemail" width="280" align="right"/>
-    </hbox>
-  </groupbox>
-</tabpanel>
-<description></description>
+            <hbox>
+                <label  align="right" id="city"  value="&city.value;" width="97"/>
+                <textbox id="txtcity" align="right" />
+                <spacer width="33"/>
+            </hbox>
+
+            <hbox>
+                <label  align="right" id="countryname"  value="&country.value;" width="97" />
+                <menulist id="country" width="190" oncommand= "getAllState();" >
+                    <menupopup>
+                        <menuitem label="" value=""/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+
+            <hbox>
+             <label  align="right" id="statename"  value="&state.value;" width="97" />
+                 <menulist id="state" width="190">
+                    <menupopup>
+                        <menuitem label="" value=""/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+            <separator class="groove-thin" orient="horizontal" width="60"/> 
+        </groupbox>
+        
+        <groupbox id="communication" style="border:1px solid black">
+           <vbox>
+                <caption label="&communication.value;" />
+             </vbox>
+             <separator class="groove-thin" orient="horizontal" width="94"/> 
+             <hbox>
+                <label  align="right" id="office"  value="&office.value;" width="97" />
+	            <textbox id="txtoffice" align="right" />
+            </hbox>
+            <hbox>
+                <label  align="right" id="mobile"  value="&mobile.value;" width="97" />
+	            <textbox id="txtmobile" align="right"/>
+            </hbox> 
+            <hbox>
+                <label  align="right" id="fax"  value="&fax.value;" width="97" />
+	            <textbox id="txtfax" align="right" />
+            </hbox> 
+            <hbox>
+                <label  align="right" id="emailid"  value="&email.value;" width="97" />
+	            <textbox id="txtemail" align="right"/>
+	            <spacer width="30"/>
+            </hbox>
+          </groupbox>
+    </tabpanel>
+    <description></description>
 <hbox align="right">
   <button label="&cancel.label;" image="&imagecancel.value;" oncommand="close();" />
   <button label="&ok.label;" image="&imageok.value;" oncommand="createContact();"/>
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 cba4b450ca9..598abb8fb61 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
@@ -6,185 +6,185 @@ var name = new Array();
 var test = new Array();
 
 var MBstrBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].
-			getService(Components.interfaces.nsIStringBundleService);
+            getService(Components.interfaces.nsIStringBundleService);
 var mboximportbundle = MBstrBundleService.createBundle("chrome://mboximport/locale/mboximport.properties"); 
 //function to get the required details of the selected email
 
 function check()
 {
     setTimeout("createConnection()",5000)
-	if (getconnect_server() == "false")
-	{
-		alert("Please Login To The Database First !")
-		return false;
-	}
-	setTimeout("module_install()", 10000)
-	if (getmodule_install() == "no")
-	{
-		alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
-		return false
-	}
+    if (getconnect_server() == "false")
+    {
+        alert("Please Login To The Database First !")
+        return false;
+    }
+    setTimeout("module_install()", 10000)
+    if (getmodule_install() == "no")
+    {
+        alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
+        return false
+    }
     if(GetNumSelectedMessages() < 1 || GetNumSelectedMessages() > 1){
-		alert("You must select only one mail to archive");
-		return false
-	}
-	return true
+        alert("You must select only one mail to archive");
+        return false
+    }
+    return true
 
 }
 
 function searchmail()
-{	
-	if (check() == false){
+{   
+    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();
-	}
+    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];
+    IETtotal = emlsArray.length;
+    IETexported = 0;
+    var msguri = emlsArray[0];
 
-	
-	//gives the selected email uri
-	var messageUri= gDBView.URIForFirstSelectedMessage;
+    
+    //gives the selected email uri
+    var messageUri= gDBView.URIForFirstSelectedMessage;
 
-	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
+    var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
 
-	//gives the selected email object
-	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+    //gives the selected email object
+    var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
 
 
-	if (version > 2)
-	{
-		m_uri = message.folder.getUriForMsg(message);
-		saveMsgAsEML(m_uri,file,false,emlsArray,null);
-	}
-	else
-	{
-		saveMsgAsEML(msguri,file,false,emlsArray,null);
-	}
+    if (version > 2)
+    {
+        m_uri = message.folder.getUriForMsg(message);
+        saveMsgAsEML(m_uri,file,false,emlsArray,null);
+    }
+    else
+    {
+        saveMsgAsEML(msguri,file,false,emlsArray,null);
+    }
 
-	//gives the received email date
-	var stdate = new Date(message.date / 1000);
+    //gives the received email date
+    var stdate = new Date(message.date / 1000);
 
-	//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
-	}
+    //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
+    }
 
-	//gives the receiver email address
-	receiveremail = message.mime2DecodedRecipients;
+    //gives the receiver email address
+    receiveremail = message.mime2DecodedRecipients;
 
-	//parsing the received date in the particular format
-	receivedDate = stdate.getFullYear()+'/'+(stdate.getMonth()+1)+'/'+stdate.getDate();
+    //parsing the received date in the particular format
+    receivedDate = stdate.getFullYear()+'/'+(stdate.getMonth()+1)+'/'+stdate.getDate();
 
-	//gives the selected email subject
-	subject = message.subject;
+    //gives the selected email subject
+    subject = message.subject;
 
-	//gives the selected email cclist
-	cclist = message.ccList;
+    //gives the selected email cclist
+    cclist = message.ccList;
 
-	//gives the selected email message body in text format
-	if (version > 2)
-	{
-		var listener = Components.classes["@mozilla.org/network/sync-stream-listener;1"].createInstance(Components.interfaces.nsISyncStreamListener);  
-		var uri = message.folder.getUriForMsg(message);
-		messenger.messageServiceFromURI(uri)  
-		    .streamMessage(uri, listener, null, null, false, "");    
-		var folder = message.folder;  
-		messagebody = folder.getMsgTextFromStream(listener.inputStream,message.Charset,65536,32768,false,true,{})
-	}
-	else
-	{
-		messagebody = getMessageBrowser().docShell.contentViewer.DOMDocument.body.textContent;
-	}
-	//gives the selected email message body in html format
-	msghtmlbody = ""// getMessageBrowser().docShell.contentViewer.DOMDocument.body.innerHTML;
+    //gives the selected email message body in text format
+    if (version > 2)
+    {
+        var listener = Components.classes["@mozilla.org/network/sync-stream-listener;1"].createInstance(Components.interfaces.nsISyncStreamListener);  
+        var uri = message.folder.getUriForMsg(message);
+        messenger.messageServiceFromURI(uri)  
+            .streamMessage(uri, listener, null, null, false, "");    
+        var folder = message.folder;  
+        messagebody = folder.getMsgTextFromStream(listener.inputStream,message.Charset,65536,32768,false,true,{})
+    }
+    else
+    {
+        messagebody = getMessageBrowser().docShell.contentViewer.DOMDocument.body.textContent;
+    }
+    //gives the selected email message body in html format
+    msghtmlbody = ""// getMessageBrowser().docShell.contentViewer.DOMDocument.body.innerHTML;
 
-	//set the initial information for the selected email
-	setSenderEmail(senderemail);
-	setSenderName(sendername);
-	setReceiverEmail(receiveremail);
-	setSubject(subject);
-	setReceivedDate(receivedDate);
-	setCCList(cclist);
-	setMessageBody(messagebody);
-	getPref().setCharPref('displayName','');
-	getPref().setCharPref('attachmentdata','');
-	name = [];
-	test = [];
-	getPref().setCharPref('attachmentlength',currentAttachments.length);
-	//retrieving the information for the selected email's attachment
-	if(currentAttachments.length > 0){
-		for(i=0;i<currentAttachments.length;i++){
-			contentType[i] = currentAttachments[i].contentType;
-			uri = currentAttachments[i].uri;
-			url[i] = currentAttachments[i].url;
-			name[i] = currentAttachments[i].displayName;
-			var obj = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-			if(navigator.userAgent.indexOf('Linux')!= -1){
-				obj.initWithPath("/tmp/");
-			}
-			else if(navigator.userAgent.indexOf('Win')!= -1){
-				obj.initWithPath("c:\\");
-			}
-			else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-				obj.initWithPath("/tmp/");
-			} 
-			else{
-				alert("Not Compatible for this Operating System");
-				false();
-			}
-			//saving the attachment files in system's temp folder
-			test[i] = messenger.saveAttachmentToFolder(contentType[i],url[i],name[i],uri,obj);
-		}
-		//function to read the attachment file contents
-		att =getAttachValue()
-		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
-		createInstance(name,test)
+    //set the initial information for the selected email
+    setSenderEmail(senderemail);
+    setSenderName(sendername);
+    setReceiverEmail(receiveremail);
+    setSubject(subject);
+    setReceivedDate(receivedDate);
+    setCCList(cclist);
+    setMessageBody(messagebody);
+    getPref().setCharPref('displayName','');
+    getPref().setCharPref('attachmentdata','');
+    name = [];
+    test = [];
+    getPref().setCharPref('attachmentlength',currentAttachments.length);
+    //retrieving the information for the selected email's attachment
+    if(currentAttachments.length > 0){
+        for(i=0;i<currentAttachments.length;i++){
+            contentType[i] = currentAttachments[i].contentType;
+            uri = currentAttachments[i].uri;
+            url[i] = currentAttachments[i].url;
+            name[i] = currentAttachments[i].displayName;
+            var obj = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+            if(navigator.userAgent.indexOf('Linux')!= -1){
+                obj.initWithPath("/tmp/");
+            }
+            else if(navigator.userAgent.indexOf('Win')!= -1){
+                obj.initWithPath("c:\\");
+            }
+            else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+                obj.initWithPath("/tmp/");
+            } 
+            else{
+                alert("Not Compatible for this Operating System");
+                false();
+            }
+            //saving the attachment files in system's temp folder
+            test[i] = messenger.saveAttachmentToFolder(contentType[i],url[i],name[i],uri,obj);
+        }
+        //function to read the attachment file contents
+        att =getAttachValue()
+        window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+        createInstance(name,test)
 
-	}
-	else
-	{
-		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
-	}
+    }
+    else
+    {
+        window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+    }
 }
-
-
+
+
 var openPartnerHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    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 arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        var count = arrIdList.Count();
+        for (var 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=='')
@@ -192,246 +192,286 @@ var openPartnerHandler = {
                 alert("Partner is not Available.");
                 return;
             } 
-            if(strlSearchResult=="partner_id"){
-                partner_id = strlSearchResultValue;
-                weburl = getWebServerURL();
-
-                if (parseInt(partner_id) > 0){
-                  var t = weburl + "/openerp/form/view?model=res.partner&id="+partner_id;
-                  window.open(t, "", "chrome","resizable=yes,scrollbars=yes,status=yes");
-                
+            if(strlSearchResult=="partner_id"){
+                partner_id = strlSearchResultValue;
+                weburl = getWebServerURL();
+
+                if (parseInt(partner_id) > 0){
+                    //Encode the url and form an url to have menu in webclient
+                    var encoded = encodeURIComponent("/openerp/form/view?model=res.partner&id="+partner_id)
+                    var t = weburl + "?next=" + encoded
+                    var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
+                    messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
+                    messenger.launchExternalURL(t);
                 }
                 else{
                     alert("Partner is not Available.");
                     return;
                 }
             }
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 
 }
 
 function searchPartner(email)
 {
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	arrFinalList = [];
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    arrFinalList = [];
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
     var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_contact';
-	var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strname.data = email;
-	xmlRpcClient.asyncCall(openPartnerHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
+    strobj.data = 'thunderbird.partner';
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_contact';
+    var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strname.data = email;
+    xmlRpcClient.asyncCall(openPartnerHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
 }
+
+
 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();
-	}
+    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];
+    IETtotal = emlsArray.length;
+    IETexported = 0;
+    var msguri = emlsArray[0];
 
-	
-	//gives the selected email uri
-	var messageUri= gDBView.URIForFirstSelectedMessage;
+    
+    //gives the selected email uri
+    var messageUri= gDBView.URIForFirstSelectedMessage;
+    
 
-	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
+    var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
 
-	//gives the selected email object 
-	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+    //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
-	}
+    //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');
-		var res = result.QueryInterface(Components.interfaces.nsISupportsArray);
-        res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32);
-		model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString); 
-        weburl = getWebServerURL();
-        if(res_id==0)
-        {
-            alert("Document is not available.");
-            return;
-        }
-        else
-        {
-            var t = weburl + "/openerp/form/view?model=" + model +"&id=" + res_id;
-            window.open(t, "", "chrome","resizable=yes,scrollbars=yes,status=yes,"); 
-        }
-
-	},
-	onFault: function (client, ctxt, fault) {
+    onResult: function(client, context, result) {
+        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();
+        if(res_id==0)
+        {
+            alert("Document is not available.");
+            return;
+        }
+        else
+        {
+    
+            var encoded = encodeURIComponent("/openerp/form/view?model=" + model +"&id=" + res_id)
+            var t = weburl + "?next=" + encoded
+            var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
+            messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
+            messenger.launchExternalURL(t);
+        }
 
-	},
+    },
+    onFault: function (client, ctxt, fault) {
 
-	onError: function (client, ctxt, status, errorMsg) {
+    },
 
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+
+    }
 } 
-
-
+
+//function to archive the mail content through xmlrpc request
+function parse_eml(){
+    var fpath =""
+    if(navigator.userAgent.indexOf('Linux')!= -1){
+        fpath ="/tmp/"
+    }
+    else if(navigator.userAgent.indexOf('Win')!= -1){
+        fpath ="C:\\"
+    }
+    else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+        fpath ="/tmp/"
+    } 
+    name = fpath + getPref().getCharPref('fname') +".eml"
+    var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+    file.initWithPath( name );
+    if ( file.exists() == false ) {
+        return null;
+    } else {
+        var is = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance( Components.interfaces.nsIFileInputStream );
+        is.init( file,0x01, 00004, null);
+        var sis = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance( Components.interfaces.nsIScriptableInputStream );
+        sis.init( is );
+        var output = sis.read( sis.available() );
+        return output
+    }
+    
+}
 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);
-	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];
-
+    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 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);
+    if (version > 2)
+    {
+        m_uri = message.folder.getUriForMsg(message);
+        saveMsgAsEML(m_uri,file,false,emlsArray,null);
+    }
+    else
+    {
+        saveMsgAsEML(msguri,file,false,emlsArray,null);
+    }
+    //gives the received email date
+    var stdate = new Date(message.date / 1000);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_message';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var eml_string = parse_eml()
+    var a = ['message'];
+    var b = [eml_string];
+    var arrofarr = dictcontact(a,b); 
+    xmlRpcClient.asyncCall(listDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+}
 
-	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
-
-	//gives the selected email object 
-	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
-    
-	
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_message';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var a = ['message_id'];
-	var b = ['<'+message.messageId+'>'];
-	var arrofarr = dictcontact(a,b); 
-	xmlRpcClient.asyncCall(listDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
-}
-
 function open_contact()
-{	
-	if (check() == false){
+{   
+    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();
-	}
+    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];
+    IETtotal = emlsArray.length;
+    IETexported = 0;
+    var msguri = emlsArray[0];
 
-	
-	//gives the selected email uri
-	var messageUri= gDBView.URIForFirstSelectedMessage;
+    
+    //gives the selected email uri
+    var messageUri= gDBView.URIForFirstSelectedMessage;
 
-	var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
+    var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
 
-	//gives the selected email object 
-	var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
+    //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
-	}
+    //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
+    }
 
-	//set the initial information for the selected email
+    //set the initial information for the selected email
     setSenderEmail(senderemail);
     setSenderName(sendername);
     setPartnerName("");
@@ -461,61 +501,61 @@ window.addEventListener("load", function(e) { Config.onLoad(e); }, false);
 
 //function to open the plugin window for searching the records for a particular object
 var Plugin = {
-	onLoad: function() {
-	this.initialized = true;
-	},
+    onLoad: function() {
+    this.initialized = true;
+    },
 
-	onMenuItemCommand: function() {
-		window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
-	}
+    onMenuItemCommand: function() {
+        window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
+    }
 };
 window.addEventListener("load", function(e) { Plugin.onLoad(e); }, false);
 
 //function to open the window for creating a new partner contact
 var Create = {
-	onLoad: function(){
-	this.initialized=true;
-	},
+    onLoad: function(){
+    this.initialized=true;
+    },
 
-	onMenuItemCommand: function(){
-		window.open("chrome://openerp_plugin/content/create.xul", "", "chrome");
-	}
+    onMenuItemCommand: function(){
+        window.open("chrome://openerp_plugin/content/create.xul", "", "chrome");
+    }
 };
 window.addEventListener("load", function(e) { Create.onLoad(e); }, false);
 
 var Address = {
-	onLoad: function(){
-	this.initialized=true;
-	},
+    onLoad: function(){
+    this.initialized=true;
+    },
 
-	onMenuItemCommand: function(){
-       open_contact();
+    onMenuItemCommand: function(){
+       open_contact();
        
-	}
+    }
 };
 
 
 //function to open the window for selecting the partner for a new contact creation
 var Select = {
-	onLoad: function(){
-	this.initialized=true;
-	},
+    onLoad: function(){
+    this.initialized=true;
+    },
 
-	onMenuItemCommand: function(){
-        // document.getElementById("txtselectpartner").value="";
-		 window.open("chrome://openerp_plugin/content/selectpartner.xul", "", "chrome");
+    onMenuItemCommand: function(){
+        // document.getElementById("txtselectpartner").value="";
+         window.open("chrome://openerp_plugin/content/selectpartner.xul", "", "chrome");
     }
-};
-
+};
+
 
 var CreatePartner = {
-	onLoad: function(){
-	this.initialized=true;
-	},
+    onLoad: function(){
+    this.initialized=true;
+    },
 
-	onMenuItemCommand: function(){
-		window.open("chrome://openerp_plugin/content/createpartner.xul", "", "chrome");
-	}
+    onMenuItemCommand: function(){
+        window.open("chrome://openerp_plugin/content/createpartner.xul", "", "chrome");
+    }
 };
 window.addEventListener("load", function(e) { CreatePartner.onLoad(e); }, false);
 
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 e2c3b3b7cee..93ba843b947 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
@@ -8,54 +8,89 @@
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/exportTools.js"></script>
 
-<menupopup id="taskPopup">
-    <menuitem id="tiny-plugin2" label="&tinyplugin;"
-          oncommand="Config.onMenuItemCommand(event);"
-          image="&menuicon.value;"
-          class="menuitem-iconic"
-          tooltiptext="&pluginconfig.value;"/>
-</menupopup>
+<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="Config.onMenuItemCommand(event);"
+                      image="&menuicon.settings;"
+                      class="menuitem-iconic"
+                      tooltiptext="&pluginconfig.value;"
+                      />
+            <menuseparator/>
+            <menuitem id="tiny-plugin4" label="&tinypluginconfig;"
+                      oncommand="searchmail();"
+                      image="&menuicon.value;"
+                      class="menuitem-iconic"
+                      tooltiptext="&pluginconfigvalue.value;"
+                      />
+            <menuseparator/>
+            <menuitem id="tiny-openpartner" label="&openpartner.value;"
+                      oncommand="open_partner();"
+                      image="&menuicon.value;"
+                      class="menuitem-iconic"
+                      tooltiptext="&openpartnertooltip.value;"
+                      />
 
-<menupopup id="taskPopup">
-    <menuitem id="tiny-plugin1" label="&tinypluginconfig;"
-          oncommand="searchmail();"
-          image="&menuicon.value;"
-          class="menuitem-iconic"
-          tooltiptext="&pluginconfigvalue.value;"/>
-</menupopup>
+            <menuitem id="tiny-opendocument" label="&opendocument.value;"
+                      oncommand="open_document();"
+                      image="&menuicon.value;"
+                      class="menuitem-iconic"
+                      tooltiptext="&opendocumenttooltip.value;"
+                      />
+            
+        </menupopup>
+    </menu>
+</menubar>
+
+<!--<menupopup id="taskPopup">-->
+<!--    <menuitem id="tiny-plugin2" label="&tinyplugin;"-->
+<!--          oncommand="Config.onMenuItemCommand(event);"-->
+<!--          image="&menuicon.value;"-->
+<!--          class="menuitem-iconic"-->
+<!--          tooltiptext="&pluginconfig.value;"/>-->
+<!--</menupopup>-->
+
+<!--<menupopup id="taskPopup">-->
+<!--    <menuitem id="tiny-plugin1" label="&tinypluginconfig;"-->
+<!--          oncommand="searchmail();"-->
+<!--          image="&menuicon.value;"-->
+<!--          class="menuitem-iconic"-->
+<!--          tooltiptext="&pluginconfigvalue.value;"/>-->
+<!--</menupopup>-->
 
 <popup id="threadPaneContext">
-	<menuitem id="threadPaneContext-saveAsMultiple"
-		insertbefore="threadPaneContext-print"
-		class="menuitem-iconic"
-		image="&menuicon.value;"
-		label="Archive To OpenERP"
-		accesskey="T"
-		oncommand="searchmail();"/>
+    <menuitem id="threadPaneContext-saveAsMultiple"
+        insertbefore="threadPaneContext-print"
+        class="menuitem-iconic"
+        image="&menuicon.value;"
+        label="Archive To OpenERP"
+        accesskey="T"
+        oncommand="searchmail();"/>
 </popup>
 
 <toolbarpalette id="MailToolbarPalette">
-	<toolbarbutton id="GA-button"
-		class="toolbarbutton-1"
-		image="&menuicon.value;"
-		label= "Push To OpenERP"
-		oncommand="searchmail();" />
+    <toolbarbutton id="GA-button"
+        class="toolbarbutton-1"
+        image="&menuicon.value;"
+        label= "Push"
+        oncommand="searchmail();" />
 </toolbarpalette> 
 
 <toolbarpalette id="MailToolbarPalette">
-	<toolbarbutton id="GA-button2"
-		class="toolbarbutton-1"
-		image="&partnericon.value;"
-		label= "Open Partner"
+    <toolbarbutton id="GA-button2"
+        class="toolbarbutton-1"
+        image="&partnericon.value;"
+        label= "Partner"
         oncommand="open_partner();"
-		  />
+          />
 </toolbarpalette>
 <toolbarpalette id="MailToolbarPalette">
-	<toolbarbutton id="GA-button3"
-		class="toolbarbutton-1"
-		image="&imagearchive.value;"
-		label= "Open Document"
-		oncommand="open_document();"  />
+    <toolbarbutton id="GA-button3"
+        class="toolbarbutton-1"
+        image="&imagearchive.value;"
+        label= "Document"
+        oncommand="open_document();"  />
 </toolbarpalette> 
-
+
 </overlay>
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 afe02875931..fc6802d9b9c 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
@@ -3,7 +3,7 @@
 <!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/plugin.dtd">
 <window id="pluginwindows" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
-	title="&title.label;" onload="myPrefObserver.loaddata()" height="650" width="1000">
+	title="&title.label;" onload="myPrefObserver.loaddata()" height="560" width="960">
 
 <script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/config.js"></script>
@@ -12,11 +12,9 @@
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/exportTools.js"></script>
 <description></description>
-<hbox id="root" height="10" width="800" style="padding:12px;border:1px solid black">
-    
-        <caption label="&title.label;" />
+<hbox id="root" height="10" width="800" >
 </hbox>
-<hbox id="root1" height="380" width="800" style="padding:12px;border:1px solid black">
+<hbox id="root1" height="380" width="800" >
 <vbox>
       <caption label="&gptinyobj.label;" />
       <groupbox id="existsobjectgroup" width="400" style="border:1px solid black">
@@ -42,6 +40,7 @@
 	        <listbox height="250" width="100%" id="listSearchBox" style="border:1px solid red" seltype="multiple">
 	            <listhead>
 	    	        <listheader label="&listSearchBox.header;"/>
+<!--	    	        <listheader label="&listSearchBox.header2;"/>-->
 	            </listhead>
 	            <listcols>
 	    	        <listcol flex="1"/>
@@ -58,42 +57,42 @@
 
    <vbox> 
     <caption label="&newobject.label;" />
-   <groupbox id="newobjectgroup" width="400" align="left" style="border:1px solid black;">
-        
-        <separator class="groove-thin" orient="horizontal" width="400"/> 
-	       <hbox align="left">
-                <vbox>
-                    <label id="lblex3" align="right" width="135" control="section" value="&object.label;"/>
-                </vbox>
-                <vbox>
-                    <menulist id="section" width="150">
-                    <menupopup>
-	                    <menuitem label="" value=""/>
-   	                </menupopup>
-      	            </menulist>
-                </vbox>
-                <vbox>
-      	            <button width="50" label="&archive.label;" accesskey="c" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('create');"/>
-                </vbox>
-	        </hbox>
+	<groupbox id="newobjectgroup" width="400" align="left" style="border:1px solid black;">
+		<separator class="groove-thin" orient="horizontal" width="400" height="30"/> 
+		<hbox align="left">
+			<vbox>
+				<label id="lblex3" align="right" width="135" control="section" value="&object.label;"/>
+			</vbox>
+			<vbox>
+				<menulist id="section" width="150">
+					<menupopup>
+						<menuitem label="" value=""/>
+					</menupopup>
+				</menulist>
+			</vbox>
+			<vbox>
+				<button width="50" label="&archive.label;" accesskey="c" image="&imagearchive.value;" oncommand="attachmentWidnowOpen('create');"/>
+			</vbox>
+		</hbox>
+		<separator class="groove-thin" orient="horizontal" width="180" height="100"/>
+	</groupbox>
+ 		<caption label="&newcontact.label;" />
+		<groupbox id="newcontactgroup" width="400" align="left" style="border:1px solid black;">
+			<separator class="groove-thin" orient="horizontal" width="400" height="30"/>
+		    <hbox align="left">
+			    <vbox>
+				    <label align="right" width="135" id="lblsection" control="section" value="&partner.label;"/>
+			    </vbox>
+			    <vbox>
+				    <button label="&create.label;" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
+			    </vbox>
+		    </hbox> 
+	        <separator class="groove-thin" orient="horizontal" width="180" height="215"/>
+		</groupbox>
 
-	        <separator class="groove-thin" orient="horizontal" width="180"/>
-   
-            <hbox align="left">
-                <vbox>
-	                <label align="right" width="135" id="lblsection" control="section" value="&partner.label;"/>
-                </vbox>
-                <vbox>
-	                <button label="&create.label;" image="&imagecreate.value;" oncommand="Create.onMenuItemCommand(event);"/>
-                </vbox>
-            </hbox> 
-        <separator class="groove-thin" orient="horizontal" width="480"/> 
- </groupbox>
-</vbox>
-  
-  
-</hbox>
-<hbox height="60" align="right" width="800">
-	    <button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
-   </hbox> 
+	</vbox>
+	</hbox>
+		<hbox height="60" align="right" width="800">
+			<button label="&close.label;" accesskey="l" image="&imagecancel.value;" oncommand="win_close();"/>
+		</hbox> 
 </window>
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 23038f29860..f1dff41bd77 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
@@ -37,187 +37,187 @@ var name = new Array();
 var attach_eml ="no";
 var popup_display = "yes"
 var rpc= {
-	servers: {},
-	addserver: function(name,ip,port,path) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		this.servers[name]= {
-			ip: ip,
-			port: port,
-			path: path,
-			avaible: true,
-			sock: Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient)};
-	},
-	getany: function(rpcval,n) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var t = ['PRUint8','PRUint16','PRInt16','PRInt32','PRBool','Char','CString','Float','Double','PRTime','InputStream','Array','Dictionary'];
-		for (var i=0; i<t.length; i++)
-			try { return [t[i],this.Iget(rpcval,Components.interfaces[((i==10 || i==12)? 'nsI': 'nsISupports')+t[i]],n)]; } catch(e) {}
-		return [false,'error getany','Undefined type'];
-	},
-	onfault: function(t) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		return (t.constructor==Array && t.length==3 && !t[0] && (t[1].substr(0,5)=='error' || t[1].substr(0,5)=='fault'))?
-			true : false;
-	},
-	getall: function(rpcval,n) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var t = this.getany(rpcval,n);
-		if (this.onfault(t)) return t;
-		if (t[0]=='PRBool') return (t[1]=='true');
-		if (t[0]=='PRInt32') return parseInt(t[1]+'');
-		if (t[0]=='PRTime') {
-			dte= new Date("January 1, 1970, 00:00:00");
-			dte.setUTCMilliseconds(t[1]+'');
-			return dte; }
-		if (t[0]=='Double' || t[0]=='Float') return parseFloat(t[1]+'');
-		if (t[0]=='Char' || t[0]=='CString') return (t[1]+'').replace(/¬/g,'€');
-		if (t[0]=='Array') {
-			var a=[];
-			for (var i=0; i<t[1].Count(); i++) a[i]= this.getall(t[1],i);
-		} else if (t[0]=='Dictionary') {
-			var a={};
-			var keys = t[1].getKeys({});
-			for (var k = 0; k < keys.length; k++)
-				a[keys[k]]= this.getall(t[1],keys[k]);
-		} else return t[1];
-		return a;
-	},
-	Iget: function(rpcval,itype,n) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		if (n == undefined) return rpcval.QueryInterface(itype);
-		else if (n==parseInt(n)) return rpcval.QueryElementAt(n,itype);
-		else return rpcval.getValue(n).QueryInterface(itype);
-	},
-	checktype: function(val) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		if (val != undefined) {
-			switch (val.constructor) {
-				case Number: return (val==parseInt(val))? 1:4;
-				case Boolean: return 2;
-				case String: return 3;
-				case Date: return 5;
-				case Object: return 7;
-				case Array: return 6;
+    servers: {},
+    addserver: function(name,ip,port,path) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        this.servers[name]= {
+            ip: ip,
+            port: port,
+            path: path,
+            avaible: true,
+            sock: Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient)};
+    },
+    getany: function(rpcval,n) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var t = ['PRUint8','PRUint16','PRInt16','PRInt32','PRBool','Char','CString','Float','Double','PRTime','InputStream','Array','Dictionary'];
+        for (var i=0; i<t.length; i++)
+            try { return [t[i],this.Iget(rpcval,Components.interfaces[((i==10 || i==12)? 'nsI': 'nsISupports')+t[i]],n)]; } catch(e) {}
+        return [false,'error getany','Undefined type'];
+    },
+    onfault: function(t) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        return (t.constructor==Array && t.length==3 && !t[0] && (t[1].substr(0,5)=='error' || t[1].substr(0,5)=='fault'))?
+            true : false;
+    },
+    getall: function(rpcval,n) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var t = this.getany(rpcval,n);
+        if (this.onfault(t)) return t;
+        if (t[0]=='PRBool') return (t[1]=='true');
+        if (t[0]=='PRInt32') return parseInt(t[1]+'');
+        if (t[0]=='PRTime') {
+            dte= new Date("January 1, 1970, 00:00:00");
+            dte.setUTCMilliseconds(t[1]+'');
+            return dte; }
+        if (t[0]=='Double' || t[0]=='Float') return parseFloat(t[1]+'');
+        if (t[0]=='Char' || t[0]=='CString') return (t[1]+'').replace(/¬/g,'€');
+        if (t[0]=='Array') {
+            var a=[];
+            for (var i=0; i<t[1].Count(); i++) a[i]= this.getall(t[1],i);
+        } else if (t[0]=='Dictionary') {
+            var a={};
+            var keys = t[1].getKeys({});
+            for (var k = 0; k < keys.length; k++)
+                a[keys[k]]= this.getall(t[1],keys[k]);
+        } else return t[1];
+        return a;
+    },
+    Iget: function(rpcval,itype,n) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        if (n == undefined) return rpcval.QueryInterface(itype);
+        else if (n==parseInt(n)) return rpcval.QueryElementAt(n,itype);
+        else return rpcval.getValue(n).QueryInterface(itype);
+    },
+    checktype: function(val) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        if (val != undefined) {
+            switch (val.constructor) {
+                case Number: return (val==parseInt(val))? 1:4;
+                case Boolean: return 2;
+                case String: return 3;
+                case Date: return 5;
+                case Object: return 7;
+                case Array: return 6;
 
-			}
-		}
-		return 7;
+            }
+        }
+        return 7;
 
-	},
-	set: function(rpcobj,param) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		if (param==undefined) return [false,'error set','Undefined parameter'];
-		var itype= this.checktype(param);
-		if (this.onfault(itype)) return itype;
-		var p = this.servers[rpcobj].sock.createType(itype,{});
-		if (itype==6) {
-			if (param.length>0)
-				for (var i=0; i<param.length; i++) p.AppendElement( this.set(rpcobj,param[i]) );
-		} else if (itype==7) {
-			for (var i in param) p.setValue( i, this.set(rpcobj,param[i]) );
-		} else if (itype==4) {
-			p.data=(''+param).replace(',','.');
-		} else p.data=param;
-		return p;
-	},
-	ask: function(rpcobj,method,params,func_out) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var a=this.disableNset(rpcobj) ;
-		if (this.onfault(a)) return a;
-		var handler = {
-			onResult: function(client, async, result) {
-				rpc.servers[rpcobj].avaible= true;
-				func_out(rpc.getall(result)); },
-			onFault: function (client, async, faute) {alert("in ask infault"+result)
-				 rpc.servers[rpcobj].avaible= true; func_out([false,'fault',faute]); },
-			onError: function (client, async, status, msg) {
-				rpc.servers[rpcobj].avaible= true;
-				if (status=='2147500037') {
-					status= "no network or no server";
-					msg= "1. Check your network connection.";
-					msg+= "\n2. Check your server connection parameters:";
-					msg+= "\n\t"+rpc.servers[rpcobj].ip+":"+rpc.servers[rpcobj].port+"=>"+params[0];
-					msg+= "\n3. Your server may not be launched or connected to the network.";
-				}
-				func_out([false,'error '+status,msg]);
-				} };
-		var p = [];
-		for (var i=0; i<params.length; i++)
-			p[i]= this.set(rpcobj,params[i]);
-		try { this.servers[rpcobj].sock.asyncCall(handler, null, method, p, p.length);
-		} catch(e) {
-			this.servers[rpcobj].avaible= true;
-			this.servers[rpcobj].sock= Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient) ;
-			func_out([false,'error catch',e]); }
-		return true;
-	},
-	disableNset: function(rpcobj) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		if (this.servers[rpcobj]) {
-			this.servers[rpcobj].avaible= false;//alert('http://'+this.servers[rpcobj].ip+':'+this.servers[rpcobj].port+this.servers[rpcobj].path);
-			server_path=this.servers[rpcobj].ip+':'+this.servers[rpcobj].port+this.servers[rpcobj].path
-			this.servers[rpcobj].sock.init(server_path);
-			
-			return true; }
-		return [false,'error disableNset','Server vars not set'];
-	}
+    },
+    set: function(rpcobj,param) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        if (param==undefined) return [false,'error set','Undefined parameter'];
+        var itype= this.checktype(param);
+        if (this.onfault(itype)) return itype;
+        var p = this.servers[rpcobj].sock.createType(itype,{});
+        if (itype==6) {
+            if (param.length>0)
+                for (var i=0; i<param.length; i++) p.AppendElement( this.set(rpcobj,param[i]) );
+        } else if (itype==7) {
+            for (var i in param) p.setValue( i, this.set(rpcobj,param[i]) );
+        } else if (itype==4) {
+            p.data=(''+param).replace(',','.');
+        } else p.data=param;
+        return p;
+    },
+    ask: function(rpcobj,method,params,func_out) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var a=this.disableNset(rpcobj) ;
+        if (this.onfault(a)) return a;
+        var handler = {
+            onResult: function(client, async, result) {
+                rpc.servers[rpcobj].avaible= true;
+                func_out(rpc.getall(result)); },
+            onFault: function (client, async, faute) {alert("in ask infault"+result)
+                 rpc.servers[rpcobj].avaible= true; func_out([false,'fault',faute]); },
+            onError: function (client, async, status, msg) {
+                rpc.servers[rpcobj].avaible= true;
+                if (status=='2147500037') {
+                    status= "no network or no server";
+                    msg= "1. Check your network connection.";
+                    msg+= "\n2. Check your server connection parameters:";
+                    msg+= "\n\t"+rpc.servers[rpcobj].ip+":"+rpc.servers[rpcobj].port+"=>"+params[0];
+                    msg+= "\n3. Your server may not be launched or connected to the network.";
+                }
+                func_out([false,'error '+status,msg]);
+                } };
+        var p = [];
+        for (var i=0; i<params.length; i++)
+            p[i]= this.set(rpcobj,params[i]);
+        try { this.servers[rpcobj].sock.asyncCall(handler, null, method, p, p.length);
+        } catch(e) {
+            this.servers[rpcobj].avaible= true;
+            this.servers[rpcobj].sock= Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient) ;
+            func_out([false,'error catch',e]); }
+        return true;
+    },
+    disableNset: function(rpcobj) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        if (this.servers[rpcobj]) {
+            this.servers[rpcobj].avaible= false;//alert('http://'+this.servers[rpcobj].ip+':'+this.servers[rpcobj].port+this.servers[rpcobj].path);
+            server_path=this.servers[rpcobj].ip+':'+this.servers[rpcobj].port+this.servers[rpcobj].path
+            this.servers[rpcobj].sock.init(server_path);
+            
+            return true; }
+        return [false,'error disableNset','Server vars not set'];
+    }
 }
 function handler_function( result ) {
-	if ( rpc.onfault( result ) ) { alert( result[0] + "\n" + result[1] ); return; }
-	else{
-		alert("got result"+result)	
-	}
+    if ( rpc.onfault( result ) ) { alert( result[0] + "\n" + result[1] ); return; }
+    else{
+        alert("got result"+result)  
+    }
 }
 
 //Sets the preference service
 function getPref(){
-	var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
+    var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
     var branchobj = prefService.getBranch("extensions.tiny.");
     branchobj.QueryInterface(Components.interfaces.nsIPrefBranch2);
-	return branchobj
+    return branchobj
 }
 
 function setFileName(fname){
-	getPref().setCharPref('fname',fname);
+    getPref().setCharPref('fname',fname);
 }
 
 //set attachment file save or not
 function setAttachment(argAttac){
-	getPref().setCharPref('attachment',argAttac);
+    getPref().setCharPref('attachment',argAttac);
 }
 
 //set preference value for server url
 function setServer(argServer){
-	getPref().setCharPref('serverurl',argServer);
+    getPref().setCharPref('serverurl',argServer);
 }
 
 //set preference value for server port
 function setPort(argPort){
-	getPref().setCharPref('serverport',argPort)
+    getPref().setCharPref('serverport',argPort)
 }
 
 //set preference value of database name for data searching and selection
 function setDbName(argDbName){
-	getPref().setCharPref('serverdbname',argDbName);
+    getPref().setCharPref('serverdbname',argDbName);
 }
 
 //set webserver url
 function setWebServerURL(argWebServerURL){
-	getPref().setCharPref('webserverurl',argWebServerURL);
+    getPref().setCharPref('webserverurl',argWebServerURL);
 }
 //set preference value of username for login
 function setUsername(argUsername){
-	getPref().setCharPref('username',argUsername);
+    getPref().setCharPref('username',argUsername);
 }
 
 //set preference value of password for login
 function setPassword(argPassword){
-	getPref().setCharPref('password',argPassword);
+    getPref().setCharPref('password',argPassword);
 }
 
 //set preference value for storing partner id
 function setPartnerId(argPartnerId){
-	getPref().setCharPref('partnerid',argPartnerId)
+    getPref().setCharPref('partnerid',argPartnerId)
 }
 
 //set preference value for Resource Id
@@ -226,17 +226,17 @@ function setResourceId(argResourceId){
 }
 //set server service
 function setServerService(argServerService){
-	strServerService = argServerService;
+    strServerService = argServerService;
 }
 
 //set preference value for sender email
 function setSenderEmail(argSenderEmail){
-	getPref().setCharPref('senderemail',argSenderEmail)
+    getPref().setCharPref('senderemail',argSenderEmail)
 }
 
 //set preference value for receiver email
 function setReceiverEmail(argReceiverEmail){
-	getPref().setCharPref('receiveremail',argReceiverEmail)
+    getPref().setCharPref('receiveremail',argReceiverEmail)
 }
 
 //set preference value for sender name
@@ -246,202 +246,202 @@ function setSenderName(argSenderName){
 
 //set preference value for email subject
 function setSubject(argSubject){
-	getPref().setCharPref('subject',argSubject)
+    getPref().setCharPref('subject',argSubject)
 }
 
 //set preference value for email received date
 function setReceivedDate(argReceivedDate){
-	getPref().setCharPref('receiveddate',argReceivedDate)
+    getPref().setCharPref('receiveddate',argReceivedDate)
 }
 
 //set preference value for storing contact id which is used while storing mail contents after creating a new partner contact
 function setContactId(argContactId){
-	getPref().setCharPref('contactid',argContactId)
+    getPref().setCharPref('contactid',argContactId)
 }
 
 //set preference value for storing attachment option in config
 function setAttachValue(argAttachValue){
-	getPref().setCharPref('attachvalue',argAttachValue)
+    getPref().setCharPref('attachvalue',argAttachValue)
 }
 
 //set preference value for email cclist
 function setCCList(argCCList){
-	getPref().setCharPref('cclist',argCCList)
+    getPref().setCharPref('cclist',argCCList)
 }
 
 //set preference value for email message body
 function setMessageBody(argMessageBody){
-	getPref().setCharPref('messagebody',argMessageBody)
+    getPref().setCharPref('messagebody',argMessageBody)
 }
 
 //set preference value for Partner Name
 function setPartnerName(argPartnerName){
-	getPref().setCharPref('partnername',argPartnerName)
+    getPref().setCharPref('partnername',argPartnerName)
 }
 
 //set preference value for Contact Name
 function setContactName(argContactName){
-	getPref().setCharPref('contactname',argContactName)
+    getPref().setCharPref('contactname',argContactName)
 }
 
 //set preference value for street
 function setStreet(argStreet){
-	getPref().setCharPref('street',argStreet)
+    getPref().setCharPref('street',argStreet)
 }
 
 //set preference value for street2
 function setStreet2(argStreet2){
-	getPref().setCharPref('street2',argStreet2)
+    getPref().setCharPref('street2',argStreet2)
 }
 
 //set preference value for zipcode
 function setZipCode(argZipcode){
-	getPref().setCharPref('zipcode',argZipcode)
+    getPref().setCharPref('zipcode',argZipcode)
 }
 
 //set preference value for Office Number
 function setOfficenumber(argOfficenumber){
-	getPref().setCharPref('officeno',argOfficenumber)
+    getPref().setCharPref('officeno',argOfficenumber)
 }
 
 //set preference value for Phone Number
 function setMobilenumber(argMobilenumber){
-	getPref().setCharPref('phoneno',argMobilenumber)
+    getPref().setCharPref('phoneno',argMobilenumber)
 }
 
 //set preference value for Fax
 function setFax(argFax){
-	getPref().setCharPref('fax',argFax)
+    getPref().setCharPref('fax',argFax)
 }
 
 //set preference value for city
 function setCity(argCity){
-	getPref().setCharPref('city',argCity)
+    getPref().setCharPref('city',argCity)
 }
 
 //set preference value for country
 function setCountry(argCountry){
-	getPref().setCharPref('country',argCountry)
+    getPref().setCharPref('country',argCountry)
 }
 
 //set preference value for state
 function setState(argState){
-	getPref().setCharPref('state',argState)
+    getPref().setCharPref('state',argState)
 }
 
 
 //set the value for the whole server url
 function setServerUrl(argServerUrl)
 {
-	var seperateUrl = argServerUrl.split(':');
-	setServer(seperateUrl.slice(0,seperateUrl.length-1).join(":"));
-	setPort(seperateUrl[seperateUrl.length-1]);
+    var seperateUrl = argServerUrl.split(':');
+    setServer(seperateUrl.slice(0,seperateUrl.length-1).join(":"));
+    setPort(seperateUrl[seperateUrl.length-1]);
 }
 
 //set preference value for storing user id
 function setUserId(argUserId){
-	getPref().setIntPref('userid',argUserId);
+    getPref().setIntPref('userid',argUserId);
 }
 
 //set database list is displaye or not
 function setDBList(argDBList){
-	getPref().setCharPref('db_list',argDBList)
+    getPref().setCharPref('db_list',argDBList)
 }
 
 //set server connect or not
 function setconnect_server(argconnect_server){
-	getPref().setCharPref('connect_server',argconnect_server)
+    getPref().setCharPref('connect_server',argconnect_server)
 }
 
 //set module install or not
 function setmodule_install(argconnect_module){
-	getPref().setCharPref('module_install',argconnect_module)
+    getPref().setCharPref('module_install',argconnect_module)
 }
 
 //get module install or not
 function getmodule_install(){
-	return getPref().getCharPref('module_install');
+    return getPref().getCharPref('module_install');
 }
 
 
 //get server connect or not
 function getconnect_server(){
-	return getPref().getCharPref('connect_server');
+    return getPref().getCharPref('connect_server');
 }
 
 
 //get partner id
 function getPartnerId(){
-	return getPref().getCharPref('partnerid');
+    return getPref().getCharPref('partnerid');
 }
 //get database list is displaye or not
 function getDBList(){
-	return getPref().getCharPref('db_list');
+    return getPref().getCharPref('db_list');
 }
 
 function getFileName(){
-	return getPref().getCharPref('fname');
+    return getPref().getCharPref('fname');
 }
 
 //get attachment save or not
 function getAttachment(){
-	return getPref().getCharPref('attachment');
+    return getPref().getCharPref('attachment');
 }
 
 //get serverurl
 function getServer(){
-	return getPref().getCharPref('serverurl');
+    return getPref().getCharPref('serverurl');
 }
 
 //get server port
 function getPort(){
-	return getPref().getCharPref('serverport');
+    return getPref().getCharPref('serverport');
 }
 
 //get database name
 function getDbName(){
-	return getPref().getCharPref('serverdbname');
+    return getPref().getCharPref('serverdbname');
 }
 
 //get webserver url
 function getWebServerURL(){
-	return getPref().getCharPref('webserverurl');
+    return getPref().getCharPref('webserverurl');
 }
 
 //get webserver port
 function getwebPort(){
-	return getPref().getCharPref('webserverport');
+    return getPref().getCharPref('webserverport');
 }
 
 //get username from config settings
 function getUsername(){
-	return getPref().getCharPref('username');
+    return getPref().getCharPref('username');
 }
 
 //get password from config settings
 function getPassword(){
-	return getPref().getCharPref('password');
+    return getPref().getCharPref('password');
 }
 
 //get serverservice
 function getServerService(){
-	return strServerService;
+    return strServerService;
 
 }
 
 //get sender email
 function getSenderEmail(){
-	return getPref().getCharPref('senderemail');
+    return getPref().getCharPref('senderemail');
 }
 
 //get receiver email
 function getReceiverEmail(){
-	return getPref().getCharPref('receiveremail');
+    return getPref().getCharPref('receiveremail');
 }
 
 //get resource id
 function getResourceId(){
-	return getPref().getCharPref('res_id');
+    return getPref().getCharPref('res_id');
 }
 
 
@@ -460,49 +460,49 @@ function getSenderName(){
             var utftext = "";
             var encoded_string = "";
             var convertedString = "";
-		    for (var n = 0; n < string.length; n++)
+            for (var n = 0; n < string.length; n++)
             {
-        		var c = string.charCodeAt(n);
-			    if (c < 128) {
-				    utftext += String.fromCharCode(c);
-			    }
-		    }
+                var c = string.charCodeAt(n);
+                if (c < 128) {
+                    utftext += String.fromCharCode(c);
+                }
+            }
 
             encoded_string = encode64(utftext);
-		   return encoded_string;
+           return encoded_string;
         }
 }
 
 
 //get partner name
 function getPartnerName(){
-	return getPref().getCharPref('partnername');
+    return getPref().getCharPref('partnername');
 }
 
 //get contact name
 function getContactName(){
-	return getPref().getCharPref('contactname');
+    return getPref().getCharPref('contactname');
 }
 
 
 //get street name
 function getStreet(){
-	return getPref().getCharPref('street');
+    return getPref().getCharPref('street');
 }
 
 //get street2 name
 function getStreet2(){
-	return getPref().getCharPref('street2');
+    return getPref().getCharPref('street2');
 }
 
 //get zip code
 function getZipCode(){
-	return getPref().getCharPref('zipcode');
+    return getPref().getCharPref('zipcode');
 }
 
 //get city name
 function getCity(){
-	return getPref().getCharPref('city');
+    return getPref().getCharPref('city');
 }
 
 //get country name
@@ -512,375 +512,375 @@ function getCountry(){
 
 //get state name
 function getState(){
-	return getPref().getCharPref('state');
+    return getPref().getCharPref('state');
 }
 
 //get office no
 function getOfficenumber(){
-	return getPref().getCharPref('officeno');
+    return getPref().getCharPref('officeno');
 }
 
 //get mobile no
 function getMobilenumber(){
-	return getPref().getCharPref('phoneno');
+    return getPref().getCharPref('phoneno');
 }
 
 //get fax no
 function getFax(){
-	return getPref().getCharPref('fax');
+    return getPref().getCharPref('fax');
 }
 
 
 //get email subject
 function getSubject(){
-	return getPref().getCharPref('subject');
+    return getPref().getCharPref('subject');
 }
 
 //get email received date
 function getReceivedDate(){
-	return getPref().getCharPref('receiveddate');
+    return getPref().getCharPref('receiveddate');
 }
 
 //get contact id which is used while storing mail contents after creating a new partner contact
 function getContactId(){
-	return getPref().getCharPref('contactid');
+    return getPref().getCharPref('contactid');
 }
 
 //get attachment option information from the configuration settings
 function getAttachValue(){
-	return getPref().getCharPref('attachvalue');
+    return getPref().getCharPref('attachvalue');
 }
 
 //get email cclist information
 function getCCList(){
-	return getPref().getCharPref('cclist');
+    return getPref().getCharPref('cclist');
 }
 
 //get email message body
 function getMessageBody(){
-	return getPref().getCharPref('messagebody');
+    return getPref().getCharPref('messagebody');
 }
 
 //get the whole server path
 function getServerUrl(){
-	return getServer()+":"+getPort()+"/"+getServerService();
+    return getServer()+":"+getPort()+"/"+getServerService();
 }
 
 //get user id for the xmlrpc request
 function getUserId(){
-	return getPref().getIntPref('userid');
+    return getPref().getIntPref('userid');
 }
 
 //Creates and returns and instance of the XML-RPC client
 function getClient() {
-	// Enable correct security
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	return Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient);
+    // Enable correct security
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    return Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient);
 }
 
 //returns the xmlrpc client instance
 function getXmlRpc() {
-	if (!xmlRpcClient) {
-		xmlRpcClient = getClient();
-	}
+    if (!xmlRpcClient) {
+        xmlRpcClient = getClient();
+    }
 
-	// Initialize the client with the URL
-	xmlRpcClient.init(getServerUrl());
-	return xmlRpcClient;
+    // Initialize the client with the URL
+    xmlRpcClient.init(getServerUrl());
+    return xmlRpcClient;
 }
 
 // function to get all basic parameters
 function getBasicList(){
-	var branchobj = getPref();
-	arrBasicList = [];
-	arrBasicList[0] = branchobj.getCharPref("serverdbname");
-	arrBasicList[1] = branchobj.getIntPref('userid');
-	arrBasicList[2] = branchobj.getCharPref("password");
-	arrBasicList[3] = getServer()
-	arrBasicList[4] = getPort()
-	return arrBasicList
+    var branchobj = getPref();
+    arrBasicList = [];
+    arrBasicList[0] = branchobj.getCharPref("serverdbname");
+    arrBasicList[1] = branchobj.getIntPref('userid');
+    arrBasicList[2] = branchobj.getCharPref("password");
+    arrBasicList[3] = getServer()
+    arrBasicList[4] = getPort()
+    return arrBasicList
 }
 
 function createMenuItem_db(aLabel) {
-  	const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-  	var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
-  	item.setAttribute("label", aLabel);
-	item.setAttribute("value", aLabel);
-  	return item;
+    const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
+    item.setAttribute("label", aLabel);
+    item.setAttribute("value", aLabel);
+    return item;
 }
 
 //xmlrpc request handler for getting the list of database
 var listDbHandler = {
-	onResult: function(client, context, result) {
-		setconnect_server("true")
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        setconnect_server("true")
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrMethodList.Count();
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlDbName = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
+        var count = arrMethodList.Count();
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlDbName = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
                         arrDbList[i] = strlDbName.data;
-		}
-		var database = ""
-		if (count > 0)
-		{
-			setDBList("true")
-			var label = document.getElementById("database_option");
-			var vbox = document.createElement("vbox");
-			var hbox = document.createElement("hbox");
-			var label1 = document.createElement("label");
-			label1.setAttribute("width","80");
-			label1.setAttribute("value","Database:");
-			label1.setAttribute("id","label111");
-			var menu1 = document.createElement("menulist");
-			var menupopup1 = document.createElement("menupopup");
-			menu1.setAttribute("id","DBlist");
-			menu1.setAttribute("width","300");
-			var menuitem1 = document.createElement("menuitem");
-			database = arrDbList[0]
-		  	menuitem1.setAttribute("label", arrDbList[0]);
-			menuitem1.setAttribute("value", arrDbList[0]);
-			menupopup1.appendChild(menuitem1);
-			menu1.appendChild(menupopup1)
-			hbox.appendChild(label1);
-			hbox.appendChild(menu1);
-			vbox.appendChild(hbox);
-			label.appendChild(vbox);
+        }
+        var database = ""
+        if (count > 0)
+        {
+            setDBList("true")
+            var label = document.getElementById("database_option");
+            var vbox = document.createElement("vbox");
+            var hbox = document.createElement("hbox");
+            var label1 = document.createElement("label");
+            label1.setAttribute("width","80");
+            label1.setAttribute("value","Database:");
+            label1.setAttribute("id","label111");
+            var menu1 = document.createElement("menulist");
+            var menupopup1 = document.createElement("menupopup");
+            menu1.setAttribute("id","DBlist");
+            menu1.setAttribute("width","300");
+            var menuitem1 = document.createElement("menuitem");
+            database = arrDbList[0]
+            menuitem1.setAttribute("label", arrDbList[0]);
+            menuitem1.setAttribute("value", arrDbList[0]);
+            menupopup1.appendChild(menuitem1);
+            menu1.appendChild(menupopup1)
+            hbox.appendChild(label1);
+            hbox.appendChild(menu1);
+            vbox.appendChild(hbox);
+            label.appendChild(vbox);
 
-			var d = document.getElementById("first"); 
-			var d_nested = document.getElementById("lbldb_list1"); 
-			var throwawayNode = d.removeChild(d_nested);
-			var d_nested = document.getElementById("DBlist_text"); 
-			var throwawayNode = d.removeChild(d_nested);
+            var d = document.getElementById("first"); 
+            var d_nested = document.getElementById("lbldb_list1"); 
+            var throwawayNode = d.removeChild(d_nested);
+            var d_nested = document.getElementById("DBlist_text"); 
+            var throwawayNode = d.removeChild(d_nested);
 
 
-		}
-		else
-		{
-			setDBList("false")
-		}
-		// Loop through the results, adding items to the list
-		if (count)
-		{
-			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-			var popup = document.getElementById("DBlist"); // a <menupopup> element
-			var arrsec=new Array()
-			for (var i=0;i<popup.menupopup.childNodes.length;i++) {
-				arrsec.push(popup.menupopup.childNodes[i].label)
-			}
-			for (i=0;i<arrDbList.length;i++){
-				
-				if (arrsec.indexOf(arrDbList[i])==-1) {
- 					if (arrDbList[i] != database){
-						popup.menupopup.appendChild(createMenuItem_db(arrDbList[i]));
-					}
-				}
-			}
-		}
-	},
+        }
+        else
+        {
+            setDBList("false")
+        }
+        // Loop through the results, adding items to the list
+        if (count)
+        {
+            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+            var popup = document.getElementById("DBlist"); // a <menupopup> element
+            var arrsec=new Array()
+            for (var i=0;i<popup.menupopup.childNodes.length;i++) {
+                arrsec.push(popup.menupopup.childNodes[i].label)
+            }
+            for (i=0;i<arrDbList.length;i++){
+                
+                if (arrsec.indexOf(arrDbList[i])==-1) {
+                    if (arrDbList[i] != database){
+                        popup.menupopup.appendChild(createMenuItem_db(arrDbList[i]));
+                    }
+                }
+            }
+        }
+    },
 
 
-	onFault: function (client, ctxt, fault) {
-		
-	},
+    onFault: function (client, ctxt, fault) {
+        
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
-		
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+        
+    }
 };
 //function to get the database list
 function getDbList(argControl)
 {
-	setDBList("false")
-	setconnect_server("false")
-	// Enable correct security
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	// Get the instance of the XML-RPC client
-	var xmlRpcClient = getXmlRpc();
-	arrDbList = [];
-	var cmbDbList = document.getElementById(argControl);
+    setDBList("false")
+    setconnect_server("false")
+    // Enable correct security
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    // Get the instance of the XML-RPC client
+    var xmlRpcClient = getXmlRpc();
+    arrDbList = [];
+    var cmbDbList = document.getElementById(argControl);
 
-	xmlRpcClient.asyncCall(listDbHandler,cmbDbList,'list',[],0);
-	return arrDbList;
+    xmlRpcClient.asyncCall(listDbHandler,cmbDbList,'list',[],0);
+    return arrDbList;
 }
 
 function createMenuItem_partner(aLabel, aValue) {
-  	const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-  	var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
-  	item.setAttribute("label", aLabel);
-	item.setAttribute("value", aValue);
-  	return item;
+    const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
+    item.setAttribute("label", aLabel);
+    item.setAttribute("value", aValue);
+    return item;
 }
 
 //xmlrpc request handler for getting the list of All objects
 var listAllDocumentHandler = {
 
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrIdList.Count();
+        var count = arrIdList.Count();
 
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-			var resultcount = strlResult.Count();
-			var arrDataPair = new Array();
-			arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
-			arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-			arrPartnerList[i] = arrDataPair;
-		}
-		if (context)
-		{
-			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-			var popup = document.getElementById("section"); // a <menupopup> element
-			for (i=0;i<arrPartnerList.length;i++){
-				popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList[i][1],arrPartnerList[i][0]));
-			}
-		}
-		popup_display = "no"
-		searchCheckbox()
-	},
-	onFault: function (client, ctxt, fault) {
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+            var resultcount = strlResult.Count();
+            var arrDataPair = new Array();
+            arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
+            arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            arrPartnerList[i] = arrDataPair;
+        }
+        if (context)
+        {
+            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+            var popup = document.getElementById("section"); // a <menupopup> element
+            for (i=0;i<arrPartnerList.length;i++){
+                popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList[i][1],arrPartnerList[i][0]));
+            }
+        }
+        popup_display = "no"
+        searchCheckbox()
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 var listAllCountryHandler = {
 
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
-		var count = arrIdList.Count();
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-			var resultcount = strlResult.Count();
-			var arrDataPair = new Array();
-			arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        var count = arrIdList.Count();
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+            var resultcount = strlResult.Count();
+            var arrDataPair = new Array();
+            arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
           
-			arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-			arrPartnerList[i] = arrDataPair;
-		}
-		if (!context)
-		{
-			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-			var popup = document.getElementById("country"); // a <menupopup> element
-			for (i=0;i<arrPartnerList.length;i++){
-				popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList[i][1],arrPartnerList[i][0]));
-			}
-		}
-	       
-	},
-	onFault: function (client, ctxt, fault) {
-		
-	},
+            arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            arrPartnerList[i] = arrDataPair;
+        }
+        if (!context)
+        {
+            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+            var popup = document.getElementById("country"); // a <menupopup> element
+            for (i=0;i<arrPartnerList.length;i++){
+                popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList[i][1],arrPartnerList[i][0]));
+            }
+        }
+           
+    },
+    onFault: function (client, ctxt, fault) {
+        
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
-		
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+        
+    }
 }
 
 var listAllStateHandler = {
 
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrIdList.Count();
+        var count = arrIdList.Count();
         
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-			var resultcount = strlResult.Count();
-			var arrDataPair = new Array();
-			arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
-			arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-			arrPartnerList1[i] = arrDataPair;
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+            var resultcount = strlResult.Count();
+            var arrDataPair = new Array();
+            arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
+            arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            arrPartnerList1[i] = arrDataPair;
 
           
-		}
-		if (!context)
-		{
-			const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+        }
+        if (!context)
+        {
+            const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-			var popup = document.getElementById("state"); 
+            var popup = document.getElementById("state"); 
             // a <menupopup> element
-			for (i=0;i<arrPartnerList1.length;i++){
-				popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList1[i][1],arrPartnerList1[i][0]));
+            for (i=0;i<arrPartnerList1.length;i++){
+                popup.menupopup.appendChild(createMenuItem_partner(arrPartnerList1[i][1],arrPartnerList1[i][0]));
 
-			}
+            }
           //  popup.menupopup.selectedItem = popup.menupopup.firstChild;
-		}
-	
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+    
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 
 //function to get the list of All object
 function getAllDocument(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	var xmlRpcClient = getXmlRpc();
-	arrPartnerList = [];
-	var end = document.getElementById("section")
-	length = end.itemCount
-	for (i = 0; i < length; i++) {
-		end.removeItemAt(0)
-	}
-	var cmdObjectList = document.getElementById("section");
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'list_alldocument';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strvalue.data = ""
-	xmlRpcClient.asyncCall(listAllDocumentHandler,cmdObjectList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    var xmlRpcClient = getXmlRpc();
+    arrPartnerList = [];
+    var end = document.getElementById("section")
+    length = end.itemCount
+    for (i = 0; i < length; i++) {
+        end.removeItemAt(0)
+    }
+    var cmdObjectList = document.getElementById("section");
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'list_alldocument';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strvalue.data = ""
+    xmlRpcClient.asyncCall(listAllDocumentHandler,cmdObjectList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
 }
 
 function getAllCountry(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	var xmlRpcClient = getXmlRpc();
-	arrPartnerList = [];
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'list_allcountry';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strvalue.data = document.getElementById("country").value;
-	xmlRpcClient.asyncCall(listAllCountryHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    var xmlRpcClient = getXmlRpc();
+    arrPartnerList = [];
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'list_allcountry';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strvalue.data = document.getElementById("country").value;
+    xmlRpcClient.asyncCall(listAllCountryHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
 }
 
 function getAllState(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	var xmlRpcClient = getXmlRpc();
-	arrPartnerList1 = [];
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    var xmlRpcClient = getXmlRpc();
+    arrPartnerList1 = [];
     var state = document.getElementById('state').menupopup;
     while (state.firstChild) 
      {
@@ -889,40 +889,40 @@ function getAllState(){
     };
 
 
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'list_allstate';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strvalue.data = document.getElementById("country").value;
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'list_allstate';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strvalue.data = document.getElementById("country").value;
     xmlRpcClient.asyncCall(listAllStateHandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
 }
 
 
 //function to create array object to pass as an parameter for xmlrpc request
 function dictcreation(value,checkboxobj){
-	var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-	var test = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-	var strkey = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strkey.data = value;
-	test.AppendElement(strkey);
-	temp.AppendElement(test);
-	var test1 = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-	for(i=0;i<checkboxobj.length;i++){
-		var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strvalue.data = checkboxobj[i];
-		test1.AppendElement(strvalue);
-	}
-	if(checkboxobj.length>0){
-		temp.AppendElement(test1);
-	}
-	return temp;
+    var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+    var test = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+    var strkey = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strkey.data = value;
+    test.AppendElement(strkey);
+    temp.AppendElement(test);
+    var test1 = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+    for(i=0;i<checkboxobj.length;i++){
+        var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strvalue.data = checkboxobj[i];
+        test1.AppendElement(strvalue);
+    }
+    if(checkboxobj.length>0){
+        temp.AppendElement(test1);
+    }
+    return temp;
 }
 
 //function to search and fillup section selection box
@@ -937,41 +937,41 @@ function createMenuItem(aLabel) {
 
 var listinstallmodulehandler = {
     onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
-		var count = arrIdList.Count();
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+        var count = arrIdList.Count();
         if (count > 0) 
         { 
-	        setmodule_install('yes')
+            setmodule_install('yes')
         }
-	
-	},
-	onFault: function (client, ctxt, fault) {
+    
+    },
+    onFault: function (client, ctxt, fault) {
         setmodule_install('no')
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
         setmodule_install('no')
-	}
+    }
 }
 
 function module_install()
 {
-	setmodule_install("no")
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
+    setmodule_install("no")
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
     var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'name_search';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'ir.model';
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'name_search';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'ir.model';
     var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
     strvalue.data = 'thunderbird.partner';
     xmlRpcClient.asyncCall(listinstallmodulehandler,null,'execute',[ strDbName,struid,strpass,strobj,strmethod, strvalue],6);
@@ -980,13 +980,13 @@ function module_install()
 
 
 var listSearchContactHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    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 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=="partner_name"){
@@ -1037,27 +1037,27 @@ var listSearchContactHandler = {
             if(strlSearchResult=="res_id"){
                  setResourceId(strlSearchResultValue);
                  var t = getResourceId();}
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 
 }
 
 var listSearchContactdetailHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
      //  var sendername = getSenderEmail();
         var sendername = document.getElementById("txtemail").value
-		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 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=='')
@@ -1098,316 +1098,316 @@ var listSearchContactdetailHandler = {
                  setResourceId(strlSearchResultValue);
                  var t = getResourceId();}
 
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 
 }
 
 function searchContactdetail()
 {
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	arrFinalList = [];
-	var xmlRpcClient = getXmlRpc();
-	var cmbSearchList = document.getElementById('listSearchBox');
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    arrFinalList = [];
+    var xmlRpcClient = getXmlRpc();
+    var cmbSearchList = document.getElementById('listSearchBox');
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
     var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_contact';
-	var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strname.data = document.getElementById("txtemail").value;
-	xmlRpcClient.asyncCall(listSearchContactdetailHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
+    strobj.data = 'thunderbird.partner';
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_contact';
+    var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strname.data = document.getElementById("txtemail").value;
+    xmlRpcClient.asyncCall(listSearchContactdetailHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
 }
 
 //xmlrpc request handler for getting the search results for the particular selected check box object
 var listSearchCheckboxHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrMethodList.Count();
-		var close=0;
-		if(count == 0  && popup_display != "no"){
-			alert("No Records Found");
-			return false;
-		}
-		else if(count ==2 )
-		{
-			if (arrMethodList.QueryElementAt(0, Components.interfaces.nsISupportsCString)=="error")
-			{
-				close =1;
-			}
-		}
-		popup_display = "yes"
-		// Loop through the results, adding items to the list
-		var arr1 = new Array();
-		var arr2 = new Array();
-		var flag1 = 0;
-		var flag2 = 0;
-		var er ="";
-		var er_val =new Array();
-		for (i = 0; i < count; i++) 
-		{
-			if(i%2==0){
-				if (arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString)=="error")
-				{
-					er = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
-					er_val[0] =arrMethodList.QueryElementAt(i+1, Components.interfaces.nsISupportsArray);
-					i +=1;
-					continue;
-				}
-				arr1[flag1] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
-				flag1++;
-			}
-			else{
-				arr2[flag2] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-				flag2++;
-			}
-		}
-		if (er)
-		{
-			var arrSearchList1 = new Array();
-			for(j=0;j<er_val[0].Count();j++)
-			{
-				var arrDataPair = new Array();
-				arrDataPair[0] = er_val[0].QueryElementAt(j, Components.interfaces.nsISupportsCString)
-				arrSearchList1[j]=arrDataPair;
-			}
-			alert( arrSearchList1 + "  Model not exists")
-			if (close == 1)
-			{
-				alert("No Records Found");
-				return false;
-			}
-		}
-		for (i = 0; i < arr2.length; i++) {
-			var arrSearchList1 = new Array();
-			for(j=0;j<arr2[i].Count();j++){
-				var strlSearchResult = arr2[i].QueryElementAt(j, Components.interfaces.nsISupportsArray);
-				var resultcount = strlSearchResult.Count();
-				var arrDataPair = new Array();
-				arrDataPair[0] = strlSearchResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
-				arrDataPair[1] = strlSearchResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-				arrDataPair[2] = arr1[i];
-				arrSearchList1[j] = arrDataPair;
-			}
-			arrFinalList[i]=arrSearchList1;
-		}
-		if (context)
-		{
+        var count = arrMethodList.Count();
+        var close=0;
+        if(count == 0  && popup_display != "no"){
+            alert("No Records Found");
+            return false;
+        }
+        else if(count ==2 )
+        {
+            if (arrMethodList.QueryElementAt(0, Components.interfaces.nsISupportsCString)=="error")
+            {
+                close =1;
+            }
+        }
+        popup_display = "yes"
+        // Loop through the results, adding items to the list
+        var arr1 = new Array();
+        var arr2 = new Array();
+        var flag1 = 0;
+        var flag2 = 0;
+        var er ="";
+        var er_val =new Array();
+        for (i = 0; i < count; i++) 
+        {
+            if(i%2==0){
+                if (arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString)=="error")
+                {
+                    er = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
+                    er_val[0] =arrMethodList.QueryElementAt(i+1, Components.interfaces.nsISupportsArray);
+                    i +=1;
+                    continue;
+                }
+                arr1[flag1] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
+                flag1++;
+            }
+            else{
+                arr2[flag2] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+                flag2++;
+            }
+        }
+        if (er)
+        {
+            var arrSearchList1 = new Array();
+            for(j=0;j<er_val[0].Count();j++)
+            {
+                var arrDataPair = new Array();
+                arrDataPair[0] = er_val[0].QueryElementAt(j, Components.interfaces.nsISupportsCString)
+                arrSearchList1[j]=arrDataPair;
+            }
+            alert( arrSearchList1 + "  Model not exists")
+            if (close == 1)
+            {
+                alert("No Records Found");
+                return false;
+            }
+        }
+        for (i = 0; i < arr2.length; i++) {
+            var arrSearchList1 = new Array();
+            for(j=0;j<arr2[i].Count();j++){
+                var strlSearchResult = arr2[i].QueryElementAt(j, Components.interfaces.nsISupportsArray);
+                var resultcount = strlSearchResult.Count();
+                var arrDataPair = new Array();
+                arrDataPair[0] = strlSearchResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
+                arrDataPair[1] = strlSearchResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+                arrDataPair[2] = arr1[i];
+                arrSearchList1[j] = arrDataPair;
+            }
+            arrFinalList[i]=arrSearchList1;
+        }
+        if (context)
+        {
 
-			var row_count = context.getRowCount();
-			var cmbSearchList = document.getElementById('listSearchBox');
-			for (i=0;i<row_count;i++)
-			{
-				context.removeItemAt(0);
-			}
-			for (i=0;i<arrFinalList.length;i++)
-			{
-				for(j=0;j<arrFinalList[i].length;j++){
-				//creates the dynamic listbox which shows the searched records for the selected object in checkbox
-					var listcell = document.createElement("listcell");
-					var	listItem = document.createElement("listitem");
+            var row_count = context.getRowCount();
+            var cmbSearchList = document.getElementById('listSearchBox');
+            for (i=0;i<row_count;i++)
+            {
+                context.removeItemAt(0);
+            }
+            for (i=0;i<arrFinalList.length;i++)
+            {
+                for(j=0;j<arrFinalList[i].length;j++){
+                //creates the dynamic listbox which shows the searched records for the selected object in checkbox
+                    var listcell = document.createElement("listcell");
+                    var listItem = document.createElement("listitem");
 
-					var objectcharpref = getPref().getCharPref("object").split(',');
-					var imagecharpref = getPref().getCharPref("imagename").split(',');
-					var imagename = ''
-					for(k=0;k<objectcharpref.length;k++){
-						if(arr1[i] == objectcharpref[k]){
-							imagename = imagecharpref[k]
-						}
-					}
+                    var objectcharpref = getPref().getCharPref("object").split(',');
+                    var imagecharpref = getPref().getCharPref("imagename").split(',');
+                    var imagename = ''
+                    for(k=0;k<objectcharpref.length;k++){
+                        if(arr1[i] == objectcharpref[k]){
+                            imagename = imagecharpref[k]
+                        }
+                    }
 
-					listcell.setAttribute("image",imagename); // stores the image of the object
-					listcell.setAttribute("class","listcell-iconic");
-					listcell.setAttribute("width",12);
-					listcell.setAttribute("height",12);
-					listcell.setAttribute("label",arrFinalList[i][j][1]); //stores the name ofthe record
-		  			listItem.appendChild(listcell);
-		  			listItem.value = arrFinalList[i][j][0]; //stores the id of the record
-		  			listItem.label = arr1[i]; // stores the value of the object   
-					cmbSearchList.appendChild(listItem);
-		  		}
-			}
-		}
-	},
+                    listcell.setAttribute("image",imagename); // stores the image of the object
+                    listcell.setAttribute("class","listcell-iconic");
+                    listcell.setAttribute("width",12);
+                    listcell.setAttribute("height",12);
+                    listcell.setAttribute("label",arrFinalList[i][j][1]); //stores the name ofthe record
+                    listItem.appendChild(listcell);
+                    listItem.value = arrFinalList[i][j][0]; //stores the id of the record
+                    listItem.label = arr1[i]; // stores the value of the object   
+                    cmbSearchList.appendChild(listItem);
+                }
+            }
+        }
+    },
 
-	onFault: function (client, ctxt, fault) {
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 };
 
 //function to search the records of selected checkbox object
 function searchCheckbox()
 {
-	var checkboxlist = getnamesearch();
-	if(checkboxlist.length == 0){
-		alert("Please Select One or More Document");
-		return false;
-	}
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	arrFinalList = [];
-	var xmlRpcClient = getXmlRpc();
-	var end = document.getElementById('listSearchBox').getRowCount();
-	for(i=0; i< end; i++){
-		document.getElementById('listSearchBox').removeItemAt(0);
-	}
-	var cmbSearchList = document.getElementById('listSearchBox');
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_checkbox';
-	var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strname.data = document.getElementById('txtvalueobj').value;
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var arrofarr = dictcreation(strname,checkboxlist);
-	xmlRpcClient.asyncCall(listSearchCheckboxHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,arrofarr ],6);
+    var checkboxlist = getnamesearch();
+    if(checkboxlist.length == 0){
+        alert("Please Select One or More Document");
+        return false;
+    }
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    arrFinalList = [];
+    var xmlRpcClient = getXmlRpc();
+    var end = document.getElementById('listSearchBox').getRowCount();
+    for(i=0; i< end; i++){
+        document.getElementById('listSearchBox').removeItemAt(0);
+    }
+    var cmbSearchList = document.getElementById('listSearchBox');
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_checkbox';
+    var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strname.data = document.getElementById('txtvalueobj').value;
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var arrofarr = dictcreation(strname,checkboxlist);
+    xmlRpcClient.asyncCall(listSearchCheckboxHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,arrofarr ],6);
 }
 
 function searchContact()
 {
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	arrFinalList = [];
-	var xmlRpcClient = getXmlRpc();
-	var cmbSearchList = document.getElementById('listSearchBox');
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    arrFinalList = [];
+    var xmlRpcClient = getXmlRpc();
+    var cmbSearchList = document.getElementById('listSearchBox');
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
     var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_contact';
-	var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strname.data = getSenderEmail();
-  	
-	xmlRpcClient.asyncCall(listSearchContactHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
+    strobj.data = 'thunderbird.partner';
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_contact';
+    var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strname.data = getSenderEmail();
+    
+    xmlRpcClient.asyncCall(listSearchContactHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
 }
 
 //xmlrpc request handler for getting the list of partners
 var listPartnerHandler = {
 
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
                 // Set the number of results
-		var count = arrIdList.Count();
-		// Loop through the results, adding items to the list
-		for (i = 0; i < count; i++) {
-			var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
-			var resultcount = strlResult.Count();
-			var arrDataPair = new Array();
-			arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
-			arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
-			arrPartnerList[i] = arrDataPair;
-		}
-		if (context)
-		{
-			var row_count = context.getRowCount();
-			var cmdPartnerList = document.getElementById('listPartnerBox');
-			for (i=0;i<row_count;i++)
-			{
-				context.removeItemAt(0);
-			}
-			for (i=0;i<arrPartnerList.length;i++)
-			{
-				var listcell = document.createElement("listcell");
-				var listItem = document.createElement("listitem");
-				listcell.setAttribute("label",arrPartnerList[i][1]);
-	  			listItem.appendChild(listcell);
-	  			listItem.value = arrPartnerList[i][0];
-	  			cmdPartnerList.appendChild(listItem);
-			}
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        var count = arrIdList.Count();
+        // Loop through the results, adding items to the list
+        for (i = 0; i < count; i++) {
+            var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
+            var resultcount = strlResult.Count();
+            var arrDataPair = new Array();
+            arrDataPair[0] = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsPRInt32);
+            arrDataPair[1] = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
+            arrPartnerList[i] = arrDataPair;
+        }
+        if (context)
+        {
+            var row_count = context.getRowCount();
+            var cmdPartnerList = document.getElementById('listPartnerBox');
+            for (i=0;i<row_count;i++)
+            {
+                context.removeItemAt(0);
+            }
+            for (i=0;i<arrPartnerList.length;i++)
+            {
+                var listcell = document.createElement("listcell");
+                var listItem = document.createElement("listitem");
+                listcell.setAttribute("label",arrPartnerList[i][1]);
+                listItem.appendChild(listcell);
+                listItem.value = arrPartnerList[i][0];
+                cmdPartnerList.appendChild(listItem);
+            }
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to get the list of partners
 function getPartnerList(){
-	var branchobj = getPref();
-	window.opener.document.getElementById('txtselectpartner').setAttribute('value','');
-	setServerService('xmlrpc/object');
-	var xmlRpcClient = getXmlRpc();
-	arrPartnerList = [];
-	var end = document.getElementById('listPartnerBox').getRowCount();
-	for(i=0; i< end; i++){
-		document.getElementById('listPartnerBox').removeItemAt(0);
-	}
-	var cmdPartnerList = document.getElementById('listPartnerBox');
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struid.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'name_search';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'res.partner';
-	var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strvalue.data = document.getElementById('txtselectpartner').value;
-	xmlRpcClient.asyncCall(listPartnerHandler,cmdPartnerList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
+    var branchobj = getPref();
+    window.opener.document.getElementById('txtselectpartner').setAttribute('value','');
+    setServerService('xmlrpc/object');
+    var xmlRpcClient = getXmlRpc();
+    arrPartnerList = [];
+    var end = document.getElementById('listPartnerBox').getRowCount();
+    for(i=0; i< end; i++){
+        document.getElementById('listPartnerBox').removeItemAt(0);
+    }
+    var cmdPartnerList = document.getElementById('listPartnerBox');
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struid.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'name_search';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'res.partner';
+    var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strvalue.data = document.getElementById('txtselectpartner').value;
+    xmlRpcClient.asyncCall(listPartnerHandler,cmdPartnerList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strvalue ],6);
 }
 
 
 //function to create the xmlrpc supported variables for xmlrpc request
 function dictcontact(a,b){
-	var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-	for(i=0;i<a.length;i++){
-		var strkey = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strkey.data = a[i]
-		var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strvalue.data = b[i]
-		var test = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-		test.AppendElement(strkey);
-		test.AppendElement(strvalue);
-		temp.AppendElement(test);
-	}
-	return temp;
+    var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+    for(i=0;i<a.length;i++){
+        var strkey = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strkey.data = a[i]
+        var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strvalue.data = b[i]
+        var test = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
+        test.AppendElement(strkey);
+        test.AppendElement(strvalue);
+        temp.AppendElement(test);
+    }
+    return temp;
 }
 
 //xmlrpc request handler for creating the record of mail
 var listArchiveHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
         list_documents = document.getElementById('listSearchBox')
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
         createId = parseInt(createId);
         if(createId==0)
         {
@@ -1425,42 +1425,42 @@ var listArchiveHandler = {
         }
     window.close();
 
-	},
-	onFault: function (client, ctxt, fault) {
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to archive the mail content through xmlrpc request
 
 function parse_eml(){
-	var fpath =""
-	if(navigator.userAgent.indexOf('Linux')!= -1){
-		fpath ="/tmp/"
-	}
-	else if(navigator.userAgent.indexOf('Win')!= -1){
-		fpath ="C:\\"
-	}
-	else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-		fpath ="/tmp/"
-	} 
+    var fpath =""
+    if(navigator.userAgent.indexOf('Linux')!= -1){
+        fpath ="/tmp/"
+    }
+    else if(navigator.userAgent.indexOf('Win')!= -1){
+        fpath ="C:\\"
+    }
+    else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+        fpath ="/tmp/"
+    } 
 
-	name = fpath + getFileName() +".eml"
-	var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-	file.initWithPath( name );
-	if ( file.exists() == false ) {
-		return null;
-	} else {
-		var is = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance( Components.interfaces.nsIFileInputStream );
-		is.init( file,0x01, 00004, null);
-		var sis = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance( Components.interfaces.nsIScriptableInputStream );
-		sis.init( is );
-		var output = sis.read( sis.available() );
-		return output
+    name = fpath + getFileName() +".eml"
+    var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+    file.initWithPath( name );
+    if ( file.exists() == false ) {
+        return null;
+    } else {
+        var is = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance( Components.interfaces.nsIFileInputStream );
+        is.init( file,0x01, 00004, null);
+        var sis = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance( Components.interfaces.nsIScriptableInputStream );
+        sis.init( is );
+        var output = sis.read( sis.available() );
+        return output
     }
     
 }
@@ -1471,33 +1471,33 @@ function upload_archivemail()
     var cnt = list_documents.selectedCount
     var ref_ids = "";
     var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'history_message';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'history_message';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
 
-	for(i=0;i<cnt;i++)
-	{	
+    for(i=0;i<cnt;i++)
+    {   
         var object = list_documents.getSelectedItem(i);
-		var eml_string = parse_eml();
+        var eml_string = parse_eml();
         ref_ids += object.label;
         ref_ids += ",";
         ref_ids += object.value;
         if (i < cnt-1){ref_ids += ";";}
-		
+        
     }
     var a = ['ref_ids','message'];
-	var b = [ref_ids, eml_string];
+    var b = [ref_ids, eml_string];
     var arrofarr = dictcontact(a,b);
 
     xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
@@ -1505,154 +1505,154 @@ function upload_archivemail()
 }
 
 var listArchiveDocumentHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
         var popup = document.getElementById("section").selectedItem; 
         alert("Document Created Successfully For " +" " + ":" + " "+ popup.label);
-		window.close();
+        window.close();
 
-	},
-	onFault: function (client, ctxt, fault) {
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 function create_archivemail(){
-	var popup = document.getElementById("section").selectedItem; 
+    var popup = document.getElementById("section").selectedItem; 
     // a <menupopup> element
 
-	if (String(popup) != "null"){
-		object=popup.value;
-		if (object == undefined) { alert("select At Least one Document !")}
-		else{
-		var branchobj = getPref();
-		setServerService('xmlrpc/object');
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var xmlRpcClient = getXmlRpc();
-		var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strDbName.data = branchobj.getCharPref("serverdbname");
-		var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-		struids.data = branchobj.getIntPref('userid');
-		var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strpass.data = branchobj.getCharPref("password");
-		var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strmethod.data = 'process_email';
-		var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strobj.data = 'thunderbird.partner';
+    if (String(popup) != "null"){
+        object=popup.value;
+        if (object == undefined) { alert("select At Least one Document !")}
+        else{
+        var branchobj = getPref();
+        setServerService('xmlrpc/object');
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var xmlRpcClient = getXmlRpc();
+        var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strDbName.data = branchobj.getCharPref("serverdbname");
+        var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+        struids.data = branchobj.getIntPref('userid');
+        var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strpass.data = branchobj.getCharPref("password");
+        var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strmethod.data = 'process_email';
+        var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+        strobj.data = 'thunderbird.partner';
         var eml_string = parse_eml()
-		var a = ['model', 'message'];
-		var b = [object, eml_string];
-		var arrofarr = dictcontact(a,b);
-		xmlRpcClient.asyncCall(listArchiveDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+        var a = ['model', 'message'];
+        var b = [object, eml_string];
+        var arrofarr = dictcontact(a,b);
+        xmlRpcClient.asyncCall(listArchiveDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
         //alert("Document Created Successfully For " +" " + ":" + " "+ popup.label);
-		}
-    	//window.close();
-	}
-	else
-	{
-		alert(" select At Least one Document !")
-	}
+        }
+        //window.close();
+    }
+    else
+    {
+        alert(" select At Least one Document !")
+    }
 }
 
 
 //xmlrpc request handler for creating a new contact
 var listCreateContactHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
-		setContactId(createId);
-		alert("Contact Created Successfully.");	
-		window.close();
-	},
-	onFault: function (client, ctxt, fault) {
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+        setContactId(createId);
+        alert("Contact Created Successfully."); 
+        window.close();
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 var listUpdateContactHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
         alert("Contact Update Successfully.");
         window.close();
-		var partnerId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
-		setResourceId(partnerId);
-		window.close();
-	},
-	onFault: function (client, ctxt, fault) {
+        var partnerId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+        setResourceId(partnerId);
+        window.close();
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to create a new contact
 function createContact(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'create_contact';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var a = ['partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
-	var b = [getPartnerId(),document.getElementById("txtname").value,document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listCreateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'create_contact';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var a = ['partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
+    var b = [getPartnerId(),document.getElementById("txtname").value,document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listCreateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 
 function UpdateContact(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'update_contact';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var a = ['res_id','partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
-	var b = [getResourceId(),document.getElementById("txtselectpartner").value,document.getElementById("txtcontactname").value,document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listUpdateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'update_contact';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var a = ['res_id','partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
+    var b = [getResourceId(),document.getElementById("txtselectpartner").value,document.getElementById("txtcontactname").value,document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listUpdateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 
 //xmlrpc request handler for creating a attachment record
 var listAttachHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
 
-	},
-	onFault: function (client, ctxt, fault) {
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 
@@ -1729,30 +1729,30 @@ return output;
 
 //function to read the contents of the attachment files from the temp folder
 function createInstance(name,test){
-	var encoded_string = '';
-	var file_name = ''
+    var encoded_string = '';
+    var file_name = ''
 
-	for(i=0;i<test.length;i++){
-		var stream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
-		stream.init(test[i], 0x01, 00004, 0);
-		var bstream = Components.classes["@mozilla.org/binaryinputstream;1"].createInstance(Components.interfaces.nsIBinaryInputStream);
-		bstream.setInputStream(stream);
-		var r = new Array();
-	    	var fileContents = bstream.readByteArray(bstream.available(),r);
-		bstream.close();
-		var printstring = '';
-		for(j=0;j<fileContents.length;j++)
-		{
-			printstring += String.fromCharCode(fileContents[j]);
-		}
-		encoded_string += encode64(printstring)+',';
-		file_name += name[i]+',';
-		test[i].remove(true);
-	}
-	encoded_string = encoded_string.substring(0,encoded_string.length-1);
-	file_name = file_name.substring(0,file_name.length-1);
-	getPref().setCharPref('displayName',file_name);
-	getPref().setCharPref('attachmentdata',encoded_string);
+    for(i=0;i<test.length;i++){
+        var stream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
+        stream.init(test[i], 0x01, 00004, 0);
+        var bstream = Components.classes["@mozilla.org/binaryinputstream;1"].createInstance(Components.interfaces.nsIBinaryInputStream);
+        bstream.setInputStream(stream);
+        var r = new Array();
+            var fileContents = bstream.readByteArray(bstream.available(),r);
+        bstream.close();
+        var printstring = '';
+        for(j=0;j<fileContents.length;j++)
+        {
+            printstring += String.fromCharCode(fileContents[j]);
+        }
+        encoded_string += encode64(printstring)+',';
+        file_name += name[i]+',';
+        test[i].remove(true);
+    }
+    encoded_string = encoded_string.substring(0,encoded_string.length-1);
+    file_name = file_name.substring(0,file_name.length-1);
+    getPref().setCharPref('displayName',file_name);
+    getPref().setCharPref('attachmentdata',encoded_string);
 
 
 }
@@ -1769,348 +1769,351 @@ function check_module_install(count){
 }
     
 var listLoginHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var login = result.QueryInterface(Components.interfaces.nsISupportsPrimitive)
-		if(login.type == 12){
-			login = result.QueryInterface(Components.interfaces.nsISupportsPRInt32)
-			setUserId(login.data);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var login = result.QueryInterface(Components.interfaces.nsISupportsPrimitive)
+        if(login.type == 12){
+            login = result.QueryInterface(Components.interfaces.nsISupportsPRInt32)
+            setUserId(login.data);
             module_install();
             alert('Successfully Login To OpenERP.');
             window.close();
-		}
-		else{
-			alert("Login Failed");
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        }
+        else{
+            alert("Login Failed");
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
-		alert("Database does not Exist!\n\n Please specify proper database name.");
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+        alert("Database does not Exist!\n\n Please specify proper database name.");
+    }
 }
 
 
 //function to check the login information
 function testConnection(){
-	if (getconnect_server() == "false")
-	{
-		alert("Server is Not Running...Please check it!!"+" "+getServer())
-		return false;
-	}
-	if (getDBList()=="false")
-	{
-		if (document.getElementById('DBlist_text').value =='')
-		{
-			alert("You Must Enter Database Name.");
-			return false;
-		}
-		setDbName(document.getElementById('DBlist_text').value);
-	}
-	else
-	{
-		if (document.getElementById('DBlist').value == 0 || document.getElementById('DBlist').value =="--select--")
-		{
-			alert("You Must Select Database Name.");
-			return false;
-		}
-		setDbName(document.getElementById('DBlist').value);
-	}
-	var branchobj = getPref();
-	setServer(document.getElementById('txturl').value);
-    	var s = document.getElementById('txturl').value;
-	var a =s.split(':');
-	setPort(a[a.length-1]);
-	setUsername(document.getElementById('txtusername').value);
-	setPassword(document.getElementById('txtpassword').value);
-	setServerService('xmlrpc/common');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = getPref().getCharPref('serverdbname');
-	var strusername = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strusername.data = getPref().getCharPref('username');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = getPref().getCharPref('password');
-	xmlRpcClient.asyncCall(listLoginHandler,null,'login',[strDbName,strusername,strpass],3);
+    if (getconnect_server() == "false")
+    {
+        alert("Server is Not Running...Please check it!!"+" "+getServer())
+        return false;
+    }
+    if (getDBList()=="false")
+    {
+        if (document.getElementById('DBlist_text').value =='')
+        {
+            alert("You Must Enter Database Name.");
+            return false;
+        }
+        setDbName(document.getElementById('DBlist_text').value);
+    }
+    else
+    {
+        if (document.getElementById('DBlist').value == 0 || document.getElementById('DBlist').value =="--select--")
+        {
+            alert("You Must Select Database Name.");
+            return false;
+        }
+        setDbName(document.getElementById('DBlist').value);
+    }
+    var branchobj = getPref();
+    setServer(document.getElementById('txturl').value);
+        var s = document.getElementById('txturl').value;
+    var a =s.split(':');
+    setPort(a[a.length-1]);
+    setUsername(document.getElementById('txtusername').value);
+    setPassword(document.getElementById('txtpassword').value);
+    setServerService('xmlrpc/common');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = getPref().getCharPref('serverdbname');
+    var strusername = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strusername.data = getPref().getCharPref('username');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = getPref().getCharPref('password');
+    xmlRpcClient.asyncCall(listLoginHandler,null,'login',[strDbName,strusername,strpass],3);
     
 }
 
 function testConnection_web(){
-	var branchobj = getPref();
+    var branchobj = getPref();
     weburl = getWebServerURL();
-    window.open(weburl, "", "chrome","resizable=yes,scrollbars=yes,status=yes");
+//    window.open(weburl, "", "chrome","resizable=yes,scrollbars=yes,status=yes");
+    var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
+    messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
+    messenger.launchExternalURL(weburl);
     
 }
 
 //xmlrpc request handler for handling the login information
 var listcreateLoginHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var login = result.QueryInterface(Components.interfaces.nsISupportsPrimitive)
-		setconnect_server("true")		
-		if(login.type == 12){
-			login = result.QueryInterface(Components.interfaces.nsISupportsPRInt32)
-			setUserId(login.data);
-		}
-		else{
-			alert("Login Failed.");
-		}
-	},
-	onFault: function (client, ctxt, fault) {
-		
-	},
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var login = result.QueryInterface(Components.interfaces.nsISupportsPrimitive)
+        setconnect_server("true")       
+        if(login.type == 12){
+            login = result.QueryInterface(Components.interfaces.nsISupportsPRInt32)
+            setUserId(login.data);
+        }
+        else{
+            alert("Login Failed.");
+        }
+    },
+    onFault: function (client, ctxt, fault) {
+        
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
-		setconnect_server("false")
-	}
+    onError: function (client, ctxt, status, errorMsg) {
+        setconnect_server("false")
+    }
 }
 
 //function to check the login information
 function createConnection(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/common');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = getPref().getCharPref('serverdbname');
-	var strusername = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strusername.data = getPref().getCharPref('username');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = getPref().getCharPref('password');
-	xmlRpcClient.asyncCall(listcreateLoginHandler,null,'login',[strDbName,strusername,strpass],3);
+    var branchobj = getPref();
+    setServerService('xmlrpc/common');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = getPref().getCharPref('serverdbname');
+    var strusername = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strusername.data = getPref().getCharPref('username');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = getPref().getCharPref('password');
+    xmlRpcClient.asyncCall(listcreateLoginHandler,null,'login',[strDbName,strusername,strpass],3);
 }
 
 //xmlrpc request handler for handling the partner information
 var listCreatePartnerHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
         setPartnerId(createId);
         txtselectpartner = document.getElementById('txtselectpartner')
-		if(typeof(createId.data) == 'number' && createId!=0){
+        if(typeof(createId.data) == 'number' && createId!=0){
          window.opener.document.getElementById('txtselectpartner').setAttribute('value',txtselectpartner.value);
-			window.close();
-		}
-		if(createId == 0){
-			alert("Partner Already Exist.");
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+            window.close();
+        }
+        if(createId == 0){
+            alert("Partner Already Exist.");
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 //function to create the tiny partner object
 function createPartner(){
-	var branchobj = getPref();
+    var branchobj = getPref();
     txtselectpartner = document.getElementById('txtselectpartner')
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'create_partner';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	if(document.getElementById('txtselectpartner').value ==''){
-		alert("You Must Enter Partner Name.");
-		return false;
-	}
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'create_partner';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    if(document.getElementById('txtselectpartner').value ==''){
+        alert("You Must Enter Partner Name.");
+        return false;
+    }
     setPartnerId(txtselectpartner.value)
-	var a = ['partner_id','name'];
-	var b = [getPartnerId(),txtselectpartner.value];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listCreatePartnerHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var a = ['partner_id','name'];
+    var b = [getPartnerId(),txtselectpartner.value];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listCreatePartnerHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 //xmlrpc request handler for handling the object information
 var listSearchDocumentHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var searchResult = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
-		if(searchResult.data == 0){
-			alert("Document Does Not Exist.");
-			return false;
-		}
-		var objvalue = getPref().getCharPref("listobject");
-		var objectvalue = getPref().getCharPref("object");
-		var imagevalue = getPref().getCharPref("imagename");
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var searchResult = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
+        if(searchResult.data == 0){
+            alert("Document Does Not Exist.");
+            return false;
+        }
+        var objvalue = getPref().getCharPref("listobject");
+        var objectvalue = getPref().getCharPref("object");
+        var imagevalue = getPref().getCharPref("imagename");
 
-		var objcharpref = getPref().getCharPref("listobject").split(',');
-		var objectcharpref = getPref().getCharPref("object").split(',');
-		var imagecharpref = getPref().getCharPref("imagename").split(',');
+        var objcharpref = getPref().getCharPref("listobject").split(',');
+        var objectcharpref = getPref().getCharPref("object").split(',');
+        var imagecharpref = getPref().getCharPref("imagename").split(',');
 
 
-		if(objectcharpref.indexOf(document.getElementById("txtobject").value) != -1){
-			alert("Document already in List.");
-		}
-		else{
-			var	listItem = document.createElement("listitem");
-			var listcell1 = document.createElement("listcell");
-			var listcell2 = document.createElement("listcell");
-			var listcell3 = document.createElement("listcell");
-			listcell1.setAttribute("label",document.getElementById("txtobj").value);
-			listcell2.setAttribute("label",document.getElementById("txtobject").value);
-			listcell3.setAttribute("image",'file://'+document.getElementById("txtimagename").value);
-			listcell3.setAttribute("class","listcell-iconic")
-			listcell3.setAttribute("width",16)
-			listcell3.setAttribute("height",16)
-			listItem.appendChild(listcell1);
-		  	listItem.appendChild(listcell2);
-		  	listItem.appendChild(listcell3);
-		  	document.getElementById("listObjectListBox").appendChild(listItem)
-			if(getPref().getCharPref("object")!=''){
-				getPref().setCharPref("listobject",objvalue+','+document.getElementById("txtobj").value);
-				getPref().setCharPref("object",objectvalue+','+document.getElementById("txtobject").value);
-				getPref().setCharPref("imagename",imagevalue+','+"file://"+document.getElementById("txtimagename").value);
-			}
-			else{
-				getPref().setCharPref("listobject",document.getElementById("txtobj").value);
-				getPref().setCharPref("object",document.getElementById("txtobject").value);
-				getPref().setCharPref("imagename","file://"+document.getElementById("txtimagename").value);
-			}
-		}
-	},
-	onFault: function (client, ctxt, fault) {
+        if(objectcharpref.indexOf(document.getElementById("txtobject").value) != -1){
+            alert("Document already in List.");
+        }
+        else{
+            var listItem = document.createElement("listitem");
+            var listcell1 = document.createElement("listcell");
+            var listcell2 = document.createElement("listcell");
+            var listcell3 = document.createElement("listcell");
+            listcell1.setAttribute("label",document.getElementById("txtobj").value);
+            listcell2.setAttribute("label",document.getElementById("txtobject").value);
+            listcell3.setAttribute("image",'file://'+document.getElementById("txtimagename").value);
+            listcell3.setAttribute("class","listcell-iconic")
+            listcell3.setAttribute("width",16)
+            listcell3.setAttribute("height",16)
+            listItem.appendChild(listcell1);
+            listItem.appendChild(listcell2);
+            listItem.appendChild(listcell3);
+            document.getElementById("listObjectListBox").appendChild(listItem)
+            if(getPref().getCharPref("object")!=''){
+                getPref().setCharPref("listobject",objvalue+','+document.getElementById("txtobj").value);
+                getPref().setCharPref("object",objectvalue+','+document.getElementById("txtobject").value);
+                getPref().setCharPref("imagename",imagevalue+','+"file://"+document.getElementById("txtimagename").value);
+            }
+            else{
+                getPref().setCharPref("listobject",document.getElementById("txtobj").value);
+                getPref().setCharPref("object",document.getElementById("txtobject").value);
+                getPref().setCharPref("imagename","file://"+document.getElementById("txtimagename").value);
+            }
+        }
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to search the tiny objects for configuration settings
 function searchDocument(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_document';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	if(document.getElementById('txtobj').value =='' ){
-		alert("You Must Enter Document.");
-		return false;
-	}
-	if(document.getElementById('txtobject').value =='' ){
-		alert("You Must Enter Document Name.");
-		return false;
-	}
-	var a = ['model'];
-	var b = [document.getElementById('txtobject').value];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listSearchDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_document';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    if(document.getElementById('txtobj').value =='' ){
+        alert("You Must Enter Document.");
+        return false;
+    }
+    if(document.getElementById('txtobject').value =='' ){
+        alert("You Must Enter Document Name.");
+        return false;
+    }
+    var a = ['model'];
+    var b = [document.getElementById('txtobject').value];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listSearchDocumentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 
 //xmlrpc request handler for list of search object exist in database or not.
 var listsearchAttachmentHandler = {
-	onResult: function(client, context, result) {
-		netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-		var objectlist = result.QueryInterface(Components.interfaces.nsISupportsCString);
-		getPref().setCharPref('tempobject',objectlist)
-		document.getElementById("txtvalueobj").value= getSenderEmail();
-		var checkbox = document.getElementById("checkbox-dynamic");
-		
-		var object = preferenceBranch.getCharPref("listobject").split(',');
-		var obj = preferenceBranch.getCharPref("tempobject").split(',');
-		var imagelist = preferenceBranch.getCharPref("imagename").split(',');
+    onResult: function(client, context, result) {
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+        var objectlist = result.QueryInterface(Components.interfaces.nsISupportsCString);
+        getPref().setCharPref('tempobject',objectlist)
+        //document.getElementById("txtvalueobj").value= getSenderEmail();
+        var checkbox = document.getElementById("checkbox-dynamic");
+        
+        var object = preferenceBranch.getCharPref("listobject").split(',');
+        var obj = preferenceBranch.getCharPref("tempobject").split(',');
+        var imagelist = preferenceBranch.getCharPref("imagename").split(',');
 
-		count = 0
-		if (object[0]!=''){
-			for(var i=0; i<object.length; i++){
-				if (obj[i] == "null")
-				{
-					continue
-				}
+        count = 0
+        if (object[0]!=''){
+            for(var i=0; i<object.length; i++){
+                if (obj[i] == "null")
+                {
+                    continue
+                }
 
-				if(count%3==0){
-					var vbox = document.createElement("hbox");
-				}
-				count += 1
-				var hbox = document.createElement("vbox");
-				var checkbox1 = document.createElement("checkbox");
+                if(count%3==0){
+                    var vbox = document.createElement("hbox");
+                }
+                count += 1
+                var hbox = document.createElement("vbox");
+                var checkbox1 = document.createElement("checkbox");
             
-				checkbox1.setAttribute("label",object[i]);
-				checkbox1.setAttribute("id","cbx"+(i+1));
-				checkbox1.setAttribute("width",150)
-				if (obj[i] =="res.partner.address")
-				{
-					checkbox1.setAttribute("checked",true);
-				}
-				if(i==0){
-					checkbox1.setAttribute("checked",true);
-				}
+                checkbox1.setAttribute("label",object[i]);
+                checkbox1.setAttribute("id","cbx"+(i+1));
+                checkbox1.setAttribute("width",150)
+                if (obj[i] =="res.partner.address")
+                {
+                    checkbox1.setAttribute("checked",true);
+                }
+                if(i==0){
+                    checkbox1.setAttribute("checked",true);
+                }
 
-				var image1 = document.createElement("image");
-				image1.setAttribute("src",imagelist[i]);
-				image1.setAttribute("width",16)
-				image1.setAttribute("height",16)
+                var image1 = document.createElement("image");
+                image1.setAttribute("src",imagelist[i]);
+                image1.setAttribute("width",16)
+                image1.setAttribute("height",16)
 
-				vbox.appendChild(image1);
-				hbox.appendChild(checkbox1);
-				vbox.appendChild(hbox);
-				checkbox.appendChild(vbox);
-			}
-		}
-		setTimeout("getAllDocument()", 0)
-		exis_grp = document.getElementById("existsobjectgroup")
-		new_grp = document.getElementById("newobjectgroup")
+                vbox.appendChild(image1);
+                hbox.appendChild(checkbox1);
+                vbox.appendChild(hbox);
+                checkbox.appendChild(vbox);
+            }
+        }
+        setTimeout("getAllDocument()", 0)
+        exis_grp = document.getElementById("existsobjectgroup")
+        new_grp = document.getElementById("newobjectgroup")
 
-		new_grp.height = parseInt(parseInt(new_grp.height) + parseInt((count /3) * 23.5))
-		win = document.getElementById("pluginwindows").setAttribute("height",1000)
+        new_grp.height = parseInt(parseInt(new_grp.height) + parseInt((count /3) * 23.5))
+        win = document.getElementById("pluginwindows").setAttribute("height",1000)
 
-	},
-	onFault: function (client, ctxt, fault) {
+    },
+    onFault: function (client, ctxt, fault) {
 
-	},
+    },
 
-	onError: function (client, ctxt, status, errorMsg) {
+    onError: function (client, ctxt, status, errorMsg) {
 
-	}
+    }
 }
 
 //function to create a new attachment record
 function listSearchDocumentAttachment(){
-	var branchobj = getPref();
-	setServerService('xmlrpc/object');
-	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
-	var xmlRpcClient = getXmlRpc();
-	var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strDbName.data = branchobj.getCharPref("serverdbname");
-	var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
-	struids.data = branchobj.getIntPref('userid');
-	var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strpass.data = branchobj.getCharPref("password");
-	var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strmethod.data = 'search_document_attachment';
-	var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	strobj.data = 'thunderbird.partner';
-	var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-	var popup = document.getElementById("section").selectedItem; // a <menupopup> element
-	object=popup.value;
-	resobj.data = object;
-	var a = ['object'];
-	var b = [getPref().getCharPref("object")];
-	var arrofarr = dictcontact(a,b);
-	xmlRpcClient.asyncCall(listsearchAttachmentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
+    var branchobj = getPref();
+    setServerService('xmlrpc/object');
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
+    var xmlRpcClient = getXmlRpc();
+    var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strDbName.data = branchobj.getCharPref("serverdbname");
+    var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
+    struids.data = branchobj.getIntPref('userid');
+    var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strpass.data = branchobj.getCharPref("password");
+    var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strmethod.data = 'search_document_attachment';
+    var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    strobj.data = 'thunderbird.partner';
+    var resobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
+    var popup = document.getElementById("section").selectedItem; // a <menupopup> element
+    object=popup.value;
+    resobj.data = object;
+    var a = ['object'];
+    var b = [getPref().getCharPref("object")];
+    var arrofarr = dictcontact(a,b);
+    xmlRpcClient.asyncCall(listsearchAttachmentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
 }
 
 
@@ -2118,57 +2121,57 @@ function listSearchDocumentAttachment(){
 
 function win_close()
 {
-	var fpath =""
-	if(navigator.userAgent.indexOf('Linux')!= -1){
-		fpath ="/tmp/"
-	}
-	else if(navigator.userAgent.indexOf('Win')!= -1){
-		fpath ="C:\\"
-	}
-	else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-		fpath ="/tmp/"
-	} 
-	try
-	  {
-		name = fpath + getFileName() +".eml"
+    var fpath =""
+    if(navigator.userAgent.indexOf('Linux')!= -1){
+        fpath ="/tmp/"
+    }
+    else if(navigator.userAgent.indexOf('Win')!= -1){
+        fpath ="C:\\"
+    }
+    else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
+        fpath ="/tmp/"
+    } 
+    try
+      {
+        name = fpath + getFileName() +".eml"
 
-		var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-		file.initWithPath( name );
-		file.remove(true);
-		window.close();
-	  }
-	catch(err)
-	  {
-		window.close();
-	  }
+        var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+        file.initWithPath( name );
+        file.remove(true);
+        window.close();
+      }
+    catch(err)
+      {
+        window.close();
+      }
 }
 
 function attachmentWidnowOpen(msg)
 {
 
-		if (msg=="create")
-		{
-			var popup = document.getElementById("section").selectedItem; // a <menupopup> element
-			if (String(popup) != "null"){
-				object=popup.value;
-				if (object=="" || object == undefined) { alert("select at least one document !")}
-				else{
-					create_archivemail()
-				}
-			}
-			else
-			{
-				alert("select at least one Document !")
-			}
-		}
-		else if (msg=="upload")
-		{	
-			if(document.getElementById('listSearchBox').selectedItem)
-			{	
-				upload_archivemail()
-			}
-			else{
-				alert("Please select at least one record");
-			}
-		}
+        if (msg=="create")
+        {
+            var popup = document.getElementById("section").selectedItem; // a <menupopup> element
+            if (String(popup) != "null"){
+                object=popup.value;
+                if (object=="" || object == undefined) { alert("select at least one document !")}
+                else{
+                    create_archivemail()
+                }
+            }
+            else
+            {
+                alert("select at least one Document !")
+            }
+        }
+        else if (msg=="upload")
+        {   
+            if(document.getElementById('listSearchBox').selectedItem)
+            {   
+                upload_archivemail()
+            }
+            else{
+                alert("Please select at least one record");
+            }
+        }
 }
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
index fb257d70c95..e649eb92ced 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
@@ -1,11 +1,18 @@
-<!ENTITY tinyplugin "OpenERP Configuration">
-<!ENTITY tinypluginconfig "Push To OpenERP">
+<!ENTITY tinyplugin "Configuration">
+<!ENTITY tinypluginconfig "Push">
 <!ENTITY tinyarchive "Push to OpenERP">
-<!ENTITY imageicon.value "chrome://openerp_plugin/skin/NEWT1.png">
-<!ENTITY menuicon.value "chrome://openerp_plugin/skin/openerp-icon.png">
-<!ENTITY partnericon.value "chrome://openerp_plugin/skin/partner_icon.png">
-<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/document-new.png">
+<!ENTITY imageicon.value "chrome://openerp_plugin/skin/openerp.png">
+<!ENTITY menuicon.settings "chrome://openerp_plugin/skin/settings.png">
+<!ENTITY menuicon.value "chrome://openerp_plugin/skin/openerp.png">
+<!ENTITY partnericon.value "chrome://openerp_plugin/skin/openerp.png">
+<!ENTITY imagearchive.value "chrome://openerp_plugin/skin/openerp.png">
 <!ENTITY tooltip.value "Add To Archive">
 <!ENTITY pluginconfig.value "OpenERP Configuration Settings">
 <!ENTITY pluginconfigvalue.value "Archieve To OpenERP Settings">
+<!ENTITY openerpMenu.label "OpenERP">
+<!ENTITY openerpMenu.accesskey "OE">
+<!ENTITY openpartner.value "Partner">
+<!ENTITY openpartnertooltip.value "Click to Open Partner Realted to Sender Eamil address.">
+<!ENTITY opendocument.value "Document">
+<!ENTITY opendocumenttooltip.value "Click to See the Mail if it is archived to OpenERP.">
 
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
index 2f1a06ed341..cd00045c22a 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
@@ -1,6 +1,6 @@
 <!ENTITY title.label "Push To OpenERP">
 <!ENTITY gptinyobj.label "Link to an Existing Document">
-<!ENTITY newobject.label "New Documents">
+<!ENTITY newobject.label "Create a New Documents">
 <!ENTITY document.label "Documents">
 <!ENTITY bsearch.label "Search">
 <!ENTITY close.label "Close">
@@ -27,3 +27,5 @@
 <!ENTITY imagearchive.value "chrome://openerp_plugin/skin/Archive.png">
 <!ENTITY imagecreate.value "chrome://openerp_plugin/skin/Create.png">
 <!ENTITY gptinyobjexe.label "Documents">
+<!ENTITY newcontact.label "Create a New Contact">
+<!ENTITY listSearchBox.header2 "Document Type">
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png
deleted file mode 100644
index 373464bd53e..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png
deleted file mode 100644
index 2daac224a51..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png
deleted file mode 100755
index bdbe31c4bff..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png
deleted file mode 100644
index e2b45b52211..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png
new file mode 100644
index 00000000000..326798df2ec
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png
deleted file mode 100644
index b8f4a0f380b..00000000000
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png
new file mode 100644
index 00000000000..1b77bed23dd
Binary files /dev/null and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
index b1e78c0047e..0057dc4c879 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico differ