diff --git a/core/email.class.inc.php b/core/email.class.inc.php
index 8bd7b147f..d929cb887 100644
--- a/core/email.class.inc.php
+++ b/core/email.class.inc.php
@@ -154,7 +154,7 @@ class EMail implements iEMail
 	 */
 	public function SetInReplyTo(string $sMessageId)
 	{
-		$this->AddToHeader('In-Reply-To', $sMessageId);
+		$this->oMailer->SetInReplyTo($sMessageId);
 	}
 
 	public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null)
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
index 799a111ab..2e6a8e531 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
@@ -75,14 +75,16 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:DeliveryModel/Attribute:description' => 'Popis',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Název',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organizace',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Název organizace',
 	'Class:DeliveryModel/Attribute:organization_name+' => '',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Model poskytování služeb',
 	'Class:Organization/Attribute:deliverymodel_id+' => '',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Název modelu poskytování služeb',
+	'Class:Organization/Attribute:deliverymodel_name+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:ProviderContract' => 'Smlouva s poskytovatelem',
 	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:contracttype_id' => 'Typ smlouvy',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
index e9f4f1b3d..4c647584e 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
@@ -74,14 +74,16 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:DeliveryModel/Attribute:description' => 'Beskrivelse',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Navn',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Organisations navn',
 	'Class:DeliveryModel/Attribute:organization_name+' => '',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Leverings model',
 	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Leverings model navn',
+	'Class:Organization/Attribute:deliverymodel_name+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:ProviderContract' => 'Leverandør kontrakt',
 	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:contracttype_id' => 'Kontrakt type',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
index ffc9d1bf3..c38e64f5d 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
@@ -74,14 +74,16 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:DeliveryModel/Attribute:description' => 'Beschreibung',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Name',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Organizations-Name',
 	'Class:DeliveryModel/Attribute:organization_name+' => '',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery-Modell',
 	'Class:Organization/Attribute:deliverymodel_id+' => '',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery-Modell-Name',
+	'Class:Organization/Attribute:deliverymodel_name+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:ProviderContract' => 'Provider-Vertrag',
 	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:contracttype_id' => 'Vertragstyp',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
index dc9906b30..794f401a0 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
@@ -73,7 +73,8 @@ Dict::Add('EN US', 'English', 'English', array(
 
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
 ));
 
@@ -477,9 +478,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:DeliveryModel' => 'Delivery Model',
 	'Class:DeliveryModel+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Name',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organization',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name',
 	'Class:DeliveryModel/Attribute:description' => 'Description',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
index 431f6b7eb..f11a203e4 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
@@ -74,14 +74,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:DeliveryModel/Attribute:description' => 'Descripción',
 	'Class:DeliveryModel/Attribute:description+' => 'Descripción',
 	'Class:DeliveryModel/Attribute:name' => 'Nombre',
-	'Class:DeliveryModel/Attribute:name+' => 'Nombre del Modelo de Entrega',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organización',
-	'Class:DeliveryModel/Attribute:org_id+' => 'Organización',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Organización',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Organización',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo de Entrega',
 	'Class:Organization/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Nombre del Modelo de Entrega',
+	'Class:Organization/Attribute:deliverymodel_name+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:ProviderContract' => 'Contrato con Proveedor',
 	'Class:ProviderContract+' => 'Contrato con Proveedor',
 	'Class:ProviderContract/Attribute:contracttype_id' => 'Tipo de Contrato',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
index fa6264bd4..063486e92 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
@@ -78,14 +78,14 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:DeliveryModel/Attribute:customers_list/UI:Links:Remove:Modal:Title' => 'Retirer ce %4$s de son %1$s',
 	'Class:DeliveryModel/Attribute:description' => 'Description',
 	'Class:DeliveryModel/Attribute:description+' => '',
