diff --git a/Configuration/MailTemplates/ApplicationMail.php b/Configuration/SgMail/ApplicationMail.php
similarity index 83%
rename from Configuration/MailTemplates/ApplicationMail.php
rename to Configuration/SgMail/ApplicationMail.php
index a6c336e1b4ff8c218e7121bcc65a36235b5f8c93..f7666f8903b83cf8f4d7be356b506a67b186f1bd 100644
--- a/Configuration/MailTemplates/ApplicationMail.php
+++ b/Configuration/SgMail/ApplicationMail.php
@@ -5,6 +5,42 @@ return [
 	'template_key' => 'application_mail',
 	'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:mail.application.description',
 	'subject' => 'Eine neue Bewerbung',
+	'templateContent' => <<<EOT
+Eine neue {f:if(condition: '{application.jobTitle}', then: 'Bewerbung als <b>{application.jobTitle}</b> für den Standort <b>{application.company.city}</b>.', else: 'Initiativbewerbung für den Standort <b>{application.company.city}</b>.')}
+
+Geschlecht: {f:if(condition: '{application.gender} == \'Female\'', then: 'weiblich', else: 'männlich')}
+
+Vorname: {application.firstName}
+
+Nachname: {application.lastName}
+
+Geburtsdatum: {application.birthDate}
+
+Straße: {application.street}
+
+Postleitzahl: {application.zip}
+
+Ort: {application.city}
+
+Land: {application.country}
+
+Nationalität: {application.nationality}
+
+Telefon: {application.phone}
+
+Mobil: {application.mobile}
+
+E-Mail-Adresse: {application.email}
+
+Höchster Bildungsstand: {application.education}
+
+Nachricht:
+
+{application.message}
+
+{f:if(condition: '{application.privacyPolicy}', then: 'Die Datenschutzvereinbarung wurde aktzeptiert.')}
+EOT
+,
 	'markers' => [
 		[
 			'marker' => 'application.jobTitle',
diff --git a/Configuration/TCA/tx_sgjobs_domain_model_job.php b/Configuration/TCA/tx_sgjobs_domain_model_job.php
index 82cd7ba74956ade041371369e071a832981f2212..7f71b80b42b5874835f6b5503bf55c4a11a0b66e 100644
--- a/Configuration/TCA/tx_sgjobs_domain_model_job.php
+++ b/Configuration/TCA/tx_sgjobs_domain_model_job.php
@@ -133,7 +133,7 @@ return [
 			'config' => [
 				'type' => 'input',
 				'size' => 30,
-				'eval' => 'trim, required'
+				'eval' => 'trim, required, unique'
 			],
 		],
 		'job_id' => [
diff --git a/Resources/Private/Templates/SgMail/ApplicationMail/template.html b/Resources/Private/Templates/SgMail/ApplicationMail/template.html
deleted file mode 100644
index b704aa778fd8656818c77325b057e6944caccb84..0000000000000000000000000000000000000000
--- a/Resources/Private/Templates/SgMail/ApplicationMail/template.html
+++ /dev/null
@@ -1,33 +0,0 @@
-Eine neue {f:if(condition: '{application.jobTitle}', then: 'Bewerbung als <b>{application.jobTitle}</b> für den Standort <b>{application.company.city}</b>.', else: 'Initiativbewerbung für den Standort <b>{application.company.city}</b>.')}
-
-Geschlecht: {f:if(condition: '{application.gender} == \'Female\'', then: 'weiblich', else: 'männlich')}
-
-Vorname: {application.firstName}
-
-Nachname: {application.lastName}
-
-Geburtsdatum: {application.birthDate}
-
-Straße: {application.street}
-
-Postleitzahl: {application.zip}
-
-Ort: {application.city}
-
-Land: {application.country}
-
-Nationalität: {application.nationality}
-
-Telefon: {application.phone}
-
-Mobil: {application.mobile}
-
-E-Mail-Adresse: {application.email}
-
-Höchster Bildungsstand: {application.education}
-
-Nachricht:
-
-{application.message}
-
-{f:if(condition: '{application.privacyPolicy}', then: 'Die Datenschutzvereinbarung wurde aktzeptiert.')}
diff --git a/composer.json b/composer.json
index 509e8a17ffa74086713e3cf7a1d20c27abe7ea36..ff3886fd2f6534c4efd5f9b9bf078a7efb737225 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 	"license": [
 		"GPL-2.0-or-later"
 	],
-	"version": "1.18.0",
+	"version": "1.19.1",
 	"support": {
 		"issues": "https://gitlab.sgalinski.de/typo3/sg_jobs"
 	},
diff --git a/ext_emconf.php b/ext_emconf.php
index ab75beb7b67c18bf9f33a6185d5edede92d83faa..5d74261c07736385670b70bb343a4b5fab0e7111 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -4,7 +4,7 @@ $EM_CONF[$_EXTKEY] = array (
 	'title' => 'Jobs',
 	'description' => 'Manage and display your Job offers.',
 	'category' => 'plugin',
-	'version' => '1.18.0',
+	'version' => '1.19.1',
 	'state' => 'stable',
 	'uploadfolder' => FALSE,
 	'createDirs' => '',
diff --git a/ext_localconf.php b/ext_localconf.php
index 180e49b386efe4cae4644e01ebe2bccde0784542..da7577a226767c748a7f39855646405f7e048d49 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -60,6 +60,9 @@ if (TYPO3_MODE === 'BE') {
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScriptSetup(file_get_contents($tsPath . 'setup.ts'));
 }
 
+// register mail templates
+$GLOBALS['sg_mail']['sg_jobs']['ApplicationMail'] = 'EXT:sg_jobs/Configuration/SgMail/ApplicationMail.php';
+
 // signal slot for sg_seo integration
 /** @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher $signalSlotDispatcher */
 $signalSlotDispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(