diff --git a/workflow/workflow-demos/cms/Notification/business/Templates/Order/mail/Content.html b/workflow/workflow-demos/cms/Notification/business/Templates/Order/mail/Content.html
new file mode 100644
index 000000000..029309159
--- /dev/null
+++ b/workflow/workflow-demos/cms/Notification/business/Templates/Order/mail/Content.html
@@ -0,0 +1,17 @@
+<html>
+  <body>
+    <img class="logo" src="<%= ivy.branding.ref("logo_mail") %>"/>
+    <h1><%= ivy.cm.co("/Notification/business/Templates/Order/Labels/Title") %></h1>
+    <p><%= ivy.cm.co("/Notification/business/Templates/Order/Labels/Greeting") %> <%= ivy.session.getSessionUser().getFullName() %></p>
+	<table>
+	  <tr>
+	    <th><%= ivy.cm.co("/Notification/business/Templates/Order/Labels/Message") %><th>
+	    <td><%= ivy.html.escape(message) %></td>
+	  </tr>
+	  <tr>
+	    <th><%= ivy.cm.co("/Notification/business/Templates/Order/Labels/Customer") %></th>
+	    <td><i style="color: red;"> <%= ivy.html.escape(payload.get("surname")) %> <%= ivy.html.escape(payload.get("name")) %> </i></td>
+	  </tr>
+	</table> 
+  </body>
+</html>
diff --git a/workflow/workflow-demos/cms/cms_de.yaml b/workflow/workflow-demos/cms/cms_de.yaml
index 9658411ef..b3b32f63c 100644
--- a/workflow/workflow-demos/cms/cms_de.yaml
+++ b/workflow/workflow-demos/cms/cms_de.yaml
@@ -137,7 +137,10 @@ Notification:
     Templates:
       Order:
         Labels:
-          customer: Kunde
+          Customer: Kunde
+          Greeting: 'Hallo '
+          Message: Meldung
+          Title: Bestellungsinformation
 TaskDescriptions:
   DeliverKeyCardDesc: Bitte liefern Sie die Schlüsselkarte aus für
   acceptRequest: Antrag annehmen
diff --git a/workflow/workflow-demos/cms/cms_en.yaml b/workflow/workflow-demos/cms/cms_en.yaml
index a2c982962..a3f483bc3 100644
--- a/workflow/workflow-demos/cms/cms_en.yaml
+++ b/workflow/workflow-demos/cms/cms_en.yaml
@@ -199,11 +199,14 @@ Notification:
     Templates:
       Order:
         Labels:
-          customer: Customer
+          Customer: Customer
+          Greeting: Hello
+          Message: Message
+          Title: Order Information
         web:
           Subject: |-
             <%= ivy.html.escape(message) %><br>
-            <%= ivy.cm.co("/Notification/business/Templates/Order/Labels/customer") %> <i style="color:red;"><%= ivy.html.escape(payload.get("surname")) %> <%= ivy.html.escape(payload.get("name")) %> </i>
+            <%= ivy.cm.co("/Notification/business/Templates/Order/Labels/Customer") %> <i style="color:red;"><%= ivy.html.escape(payload.get("surname")) %> <%= ivy.html.escape(payload.get("name")) %> </i>
 ProcessDescriptions:
   AdHocDescription: 'Self Service Process: Launch an ad-hoc Workflow based on a predefined flow pattern.'
   AdHocName: Ad-hoc Process

<%= ivy.cm.co("/Notification/business/Templates/Order/Labels/Message") %>	+	<%= ivy.html.escape(message) %>
<%= ivy.cm.co("/Notification/business/Templates/Order/Labels/Customer") %>	<%= ivy.html.escape(payload.get("surname")) %> <%= ivy.html.escape(payload.get("name")) %>