From 0e3ea32b0b4eac509bc8cff090b77dac173f665a Mon Sep 17 00:00:00 2001
From: satyajosyula2020 <satya.josyula@digital.hmrc.gov.uk>
Date: Thu, 21 Dec 2023 15:56:58 +0000
Subject: [PATCH] DC-5699 Create new templates for IOSS

---
 .../templates/ServiceIdentifier.scala         |   1 +
 .../templates/TemplateLocator.scala           |   2 +
 .../templates/ioss/IossTemplates.scala        | 278 ++++++++++++++++++
 .../ioss/new_message_alert_ioss.scala.html    |  35 +++
 .../ioss/new_message_alert_ioss.scala.txt     |  17 ++
 .../ioss/new_message_alert_ioss_cy.scala.html |  27 ++
 .../ioss/new_message_alert_ioss_cy.scala.txt  |  19 ++
 .../new_message_alert_m01_ioss.scala.html     |  35 +++
 .../ioss/new_message_alert_m01_ioss.scala.txt |  17 ++
 .../new_message_alert_m01_ioss_cy.scala.html  |  27 ++
 .../new_message_alert_m01_ioss_cy.scala.txt   |  19 ++
 .../new_message_alert_m01a_ioss.scala.html    |  35 +++
 .../new_message_alert_m01a_ioss.scala.txt     |  17 ++
 .../new_message_alert_m01a_ioss_cy.scala.html |  27 ++
 .../new_message_alert_m01a_ioss_cy.scala.txt  |  19 ++
 .../new_message_alert_m02_ioss.scala.html     |  35 +++
 .../ioss/new_message_alert_m02_ioss.scala.txt |  17 ++
 .../new_message_alert_m02_ioss_cy.scala.html  |  27 ++
 .../new_message_alert_m02_ioss_cy.scala.txt   |  19 ++
 .../new_message_alert_m02a_ioss.scala.html    |  35 +++
 .../new_message_alert_m02a_ioss.scala.txt     |  17 ++
 .../new_message_alert_m02a_ioss_cy.scala.html |  27 ++
 .../new_message_alert_m02a_ioss_cy.scala.txt  |  19 ++
 .../new_message_alert_m04_ioss.scala.html     |  35 +++
 .../ioss/new_message_alert_m04_ioss.scala.txt |  17 ++
 .../new_message_alert_m04_ioss_cy.scala.html  |  27 ++
 .../new_message_alert_m04_ioss_cy.scala.txt   |  19 ++
 .../new_message_alert_m05_ioss.scala.html     |  35 +++
 .../ioss/new_message_alert_m05_ioss.scala.txt |  17 ++
 .../new_message_alert_m05_ioss_cy.scala.html  |  27 ++
 .../new_message_alert_m05_ioss_cy.scala.txt   |  19 ++
 .../new_message_alert_m05a_ioss.scala.html    |  35 +++
 .../new_message_alert_m05a_ioss.scala.txt     |  17 ++
 .../new_message_alert_m05a_ioss_cy.scala.html |  27 ++
 .../new_message_alert_m05a_ioss_cy.scala.txt  |  19 ++
 .../new_message_alert_m06_ioss.scala.html     |  35 +++
 .../ioss/new_message_alert_m06_ioss.scala.txt |  17 ++
 .../new_message_alert_m06_ioss_cy.scala.html  |  27 ++
 .../new_message_alert_m06_ioss_cy.scala.txt   |  19 ++
 .../new_message_alert_m06a_ioss.scala.html    |  35 +++
 .../new_message_alert_m06a_ioss.scala.txt     |  17 ++
 .../new_message_alert_m06a_ioss_cy.scala.html |  27 ++
 .../new_message_alert_m06a_ioss_cy.scala.txt  |  19 ++
 .../new_message_alert_m07_ioss.scala.html     |  35 +++
 .../ioss/new_message_alert_m07_ioss.scala.txt |  17 ++
 .../new_message_alert_m07_ioss_cy.scala.html  |  27 ++
 .../new_message_alert_m07_ioss_cy.scala.txt   |  19 ++
 .../new_message_alert_m07a_ioss.scala.html    |  35 +++
 .../new_message_alert_m07a_ioss.scala.txt     |  17 ++
 .../new_message_alert_m07a_ioss_cy.scala.html |  27 ++
 .../new_message_alert_m07a_ioss_cy.scala.txt  |  19 ++
 .../new_message_alert_m08_ioss.scala.html     |  35 +++
 .../ioss/new_message_alert_m08_ioss.scala.txt |  17 ++
 .../new_message_alert_m08_ioss_cy.scala.html  |  27 ++
 .../new_message_alert_m08_ioss_cy.scala.txt   |  19 ++
 .../new_message_alert_m08a_ioss.scala.html    |  35 +++
 .../new_message_alert_m08a_ioss.scala.txt     |  17 ++
 .../new_message_alert_m08a_ioss_cy.scala.html |  27 ++
 .../new_message_alert_m08a_ioss_cy.scala.txt  |  19 ++
 .../templates/itsa/ItsaTemplates.scala        |   2 +-
 .../templates/TemplateLocatorSpec.scala       |  33 ++-
 .../ioss/NewMessageAlert_IOSSSpec.scala       | 101 +++++++
 62 files changed, 1786 insertions(+), 3 deletions(-)
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/IossTemplates.scala
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss_cy.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss.scala.txt
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss_cy.scala.html
 create mode 100644 app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss_cy.scala.txt
 create mode 100644 test/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/NewMessageAlert_IOSSSpec.scala

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ServiceIdentifier.scala b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ServiceIdentifier.scala
index 587d5781b..764648b16 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ServiceIdentifier.scala
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ServiceIdentifier.scala
@@ -50,6 +50,7 @@ object ServiceIdentifier {
   case object GuaranteedMinimumPension extends ServiceIdentifier { override val name = "gmp" }
   case object Generic extends ServiceIdentifier { override val name = "generic" }
   case object Itsa extends ServiceIdentifier { override val name = "itsa" }
+  case object Ioss extends ServiceIdentifier { override val name = "ioss" }
   case object InheritanceTax extends ServiceIdentifier { override val name = "iht" }
   case object PayAsYouEarn extends ServiceIdentifier { override val name = "paye" }
   case object PensionSchemesforPractitioners extends ServiceIdentifier { override val name = "pp" }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/TemplateLocator.scala b/app/uk/gov/hmrc/hmrcemailrenderer/templates/TemplateLocator.scala
index 9ab8a0489..4ca8dc142 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/TemplateLocator.scala
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/TemplateLocator.scala
@@ -89,6 +89,7 @@ import uk.gov.hmrc.hmrcemailrenderer.templates.itsa.ItsaTemplates
 import uk.gov.hmrc.hmrcemailrenderer.templates.mtdfb.vatreg.VatRegTemplates
 import uk.gov.hmrc.hmrcemailrenderer.templates.hipp.HippTemplates
 import uk.gov.hmrc.hmrcemailrenderer.templates.feedback.FeedbackTemplates
+import uk.gov.hmrc.hmrcemailrenderer.templates.ioss.IossTemplates
 import uk.gov.hmrc.hmrcemailrenderer.templates.penaltyreform.PenReformTemplates
 import uk.gov.hmrc.hmrcemailrenderer.templates.tctr.TctrTemplates
 import uk.gov.hmrc.hmrcemailrenderer.templates.tctr.TctrTemplates.tctrGroup
@@ -165,6 +166,7 @@ trait TemplateLocator {
       "HEC"                   -> HecTemplates.templates,
       "EU Subsidy"            -> EUSubsidyTemplates.templates,
       "ITSA"                  -> ItsaTemplates.templates,
+      "IOSS"                  -> IossTemplates.templates,
       "ECL"                   -> EclTemplates.templates,
       "HIPP"                  -> HippTemplates.templates,
       "Penalty Reform"        -> PenReformTemplates.templates,
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/IossTemplates.scala b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/IossTemplates.scala
new file mode 100644
index 000000000..0ede581b5
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/IossTemplates.scala
@@ -0,0 +1,278 @@
+/*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.hmrc.hmrcemailrenderer.templates.ioss
+
+import uk.gov.hmrc.hmrcemailrenderer.domain.{ MessagePriority, MessageTemplate }
+import uk.gov.hmrc.hmrcemailrenderer.templates.FromAddress.govUkTeamAddress
+import uk.gov.hmrc.hmrcemailrenderer.templates.ServiceIdentifier.Ioss
+
+object IossTemplates {
+  val templates = Seq(
+    MessageTemplate.create(
+      templateId = "new_message_alert_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_ioss.f,
+      htmlTemplate = html.new_message_alert_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m01_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m01_ioss.f,
+      htmlTemplate = html.new_message_alert_m01_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m01_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m01_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m01_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m01a_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m01a_ioss.f,
+      htmlTemplate = html.new_message_alert_m01a_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m01a_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m01a_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m01a_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m02_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m02_ioss.f,
+      htmlTemplate = html.new_message_alert_m02_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m02_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m02_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m02_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m02a_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m02a_ioss.f,
+      htmlTemplate = html.new_message_alert_m02a_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m02a_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m02a_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m02a_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m04_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m04_ioss.f,
+      htmlTemplate = html.new_message_alert_m04_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m04_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m04_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m04_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m05_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m05_ioss.f,
+      htmlTemplate = html.new_message_alert_m05_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m05_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m05_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m05_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m05a_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m05a_ioss.f,
+      htmlTemplate = html.new_message_alert_m05a_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m05a_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m05a_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m05a_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m06_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m06_ioss.f,
+      htmlTemplate = html.new_message_alert_m06_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m06_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m06_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m06_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m06a_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m06a_ioss.f,
+      htmlTemplate = html.new_message_alert_m06a_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m06a_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m06a_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m06a_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m07_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m07_ioss.f,
+      htmlTemplate = html.new_message_alert_m07_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m07_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m07_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m07_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m07a_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m07a_ioss.f,
+      htmlTemplate = html.new_message_alert_m07a_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m07a_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m07a_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m07a_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m08_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m08_ioss.f,
+      htmlTemplate = html.new_message_alert_m08_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m08_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m08_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m08_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m08a_ioss",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_m08a_ioss.f,
+      htmlTemplate = html.new_message_alert_m08a_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    ),
+    MessageTemplate.create(
+      templateId = "new_message_alert_m08a_ioss_cy",
+      fromAddress = govUkTeamAddress,
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_m08a_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_m08a_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    )
+  )
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m01a_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m02a_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m04_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m05a_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m06a_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m07a_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss.scala.html
new file mode 100644
index 000000000..726a62b19
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss.scala.html
@@ -0,0 +1,35 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "You’ve got a new message from HMRC") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params)
+
+<p style="margin: 0 0 30px; font-size: 19px;">You have a new message from HMRC.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">To view it, sign in to your HMRC online account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we have not included a link with this email.</p>
+
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Why you got this email</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">You chose to get paperless notifications.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">This means we send you an email when you have a new message in your account.</p>
+
+<p style="margin: 0 0 30px; font-size: 19px;">From HMRC digital</p>
+
+}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss.scala.txt
new file mode 100644
index 000000000..3144bf9df
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss.scala.txt
@@ -0,0 +1,17 @@
+@(params: Map[String, Any])You’ve got a new message from HMRC
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params)
+
+You have a new message from HMRC.
+
+To view it, sign in to your HMRC online account.
+
+For security reasons, we have not included a link with this email.
+
+Why you got this email
+
+You chose to get paperless notifications.
+
+This means we send you an email when you have a new message in your account.
+
+From HMRC digital
+
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss_cy.scala.html
new file mode 100644
index 000000000..49039dcb0
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss_cy.scala.html
@@ -0,0 +1,27 @@
+@*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *@
+
+@(params: Map[String, Any])
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae gennych neges newydd oddi wrth CThEF", isWelsh = true) {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.salutation(params, isWelsh=true)
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych neges newydd oddi wrth CThEF.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.</p>
+<h2 id="why-you-got-this-email" style="margin: 0 0 30px; font-size: 24px;">Pam y cawsoch yr e-bost hwn</h2>
+<p style="margin: 0 0 30px; font-size: 19px;">Gwnaethoch ddewis cael hysbysiadau di-bapur.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth adran Ddigidol CThEF</p>
+}
\ No newline at end of file
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss_cy.scala.txt
new file mode 100644
index 000000000..e59a4f41e
--- /dev/null
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/new_message_alert_m08a_ioss_cy.scala.txt
@@ -0,0 +1,19 @@
+@(params: Map[String, Any])Mae gennych neges newydd oddi wrth CThEF
+
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.salutation(params, isWelsh=true)
+
+Mae gennych neges newydd oddi wrth CThEF.
+
+I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.
+
+Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.
+
+Pam y cawsoch yr e-bost hwn
+
+Gwnaethoch ddewis cael hysbysiadau di-bapur.
+
+Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.
+
+Oddi wrth adran Ddigidol CThEF
+
+@{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer_cy()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/itsa/ItsaTemplates.scala b/app/uk/gov/hmrc/hmrcemailrenderer/templates/itsa/ItsaTemplates.scala
index f0f8d4348..2cfa0ad06 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/itsa/ItsaTemplates.scala
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/itsa/ItsaTemplates.scala
@@ -271,7 +271,7 @@ object ItsaTemplates {
       service = Itsa,
       subject = "Mae gennych neges newydd oddi wrth CThEF",
       plainTemplate = txt.new_message_alert_itsapoa_cn_cy.f,
-      htmlTemplate = html.new_message_alert_itsapoa_cn.f,
+      htmlTemplate = html.new_message_alert_itsapoa_cn_cy.f,
       priority = Some(MessagePriority.Standard)
     ),
     MessageTemplate.create(
diff --git a/test/uk/gov/hmrc/hmrcemailrenderer/templates/TemplateLocatorSpec.scala b/test/uk/gov/hmrc/hmrcemailrenderer/templates/TemplateLocatorSpec.scala
index 52c65ade9..9e63c6a5d 100644
--- a/test/uk/gov/hmrc/hmrcemailrenderer/templates/TemplateLocatorSpec.scala
+++ b/test/uk/gov/hmrc/hmrcemailrenderer/templates/TemplateLocatorSpec.scala
@@ -139,7 +139,8 @@ class TemplateLocatorSpec extends AnyWordSpecLike with should.Matchers with Opti
         "HIPP",
         "Penalty Reform",
         FeedbackTemplates.id,
-        "DASS"
+        "DASS",
+        "IOSS"
       )
     }
 
@@ -997,7 +998,35 @@ class TemplateLocatorSpec extends AnyWordSpecLike with should.Matchers with Opti
         "hipp_production_access_approved_email",
         "hipp_production_access_rejected_email",
         "hipp_new_production_access_request_email",
-        "hipp_production_access_request_submitted_email"
+        "hipp_production_access_request_submitted_email",
+        "new_message_alert_ioss",
+        "new_message_alert_ioss_cy",
+        "new_message_alert_m01_ioss",
+        "new_message_alert_m01_ioss_cy",
+        "new_message_alert_m01a_ioss",
+        "new_message_alert_m01a_ioss_cy",
+        "new_message_alert_m02_ioss",
+        "new_message_alert_m02_ioss_cy",
+        "new_message_alert_m02a_ioss",
+        "new_message_alert_m02a_ioss_cy",
+        "new_message_alert_m04_ioss",
+        "new_message_alert_m04_ioss_cy",
+        "new_message_alert_m05_ioss",
+        "new_message_alert_m05_ioss_cy",
+        "new_message_alert_m05a_ioss",
+        "new_message_alert_m05a_ioss_cy",
+        "new_message_alert_m06_ioss",
+        "new_message_alert_m06_ioss_cy",
+        "new_message_alert_m06a_ioss",
+        "new_message_alert_m06a_ioss_cy",
+        "new_message_alert_m07_ioss",
+        "new_message_alert_m07_ioss_cy",
+        "new_message_alert_m07a_ioss",
+        "new_message_alert_m07a_ioss_cy",
+        "new_message_alert_m08_ioss",
+        "new_message_alert_m08_ioss_cy",
+        "new_message_alert_m08a_ioss",
+        "new_message_alert_m08a_ioss_cy"
       )
     }
   }
diff --git a/test/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/NewMessageAlert_IOSSSpec.scala b/test/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/NewMessageAlert_IOSSSpec.scala
new file mode 100644
index 000000000..eb7c4c604
--- /dev/null
+++ b/test/uk/gov/hmrc/hmrcemailrenderer/templates/ioss/NewMessageAlert_IOSSSpec.scala
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2023 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.hmrc.hmrcemailrenderer.templates.ioss
+
+import org.scalatestplus.play.PlaySpec
+import uk.gov.hmrc.hmrcemailrenderer.domain.{ MessagePriority, MessageTemplate }
+import uk.gov.hmrc.hmrcemailrenderer.templates.CommonParamsForSpec
+import uk.gov.hmrc.hmrcemailrenderer.templates.ServiceIdentifier.Ioss
+
+class NewMessageAlert_IOSSSpec extends PlaySpec with CommonParamsForSpec {
+
+  "NewMessageAlert_IOSS" must {
+
+    val newMessageAlert: MessageTemplate = MessageTemplate.create(
+      templateId = "new_message_alert_ioss",
+      fromAddress = "HMRC@tax.service.gov.uk",
+      service = Ioss,
+      subject = "You’ve got a new message from HMRC",
+      plainTemplate = txt.new_message_alert_ioss.f,
+      htmlTemplate = html.new_message_alert_ioss.f,
+      priority = Some(MessagePriority.Standard)
+    )
+
+    "include correct subject" in {
+      newMessageAlert.subject(commonParameters) mustBe "You’ve got a new message from HMRC"
+    }
+
+    "include htmlTemplate body and footer" in {
+      val htmlContent = newMessageAlert
+        .htmlTemplate(commonParameters ++ Map("recipientName_surname" -> "John", "recipientName_title" -> "Mrs"))
+        .toString
+      htmlContent must include("You’ve got a new message from HMRC")
+      htmlContent must include("Dear")
+      htmlContent must include("Mrs John")
+      htmlContent must include("You have a new message from HMRC.")
+      htmlContent must include("To view it, sign in to your HMRC online account.")
+      htmlContent must include("For security reasons, we have not included a link with this email.")
+      htmlContent must include("Why you got this email")
+      htmlContent must include("You chose to get paperless notifications.")
+      htmlContent must include("This means we send you an email when you have a new message in your account.")
+      htmlContent must include("From HMRC digital")
+      htmlContent must include("If you&#8217;re unsure an email is from HMRC:")
+      htmlContent must include("Do not reply to it or click on any links")
+      htmlContent must include(
+        "Report the suspicious email to HMRC - to find out how, go to GOV.UK and search for 'Avoid and report internet scams and phishing'")
+    }
+  }
+
+  "NewMessageAlert_ioss_cy welsh template" must {
+
+    val newMessageAlert: MessageTemplate = MessageTemplate.create(
+      templateId = "newMessageAlert_ioss_cy",
+      fromAddress = "HMRC@tax.service.gov.uk",
+      service = Ioss,
+      subject = "Mae gennych neges newydd oddi wrth CThEF",
+      plainTemplate = txt.new_message_alert_ioss_cy.f,
+      htmlTemplate = html.new_message_alert_ioss_cy.f,
+      priority = Some(MessagePriority.Standard)
+    )
+
+    "include correct subject" in {
+      newMessageAlert.subject(commonParameters) mustBe "Mae gennych neges newydd oddi wrth CThEF"
+    }
+
+    "include htmlTemplate body and footer" in {
+      val htmlContent = newMessageAlert
+        .htmlTemplate(commonParameters ++ Map("recipientName_surname" -> "John", "recipientName_title" -> "Mrs"))
+        .toString
+      htmlContent must include("Mae gennych neges newydd oddi wrth CThEF")
+      htmlContent must include("Annwyl")
+      htmlContent must include("Mrs John")
+      htmlContent must include("Mae gennych neges newydd oddi wrth CThEF.")
+      htmlContent must include("I’w gweld, mewngofnodwch i’ch cyfrif CThEF ar-lein.")
+      htmlContent must include("Am resymau diogelwch, nid ydym wedi cynnwys cysylltiad gyda’r e-bost hwn.")
+      htmlContent must include("Pam y cawsoch yr e-bost hwn")
+      htmlContent must include("Gwnaethoch ddewis cael hysbysiadau di-bapur.")
+      htmlContent must include(
+        "Mae hyn yn golygu ein bod yn anfon e-bost atoch pan fydd gennych neges newydd yn eich cyfrif.")
+      htmlContent must include("Oddi wrth adran Ddigidol CThEF")
+      htmlContent must include("Os nad ydych yn siŵr a yw e-bost wedi dod oddi wrth CThEF:")
+      htmlContent must include("Peidiwch ag ymateb iddo na chlicio ar unrhyw gysylltiadau")
+      htmlContent must include(
+        "Rhowch wybod i CThEF am yr e-bost amheus - er mwyn gweld sut, ewch i GOV.UK a chwilio am ‘gwe-rwydo a sgamiau’")
+    }
+  }
+
+}