diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index bb67ccde0d1..28e86390742 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 ee385c4e81d..a392be18e67 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..cd3cd90c1d0 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
@@ -196,12 +196,11 @@ function getPredefinedFolder(type) {
 
 		var fname = msgDate8601string+"-"+subj+"-"+hdr.messageKey;
 	}
+	var rand1=Math.floor(Math.random()*100000)
+	var rand2=Math.floor(Math.random()*100000)
+	fname = rand1+'openerp-eml'+rand2
 	setFileName(fname)
 	fname = fname.replace(/[\x00-\x19]/g,"_");
-	if (mustcorrectname)
-		fname = nametoascii(fname);
-	else
-		fname = fname.replace(/[\/\\:,<>*\?\"\|]/g,"_");
 	return fname;
 }
 
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 a10fe47b521..84aa9394ee4 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
@@ -1389,7 +1389,6 @@ function getPartnerList(){
     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,{});