diff --git a/config/services/mappers.yml b/config/services/mappers.yml
index b0df7b58..54879ad8 100644
--- a/config/services/mappers.yml
+++ b/config/services/mappers.yml
@@ -11,3 +11,7 @@ services:
   PhpList\Core\Domain\Subscription\Service\CsvToDtoImporter:
     autowire: true
     autoconfigure: true
+
+  PhpList\Core\Domain\Messaging\Service\Mapper\DefaultTemplateMapper:
+    autowire: true
+    autoconfigure: true
diff --git a/config/services/messenger.yml b/config/services/messenger.yml
index 6ae953d4..38130f6e 100644
--- a/config/services/messenger.yml
+++ b/config/services/messenger.yml
@@ -11,6 +11,10 @@ services:
         resource: '../../src/Domain/Subscription/MessageHandler'
         tags: [ 'messenger.message_handler' ]
 
-    PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessorMessageHandler:
+    PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessor\CampaignProcessorMessageHandler:
+        autowire: true
+        autoconfigure: true
+
+    PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessor\TestCampaignProcessorMessageHandler:
         autowire: true
         autoconfigure: true
diff --git a/config/services/resolvers.yml b/config/services/resolvers.yml
index 6dfab328..baa9d3b9 100644
--- a/config/services/resolvers.yml
+++ b/config/services/resolvers.yml
@@ -1,4 +1,16 @@
 services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+
+  _instanceof:
+    PhpList\Core\Domain\Configuration\Service\Placeholder\PlaceholderValueResolverInterface:
+      tags: ['phplist.placeholder_resolver']
+    PhpList\Core\Domain\Configuration\Service\Placeholder\PatternValueResolverInterface:
+      tags: ['phplist.pattern_resolver']
+    PhpList\Core\Domain\Configuration\Service\Placeholder\SupportingPlaceholderResolverInterface:
+      tags: ['phplist.supporting_placeholder_resolver']
+
   PhpList\Core\Domain\Subscription\Service\Resolver\AttributeValueResolver:
     arguments:
       $providers:
@@ -14,26 +26,5 @@ services:
     arguments:
       - !tagged_iterator { tag: 'phplist.bounce_action_handler' }
 
-  PhpList\Core\Domain\Configuration\Service\Placeholder\UnsubscribeUrlValueResolver:
-    autowire: true
-    autoconfigure: true
-
-  PhpList\Core\Domain\Configuration\Service\Placeholder\ConfirmationUrlValueResolver:
-    autowire: true
-    autoconfigure: true
-
-  PhpList\Core\Domain\Configuration\Service\Placeholder\PreferencesUrlValueResolver:
-    autowire: true
-    autoconfigure: true
-
-  PhpList\Core\Domain\Configuration\Service\Placeholder\SubscribeUrlValueResolver:
-    autowire: true
-    autoconfigure: true
-
-  _instanceof:
-    PhpList\Core\Domain\Configuration\Service\Placeholder\PlaceholderValueResolverInterface:
-      tags: ['phplist.placeholder_resolver']
-    PhpList\Core\Domain\Configuration\Service\Placeholder\PatternValueResolverInterface:
-      tags: [ 'phplist.pattern_resolver' ]
-    PhpList\Core\Domain\Configuration\Service\Placeholder\SupportingPlaceholderResolverInterface:
-      tags: [ 'phplist.supporting_placeholder_resolver' ]
+  PhpList\Core\Domain\Configuration\Service\Placeholder\:
+    resource: '../../src/Domain/Configuration/Service/Placeholder/*'
diff --git a/public/.htaccess b/public/.htaccess
index 4dc72516..0c1f8117 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -3,7 +3,7 @@
 # mod_rewrite). Additionally, this reduces the matching process for the
 # start page (path "/") because otherwise Apache will apply the rewriting rules
 # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
-DirectoryIndex app.php
+DirectoryIndex index.php
 
 # By default, Apache does not evaluate symbolic links if you did not enable this
 # feature in your server configuration. Uncomment the following line if you
@@ -46,7 +46,7 @@ DirectoryIndex app.php
     # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
     #   following RewriteCond (best solution)
     RewriteCond %{ENV:REDIRECT_STATUS} ^$
-    RewriteRule ^app\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
+    RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
 
     # If the requested filename exists, simply serve it.
     # We only want to let Apache serve files and not directories.
@@ -54,7 +54,7 @@ DirectoryIndex app.php
     RewriteRule ^ - [L]
 
     # Rewrite all other queries to the front controller.
-    RewriteRule ^ %{ENV:BASE}/app.php [L]
+    RewriteRule ^ %{ENV:BASE}/index.php [L]
 </IfModule>
 
 <IfModule !mod_rewrite.c>
@@ -62,7 +62,7 @@ DirectoryIndex app.php
         # When mod_rewrite is not available, we instruct a temporary redirect of
         # the start page to the front controller explicitly so that the website
         # and the generated links can still be used.
-        RedirectMatch 302 ^/$ /app.php/
+        RedirectMatch 302 ^/$ /index.php/
         # RedirectTemp cannot be used instead
     </IfModule>
 </IfModule>
