diff --git a/Classes/Controller/AddressController.php b/Classes/Controller/AddressController.php
index 1979ab1..1e28e9e 100644
--- a/Classes/Controller/AddressController.php
+++ b/Classes/Controller/AddressController.php
@@ -235,7 +235,7 @@ protected function errorAction()
      * action form only
      *
      * @param Address $newAddress
-     * @dontvalidate $newAddress
+     * @ignorevalidation $newAddress
      * @return void
      */
     public function formOnlyAction(Address $newAddress = NULL)
@@ -247,7 +247,7 @@ public function formOnlyAction(Address $newAddress = NULL)
      * action new
      *
      * @param Address $newAddress
-     * @dontvalidate $newAddress
+     * @ignorevalidation $newAddress
      * @return void
      */
     public function newAction(Address $newAddress = NULL)
diff --git a/Resources/Private/Templates/Address/Approve.html b/Resources/Private/Templates/Address/Approve.html
index 632a82f..67530f0 100644
--- a/Resources/Private/Templates/Address/Approve.html
+++ b/Resources/Private/Templates/Address/Approve.html
@@ -17,7 +17,7 @@
 	<f:then>
 		<f:if condition="{doApprove}">
 			<f:then>
-				<p><f:translate key="form.approve.approvetext" htmlEscape="false" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
+				<p><f:translate key="form.approve.approvetext" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
 			</f:then>
 			<f:else>
 				<f:form action="approve" arguments="{hash: hash}">
diff --git a/Resources/Private/Templates/Address/Create.html b/Resources/Private/Templates/Address/Create.html
index 67e0659..91961b0 100644
--- a/Resources/Private/Templates/Address/Create.html
+++ b/Resources/Private/Templates/Address/Create.html
@@ -15,11 +15,11 @@
 	<f:then>
 		<f:if condition="{alreadyExists}">
 			<f:then>
-				<p><f:translate key="form.create.alreadyexists" htmlEscape="false" /><br />
+				<p><f:translate key="form.create.alreadyexists" /><br />
 					<f:link.action action="information" arguments="{email: oldAddress.email, uid: oldAddress}" pageUid="{settings.pagewithform}"><f:translate key="form.create.alreadyexistsLinktext" /></f:link.action></p>
 			</f:then>
 			<f:else>
-				<p><f:translate key="form.create.approvetext" htmlEscape="false" arguments="{0: address.email}" /></p>
+				<p><f:translate key="form.create.approvetext" arguments="{0: address.email}" /></p>
 			</f:else>
 		</f:if>
 	</f:then>
diff --git a/Resources/Private/Templates/Address/Delete.html b/Resources/Private/Templates/Address/Delete.html
index 3984f6a..daee160 100644
--- a/Resources/Private/Templates/Address/Delete.html
+++ b/Resources/Private/Templates/Address/Delete.html
@@ -17,7 +17,7 @@
 	<f:then>
 		<f:if condition="{doDelete}">
 			<f:then>
-				<p><f:translate key="form.delete.text" htmlEscape="false" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
+				<p><f:translate key="form.delete.text" arguments="{0: address.firstName, 1:address.lastName, 2:address.email}" /></p>
 			</f:then>
 			<f:else>
 				<f:form action="delete" arguments="{hash: hash}">
diff --git a/Resources/Private/Templates/Address/Information.html b/Resources/Private/Templates/Address/Information.html
index e8f0b14..4b8769c 100644
--- a/Resources/Private/Templates/Address/Information.html
+++ b/Resources/Private/Templates/Address/Information.html
@@ -18,7 +18,7 @@
 		<p><f:translate key="form.info.text" /></p>
 	</f:then>
 	<f:else>
-		<p><f:translate key="form.info.error" htmlEscape="false" /></p>
+		<p><f:translate key="form.info.error" /></p>
 	</f:else>
 </f:if>
 
diff --git a/Resources/Private/Templates/Address/MailNewsletterRegistration.html b/Resources/Private/Templates/Address/MailNewsletterRegistration.html
index ea746f5..76cfd79 100644
--- a/Resources/Private/Templates/Address/MailNewsletterRegistration.html
+++ b/Resources/Private/Templates/Address/MailNewsletterRegistration.html
@@ -2,7 +2,7 @@
 	{f:translate(key:'mail.registration.greet')} {f:translate(key:'mail.gender.{address.gender}')} {address.firstName} {address.lastName}
 </p>
 <p>
-	{f:translate(key:'mail.registration.text', htmlEscape:0)}
+	{f:translate(key:'mail.registration.text')}
 </p>
 <div>
 	{f:translate(key:'mail.registration.consentText')}
diff --git a/Resources/Private/Templates/Address/MailNewsletterRegistration.txt b/Resources/Private/Templates/Address/MailNewsletterRegistration.txt
index 9d62f80..15fd9ee 100644
--- a/Resources/Private/Templates/Address/MailNewsletterRegistration.txt
+++ b/Resources/Private/Templates/Address/MailNewsletterRegistration.txt
@@ -1,6 +1,6 @@
 {f:translate(key:'mail.registration.greet')} {f:translate(key:'mail.gender.{address.gender}')} {address.firstName} {address.lastName}
 
-{f:translate(key:'mail.registration.text', htmlEscape:0)}
+{f:translate(key:'mail.registration.text')}
 
 {f:translate(key:'mail.registration.consentText')}
 {address.consent -> f:format.html(parseFuncTSPath:"plugin.tx_registeraddress.lib.parseFunc_PLAIN") -> f:format.stripTags()}
diff --git a/ext_emconf.php b/ext_emconf.php
index 3ec5632..ec6539c 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -27,11 +27,11 @@
 	'modify_tables' => '',
 	'clearCacheOnLoad' => 0,
 	'lockType' => '',
-	'version' => '2.0.1',
+	'version' => '2.0.2',
 	'constraints' => array(
 		'depends' => array(
-			'typo3' => '6.2.0-8.7.99',
-			'tt_address' => '3.1.0-3.3.99',
+			'typo3' => '6.2.0-9.5.99',
+			'tt_address' => '3.1.0-4.1.99',
 		),
 		'conflicts' => array(
 		),