[BUGFIX] 1584 Fixed a logical error

Classes/Service/MailTemplateService.php

@@ -873,11 +873,6 @@ class MailTemplateService {
 		$this->setSubjectToSend($subject);
 		$this->mailMessage->setSubject($subject);
 
-		// Load the values from the template if they are set
-		if (!$isNewsletter && $template !== NULL) {
-			$this->loadTemplateValues($template);
-		}
-
 		// Parse the markers
 		if ($this->fromName) {
 			$this->setFromName(
@@ -985,6 +980,11 @@ class MailTemplateService {
 
 		$registerService = GeneralUtility::makeInstance(RegisterService::class);
 
+		// Load the values from the template if they are set
+		if (!$isNewsletter && $template !== NULL) {
+			$this->loadTemplateValues($template);
+		}
+
 		// get default template content from register array
 		$defaultTemplateContent = $this->getDefaultTemplateContent($template, $registerService);