diff --git a/samples/ServalApp/serval_email_module.py b/samples/ServalApp/serval_email_module.py
index 5033102b..f7c99ba8 100644
--- a/samples/ServalApp/serval_email_module.py
+++ b/samples/ServalApp/serval_email_module.py
@@ -22,7 +22,7 @@ def password(self):
         return len(self.__password) * "*"
 
     def __enter__(self):
-        context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+        context = ssl.create_default_context()  # ssl.SSLContext(ssl.PROTOCOL_SSLv23)
         self.server = smtplib.SMTP_SSL(host=self.host, port=self.port, context=context)
         self.server.login(self.sender_address, self.__password)
         return self