diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
index 6693fbf5711..a86bcb88e6b 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
@@ -251,14 +251,14 @@ def UnregisterAddin(klass):
     import _winreg
     try:
         _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\" + klass._reg_progid_)
-    except WindowsError:
+    except:
         pass
 
 def UnregisterXMLConn(klass):
     import _winreg
     try:
         _winreg.DeleteKey(_winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Office\\Outlook\\Addins\\XMLConnection" + klass._reg_progid_)
-    except WindowsError:
+    except:
         pass
 
 def RegisterXMLConn(klass):
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index c4efe23cddc..dc02d956f3c 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -68,16 +68,16 @@ class XMLRpcConn(object):
         self._server=server
         self._port=port
         self._uri=uri
-    	self._obj_list=[]
-    	self._dbname=''
-    	self._uname='admin'
-    	self._pwd='a'
-    	self._login=False
-    	self._running=False
-    	self._uid=False
-    	self._iscrm=True
-    	self.partner_id_list=None
-    	self.protocol=None
+        self._obj_list=[]
+        self._dbname=''
+        self._uname='admin'
+        self._pwd='a'
+        self._login=False
+        self._running=False
+        self._uid=False
+        self._iscrm=True
+        self.partner_id_list=None
+        self.protocol=None
 
     def getitem(self, attrib):
     	v=self.__getattribute__(attrib)
@@ -200,7 +200,6 @@ class XMLRpcConn(object):
             if attachments:
             	result = self.MakeAttachment([rec], mail)
             attachment_ids = result.get(model, {}).get(res_id, [])
-            ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','history',model, res_id, msg, attachment_ids)
             new_msg += """- {0} : {1}\n""".format(object_name,str(rec[2]))
             flag = True
 
@@ -394,7 +393,6 @@ class XMLRpcConn(object):
     	address_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(email))])
     	if not partner_id or not address_id or not country_id or not state_id:
     		return flag
-    	address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address','read',address_id[0],['id','partner_id','state_id','country_id'])
     	vals_res_address={
     					   'partner_id' : partner_id[0],
     					   'name' : new_dict['name'],