diff --git a/Classes/Controller/MailController.php b/Classes/Controller/MailController.php
index a2640b08d048221a1bfa0276d56222a35665a164..b1b763bc617dcb32caa758cb98ec766231e2a5b2 100644
--- a/Classes/Controller/MailController.php
+++ b/Classes/Controller/MailController.php
@@ -315,6 +315,9 @@ class MailController extends ActionController {
 		$selectedExtension, $selectedTemplate, $selectedLanguage, $selectedContent, $selectedSubject,
 		$selectedFromName, $selectedFromMail, $selectedCc, $selectedBcc, $selectedReplyTo
 	) {
+		$pageUid = (int) GeneralUtility::_GP('id');
+		$siteRootId = BackendService::getSiteRoot($pageUid)['uid'];
+
 		/** @var Template $template */
 		$template = $this->templateRepository->findOneByTemplate(
 			$selectedExtension, $selectedTemplate, $selectedLanguage, $siteRootId
diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index 0c716e4fb77000b16472c43ce9c977f9a3dd928a..c63ad182adaa71c7ee9ef41c1aac28d1002ceb08 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -435,6 +435,9 @@ class MailTemplateService {
 		$mail->setSendingTime($sendingTime);
 		$mail->setReplyTo($this->replyToAddress);
 
+
+		$mail->setSiteRootId($this->replyToAddress);
+
 		$mailRepository = $this->objectManager->get(MailRepository::class);
 		$mailRepository->add($mail);
 		$this->persistenceManager->persistAll();