diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index db02bb1974e..430243e0adb 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 59e4c9284d7..4bf6924ab7b 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/exportTools.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
index 7da3701b1f3..6594b718227 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
@@ -148,13 +148,14 @@ function getPredefinedFolder(type) {
 	// type 2 = selected messages
 
 	var use_dir = "mboximport.exportMSG.use_dir";
-
+	var username = Components.classes["@mozilla.org/process/environment;1"].
+		getService(Components.interfaces.nsIEnvironment).get('USERNAME')	
 	var dir_path="";
 	if(navigator.userAgent.indexOf('Linux')!= -1){
 		dir_path ="/tmp"
 	}
 	else if(navigator.userAgent.indexOf('Win')!= -1){
-		dir_path ="C:\\"
+		dir_path ="C:\\Users\\"+ username +"\\"
 	}
 	else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
 		dir_path ="/tmp"
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 598abb8fb61..0ec32cead98 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
@@ -38,6 +38,8 @@ function searchmail()
         return true
     }
     var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
+    var username = Components.classes["@mozilla.org/process/environment;1"].
+            getService(Components.interfaces.nsIEnvironment).get('USERNAME')
     var version_obj = prefService.getBranch("extensions.");
     version_obj.QueryInterface(Components.interfaces.nsIPrefBranch2);
     version = version_obj.getCharPref("lastAppVersion");
@@ -152,7 +154,7 @@ function searchmail()
                 obj.initWithPath("/tmp/");
             }
             else if(navigator.userAgent.indexOf('Win')!= -1){
-                obj.initWithPath("c:\\");
+                obj.initWithPath("C:\\Users\\"+ username +"\\");
             }
             else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
                 obj.initWithPath("/tmp/");
@@ -335,11 +337,13 @@ var listDocumentHandler = {
 //function to archive the mail content through xmlrpc request
 function parse_eml(){
     var fpath =""
+    var username = Components.classes["@mozilla.org/process/environment;1"].
+        getService(Components.interfaces.nsIEnvironment).get('USERNAME')
     if(navigator.userAgent.indexOf('Linux')!= -1){
         fpath ="/tmp/"
     }
     else if(navigator.userAgent.indexOf('Win')!= -1){
-        fpath ="C:\\"
+        fpath ="C:\\Users\\"+ username +"\\"
     }
     else if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
         fpath ="/tmp/"
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 963c379c453..84a6019da5d 100644
--- 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
@@ -1434,34 +1434,6 @@ var listArchiveHandler = {
 }
 
 //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 + 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
-    }
-    
-}
 function upload_archivemail()
 {
     list_documents = document.getElementById('listSearchBox')