diff --git a/app/lib/message_template_parser.rb b/app/lib/message_template_parser.rb
index 78506d86f..0de8ef3fb 100644
--- a/app/lib/message_template_parser.rb
+++ b/app/lib/message_template_parser.rb
@@ -1,5 +1,5 @@
 module MessageTemplateParser
-  PLACEHOLDER_PATTERN=/({{ ?([\p{L} +]+)(\*?):([\p{L}_]+)(?:\:"([\p{L} +]+)")? }})/
+  PLACEHOLDER_PATTERN=/({{ ?([\p{L} +]+)(\*?):([\p{L}_]+)(?:\:"([\p{L}.@\-+_\d\s]+)")? }})/
 
   def self.parse_template_placeholders(template)
     template_content = template.content
diff --git a/test/fixtures/upvs/message_templates.yml b/test/fixtures/upvs/message_templates.yml
index afe660e4b..45a846bda 100644
--- a/test/fixtures/upvs/message_templates.yml
+++ b/test/fixtures/upvs/message_templates.yml
@@ -2,8 +2,8 @@
 
 message_reply:
   content: <GeneralAgenda xmlns="http://schemas.gov.sk/form/App.GeneralAgenda/1.9">
-    <subject>{{Predmet::text_field}}</subject>
-    <text>{{Text::text_area}}</text>
+    <subject>{{ Predmet:text_field }}</subject>
+    <text>{{ Text:text_area }}</text>
     </GeneralAgenda>
   metadata:
     posp_id: App.GeneralAgenda
@@ -15,8 +15,8 @@ message_reply:
 
 general_agenda:
   content: <GeneralAgenda xmlns="http://schemas.gov.sk/form/App.GeneralAgenda/1.9">
-    <subject>{{Predmet::text_field}}</subject>
-    <text>{{Text::text_area}}</text>
+    <subject>{{ Predmet:text_field }}</subject>
+    <text>{{ Text:text_area }}</text>
     </GeneralAgenda>
   metadata:
     posp_id: App.GeneralAgenda
@@ -32,25 +32,25 @@ ssd_crac_template:
     <CertificateOwner>
     <IdentityType>PO</IdentityType>
     <OwnerPoOvm>
-    <ICO>{{IČO::text_field}}</ICO>
+    <ICO>{{ IČO*:text_field }}</ICO>
     <Suffix xsi:nil="true" />
     </OwnerPoOvm>
     </CertificateOwner>
     <ContactPerson>
-    <ContactName>{{Kontaktná osoba:Ján Suchal:text_field}}</ContactName>
-    <Email>{{Email:jan.suchal@test.sk:text_field}}</Email>
-    <Phone>{{Telefón:+4190000000:text_field}}</Phone>
+    <ContactName>{{ Kontaktná osoba*:text_field:"Ján Suchal" }}</ContactName>
+    <Email>{{ Email*:text_field:"jan.suchal@test.sk" }}</Email>
+    <Phone>{{ Telefón*:text_field:"+4190000000" }}</Phone>
     </ContactPerson>
     <IntegrationContract>
-    <ProjectID>{{Názov prostriedku:IRVIN:text_field}}</ProjectID>
+    <ProjectID>{{ Názov prostriedku:text_field:"IRVIN" }}</ProjectID>
     </IntegrationContract>
     <TechnicalAccount>
     <EDeckAccessType>1</EDeckAccessType>
-    <ValidFrom>{{Dátum začiatku platnosti::date_field}}</ValidFrom>
+    <ValidFrom>{{ Dátum začiatku platnosti*:date_field }}</ValidFrom>
     <ValidTo xsi:nil="true" />
     </TechnicalAccount>
     <AuthentificationCertificateData>
-    <Thumbprint>{{Digitálny odtlačok::text_field}}</Thumbprint>
+    <Thumbprint>{{ Digitálny odtlačok*:text_field }}</Thumbprint>
     </AuthentificationCertificateData>
     </AuthentificationCertificateWithTechnicalAccountRegistration>
   metadata:
diff --git a/test/lib/message_template_parser_test.rb b/test/lib/message_template_parser_test.rb
index 7ee13cdd7..8c7b96e56 100644
--- a/test/lib/message_template_parser_test.rb
+++ b/test/lib/message_template_parser_test.rb
@@ -9,13 +9,15 @@ class MessageTemplateParserTest < ActiveSupport::TestCase
 
     assert_equal template_items.count, 2
 
-    assert_equal template_items.first[:placeholder], "{{Predmet::text_field}}"
+    assert_equal template_items.first[:placeholder], "{{ Predmet:text_field }}"
     assert_equal template_items.first[:name], "Predmet"
+    assert_equal template_items.first[:required], false
     assert_equal template_items.first[:default_value], nil
     assert_equal template_items.first[:type], "text_field"
 
