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/parameters.yml.dist b/config/parameters.yml.dist
index 41c9a20b..fb44d2ea 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):
+    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): 2048
+
+    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): 'http'
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..e4e4086a
--- /dev/null
+++ b/src/Domain/Common/ExternalImageService.php
@@ -0,0 +1,177 @@
+<?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 ExternalImageService
+{
+    private string $externalCacheDir;
+
+    public function __construct(
+        private readonly ConfigProvider $configProvider,
+        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 (
+            !(str_starts_with($filename, 'http'))
+            || str_contains($filename, '://' . $this->configProvider->getValue(ConfigOption::Website) . '/')
+        ) {
+            return false;
+        }
+
+        if (!file_exists($this->externalCacheDir)) {
+            @mkdir($this->externalCacheDir);
+        }
+
+        if (!file_exists($this->externalCacheDir) || !is_writable($this->externalCacheDir)) {
+            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';
+            }
+
+            $cacheFileHandle = @fopen($cacheFileName, 'wb');
+            if ($cacheFileHandle !== false) {
+                if (flock($cacheFileHandle, LOCK_EX)) {
+                    fwrite($cacheFileHandle, $cacheFileContent);
+                    fflush($cacheFileHandle);
+                    flock($cacheFileHandle, LOCK_UN);
+                }
+                fclose($cacheFileHandle);
+            }
+        }
+
+        if (file_exists($cacheFileName) && (@filesize($cacheFileName) > 64)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function removeOldFilesInCache(): void
+    {
+        $extCacheDirHandle = @opendir($this->externalCacheDir);
+        if (!$this->externalImageMaxAge || !$extCacheDirHandle) {
+           return;
+        }
+
+        while (($cacheFile = @readdir($extCacheDirHandle)) !== false) {
+            // todo: make sure that this is what we need
+            if (!str_starts_with($cacheFile, '.')) {
+                $cacheFileMTime = @filemtime($this->externalCacheDir.'/'.$cacheFile);
+
+                if (
+                    is_numeric($cacheFileMTime)
+                    && ($cacheFileMTime > 0)
+                    && ((time() - $cacheFileMTime) > $this->externalImageMaxAge)
+                ) {
+                    @unlink($this->externalCacheDir.'/'.$cacheFile);
+                }
+            }
+        }
+
+        @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;
+    }
+}
diff --git a/src/Domain/Common/Html2Text.php b/src/Domain/Common/Html2Text.php
new file mode 100644
index 00000000..93705748
--- /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 (strpos($linkurl, '#') === 0) {
+                    $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);
+        }
+        $ww = $this->configProvider->getValue(ConfigOption::WordWrap) ?? self::WORD_WRAP;
+
+        return wordwrap($text, $ww);
+    }
+}
diff --git a/src/Domain/Common/HtmlUrlRewriter.php b/src/Domain/Common/HtmlUrlRewriter.php
new file mode 100644
index 00000000..bba0b46e
--- /dev/null
+++ b/src/Domain/Common/HtmlUrlRewriter.php
@@ -0,0 +1,190 @@
+<?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 ($url === '' || $url[0] === '#') return $url;
+        if (preg_match('/\[[^\]]+\]/', $url)) return $url;
+
+        // already has a scheme (http:, https:, mailto:, data:, etc.)
+        if (preg_match('#^[a-z][a-z0-9+.-]*:#i', $url)) return $url;
+
+        $base = parse_url($baseUrl);
+        if (!$base || empty($base['scheme']) || empty($base['host'])) {
+            // If base is invalid, bail out rather than corrupt URLs
+            return $url;
+        }
+
+        // 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);
+        }
+
+        if (str_starts_with($url, '/')) {
+            $path = $url;
+        } else {
+            $path = $basePath . $url;
+        }
+
+        $path = $this->normalizePath($path);
+
+        $port = isset($base['port']) ? ':' . $base['port'] : '';
+        return $base['scheme'] . '://' . $base['host'] . $port . $path;
+    }
+
+    function normalizePath(string $path): string
+    {
+        // Keep query/fragment if present
+        $parts = parse_url($path);
+        $p = $parts['path'] ?? $path;
+
+        $segments = explode('/', $p);
+        $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;
+    }
+
+    public 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 &$cand) {
+            if ($cand === '') continue;
+            // split at first whitespace: "url descriptor..."
+            if (preg_match('/^(\S+)(\s+.*)?$/', $cand, $m)) {
+                $u = $m[1];
+                $d = $m[2] ?? '';
+                $cand = $this->absolutizeUrl($u, $baseUrl) . $d;
+            }
+        }
+        return implode(', ', $candidates);
+    }
+
+    public function rewriteCssUrls(string $css, string $baseUrl): string
+    {
+        // url(...) handling (supports quotes or no quotes)
+        $css = preg_replace_callback(
+            '#url\(\s*(["\']?)(.*?)\1\s*\)#i',
+            function ($m) use ($baseUrl) {
+                $q = $m[1];
+                $u = $m[2];
+                $abs = $this->absolutizeUrl($u, $baseUrl);
+                return 'url(' . ($q !== '' ? $q : '') . $abs . ($q !== '' ? $q : '') . ')';
+            },
+            $css
+        );
+
+        // @import "..."; or @import url("..."); etc.
+        return preg_replace_callback(
+            '#@import\s+(?:url\()?(\s*["\']?)([^"\')\s;]+)\1\)?#i',
+            function ($m) use ($baseUrl) {
+                $q = trim($m[1]);
+                $u = $m[2];
+                $abs = $this->absolutizeUrl($u, $baseUrl);
+                // Preserve original form loosely
+                return str_starts_with($m[0], '@import url')
+                    ? '@import url(' . ($q ?: '') . $abs . ($q ?: '') . ')'
+                    : '@import ' . ($q ?: '') . $abs . ($q ?: '');
+            },
+            $css
+        );
+    }
+}
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..7be841e5
--- /dev/null
+++ b/src/Domain/Common/RemotePageFetcher.php
@@ -0,0 +1,121 @@
+<?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
+    {
+        //# fix the Editor replacing & with &amp;
+        $url = str_ireplace('&amp;', '&', $url);
+
+        foreach ($userData as $key => $val) {
+            if ($key !== 'password') {
+                $url = utf8_encode(str_ireplace("[$key]", urlencode($val), utf8_decode($url)));
+            }
+        }
+
+        $url = $this->expandUrl($url);
+        $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->entityManager->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, [
+//                'timeout' => 10,
+                'timeout' => 600,
+                'allowRedirects' => 1,
+                'method' => 'HEAD',
+            ]);
+
+            return $response->getContent(false);
+        } catch (Throwable $e) {
+            return '';
+        }
+    }
+
+    private function expandURL(string $url): string
+    {
+        $url_append = $this->configProvider->getValue(ConfigOption::RemoteUrlAppend);
+        $url_append = strip_tags($url_append);
+        $url_append = preg_replace('/\W/', '', $url_append);
+        if ($url_append) {
+            if (strpos($url, '?')) {
+                $url = $url.$url_append;
+            } else {
+                $url = $url.'?'.$url_append;
+            }
+        }
+
+        return $url;
+    }
+}
+
diff --git a/src/Domain/Common/TextParser.php b/src/Domain/Common/TextParser.php
new file mode 100644
index 00000000..6a3c7225
--- /dev/null
+++ b/src/Domain/Common/TextParser.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Common;
+
+class TextParser
+{
+    public function __invoke(string $text): string
+    {
+        // bug in PHP? get rid of newlines at the beginning of text
+        $text = ltrim($text);
+
+        // make urls and emails clickable
+        $text = preg_replace("/([\._a-z0-9-]+@[\.a-z0-9-]+)/i", '<a href="mailto:\\1" class="email">\\1</a>', $text);
+        $link_pattern = "/(.*)<a.*href\s*=\s*\"(.*?)\"\s*(.*?)>(.*?)<\s*\/a\s*>(.*)/is";
+
+        $i = 0;
+        while (preg_match($link_pattern, $text, $matches)) {
+            $url = $matches[2];
+            $rest = $matches[3];
+            if (!preg_match('/^(http:)|(mailto:)|(ftp:)|(https:)/i', $url)) {
+                // avoid this
+                //<a href="javascript:window.open('http://hacker.com?cookie='+document.cookie)">
+                $url = preg_replace('/:/', '', $url);
+            }
+            $link[$i] = '<a href="'.$url.'" '.$rest.'>'.$matches[4].'</a>';
+            $text = $matches[1]."%%$i%%".$matches[5];
+            ++$i;
+        }
+
+        $text = preg_replace("/(www\.[a-zA-Z0-9\.\/#~:?+=&%@!_\\-]+)/i", 'http://\\1', $text); //make www. -> http://www.
+        $text = preg_replace("/(https?:\/\/)http?:\/\//i", '\\1', $text); //take out duplicate schema
+        $text = preg_replace("/(ftp:\/\/)http?:\/\//i", '\\1', $text); //take out duplicate schema
+        $text = preg_replace("/(https?:\/\/)(?!www)([a-zA-Z0-9\.\/#~:?+=&%@!_\\-]+)/i",
+            '<a href="\\1\\2" class="url" target="_blank">\\2</a>',
+            $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\\3" class="url" target="_blank">\\2\\3</a>',
+            $text); //eg -- http://www.google.com -> <a href"http://www.google.com" target="_blank">www.google.com</a>
+
+        // 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 < $i; ++$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">';
+        $br = '<br />';
+        $text = preg_replace("/\r/", '', $text);
+        $text = preg_replace("/\n/", "$br\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..1528f615 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 ndicates that emails are sent by phpList',
+                'type'        => 'string',
+                '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'        => 'string',
+                '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/Repository/AdminAttributeDefinitionRepository.php b/src/Domain/Identity/Repository/AdminAttributeDefinitionRepository.php
index 53df9996..006b10af 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..b6d6184c
--- /dev/null
+++ b/src/Domain/Messaging/EventSubscriber/InjectedByHeaderSubscriber.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\EventSubscriber;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Mailer\Event\MessageEvent;
+use Symfony\Component\Mime\Email;
+
+class InjectedByHeaderSubscriber implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents(): array
+    {
+        return [MessageEvent::class => 'onMessage'];
+    }
+
+    public function onMessage(MessageEvent $event): void
+    {
+        // 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 = $_SERVER['REMOTE_ADDR'] ?? 'unknown';
+        $host = gethostname() ?: 'unknown-host';
+        $time = date('r', $_SERVER['REQUEST_TIME'] ?? time());
+
+        $msg->getHeaders()->addTextHeader(
+            'X-phpList-Injected-By',
+            "from [$ip] by $host with HTTP; $time"
+        );
+    }
+}
diff --git a/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php b/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php
index 12d45c30..db8d25b2 100644
--- a/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php
+++ b/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php
@@ -5,9 +5,11 @@
 namespace PhpList\Core\Domain\Messaging\MessageHandler;
 
 use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Domain\Configuration\Service\UserPersonalizer;
 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;
@@ -17,6 +19,7 @@
 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;
@@ -56,6 +59,8 @@ public function __construct(
         private readonly EventLogManager $eventLogManager,
         private readonly MessageDataManager $messageDataManager,
         private readonly MessagePrecacheService $precacheService,
+        private readonly UserPersonalizer $userPersonalizer,
+        private readonly MessageDataLoader $messageDataLoader,
         ?int $maxMailSize = null,
     ) {
         $this->maxMailSize = $maxMailSize ?? 0;
@@ -73,7 +78,33 @@ 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', $campaign->getId());
+        $messagePrecached = $this->precacheService->precacheMessage($campaign, $loadedMessageData);
+        if (!$messagePrecached) {
+            $this->updateMessageStatus($campaign, MessageStatus::Suspended);
+
+            return;
+        }
 
         $this->updateMessageStatus($campaign, MessageStatus::Prepared);
         $subscribers = $this->subscriberProvider->getSubscribersForMessage($campaign);
@@ -104,7 +135,8 @@ public function __invoke(CampaignProcessorMessage|SyncCampaignProcessorMessage $
                 continue;
             }
 
-            $this->handleEmailSending($campaign, $subscriber, $userMessage, $messageContent);
+            $messagePrecacheDto = $this->cache->get($cacheKey);
+            $this->handleEmailSending($campaign, $subscriber, $userMessage, $messagePrecacheDto);
         }
 
         if ($stoppedEarly && $this->requeueHandler->handle($campaign)) {
@@ -156,9 +188,11 @@ private function handleEmailSending(
         Message $campaign,
         Subscriber $subscriber,
         UserMessage $userMessage,
-        Message\MessageContent $precachedContent,
+        MessagePrecacheDto $precachedContent,
     ): void {
         $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);
diff --git a/src/Domain/Messaging/Model/Dto/MessagePrecacheDto.php b/src/Domain/Messaging/Model/Dto/MessagePrecacheDto.php
new file mode 100644
index 00000000..e1e95cfa
--- /dev/null
+++ b/src/Domain/Messaging/Model/Dto/MessagePrecacheDto.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Model\Dto;
+
+class MessagePrecacheDto
+{
+    public string $replyToEmail;
+    public string $replyToName;
+    public string $fromName;
+    public string $fromEmail;
+    public string $to;
+    public string $subject;
+    public string $content;
+    public string $textContent = '';
+    public string $footer;
+    public string $textFooter;
+    public string $htmlFooter;
+    public bool $htmlFormatted;
+    public string $sendFormat;
+    public ?string $template = '';
+    public ?string $templateText = '';
+    public ?int $templateId = 0;
+    public string $htmlCharset= 'UTF-8';
+    public string $textCharset= 'UTF-8';
+    public bool $userSpecificUrl;
+    public string $googleTrack;
+    public array $adminAttributes = [];
+}
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..ddcadce4 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;
@@ -97,4 +98,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..04e28bc9
--- /dev/null
+++ b/src/Domain/Messaging/Service/Builder/EmailBuilder.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Service\Builder;
+
+use Symfony\Component\Mime\Email;
+
+class EmailBuilder
+{
+    public function __construct(
+        private readonly string $googleSenderId,
+        private readonly bool $useAmazonSes,
+        private readonly bool $usePrecedenceHeader,
+    ) {
+    }
+
+    public function buildPhplistEmail(
+        string $messageId,
+        string $destinationEmail,
+        bool $inBlast = true,
+    ): Email {
+        $email = (new Email());
+
+        $email->getHeaders()->addTextHeader('X-MessageID', $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');
+        }
+
+        return $email;
+    }
+}
diff --git a/src/Domain/Messaging/Service/Manager/TemplateImageManager.php b/src/Domain/Messaging/Service/Manager/TemplateImageManager.php
index 68b04f40..58bba8be 100644
--- a/src/Domain/Messaging/Service/Manager/TemplateImageManager.php
+++ b/src/Domain/Messaging/Service/Manager/TemplateImageManager.php
@@ -6,6 +6,8 @@
 
 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 +26,11 @@ 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 EntityManagerInterface $entityManager,
+        private readonly ConfigProvider $configProvider,
     ) {
-        $this->templateImageRepository = $templateImageRepository;
-        $this->entityManager = $entityManager;
     }
 
     /** @return TemplateImage[] */
@@ -99,4 +97,92 @@ public function delete(TemplateImage $templateImage): void
     {
         $this->templateImageRepository->remove($templateImage);
     }
+
+    public function parseLogoPlaceholders($content)
+    {
+        //# 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("ORGANISATIONLOGO$size.png");
+        if (!empty($orgLogoImage->getData())) {
+            return;
+        }
+
+        $logoImage = $this->templateImageRepository->findById((int) $logoImageId);
+        $imageContent = base64_decode($logoImage->getData());
+        if (empty($imageContent)) {
+            //# fall back to a single pixel, so that there are no broken images
+            $imageContent = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAABGdBTUEAALGPC/xhBQAAAAZQTFRF////AAAAVcLTfgAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0gQCEx05cqKA8gAAAApJREFUeJxjYAAAAAIAAUivpHEAAAAASUVORK5CYII=');
+        }
+
+        $imgSize = getimagesizefromstring($imageContent);
+        $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);
+
+        if ($sizeFactor < 1) {
+            $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);
+
+            if (imagecopyresized(
+                $resized,
+                $original,
+                0,
+                0,
+                0,
+                0,
+                $newWidth,
+                $newHeight,
+                $sizeW,
+                $sizeH,
+            )) {
+                $this->entityManager->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;
+            }
+        }
+        // else copy original
+        $templateImage = (new TemplateImage())
+            ->setFilename("ORGANISATIONLOGO$size.png")
+            ->setMimetype($imgSize['mime'])
+            ->setData(base64_encode($imageContent))
+            ->setWidth($newWidth)
+            ->setHeight($newHeight);
+
+        $this->entityManager->persist($templateImage);
+    }
 }
