diff --git a/server/AyaNova/Controllers/EnumListController.cs b/server/AyaNova/Controllers/EnumListController.cs
index de23747d..0afa5cff 100644
--- a/server/AyaNova/Controllers/EnumListController.cs
+++ b/server/AyaNova/Controllers/EnumListController.cs
@@ -268,7 +268,7 @@ namespace AyaNova.Api.Controllers
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventContractExpiring"], Id = (long)NotifyEventType.ContractExpiring });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventCSRAccepted"], Id = (long)NotifyEventType.CSRAccepted });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventCSRRejected"], Id = (long)NotifyEventType.CSRRejected });
-               // ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderClosed"], Id = (long)NotifyEventType.WorkorderClosed });
+                // ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderClosed"], Id = (long)NotifyEventType.WorkorderClosed });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusChange"], Id = (long)NotifyEventType.QuoteStatusChange });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusAge"], Id = (long)NotifyEventType.QuoteStatusAge });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventObjectAge"], Id = (long)NotifyEventType.ObjectAge });
@@ -301,6 +301,18 @@ namespace AyaNova.Api.Controllers
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyDeliveryMethodApp"], Id = (long)NotifyDeliveryMethod.App });
                 ReturnList.Add(new NameIdItem() { Name = LT["NotifyDeliveryMethodSMTP"], Id = (long)NotifyDeliveryMethod.SMTP });
             }
+            else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(NotifyMailSecurity).ToString()).ToLowerInvariant())
+            {
+                TranslationKeysToFetch.Add("NotifyMailSecurityNone");
+                TranslationKeysToFetch.Add("NotifyMailSecuritySSLTLS");
+                TranslationKeysToFetch.Add("NotifyMailSecurityStartTls");
+
+                var LT = TranslationBiz.GetSubsetStaticAsync(TranslationKeysToFetch, TranslationId).Result;
+
+                ReturnList.Add(new NameIdItem() { Name = LT["NotifyMailSecurityNone"], Id = (long)NotifyMailSecurity.None });
+                ReturnList.Add(new NameIdItem() { Name = LT["NotifyMailSecuritySSLTLS"], Id = (long)NotifyMailSecurity.SSLTLS });
+                ReturnList.Add(new NameIdItem() { Name = LT["NotifyMailSecurityStartTls"], Id = (long)NotifyMailSecurity.StartTls });
+            }
             else
             {
                 ReturnList.Add(new NameIdItem() { Name = $"Unknown enum type list key value {enumkey}", Id = (long)UserType.Administrator });
@@ -332,6 +344,7 @@ namespace AyaNova.Api.Controllers
             ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(UiFieldDataType).ToString()), "Types of data used in AyaNova for display and formatting UI purposes"));
             ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(NotifyEventType).ToString()), "Notification event types"));
             ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(NotifyDeliveryMethod).ToString()), "Notification delivery methods"));
+            ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(NotifyMailSecurity).ToString()), "Notification SMTP mail server security method"));
 
             return Ok(ApiOkResponse.Response(ret));
         }
diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json
index 4f0bf5d9..e934a383 100644
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -1865,7 +1865,7 @@
   "NotifyEventCSRAccepted": "Kundendienstanfrage angenommen",
   "NotifyEventCSRRejected": "Kundendienstanfrage abgelehnt",
   "NotifyEventWorkorderClosed": "Arbeitsauftrag geschlossen",
-  "NotifyEventQuoteStatusChange": "Angebotsstatus geändert",  
+  "NotifyEventQuoteStatusChange": "Angebotsstatus geändert",
   "NotifyEventQuoteStatusAge": "Angebotsstatus für den Zeitraum unverändert",
   "NotifyEventServiceBankDepleted": "Service Bank erschöpft",
   "NotifyEventReminderImminent": "Erinnerung unmittelbar bevorsteht",
@@ -1889,5 +1889,17 @@
   "NotifyEventObjectAge": "Objektalter seit der Erstellung",
   "NotifyEventServerOperationsProblem": "Problem mit dem Serverbetrieb",
   "Duration": "Dauer",
