diff --git a/admin/tokens.php b/admin/tokens.php
index c4a725a3a01..9816b730376 100644
--- a/admin/tokens.php
+++ b/admin/tokens.php
@@ -688,6 +688,7 @@
 					{
 					$sendmessage = str_replace("{ATTRIBUTE_2}", $emrow['attribute_2'], $sendmessage);
 					}
+				$sendmessage=crlf_lineendings($sendmessage);
 				// Uncomment the next line if your mail clients can't handle emails containing <CR><LF> 
 				// line endings. This converts them to just <LF> line endings. This is not correct, and may 
 				// cause problems with certain email server
@@ -853,6 +854,7 @@
 				$sendmessage = str_replace("{SURVEYURL}", "$publicurl/index.php?sid=$sid&token={$emrow['token']}", $sendmessage);
 				$sendmessage = str_replace("{ATTRIBUTE1}", $emrow['attribute_1'], $sendmessage);
 				$sendmessage = str_replace("{ATTRIBUTE2}", $emrow['attribute_2'], $sendmessage);
+				$sendmessage=crlf_lineendings($sendmessage);
 				// Uncomment the next line if your mail clients can't handle emails containing <CR><LF> 
 				// line endings. This converts them to just <LF> line endings. This is not correct, and may 
 				// cause problems with certain email server