diff --git a/src/Domain/Messaging/Service/MessageDataLoader.php b/src/Domain/Messaging/Service/MessageDataLoader.php
new file mode 100644
index 00000000..b0749447
--- /dev/null
+++ b/src/Domain/Messaging/Service/MessageDataLoader.php
@@ -0,0 +1,200 @@
+<?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;
+
+class MessageDataLoader
+{
+    public function __construct(
+        private readonly ConfigProvider $configProvider,
+        private readonly MessageDataRepository $messageDataRepository,
+        private readonly MessageRepository $messageRepository,
+        private readonly int $defaultMessageAge,
+    ) {
+    }
+
+    public function __invoke(Message $message): array
+    {
+        $defaultFrom = $this->configProvider->getValue(ConfigOption::MessageFromAddress)
+                ?? $this->configProvider->getValue(ConfigOption::AdminAddress);
+
+        $finishSending = time() + $this->defaultMessageAge;
+
+        $messageData = [
+            'template'       => $this->configProvider->getValue(ConfigOption::DefaultMessageTemplate),
+            'sendformat'     => 'HTML',
+            'message'        => '',
+            'forwardmessage' => '',
+            'textmessage'    => '',
+            'rsstemplate'    => '',
+            'embargo'        => [
+                'year'   => date('Y'),
+                'month'  => date('m'),
+                'day'    => date('d'),
+                'hour'   => date('H'),
+                'minute' => date('i'),
+            ],
+            'repeatinterval' => 0,
+            'repeatuntil'    => [
+                'year'   => date('Y'),
+                'month'  => date('m'),
+                'day'    => date('d'),
+                'hour'   => date('H'),
+                'minute' => date('i'),
+            ],
+            'requeueinterval' => 0,
+            'requeueuntil'    => [
+                'year'   => date('Y'),
+                'month'  => date('m'),
+                'day'    => date('d'),
+                'hour'   => date('H'),
+                'minute' => date('i'),
+            ],
+            'finishsending' => [
+                'year'   => date('Y', $finishSending),
+                'month'  => date('m', $finishSending),
+                'day'    => date('d', $finishSending),
+                'hour'   => date('H', $finishSending),
+                'minute' => date('i', $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,
+        ];
+
+        $nonEmptyFields = $this->messageRepository->getNonEmptyFields($message->getId());
+        foreach ($nonEmptyFields as $key => $val) {
+            $messageData[$key] = $val;
+        }
+
+        $messageData['subject'] = $messageData['subject'] === '(no title)' ? '(no subject)' : $messageData['subject'];
+
+        $storedMessageData = $this->messageDataRepository->getForMessage($message->getId());
+        foreach ($storedMessageData as $storedMessageDatum) {
+            if (str_starts_with($storedMessageDatum->getData(), 'SER:')) {
+                $unserialized = unserialize(substr($storedMessageDatum->getData(), 4));
+                $data = array_walk_recursive($unserialized, 'stripslashes');
+            } else {
+                $data = stripslashes($storedMessageDatum->getData());
+            }
+            if (!in_array($storedMessageDatum->getName(), ['astext', 'ashtml', 'astextandhtml', 'aspdf', 'astextandpdf']))
+            {
+                //# don't overwrite counters in the message table from the data table
+                $messageData[stripslashes($storedMessageDatum->getName())] = $data;
+            }
+        }
+
+        foreach (['embargo', 'repeatuntil', 'requeueuntil'] as $dateField) {
+            if (!is_array($messageData[$dateField])) {
+                $messageData[$dateField] = [
+                    'year'   => date('Y'),
+                    'month'  => date('m'),
+                    'day'    => date('d'),
+                    'hour'   => date('H'),
+                    'minute' => date('i'),
+                ];
+            }
+        }
+
+        foreach($message->getListMessages() as $listMessage) {
+            $messageData['targetlist'][$listMessage->getListId()] = 1;
+        }
+
+        //# 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';
+        }
+
+        //## 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 (strpos($messageData['fromfield'], ' ')) {
+            // if there is a space, we need to add the email
+            $messageData['fromname'] = $messageData['fromfield'];
+            //  $cached[$messageid]["fromemail"] = "listmaster@$domain";
+            $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 (strpos($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'];
+        }
+
+        if (isset($messageData['targetlist']['unselect'])) {
+            unset($messageData['targetlist']['unselect']);
+        }
+        if (isset($messageData['excludelist']['unselect'])) {
+            unset($messageData['excludelist']['unselect']);
+        }
+
+        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'];
+        }
+
+        return $messageData;
+    }
+}
diff --git a/src/Domain/Messaging/Service/MessagePrecacheService.php b/src/Domain/Messaging/Service/MessagePrecacheService.php
index cc1c7dc9..779d19c2 100644
--- a/src/Domain/Messaging/Service/MessagePrecacheService.php
+++ b/src/Domain/Messaging/Service/MessagePrecacheService.php
@@ -4,85 +4,190 @@
 
 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;
 
 class MessagePrecacheService
 {
-    public function __construct(private readonly CacheInterface $cache)
-    {
+    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 $adminAttributeDefRepository,
+        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);
+        $cached = $this->cache->get($cacheKey);
         if ($cached !== null) {
             return $cached;
         }
+        $domain = $this->configProvider->getValue(ConfigOption::Domain);
+
+        $messagePrecacheDto = new MessagePrecacheDto();
+
+        // 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 (strpos($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";
+        }
+
+        $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'];
+        }
+        //0013076: different content when forwarding 'to a friend'
+        $messagePrecacheDto->footer = $forwardContent ? stripslashes($loadedMessageData['forwardfooter']) : $loadedMessageData['footer'];
+
+        if (strip_tags($messagePrecacheDto->footer ) !== $messagePrecacheDto->footer) {
+            $messagePrecacheDto->textFooter = ($this->html2Text)($messagePrecacheDto->footer);
+            $messagePrecacheDto->htmlFooter = $messagePrecacheDto->footer;
+        } else {
+            $messagePrecacheDto->textFooter = $messagePrecacheDto->footer;
+            $messagePrecacheDto->htmlFooter = ($this->textParser)($messagePrecacheDto->footer);
+        }
 
