diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index c0355c4ece7..16222dd2069 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 c0acd329c58..e201f87a04c 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 64d1f1077f4..47eb2111c33 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
@@ -152,9 +152,6 @@ function getPredefinedFolder(type) {
     	getService(Components.interfaces.nsIProperties).get("Home", Components.interfaces.nsIFile);
     var homeDir = dirService.path;
     var dir_path = ((homeDir.search(/\\/) != -1) ? homeDir + "\\" : homeDir + "/")
-    if(navigator.userAgent.indexOf('Mac OS X')!= -1){ 
-    	dir_path ="/tmp/"
-    } 
 	try {
 		var localFile = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
 		localFile.initWithPath(dir_path);
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 c69de7035ec..fde29df4dbe 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
@@ -153,13 +153,6 @@ function searchmail()
             name[i] = currentAttachments[i].displayName;
             var obj = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
             obj.initWithPath(path)
-            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);
         }
@@ -338,9 +331,6 @@ function parse_eml(){
         getService(Components.interfaces.nsIProperties).get("Home", Components.interfaces.nsIFile);
     var homeDir = dirService.path;
     fpath = ((homeDir.search(/\\/) != -1) ? homeDir + "\\" : homeDir + "/")
-    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 );