diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Autoreply.html b/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Autoreply.html
index 546ab819..aaa00616 100644
--- a/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Autoreply.html
+++ b/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Autoreply.html
@@ -2,7 +2,7 @@
 	 xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
 	 xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-	<f:layout name="Email"/>
+	<f:layout name="SystemEmail"/>
 
 	<f:section name="Main">
         <p>Sehr geehrte Damen und Herren,</p>
diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Configurator.html b/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Configurator.html
index 3ab883c2..f6970954 100644
--- a/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Configurator.html
+++ b/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Configurator.html
@@ -3,7 +3,7 @@
 	 xmlns:ep="http://typo3.org/ns/EP/EpEvents/ViewHelpers"
 	 xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-	<f:layout name="Email"/>
+	<f:layout name="SystemEmail"/>
 
 	<f:section name="Main">
 		<h1>Anfrage E&amp;P Events vom <f:format.date date="now" format="d.m.y" /></h1>
diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Inquiry.html b/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Inquiry.html
index f116e5e1..f1e32524 100644
--- a/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Inquiry.html
+++ b/public/typo3conf/ext/ep_events/Resources/Private/Templates/Email/Inquiry.html
@@ -2,7 +2,7 @@
 	 xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
 	 xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-	<f:layout name="Email"/>
+	<f:layout name="SystemEmail"/>
 
 	<f:section name="Main">
 		<h1>Anfrage E&amp;P Events vom <f:format.date date="now" format="d.m.y" /></h1>
diff --git a/public/typo3conf/ext/ep_events/ext_localconf.php b/public/typo3conf/ext/ep_events/ext_localconf.php
index c4cbcb50..58b2ae53 100644
--- a/public/typo3conf/ext/ep_events/ext_localconf.php
+++ b/public/typo3conf/ext/ep_events/ext_localconf.php
@@ -189,4 +189,6 @@ call_user_func(function() {
     $GLOBALS['TYPO3_CONF_VARS']['FE']['cacheHash']['excludedParameters'][] = 'ref';
     $GLOBALS['TYPO3_CONF_VARS']['FE']['cacheHash']['excludedParameters'][] = 'tx_epevents_configurator[travelType]';
     $GLOBALS['TYPO3_CONF_VARS']['FE']['cacheHash']['excludedParameters'][] = 'tx_epevents_configurator[locationType]';
+
+    $GLOBALS['TYPO3_CONF_VARS']['MAIL']['templateRootPaths'][800] = 'EXT:ep_events/Resources/Private/Templates/Email/';
 });