-        $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);
+        $messagePrecacheDto->htmlFormatted = strip_tags($messagePrecacheDto->content) !== $messagePrecacheDto->content;
+        $messagePrecacheDto->sendFormat = $loadedMessageData['sendformat'];
+
+        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();
             }
         }
 
-        // 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);
-
-        $snapshot = [
-            'subject' => $subject,
-            'text' => $html,
-            'textMessage' => $text,
-            'footer' => $footer,
-        ];
+        //# 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) {
+            //# Fetch external content here, because URL does not contain placeholders
+            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 = strip_tags($remoteContent) !== $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;
+                }
+            }
+        }
 
-        $this->cache->set($cacheKey, $snapshot);
+        $messagePrecacheDto->googleTrack = $loadedMessageData['google_track'];
 
-        return new Message\MessageContent($subject, $html, $text, $footer);
-    }
+        foreach (['subject', 'id', 'fromname', 'fromemail'] as $key) {
+            $val = $loadedMessageData[$key];
+            // Replace in content except for user-specific URL
+            if (!$messagePrecacheDto->userSpecificUrl) {
+                $messagePrecacheDto->content = str_ireplace("[$key]", $val, $messagePrecacheDto->content);
+            }
+            $messagePrecacheDto->textContent = str_ireplace("[$key]", $val, $messagePrecacheDto->textContent);
+            $messagePrecacheDto->textFooter = str_ireplace("[$key]", $val, $messagePrecacheDto->textFooter);
+            $messagePrecacheDto->htmlFooter = str_ireplace("[$key]", $val, $messagePrecacheDto->htmlFooter);
+        }
 
