1 files changed, 26 insertions, 16 deletions

diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index b52b86a3a..b12f98522 100644
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -12,18 +12,20 @@ if (!$message) {
 	return true;
 }
 
-if ($full) {
-	$message->readYet = true;
-}
-
 if ($message->toId == elgg_get_page_owner_guid()) {
 	// received
 	$user = get_entity($message->fromId);
-	$icon = elgg_view_entity_icon($user, 'tiny');
-	$user_link = elgg_view('output/url', array(
-		'href' => "messages/compose?send_to=$user->guid",
-		'text' => $user->name,
-	));
+	if ($user) {
+		$icon = elgg_view_entity_icon($user, 'tiny');
+		$user_link = elgg_view('output/url', array(
+			'href' => "messages/compose?send_to=$user->guid",
+			'text' => $user->name,
+			'is_trusted' => true,
+		));
+	} else {
+		$icon = '';
+		$user_link = elgg_echo('messages:deleted_sender');
+	}
 
 	if ($message->readYet) {
 		$class = 'message read';
@@ -34,11 +36,18 @@ if ($message->toId == elgg_get_page_owner_guid()) {
 } else {
 	// sent
 	$user = get_entity($message->toId);
-	$icon = elgg_view_entity_icon($user, 'tiny');
-	$user_link = elgg_view('output/url', array(
-		'href' => "messages/compose?send_to=$user->guid",
-		'text' => elgg_echo('messages:to_user', array($user->name)),
-	));
+
+	if ($user) {
+		$icon = elgg_view_entity_icon($user, 'tiny');
+		$user_link = elgg_view('output/url', array(
+			'href' => "messages/compose?send_to=$user->guid",
+			'text' => elgg_echo('messages:to_user', array($user->name)),
+			'is_trusted' => true,
+		));
+	} else {
+		$icon = '';
+		$user_link = elgg_echo('messages:deleted_sender');
+	}
 
 	$class = 'message read';
 }
@@ -52,13 +61,14 @@ if (!$full) {
 $subject_info .= elgg_view('output/url', array(
 	'href' => $message->getURL(),
 	'text' => $message->title,
+	'is_trusted' => true,
 ));
 
 $delete_link = elgg_view("output/confirmlink", array(
 						'href' => "action/messages/delete?guid=" . $message->getGUID(),
-						'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
+						'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>",
 						'confirm' => elgg_echo('deleteconfirm'),
-						'text_encode' => false,
+						'encode_text' => false,
 					));
 
 $body = <<<HTML