diff --git a/gluon/tools.py b/gluon/tools.py
index e0339e08..5b7221af 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -816,7 +816,16 @@ class Mail(object):
                         server.login(*self.settings.login.split(':', 1))
                     result = server.sendmail(sender, to, payload.as_string())
                 finally:
-                    server.quit()
+                    # do not want to hide errors raising some exception here
+                    try:
+                        server.quit()
+                    except:
+                        pass
+                    # ensure to close any socket with SMTP server
+                    try:
+                        server.close()
+                    except:
+                        pass
         except Exception as e:
             logger.warning('Mail.send failure:%s' % e)
             self.result = result