-    private function fetchRemoteContent(string $url): ?string
-    {
-        $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();
+        $ownerAttrValues = $this->adminAttributeDefRepository->getForAdmin($campaign->getOwner());
+        foreach ($ownerAttrValues as $attr) {
+            $messagePrecacheDto->adminAttributes['OWNER.'.$attr['name']] = $attr['value'];
         }
 
-        if ($data === false) {
-            return null;
+        $relatedAdmins = $this->adminRepository->getMessageRelatedAdmins($campaign->getId());
+        if (count($relatedAdmins) === 1) {
+            $listOwnerAttrValues = $this->adminAttributeDefRepository->getForAdmin($relatedAdmins[0]);
+        } else {
+            $listOwnerAttrValues = $this->adminAttributeDefRepository->getAllWIthEmptyValues();
+        }
+
+        foreach ($listOwnerAttrValues as $attr) {
+            $messagePrecacheDto->adminAttributes['LISTOWNER.'.$attr['name']] = $attr['value'];
+        }
+
+        $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
+            );
         }
 
-        return $data;
+        $messagePrecacheDto->content = $this->templateImageManager->parseLogoPlaceholders($messagePrecacheDto->content);
+        $messagePrecacheDto->template = $this->templateImageManager->parseLogoPlaceholders($messagePrecacheDto->template);
+        $messagePrecacheDto->htmlFooter = $this->templateImageManager->parseLogoPlaceholders($messagePrecacheDto->htmlFooter);
+
+//        $replacements = $this->buildBasicReplacements($campaign, $subject);
+//        $html = $this->applyReplacements($html, $replacements);
+//        $text = $this->applyReplacements($text, $replacements);
+//        $footer = $this->applyReplacements($footer, $replacements);
+
+        $this->cache->set($cacheKey, $messagePrecacheDto);
+
+        return true;
     }
 
     private function buildBasicReplacements(Message $campaign, string $subject): array
