diff --git a/htdocs/core/ajax/mailtemplate.php b/htdocs/core/ajax/mailtemplate.php
index 85b30f14bf6..5ac260b03bb 100644
--- a/htdocs/core/ajax/mailtemplate.php
+++ b/htdocs/core/ajax/mailtemplate.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2024 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+/* Copyright (C) 2024-2025 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024      Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -91,11 +91,24 @@ if (GETPOSTISSET('template')) {
 		'__LAST_NEWS__'   => $langs->trans('LastNews'),
 		'__LIST_PRODUCTS___' => $langs->trans('ListProducts'),
 		'__SUBJECT__' => GETPOST('subject'),
-		'__MYCOMPANY_SOCIAL_NETWORKS__' => 'TODO Generate list of enabled social network',
+		// vars for company
 		'__MYCOMPANY_ADDRESS__' => $mysoc->getFullAddress(0, '<br>', 1, $langs),
 		'__MYCOMPANY_EMAIL__' => $mysoc->email,
+		'__MYCOMPANY_PHONE_PRO__' => $mysoc->phone_pro,
+		'__MYCOMPANY_PHONE_MOBILE__' => $mysoc->phone_mobile,
+		'__MYCOMPANY_FAX__' => $mysoc->fax,
+		'__MYCOMPANY_EMAIL__' => $mysoc->email,
 	);
 
+	$listsocialnetworks = '';
+	// TODO Add a column imgsrcdata into llx_c_socialnetworks to store the src data for image of the social network in black on a white background.
+	/*
+	foreach($mysoc->socialnetworks as $snkey => $snval) {
+		$listsocialnetworks .= $snkey;
+	}
+	*/
+	$specificSubstitutionArray['__MYCOMPANY_SOCIAL_NETWORKS__'] = $listsocialnetworks;
+
 	if (!empty($mysoc->logo) && dol_is_file($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 		$specificSubstitutionArray['__LOGO_URL__'] = $urlwithroot.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
 	} else {
@@ -116,7 +129,6 @@ if (GETPOSTISSET('template')) {
 	}
 
 
-
 	// Must replace
 	// __SUBJECT__, __CONTENTOFMAILHOLDER__, __USERSIGNATURE__, __NEWS_LIST__, __PRODUCTS_LIST__
 	foreach ($specificSubstitutionArray as $key => $val) {
@@ -124,7 +136,11 @@ if (GETPOSTISSET('template')) {
 	}
 
 	// Parse all strings __(...)__ to replace with the translated value $langs->trans("...")
-	// TODO
+	$langs->load("other");
+	$content = preg_replace_callback('/__\((.+)\)__/', function ($matches) {
+		global $langs;
+		return $langs->trans($matches[1]);
+	}, $content);
 
 
 	$selectedPostsStr = GETPOST('selectedPosts', 'alpha');
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 65509e6b203..6289e924ccd 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1500,10 +1500,11 @@ class FormMail extends Form
 	 */
 	public function getEmailLayoutSelector($htmlContent = 'message', $showlinktolayout = 'email')
 	{
-		global $websitepage, $langs;
+		global $conf, $db, $websitepage, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/emaillayout.lib.php';
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
 		$out = '<div id="template-selector" class="template-selector email-layout-container hidden" style="display:none;">';
@@ -1544,19 +1545,39 @@ class FormMail extends Form
 		// Prepare the array for multiselect
 
 		// Fetch blogs
-		$websitepage = new WebsitePage($this->db);
-		$arrayofblogs = $websitepage->fetchAll('', 'DESC', 'date_creation', 0, 0, array('type_container' => 'blogpost'));
-
 		$blogArray = array();
-		if (!empty($arrayofblogs)) {
-			foreach ($arrayofblogs as $blog) {
-				$blogArray[$blog->id] = substr(htmlentities($blog->title), 0, 30);
+		if (isModEnabled('website')) {
+			$websitepage = new WebsitePage($this->db);
+			$arrayofblogs = $websitepage->fetchAll('', 'ASC,DESC', 'fk_website,date_creation', 0, 0, array('type_container' => 'blogpost'));
+
+			if (empty($conf->cache['websiteurl'])) {
+				$conf->cache['websiteurl'] = array();
+			}
+
+			if (!empty($arrayofblogs)) {
+				foreach ($arrayofblogs as $blog) {
+					if (!isset($conf->cache['websiteurl'][$blog->id])) {
+						$tmpwebsite = new Website($db);
+						$tmpwebsite->fetch($blog->fk_website);
+						$conf->cache['websiteurl'][$blog->fk_website] = (empty($tmpwebsite->virtualhost) ? $tmpwebsite->ref : $tmpwebsite->virtualhost);
+					}
+
+					$labelwebsite = $conf->cache['websiteurl'][$blog->fk_website];
+					//$blog->fk_website
+
+					$blogArray[$blog->id] = array(
+						'id' => $blog->id,
+						'label' => '['.$labelwebsite.' '.$blog->type_container.' '.$blog->id.'] '.dol_trunc($blog->title, 40),
+						'data-html' => '<span class="opacitymedium">['.$labelwebsite.' '.$blog->type_container.' '.$blog->id.']</span> '.dol_trunc($blog->title, 40),
+					);
+				}
 			}
 		}
 
 		// Use the multiselect array function to create the dropdown
 		$out .= '<div id="post-dropdown-container" class="email-layout-container hidden" style="display:none;">';
 		$out .= '<label for="blogpost-select">Select Posts: </label>';
+		$out .= '<!-- select component for selection of products -->'."\n";
 		$out .= self::multiselectarray('blogpost-select', $blogArray, array(), 0, 0, 'minwidth200');
 		$out .= '</div>';
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 830667258f3..55e03bbafdb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3511,7 +3511,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 	// See format of addresses on https://en.wikipedia.org/wiki/Address
 	// Address
 	if (empty($mode)) {
-		$ret .= ($extralangcode ? $object->array_languages['address'][$extralangcode] : (empty($object->address) ? '' : preg_replace('/(\r\n|\r|\n)+/', $sep, $object->address)));
+		$ret .= (($extralangcode && !empty($object->array_languages['address'][$extralangcode])) ? $object->array_languages['address'][$extralangcode] : (empty($object->address) ? '' : preg_replace('/(\r\n|\r|\n)+/', $sep, $object->address)));
 	}
 	// Zip/Town/State
 	if (isset($object->country_code) && in_array($object->country_code, array('AU', 'CA', 'US', 'CN')) || getDolGlobalString('MAIN_FORCE_STATE_INTO_ADDRESS')) {
@@ -3556,7 +3556,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		$ret .= (empty($object->state_code) ? '' : (' '.$object->state_code));
 	} else {
 		// Other: title firstname name \n address lines \n zip town[, state] \n country
-		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : (empty($object->town) ? '' : $object->town));
+		$town = (($extralangcode && !empty($object->array_languages['address'][$extralangcode])) ? $object->array_languages['town'][$extralangcode] : (empty($object->town) ? '' : $object->town));
 		$ret .= !empty($object->zip) ? (($ret ? $sep : '').$object->zip) : '';
 		$ret .= ($town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$town) : '');
 		if (!empty($object->state) && in_array($object->country_code, $countriesusingstate)) {
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index c204f9adde5..267f82b3af1 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -1392,6 +1392,10 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
  */
 function getImageFromHtmlContent($htmlContent, $imageNumber = 1)
 {
+	if (empty($htmlContent)) {
+		return '';
+	}
+
 	$dom = new DOMDocument();
 
 	libxml_use_internal_errors(false);	// Avoid to fill memory with xml errors
diff --git a/htdocs/install/doctemplates/maillayout/products.html b/htdocs/install/doctemplates/maillayout/products.html
index 76b93a8689a..abb39ae30a8 100644
--- a/htdocs/install/doctemplates/maillayout/products.html
+++ b/htdocs/install/doctemplates/maillayout/products.html
@@ -6,13 +6,13 @@ body {
 }
 </style>
 
-<div style="background-color: #e2f3fd; padding: 0; margin-top:-10px; margin-bottom:-20px; margin-left:-10px; margin-right:-10px; width:calc(100% + 20px)">
+<div style="background-color: #e2f3fd; padding: 0; margin-top:-10px; margin-bottom:-20px; margin-left:-10px; margin-right:-10px; width: 100%">
         <div style="width: 680px; margin: 0 auto; background-color: #e2f3fd;">
 
         <div style="width: 100%; height: 50px; background-color: unset;">
         </div>
 
-        <div style="border-top-left-radius: 20px; border-top-right-radius: 20px; box-shadow: 0px 0px 20px #aaa;">
+        <div style="border-top-left-radius: 20px; border-top-right-radius: 20px; border-bottom-left-radius: 20px; border-bottom-right-radius: 20px; box-shadow: 0px 0px 20px #aaa;">
 	        <div style="border-top-left-radius: 20px; border-top-right-radius: 20px; width: calc(100% - 60px); background-color: white; padding: 30px; text-align: center;">
 	                <img src="__LOGO_URL__" style="height: 75px; max-width: 400px; border-radius: 4px;">
 	        </div>
@@ -29,7 +29,7 @@ body {
 			<!-- PRODUCTS_END -->
 
 	        </div>
-	    	<div style="width: calc(100% - 60px); background-color: #263c5a; color: #fff; padding: 30px;">
+	    	<div style="width: calc(100% - 60px); border-bottom-left-radius: 20px; border-bottom-right-radius: 20px; background-color: #263c5a; color: #fff; padding: 30px;">
 	       	__MYCOMPANY_SOCIAL_NETWORKS__
 	       	<hr>
 	       	__MYCOMPANY_ADDRESS__<br>
@@ -37,7 +37,7 @@ body {
 	       	</div>
         </div>
 
-		<div style="width: 100%; height: 100px; background-color: unset;">
+		<div style="width: 100%; height: 100px; background-color: unset; text-align: center;">
         __CHECK_READ__
         </div>
 
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 48a565842f8..1b435a28aca 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -379,3 +379,4 @@ TLSv1.2=TLSv1.2
 TLS/STARTTLS=TLS/STARTTLS
 FillExtrafieldWithAi=Fill extrafield with AI content
 ExtrafieldFiller=Extrafield filler
+OurProductSelection=Our selection of new products
diff --git a/htdocs/website/lib/website.lib.php b/htdocs/website/lib/website.lib.php
index a7b04c66122..4a25bdc8a8d 100644
--- a/htdocs/website/lib/website.lib.php
+++ b/htdocs/website/lib/website.lib.php
@@ -32,7 +32,7 @@
  */
 function websiteconfigPrepareHead($object)
 {
-	global $db, $langs, $conf;
+	global $langs, $conf;
 
 	$h = 0;
 	$head = array();