diff --git a/application/helpers/admin/token_helper.php b/application/helpers/admin/token_helper.php
index ce4ac27..863dcb5 100644
--- a/application/helpers/admin/token_helper.php
+++ b/application/helpers/admin/token_helper.php
@@ -78,6 +78,7 @@ function emailTokens($iSurveyID,$aResultTokens,$sType)
 
 		$fieldsarray["{ADMINNAME}"] = $oSurvey['admin'];
 		$fieldsarray["{ADMINEMAIL}"] = $oSurvey['adminemail'];
+		$fieldsarray["{EXPIRY}"] = $oSurvey['expires'];
 		$from = $fieldsarray["{ADMINNAME}"] . ' <' . $fieldsarray["{ADMINEMAIL}"] . '>';
 		if($from ==  '')
 			$from = Yii::app()->getConfig('siteadminemail');
@@ -128,8 +129,10 @@ function emailTokens($iSurveyID,$aResultTokens,$sType)
 			$sMessage = $aSurveyLocaleData[$sTokenLanguage]['surveyls_email_remind'];
 		}
 
-		$modsubject = Replacefields($sSubject, $fieldsarray);
-		$modmessage = Replacefields($sMessage, $fieldsarray);
+		$modsubject = Replacefields($sSubject, $fieldsarray, false);
+		$modsubject = Replacefields($modsubject, $fieldsarray);
+		$modmessage = Replacefields($sMessage, $fieldsarray, false);
+		$modmessage = Replacefields($modmessage, $fieldsarray);
 
 		if (isset($barebone_link))
 		{