-	'Class:DeliveryModel/Attribute:name' => 'Nom Modèle de support',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name' => 'Nom du modèle de support',
+	'Class:DeliveryModel/Attribute:name+' => 'Attachez à ce modèle les équipes qui géreront les tickets',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Généralement le fournisseur des services',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Nom organisation',
 	'Class:DeliveryModel/Attribute:organization_name+' => '',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Modèle de support',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'C\'est indispensable pour définir les équipes auxquelles les tickets pourront être assignés',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Nom modèle de support',
 	'Class:ProviderContract' => 'Contrat fournisseur',
 	'Class:ProviderContract+' => '',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
index 51733c52b..577ae6f8b 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
@@ -73,14 +73,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:DeliveryModel/Attribute:description' => 'Leírás',
 	'Class:DeliveryModel/Attribute:description+' => '~~',
 	'Class:DeliveryModel/Attribute:name' => 'Teljesítési modell név',
-	'Class:DeliveryModel/Attribute:name+' => '~~',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Szervezeti egység',
-	'Class:DeliveryModel/Attribute:org_id+' => '~~',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Szervezeti egység név',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Általános név',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Teljesítési modell',
 	'Class:Organization/Attribute:deliverymodel_id+' => 'Ki kinek szolgáltat',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Teljesítési modell név',
+	'Class:Organization/Attribute:deliverymodel_name+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:ProviderContract' => 'Szolgáltatói szerződés',
 	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:contracttype_id' => 'Szerződéstípus',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
index 3f86b0e35..e3ee9bec4 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
@@ -73,13 +73,14 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:DeliveryModel/Attribute:description' => 'Descrizione',
 	'Class:DeliveryModel/Attribute:description+' => '~~',
 	'Class:DeliveryModel/Attribute:name' => 'Nome',
-	'Class:DeliveryModel/Attribute:name+' => '~~',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organizzazione',
-	'Class:DeliveryModel/Attribute:org_id+' => '~~',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Nome dell\'Organizzazione',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name~~',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Modello di Consegna',
-	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Nome del Modello di Consegna',
 	'Class:ProviderContract' => 'Contratto con Provider',
 	'Class:ProviderContract+' => '~~',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
index 159fbdaa9..c0125d8ba 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
@@ -73,13 +73,14 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:DeliveryModel/Attribute:description' => '説明',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:name' => '名前',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => '組織',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => '組織名',
 	'Class:DeliveryModel/Attribute:organization_name+' => '共通名',
 	'Class:Organization/Attribute:deliverymodel_id' => '提供モデル',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:Organization/Attribute:deliverymodel_name' => '提供モデル名',
 	'Class:ProviderContract' => 'プロバイダー契約',
 	'Class:ProviderContract+' => '',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
index daab67078..eaab86915 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
@@ -76,13 +76,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:DeliveryModel/Attribute:description' => 'Omschrijving',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Naam',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organisatie',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Naam organisatie',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Naam van de organisatie',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Leveringsmodel',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Naam leveringsmodel',
 	'Class:ProviderContract' => 'Leverancierscontract',
 	'Class:ProviderContract+' => '',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php
index e2ce118f1..79004dae1 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php
@@ -73,13 +73,14 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:DeliveryModel/Attribute:description' => 'Opis',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Nazwa',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organizacja',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Nazwa organizacji',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Nazwa zwyczajowa',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Model obsługi',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Nazwa modelu obsługi',
 	'Class:ProviderContract' => 'Umowa z dostawcą',
 	'Class:ProviderContract+' => '',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
index 62f3805b9..1dcfdde92 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
@@ -73,13 +73,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:DeliveryModel/Attribute:description' => 'Descrição',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Nome',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organização',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Nome da organização',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Nome comum',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo de entrega',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Nome do modelo de entrega',
 	'Class:ProviderContract' => 'Contrato de provedor',
 	'Class:ProviderContract+' => '',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
index dc9ca0241..df7c56710 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
@@ -74,13 +74,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:DeliveryModel/Attribute:description' => 'Описание',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Название',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Организация',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Организация',
 	'Class:DeliveryModel/Attribute:organization_name+' => '',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Модель предоставления услуг',
-	'Class:Organization/Attribute:deliverymodel_id+' => 'Модель предоставления услуг (Delivery Model)',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Модель предоставления услуг',
 	'Class:ProviderContract' => 'Договор с поставщиком',
 	'Class:ProviderContract+' => '',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
