diff --git a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailReminderService.kt b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailReminderService.kt
index 12bf8a5..09c0a85 100644
--- a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailReminderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailReminderService.kt
@@ -64,12 +64,14 @@ open class MailReminderService(
         return tableStarter.toString()
     }
 
-    private fun createEmailRequest(content: String, emailTo: List<String>) {
+    public fun createEmailRequest(content: String, emailTo: List<String>) {
 //        val subject = settingsService.findByName(SettingNames.TIMESHEET_MAIL_SUBJECT).orElseThrow().value
 //        val template = settingsService.findByName(SettingNames.TIMESHEET_MAIL_TEMPLATE).orElseThrow().value
 //        val cc = settingsService.findByName(SettingNames.TIMESHEET_MAIL_CC).orElseThrow().value.split(",")
 //        val bcc = settingsService.findByName(SettingNames.TIMESHEET_MAIL_BCC).orElseThrow().value.split(",")
         val mailRequest = MailRequest.Builder()
+            .subject("Test: subject")
+            .templateContent("<p>{date}</p>")
 //            .subject(subject)
 //            .templateContent(template)
             .args(
@@ -85,4 +87,5 @@ open class MailReminderService(
         mailRequestList += mailRequest
         mailService.send(mailRequestList)
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailSenderService.kt b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailSenderService.kt
index e8ea93b..3cc9a0b 100644
--- a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailSenderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailSenderService.kt
@@ -29,8 +29,8 @@ open class MailSenderService(private val settingsService: SettingsService) {
             }
             props["mail.smtp.auth"] = auth
 //            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"
+            props["mail.smtp.starttls.enable"] = "true"
+            props["mail.smtp.ssl.protocols"] = "TLSv1.2"
 
             sender.host = config.host
             sender.port = config.port!!
diff --git a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailService.kt b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailService.kt
index 890ab00..aec186d 100644
--- a/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/common/mail/service/MailService.kt
@@ -183,29 +183,29 @@ open class MailService(
         }
 
         // ------------------ save timesheet mail details ------------------ //
-        val mailCc = settingsRepository.findByName("TIMESHEET.mail.cc").orElseThrow()
-
-        settings += mailCc.apply {
-            value = mailSave.template.cc
-        }
-
-        val mailBcc = settingsRepository.findByName("TIMESHEET.mail.bcc").orElseThrow()
-
-        settings += mailBcc.apply {
-            value = mailSave.template.bcc
-        }
-
-        val mailSubject = settingsRepository.findByName("TIMESHEET.mail.subject").orElseThrow()
-
-        settings += mailSubject.apply {
-            value = mailSave.template.subject
-        }
-
-        val mailTemplate = settingsRepository.findByName("TIMESHEET.mail.template").orElseThrow()
-
-        settings += mailTemplate.apply {
-            value = mailSave.template.template
-        }
+//        val mailCc = settingsRepository.findByName("TIMESHEET.mail.cc").orElseThrow()
+//
+//        settings += mailCc.apply {
+//            value = mailSave.template.cc
+//        }
+//
+//        val mailBcc = settingsRepository.findByName("TIMESHEET.mail.bcc").orElseThrow()
+//
+//        settings += mailBcc.apply {
+//            value = mailSave.template.bcc
+//        }
+//
+//        val mailSubject = settingsRepository.findByName("TIMESHEET.mail.subject").orElseThrow()
+//
+//        settings += mailSubject.apply {
+//            value = mailSave.template.subject
+//        }
+//
+//        val mailTemplate = settingsRepository.findByName("TIMESHEET.mail.template").orElseThrow()
+//
+//        settings += mailTemplate.apply {
+//            value = mailSave.template.template
+//        }
 
         // ------------------ save all ------------------ //
         settingsRepository.saveAll(settings)
diff --git a/src/main/java/com/ffii/fpsms/modules/common/mail/web/MailController.kt b/src/main/java/com/ffii/fpsms/modules/common/mail/web/MailController.kt
index 06f8235..cd34758 100644
--- a/src/main/java/com/ffii/fpsms/modules/common/mail/web/MailController.kt
+++ b/src/main/java/com/ffii/fpsms/modules/common/mail/web/MailController.kt
@@ -3,10 +3,13 @@ package com.ffii.fpsms.modules.common.mail.web
 import com.ffii.fpsms.modules.common.mail.service.MailReminderService
 import com.ffii.fpsms.modules.common.mail.service.MailService
 import com.ffii.fpsms.modules.common.mail.web.models.MailSave
+import com.ffii.fpsms.modules.common.mail.web.models.Setting
 import com.ffii.fpsms.modules.settings.entity.Settings
 import com.ffii.fpsms.modules.settings.service.SettingsService
 import jakarta.validation.Valid
 import org.springframework.web.bind.annotation.*
+import java.time.LocalDateTime
+import java.util.Date
 
 @RestController
 @RequestMapping("/mails")
@@ -20,6 +23,11 @@ class MailController(
         return settingsService.findAllByCategory("MAIL")
     }
 
+    @GetMapping("/test-send")
+    fun mailTestSend() {
+        mailReminderService.createEmailRequest(LocalDateTime.now().toString(), listOf("the email u will send"))
+    }
+
     @PostMapping("/save")
     fun saveMail(@Valid @RequestBody mailSave: MailSave): List<Settings> {
         return mailService.saveMail(mailSave)
diff --git a/src/main/java/com/ffii/fpsms/modules/common/mail/web/models/MailSave.kt b/src/main/java/com/ffii/fpsms/modules/common/mail/web/models/MailSave.kt
index b7b4736..6331cb7 100644
--- a/src/main/java/com/ffii/fpsms/modules/common/mail/web/models/MailSave.kt
+++ b/src/main/java/com/ffii/fpsms/modules/common/mail/web/models/MailSave.kt
@@ -17,5 +17,5 @@ data class Template (
 
 data class MailSave (
     val settings: List<Setting>,
-    val template: Template
+//    val template: Template
 )
\ No newline at end of file