diff --git a/Classes/Domain/Repository/TemplateRepository.php b/Classes/Domain/Repository/TemplateRepository.php
index 09e71ca1e9f5afc3e79c7eadee8a806f43d8c8e1..978b320f04302a393d5f0946cf4f2411dc39c7e3 100644
--- a/Classes/Domain/Repository/TemplateRepository.php
+++ b/Classes/Domain/Repository/TemplateRepository.php
@@ -55,7 +55,9 @@ class TemplateRepository extends AbstractRepository {
 			$query->logicalAnd($constraintsAnd)
 		);
 
-		return $query->execute()->getFirst();
+		/** @var Template $template */
+		$template = $query->execute()->getFirst();
+		return $template;
 	}
 
 	/**
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index b005facef993052f01a5515a869b83fae420b221..41f37dde39fb1cc3d40d7682892ae1da65130dee 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -18,8 +18,8 @@
 			<target>Zurücksetzen</target>
 		</trans-unit>
 		<trans-unit id="backend.button_reset_all" approved="yes">
-			<source>Reset all</source>
-			<target>Alles Zurücksetzen</target>
+			<source>Reset all Languages for this Template</source>
+			<target>Alle Sprachen für dieses Template zurücksetzen</target>
 		</trans-unit>
 		<trans-unit id="backend.cc" approved="yes" xml:space="preserve">
 			<source>cc (Comma separated if multiple)</source>
@@ -162,8 +162,8 @@
 			<target>Gebrauch im Template</target>
 		</trans-unit>
 		<trans-unit id="backend.value" approved="yes">
-			<source>Value</source>
-			<target>Wert</target>
+			<source>Example value</source>
+			<target>Beispielwert</target>
 		</trans-unit>
 		<trans-unit id="mlang_labels_tabdescr" approved="yes">
 			<source>Mail Templates</source>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 6fea59b417e5739294753b5061507d25053ea7c9..27c76753daa934a85a96aa061d5e9c87d196014a 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -16,7 +16,7 @@
 			<source>Reset Template</source>
 		</trans-unit>
 		<trans-unit id="backend.button_reset_all">
-			<source>Reset all</source>
+			<source>Reset all Languages for this Template</source>
 		</trans-unit>
 		<trans-unit id="backend.cc">
 			<source>cc (Comma separated if multiple)</source>
@@ -124,7 +124,7 @@
 			<source>Usage in Template</source>
 		</trans-unit>
 		<trans-unit id="backend.value">
-			<source>Value</source>
+			<source>Example value</source>
 		</trans-unit>
 		<trans-unit id="mlang_labels_tabdescr">
 			<source>Mail Templates</source>
diff --git a/Resources/Private/Templates/Mail/Index.html b/Resources/Private/Templates/Mail/Index.html
index 4c18a0654ac9e7a4e0c1ef14e3c6dcafa9626fb6..19060181403881754bc0399976824a46fd4b2f97 100644
--- a/Resources/Private/Templates/Mail/Index.html
+++ b/Resources/Private/Templates/Mail/Index.html
@@ -4,9 +4,7 @@
 
 <f:section name="iconButtons">
 </f:section>
-
 <f:section name="main">
-
 	<f:flashMessages renderMode="div" />
 	<div class="col-md-12">
 		<p>{templateDescription}</p>