diff --git a/application/Espo/Resources/i18n/en_US/EmailTemplate.json b/application/Espo/Resources/i18n/en_US/EmailTemplate.json
index 5105156970..6cd44b9eb9 100644
--- a/application/Espo/Resources/i18n/en_US/EmailTemplate.json
+++ b/application/Espo/Resources/i18n/en_US/EmailTemplate.json
@@ -27,6 +27,8 @@
         "actual": "Actual"
     },
     "placeholderTexts": {
+        "today": "Today's date",
+        "now": "Current date & time",
         "optOutUrl": "URL for an unsubsbribe link",
         "optOutLink": "an unsubscribe link"
     }
diff --git a/application/Espo/Resources/metadata/clientDefs/EmailTemplate.json b/application/Espo/Resources/metadata/clientDefs/EmailTemplate.json
index 1061566be0..2d5479f26e 100644
--- a/application/Espo/Resources/metadata/clientDefs/EmailTemplate.json
+++ b/application/Espo/Resources/metadata/clientDefs/EmailTemplate.json
@@ -43,5 +43,5 @@
     "filterList": [
         "actual"
     ],
-    "placeholderList": ["optOutUrl", "optOutLink"]
+    "placeholderList": ["today", "now", "optOutUrl", "optOutLink"]
 }