diff --git a/htdocs/core/ajax/mailtemplate.php b/htdocs/core/ajax/mailtemplate.php
index fd6981b8c7f..c8312095af7 100644
--- a/htdocs/core/ajax/mailtemplate.php
+++ b/htdocs/core/ajax/mailtemplate.php
@@ -55,6 +55,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
  * @var User $user
  */
 
+
 /*
  * View
  */
@@ -62,8 +63,39 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
 top_httphead();
 
 // TODO Replace with ID of template
-if (GETPOSTISSET('content')) {
-	$content = filter_input(INPUT_POST, 'content', FILTER_UNSAFE_RAW);
+if (GETPOSTISSET('template')) {
+	$templatefile = DOL_DOCUMENT_ROOT.'/install/doctemplates/maillayout/'.dol_sanitizeFileName(GETPOST('template')).'.html';
+
+	$content = file_get_contents($templatefile);
+
+	if ($content === false) {
+		print 'Failed to load template '.dol_escape_htmltag(GETPOST('template'));
+		exit;
+	}
+
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+
+	$specificSubstitutionArray = array(
+		'__LOGO_URL__' => !empty($mysoc->logo) && dol_is_file($conf->mycompany->dir_output.'/logos/'.$mysoc->logo) ? $urlwithroot.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo) : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC',
+		'__TITLEOFMAILHOLDER__' => $langs->trans('TitleOfMailHolder'),
+		'__CONTENTOFMAILHOLDER__' => 'Lorem ipsum ...',
+		'__USERSIGNATURE__' => !empty($user->signature) ? dol_htmlentities($user->signature) : '',
+		'__GRAY_RECTANGLE__' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC',
+		'__LAST_NEWS__'   => $langs->trans('LastNews'),
+		'__LIST_PRODUCTS___' => $langs->trans('ListProducts'),
+		'__SUBJECT__' => GETPOST('subject')
+	);
+
+	// Must replace
+	// __SUBJECT__, __CONTENTOFMAILHOLDER__, __USERSIGNATURE__, __NEWS_LIST__, __PRODUCTS_LIST__
+	foreach ($specificSubstitutionArray as $key => $val) {
+		$content = str_replace($key, $val, $content);
+	}
+
 
 	$selectedPostsStr = GETPOST('selectedPosts', 'alpha');
 	$selectedPosts = explode(',', $selectedPostsStr);
@@ -93,8 +125,7 @@ if (GETPOSTISSET('content')) {
 		$content = str_replace('__NEWS_LIST__', 'No articles selected', $content);
 	}
 
-
 	print $content;
 } else {
-	print 'No content provided or invalid token';
+	print 'No template ID provided or expired token';
 }
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index b91c894773e..11a7f21645b 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1560,25 +1560,20 @@ class FormMail extends Form
 		$out .= '</div>';
 
 		$out .= '<script type="text/javascript">
