diff --git a/include/conversation.php b/include/conversation.php
index a5fe573cd..c278dcf12 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1024,8 +1024,8 @@ function builtin_activity_puller($item, &$conv_responses) {
 
 		if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
 			$name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown'));
-			$url = (($item['author']['xchan_url']) 
-				? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . $name . '</a>' 
+			$url = (($item['author']['xchan_url'] && $item['author']['xchan_photo_s']) 
+				? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="response-photo" src="' . zid($item['author']['xchan_photo_s'])  . ' alt="' . urlencode($name) . '" /> ' . $name . '</a>' 
 				: '<a href="#" class="disabled">' . $name . '</a>'
 			);
 
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 6f1d4b899..dc74dbbeb 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -246,3 +246,9 @@ a.wall-item-name-link {
 	color: #FF0000;
 	font-size: 1em !important;
 }
+
+.response-photo {
+	height: 18px !important;
+	width: 18px !important;
+}
+