-    assert_equal template_items.second[:placeholder], "{{Text::text_area}}"
+    assert_equal template_items.second[:placeholder], "{{ Text:text_area }}"
     assert_equal template_items.second[:name], "Text"
+    assert_equal template_items.second[:required], false
     assert_equal template_items.second[:default_value], nil
     assert_equal template_items.second[:type], "text_area"
   end
@@ -26,40 +28,47 @@ class MessageTemplateParserTest < ActiveSupport::TestCase
 
     assert_equal template_items.count, 7
 
-    assert_equal template_items.first[:placeholder], "{{IČO::text_field}}"
-    assert_equal template_items.first[:name], "IČO"
+    assert_equal template_items.first[:placeholder], '{{ IČO*:text_field }}'
+    assert_equal template_items.first[:name], 'IČO'
+    assert_equal template_items.first[:required], true
     assert_equal template_items.first[:default_value], nil
-    assert_equal template_items.first[:type], "text_field"
+    assert_equal template_items.first[:type], 'text_field'
 
-    assert_equal template_items.second[:placeholder], "{{Kontaktná osoba:Ján Suchal:text_field}}"
-    assert_equal template_items.second[:name], "Kontaktná osoba"
-    assert_equal template_items.second[:default_value], "Ján Suchal"
-    assert_equal template_items.second[:type], "text_field"
+    assert_equal template_items.second[:placeholder], '{{ Kontaktná osoba*:text_field:"Ján Suchal" }}'
+    assert_equal template_items.second[:name], 'Kontaktná osoba'
+    assert_equal template_items.second[:required], true
+    assert_equal template_items.second[:default_value], 'Ján Suchal'
+    assert_equal template_items.second[:type], 'text_field'
 
-    assert_equal template_items.third[:placeholder], "{{Email:jan.suchal@test.sk:text_field}}"
-    assert_equal template_items.third[:name], "Email"
-    assert_equal template_items.third[:default_value], "jan.suchal@test.sk"
-    assert_equal template_items.third[:type], "text_field"
+    assert_equal template_items.third[:placeholder], '{{ Email*:text_field:"jan.suchal@test.sk" }}'
+    assert_equal template_items.third[:name], 'Email'
+    assert_equal template_items.third[:required], true
+    assert_equal template_items.third[:default_value], 'jan.suchal@test.sk'
+    assert_equal template_items.third[:type], 'text_field'
 
-    assert_equal template_items.fourth[:placeholder], "{{Telefón:+4190000000:text_field}}"
-    assert_equal template_items.fourth[:name], "Telefón"
-    assert_equal template_items.fourth[:default_value], "+4190000000"
-    assert_equal template_items.fourth[:type], "text_field"
+    assert_equal template_items.fourth[:placeholder], '{{ Telefón*:text_field:"+4190000000" }}'
+    assert_equal template_items.fourth[:name], 'Telefón'
+    assert_equal template_items.fourth[:required], true
+    assert_equal template_items.fourth[:default_value], '+4190000000'
+    assert_equal template_items.fourth[:type], 'text_field'
 
-    assert_equal template_items.fifth[:placeholder], "{{Názov prostriedku:IRVIN:text_field}}"
-    assert_equal template_items.fifth[:name], "Názov prostriedku"
-    assert_equal template_items.fifth[:default_value], "IRVIN"
-    assert_equal template_items.fifth[:type], "text_field"
+    assert_equal template_items.fifth[:placeholder], '{{ Názov prostriedku:text_field:"IRVIN" }}'
+    assert_equal template_items.fifth[:name], 'Názov prostriedku'
+    assert_equal template_items.fifth[:required], false
+    assert_equal template_items.fifth[:default_value], 'IRVIN'
+    assert_equal template_items.fifth[:type], 'text_field'
 
-    assert_equal template_items[5][:placeholder], "{{Dátum začiatku platnosti::date_field}}"
-    assert_equal template_items[5][:name], "Dátum začiatku platnosti"
+    assert_equal template_items[5][:placeholder], '{{ Dátum začiatku platnosti*:date_field }}'
+    assert_equal template_items[5][:name], 'Dátum začiatku platnosti'
+    assert_equal template_items[5][:required], true
     assert_equal template_items[5][:default_value], nil
-    assert_equal template_items[5][:type], "date_field"
+    assert_equal template_items[5][:type], 'date_field'
 
-    assert_equal template_items[6][:placeholder], "{{Digitálny odtlačok::text_field}}"
-    assert_equal template_items[6][:name], "Digitálny odtlačok"
+    assert_equal template_items[6][:placeholder], '{{ Digitálny odtlačok*:text_field }}'
+    assert_equal template_items[6][:name], 'Digitálny odtlačok'
+    assert_equal template_items[6][:required], true
     assert_equal template_items[6][:default_value], nil
-    assert_equal template_items[6][:type], "text_field"
+    assert_equal template_items[6][:type], 'text_field'
 
   end
 end