diff --git a/include/conversation.php b/include/conversation.php
index b7fba9154..a4069c9fd 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -214,18 +214,18 @@ function conversation(&$a, $items, $mode, $update) {
 					'$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 					'$profile_url' => $profile_link,
 					'$item_photo_menu' => item_photo_menu($item),
-					'$name' => $profile_name,
+					'$name' => template_escape($profile_name),
 					'$sparkle' => $sparkle,
 					'$lock' => $lock,
 					'$thumb' => $profile_avatar,
-					'$title' => $item['title'],
-					'$body' => $body,
+					'$title' => template_escape($item['title']),
+					'$body' => template_escape($body),
 					'$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-					'$location' => $location,
+					'$location' => template_escape($location),
 					'$indent' => '',
 					'$owner_url' => $owner_url,
 					'$owner_photo' => $owner_photo,
-					'$owner_name' => $owner_name,
+					'$owner_name' => template_escape($owner_name),
 					'$star' => $star,
 					'$drop' => $drop,
 					'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'