diff --git a/public/index.php b/public/index.php
new file mode 100644
index 00000000..8a06781f
--- /dev/null
+++ b/public/index.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpList\Core\Core\Bootstrap;
+use PhpList\Core\Core\Environment;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+$environment = $_ENV['APP_ENV'] ?? $_SERVER['APP_ENV'] ?? getenv('APP_ENV') ?: Environment::PRODUCTION;
+
+$bootstrap = Bootstrap::getInstance();
+if ($environment !== Environment::PRODUCTION) {
+    $bootstrap->ensureDevelopmentOrTestingEnvironment();
+}
+
+$bootstrap
+    ->setEnvironment($environment)
+    ->configure()
+    ->dispatch();
diff --git a/src/Bounce/Service/Manager/BounceManager.php b/src/Bounce/Service/Manager/BounceManager.php
index 230ad279..868aae10 100644
--- a/src/Bounce/Service/Manager/BounceManager.php
+++ b/src/Bounce/Service/Manager/BounceManager.php
@@ -18,24 +18,13 @@
 
 class BounceManager
 {
-    private BounceRepository $bounceRepository;
-    private UserMessageBounceRepository $userMessageBounceRepo;
-    private EntityManagerInterface $entityManager;
-    private LoggerInterface $logger;
-    private TranslatorInterface $translator;
-
     public function __construct(
-        BounceRepository $bounceRepository,
-        UserMessageBounceRepository $userMessageBounceRepo,
-        EntityManagerInterface $entityManager,
-        LoggerInterface $logger,
-        TranslatorInterface $translator,
+        private readonly BounceRepository $bounceRepository,
+        private readonly UserMessageBounceRepository $userMessageBounceRepo,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly LoggerInterface $logger,
+        private readonly TranslatorInterface $translator,
     ) {
-        $this->bounceRepository = $bounceRepository;
-        $this->userMessageBounceRepo = $userMessageBounceRepo;
-        $this->entityManager = $entityManager;
-        $this->logger = $logger;
-        $this->translator = $translator;
     }
 
     public function create(
@@ -93,7 +82,10 @@ public function linkUserMessageBounce(
         int $subscriberId,
         ?int $messageId = -1
     ): UserMessageBounce {
-        $userMessageBounce = new UserMessageBounce($bounce->getId(), new DateTime($date->format('Y-m-d H:i:s')));
+        $userMessageBounce = new UserMessageBounce(
+            bounceId: $bounce->getId(),
+            createdAt: new DateTime($date->format('Y-m-d H:i:s'))
+        );
         $userMessageBounce->setUserId($subscriberId);
         $userMessageBounce->setMessageId($messageId);
 
diff --git a/src/DependencyInjection/PhpListCoreExtension.php b/src/DependencyInjection/PhpListCoreExtension.php
index e04ad940..a41381f0 100644
--- a/src/DependencyInjection/PhpListCoreExtension.php
+++ b/src/DependencyInjection/PhpListCoreExtension.php
@@ -11,12 +11,26 @@
 
 class PhpListCoreExtension extends Extension
 {
+    private array $configFiles = [
+        'builders.yml',
+        'commands.yml',
+        'managers.yml',
+        'mappers.yml',
+        'messengers.yml',
+        'processors.yml',
+        'providers.yml',
+        'repositories.yml',
+        'resolvers.yml',
+        'services.yml',
+        'validators.yml',
+    ];
+
     public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config/services'));
 
         // Load core service definitions if present (keep optional to avoid breaking consumers)
-        foreach (['services.yml', 'builders.yml', 'managers.yml'] as $file) {
+        foreach ($this->configFiles as $file) {
             $path = __DIR__ . '/../../config/services/' . $file;
             if (is_file($path) && is_readable($path)) {
                 $loader->load($file);
diff --git a/src/Domain/Analytics/Service/LinkTrackService.php b/src/Domain/Analytics/Service/LinkTrackService.php
index 60230dd3..d6d60f95 100644
--- a/src/Domain/Analytics/Service/LinkTrackService.php
+++ b/src/Domain/Analytics/Service/LinkTrackService.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Domain\Analytics\Service;
 
+use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Core\ParameterProvider;
 use PhpList\Core\Domain\Analytics\Exception\MissingMessageIdException;
 use PhpList\Core\Domain\Analytics\Model\LinkTrack;
@@ -12,13 +13,11 @@
 
 class LinkTrackService
 {
-    private LinkTrackRepository $linkTrackRepository;
-    private ParameterProvider $paramProvider;
-
-    public function __construct(LinkTrackRepository $linkTrackRepository, ParameterProvider $paramProvider)
-    {
-        $this->linkTrackRepository = $linkTrackRepository;
-        $this->paramProvider = $paramProvider;
+    public function __construct(
+        private readonly LinkTrackRepository $linkTrackRepository,
+        private readonly ParameterProvider $paramProvider,
+        private readonly EntityManagerInterface $entityManager,
+    ) {
     }
 
     public function getUrlById(int $id): ?string
@@ -58,7 +57,6 @@ public function extractAndSaveLinks(MessagePrecacheDto $content, int $userId, ?i
         $links = array_unique($links);
 
         $savedLinks = [];
-
         foreach ($links as $url) {
             $existingLinkTrack = $this->linkTrackRepository->findByUrlUserIdAndMessageId($url, $userId, $messageId);
             if ($existingLinkTrack !== null) {
@@ -74,6 +72,8 @@ public function extractAndSaveLinks(MessagePrecacheDto $content, int $userId, ?i
             $savedLinks[] = $linkTrack;
         }
 
+        $this->entityManager->flush();
+
         return $savedLinks;
     }
 
diff --git a/src/Domain/Common/RemotePageFetcher.php b/src/Domain/Common/RemotePageFetcher.php
index 30ac316e..fdeb01db 100644
--- a/src/Domain/Common/RemotePageFetcher.php
+++ b/src/Domain/Common/RemotePageFetcher.php
@@ -60,13 +60,16 @@ public function __invoke(string $url, array $userData): string
 
         if (!empty($content)) {
             $content = $this->htmlUrlRewriter->addAbsoluteResources($content, $url);
-            $this->eventLogManager->log(page: 'unknown page', entry:'Fetching '.$url.' success');
+            $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);
+            $urlCache = (new UrlCache())
+                ->setUrl($url)
+                ->setContent($content)
+                ->setLastModified($lastModified);
             $this->urlCacheRepository->persist($urlCache);
 
             $this->cache->set($cacheKey, [
diff --git a/src/Domain/Configuration/Service/MessagePlaceholderProcessor.php b/src/Domain/Configuration/Service/MessagePlaceholderProcessor.php
index ba216a1a..f0443f4a 100644
--- a/src/Domain/Configuration/Service/MessagePlaceholderProcessor.php
+++ b/src/Domain/Configuration/Service/MessagePlaceholderProcessor.php
@@ -65,10 +65,8 @@ public function process(
             name: 'ORGANIZATION_NAME',
             resolver: fn(PlaceholderContext $ctx) => $this->config->getValue(ConfigOption::OrganisationName) ?? ''
         );
-
-        foreach ($this->placeholderResolvers as $placeholderResolver) {
-            $resolver->register($placeholderResolver->name(), $placeholderResolver);
-        }
+        
+        $this->registerNestedResolvers($resolver);
 
         foreach ($this->patternResolvers as $patternResolver) {
             $resolver->registerPattern($patternResolver->pattern(), $patternResolver);
@@ -136,4 +134,57 @@ private function registerAttributeResolvers(
             );
         }
     }
+
+    private function maskFooterPlaceholders(string $value, array &$placeholderMap): string
+    {
+        $placeholderMap = [];
+        $index = 0;
+
+        return preg_replace_callback(
+            '/\[FOOTER(?:%%[^\]]+)?\]/i',
+            function (array $matches) use (&$placeholderMap, &$index): string {
+                $token = sprintf('__PHPLIST_FOOTER_TOKEN_%d__', $index++);
+                $placeholderMap[$token] = $matches[0];
+
+                return $token;
+            },
+            $value
+        ) ?? $value;
+    }
+
+    /** @param array<string, string> $placeholderMap */
+    private function restoreFooterPlaceholders(string $value, array $placeholderMap): string
+    {
+        if ($placeholderMap === []) {
+            return $value;
+        }
+
+        return strtr($value, $placeholderMap);
+    }
+
+    private function registerNestedResolvers(PlaceholderResolver $resolver): void
+    {
+        foreach ($this->placeholderResolvers as $placeholderResolver) {
+            if (strtoupper($placeholderResolver->name()) !== 'FOOTER') {
+                $resolver->register($placeholderResolver->name(), $placeholderResolver);
+                continue;
+            }
+
+            $resolver->register(
+                $placeholderResolver->name(),
+                function (PlaceholderContext $ctx) use ($placeholderResolver, $resolver): string {
+                    $footer = (string) $placeholderResolver($ctx);
+                    if (!str_contains($footer, '[')) {
+                        return $footer;
+                    }
+
+                    $placeholderMap = [];
+                    $maskedFooter = $this->maskFooterPlaceholders($footer, $placeholderMap);
+                    $resolvedFooter = $resolver->resolve($maskedFooter, $ctx);
+
+                    return $this->restoreFooterPlaceholders($resolvedFooter, $placeholderMap);
+                }
+            );
+        }
+    }
 }
diff --git a/src/Domain/Configuration/Service/Placeholder/FooterValueResolver.php b/src/Domain/Configuration/Service/Placeholder/FooterValueResolver.php
index 506581dd..96e66e77 100644
--- a/src/Domain/Configuration/Service/Placeholder/FooterValueResolver.php
+++ b/src/Domain/Configuration/Service/Placeholder/FooterValueResolver.php
@@ -7,12 +7,13 @@
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
 use PhpList\Core\Domain\Configuration\Model\Dto\PlaceholderContext;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 final class FooterValueResolver implements PlaceholderValueResolverInterface
 {
     public function __construct(
         private readonly ConfigProvider $config,
-        private readonly bool $forwardAlternativeContent,
+        #[Autowire('%messaging.forward_alternative_content%')] private readonly bool $forwardAlternativeContent,
     ) {
     }
 
diff --git a/src/Domain/Configuration/Service/Placeholder/ListsValueResolver.php b/src/Domain/Configuration/Service/Placeholder/ListsValueResolver.php
index 5a77deb4..7df7adcc 100644
--- a/src/Domain/Configuration/Service/Placeholder/ListsValueResolver.php
+++ b/src/Domain/Configuration/Service/Placeholder/ListsValueResolver.php
@@ -6,6 +6,7 @@
 
 use PhpList\Core\Domain\Configuration\Model\Dto\PlaceholderContext;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberListRepository;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class ListsValueResolver implements PlaceholderValueResolverInterface
@@ -13,7 +14,7 @@ final class ListsValueResolver implements PlaceholderValueResolverInterface
     public function __construct(
         private readonly SubscriberListRepository $subscriberListRepository,
         private readonly TranslatorInterface $translator,
-        private readonly bool $showPrivateLists = false,
+        #[Autowire('%app.preference_page_show_private_lists%')] private readonly bool $showPrivateLists = false,
     ) {
     }
 
diff --git a/src/Domain/Configuration/Service/Placeholder/SignatureValueResolver.php b/src/Domain/Configuration/Service/Placeholder/SignatureValueResolver.php
index ebd90daa..b00b9182 100644
--- a/src/Domain/Configuration/Service/Placeholder/SignatureValueResolver.php
+++ b/src/Domain/Configuration/Service/Placeholder/SignatureValueResolver.php
@@ -7,12 +7,13 @@
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
 use PhpList\Core\Domain\Configuration\Model\Dto\PlaceholderContext;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 final class SignatureValueResolver implements PlaceholderValueResolverInterface
 {
     public function __construct(
         private readonly ConfigProvider $config,
-        private readonly bool $emailTextCredits = false,
+        #[Autowire('%messaging.email_text_credits%')] private readonly bool $emailTextCredits = false,
     ) {
     }
 
diff --git a/src/Domain/Identity/Model/AdminAttributeValue.php b/src/Domain/Identity/Model/AdminAttributeValue.php
index 3f4e6c68..f3889085 100644
--- a/src/Domain/Identity/Model/AdminAttributeValue.php
+++ b/src/Domain/Identity/Model/AdminAttributeValue.php
@@ -15,12 +15,12 @@ class AdminAttributeValue implements DomainModel
 {
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: AdminAttributeDefinition::class)]
-    #[ORM\JoinColumn(name: 'adminattributeid', referencedColumnName: 'id', nullable: false)]
+    #[ORM\JoinColumn(name: 'adminattributeid', referencedColumnName: 'id')]
     private AdminAttributeDefinition $attributeDefinition;
 
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: Administrator::class)]
-    #[ORM\JoinColumn(name: 'adminid', referencedColumnName: 'id', nullable: false)]
+    #[ORM\JoinColumn(name: 'adminid', referencedColumnName: 'id')]
     private Administrator $administrator;
 
     #[ORM\Column(name: 'value', type: 'string', length: 255, nullable: true)]
diff --git a/src/Domain/Identity/Service/PermissionChecker.php b/src/Domain/Identity/Service/PermissionChecker.php
index 9986ff59..cce4d514 100644
--- a/src/Domain/Identity/Service/PermissionChecker.php
+++ b/src/Domain/Identity/Service/PermissionChecker.php
@@ -8,6 +8,7 @@
 use PhpList\Core\Domain\Common\Model\Interfaces\OwnableInterface;
 use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Identity\Model\PrivilegeFlag;
+use PhpList\Core\Domain\Messaging\Model\ListMessage;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Model\SubscriberList;
@@ -70,9 +71,7 @@ private function resolveRelatedEntity(DomainModel $resource, string $relatedClas
         }
 
         if ($resource instanceof Message && $relatedClass === SubscriberList::class) {
-            // todo: check which one is correct
-            // return $resource->getListMessages()->map(fn(ListMessage $lm) => $lm->getList())->toArray();
-            return $resource->getListMessages()->map(fn($lm) => $lm->getSubscriberList())->toArray();
+            return $resource->getListMessages()->map(fn(ListMessage $lm) => $lm->getList())->toArray();
         }
 
         return [];
diff --git a/src/Domain/Messaging/Command/ProcessQueueCommand.php b/src/Domain/Messaging/Command/ProcessQueueCommand.php
index 245bc57a..080c24cb 100644
--- a/src/Domain/Messaging/Command/ProcessQueueCommand.php
+++ b/src/Domain/Messaging/Command/ProcessQueueCommand.php
@@ -8,7 +8,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
-use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\CampaignProcessorMessage;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageStatus;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
diff --git a/src/Domain/Messaging/Message/CampaignProcessorMessage.php b/src/Domain/Messaging/Message/CampaignProcessor/CampaignProcessorMessage.php
similarity index 88%
rename from src/Domain/Messaging/Message/CampaignProcessorMessage.php
rename to src/Domain/Messaging/Message/CampaignProcessor/CampaignProcessorMessage.php
index 06220106..574149d8 100644
--- a/src/Domain/Messaging/Message/CampaignProcessorMessage.php
+++ b/src/Domain/Messaging/Message/CampaignProcessor/CampaignProcessorMessage.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Messaging\Message;
+namespace PhpList\Core\Domain\Messaging\Message\CampaignProcessor;
 
 class CampaignProcessorMessage implements CampaignProcessorMessageInterface
 {
diff --git a/src/Domain/Messaging/Message/CampaignProcessorMessageInterface.php b/src/Domain/Messaging/Message/CampaignProcessor/CampaignProcessorMessageInterface.php
similarity index 70%
rename from src/Domain/Messaging/Message/CampaignProcessorMessageInterface.php
rename to src/Domain/Messaging/Message/CampaignProcessor/CampaignProcessorMessageInterface.php
index 0d0bc978..dbf71b25 100644
--- a/src/Domain/Messaging/Message/CampaignProcessorMessageInterface.php
+++ b/src/Domain/Messaging/Message/CampaignProcessor/CampaignProcessorMessageInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Messaging\Message;
+namespace PhpList\Core\Domain\Messaging\Message\CampaignProcessor;
 
 interface CampaignProcessorMessageInterface
 {
diff --git a/src/Domain/Messaging/Message/SyncCampaignProcessorMessage.php b/src/Domain/Messaging/Message/CampaignProcessor/SyncCampaignProcessorMessage.php
similarity index 88%
rename from src/Domain/Messaging/Message/SyncCampaignProcessorMessage.php
rename to src/Domain/Messaging/Message/CampaignProcessor/SyncCampaignProcessorMessage.php
index a310129f..463dc96b 100644
--- a/src/Domain/Messaging/Message/SyncCampaignProcessorMessage.php
+++ b/src/Domain/Messaging/Message/CampaignProcessor/SyncCampaignProcessorMessage.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Messaging\Message;
+namespace PhpList\Core\Domain\Messaging\Message\CampaignProcessor;
 
 class SyncCampaignProcessorMessage implements CampaignProcessorMessageInterface
 {
diff --git a/src/Domain/Messaging/Message/CampaignProcessor/TestCampaignProcessorMessage.php b/src/Domain/Messaging/Message/CampaignProcessor/TestCampaignProcessorMessage.php
new file mode 100644
index 00000000..961e5406
--- /dev/null
+++ b/src/Domain/Messaging/Message/CampaignProcessor/TestCampaignProcessorMessage.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Message\CampaignProcessor;
+
+class TestCampaignProcessorMessage implements CampaignProcessorMessageInterface
+{
+    private int $messageId;
+    private array $listIds;
+    private array $subscriberEmails;
+
+    public function __construct(int $messageId, ?array $listIds = [], ?array $subscriberEmails = [])
+    {
+        $this->messageId = $messageId;
+        $this->listIds = $listIds ?? [];
+        $this->subscriberEmails = $subscriberEmails ?? [];
+    }
+
+    public function getMessageId(): int
+    {
+        return $this->messageId;
+    }
+
+    public function getListIds(): array
+    {
+        return $this->listIds;
+    }
+
+    public function getSubscriberEmails(): array
+    {
+        return $this->subscriberEmails;
+    }
+}
diff --git a/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php b/src/Domain/Messaging/MessageHandler/CampaignProcessor/CampaignProcessorMessageHandler.php
similarity index 96%
rename from src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php
rename to src/Domain/Messaging/MessageHandler/CampaignProcessor/CampaignProcessorMessageHandler.php
index f576d1df..e1aa9219 100644
--- a/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php
+++ b/src/Domain/Messaging/MessageHandler/CampaignProcessor/CampaignProcessorMessageHandler.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Messaging\MessageHandler;
+namespace PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessor;
 
 use DateTime;
 use DateTimeImmutable;
@@ -13,8 +13,8 @@
 use PhpList\Core\Domain\Messaging\Exception\AttachmentCopyException;
 use PhpList\Core\Domain\Messaging\Exception\MessageCacheMissingException;
 use PhpList\Core\Domain\Messaging\Exception\MessageSizeLimitExceededException;
-use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage;
-use PhpList\Core\Domain\Messaging\Message\SyncCampaignProcessorMessage;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\CampaignProcessorMessage;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\SyncCampaignProcessorMessage;
 use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageStatus;
@@ -109,7 +109,11 @@ public function __invoke(CampaignProcessorMessage|SyncCampaignProcessorMessage $
 //        $userSelection = $loadedMessageData['userselection'];
 
         $cacheKey = sprintf('messaging.message.base.%d.%d', $campaign->getId(), 0);
-        if (!$this->precacheService->precacheMessage($campaign, $loadedMessageData)) {
+        if (!$this->precacheService->precacheMessage(
+            campaign: $campaign,
+            loadedMessageData: $loadedMessageData,
+            isTest: false
+        )) {
             $this->updateMessageStatus($campaign, MessageStatus::Suspended);
 
             return;
@@ -199,7 +203,7 @@ private function handleEmailSending(
         UserMessage $userMessage,
         MessagePrecacheDto $precachedContent,
     ): void {
-        // todo: check at which point link tracking should be applied (maybe after constructing ful text?)
+        // todo: check at which point link tracking should be applied (maybe after constructing full text?)
         $processed = $this->messagePreparator->processMessageLinks(
             campaignId: $campaign->getId(),
             cachedMessageDto: $precachedContent,
diff --git a/src/Domain/Messaging/MessageHandler/CampaignProcessor/TestCampaignProcessorMessageHandler.php b/src/Domain/Messaging/MessageHandler/CampaignProcessor/TestCampaignProcessorMessageHandler.php
new file mode 100644
index 00000000..8ae47ea7
--- /dev/null
+++ b/src/Domain/Messaging/MessageHandler/CampaignProcessor/TestCampaignProcessorMessageHandler.php
@@ -0,0 +1,167 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessor;
+
+use PhpList\Core\Domain\Configuration\Model\ConfigOption;
+use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PhpList\Core\Domain\Messaging\Exception\AttachmentCopyException;
+use PhpList\Core\Domain\Messaging\Exception\MessageCacheMissingException;
+use PhpList\Core\Domain\Messaging\Exception\MessageSizeLimitExceededException;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\TestCampaignProcessorMessage;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
+use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
+use PhpList\Core\Domain\Messaging\Service\Builder\EmailBuilder;
+use PhpList\Core\Domain\Messaging\Service\Builder\SystemEmailBuilder;
+use PhpList\Core\Domain\Messaging\Service\MailSizeChecker;
+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\Subscription\Model\Subscriber;
+use PhpList\Core\Domain\Subscription\Service\Provider\SubscriberProvider;
+use Psr\Log\LoggerInterface;
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Symfony\Component\Mime\Address;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Throwable;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ */
+#[AsMessageHandler]
+class TestCampaignProcessorMessageHandler
+{
+    public function __construct(
+        private readonly MailerInterface $mailer,
+        private readonly SubscriberProvider $subscriberProvider,
+        private readonly MessageProcessingPreparator $messagePreparator,
+        private readonly LoggerInterface $logger,
+        private readonly CacheInterface $cache,
+        private readonly TranslatorInterface $translator,
+        private readonly MessageRepository $messageRepository,
+        private readonly MessagePrecacheService $precacheService,
+        private readonly MessageDataLoader $messageDataLoader,
+        private readonly SystemEmailBuilder $systemEmailBuilder,
+        private readonly EmailBuilder $campaignEmailBuilder,
+        private readonly MailSizeChecker $mailSizeChecker,
+        private readonly ConfigProvider $configProvider,
+        #[Autowire('%imap_bounce.email%')] private readonly string $bounceEmail,
+    ) {
+    }
+
+    public function __invoke(TestCampaignProcessorMessage $data): void
+    {
+        $campaign = $this->messageRepository->findById($data->getMessageId());
+        if (!$campaign) {
+            $this->logger->warning(
+                $this->translator->trans('Campaign not found or not in submitted status'),
+                ['campaign_id' => $data->getMessageId()]
+            );
+
+            return;
+        }
+
+        $loadedMessageData = ($this->messageDataLoader)($campaign);
+
+        $cacheKey = sprintf('messaging.message.base.%d.%d.%d', $campaign->getId(), 0, 1);
+        if (!$this->precacheService->precacheMessage(
+            campaign: $campaign,
+            loadedMessageData: $loadedMessageData,
+            isTest: true
+        )) {
+            return;
+        }
+
+        $subscribers = $this->subscriberProvider->getSubscribersForMessageOrLists(data: $data, campaign: $campaign);
+
+        $this->processSubscribersForCampaign(campaign: $campaign, subscribers: $subscribers, cacheKey: $cacheKey);
+    }
+
+    private function handleEmailSending(
+        Message $campaign,
+        Subscriber $subscriber,
+        MessagePrecacheDto $precachedContent,
+    ): void {
+        // todo: check at which point link tracking should be applied (maybe after constructing full text?)
+        $processed = $this->messagePreparator->processMessageLinks(
+            campaignId: $campaign->getId(),
+            cachedMessageDto: $precachedContent,
+            subscriber: $subscriber
+        );
+
+        try {
+            $result = $this->campaignEmailBuilder->buildCampaignEmail(
+                messageId: $campaign->getId(),
+                data: $processed,
+                toEmail: $subscriber->getEmail(),
+                skipBlacklistCheck: false,
+                inBlast: true,
+                htmlPref: $subscriber->hasHtmlEmail(),
+            );
+            if ($result === null) {
+                return;
+            }
+            $email = $result[0];
+            $this->campaignEmailBuilder->applyCampaignHeaders(email: $email, subscriber: $subscriber);
+
+            $this->mailer->send($email);
+            ($this->mailSizeChecker)($campaign, $email, $subscriber->hasHtmlEmail());
+        } catch (MessageSizeLimitExceededException $e) {
+            // stop after the first message if size is exceeded
+            $this->logger->error($e->getMessage(), [
+                'campaign_id' => $campaign->getId(),
+            ]);
+            throw $e;
+        } catch (AttachmentCopyException $e) {
+            // stop after the first message if size is exceeded
+            $data = new MessagePrecacheDto();
+            $data->subject = $this->translator->trans('phpList system error');
+            $data->content = $this->translator->trans($e->getMessage());
+
+            $email = $this->systemEmailBuilder->buildCampaignEmail(
+                messageId: $campaign->getId(),
+                data: $data,
+                toEmail: $this->configProvider->getValue(ConfigOption::ReportAddress) ?? '',
+            );
+
+            $envelope = new Envelope(
+                sender: new Address($this->bounceEmail, 'PHPList'),
+                recipients: [new Address($email->getTo()[0]->getAddress())],
+            );
+            $this->mailer->send(message: $email, envelope: $envelope);
+
+            throw $e;
+        } catch (Throwable $e) {
+            $this->logger->error($e->getMessage(), [
+                'subscriber_id' => $subscriber->getId(),
+                'campaign_id' => $campaign->getId(),
+            ]);
+            $this->logger->warning($this->translator->trans('Failed to send to: %email%', [
+                '%email%' => $subscriber->getEmail(),
+            ]));
+        }
+    }
+
+    private function processSubscribersForCampaign(Message $campaign, array $subscribers, string $cacheKey): void
+    {
+        foreach ($subscribers as $subscriber) {
+            if (!filter_var($subscriber->getEmail(), FILTER_VALIDATE_EMAIL)) {
+                continue;
+            }
+
+            $messagePrecacheDto = $this->cache->get($cacheKey);
+            if ($messagePrecacheDto === null) {
+                throw new MessageCacheMissingException();
+            }
+
+            $this->handleEmailSending($campaign, $subscriber, $messagePrecacheDto);
+        }
+    }
+}
diff --git a/src/Domain/Messaging/Model/Dto/CreateTemplateDto.php b/src/Domain/Messaging/Model/Dto/CreateTemplateDto.php
index b6aa0926..f54d53ab 100644
--- a/src/Domain/Messaging/Model/Dto/CreateTemplateDto.php
+++ b/src/Domain/Messaging/Model/Dto/CreateTemplateDto.php
@@ -14,6 +14,7 @@ public function __construct(
         public readonly bool $shouldCheckLinks = false,
         public readonly bool $shouldCheckImages = false,
         public readonly bool $shouldCheckExternalImages = false,
+        public readonly int $listOrder = 0,
     ) {
     }
 }
diff --git a/src/Domain/Messaging/Model/Dto/Message/MessageContentDto.php b/src/Domain/Messaging/Model/Dto/Message/MessageContentDto.php
index 0ac18672..c5fb5ce8 100644
--- a/src/Domain/Messaging/Model/Dto/Message/MessageContentDto.php
+++ b/src/Domain/Messaging/Model/Dto/Message/MessageContentDto.php
@@ -9,7 +9,6 @@ class MessageContentDto
     public function __construct(
         public readonly string $subject,
         public readonly string $text,
-        public readonly string $textMessage,
         public readonly string $footer,
     ) {
     }
diff --git a/src/Domain/Messaging/Model/Dto/Message/MessageFormatDto.php b/src/Domain/Messaging/Model/Dto/Message/MessageFormatDto.php
index 01bc0474..d6849d26 100644
--- a/src/Domain/Messaging/Model/Dto/Message/MessageFormatDto.php
+++ b/src/Domain/Messaging/Model/Dto/Message/MessageFormatDto.php
@@ -6,10 +6,7 @@
 
 class MessageFormatDto
 {
-    public function __construct(
-        public readonly bool $htmlFormated,
-        public readonly string $sendFormat,
-        public readonly array $formatOptions,
-    ) {
+    public function __construct(public readonly string $sendFormat)
+    {
     }
 }
diff --git a/src/Domain/Messaging/Model/Dto/UpdateTemplateDto.php b/src/Domain/Messaging/Model/Dto/UpdateTemplateDto.php
index 72a70bf9..3e4480c6 100644
--- a/src/Domain/Messaging/Model/Dto/UpdateTemplateDto.php
+++ b/src/Domain/Messaging/Model/Dto/UpdateTemplateDto.php
@@ -14,6 +14,7 @@ public function __construct(
         public readonly bool $shouldCheckLinks = false,
         public readonly bool $shouldCheckImages = false,
         public readonly bool $shouldCheckExternalImages = false,
+        public readonly int $listOrder = 0,
     ) {
     }
 }
diff --git a/src/Domain/Messaging/Model/Filter/MessageFilter.php b/src/Domain/Messaging/Model/Filter/MessageFilter.php
index ef1211cf..ccb5b1ac 100644
--- a/src/Domain/Messaging/Model/Filter/MessageFilter.php
+++ b/src/Domain/Messaging/Model/Filter/MessageFilter.php
@@ -11,6 +11,7 @@
 class MessageFilter extends PaginatedFilter implements FilterRequestInterface
 {
     private ?Administrator $owner = null;
+    private ?string $subject = null;
 
     public function getOwner(): ?Administrator
     {
@@ -22,4 +23,18 @@ public function setOwner(?Administrator $admin): self
         $this->owner = $admin;
         return $this;
     }
+
+    public function getSubject(): ?string
+    {
+        return $this->subject;
+    }
+
+    public function setSubject(?string $subject): self
+    {
+        if ($subject !== null) {
+            $subject = trim($subject);
+        }
+        $this->subject = $subject;
+        return $this;
+    }
 }
diff --git a/src/Domain/Messaging/Model/Message.php b/src/Domain/Messaging/Model/Message.php
index c70ff01c..4d5f4e8f 100644
--- a/src/Domain/Messaging/Model/Message.php
+++ b/src/Domain/Messaging/Model/Message.php
@@ -61,6 +61,9 @@ class Message implements DomainModel, Identity, ModificationDate, OwnableInterfa
     #[ORM\JoinColumn(name: 'template', referencedColumnName: 'id', nullable: true, onDelete: 'SET NULL')]
     private ?Template $template = null;
 
+    /**
+     * @var Collection<int, ListMessage>
+     */
     #[ORM\OneToMany(targetEntity: ListMessage::class, mappedBy: 'message')]
     private Collection $listMessages;
 
@@ -190,6 +193,9 @@ public function setOptions(MessageOptions $options): self
         return $this;
     }
 
+    /**
+     * @return Collection<int, ListMessage>
+     */
     public function getListMessages(): Collection
     {
         return $this->listMessages;
diff --git a/src/Domain/Messaging/Model/Message/MessageFormat.php b/src/Domain/Messaging/Model/Message/MessageFormat.php
index 1f857c37..419b63df 100644
--- a/src/Domain/Messaging/Model/Message/MessageFormat.php
+++ b/src/Domain/Messaging/Model/Message/MessageFormat.php
@@ -55,6 +55,11 @@ public function getSendFormat(): ?string
         return $this->sendFormat;
     }
 
+    public function isInvitation(): bool
+    {
+        return $this->sendFormat === 'invite';
+    }
+
     public function setSendFormat(?string $sendFormat): self
     {
         $this->sendFormat = $sendFormat;
diff --git a/src/Domain/Messaging/Model/Message/MessageMetadata.php b/src/Domain/Messaging/Model/Message/MessageMetadata.php
index 4d774143..c571bd1f 100644
--- a/src/Domain/Messaging/Model/Message/MessageMetadata.php
+++ b/src/Domain/Messaging/Model/Message/MessageMetadata.php
@@ -6,8 +6,8 @@
 
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
-use InvalidArgumentException;
 use PhpList\Core\Domain\Common\Model\Interfaces\EmbeddableInterface;
+use Symfony\Component\Validator\Exception\ValidatorException;
 
 #[ORM\Embeddable]
 class MessageMetadata implements EmbeddableInterface
@@ -57,7 +57,11 @@ public function getStatus(): ?MessageStatus
     public function setStatus(MessageStatus $status): self
     {
         if (!$this->getStatus()->canTransitionTo($status)) {
-            throw new InvalidArgumentException('Invalid status transition');
+            throw new ValidatorException(
+                'status: Invalid transition ' . $this->status . ' -> ' . $status->value
+                . PHP_EOL .
+                'metadata.status: Invalid transition ' . $this->status . ' -> ' . $status->value
+            );
         }
         $this->status = $status->value;
 
diff --git a/src/Domain/Messaging/Model/Message/MessageStatus.php b/src/Domain/Messaging/Model/Message/MessageStatus.php
index 90b7f987..789f07c2 100644
--- a/src/Domain/Messaging/Model/Message/MessageStatus.php
+++ b/src/Domain/Messaging/Model/Message/MessageStatus.php
@@ -22,12 +22,13 @@ enum MessageStatus: string
     public function allowedTransitions(): array
     {
         return match ($this) {
-            self::Draft, self::Suspended => [self::Submitted],
-            self::Submitted => [self::Prepared, self::InProcess],
-            self::Prepared => [self::InProcess],
+            self::Draft => [self::Prepared, self::Submitted],
+            self::Suspended => [self::Submitted, self::Requeued],
+            self::Submitted => [self::Prepared, self::InProcess, self::Suspended],
+            self::Prepared => [self::InProcess, self::Suspended],
             self::InProcess => [self::Sent, self::Suspended, self::Submitted],
             self::Requeued => [self::InProcess, self::Suspended],
-            self::Sent => [],
+            self::Sent => [self::Requeued],
         };
     }
 
diff --git a/src/Domain/Messaging/Model/Template.php b/src/Domain/Messaging/Model/Template.php
index efff0de4..dc1b67a0 100644
--- a/src/Domain/Messaging/Model/Template.php
+++ b/src/Domain/Messaging/Model/Template.php
@@ -59,12 +59,19 @@ public function getTitle(): string
 
     public function getContent(): ?string
     {
+        if ($this->content === null) {
+            return null;
+        }
+
         if (is_resource($this->content)) {
             rewind($this->content);
-            return stream_get_contents($this->content);
+            $value = stream_get_contents($this->content);
+            rewind($this->content);
+
+            return $value === false ? null : $value;
         }
 
-        return $this->content;
+        return (string) $this->content;
     }
 
     public function getText(): ?string
@@ -95,14 +102,30 @@ public function setTitle(string $title): self
 
     public function setContent(?string $content): self
     {
-        $this->content = $content !== null ? fopen('data://text/plain,' . $content, 'r') : null;
+        if ($content === null) {
+            $this->content = null;
+            return $this;
+        }
+
+        $stream = fopen('php://temp', 'r+');
+        fwrite($stream, $content);
+        rewind($stream);
+
+        $this->content = $stream;
+
         return $this;
     }
 
-
     public function setText(?string $text): self
     {
-        $this->text = $text !== null ? fopen('data://text/plain,' . $text, 'r') : null;
+        if ($text === null) {
+            $text = '[CONTENT]';
+        }
+        $stream = fopen('data://text/plain,' . $text, 'r');
+        rewind($stream);
+
+        $this->text = $stream;
+
         return $this;
     }
 
diff --git a/src/Domain/Messaging/Model/TemplateImage.php b/src/Domain/Messaging/Model/TemplateImage.php
index 2cc5288f..c1c5c8c4 100644
--- a/src/Domain/Messaging/Model/TemplateImage.php
+++ b/src/Domain/Messaging/Model/TemplateImage.php
@@ -98,7 +98,7 @@ public function setFilename(?string $filename): self
 
     public function setData(?string $data): self
     {
-        $this->data = $data !== null ? fopen('data://text/plain,' . $data, 'r') : null;
+        $this->data = $data !== null ? fopen('data://text/plain,' . rawurlencode($data), 'r') : null;
         return $this;
     }
 
diff --git a/src/Domain/Messaging/Model/UserMessage.php b/src/Domain/Messaging/Model/UserMessage.php
index 3f3c9cdf..d5fe202c 100644
--- a/src/Domain/Messaging/Model/UserMessage.php
+++ b/src/Domain/Messaging/Model/UserMessage.php
@@ -22,12 +22,12 @@ class UserMessage implements DomainModel
 {
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: Subscriber::class)]
-    #[ORM\JoinColumn(name: 'userid', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(name: 'userid', referencedColumnName: 'id', onDelete: 'CASCADE')]
     private Subscriber $user;
 
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: Message::class)]
-    #[ORM\JoinColumn(name: 'messageid', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(name: 'messageid', referencedColumnName: 'id', onDelete: 'CASCADE')]
     private Message $message;
 
     #[ORM\Column(name: 'entered', type: 'datetime')]
diff --git a/src/Domain/Messaging/Repository/BounceRepository.php b/src/Domain/Messaging/Repository/BounceRepository.php
index 410f5da1..9034f634 100644
--- a/src/Domain/Messaging/Repository/BounceRepository.php
+++ b/src/Domain/Messaging/Repository/BounceRepository.php
@@ -8,6 +8,8 @@
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
+use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Model\UserMessageBounce;
 
 class BounceRepository extends AbstractRepository implements PaginatableRepositoryInterface
 {
@@ -18,4 +20,39 @@ public function findByStatus(string $status): array
     {
         return $this->findBy(['status' => $status]);
     }
+
+    /**
+     * Returns bounce totals grouped by campaign, matching legacy msgbounces listing data.
+     *
+     * @param int|null $ownerId Limit results to campaigns owned by this admin when provided.
+     * @return array<int, array{messageId: int, subject: string, totalBounces: int}>
+     */
+    public function getCampaignBounceTotals(?int $ownerId = null): array
+    {
+        $queryBuilder = $this->getEntityManager()
+            ->createQueryBuilder()
+            ->select('m.id AS messageId', 'm.content.subject AS subject', 'COUNT(umb.bounceId) AS totalBounces')
+            ->from(Message::class, 'm')
+            ->innerJoin(UserMessageBounce::class, 'umb', 'ON', 'umb.messageId = m.id')
+            ->groupBy('m.id, m.content.subject')
+            ->orderBy('m.id', 'ASC');
+
+        if ($ownerId !== null) {
+            $queryBuilder
+                ->andWhere('IDENTITY(m.owner) = :ownerId')
+                ->setParameter('ownerId', $ownerId);
+        }
+
+        /** @var array<int, array{messageId: string|int, subject: string, totalBounces: string|int}> $rows */
+        $rows = $queryBuilder->getQuery()->getArrayResult();
+
+        return array_map(
+            static fn (array $row): array => [
+                'messageId' => (int) $row['messageId'],
+                'subject' => $row['subject'],
+                'totalBounces' => (int) $row['totalBounces'],
+            ],
+            $rows
+        );
+    }
 }
diff --git a/src/Domain/Messaging/Repository/MessageRepository.php b/src/Domain/Messaging/Repository/MessageRepository.php
index 10ee8629..d18ce68b 100644
--- a/src/Domain/Messaging/Repository/MessageRepository.php
+++ b/src/Domain/Messaging/Repository/MessageRepository.php
@@ -60,6 +60,11 @@ public function getFilteredAfterId(FilterRequestInterface $filter): PaginatedRes
                 ->setParameter('ownerId', $filter->getOwner()->getId());
         }
 
+        if ($filter instanceof MessageFilter && $filter->getSubject() !== null) {
+            $queryBuilder->andWhere('m.content.subject LIKE :subject')
+                ->setParameter('subject', '%' . $filter->getSubject() . '%');
+        }
+
         $countQb = clone $queryBuilder;
         $total = (int) $countQb
             ->select('COUNT(DISTINCT m.id)')
diff --git a/src/Domain/Messaging/Repository/TemplateImageRepository.php b/src/Domain/Messaging/Repository/TemplateImageRepository.php
index 60a48b39..16fce26a 100644
--- a/src/Domain/Messaging/Repository/TemplateImageRepository.php
+++ b/src/Domain/Messaging/Repository/TemplateImageRepository.php
@@ -7,6 +7,7 @@
 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;
 use PhpList\Core\Domain\Messaging\Model\TemplateImage;
 
 class TemplateImageRepository extends AbstractRepository implements PaginatableRepositoryInterface
@@ -43,4 +44,15 @@ public function findByTemplateIdAndFilename(int $templateId, string $filename):
             ->getQuery()
             ->getOneOrNullResult();
     }
+
+    public function poweredByImageExists(Template $template): bool
+    {
+        return $this->createQueryBuilder('ti')
+            ->andWhere('ti.template = :templateId')
+            ->setParameter('templateId', $template->getId())
+            ->andWhere('ti.filename = :filename')
+            ->setParameter('filename', 'powerphplist.png')
+            ->getQuery()
+            ->getOneOrNullResult() !== null;
+    }
 }
diff --git a/src/Domain/Messaging/Repository/TemplateRepository.php b/src/Domain/Messaging/Repository/TemplateRepository.php
index b84f2837..7cc40e9e 100644
--- a/src/Domain/Messaging/Repository/TemplateRepository.php
+++ b/src/Domain/Messaging/Repository/TemplateRepository.php
@@ -4,6 +4,8 @@
 
 namespace PhpList\Core\Domain\Messaging\Repository;
 
+use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
+use PhpList\Core\Domain\Common\Model\PaginatedResult;
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
@@ -17,4 +19,37 @@ public function findOneById(int $id): ?Template
     {
         return $this->findOneBy(['id' => $id]);
     }
+
+    /**
+     * @return PaginatedResult<Template>
+     */
+    public function getFilteredAfterId(FilterRequestInterface $filter): PaginatedResult
+    {
+        $lastId = $filter->getLastId();
+        $limit = $filter->getLimit();
+
+        $queryBuilder = $this->createQueryBuilder('t')
+            ->leftJoin('t.images', 'ti');
+
+        $countQb = clone $queryBuilder;
+        $total = (int) $countQb
+            ->select('COUNT(DISTINCT t.id)')
+            ->getQuery()
+            ->getSingleScalarResult();
+
+        /** @var list<Template> $items */
+        $items = $queryBuilder
+            ->andWhere('t.id > :lastId')
+            ->setParameter('lastId', $lastId)
+            ->setMaxResults($limit)
+            ->getQuery()
+            ->getResult();
+
+        return new PaginatedResult(
+            items: $items,
+            total: $total,
+            limit: $limit,
+            lastId: $lastId,
+        );
+    }
 }
diff --git a/src/Domain/Messaging/Repository/UserMessageBounceRepository.php b/src/Domain/Messaging/Repository/UserMessageBounceRepository.php
index 0dc9fb38..7739f43b 100644
--- a/src/Domain/Messaging/Repository/UserMessageBounceRepository.php
+++ b/src/Domain/Messaging/Repository/UserMessageBounceRepository.php
@@ -12,6 +12,7 @@
 use PhpList\Core\Domain\Messaging\Model\UserMessage;
 use PhpList\Core\Domain\Messaging\Model\UserMessageBounce;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
+use PhpList\Core\Domain\Subscription\Model\Subscription;
 
 class UserMessageBounceRepository extends AbstractRepository implements PaginatableRepositoryInterface
 {
@@ -27,6 +28,51 @@ public function getCountByMessageId(int $messageId): int
             ->getSingleScalarResult();
     }
 
+    /**
+     * Returns bounce totals per subscriber for a specific list.
+     * This matches the legacy listbounces data shape.
+     *
+     * @return array<int, array{
+     *   subscriberId: int,
+     *   email: string,
+     *   confirmed: bool,
+     *   blacklisted: bool,
+     *   totalBounces: int
+     * }>
+     */
+    public function getListBounceTotals(int $listId): array
+    {
+        $rows = $this->getEntityManager()
+            ->createQueryBuilder()
+            ->select(
+                'subscriber.id AS subscriberId',
+                'subscriber.email AS email',
+                'subscriber.confirmed AS confirmed',
+                'subscriber.blacklisted AS blacklisted',
+                'COUNT(umb.id) AS totalBounces'
+            )
+            ->from(Subscriber::class, 'subscriber')
+            ->innerJoin(Subscription::class, 'subscription', 'ON', 'subscription.subscriber = subscriber')
+            ->innerJoin(UserMessageBounce::class, 'umb', 'ON', 'umb.userId = subscriber.id')
+            ->where('IDENTITY(subscription.subscriberList) = :listId')
+            ->setParameter('listId', $listId)
+            ->groupBy('subscriber.id, subscriber.email, subscriber.confirmed, subscriber.blacklisted')
+            ->orderBy('subscriber.id', 'ASC')
+            ->getQuery()
+            ->getArrayResult();
+
+        return array_map(
+            static fn (array $row): array => [
+                'subscriberId' => (int) $row['subscriberId'],
+                'email' => (string) $row['email'],
+                'confirmed' => (bool) $row['confirmed'],
+                'blacklisted' => (bool) $row['blacklisted'],
+                'totalBounces' => (int) $row['totalBounces'],
+            ],
+            $rows
+        );
+    }
+
     /**
      * Counts bounces between two dates.
      *
diff --git a/src/Domain/Messaging/Resources/Templates/responsive.html b/src/Domain/Messaging/Resources/Templates/responsive.html
new file mode 100644
index 00000000..df5b0504
--- /dev/null
+++ b/src/Domain/Messaging/Resources/Templates/responsive.html
@@ -0,0 +1,328 @@
+<!doctype html>
+<html>
+<head><meta name="viewport" content="width=device-width" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>[SUBJECT]</title>
+    <style type="text/css">/* -------------------------------------
+              GLOBAL RESETS
+          ------------------------------------- */
+
+    /*All the styling goes here*/
+
+    img {
+        border: none;
+        -ms-interpolation-mode: bicubic;
+        max-width: 100%;
+    }
+
+    /* -------------------------------------
+        BODY & CONTAINER
+    ------------------------------------- */
+    .body {
+        background-color: #f6f6f6;
+        width: 100%;
+    }
+    /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
+    .templatecontainer {
+        display: block;
+        margin: 0 auto !important;
+        /* makes it centered */
+        max-width: 580px;
+        padding: 10px;
+        width: 580px;
+    }
+    .logo {
+        padding-bottom: 10px;
+    }
+
+    /* This should also be a block element, so that it will fill 100% of the .container */
+    .templatecontent {
+        box-sizing: border-box;
+        display: block;
+        margin: 0 auto;
+        max-width: 580px;
+        padding: 10px;
+    }
+    /* -------------------------------------
+        HEADER, FOOTER, MAIN
+    ------------------------------------- */
+    .main {
+        background: #ffffff;
+        border-radius: 3px;
+        width: 100%;
+    }
+    .wrapper {
+        box-sizing: border-box;
+        padding: 20px;
+    }
+    .templatecontent-block {
+        padding-bottom: 10px;
+        padding-top: 10px;
+    }
+    .footer {
+        clear: both;
+        margin-top: 10px;
+        text-align: center;
+        width: 100%;
+    }
+    .footer td,
+    .footer p,
+    .footer span,
+    .footer a {
+        color: #999999;
+        font-size: 12px;
+        text-align: center;
+    }
+    /* -------------------------------------
+        TYPOGRAPHY
+    ------------------------------------- */
+    h1,
+    h2,
+    h3,
+    h4 {
+        color: #000000;
+        font-family: sans-serif;
+        font-weight: 400;
+        line-height: 1.4;
+        margin: 0;
+        margin-bottom: 30px;
+    }
+    h1 {
+        font-size: 35px;
+        font-weight: 300;
+        text-align: center;
+        text-transform: capitalize;
+    }
+    p,
+    ul,
+    ol {
+        font-family: sans-serif;
+        font-size: 14px;
+        font-weight: normal;
+        margin: 0;
+        margin-bottom: 15px;
+    }
+    p li,
+    ul li,
+    ol li {
+        list-style-position: inside;
+        margin-left: 5px;
+    }
+    /* -------------------------------------
+        BUTTONS
+    ------------------------------------- */
+    .templatebtn {
+        box-sizing: border-box;
+        width: 100%; }
+    .templatebtn > tbody > tr > td {
+        padding-bottom: 15px; }
+    .templatebtn table {
+        width: auto;
+    }
+    .templatebtn table td {
+        background-color: #ffffff;
+        border-radius: 5px;
+        text-align: center;
+    }
+    .templatebtn a {
+        background-color: #ffffff;
+        border: solid 1px #3498db;
+        border-radius: 5px;
+        box-sizing: border-box;
+        color: #3498db;
+        cursor: pointer;
+        display: inline-block;
+        font-size: 14px;
+        font-weight: bold;
+        margin: 0;
+        padding: 12px 25px;
+        text-decoration: none;
+        text-transform: capitalize;
+    }
+    .templatebtn-primary table td {
+        background-color: #3498db;
+    }
+    .templatebtn-primary a {
+        background-color: #3498db;
+        border-color: #3498db;
+        color: #ffffff;
+    }
+    /* -------------------------------------
+        OTHER STYLES THAT MIGHT BE USEFUL
+    ------------------------------------- */
+    .last {
+        margin-bottom: 0;
+    }
+    .first {
+        margin-top: 0;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .align-right {
+        text-align: right;
+    }
+    .align-left {
+        text-align: left;
+    }
+    .clear {
+        clear: both;
+    }
+    .mt0 {
+        margin-top: 0;
+    }
+    .mb0 {
+        margin-bottom: 0;
+    }
+    .preheader {
+        color: transparent;
+        display: none;
+        height: 0;
+        max-height: 0;
+        max-width: 0;
+        opacity: 0;
+        overflow: hidden;
+        mso-hide: all;
+        visibility: hidden;
+        width: 0;
+    }
+    .powered-by a {
+        text-decoration: none;
+    }
+    hr {
+        border: 0;
+        border-bottom: 1px solid #f6f6f6;
+        margin: 20px 0;
+    }
+    /* -------------------------------------
+        RESPONSIVE AND MOBILE FRIENDLY STYLES
+    ------------------------------------- */
+    @media only screen and (max-width: 620px) {
+        table[class=body] h1 {
+            font-size: 28px !important;
+            margin-bottom: 10px !important;
+        }
+        table[class=body] p,
+        table[class=body] ul,
+        table[class=body] ol,
+        table[class=body] td,
+        table[class=body] span,
+        table[class=body] a {
+            font-size: 16px !important;
+        }
+        table[class=body] .wrapper,
+        table[class=body] .article {
+            padding: 10px !important;
+        }
+        table[class=body] .templatecontent {
+            padding: 0 !important;
+        }
+        table[class=body] .templatecontainer {
+            padding: 0 !important;
+            width: 100% !important;
+        }
+        table[class=body] .main {
+            border-left-width: 0 !important;
+            border-radius: 0 !important;
+            border-right-width: 0 !important;
+        }
+        table[class=body] .templatebtn table {
+            width: 100% !important;
+        }
+        table[class=body] .templatebtn a {
+            width: 100% !important;
+        }
+        table[class=body] .img-responsive {
+            height: auto !important;
+            max-width: 100% !important;
+            width: auto !important;
+        }
+    }
+    /* -------------------------------------
+        PRESERVE THESE STYLES IN THE HEAD
+    ------------------------------------- */
+    @media all {
+        .ExternalClass {
+            width: 100%;
+        }
+        .ExternalClass,
+        .ExternalClass p,
+        .ExternalClass span,
+        .ExternalClass font,
+        .ExternalClass td,
+        .ExternalClass div {
+            line-height: 100%;
+        }
+        .apple-link a {
+            font-family: inherit !important;
+            font-size: inherit !important;
+            font-weight: bold !important;
+            line-height: inherit !important;
+        }
+        .templatebtn-primary table td:hover {
+            background-color: #34495e !important;
+        }
+        .templatebtn-primary a:hover {
+            background-color: #34495e !important;
+            border-color: #34495e !important;
+        }
+    }
+    </style>
+</head>
+<body style=" background-color: #f6f6f6;font-family: sans-serif;-webkit-font-smoothing: antialiased;font-size: 14px;line-height: 1.4;margin: 0;padding: 0;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
+<p>&nbsp;</p>
+
+<table border="0" cellpadding="0" cellspacing="0" class="body" role="presentation" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+    <tbody>
+    <tr>
+        <td style="font-family: sans-serif;font-size: 14px;vertical-align: top;">&nbsp;</td>
+        <td class="container" style="font-family: sans-serif;font-size: 14px;vertical-align: top;">
+            <div class="templatecontent">
+                <div class="logo">
+                    <center><img src="[LOGO]" /></center>
+                </div>
+                <!-- START CENTERED WHITE CONTAINER -->
+
+                <table class="main" role="presentation" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;"><!-- START MAIN CONTENT AREA -->
+                    <tbody>
+                    <tr>
+                        <td class="wrapper" style="font-family: sans-serif;font-size: 14px;vertical-align: top;">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                                <tbody>
+                                <tr>
+                                    <td style="font-family: sans-serif;font-size: 14px;vertical-align: top;">
+                                        <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
+                                        [CONTENT]
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>
+                    <!-- END MAIN CONTENT AREA -->
+                    </tbody>
+                </table>
+                <!-- START FOOTER -->
+
+                <div class="footer">
+                    <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
+                        <tbody>
+                        <tr>
+                            <td class="templatecontent-block" style="font-family: sans-serif;font-size: 13px;vertical-align: top;">
+                                <span class="apple-link">[FOOTER]</span>
+                                <div>
+                                    <div style="color: #3498db; text-decoration: underline;">[CONTACT]</div>|<div>
+                                    <a href="[FORWARDURL]" style="color: #3498db; text-decoration: underline;">Forward this message</a></div>
+                                </div>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <!-- END FOOTER --><!-- END CENTERED WHITE CONTAINER --></div>
+        </td>
+        <td>&nbsp;</td>
+    </tr>
+    </tbody>
+</table>
+</body>
+</html>
diff --git a/src/Domain/Messaging/Resources/Templates/system.html b/src/Domain/Messaging/Resources/Templates/system.html
new file mode 100644
index 00000000..3772d695
--- /dev/null
+++ b/src/Domain/Messaging/Resources/Templates/system.html
@@ -0,0 +1,8 @@
+<div style="margin:0; text-align:center; width:100%; background:#EEE;min-width:240px;height:100%;"><br />
+    <div style="width:96%;margin:0 auto; border-top:6px solid #369;border-bottom: 6px solid #369;background:#DEF;" >
+        <h3 style="margin-top:5px;background-color:#69C; font-weight:normal; color:#FFF; text-align:center; margin-bottom:5px; padding:10px; line-height:1.2; font-size:21px; text-transform:capitalize;">[SUBJECT]</h3>
+        <div style="text-align:justify;background:#FFF;padding:20px; border-top:2px solid #369;min-height:200px;font-size:13px; border-bottom:2px solid #369;">[CONTENT]<div style="clear:both"></div></div>
+        <div style="clear:both;background:#69C;font-weight:normal; padding:10px;color:#FFF;text-align:center;font-size:11px;margin:5px 0px">[FOOTER]<br/>[SIGNATURE]</div>
+    </div>
+    <br />
+</div>
diff --git a/src/Domain/Messaging/Resources/Templates/templates.json b/src/Domain/Messaging/Resources/Templates/templates.json
new file mode 100644
index 00000000..c6a33102
--- /dev/null
+++ b/src/Domain/Messaging/Resources/Templates/templates.json
@@ -0,0 +1,14 @@
+[
+  {
+    "key": "system",
+    "name": "System",
+    "file": "system.html",
+    "description": "Default system email wrapper"
+  },
+  {
+    "key": "responsive",
+    "name": "Responsive",
+    "file": "responsive.html",
+    "description": "Responsive email layout"
+  }
+]
diff --git a/src/Domain/Messaging/Service/Builder/MessageBuilder.php b/src/Domain/Messaging/Service/Builder/MessageBuilder.php
index bb7fd852..89935ee0 100644
--- a/src/Domain/Messaging/Service/Builder/MessageBuilder.php
+++ b/src/Domain/Messaging/Service/Builder/MessageBuilder.php
@@ -27,7 +27,7 @@ public function build(MessageDtoInterface $createMessageDto, object $context = n
             throw new InvalidContextTypeException(get_debug_type($context));
         }
 
-        $format = $this->messageFormatBuilder->build($createMessageDto->getFormat());
+        $format = $this->messageFormatBuilder->build($createMessageDto);
         $schedule = $this->messageScheduleBuilder->build($createMessageDto->getSchedule());
         $content = $this->messageContentBuilder->build($createMessageDto->getContent());
         $options = $this->messageOptionsBuilder->build($createMessageDto->getOptions());
@@ -42,6 +42,7 @@ public function build(MessageDtoInterface $createMessageDto, object $context = n
             $context->getExisting()->setContent($content);
             $context->getExisting()->setOptions($options);
             $context->getExisting()->setTemplate($template);
+
             return $context->getExisting();
         }
 
diff --git a/src/Domain/Messaging/Service/Builder/MessageContentBuilder.php b/src/Domain/Messaging/Service/Builder/MessageContentBuilder.php
index 806afe00..b1393b2e 100644
--- a/src/Domain/Messaging/Service/Builder/MessageContentBuilder.php
+++ b/src/Domain/Messaging/Service/Builder/MessageContentBuilder.php
@@ -4,22 +4,31 @@
 
 namespace PhpList\Core\Domain\Messaging\Service\Builder;
 
+use PhpList\Core\Domain\Common\Html2Text;
 use PhpList\Core\Domain\Messaging\Exception\InvalidDtoTypeException;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageContentDto;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
 
 class MessageContentBuilder
 {
+    public function __construct(private readonly Html2Text $html2Text)
+    {
+    }
+
     public function build(object $dto): MessageContent
     {
         if (!$dto instanceof MessageContentDto) {
             throw new InvalidDtoTypeException(get_debug_type($dto));
         }
 
+        $textMessage = strip_tags($dto->text) !== $dto->text
+            ? ($this->html2Text)($dto->text)
+            : $dto->text;
+
         return new MessageContent(
             subject: $dto->subject,
             text: $dto->text,
-            textMessage: $dto->textMessage,
+            textMessage: $textMessage,
             footer: $dto->footer
         );
     }
diff --git a/src/Domain/Messaging/Service/Builder/MessageFormatBuilder.php b/src/Domain/Messaging/Service/Builder/MessageFormatBuilder.php
index 2bd5cf7f..9e55c830 100644
--- a/src/Domain/Messaging/Service/Builder/MessageFormatBuilder.php
+++ b/src/Domain/Messaging/Service/Builder/MessageFormatBuilder.php
@@ -4,21 +4,18 @@
 
 namespace PhpList\Core\Domain\Messaging\Service\Builder;
 
-use PhpList\Core\Domain\Messaging\Exception\InvalidDtoTypeException;
-use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageFormatDto;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessageDtoInterface;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageFormat;
 
 class MessageFormatBuilder
 {
-    public function build(object $dto): MessageFormat
+    public function build(MessageDtoInterface $dto): MessageFormat
     {
-        if (!$dto instanceof MessageFormatDto) {
-            throw new InvalidDtoTypeException(get_debug_type($dto));
-        }
+        $htmlFormatted = strip_tags($dto->getContent()->text) !== $dto->getContent()->text;
 
         return new MessageFormat(
-            htmlFormatted: $dto->htmlFormated,
-            sendFormat: $dto->sendFormat,
+            htmlFormatted: $htmlFormatted,
+            sendFormat: $dto->getFormat()->sendFormat,
         );
     }
 }
diff --git a/src/Domain/Messaging/Service/Manager/ImageProvider.php b/src/Domain/Messaging/Service/Manager/ImageProvider.php
new file mode 100644
index 00000000..14d9e9a9
--- /dev/null
+++ b/src/Domain/Messaging/Service/Manager/ImageProvider.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Service\Manager;
+
+class ImageProvider
+{
+    private const NEW_POWERED_IMAGE = 'iVBORw0KGgoAAAANSUhEUgAAAEsAAAAhCAYAAACRIVbWAAAABHNCSVQICAgIfAhkiAAAAAlwSFl'
+    . 'zAAALEgAACxIB0t1+/AAAAB50RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNS4xqx9I6wAADmhJREFUaIHtmntw1FWWxz+/Xz/T6aQ'
+    . 'TQgIkJgR5LGRIFDcPsSAEWEFkZSIisPIcRaTKEkEMwUGXRRaZWlSylKPrqBDFGCXyUAqiKLUg6ADBhCRAEGQhWU1IIpru9Lt/j/2jkx/ppEOw'
+    . 'ZmoetX6rurrv45x77/fec+65t69AN4zOyMgDFgP5gK17+f8D2IG9QPGZmprDqqpqBULnj9EZGTFAMfDrv3Tv/obxEbC4trq6DTrI6iDqMHDbX'
+    . '69ff7OoBvJqq6vbxI6MYn4hqjfcRpAfhA4f9d9/zd78nWCiHljRW+nwzPGk507T0g11VZwqLwPAZLEybtbD2PoPxP7DVY59uA2f20lK2hgSBg/j'
+    . 'VHkZtviBZE6bzaF3tgIwfdlv2f9fL/TQC3BoR7DO5AXLtbyuem9WpvaLci6eOtpjLLb4gSH1ju3aTkv9xaD8wuVaO+m50/C6neF0rBCBvN7IssU'
+    . 'HiTj1SRmnPiljRJcOT1/2WwBOfVIWkva6nKTn3gtcJ9tksZKSNgZb/MCwek99Uoa99Sq2+EGYI61aHsC4WQ/ftEztF+VkTXuQ4Znjw4wltF5nfw'
+    . 'Fs/QeSPmGatgB8bmc4OvL09BEe2FubaDhXFfydOw1TpBVb/EBs8YPY/XKwwYZzVfxm03Zs8QNpqb+IuaNOyqgxAIzIHE9U3ACunKlEkiQURUFVF'
+    . 'GRZBqD+bCUAsizjcbbzPzUVAPRPvpUBqSN+lozBbCF55G3UHQ/1LLIso6rBb0WWMVmsSJIEwJGdb/BgwX9gNEdy9fIFTZderw/hOyQVDuMeeJh'
+    . 'xDzyskVJ7pJwBqcOxtzb1INUWPwh761UazlUxPHM8KWljOLZrGylpY4juP5CT+9/X6g/+1R3Y4geFDLwz/+nizzSdH/9+Q58y3fvxD1m5Ycts8Y'
+    . 'PIvncOAD53O+ZIK16Xk+YrF7lQcYTs6XN4o2Bhr1z0SdaxXds0P9UJr8uJOdIaktfZMEBz/UWyps2mpf4iDedOkzVtNiaLlfpz1wdYfXg/J/d/0'
+    . 'KO9+rOVHCwuYsG/vUr14f00X7nYp0xIPyxWvOHNiOYrFyjbXAhA7oNLyMibrun7puKLjsluCisLIIbNVRRt6Ssdv7t+Gi/VYbJYSRs3FUmSSB'
+    . 's3FZPFSuOlOiRJ4nLtKUwWK+dPHqHxUh1eVzvNVy5qZPYFe2sTnxVvIffBJQxIHX5TMhCcsBHZE3pddV1hSxh003o70efK6g0f/34DMx5/jim'
+    . 'LV/Qwl+YrF7G3NlF/thK9KFJ75ECwMTE4N6IgMG7WI+Q+uEST2V64mIDHhd/tRC+KXPr6GMc+fIs7p89l/2sbbyjT1XRPHdjJuS/KtbY60b1'
+    . 'ew7kqznap17Xt3iCMzshQe+QqCpKi/CzyekM3J/l3jfAjEQSNYUEQkCQZj8eNXq8nOjqayMhIVFXF7XZjt9uRZRmLxYJOp6PrwfPPRfifikAg'
+    . 'gCAIf/LE9SIdHLAgCnjcHvz+AP+YeQdT7p7CqFGjSEhIQFVVWltbqamp4dChQ5w+fRqj0YjZbA4hDIA+SFMUBa/XS4TZjHADM7gRZFnG5/N'
+    . 'hiYgAQQjJH5SQgM/vp62tDZ1O16sOt9uN0WjEYDAEGeiiB3oxQ0FVAAG3243BYGDZsmXMnTuXAQMGhG2ksbGR0tJS3nzzTRRFwWQyoaoqkqIE'
+    . 'Z/MGZCmKgsViITMzk4qKCrxeL0K3TvYFRVGIjY0lLS2NEydOIMsygiAQCARISUlh586dtLS0MG/ePFwuV1jCVFVl7NixXLlyhe+//x6dXt+DrL'
+    . 'DTqKgqfr8fm83GunXrePLJJ0OI8ng8vPLKKzz11FPU1dWRmJjIqlWreOaZZ1BVVVv2NwO/38+wYcN47bXXGDp0KD6f7+fwBIDX62Xs2LG8/v'
+    . 'rrxMbGasGmqqrodDrMZjNms7nXPsmyTEREBC+99BL33HMPbrc7bL2wZujz+VBkBZPZRHZ2dkhZIBDgzbfe4tzZs9xySzKbfvc7Nmx4nsEpg5'
+    . 'k/fz6XL1/hjTf/QGxMLBD0eV6fD6VjdXVG4IIgYDQaARA7TE+SJJxOJ5IkIQgCJpMJg8GALMt4vV5EUeyIxIPG0ElEpz5ZlkP8ktFopL6+n'
+    . 'qlTpxIIBHC5XEiShMfj0eqIooher8fn8xEIBPB6vTidTqxRUT3IDUuWJEnceuutTJo4ibVr17Ju3TpGjhwJgMvlorLya+bOnsM/3X03CxYsp'
+    . 'KG+nsEpgxFFkYce+hcOHTrEd9//LyZzBH6/n7vuuouYmBgCgQD3338/UVFRVFdXU1payrfffhs0WUkiJyeHefPmkZSUREVFBSUlJbS2ttK/f3'
+    . '9mzZrFhQsXmDx5Munp6TgcDvbs2cPnn38ePAqpqvbpCkVRmDFjBk1NTZSVlZGZmcns2bNJTU3l2rVrfPbZZxw/fpw1a9Zgs9mYP38+aWlp/Pv'
+    . 'GjfgDgRBdYc1QJ+rIysxi7dq1jL1rLAUFBZw/fx6AqKgoxt45lk8Pfsrb77zNwIEDGDp0mCY7ZMgQcsePx+/zB1ei309+fj5FRUUUFRXh9Xqp'
+    . 'rq5m4sSJfPDBB4waNQqPx4MgCKxevZr4+Hhqamq47777eP/990lISCA+Pp7169dTWlpKXl4eNTU1eDwetm7dypo1awh0G1QnOonLz88nJyeHk'
+    . 'SNHsn37dpKSkqisrESWZZ5//nlycnI0nc3NzZw/f16zhD5XFoJAeno6AMufWI4syRQWFrJ582ZGjBjB0qWPMmPGr9lW/DZfHj1KYmLidYV6PW'
+    . 'lpaRhNJk1Xpw8pKCjgww8/RBAEtm7dSklJCc899xxbtmxBp9Oxbds21q9fjyRJvPrqq+zdu5fly5dTXFwMwIkTJ3jkkUdoa2tDVVXmzJnDyy+'
+    . '/zL59+/B6vWGHAkEf297eTnZ2NhEREaxYsYILFy5gtVoZNmwYLpcLh8PB4sWLOXjwIFu2bGFQYmKPnTn8Pq2qxMXFacmVK1eSl5dHYWEhly5dY'
+    . 's+evcTFxTHvoYd45513sNvtIeK2WBtGg0FLG41GGhoa+PTTT4mOjiYmJob29naKi4u5/fbbSU5ORpIkDh48iF6vp1+/fly7do0DBw5wxx13aH'
+    . '7pvffew+l0EhsbS0xMDAcOHOC7775j0qRJmi/sDUajkZMnT+Lz+di5cyebNm1i4sSJNDc3Y7fbiY6ORhRFzGYzUWH8Va9kyYqCrIQ2vnLlSqb'
+    . '/83SWPraU3Xt2s3btWl568UX8AT+rV6/G5XJpdRVZQeW67xBFkZ9++glJkjRnbjAY+PHHHxEEAavVqm33neV6vV5z9IIgoCgKbW1tmgPvdOjX'
+    . 'rl2jX79+NyQKwGQyUVtby6JFi6ipqWHmzJmUlJSwY8cOEhMT8fv9feoIS5bRaKChvqFHflJiEs3NzbQ72omNjcVsNrPh+Q1YrVaeLnha2/abm'
+    . 'q/i811vXJZlEhMTsVgsmn/xer0MHz4cv99Pa2srer2+x2wKgqD5HVEUSU1N1cwtEAgQGRlJamoqly9f7nOgnTpOnjzJihUrmDp1KgsWLCA9PZ'
+    . '2FCxdqZPUIqPsiy2QyceLEiZC8uro6it9+m9LS98nLy2Pjxo2oqorVamXjxo1YIiyseWYNDoeDs2fOIklBUgSCoUh8fDyrVq3CaDTidDrJys'
+    . 'riiSeeYN++fTQ3N6PT6cKS1UmYLMs8/vjjZGdn43Q6MRgMFBQUEBERQXl5OaYOH+nz+fB6vfh8Pi0cEAQBn8/HvHnzKCwsJDo6GrvdTlVVFQ6'
+    . 'HQzu+GQwGRFHE6/WGJa2X445AZWUlx48f58477wSCUTqqyoCEBIaPGE5VVRV+vx+TyYTZbOaFF15g06ZNLF36GN83fkdkx32XSjAeamtr49577'
+    . '2XKlCk4HA6SkpL46quv2Lx5M2lpaQAhfkdVVQRBwGAwQEeQ7PV62bFjB42NjVitVgwGAytXruTy5ctkZWVhMBgoKSnB7/drxO/atUtLe71eFi1'
+    . 'axMyZM3E4HMTExOByuXj33Xfx+XwcPXqUpUuXkpmZyaqnn8bXzTSF0RkZbXS7WhZQcTpdZGdl8oc33iA6Khq3282zzz5Lyw+tSIEAc+fMJT8/'
+    . 'P0RZa2sr+fn5NDY1ER0djT8QwO/3859btpCcnMzSRx8ld8IEoqxWvvnmGyoqKpAVhZiYGLKzszl+/DgejwexYwdNHTKEuLg4PB4Pu3fvZsmSJ'
+    . 'TgcDtLT03E6nXx57BiNTU2YTCZibDZyJ0wgMjIyZIWePXMGCO6I1TU1DE5JITMri9jYWFpaWvjjV3+kzR70hWazmcmTJ2PQ6zlQXg6hu6FdGJ2'
+    . 'RsZdu/0ILqMiqgqPNzv33z2Tdv64jLq4fHo+H/Qf2k3xLMjk5OSFE/fDDD2x+8UX27fsYnU6PIEBAkvH7/WwtKmLw4MEs+s1iTOYIVEVBbzBgM'
+    . 'pkQRQFFVvB4PERYIhAFsbMTBAIS9rY2hgwZwq6yMh5btoyvq6ow6PUIooDJZMag14MQXJVutxu6WY/RaERVVURRxGgyEggE8Pv8KIqCqBMxmc'
+    . 'zodboOHQoetxsEgcjISK42hdyafqQHirqTBQI6UUd0VDS7d++mtaWVJUseYfLkycx6YFZITVmWOXzkCNu3b+PYsS+DMysK0GHzqqqi1+vR6XTo'
+    . 'DUYyszK1sj4hCJw+Xa0lVYJBcTAGVK9n/rxz902jG1lFnX/fh6wuQSA4IEFEUSTaHU5stmgybruN9F+N5pbkZFRVpamxkZqaGmrPnsHe1kZkpB'
+    . 'VRJ3aQIRCQJFRVJXPMGMwREXxx9GjwxH+ztwoqqKpCtM3GpEmTOHz4MD/9+CPiDa5Z/pzocs78qLa6Oj/sWwdR0PraQVxwl5EkCQQw6A0gCMiS'
+    . 'hKIqGPQG7VDcFf6AhMFgwOvxBK9iOnadnwtFUXB7PFgiIrQ47C8I7a3DL69oboyer2i64pf3Wb2/z/o/Z4jQ19LLyeMAAAAASUVORK5CYII=';
+    private const IMAGE_CONTENT = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAABGdBTUEAALGPC/'
+    . 'xhBQAAAAZQTFRF////AAAAVcLTfgAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsSAAALEgHS3X78'
+    . 'AAAAB3RJTUUH0gQCEx05cqKA8gAAAApJREFUeJxjYAAAAAIAAUivpHEAAAAASUVORK5CYII=';
+
+
+    public function getFallbackLogo(): string
+    {
+        return self::IMAGE_CONTENT;
+    }
+
+    public function getPoweredByImage(): string
+    {
+        return self::NEW_POWERED_IMAGE;
+    }
+}
diff --git a/src/Domain/Messaging/Service/Manager/MessageManager.php b/src/Domain/Messaging/Service/Manager/MessageManager.php
index c11d34d9..7ed34594 100644
--- a/src/Domain/Messaging/Service/Manager/MessageManager.php
+++ b/src/Domain/Messaging/Service/Manager/MessageManager.php
@@ -8,18 +8,17 @@
 use PhpList\Core\Domain\Messaging\Model\Dto\MessageContext;
 use PhpList\Core\Domain\Messaging\Model\Dto\MessageDtoInterface;
 use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Model\Message\MessageMetadata;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Service\Builder\MessageBuilder;
+use Symfony\Component\Validator\Exception\ValidatorException;
 
 class MessageManager
 {
-    private MessageRepository $messageRepository;
-    private MessageBuilder $messageBuilder;
-
-    public function __construct(MessageRepository $messageRepository, MessageBuilder $messageBuilder)
-    {
-        $this->messageRepository = $messageRepository;
-        $this->messageBuilder = $messageBuilder;
+    public function __construct(
+        private readonly MessageRepository $messageRepository,
+        private readonly MessageBuilder $messageBuilder,
+    ) {
     }
 
     public function createMessage(MessageDtoInterface $createMessageDto, Administrator $authUser): Message
@@ -31,6 +30,27 @@ public function createMessage(MessageDtoInterface $createMessageDto, Administrat
         return $message;
     }
 
+    public function copyAsDraftMessage(Message $message, Administrator $authUser): Message
+    {
+        $newMessage = new Message(
+            format: new Message\MessageFormat(
+                htmlFormatted: $message->getFormat()->isHtmlFormatted(),
+                sendFormat: $message->getFormat()->getSendFormat()
+            ),
+            schedule: clone $message->getSchedule(),
+            metadata: new MessageMetadata(status: Message\MessageStatus::Draft),
+            content: clone $message->getContent(),
+            options: clone $message->getOptions(),
+            owner: $authUser,
+            template: $message->getTemplate(),
+        );
+        $newMessage->setUuid(bin2hex(random_bytes(18)));
+
+        $this->messageRepository->persist($newMessage);
+
+        return $newMessage;
+    }
+
     public function updateMessage(
         MessageDtoInterface $updateMessageDto,
         Message $message,
@@ -42,6 +62,29 @@ public function updateMessage(
 
     public function updateStatus(Message $message, Message\MessageStatus $status): Message
     {
+        if ($status === Message\MessageStatus::Submitted && !$this->canBeSubmitted($message)) {
+            throw new ValidatorException(
+                'status: Cannot submit. Add at least one list and fill subject, from field, and message body'
+                . PHP_EOL .
+                'metadata.status: Cannot submit. Add at least one list and fill subject, from field, and message body'
+            );
+        }
+
+        if ($status === Message\MessageStatus::Submitted
+            && $message->getFormat()->isInvitation()
+            && !str_contains($message->getContent()->getText(), '[CONFIRMATIONURL]')
+        ) {
+            throw new ValidatorException(
+                'status: Cannot submit invitation. Add [CONFIRMATIONURL] placeholder to the message body'
+                . PHP_EOL .
+                'metadata.status: Cannot submit invitation. Add [CONFIRMATIONURL] placeholder to the message body'
+            );
+        }
+
+        if ($status === Message\MessageStatus::Submitted && $message->getListMessages()->count() === 0) {
+            $status = Message\MessageStatus::Prepared;
+        }
+
         $message->getMetadata()->setStatus($status);
 
         return $message;
@@ -57,4 +100,17 @@ public function getMessagesByOwner(Administrator $owner): array
     {
         return $this->messageRepository->getByOwnerId($owner->getId());
     }
+
+    private function canBeSubmitted(Message $message): bool
+    {
+        return $message->getListMessages()->count() > 0
+            && $this->isFilled($message->getContent()->getSubject())
+            && $this->isFilled($message->getOptions()->getFromField())
+            && $this->isFilled($message->getContent()->getText());
+    }
+
+    private function isFilled(?string $value): bool
+    {
+        return !empty(trim((string) $value));
+    }
 }
diff --git a/src/Domain/Messaging/Service/Manager/TemplateImageManager.php b/src/Domain/Messaging/Service/Manager/TemplateImageManager.php
index c3e3d157..bb6c0771 100644
--- a/src/Domain/Messaging/Service/Manager/TemplateImageManager.php
+++ b/src/Domain/Messaging/Service/Manager/TemplateImageManager.php
@@ -28,6 +28,7 @@ class TemplateImageManager
     public function __construct(
         private readonly TemplateImageRepository $templateImageRepository,
         private readonly ConfigProvider $configProvider,
+        private readonly ImageProvider $imageProvider,
     ) {
     }
 
@@ -36,19 +37,77 @@ public function createImagesFromImagePaths(array $imagePaths, Template $template
     {
         $templateImages = [];
         foreach ($imagePaths as $path) {
+            $this->removeExistingTemplateImage($template, $path);
+            [$imageData, $width, $height, $detectedMimeType] = $this->extractImageData($path);
+
             $image = new TemplateImage();
             $image->setTemplate($template);
             $image->setFilename($path);
-            $image->setMimeType($this->guessMimeType($path));
-            $image->setData(null);
+            $image->setMimeType($detectedMimeType ?? $this->guessMimeType($path));
+            $image->setWidth($width);
+            $image->setHeight($height);
+            $image->setData($imageData);
 
             $this->templateImageRepository->persist($image);
             $templateImages[] = $image;
         }
 
+        $this->ensurePoweredByImageExists($template);
+
         return $templateImages;
     }
 
+    private function removeExistingTemplateImage(Template $template, string $path): void
+    {
+        $templateId = $template->getId();
+        if ($templateId === null) {
+            return;
+        }
+
+        $existing = $this->templateImageRepository->findByTemplateIdAndFilename($templateId, $path);
+        if ($existing !== null) {
+            $this->templateImageRepository->remove($existing);
+        }
+    }
+
+    /**
+     * @return array{0: ?string, 1: ?int, 2: ?int, 3: ?string}
+     */
+    private function extractImageData(string $path): array
+    {
+        // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged
+        $contents = @file_get_contents($path);
+        if ($contents === false || $contents === '') {
+            return [null, null, null, null];
+        }
+
+        $size = getimagesizefromstring($contents);
+        if ($size === false || empty($size[0]) || empty($size[1])) {
+            return [null, null, null, null];
+        }
+
+        $mimeType = strtolower((string) $size['mime']);
+
+        return [base64_encode($contents), (int) $size[0], (int) $size[1], $mimeType];
+    }
+
+    private function ensurePoweredByImageExists(Template $template): void
+    {
+        if ($this->templateImageRepository->poweredByImageExists($template)) {
+            return;
+        }
+
+        $image = new TemplateImage();
+        $image->setTemplate($template);
+        $image->setFilename('powerphplist.png');
+        $image->setMimeType('image/png');
+        $image->setWidth(70);
+        $image->setHeight(30);
+        $image->setData($this->imageProvider->getPoweredByImage());
+
+        $this->templateImageRepository->persist($image);
+    }
+
     private function guessMimeType(string $filename): string
     {
         $ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
@@ -57,9 +116,7 @@ private function guessMimeType(string $filename): string
 
     public function extractAllImages(string $html): array
     {
-        $fromRegex = array_keys(
-            $this->extractTemplateImagesFromContent($html)
-        );
+        $fromRegex = array_keys($this->extractTemplateImagesFromContent($html));
 
         $fromDom = $this->extractImagesFromHtml($html);
 
@@ -68,7 +125,10 @@ public function extractAllImages(string $html): array
 
     private function extractTemplateImagesFromContent(string $content): array
     {
-        $regexp = sprintf('/"([^"]+\.(%s))"/Ui', implode('|', array_keys(self::IMAGE_MIME_TYPES)));
+        $regexp = sprintf(
+            '/"([^"]+\.(%s))"/Ui',
+            implode('|', array_keys(self::IMAGE_MIME_TYPES))
+        );
         preg_match_all($regexp, stripslashes($content), $images);
 
         return array_count_values($images[1]);
@@ -170,9 +230,7 @@ private function decodeLogoImageData(?string $logoData): ?string
             return $imageContent;
         }
 
-        $fallbackContent = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAABGdBTUEAALGPC/'
-         . 'xhBQAAAAZQTFRF////AAAAVcLTfgAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsSAAALEgHS3X78'
-         . 'AAAAB3RJTUUH0gQCEx05cqKA8gAAAApJREFUeJxjYAAAAAIAAUivpHEAAAAASUVORK5CYII=', true);
+        $fallbackContent = base64_decode($this->imageProvider->getFallbackLogo(), true);
 
         return $fallbackContent !== false ? $fallbackContent : null;
     }
diff --git a/src/Domain/Messaging/Service/Manager/TemplateManager.php b/src/Domain/Messaging/Service/Manager/TemplateManager.php
index 99b33b8a..cca54eec 100644
--- a/src/Domain/Messaging/Service/Manager/TemplateManager.php
+++ b/src/Domain/Messaging/Service/Manager/TemplateManager.php
@@ -9,32 +9,26 @@
 use PhpList\Core\Domain\Messaging\Model\Dto\UpdateTemplateDto;
 use PhpList\Core\Domain\Messaging\Model\Template;
 use PhpList\Core\Domain\Messaging\Repository\TemplateRepository;
+use PhpList\Core\Domain\Messaging\Service\Mapper\DefaultTemplateMapper;
 use PhpList\Core\Domain\Messaging\Validator\TemplateImageValidator;
 use PhpList\Core\Domain\Messaging\Validator\TemplateLinkValidator;
 
 class TemplateManager
 {
-    private TemplateRepository $templateRepository;
-    private TemplateImageManager $templateImageManager;
-    private TemplateLinkValidator $templateLinkValidator;
-    private TemplateImageValidator $templateImageValidator;
-
     public function __construct(
-        TemplateRepository $templateRepository,
-        TemplateImageManager $templateImageManager,
-        TemplateLinkValidator $templateLinkValidator,
-        TemplateImageValidator $templateImageValidator
+        private readonly TemplateRepository $templateRepository,
+        private readonly TemplateImageManager $templateImageManager,
+        private readonly TemplateLinkValidator $templateLinkValidator,
+        private readonly TemplateImageValidator $templateImageValidator,
+        private readonly DefaultTemplateMapper $defaultTemplateMapper,
     ) {
-        $this->templateRepository = $templateRepository;
-        $this->templateImageManager = $templateImageManager;
-        $this->templateLinkValidator = $templateLinkValidator;
-        $this->templateImageValidator = $templateImageValidator;
     }
 
     public function create(CreateTemplateDto $createTemplateDto): Template
     {
-        $template = (new Template($createTemplateDto->title))
-            ->setText($createTemplateDto->text);
+        $template = (new Template(title: $createTemplateDto->title))
+            ->setText($createTemplateDto->text)
+            ->setListOrder($createTemplateDto->listOrder);
 
         $content = $createTemplateDto->fileContent ?? $createTemplateDto->content;
         if ($content !== null) {
@@ -49,11 +43,11 @@ public function create(CreateTemplateDto $createTemplateDto): Template
         $this->templateLinkValidator->validate($template->getContent() ?? '', $context);
 
         $imageUrls = $this->templateImageManager->extractAllImages($template->getContent() ?? '');
-        $this->templateImageValidator->validate($imageUrls, $context);
+        $this->templateImageValidator->validate(value: $imageUrls, context: $context);
 
         $this->templateRepository->persist($template);
 
-        $this->templateImageManager->createImagesFromImagePaths($imageUrls, $template);
+        $this->templateImageManager->createImagesFromImagePaths(imagePaths: $imageUrls, template: $template);
 
         return $template;
     }
@@ -64,9 +58,9 @@ public function update(Template $template, UpdateTemplateDto $updateTemplateDto)
             $template->setTitle($updateTemplateDto->title);
         }
 
-        if ($updateTemplateDto->text !== null) {
-            $template->setText($updateTemplateDto->text);
-        }
+        $template
+            ->setText($updateTemplateDto->text)
+            ->setListOrder($updateTemplateDto->listOrder);
 
         $content = $updateTemplateDto->fileContent ?? $updateTemplateDto->content;
         if ($content !== null) {
@@ -83,10 +77,6 @@ public function update(Template $template, UpdateTemplateDto $updateTemplateDto)
         $imageUrls = $this->templateImageManager->extractAllImages($template->getContent() ?? '');
         $this->templateImageValidator->validate($imageUrls, $context);
 
-        foreach ($template->getImages() as $image) {
-            $this->templateImageManager->delete($image);
-        }
-
         $this->templateImageManager->createImagesFromImagePaths($imageUrls, $template);
 
         return $template;
@@ -96,4 +86,22 @@ public function delete(Template $template): void
     {
         $this->templateRepository->remove($template);
     }
+
+    public function listDefaults(): array
+    {
+        return $this->defaultTemplateMapper->list();
+    }
+
+    public function createDefaultTemplate(string $key): Template
+    {
+        $defaultTemplate = $this->defaultTemplateMapper->findByKey($key);
+        $content = $this->defaultTemplateMapper->loadContent($defaultTemplate['file']);
+
+        $dto = new CreateTemplateDto(
+            title: $defaultTemplate['name'],
+            content: $content
+        );
+
+        return $this->create($dto);
+    }
 }
diff --git a/src/Domain/Messaging/Service/Mapper/DefaultTemplateMapper.php b/src/Domain/Messaging/Service/Mapper/DefaultTemplateMapper.php
new file mode 100644
index 00000000..f58d0eca
--- /dev/null
+++ b/src/Domain/Messaging/Service/Mapper/DefaultTemplateMapper.php
@@ -0,0 +1,108 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Service\Mapper;
+
+use InvalidArgumentException;
+use JsonException;
+use RuntimeException;
+
+class DefaultTemplateMapper
+{
+    private const DEFAULT_TEMPLATES_DIR = __DIR__ . '/../../Resources/Templates';
+    private const DEFAULT_TEMPLATES_MAP_FILE = self::DEFAULT_TEMPLATES_DIR . '/templates.json';
+
+    public function list(): array
+    {
+        return $this->loadDefaultTemplatesMap();
+    }
+
+    public function findByKey(string $key): array
+    {
+        foreach ($this->loadDefaultTemplatesMap() as $template) {
+            if ($template['key'] === $key) {
+                return $template;
+            }
+        }
+
+        throw new InvalidArgumentException(sprintf('Default template with key "%s" does not exist.', $key));
+    }
+
+    public function loadContent(string $file): string
+    {
+        $templatePath = self::DEFAULT_TEMPLATES_DIR . '/' . $file;
+        // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged
+        $content = @file_get_contents($templatePath);
+        if ($content === false) {
+            throw new RuntimeException(
+                sprintf('Could not read default template file "%s".', $templatePath)
+            );
+        }
+
+        return $content;
+    }
+
+    private function loadDefaultTemplatesMap(): array
+    {
+        // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged
+        $raw = @file_get_contents(self::DEFAULT_TEMPLATES_MAP_FILE);
+        if ($raw === false) {
+            throw new RuntimeException(
+                sprintf('Could not read default templates map file "%s".', self::DEFAULT_TEMPLATES_MAP_FILE)
+            );
+        }
+
+        try {
+            $decoded = json_decode($raw, true, 512, JSON_THROW_ON_ERROR);
+        } catch (JsonException $exception) {
+            throw new RuntimeException(
+                sprintf('Default templates map file "%s" is not valid JSON.', self::DEFAULT_TEMPLATES_MAP_FILE),
+                previous: $exception
+            );
+        }
+
+        if (!is_array($decoded)) {
+            throw new RuntimeException(
+                sprintf('Default templates map file "%s" must contain an array.', self::DEFAULT_TEMPLATES_MAP_FILE)
+            );
+        }
+
+        $templates = [];
+        foreach ($decoded as $index => $template) {
+            if (!is_array($template)) {
+                throw new RuntimeException(
+                    sprintf('Default template entry at index %d must be an object.', $index)
+                );
+            }
+
+            $this->checkRequiredFields($template, $index);
+
+            $templates[] = [
+                'key' => $template['key'],
+                'name' => $template['name'],
+                'description' => $template['description'],
+                'file' => $template['file'],
+            ];
+        }
+
+        return $templates;
+    }
+
+    private function checkRequiredFields(array $template, int|string $index): void
+    {
+        foreach (['key', 'name', 'description', 'file'] as $requiredField) {
+            if (!isset($template[$requiredField])
+                || !is_string($template[$requiredField]) || $template[$requiredField] === ''
+            ) {
+                throw new RuntimeException(
+                    sprintf(
+                        'Default template entry at index %d is missing required string field "%s".',
+                        $index,
+                        $requiredField
+                    )
+                );
+            }
+        }
+    }
+}
diff --git a/src/Domain/Messaging/Service/MessageDataLoader.php b/src/Domain/Messaging/Service/MessageDataLoader.php
index c3577bec..9e5d07c8 100644
--- a/src/Domain/Messaging/Service/MessageDataLoader.php
+++ b/src/Domain/Messaging/Service/MessageDataLoader.php
@@ -109,6 +109,10 @@ private function mergeNonEmptyFields(array &$messageData, Message $message): voi
         if ($messageData['subject'] === '(no title)') {
             $messageData['subject'] = '(no subject)';
         }
+
+        if ($messageData['subject'] === '') {
+            $messageData['subject'] = '(no subject)';
+        }
     }
 
     private function mergeStoredMessageData(array &$messageData, Message $message): void
@@ -148,7 +152,7 @@ private function normaliseScheduleFields(array &$messageData): void
     private function populateTargetLists(array &$messageData, Message $message): void
     {
         foreach ($message->getListMessages() as $listMessage) {
-            $messageData['targetlist'][$listMessage->getListId()] = 1;
+            $messageData['targetlist'][$listMessage->getList()->getId()] = 1;
         }
     }
 
diff --git a/src/Domain/Messaging/Service/MessagePrecacheService.php b/src/Domain/Messaging/Service/MessagePrecacheService.php
index dfab25ec..9ea7e873 100644
--- a/src/Domain/Messaging/Service/MessagePrecacheService.php
+++ b/src/Domain/Messaging/Service/MessagePrecacheService.php
@@ -37,6 +37,7 @@ public function __construct(
         private readonly bool $useManualTextPart,
         private readonly string $uploadImageDir,
         private readonly string $publicSchema,
+        private readonly ?int $ttl = 3600,
     ) {
     }
 
@@ -44,11 +45,20 @@ public function __construct(
      * Retrieve the base (unpersonalized) message content for a campaign from cache,
      * or cache it on first access. Handle [URL:] token fetch and basic placeholder replacements.
      */
-    public function precacheMessage(Message $campaign, array $loadedMessageData, ?bool $forwardContent = false): bool
-    {
-        $cacheKey = sprintf('messaging.message.base.%d.%d', $campaign->getId(), (int) $forwardContent);
+    public function precacheMessage(
+        Message $campaign,
+        array $loadedMessageData,
+        ?bool $forwardContent = false,
+        ?bool $isTest = false,
+    ): bool {
+        $cacheKey = sprintf(
+            'messaging.message.base.%d.%d.%d',
+            $campaign->getId(),
+            (int) $forwardContent,
+            (int) $isTest
+        );
         $cached = $this->cache->get($cacheKey);
-        if ($cached !== null) {
+        if ($cached !== null && $isTest === false) {
             return true;
         }
 
@@ -71,7 +81,7 @@ public function precacheMessage(Message $campaign, array $loadedMessageData, ?bo
             return false;
         }
 
-        $messagePrecacheDto->googleTrack = $loadedMessageData['google_track'];
+        $messagePrecacheDto->googleTrack = (bool) $loadedMessageData['google_track'];
 
         $this->applyBasicReplacements($messagePrecacheDto, $loadedMessageData);
         $this->populateAdminAttributes($messagePrecacheDto, $campaign);
@@ -93,7 +103,8 @@ public function precacheMessage(Message $campaign, array $loadedMessageData, ?bo
         $messagePrecacheDto->htmlFooter = $this->templateImageManager
             ->parseLogoPlaceholders($messagePrecacheDto->htmlFooter);
 
-        $this->cache->set($cacheKey, $messagePrecacheDto);
+        $ttl = $isTest ? 5 : $this->ttl;
+        $this->cache->set(key: $cacheKey, value: $messagePrecacheDto, ttl: $ttl);
 
         return true;
     }
diff --git a/src/Domain/Messaging/Service/MessageProcessingPreparator.php b/src/Domain/Messaging/Service/MessageProcessingPreparator.php
index 960e17e4..05f044ea 100644
--- a/src/Domain/Messaging/Service/MessageProcessingPreparator.php
+++ b/src/Domain/Messaging/Service/MessageProcessingPreparator.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Domain\Messaging\Service;
 
+use PhpList\Core\Domain\Analytics\Model\LinkTrack;
 use PhpList\Core\Domain\Analytics\Service\LinkTrackService;
 use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
@@ -68,9 +69,9 @@ public function processMessageLinks(
         }
 
         $savedLinks = $this->linkTrackService->extractAndSaveLinks(
-            $cachedMessageDto,
-            $subscriber->getId(),
-            $campaignId,
+            content: $cachedMessageDto,
+            userId: $subscriber->getId(),
+            messageId: $campaignId,
         );
         if (empty($savedLinks)) {
             return $cachedMessageDto;
@@ -78,11 +79,17 @@ public function processMessageLinks(
 
         // todo: check if getTextMessage should replace links as well
         if ($cachedMessageDto->content) {
-            $cachedMessageDto->content = $this->replaceLinks($savedLinks, $cachedMessageDto->content);
+            $cachedMessageDto->content = $this->replaceLinks(
+                savedLinks: $savedLinks,
+                htmlText: $cachedMessageDto->content
+            );
         }
 
         if ($cachedMessageDto->htmlFooter) {
-            $cachedMessageDto->htmlFooter = $this->replaceLinks($savedLinks, $cachedMessageDto->htmlFooter);
+            $cachedMessageDto->htmlFooter = $this->replaceLinks(
+                savedLinks: $savedLinks,
+                htmlText: $cachedMessageDto->htmlFooter
+            );
         }
 
         return $cachedMessageDto;
@@ -90,6 +97,7 @@ public function processMessageLinks(
 
     private function replaceLinks(array $savedLinks, string $htmlText): string
     {
+        /** @var LinkTrack $linkTrack */
         foreach ($savedLinks as $linkTrack) {
             $originalUrl = $linkTrack->getUrl();
             $trackUrl = self::LINK_TRACK_ENDPOINT . '?id=' . $linkTrack->getId();
diff --git a/src/Domain/Subscription/Model/SubscriberAttributeValue.php b/src/Domain/Subscription/Model/SubscriberAttributeValue.php
index d2144f95..3af333ff 100644
--- a/src/Domain/Subscription/Model/SubscriberAttributeValue.php
+++ b/src/Domain/Subscription/Model/SubscriberAttributeValue.php
@@ -17,12 +17,12 @@ class SubscriberAttributeValue implements DomainModel
 {
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: SubscriberAttributeDefinition::class)]
-    #[ORM\JoinColumn(name: 'attributeid', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(name: 'attributeid', referencedColumnName: 'id', onDelete: 'CASCADE')]
     private SubscriberAttributeDefinition $attributeDefinition;
 
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: Subscriber::class, inversedBy: 'attributes')]
-    #[ORM\JoinColumn(name: 'userid', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(name: 'userid', referencedColumnName: 'id', onDelete: 'CASCADE')]
     private Subscriber $subscriber;
 
     #[ORM\Column(name: 'value', type: 'text', nullable: true)]
diff --git a/src/Domain/Subscription/Model/UserBlacklistData.php b/src/Domain/Subscription/Model/UserBlacklistData.php
index 4ac769e9..ff133161 100644
--- a/src/Domain/Subscription/Model/UserBlacklistData.php
+++ b/src/Domain/Subscription/Model/UserBlacklistData.php
@@ -16,7 +16,7 @@ class UserBlacklistData implements DomainModel
 {
     #[ORM\Id]
     #[ORM\OneToOne(targetEntity: UserBlacklist::class, inversedBy: 'blacklistData')]
-    #[ORM\JoinColumn(name: 'email', referencedColumnName: 'email', nullable: false, onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(name: 'email', referencedColumnName: 'email', onDelete: 'CASCADE')]
     private UserBlacklist $blacklist;
 
     #[ORM\Column(name: 'name', type: 'string', length: 25)]
diff --git a/src/Domain/Subscription/Repository/SubscriberRepository.php b/src/Domain/Subscription/Repository/SubscriberRepository.php
index 2e977cff..4fbfac0a 100644
--- a/src/Domain/Subscription/Repository/SubscriberRepository.php
+++ b/src/Domain/Subscription/Repository/SubscriberRepository.php
@@ -328,4 +328,19 @@ public function countCreatedBetween(DateTimeInterface $start, DateTimeInterface
             ->getQuery()
             ->getSingleScalarResult();
     }
+
+    /** @return Subscriber[] */
+    public function getByEmails(array $emails): array
+    {
+        if (empty($emails)) {
+            return [];
+        }
+
+        return $this->createQueryBuilder('s')
+            ->select('s')
+            ->where('s.email IN (:emails)')
+            ->setParameter('emails', $emails)
+            ->getQuery()
+            ->getResult();
+    }
 }
diff --git a/src/Domain/Subscription/Service/Provider/SubscriberProvider.php b/src/Domain/Subscription/Service/Provider/SubscriberProvider.php
index da564da8..758db32e 100644
--- a/src/Domain/Subscription/Service/Provider/SubscriberProvider.php
+++ b/src/Domain/Subscription/Service/Provider/SubscriberProvider.php
@@ -4,7 +4,8 @@
 
 namespace PhpList\Core\Domain\Subscription\Service\Provider;
 
-use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessageInterface;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\CampaignProcessorMessageInterface;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\TestCampaignProcessorMessage;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberListRepository;
@@ -32,6 +33,10 @@ public function __construct(
      */
     public function getSubscribersForMessageOrLists(CampaignProcessorMessageInterface $data, Message $campaign): array
     {
+        if ($data instanceof TestCampaignProcessorMessage) {
+            return $this->subscriberRepository->getByEmails($data->getSubscriberEmails());
+        }
+
         if (count($data->getListIds()) > 0) {
             $listIds = $data->getListIds();
         } else {
diff --git a/tests/Integration/Domain/Messaging/Repository/UserMessageBounceRepositoryTest.php b/tests/Integration/Domain/Messaging/Repository/UserMessageBounceRepositoryTest.php
new file mode 100644
index 00000000..c5984bc5
--- /dev/null
+++ b/tests/Integration/Domain/Messaging/Repository/UserMessageBounceRepositoryTest.php
@@ -0,0 +1,139 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Tests\Integration\Domain\Messaging\Repository;
+
+use DateTime;
+use Doctrine\ORM\Tools\SchemaTool;
+use PhpList\Core\Domain\Identity\Model\Administrator;
+use PhpList\Core\Domain\Messaging\Model\Bounce;
+use PhpList\Core\Domain\Messaging\Model\UserMessageBounce;
+use PhpList\Core\Domain\Messaging\Repository\UserMessageBounceRepository;
+use PhpList\Core\Domain\Subscription\Model\Subscriber;
+use PhpList\Core\Domain\Subscription\Model\SubscriberList;
+use PhpList\Core\Domain\Subscription\Model\Subscription;
+use PhpList\Core\TestingSupport\Traits\DatabaseTestTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+class UserMessageBounceRepositoryTest extends KernelTestCase
+{
+    use DatabaseTestTrait;
+
+    private UserMessageBounceRepository $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->loadSchema();
+
+        $this->repository = self::getContainer()->get(UserMessageBounceRepository::class);
+    }
+
+    protected function tearDown(): void
+    {
+        $schemaTool = new SchemaTool($this->entityManager);
+        $schemaTool->dropDatabase();
+        parent::tearDown();
+    }
+
+    public function testGetListBounceTotalsReturnsAggregatedBouncesPerSubscriberForList(): void
+    {
+        $admin = (new Administrator())
+            ->setLoginName('admin')
+            ->setEmail('admin@example.com');
+        $this->entityManager->persist($admin);
+
+        $targetList = (new SubscriberList())
+            ->setName('Target list')
+            ->setOwner($admin);
+        $otherList = (new SubscriberList())
+            ->setName('Other list')
+            ->setOwner($admin);
+        $this->entityManager->persist($targetList);
+        $this->entityManager->persist($otherList);
+
+        $subscriber1 = (new Subscriber('one@example.com'))
+            ->setConfirmed(true)
+            ->setBlacklisted(false);
+        $subscriber2 = (new Subscriber('two@example.com'))
+            ->setConfirmed(false)
+            ->setBlacklisted(true);
+        $subscriber3 = (new Subscriber('three@example.com'))
+            ->setConfirmed(true)
+            ->setBlacklisted(false);
+
+        $this->entityManager->persist($subscriber1);
+        $this->entityManager->persist($subscriber2);
+        $this->entityManager->persist($subscriber3);
+        $this->entityManager->flush();
+
+        $subscription1 = (new Subscription())
+            ->setSubscriber($subscriber1)
+            ->setSubscriberList($targetList);
+        $subscription2 = (new Subscription())
+            ->setSubscriber($subscriber2)
+            ->setSubscriberList($targetList);
+        $subscription3 = (new Subscription())
+            ->setSubscriber($subscriber3)
+            ->setSubscriberList($otherList);
+
+        $this->entityManager->persist($subscription1);
+        $this->entityManager->persist($subscription2);
+        $this->entityManager->persist($subscription3);
+
+        $bounce1 = new Bounce();
+        $bounce2 = new Bounce();
+        $bounce3 = new Bounce();
+        $bounce4 = new Bounce();
+
+        $this->entityManager->persist($bounce1);
+        $this->entityManager->persist($bounce2);
+        $this->entityManager->persist($bounce3);
+        $this->entityManager->persist($bounce4);
+        $this->entityManager->flush();
+
+        $date = new DateTime();
+
+        $umb1 = (new UserMessageBounce($bounce1->getId(), $date))
+            ->setUserId($subscriber1->getId())
+            ->setMessageId(10);
+        $umb2 = (new UserMessageBounce($bounce2->getId(), $date))
+            ->setUserId($subscriber1->getId())
+            ->setMessageId(11);
+        $umb3 = (new UserMessageBounce($bounce3->getId(), $date))
+            ->setUserId($subscriber2->getId())
+            ->setMessageId(12);
+        $umb4 = (new UserMessageBounce($bounce4->getId(), $date))
+            ->setUserId($subscriber3->getId())
+            ->setMessageId(13);
+
+        $this->entityManager->persist($umb1);
+        $this->entityManager->persist($umb2);
+        $this->entityManager->persist($umb3);
+        $this->entityManager->persist($umb4);
+        $this->entityManager->flush();
+
+        $rows = $this->repository->getListBounceTotals($targetList->getId());
+
+        self::assertSame(
+            [
+                [
+                    'subscriberId' => $subscriber1->getId(),
+                    'email' => 'one@example.com',
+                    'confirmed' => true,
+                    'blacklisted' => false,
+                    'totalBounces' => 2,
+                ],
+                [
+                    'subscriberId' => $subscriber2->getId(),
+                    'email' => 'two@example.com',
+                    'confirmed' => false,
+                    'blacklisted' => true,
+                    'totalBounces' => 1,
+                ],
+            ],
+            $rows
+        );
+    }
+}
diff --git a/tests/Unit/Domain/Analytics/Service/LinkTrackServiceTest.php b/tests/Unit/Domain/Analytics/Service/LinkTrackServiceTest.php
index a2a53892..c7495f99 100644
--- a/tests/Unit/Domain/Analytics/Service/LinkTrackServiceTest.php
+++ b/tests/Unit/Domain/Analytics/Service/LinkTrackServiceTest.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Analytics\Service;
 
+use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Core\ParameterProvider;
 use PhpList\Core\Domain\Analytics\Exception\MissingMessageIdException;
 use PhpList\Core\Domain\Analytics\Model\LinkTrack;
@@ -29,7 +30,11 @@ protected function setUp(): void
             ->with('click_track', false)
             ->willReturn(true);
 
-        $this->subject = new LinkTrackService($this->linkTrackRepository, $paramProvider);
+        $this->subject = new LinkTrackService(
+            linkTrackRepository: $this->linkTrackRepository,
+            paramProvider: $paramProvider,
+            entityManager: $this->createMock(EntityManagerInterface::class)
+        );
     }
 
     public function testExtractAndSaveLinksWithNoLinks(): void
@@ -209,7 +214,11 @@ public function testIsExtractAndSaveLinksApplicableWhenClickTrackIsFalse(): void
             ->with('click_track', false)
             ->willReturn(false);
 
-        $subject = new LinkTrackService($this->linkTrackRepository, $paramProvider);
+        $subject = new LinkTrackService(
+            linkTrackRepository: $this->linkTrackRepository,
+            paramProvider: $paramProvider,
+            entityManager: $this->createMock(EntityManagerInterface::class)
+        );
 
         self::assertFalse($subject->isExtractAndSaveLinksApplicable());
     }
diff --git a/tests/Unit/Domain/Configuration/Service/MessagePlaceholderProcessorTest.php b/tests/Unit/Domain/Configuration/Service/MessagePlaceholderProcessorTest.php
index 2d49fa39..77cfe0f9 100644
--- a/tests/Unit/Domain/Configuration/Service/MessagePlaceholderProcessorTest.php
+++ b/tests/Unit/Domain/Configuration/Service/MessagePlaceholderProcessorTest.php
@@ -190,4 +190,42 @@ public function resolve(string $key, PlaceholderContext $ctx): ?string
 
         $this->assertStringContainsString('A XVAL B ABC C SVAL', $out);
     }
+
+    public function testFooterContentIsResolvedForNestedPlaceholders(): void
+    {
+        $user = $this->makeUser('nest@example.com');
+        $dto = new MessagePrecacheDto();
+
+        $footerResolver = new class implements PlaceholderValueResolverInterface {
+            public function name(): string
+            {
+                return 'FOOTER';
+            }
+
+            public function __invoke(PlaceholderContext $ctx): string
+            {
+                return 'Footer contact [EMAIL]';
+            }
+        };
+
+        $processor = new MessagePlaceholderProcessor(
+            config: $this->config,
+            attributesRepository: $this->attrRepo,
+            attributeValueResolver: $this->attrResolver,
+            placeholderResolvers: [$footerResolver],
+            patternResolvers: [],
+            supportingResolvers: [],
+            alwaysAddUserTrack: false,
+            keepForwardedAttributes: false
+        );
+
+        $out = $processor->process(
+            value: 'Body [FOOTER]',
+            receiver: $user,
+            format: OutputFormat::Text,
+            messagePrecacheDto: $dto,
+        );
+
+        $this->assertStringContainsString('Body Footer contact nest@example.com', $out);
+    }
 }
diff --git a/tests/Unit/Domain/Messaging/Command/ProcessQueueCommandTest.php b/tests/Unit/Domain/Messaging/Command/ProcessQueueCommandTest.php
index e4dc836e..3f5adf27 100644
--- a/tests/Unit/Domain/Messaging/Command/ProcessQueueCommandTest.php
+++ b/tests/Unit/Domain/Messaging/Command/ProcessQueueCommandTest.php
@@ -8,7 +8,7 @@
 use Exception;
 use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
 use PhpList\Core\Domain\Messaging\Command\ProcessQueueCommand;
-use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\CampaignProcessorMessage;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
diff --git a/tests/Unit/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php b/tests/Unit/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php
index 96b7dadd..0d05bd7a 100644
--- a/tests/Unit/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php
+++ b/tests/Unit/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandlerTest.php
@@ -8,9 +8,8 @@
 use Exception;
 use PhpList\Core\Domain\Configuration\Model\OutputFormat;
 use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
-use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage;
-use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessageInterface;
-use PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessorMessageHandler;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\CampaignProcessorMessage;
+use PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessor\CampaignProcessorMessageHandler;
 use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
@@ -24,8 +23,8 @@
 use PhpList\Core\Domain\Messaging\Service\MailSizeChecker;
 use PhpList\Core\Domain\Messaging\Service\MaxProcessTimeLimiter;
 use PhpList\Core\Domain\Messaging\Service\MessageDataLoader;
-use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
 use PhpList\Core\Domain\Messaging\Service\MessagePrecacheService;
+use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
 use PhpList\Core\Domain\Messaging\Service\RateLimitedCampaignMailer;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
diff --git a/tests/Unit/Domain/Messaging/Service/Builder/MessageBuilderTest.php b/tests/Unit/Domain/Messaging/Service/Builder/MessageBuilderTest.php
index d08ee9a1..6fba68db 100644
--- a/tests/Unit/Domain/Messaging/Service/Builder/MessageBuilderTest.php
+++ b/tests/Unit/Domain/Messaging/Service/Builder/MessageBuilderTest.php
@@ -27,6 +27,7 @@
 
 class MessageBuilderTest extends TestCase
 {
+    private TemplateRepository&MockObject $templateRepository;
     private MessageFormatBuilder&MockObject $formatBuilder;
     private MessageScheduleBuilder&MockObject $scheduleBuilder;
     private MessageContentBuilder&MockObject $contentBuilder;
@@ -35,14 +36,14 @@ class MessageBuilderTest extends TestCase
 
     protected function setUp(): void
     {
-        $templateRepository = $this->createMock(TemplateRepository::class);
+        $this->templateRepository = $this->createMock(TemplateRepository::class);
         $this->formatBuilder = $this->createMock(MessageFormatBuilder::class);
         $this->scheduleBuilder = $this->createMock(MessageScheduleBuilder::class);
         $this->contentBuilder = $this->createMock(MessageContentBuilder::class);
         $this->optionsBuilder = $this->createMock(MessageOptionsBuilder::class);
 
         $this->builder = new MessageBuilder(
-            templateRepository: $templateRepository,
+            templateRepository: $this->templateRepository,
             messageFormatBuilder: $this->formatBuilder,
             messageScheduleBuilder: $this->scheduleBuilder,
             messageContentBuilder: $this->contentBuilder,
@@ -50,19 +51,16 @@ protected function setUp(): void
         );
     }
 
-    private function createRequest(): CreateMessageDto
+    private function createRequest(?int $templateId = 0): CreateMessageDto
     {
         return new CreateMessageDto(
             content: new MessageContentDto(
                 subject: '',
                 text: '',
-                textMessage: '',
                 footer: ''
             ),
             format: new MessageFormatDto(
-                htmlFormated: false,
                 sendFormat: 'text',
-                formatOptions: []
             ),
             metadata: new MessageMetadataDto(
                 status: Message\MessageStatus::Draft
@@ -80,7 +78,7 @@ private function createRequest(): CreateMessageDto
                 requeueInterval: null,
                 requeueUntil: null
             ),
-            templateId: 0
+            templateId: $templateId
         );
     }
 
@@ -88,7 +86,7 @@ private function mockBuildCalls(CreateMessageDto $createMessageDto): void
     {
         $this->formatBuilder->expects($this->once())
             ->method('build')
-            ->with($createMessageDto->format)
+            ->with($createMessageDto)
             ->willReturn($this->createMock(Message\MessageFormat::class));
 
         $this->scheduleBuilder->expects($this->once())
@@ -115,7 +113,14 @@ public function testBuildsNewMessage(): void
 
         $this->mockBuildCalls($request);
 
-        $this->builder->build(createMessageDto: $request, context: $context);
+        $this->templateRepository->expects($this->once())
+            ->method('find')
+            ->with(0)
+            ->willReturn(null);
+
+        $result = $this->builder->build(createMessageDto: $request, context: $context);
+
+        $this->assertInstanceOf(Message::class, $result);
     }
 
     public function testThrowsExceptionOnInvalidContext(): void
@@ -134,25 +139,37 @@ public function testUpdatesExistingMessage(): void
 
         $this->mockBuildCalls($request);
 
+        $this->templateRepository->expects($this->once())
+            ->method('find')
+            ->with(0)
+            ->willReturn(null);
+
         $existingMessage
             ->expects($this->once())
             ->method('setFormat')
             ->with($this->isInstanceOf(Message\MessageFormat::class));
+
         $existingMessage
             ->expects($this->once())
             ->method('setSchedule')
             ->with($this->isInstanceOf(MessageSchedule::class));
+
         $existingMessage
             ->expects($this->once())
             ->method('setContent')
             ->with($this->isInstanceOf(MessageContent::class));
+
         $existingMessage
             ->expects($this->once())
             ->method('setOptions')
             ->with($this->isInstanceOf(Message\MessageOptions::class));
-        $existingMessage->expects($this->once())->method('setTemplate')->with(null);
 
-        $result = $this->builder->build($request, $context);
+        $existingMessage
+            ->expects($this->once())
+            ->method('setTemplate')
+            ->with(null);
+
+        $result = $this->builder->build(createMessageDto: $request, context: $context);
 
         $this->assertSame($existingMessage, $result);
     }
diff --git a/tests/Unit/Domain/Messaging/Service/Builder/MessageContentBuilderTest.php b/tests/Unit/Domain/Messaging/Service/Builder/MessageContentBuilderTest.php
index 62475884..82fab153 100644
--- a/tests/Unit/Domain/Messaging/Service/Builder/MessageContentBuilderTest.php
+++ b/tests/Unit/Domain/Messaging/Service/Builder/MessageContentBuilderTest.php
@@ -4,26 +4,33 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Builder;
 
+use PhpList\Core\Domain\Common\Html2Text;
 use PhpList\Core\Domain\Messaging\Exception\InvalidDtoTypeException;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageContentDto;
 use PhpList\Core\Domain\Messaging\Service\Builder\MessageContentBuilder;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class MessageContentBuilderTest extends TestCase
 {
     private MessageContentBuilder $builder;
+    private Html2Text&MockObject $html2Text;
 
     protected function setUp(): void
     {
-        $this->builder = new MessageContentBuilder();
+        $this->html2Text = $this->createMock(Html2Text::class);
+        $this->builder = new MessageContentBuilder($this->html2Text);
     }
 
     public function testBuildsMessageContentSuccessfully(): void
     {
+        $this->html2Text
+            ->expects($this->never())
+            ->method('__invoke');
+
         $dto = new MessageContentDto(
             subject: 'Test Subject',
             text: 'Full text content',
-            textMessage: 'Short text version',
             footer: 'Footer text'
         );
 
@@ -31,14 +38,37 @@ public function testBuildsMessageContentSuccessfully(): void
 
         $this->assertSame('Test Subject', $messageContent->getSubject());
         $this->assertSame('Full text content', $messageContent->getText());
-        $this->assertSame('Short text version', $messageContent->getTextMessage());
+        $this->assertSame('Full text content', $messageContent->getTextMessage());
         $this->assertSame('Footer text', $messageContent->getFooter());
     }
 
+    public function testBuildsPlainTextMessageFromHtmlText(): void
+    {
+        $dto = new MessageContentDto(
+            subject: 'Test Subject',
+            text: '<p>Full <b>text</b> content</p>',
+            footer: 'Footer text'
+        );
+
+        $this->html2Text
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with('<p>Full <b>text</b> content</p>')
+            ->willReturn('Full text content');
+
+        $messageContent = $this->builder->build($dto);
+
+        $this->assertSame('Full text content', $messageContent->getTextMessage());
+    }
+
     public function testThrowsExceptionOnInvalidDto(): void
     {
         $this->expectException(InvalidDtoTypeException::class);
 
+        $this->html2Text
+            ->expects($this->never())
+            ->method('__invoke');
+
         $invalidDto = new \stdClass();
         $this->builder->build($invalidDto);
     }
diff --git a/tests/Unit/Domain/Messaging/Service/Builder/MessageFormatBuilderTest.php b/tests/Unit/Domain/Messaging/Service/Builder/MessageFormatBuilderTest.php
index ed4645ed..0e682524 100644
--- a/tests/Unit/Domain/Messaging/Service/Builder/MessageFormatBuilderTest.php
+++ b/tests/Unit/Domain/Messaging/Service/Builder/MessageFormatBuilderTest.php
@@ -4,34 +4,51 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Builder;
 
-use PhpList\Core\Domain\Messaging\Exception\InvalidDtoTypeException;
+use PhpList\Core\Domain\Messaging\Model\Dto\CreateMessageDto;
+use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageContentDto;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageFormatDto;
-use PhpList\Core\Domain\Messaging\Service\Builder\MessageFormatBuilder;
+use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageMetadataDto;
+use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageOptionsDto;
+use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageScheduleDto;
 use PHPUnit\Framework\TestCase;
+use PhpList\Core\Domain\Messaging\Model\Message\MessageFormat;
+use PhpList\Core\Domain\Messaging\Service\Builder\MessageFormatBuilder;
 
-class MessageFormatBuilderTest extends TestCase
+final class MessageFormatBuilderTest extends TestCase
 {
-    private MessageFormatBuilder $builder;
-
-    protected function setUp(): void
+    public function testBuildSetsHtmlFormattedToFalseWhenContentIsPlainText(): void
     {
-        $this->builder = new MessageFormatBuilder();
+        $dto = $this->createDto('Plain text content', 'text');
+
+        $builder = new MessageFormatBuilder();
+        $result = $builder->build($dto);
+
+        self::assertInstanceOf(MessageFormat::class, $result);
+        self::assertFalse($result->isHtmlFormatted());
+        self::assertSame('text', $result->getSendFormat());
     }
 
-    public function testBuildsMessageFormatSuccessfully(): void
+    public function testBuildSetsHtmlFormattedToTrueWhenContentContainsHtml(): void
     {
-        $dto = new MessageFormatDto(htmlFormated: true, sendFormat: 'html', formatOptions: ['html', 'text']);
-        $messageFormat = $this->builder->build($dto);
+        $dto = $this->createDto('<p>Hello <strong>world</strong></p>', 'html');
+
+        $builder = new MessageFormatBuilder();
+        $result = $builder->build($dto);
 
-        $this->assertSame(true, $messageFormat->isHtmlFormatted());
-        $this->assertSame('html', $messageFormat->getSendFormat());
+        self::assertInstanceOf(MessageFormat::class, $result);
+        self::assertTrue($result->isHtmlFormatted());
+        self::assertSame('html', $result->getSendFormat());
     }
 
-    public function testThrowsExceptionOnInvalidDto(): void
+    private function createDto(string $text, string $sendFormat): CreateMessageDto
     {
-        $this->expectException(InvalidDtoTypeException::class);
-
-        $invalidDto = new \stdClass();
-        $this->builder->build($invalidDto);
+        return new CreateMessageDto(
+            content: new MessageContentDto(subject: '', text: $text, footer: ''),
+            format: new MessageFormatDto(sendFormat: $sendFormat),
+            metadata: $this->createMock(MessageMetadataDto::class),
+            options: $this->createMock(MessageOptionsDto::class),
+            schedule: $this->createMock(MessageScheduleDto::class),
+            templateId: null,
+        );
     }
 }
diff --git a/tests/Unit/Domain/Messaging/Service/Manager/MessageManagerTest.php b/tests/Unit/Domain/Messaging/Service/Manager/MessageManagerTest.php
index cbbbcb68..df00e584 100644
--- a/tests/Unit/Domain/Messaging/Service/Manager/MessageManagerTest.php
+++ b/tests/Unit/Domain/Messaging/Service/Manager/MessageManagerTest.php
@@ -4,7 +4,10 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Manager;
 
+use DateTime;
+use InvalidArgumentException;
 use PhpList\Core\Domain\Identity\Model\Administrator;
+use PhpList\Core\Domain\Messaging\Model\ListMessage;
 use PhpList\Core\Domain\Messaging\Model\Dto\CreateMessageDto;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageContentDto;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageFormatDto;
@@ -13,21 +16,65 @@
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageScheduleDto;
 use PhpList\Core\Domain\Messaging\Model\Dto\UpdateMessageDto;
 use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Model\Message\MessageFormat;
+use PhpList\Core\Domain\Messaging\Model\Message\MessageMetadata;
+use PhpList\Core\Domain\Messaging\Model\Message\MessageOptions;
+use PhpList\Core\Domain\Messaging\Model\Message\MessageSchedule;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Service\Builder\MessageBuilder;
 use PhpList\Core\Domain\Messaging\Service\Manager\MessageManager;
+use PhpList\Core\Domain\Subscription\Model\SubscriberList;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Validator\Exception\ValidatorException;
 
 class MessageManagerTest extends TestCase
 {
+    public function testCopyAsDraftMessagePersistsClonedDraftMessage(): void
+    {
+        $messageRepository = $this->createMock(MessageRepository::class);
+        $messageBuilder = $this->createMock(MessageBuilder::class);
+        $manager = new MessageManager($messageRepository, $messageBuilder);
+
+        $message = new Message(
+            format: new MessageFormat(true, 'html'),
+            schedule: new MessageSchedule(
+                repeatInterval: 0,
+                repeatUntil: null,
+                requeueInterval: 0,
+                requeueUntil: null,
+                embargo: new DateTime('2025-04-17T09:00:00+00:00')
+            ),
+            metadata: new MessageMetadata(Message\MessageStatus::Submitted),
+            content: new MessageContent('Subject', 'Full text', 'Short text', 'Footer'),
+            options: new MessageOptions('from@example.com', 'to@example.com', 'reply@example.com', 'all-users'),
+            owner: null
+        );
+
+        $messageRepository->expects($this->once())
+            ->method('persist')
+            ->with($this->callback(function (Message $persistedMessage) use ($message): bool {
+                $this->assertNotSame($message, $persistedMessage);
+                $this->assertSame(Message\MessageStatus::Draft, $persistedMessage->getMetadata()->getStatus());
+                $this->assertTrue($persistedMessage->getFormat()->isHtmlFormatted());
+                $this->assertSame('html', $persistedMessage->getFormat()->getSendFormat());
+
+                return true;
+            }));
+
+        $result = $manager->copyAsDraftMessage($message, $this->createMock(Administrator::class));
+
+        $this->assertSame(Message\MessageStatus::Draft, $result->getMetadata()->getStatus());
+        $this->assertNotSame($message, $result);
+    }
+
     public function testCreateMessageReturnsPersistedMessage(): void
     {
         $messageRepository = $this->createMock(MessageRepository::class);
         $messageBuilder = $this->createMock(MessageBuilder::class);
         $manager = new MessageManager($messageRepository, $messageBuilder);
 
-        $format = new MessageFormatDto(true, 'html', ['html']);
+        $format = new MessageFormatDto('html');
         $schedule = new MessageScheduleDto(
             embargo: '2025-04-17T09:00:00+00:00',
             repeatInterval: 60 * 24,
@@ -36,7 +83,7 @@ public function testCreateMessageReturnsPersistedMessage(): void
             requeueUntil: '2025-04-20T00:00:00+00:00',
         );
         $metadata = new MessageMetadataDto(Message\MessageStatus::Draft);
-        $content = new MessageContentDto('Subject', 'Full text', 'Short text', 'Footer');
+        $content = new MessageContentDto(subject: 'Subject', text: 'Full text', footer: 'Footer');
         $options = new MessageOptionsDto('from@example.com', 'to@example.com', 'reply@example.com', 'all-users');
 
         $request = new CreateMessageDto(
@@ -81,7 +128,7 @@ public function testUpdateMessageReturnsUpdatedMessage(): void
         $messageBuilder = $this->createMock(MessageBuilder::class);
         $manager = new MessageManager($messageRepository, $messageBuilder);
 
-        $format = new MessageFormatDto(false, 'text', ['text']);
+        $format = new MessageFormatDto('text');
         $schedule = new MessageScheduleDto(
             embargo: '2025-04-17T09:00:00+00:00',
             repeatInterval: 0,
@@ -91,16 +138,15 @@ public function testUpdateMessageReturnsUpdatedMessage(): void
         );
         $metadata = new MessageMetadataDto(Message\MessageStatus::Draft);
         $content = new MessageContentDto(
-            'Updated Subject',
-            'Updated Full text',
-            'Updated Short text',
-            'Updated Footer'
+            subject: 'Updated Subject',
+            text: 'Updated Full text',
+            footer: 'Updated Footer'
         );
         $options = new MessageOptionsDto(
-            'newfrom@example.com',
-            'newto@example.com',
-            'newreply@example.com',
-            'active-users'
+            fromField: 'newfrom@example.com',
+            toField:  'newto@example.com',
+            replyTo: 'newreply@example.com',
+            userSelection: 'active-users'
         );
 
         $updateRequest = new UpdateMessageDto(
@@ -134,4 +180,63 @@ public function testUpdateMessageReturnsUpdatedMessage(): void
         $this->assertSame('Updated Subject', $message->getContent()->getSubject());
         $this->assertSame(Message\MessageStatus::Draft, $message->getMetadata()->getStatus());
     }
+
+    public function testUpdateStatusThrowsWhenSubmittedWithoutListMessage(): void
+    {
+        $messageRepository = $this->createMock(MessageRepository::class);
+        $messageBuilder = $this->createMock(MessageBuilder::class);
+        $manager = new MessageManager($messageRepository, $messageBuilder);
+
+        $message = new Message(
+            format: new MessageFormat(true, 'html'),
+            schedule: new MessageSchedule(
+                repeatInterval: 0,
+                repeatUntil: null,
+                requeueInterval: 0,
+                requeueUntil: null,
+                embargo: new DateTime('2025-04-17T09:00:00+00:00')
+            ),
+            metadata: new MessageMetadata(Message\MessageStatus::Draft),
+            content: new MessageContent('Subject', 'Body text', 'Short text', 'Footer'),
+            options: new MessageOptions('from@example.com', 'to@example.com', 'reply@example.com', 'all-users'),
+            owner: null
+        );
+
+        $this->expectException(ValidatorException::class);
+        $this->expectExceptionMessage('Cannot submit.');
+
+        $manager->updateStatus($message, Message\MessageStatus::Submitted);
+    }
+
+    public function testUpdateStatusSetsSubmittedWhenRequiredFieldsAndListArePresent(): void
+    {
+        $messageRepository = $this->createMock(MessageRepository::class);
+        $messageBuilder = $this->createMock(MessageBuilder::class);
+        $manager = new MessageManager($messageRepository, $messageBuilder);
+
+        $message = new Message(
+            format: new MessageFormat(true, 'html'),
+            schedule: new MessageSchedule(
+                repeatInterval: 0,
+                repeatUntil: null,
+                requeueInterval: 0,
+                requeueUntil: null,
+                embargo: new DateTime('2025-04-17T09:00:00+00:00')
+            ),
+            metadata: new MessageMetadata(Message\MessageStatus::Draft),
+            content: new MessageContent('Subject', 'Body text', 'Short text', 'Footer'),
+            options: new MessageOptions('from@example.com', 'to@example.com', 'reply@example.com', 'all-users'),
+            owner: null
+        );
+
+        $listMessage = new ListMessage();
+        $listMessage->setMessage($message);
+        $listMessage->setList($this->createMock(SubscriberList::class));
+        $message->getListMessages()->add($listMessage);
+
+        $updated = $manager->updateStatus($message, Message\MessageStatus::Submitted);
+
+        $this->assertSame($message, $updated);
+        $this->assertSame(Message\MessageStatus::Submitted, $message->getMetadata()->getStatus());
+    }
 }
diff --git a/tests/Unit/Domain/Messaging/Service/Manager/TemplateImageManagerTest.php b/tests/Unit/Domain/Messaging/Service/Manager/TemplateImageManagerTest.php
index 238bcd06..63b3a4f9 100644
--- a/tests/Unit/Domain/Messaging/Service/Manager/TemplateImageManagerTest.php
+++ b/tests/Unit/Domain/Messaging/Service/Manager/TemplateImageManagerTest.php
@@ -8,12 +8,17 @@
 use PhpList\Core\Domain\Messaging\Model\Template;
 use PhpList\Core\Domain\Messaging\Model\TemplateImage;
 use PhpList\Core\Domain\Messaging\Repository\TemplateImageRepository;
+use PhpList\Core\Domain\Messaging\Service\Manager\ImageProvider;
 use PhpList\Core\Domain\Messaging\Service\Manager\TemplateImageManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class TemplateImageManagerTest extends TestCase
 {
+    private const ONE_PIXEL_PNG = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAABGdBTUEAALGPC/'
+    . 'xhBQAAAAZQTFRF////AAAAVcLTfgAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsSAAALEgHS3X78'
+    . 'AAAAB3RJTUUH0gQCEx05cqKA8gAAAApJREFUeJxjYAAAAAIAAUivpHEAAAAASUVORK5CYII=';
+
     private TemplateImageRepository&MockObject $templateImageRepository;
     private ConfigProvider&MockObject $configProvider;
     private TemplateImageManager $manager;
@@ -26,6 +31,7 @@ protected function setUp(): void
         $this->manager = new TemplateImageManager(
             templateImageRepository: $this->templateImageRepository,
             configProvider: $this->configProvider,
+            imageProvider: $this->createMock(ImageProvider::class),
         );
     }
 
@@ -33,7 +39,8 @@ public function testCreateImagesFromImagePaths(): void
     {
         $template = $this->createMock(Template::class);
 
-        $this->templateImageRepository->expects($this->exactly(2))
+        $this->templateImageRepository->method('poweredByImageExists')->willReturn(false);
+        $this->templateImageRepository->expects($this->exactly(2 + 1))
             ->method('persist')
             ->with($this->isInstanceOf(TemplateImage::class));
 
@@ -45,6 +52,49 @@ public function testCreateImagesFromImagePaths(): void
         }
     }
 
+    public function testCreateImagesFromImagePathsStoresImageDataAndReplacesExistingImage(): void
+    {
+        $template = $this->createMock(Template::class);
+        $template->method('getId')->willReturn(77);
+
+        $existingImage = $this->createMock(TemplateImage::class);
+        $capturedImage = null;
+
+        $tmpFile = tempnam(sys_get_temp_dir(), 'img_');
+        if ($tmpFile === false) {
+            $this->fail('Failed to create temporary file');
+        }
+
+        file_put_contents($tmpFile, (string) base64_decode(self::ONE_PIXEL_PNG, true));
+
+        $this->templateImageRepository->method('poweredByImageExists')->willReturn(true);
+        $this->templateImageRepository->expects($this->once())
+            ->method('findByTemplateIdAndFilename')
+            ->with(77, $tmpFile)
+            ->willReturn($existingImage);
+        $this->templateImageRepository->expects($this->once())
+            ->method('remove')
+            ->with($existingImage);
+        $this->templateImageRepository->expects($this->once())
+            ->method('persist')
+            ->with($this->callback(static function (TemplateImage $image) use (&$capturedImage): bool {
+                $capturedImage = $image;
+                return true;
+            }));
+
+        try {
+            $this->manager->createImagesFromImagePaths([$tmpFile], $template);
+        } finally {
+            unlink($tmpFile);
+        }
+
+        $this->assertInstanceOf(TemplateImage::class, $capturedImage);
+        $this->assertSame(1, $capturedImage->getWidth());
+        $this->assertSame(1, $capturedImage->getHeight());
+        $this->assertSame('image/png', $capturedImage->getMimeType());
+        $this->assertSame(self::ONE_PIXEL_PNG, $capturedImage->getData());
+    }
+
     public function testGuessMimeType(): void
     {
         $reflection = new \ReflectionClass($this->manager);
diff --git a/tests/Unit/Domain/Messaging/Service/Manager/TemplateManagerTest.php b/tests/Unit/Domain/Messaging/Service/Manager/TemplateManagerTest.php
index e2f79d33..efcb8b00 100644
--- a/tests/Unit/Domain/Messaging/Service/Manager/TemplateManagerTest.php
+++ b/tests/Unit/Domain/Messaging/Service/Manager/TemplateManagerTest.php
@@ -4,10 +4,12 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Manager;
 
+use InvalidArgumentException;
 use PhpList\Core\Domain\Messaging\Model\Dto\CreateTemplateDto;
 use PhpList\Core\Domain\Messaging\Model\Dto\UpdateTemplateDto;
 use PhpList\Core\Domain\Messaging\Model\Template;
 use PhpList\Core\Domain\Messaging\Repository\TemplateRepository;
+use PhpList\Core\Domain\Messaging\Service\Mapper\DefaultTemplateMapper;
 use PhpList\Core\Domain\Messaging\Service\Manager\TemplateImageManager;
 use PhpList\Core\Domain\Messaging\Service\Manager\TemplateManager;
 use PhpList\Core\Domain\Messaging\Validator\TemplateImageValidator;
@@ -21,6 +23,7 @@ class TemplateManagerTest extends TestCase
     private TemplateImageManager&MockObject $templateImageManager;
     private TemplateLinkValidator&MockObject $templateLinkValidator;
     private TemplateImageValidator&MockObject $templateImageValidator;
+    private DefaultTemplateMapper&MockObject $defaultTemplateMapper;
     private TemplateManager $manager;
 
     protected function setUp(): void
@@ -29,12 +32,14 @@ protected function setUp(): void
         $this->templateImageManager = $this->createMock(TemplateImageManager::class);
         $this->templateLinkValidator = $this->createMock(TemplateLinkValidator::class);
         $this->templateImageValidator = $this->createMock(TemplateImageValidator::class);
+        $this->defaultTemplateMapper = $this->createMock(DefaultTemplateMapper::class);
 
         $this->manager = new TemplateManager(
             templateRepository: $this->templateRepository,
             templateImageManager: $this->templateImageManager,
             templateLinkValidator: $this->templateLinkValidator,
-            templateImageValidator: $this->templateImageValidator
+            templateImageValidator: $this->templateImageValidator,
+            defaultTemplateMapper: $this->defaultTemplateMapper
         );
     }
 
@@ -126,4 +131,91 @@ public function testDeleteTemplate(): void
 
         $this->manager->delete($template);
     }
+
+    public function testListDefaultsReturnsDefaultTemplateDefinitions(): void
+    {
+        $this->defaultTemplateMapper->expects($this->once())
+            ->method('list')
+            ->willReturn([
+                [
+                    'key' => 'system',
+                    'name' => 'System',
+                    'description' => 'Default system email wrapper',
+                    'file' => 'system.html',
+                ],
+                [
+                    'key' => 'responsive',
+                    'name' => 'Responsive',
+                    'description' => 'Responsive email layout',
+                    'file' => 'responsive.html',
+                ],
+            ]);
+
+        $defaults = $this->manager->listDefaults();
+
+        $this->assertIsArray($defaults);
+        $this->assertCount(2, $defaults);
+        $this->assertSame('system', $defaults[0]['key']);
+        $this->assertSame('System', $defaults[0]['name']);
+        $this->assertSame('system.html', $defaults[0]['file']);
+        $this->assertArrayHasKey('description', $defaults[0]);
+    }
+
+    public function testCreateDefaultTemplateCreatesTemplateByKey(): void
+    {
+        $this->defaultTemplateMapper->expects($this->once())
+            ->method('findByKey')
+            ->with('system')
+            ->willReturn([
+                'key' => 'system',
+                'name' => 'System',
+                'description' => 'Default system email wrapper',
+                'file' => 'system.html',
+            ]);
+
+        $this->defaultTemplateMapper->expects($this->once())
+            ->method('loadContent')
+            ->with('system.html')
+            ->willReturn('<html><body>[CONTENT]</body></html>');
+
+        $this->templateLinkValidator->expects($this->once())
+            ->method('validate')
+            ->with($this->isType('string'), $this->anything());
+
+        $this->templateImageManager->expects($this->once())
+            ->method('extractAllImages')
+            ->with($this->isType('string'))
+            ->willReturn([]);
+
+        $this->templateImageValidator->expects($this->once())
+            ->method('validate')
+            ->with([], $this->anything());
+
+        $this->templateRepository->expects($this->once())
+            ->method('persist')
+            ->with($this->isInstanceOf(Template::class));
+
+        $this->templateImageManager->expects($this->once())
+            ->method('createImagesFromImagePaths')
+            ->with([], $this->isInstanceOf(Template::class));
+
+        $template = $this->manager->createDefaultTemplate('system');
+
+        $this->assertSame('System', $template->getTitle());
+        $this->assertNotNull($template->getContent());
+        $this->assertStringContainsString('[CONTENT]', $template->getContent());
+    }
+
+    public function testCreateDefaultTemplateThrowsForUnknownKey(): void
+    {
+        $this->defaultTemplateMapper->expects($this->once())
+            ->method('findByKey')
+            ->with('missing')
+            ->willThrowException(new InvalidArgumentException('Default template with key "missing" does not exist.'));
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Default template with key "missing" does not exist.');
+
+        $this->manager->createDefaultTemplate('missing');
+    }
 }
diff --git a/tests/Unit/Domain/Messaging/Service/Mapper/DefaultTemplateMapperTest.php b/tests/Unit/Domain/Messaging/Service/Mapper/DefaultTemplateMapperTest.php
new file mode 100644
index 00000000..03f186bd
--- /dev/null
+++ b/tests/Unit/Domain/Messaging/Service/Mapper/DefaultTemplateMapperTest.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Mapper;
+
+use InvalidArgumentException;
+use PhpList\Core\Domain\Messaging\Service\Mapper\DefaultTemplateMapper;
+use PHPUnit\Framework\TestCase;
+
+class DefaultTemplateMapperTest extends TestCase
+{
+    private DefaultTemplateMapper $mapper;
+
+    protected function setUp(): void
+    {
+        $this->mapper = new DefaultTemplateMapper();
+    }
+
+    public function testListReturnsConfiguredDefaults(): void
+    {
+        $defaults = $this->mapper->list();
+
+        $this->assertIsArray($defaults);
+        $this->assertNotEmpty($defaults);
+        $this->assertSame('system', $defaults[0]['key']);
+        $this->assertSame('System', $defaults[0]['name']);
+        $this->assertSame('system.html', $defaults[0]['file']);
+        $this->assertArrayHasKey('description', $defaults[0]);
+    }
+
+    public function testFindByKeyReturnsExpectedTemplate(): void
+    {
+        $template = $this->mapper->findByKey('responsive');
+
+        $this->assertSame('responsive', $template['key']);
+        $this->assertSame('Responsive', $template['name']);
+        $this->assertSame('responsive.html', $template['file']);
+    }
+
+    public function testFindByKeyThrowsForUnknownKey(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Default template with key "unknown" does not exist.');
+
+        $this->mapper->findByKey('unknown');
+    }
+
+    public function testLoadContentReadsTemplateFile(): void
+    {
+        $content = $this->mapper->loadContent('system.html');
+
+        $this->assertIsString($content);
+        $this->assertNotSame('', $content);
+        $this->assertStringContainsString('[CONTENT]', $content);
+    }
+}
diff --git a/tests/Unit/Domain/Messaging/Service/MessageDataLoaderTest.php b/tests/Unit/Domain/Messaging/Service/MessageDataLoaderTest.php
index c6174a44..5999ce50 100644
--- a/tests/Unit/Domain/Messaging/Service/MessageDataLoaderTest.php
+++ b/tests/Unit/Domain/Messaging/Service/MessageDataLoaderTest.php
@@ -7,11 +7,13 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Service\Provider\ConfigProvider;
+use PhpList\Core\Domain\Messaging\Model\ListMessage;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Messaging\Model\MessageData;
 use PhpList\Core\Domain\Messaging\Repository\MessageDataRepository;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Service\MessageDataLoader;
+use PhpList\Core\Domain\Subscription\Model\SubscriberList;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -61,6 +63,11 @@ public function testLoadsMessageDataMergesAndParses(): void
         $md2 = (new MessageData())->setId($messageId)->setName('criteria_match')->setData('any');
         $md3 = (new MessageData())->setId($messageId)->setName('embargo')->setData('string');
 
+        $listMock = $this->createMock(SubscriberList::class);
+        $listMock->method('getId')->willReturn(42);
+        $listMessageMock = $this->createMock(ListMessage::class);
+        $listMessageMock->method('getList')->willReturn($listMock);
+
         $this->messageDataRepository
             ->method('getForMessage')
             ->with($messageId)
@@ -69,16 +76,7 @@ public function testLoadsMessageDataMergesAndParses(): void
         // Use a Message mock instead of an anonymous stub
         $message = $this->createMock(Message::class);
         $message->method('getId')->willReturn($messageId);
-        $message->method('getListMessages')->willReturn(
-            new ArrayCollection([
-                new class {
-                    public function getListId(): int
-                    {
-                        return 42;
-                    }
-                },
-            ])
-        );
+        $message->method('getListMessages')->willReturn(new ArrayCollection([$listMessageMock]));
 
         $loader = new MessageDataLoader(
             configProvider: $this->config,
diff --git a/tests/Unit/Domain/Subscription/Service/Provider/SubscriberProviderTest.php b/tests/Unit/Domain/Subscription/Service/Provider/SubscriberProviderTest.php
index fa304c8a..ee263b73 100644
--- a/tests/Unit/Domain/Subscription/Service/Provider/SubscriberProviderTest.php
+++ b/tests/Unit/Domain/Subscription/Service/Provider/SubscriberProviderTest.php
@@ -4,8 +4,8 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Subscription\Service\Provider;
 
-use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage;
-use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessageInterface;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\CampaignProcessorMessage;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessor\CampaignProcessorMessageInterface;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberListRepository;