diff --git a/format.js b/format.js
index ddee48d31a5caba6358b760f90434e76cb9a0d52..c8597946803435fa89ff4e6a4d7f0ecea86873fd 100644
--- a/format.js
+++ b/format.js
@@ -9,7 +9,8 @@ const tplText = fs.readFileSync(path.join(__dirname, 'mail.mustache'), 'utf-8')
 //console.log('tpl: ', tplText)
 //console.log('data:', dataText)
 const data = JSON.parse(dataText)
-const dayData = data.days[moment().format('YYYY-MM-DD')]
+const dateParam = process.argv[2] || undefined
+const dayData = data.days[moment(dateParam).format('YYYY-MM-DD')]
 const usedAdditives = {}
 dayData.menu.forEach(m =>
   m.description.forEach(d =>
diff --git a/mail.mustache b/mail.mustache
index 668ba2bf519f4e7b6fe1dde2953ca89f5e12041d..5e92a3f09b9d7f9989005146cceecdcc8c60c2cb 100644
--- a/mail.mustache
+++ b/mail.mustache
@@ -3,19 +3,19 @@
 {{#today.menu}}
 {{ category }} ({{ price }}) {{#labels}}[{{.}}]{{/labels}}:
 {{#description}}
-  - {{ text }} {{#notes}}[{{.}}]{{/notes}}
+  - {{ &text }} {{#notes}}[{{.}}]{{/notes}}
 {{/description}}
 
 {{/today.menu}}
 {{#today.extras}}
 {{ category }}:
 {{#options}}
-  - {{#description}} {{text}} {{#notes}}[{{.}}]{{/notes}}{{/description}}
+  - {{#description}} {{ &text }} {{#notes}}[{{.}}]{{/notes}}{{/description}}
 {{/options}}
 
 {{/today.extras}}
 
 Additives:
 {{#additives}}
-  [{{symbol}}]: {{text}}
+  [{{symbol}}]: {{ &text }}
 {{/additives}}