diff --git a/Classes/ViewHelpers/ExtendedIfViewHelper.php b/Classes/ViewHelpers/ExtendedIfViewHelper.php
index e350a832389c60870324018b53be5a985f1065ca..f36a3c138e2ac1322b132a3db2a028341118e375 100644
--- a/Classes/ViewHelpers/ExtendedIfViewHelper.php
+++ b/Classes/ViewHelpers/ExtendedIfViewHelper.php
@@ -26,6 +26,7 @@ namespace SGalinski\SgMail\ViewHelpers;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
 
 /**
@@ -38,9 +39,11 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper {
 	 */
 	public function initializeArguments() {
 		parent::initializeArguments();
-		$this->registerArgument(
-			'condition', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
-		);
+		if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) < 8000000) {
+			$this->registerArgument(
+				'condition', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
+			);
+		}
 		$this->registerArgument(
 			'or', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
 		);
diff --git a/Resources/Private/Templates/Mail/Index.html b/Resources/Private/Templates/Mail/Index.html
index d12104993edae3605b45d8f8ff4ed693be1f74bc..b5b5f3f32741bda6034c4464f9f215df73f4a4fc 100644
--- a/Resources/Private/Templates/Mail/Index.html
+++ b/Resources/Private/Templates/Mail/Index.html
@@ -5,7 +5,7 @@
 <f:section name="iconButtons">
 </f:section>
 <f:section name="content">
-	<f:flashMessages renderMode="div" />
+	<f:flashMessages/>
 	<f:if condition="{noPage}">
 		<f:then>
 			<f:if condition="{pages}">
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index e05f4c73251b57cf61b782ddde66ebb13e97af50..26936e22a60680326a7f8300dcd934c51c029358 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -6,7 +6,7 @@
 </f:section>
 
 <f:section name="content">
-	<f:flashMessages renderMode="div" />
+	<f:flashMessages/>
 	<f:if condition="{queue -> f:count()} > 0">
 		<f:then>
 			<div class="panel panel-default recordlist">