diff --git a/Classes/Controller/MailController.php b/Classes/Controller/MailController.php
index f5e1169a7f58bee8ad4e25d2a18606ee7424436b..baf953cba10ed4a7fe1e7556cb676d2d7fc98457 100644
--- a/Classes/Controller/MailController.php
+++ b/Classes/Controller/MailController.php
@@ -171,8 +171,8 @@ class MailController extends ActionController {
 				}
 				$templateFromFile->setSubject($subject);
 				$subject = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['subject'];
-				if (file_exists($defaultTemplateFile)) {
-					$templateFromFile->setContent(file_get_contents($defaultTemplateFile));
+				if ($registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['templateContent']) {
+					$templateFromFile->setContent($registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['templateContent']);
 				} else {
 					if (file_exists($fallbackTemplateFile)) {
 						$templateFromFile->setContent(file_get_contents($fallbackTemplateFile));