-  "Notifications":"Benachrichtigungen"
+  "Notifications": "Benachrichtigungen",
+  "NotifyMailSecurityNone": "Keiner",
+  "NotifyMailSecuritySSLTLS": "SSL\\TLS",
+  "NotifyMailSecurityStartTls": "StartTLS",
+  "TestSMTPSettings": "Testnachricht senden",
+  "TestToAddress": "Test senden an",
+  "SmtpDeliveryActive": "SMTP-Benachrichtigung aktiv",
+  "SmtpServerAddress": "SMTP-Serveradresse",
+  "SmtpAccount": "SMTP-Serverkonto",
+  "SmtpPassword": "SMTP-Serverkennwort",
+  "ConnectionSecurity": "SMTP-Verbindungssicherheit",
+  "SmtpServerPort": "SMTP-Server-Port",
+  "NotifyFromAddress": "SMTP-Benachrichtigungsadresse"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index cfba1f72..631b6d1b 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -1889,5 +1889,17 @@
   "NotifyEventObjectAge": "Object age since created",
   "NotifyEventServerOperationsProblem": "Server operations problem",
   "Duration": "Duration",
-  "Notifications":"Notifications"
+  "Notifications": "Notifications",
+  "NotifyMailSecurityNone": "None",
+  "NotifyMailSecuritySSLTLS": "SSL\\TLS",
+  "NotifyMailSecurityStartTls": "StartTLS",
+  "TestSMTPSettings": "Send test message",
+  "TestToAddress": "Send test to",
+  "SmtpDeliveryActive": "SMTP notification active",
+  "SmtpServerAddress": "SMTP server address",
+  "SmtpAccount": "SMTP server account",
+  "SmtpPassword": "SMTP server password",
+  "ConnectionSecurity": "SMTP connection security",
+  "SmtpServerPort": "SMTP server port",
+  "NotifyFromAddress": "SMTP notify from address"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json
index 14e98a47..52727a56 100644
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -1889,5 +1889,17 @@
   "NotifyEventObjectAge": "Edad del objeto desde su creación",
   "NotifyEventServerOperationsProblem": "Problema de operaciones del servidor",
   "Duration": "Duración",
-  "Notifications":"Notificaciones"
+  "Notifications": "Notificaciones",
+  "NotifyMailSecurityNone": "Ninguna",
+  "NotifyMailSecuritySSLTLS": "SSL\\TLS",
+  "NotifyMailSecurityStartTls": "StartTLS",
+  "TestSMTPSettings": "Enviar mensaje de prueba",
+  "TestToAddress": "Enviar prueba a",
+  "SmtpDeliveryActive": "Notificación SMTP activa",
+  "SmtpServerAddress": "Dirección SMTP",
+  "SmtpAccount": "Nombre de usuario de SMTP",
+  "SmtpPassword": "Contraseña SMTP",
+  "ConnectionSecurity": "Seguridad de conexión del servidor SMTP",
+  "SmtpServerPort": "Puerto SMTP",
+  "NotifyFromAddress": "Notificación SMTP desde la dirección"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json
index 5db4dbda..d8c019da 100644
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -1889,5 +1889,17 @@
   "NotifyEventObjectAge": "Âge de l'objet depuis sa création",
   "NotifyEventServerOperationsProblem": "Problème de fonctionnement du serveur",
   "Duration": "Durée",
-  "Notifications":"Notifications"
+  "Notifications": "Notifications",
+  "NotifyMailSecurityNone": "Aucun",
+  "NotifyMailSecuritySSLTLS": "SSL\\TLS",
+  "NotifyMailSecurityStartTls": "StartTLS",
+  "TestSMTPSettings": "Envoyer un message de test",
+  "TestToAddress": "Envoyer à l'adresse",
+  "SmtpDeliveryActive": "Notification SMTP active",
+  "SmtpServerAddress": "Adresse du serveur SMTP",
+  "SmtpAccount": "Compte de serveur SMTP",
+  "SmtpPassword": "Mot de passe du serveur SMTP",
+  "ConnectionSecurity": "Sécurité de la connexion SMTP",
+  "SmtpServerPort": "Port du serveur SMTP",
+  "NotifyFromAddress": "Notification SMTP envoyée depuis l'adresse"
 }
\ No newline at end of file