@@ -104,6 +209,7 @@ private function parseFromField(string $fromField): array
         }
         $name = trim(str_replace([$email, '"'], ['', ''], $fromField));
         $name = trim(str_replace(['<', '>'], '', $name));
+
         return [$name, $email];
     }
 
@@ -112,26 +218,7 @@ private function applyReplacements(?string $input, array $replacements): ?string
         if ($input === null) {
             return null;
         }
-        return str_ireplace(array_keys($replacements), array_values($replacements), $input);
-    }
-
-    private function getFromCache(string $cacheKey): ?Message\MessageContent
-    {
-        $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']
-            );
-        }
 
-        return null;
+        return str_ireplace(array_keys($replacements), array_values($replacements), $input);
     }
 }
diff --git a/src/Domain/Messaging/Service/MessageProcessingPreparator.php b/src/Domain/Messaging/Service/MessageProcessingPreparator.php
index aee1d9e7..59836242 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,28 @@ 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->footer) {
+            $cachedMessageDto->footer = $this->replaceLinks($savedLinks, $cachedMessageDto->footer);
         }
 
-        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..1ccc4032 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,26 @@ 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 $processedContent,
+    ): 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());
         }
 
         return $email
             ->to($subscriber->getEmail())
-            ->subject($content->getSubject())
-            // todo: check HTML2Text functionality
-            ->text($content->getTextMessage())
-            ->html($content->getText());
+            ->subject($processedContent->subject)
+            ->text($processedContent->textContent)
+            // todo: check htmlFooterit should be html of textContent
+            ->html($processedContent->htmlFooter);
     }
 
     /**
diff --git a/src/Domain/Messaging/Service/SystemMailConstructor.php b/src/Domain/Messaging/Service/SystemMailConstructor.php
new file mode 100644
index 00000000..9e9a3f4e
--- /dev/null
+++ b/src/Domain/Messaging/Service/SystemMailConstructor.php
@@ -0,0 +1,93 @@
+<?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
+{
+    public function __construct(
+        private readonly Html2Text $html2Text,
+        private readonly ConfigProvider $configProvider,
+        private readonly TemplateRepository $templateRepository,
+        private readonly TemplateImageManager $templateImageManager,
+        private readonly bool $poweredByPhplist = false,
+    ) {
+    }
+
+    public function __invoke($message, $subject = ''): array
+    {
+        $hasHTML = strip_tags($message) !== $message;
+
+        if ($hasHTML) {
+            $message = stripslashes($message);
+            $textMessage = ($this->html2Text)($message);
+            $htmlMessage = $message;
+        } else {
+            $textMessage = $message;
+            $htmlMessage = $message;
+            //  $htmlMessage = str_replace("\n\n","\n",$htmlMessage);
+            $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);
+            for ($i = 0; $i < count($matches[0]); ++$i) {
+                $listsHTML .= '<li>'.$matches[1][$i].'</li>';
+            }
+            $htmlMessage = str_replace($listsmatch[0], '<ul>'.$listsHTML.'</ul>', $htmlMessage);
+        }
+
+        $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->configProvider->getValue(ConfigOption::PoweredByText);
+                }
+                if (strpos($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->configProvider->getValue(ConfigOption::PoweredByText)));
+                if (strpos($textContent, '[SIGNATURE]')) {
+                    $textContent = str_replace('[SIGNATURE]', $phpListPowered, $textContent);
+                } else {
+                    $textContent .= "\n\n" . $phpListPowered;
+                }
+            }
+        }
+
+        return [$htmlContent, $textContent];
+    }
+}
diff --git a/src/Domain/Messaging/Service/TemplateImageEmbedder.php b/src/Domain/Messaging/Service/TemplateImageEmbedder.php
new file mode 100644
index 00000000..cb39de79
--- /dev/null
+++ b/src/Domain/Messaging/Service/TemplateImageEmbedder.php
@@ -0,0 +1,279 @@
+<?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 embedTemplateImages(
+        string $html,
+        int $templateId,
+        int $messageId,
+    ): string {
+        $extensions = implode('|', array_keys($this->mimeMap));
+        $htmlImages = [];
+        $filesystemImages = [];
+
+        //# addition for external images
+        if ($this->embedExternalImages) {
+            $externalImages = [];
+            $matchedImages = [];
+            $pattern = sprintf(
+                '~="(https?://(?!%s)([^"]+\.(%s))([\\?/][^"]+)?)"~Ui',
+                preg_quote($this->configProvider->getValue(ConfigOption::Website)),
+                $extensions
+            );
+            preg_match_all($pattern, $html, $matchedImages);
+
+            for ($index = 0; $index < count($matchedImages[1]); ++$index) {
+                if ($this->externalImageService->cache($matchedImages[1][$index], $messageId)) {
+                    $externalImages[] = $matchedImages[1][$index]
+                        . '~^~'
+                        . basename($matchedImages[2][$index])
+                        . '~^~'
+                        . strtolower($matchedImages[3][$index]);
+                }
+            }
+
+            if (!empty($externalImages)) {
+                $externalImages = array_unique($externalImages);
+
+                for ($index = 0; $index < count($externalImages); ++$index) {
+                    $externalImage = explode('~^~', $externalImages[$index]);
+                    $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], 'cid:' . $cid, $html);
+                        }
+                    }
+                }
+            }
+        }
+        //# end addition
+
+        preg_match_all('/"([^"]+\.('.$extensions.'))"/Ui', $html, $images);
+
+        for ($i = 0; $i < count($images[1]); ++$i) {
+            if ($this->getTemplateImage($templateId, $images[1][$i]) !== null) {
+                $htmlImages[] = $images[1][$i];
+                $html = str_replace($images[1][$i], basename($images[1][$i]), $html);
+            }
+            //# addition for filesystem images
+            if ($this->embedUploadedImages) {
+                if ($this->filesystemImageExists($images[1][$i])) {
+                    $filesystemImages[] = $images[1][$i];
+                    $html = str_replace($images[1][$i], basename($images[1][$i]), $html);
+                }
+            }
+            //# end addition
+        }
+        if (!empty($htmlImages)) {
+            // If duplicate images are embedded, they may show up as attachments, so remove them.
+            $htmlImages = array_unique($htmlImages);
+            sort($htmlImages);
+            for ($i = 0; $i < count($htmlImages); ++$i) {
+                if ($image = $this->getTemplateImage($templateId, $htmlImages[$i])) {
+                    $content_type = $this->mimeMap[strtolower(substr($htmlImages[$i],  strrpos($htmlImages[$i], '.') + 1))];
+                    $cid = $this->addHtmlImage($image->getData(), basename($htmlImages[$i]), $content_type);
+                    if (!empty($cid)) {
+                        $html = str_replace(basename($htmlImages[$i]), "cid:$cid", $html);
+                    }
+                }
+            }
+        }
+        //# addition for filesystem images
+        if (!empty($filesystemImages)) {
+            // If duplicate images are embedded, they may show up as attachments, so remove them.
+            $filesystemImages = array_unique($filesystemImages);
+            sort($filesystemImages);
+            for ($i = 0; $i < count($filesystemImages); ++$i) {
+                if ($image = $this->getFilesystemImage($filesystemImages[$i])) {
+                    $contentType = $this->mimeMap[strtolower(
+                        substr($filesystemImages[$i],
+                        strrpos($filesystemImages[$i], '.') + 1)
+                    )];
+                    $cid = $this->addHtmlImage($image, basename($filesystemImages[$i]), $contentType);
+                    if (!empty($cid)) {
+                        $html = str_replace(basename($filesystemImages[$i]), "cid:$cid", $html);
+                    }
+                }
+            }
+        }
+
+        return $html;
+    }
+
+    public function getFilesystemImage(string $filename): string
+    {
+        //# get the image contents
+        $localFile = basename(urldecode($filename));
+        if ($this->uploadImagesDir) {
+            $imageRoot = $this->configProvider->getValue(ConfigOption::UploadImageRoot);
+            if (is_file($imageRoot.$localFile)) {
+                return base64_encode(file_get_contents($imageRoot.$localFile));
+            } else {
+                if (is_file($this->documentRoot.$localFile)) {
+                    //# save the document root to be able to retrieve the file later from commandline
+                    $this->configManager->create(
+                        ConfigOption::UploadImageRoot->value,
+                        $this->documentRoot,
+                        false,
+                        'string',
+                    );
+
+                    return base64_encode(file_get_contents($this->documentRoot.$localFile));
+                } elseif (is_file($this->documentRoot.'/'.$this->uploadImagesDir.'/image/'.$localFile)) {
+                    $this->configManager->create(
+                        ConfigOption::UploadImageRoot->value,
+                        $this->documentRoot.'/'.$this->uploadImagesDir.'/image/',
+                        false,
+                        'string',
+                    );
+
+                    return base64_encode(file_get_contents($this->documentRoot.'/'.$this->uploadImagesDir.'/image/'.$localFile));
+                } elseif (is_file($this->documentRoot.'/'.$this->uploadImagesDir.'/'.$localFile)) {
+                    $this->configManager->create(
+                        ConfigOption::UploadImageRoot->value,
+                        $this->documentRoot.'/'.$this->uploadImagesDir.'/',
+                        false,
+                        'string',
+                    );
+
+                    return base64_encode(file_get_contents($this->documentRoot.'/'.$this->uploadImagesDir.'/'.$localFile));
+                }
+            }
+        } elseif (is_file($this->documentRoot.$this->configProvider->getValue(ConfigOption::PageRoot).'/'.$this->editorImagesDir.'/'.$localFile)) {
+            $elements = parse_url($filename);
+            $localFile = basename($elements['path']);
+
+            return base64_encode(file_get_contents($this->documentRoot.$this->configProvider->getValue(ConfigOption::PageRoot).'/'.$this->editorImagesDir.'/'.$localFile));
+        } elseif (is_file($this->documentRoot.$this->configProvider->getValue(ConfigOption::PageRoot).'/'.$this->editorImagesDir.'/image/'.$localFile)) {
+            return base64_encode(file_get_contents($this->documentRoot.$this->configProvider->getValue(ConfigOption::PageRoot).'/'.$this->editorImagesDir.'/image/'.$localFile));
+        } elseif (is_file('../'.$this->editorImagesDir.'/'.$localFile)) {
+            return base64_encode(file_get_contents('../'.$this->editorImagesDir.'/'.$localFile));
+        } elseif (is_file('../'.$this->editorImagesDir.'/image/'.$localFile)) {
+            return base64_encode(file_get_contents('../'.$this->editorImagesDir.'/image/'.$localFile));
+        }
+
+        return '';
+    }
+
+    public function addHtmlImage(string $contents, $name = '', $content_type = 'application/octet-stream'): string
+    {
+        $cid = bin2hex(random_bytes(16));
+        $this->addStringEmbeddedImage(base64_decode($contents), $cid, $name, 'base64', $content_type);
+
+        return $cid;
+    }
+
+    public function addStringEmbeddedImage(
+        $string,
+        $cid,
+        $name = '',
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'inline'
+    ): bool {
+        try {
+            //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);
+            }
+
+            //Append to $attachment array
+            $this->attachment[] = [
+                0 => $string,
+                1 => $name,
+                2 => $name,
+                3 => $encoding,
+                4 => $type,
+                5 => true, //isStringAttachment
+                6 => $disposition,
+                7 => $cid,
+            ];
+        } catch (Exception $exc) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function filesystemImageExists($filename): bool
+    {
+        //#  find the image referenced and see if it's on the server
+        $imageRoot = $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.$this->configProvider->getValue(ConfigOption::PageRoot).'/'.$this->editorImagesDir.'/image/'.$localFile)
+                || is_file($this->documentRoot.$this->configProvider->getValue(ConfigOption::PageRoot).'/'.$this->editorImagesDir.'/'.$localFile)
+                //# commandline
+                || is_file('../'.$this->editorImagesDir.'/image/'.$localFile)
+                || is_file('../'.$this->editorImagesDir.'/'.$localFile);
+        }
+    }
+
+    public function getTemplateImage($templateId, $filename): ?TemplateImage
+    {
+        if (basename($filename) === 'powerphplist.png' || str_starts_with($filename, 'ORGANISATIONLOGO')) {
+            $templateId = 0;
+        }
+
+        return $this->templateImageRepository->findByTemplateIdAndFilename($templateId, $filename);
+    }
+}
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..bd936644 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,19 @@ 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
+        $grace = $immediate ? 0 : ((($gt = $this->blacklistGraceTime) >= 1 && $gt <= 15) ? $gt : 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/SubscriberCsvImporter.php b/src/Domain/Subscription/Service/SubscriberCsvImporter.php
index 8440d11e..af1e822d 100644
--- a/src/Domain/Subscription/Service/SubscriberCsvImporter.php
+++ b/src/Domain/Subscription/Service/SubscriberCsvImporter.php
@@ -210,6 +210,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/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php b/tests/Unit/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php
index a565f558..0e61d5dd 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;
@@ -57,10 +58,18 @@ protected function setUp(): void
         $requeueHandler = $this->createMock(RequeueHandler::class);
         $this->translator = $this->createMock(Translator::class);
         $this->precacheService = $this->createMock(MessagePrecacheService::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,
             entityManager: $this->entityManager,
@@ -77,6 +86,7 @@ protected function setUp(): void
             eventLogManager: $this->createMock(EventLogManager::class),
             messageDataManager: $this->createMock(MessageDataManager::class),
             precacheService: $this->precacheService,
+            userPersonalizer: $userPersonalizer,
             maxMailSize: 0,
         );
     }
@@ -166,6 +176,8 @@ public function testInvokeWithValidSubscriberEmail(): void
     {
         $campaign = $this->createMock(Message::class);
         $content = $this->createContentMock();
+        $content->method('getText')->willReturn('<p>Test HTML message</p>');
+        $content->method('getFooter')->willReturn('<p>Test footer message</p>');
         $campaign->method('getContent')->willReturn($content);
         $metadata = $this->createMock(MessageMetadata::class);
         $campaign->method('getMetadata')->willReturn($metadata);
@@ -225,6 +237,8 @@ public function testInvokeWithMailerException(): void
     {
         $campaign = $this->createMock(Message::class);
         $content = $this->createContentMock();
+        $content->method('getText')->willReturn('<p>Test HTML message</p>');
+        $content->method('getFooter')->willReturn('<p>Test footer message</p>');
         $metadata = $this->createMock(MessageMetadata::class);
         $campaign->method('getContent')->willReturn($content);
         $campaign->method('getMetadata')->willReturn($metadata);
@@ -278,6 +292,8 @@ public function testInvokeWithMultipleSubscribers(): void
     {
         $campaign = $this->createCampaignMock();
         $content = $this->createContentMock();
+        $content->method('getText')->willReturn('<p>Test HTML message</p>');
+        $content->method('getFooter')->willReturn('<p>Test footer message</p>');
         $metadata = $this->createMock(MessageMetadata::class);
         $campaign->method('getMetadata')->willReturn($metadata);
         $campaign->method('getId')->willReturn(1);
diff --git a/tests/Unit/Domain/Messaging/Service/MessageProcessingPreparatorTest.php b/tests/Unit/Domain/Messaging/Service/MessageProcessingPreparatorTest.php
index b7530895..9ba29c46 100644
--- a/tests/Unit/Domain/Messaging/Service/MessageProcessingPreparatorTest.php
+++ b/tests/Unit/Domain/Messaging/Service/MessageProcessingPreparatorTest.php
@@ -6,7 +6,6 @@
 
 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\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
@@ -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,
         );
     }