diff --git a/src/main/java/com/ffii/tsms/modules/common/mail/service/MailSenderService.kt b/src/main/java/com/ffii/tsms/modules/common/mail/service/MailSenderService.kt
index bce6e31..c037097 100644
--- a/src/main/java/com/ffii/tsms/modules/common/mail/service/MailSenderService.kt
+++ b/src/main/java/com/ffii/tsms/modules/common/mail/service/MailSenderService.kt
@@ -28,8 +28,9 @@ open class MailSenderService(private val settingsService: SettingsService) {
                 props["mail.smtp.connectiontimeout"] = "10000"
             }
             props["mail.smtp.auth"] = auth
-            props["mail.smtp.starttls.enable"] = "true"
-            props["mail.smtp.ssl.protocols"] = "TLSv1.2"
+//            The below setting needs to be included when the SMTP has TLS Version
+//            props["mail.smtp.starttls.enable"] = "true"
+//            props["mail.smtp.ssl.protocols"] = "TLSv1.2"
 
             sender.host = config.host
             sender.port = config.port!!