-      $(document).ready(function() {
-        $(".template-option").click(function() {
-          var template = $(this).data("template");
-          var subject = jQuery("#subject").val();
-          var fromtype = jQuery("#fromtype").val();
-          var sendto = jQuery("#sendto").val();
-          var sendtocc = jQuery("#sendtocc").val();
-          var sendtoccc = jQuery("#sendtoccc").val();
+      	$(document).ready(function() {
+        	$(".template-option").click(function() {
+				var template = $(this).data("template");
+				var subject = jQuery("#subject").val();
+				var fromtype = jQuery("#fromtype").val();
+				var sendto = jQuery("#sendto").val();
+				var sendtocc = jQuery("#sendtocc").val();
+				var sendtoccc = jQuery("#sendtoccc").val();
 
 				console.log("We choose a layout for email template=" + template + ", subject="+subject);
 
 				$(".template-option").removeClass("selected");
 				$(this).addClass("selected");
 
-				var subject = $("#sujet").val();
-
-				var contentHtml = $(this).data("content");
-				contentHtml = contentHtml.replace(/__SUBJECT__/g, subject);
-
 				if (template === "news") {
 					$("#post-dropdown-container").show();
 					console.log("Displaying dropdown for news template");
@@ -1631,7 +1626,7 @@ class FormMail extends Form
 					},
 					success: function(response) {
 						var selectedPosts = JSON.parse(response);
-						var subject = $("#sujet").val();
+						var subject = $("#subject").val();
 
 						contentHtml = contentHtml.replace(/__SUBJECT__/g, subject);
 
diff --git a/htdocs/core/lib/emaillayout.lib.php b/htdocs/core/lib/emaillayout.lib.php
index 55d4d620a42..90ecdb61f59 100644
--- a/htdocs/core/lib/emaillayout.lib.php
+++ b/htdocs/core/lib/emaillayout.lib.php
@@ -37,7 +37,7 @@ function getHtmlOfLayout($name)
 	$specificSubstitutionArray = array(
 		'__LOGO_URL__' => !empty($mysoc->logo) && dol_is_file($conf->mycompany->dir_output.'/logos/'.$mysoc->logo) ? DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo) : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC',
 		'__TITLEOFMAILHOLDER__' => $langs->trans('TitleOfMailHolder'),
-		'__CONTENOFMAILHOLDER__' => $langs->trans('ContentOfMailHolder'),
+		'__CONTENTOFMAILHOLDER__' => $langs->trans('ContentOfMailHolder'),
 		'__USERSIGNATURE__' => !empty($user->signature) ? dol_htmlentities($user->signature) : '',
 		'__GRAY_RECTANGLE__' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC',
 		'__LAST_NEWS__'   => $langs->trans('LastNews'),
diff --git a/htdocs/install/doctemplates/maillayout/basic.html b/htdocs/install/doctemplates/maillayout/basic.html
index 15298cc62e4..7884e03db4f 100644
--- a/htdocs/install/doctemplates/maillayout/basic.html
+++ b/htdocs/install/doctemplates/maillayout/basic.html
@@ -1,10 +1,12 @@
+
+
 <div>
-    <div style="text-align:center; padding: 20px;">
+    <div">
         <img src="__LOGO_URL__" style="height: 150px; max-width: 400px; border-radius: 4px;">
     </div>
     <h2>__SUBJECT__</h2>
     <div class="email-template-text">
-        <p>__CONTENOFMAILHOLDER__</p>
+        <p>__CONTENTOFMAILHOLDER__</p>
     </div>
 
     <br>
diff --git a/htdocs/install/doctemplates/maillayout/news.html b/htdocs/install/doctemplates/maillayout/news.html
index dff07807d46..429a92112e2 100644
--- a/htdocs/install/doctemplates/maillayout/news.html
+++ b/htdocs/install/doctemplates/maillayout/news.html
@@ -14,7 +14,7 @@ body {
 
         <div style="border-top-left-radius: 20px; border-top-right-radius: 20px; box-shadow: 0px 0px 20px #aaa;">
 	        <div style="width: calc(100% - 60px); background-color: white; padding: 30px; text-align: center;">
-	                Logo
+	                <img src="__LOGO_URL__" style="height: 150px; max-width: 400px; border-radius: 4px;">
 	        </div>
 	        <div style="width: calc(100% - 60px); background-color: #e2f3fd; padding: 30px;">
 	        Hello
@@ -22,7 +22,7 @@ body {
 	        <div style="width: calc(100% - 60px); background-color: #fff; padding: 30px;">
 
 			<h1>__LAST_NEWS__</h1>
-			<h2>__CONTENOFMAILHOLDER__ </h2>
+			<h2>__CONTENTOFMAILHOLDER__ </h2>
 
 			<!-- NEWS_START -->
 			__NEWS_LIST__
diff --git a/htdocs/install/doctemplates/maillayout/products.html b/htdocs/install/doctemplates/maillayout/products.html
index cda8f6ef2e1..1e4423f8c1e 100644
--- a/htdocs/install/doctemplates/maillayout/products.html
+++ b/htdocs/install/doctemplates/maillayout/products.html
@@ -14,7 +14,7 @@ body {
 
         <div style="border-top-left-radius: 20px; border-top-right-radius: 20px; box-shadow: 0px 0px 20px #aaa;">
 	        <div style="width: calc(100% - 60px); background-color: white; padding: 30px; text-align: center;">
-	                Logo
+	                <img src="__LOGO_URL__" style="height: 150px; max-width: 400px; border-radius: 4px;">
 	        </div>
 	        <div style="width: calc(100% - 60px); background-color: #e2f3fd; padding: 30px;">
 	        Hello
@@ -22,7 +22,7 @@ body {
 	        <div style="width: calc(100% - 60px); background-color: #fff; padding: 30px;">
 
 			<h1>__LAST_NEWS__</h1>
-			<h2>__CONTENOFMAILHOLDER__ </h2>
+			<h2>__CONTENTOFMAILHOLDER__ </h2>
 
 			<!-- PRODUCTS_START -->
 			__PRODUCTS_LIST__