index ab592a07c..a555f9843 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
@@ -73,13 +73,14 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:DeliveryModel/Attribute:description' => 'Popis',
 	'Class:DeliveryModel/Attribute:description+' => '~~',
 	'Class:DeliveryModel/Attribute:name' => 'Názov',
-	'Class:DeliveryModel/Attribute:name+' => '~~',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organizácia',
-	'Class:DeliveryModel/Attribute:org_id+' => '~~',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Názov organizácie',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name~~',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Model dodávky',
-	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Názov modelu dodávky',
 	'Class:ProviderContract' => 'Poskytovateľská zmluva',
 	'Class:ProviderContract+' => '~~',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
index 98bdd1268..e4a0d783e 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
@@ -74,13 +74,14 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:DeliveryModel/Attribute:description' => 'Açıklama',
 	'Class:DeliveryModel/Attribute:description+' => '~~',
 	'Class:DeliveryModel/Attribute:name' => 'İsim',
-	'Class:DeliveryModel/Attribute:name+' => '~~',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organizasyon',
-	'Class:DeliveryModel/Attribute:org_id+' => '~~',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Organizasyon Adı',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Ortak Adı',
 	'Class:Organization/Attribute:deliverymodel_id' => 'Teslimat Modeli',
-	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Teslimat Modeli Adı',
 	'Class:ProviderContract' => 'Tedarikçi Sözleşmesi',
 	'Class:ProviderContract+' => '',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
index dba0beb49..2e6574acd 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
@@ -73,13 +73,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:DeliveryModel/Attribute:description' => '描述',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:name' => '名称',
-	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => '组织',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => '组织名称',
 	'Class:DeliveryModel/Attribute:organization_name+' => '通用名称',
 	'Class:Organization/Attribute:deliverymodel_id' => '交付模式',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'This is required for Tickets handling.
+The delivery model specifies the teams to which tickets can be assigned.~~',
 	'Class:Organization/Attribute:deliverymodel_name' => '交付模式名称',
 	'Class:ProviderContract' => '供应商合同',
 	'Class:ProviderContract+' => '',
diff --git a/sources/Core/Email/EmailLaminas.php b/sources/Core/Email/EmailLaminas.php
index 6a5cab3db..b746485fb 100644
--- a/sources/Core/Email/EmailLaminas.php
+++ b/sources/Core/Email/EmailLaminas.php
@@ -18,6 +18,8 @@ use ExecutionKPI;
 use InlineImage;
 use IssueLog;
 use Laminas\Mail\Header\ContentType;
+use Laminas\Mail\Header\InReplyTo;
+use Laminas\Mail\Header\MessageId;
 use Laminas\Mail\Message;
 use Combodo\iTop\Core\Authentication\Client\Smtp\Oauth;
 use Laminas\Mail\Transport\File;
@@ -374,11 +376,11 @@ class EMailLaminas extends Email
 	{
 		$this->m_aData['message_id'] = $sId;
 
-		// Note: Swift will add the angle brackets for you
+		// Note: The email library will add the angle brackets for you
 		// so let's remove the angle brackets if present, for historical reasons
 		$sId = str_replace(array('<', '>'), '', $sId);
 
-		$this->m_oMessage->getHeaders()->addHeaderLine('Message-ID', $sId);
+		$this->m_oMessage->getHeaders()->addHeader((new MessageId())->setId($sId));
 	}
 
 	public function SetReferences($sReferences)
@@ -397,7 +399,11 @@ class EMailLaminas extends Email
 	 */
 	public function SetInReplyTo(string $sMessageId)
 	{
-		$this->AddToHeader('In-Reply-To', $sMessageId);
+		// Note: Laminas will add the angle brackets for you
+		// so let's remove the angle brackets if present, for historical reasons
+		$sId = str_replace(array('<', '>'), '', $sMessageId);
+
+		$this->m_oMessage->getHeaders()->addHeader((new InReplyTo())->setIds([$sId]));
 	}
 
 	/**