diff --git a/Classes/Controller/MailController.php b/Classes/Controller/MailController.php
index b1b763bc617dcb32caa758cb98ec766231e2a5b2..9f980b3c33f0b06f387b6fa22605764804fdb298 100644
--- a/Classes/Controller/MailController.php
+++ b/Classes/Controller/MailController.php
@@ -340,6 +340,7 @@ class MailController extends ActionController {
 		$template->setCc($selectedCc);
 		$template->setBcc($selectedBcc);
 		$template->setReplyTo($selectedReplyTo);
+		$template->setSiteRootId($siteRootId);
 
 		if ($templateAlreadyExists) {
 			$this->templateRepository->update($template);
diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index c63ad182adaa71c7ee9ef41c1aac28d1002ceb08..f6dbdc9642aa1d105c43a20dc691e9f03c424dde 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -313,6 +313,7 @@ class MailTemplateService {
 	 *
 	 * @param boolean $isPreview
 	 * @return boolean email was sent or added to mail queue successfully?
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
 	 */
 	public function sendEmail($isPreview = FALSE) {
 		/** @var Template $template */
@@ -435,8 +436,9 @@ class MailTemplateService {
 		$mail->setSendingTime($sendingTime);
 		$mail->setReplyTo($this->replyToAddress);
 
-
-		$mail->setSiteRootId($this->replyToAddress);
+		$pageUid = (int) GeneralUtility::_GP('id');
+		$siteRootId = BackendService::getSiteRoot($pageUid)['uid'];
+		$mail->setSiteRootId($siteRootId);
 
 		$mailRepository = $this->objectManager->get(MailRepository::class);
 		$mailRepository->add($mail);