diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index 0a71a9302cc1a03daa09e19b2ce2ddaddc5804a6..9dabed4ecf2c82e3241a00fed210fa7956cbeb40 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -328,14 +328,15 @@ class MailTemplateService {
 
 		if (NULL === $defaultTemplateContent) {
 			$emailView->setTemplateSource($template->getContent());
-			$subject = $template->getSubject();
+			$subject = trim($template->getSubject());
 		} else {
 			$emailView->setTemplateSource($defaultTemplateContent);
 
 			$subject = self::getRegisterArray()[$this->extensionKey][$this->templateName]['subject'];
 			if (is_array($subject)) {
-				$subject = self::getRegisterArray(
-				)[$this->extensionKey][$this->templateName]['subject'][$this->language];
+				$subject = trim(
+					self::getRegisterArray()[$this->extensionKey][$this->templateName]['subject'][$this->language]
+				);
 			}
 		}