diff --git a/mod/profile.php b/mod/profile.php
index e5bc92f5b2..94e86e151d 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -74,11 +74,14 @@ function item_display(&$a, $item,$template,$comment) {
 	if(local_user() && ($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] ))
 		$profile_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
+	$photo = (($item['self']) ? $a->profile['photo'] : $item['photo']);
+	$thumb = (($item['self']) ? $a->profile['thumb'] : $item['thumb']);
+
 	$o .= replace_macros($template,array(
 		'$id' => $item['item_id'],
 		'$profile_url' => $profile_url,
 		'$name' => $item['name'],
-		'$thumb' => $item['thumb'],
+		'$thumb' => $thumb,
 		'$body' => bbcode($item['body']),
 		'$ago' => relative_date($item['created']),
 		'$comment' => $comment
diff --git a/wip/todo b/wip/todo
index 4b3320920c..035f72a8df 100644
--- a/wip/todo
+++ b/wip/todo
@@ -1,7 +1,11 @@
 
 profile photo to self contact page? - resolve profile photo inconsistency
 	pre-load profile photos and use in conversations instead of contact photos
-	ensure correct photo is pushed with notify/poll
+	(done for profile owner)
+
+	ensure correct photo is pushed with notify/poll and used in wall/wall comments/posts
+	use photo hash to notify of changes?
+
 
 contact editor
 
@@ -15,6 +19,8 @@ publish to directory
 
 directory page
 
+publish to external directory
+
 anonymous nav links
 
 groups