4 files changed, 36 insertions, 20 deletions

diff --git a/mod/messages/pages/messages/inbox.php b/mod/messages/pages/messages/inbox.php
index 4b2d11bbf..de5b8b231 100644
--- a/mod/messages/pages/messages/inbox.php
+++ b/mod/messages/pages/messages/inbox.php
@@ -8,13 +8,20 @@
 gatekeeper();
 
 $page_owner = elgg_get_page_owner_entity();
-if (!$page_owner) {
-	register_error(elgg_echo());
+
+if (!$page_owner || !$page_owner->canEdit()) {
+	$guid = 0;
+	if($page_owner){
+		$guid = $page_owner->getGUID();
+	}
+	register_error(elgg_echo("pageownerunavailable", array($guid)));
 	forward();
 }
 
 elgg_push_breadcrumb(elgg_echo('messages:inbox'));
 
+elgg_register_title_button();
+
 $title = elgg_echo('messages:user', array($page_owner->name));
 
 $list = elgg_list_entities_from_metadata(array(
diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
index c5d1d4941..4223c6bac 100644
--- a/mod/messages/pages/messages/read.php
+++ b/mod/messages/pages/messages/read.php
@@ -8,10 +8,13 @@
 gatekeeper();
 
 $message = get_entity(get_input('guid'));
-if (!$message) {
-	forward();
+if (!$message || !elgg_instanceof($message, "object", "messages")) {
+	forward('messages/inbox/' . elgg_get_logged_in_user_entity()->username);
 }
 
+// mark the message as read
+$message->readYet = true;
+
 elgg_set_page_owner_guid($message->getOwnerGUID());
 $page_owner = elgg_get_page_owner_entity();
 
@@ -26,24 +29,25 @@ if ($page_owner->getGUID() == $message->toId) {
 }
 elgg_push_breadcrumb($title);
 
-$buttons = '';
-$content = elgg_view_entity($message, true);
+$content = elgg_view_entity($message, array('full_view' => true));
 if ($inbox) {
 	$form_params = array(
 		'id' => 'messages-reply-form',
-		'class' => 'hidden',
+		'class' => 'hidden mtl',
 		'action' => 'action/messages/send',
 	);
 	$body_params = array('message' => $message);
 	$content .= elgg_view_form('messages/reply', $form_params, $body_params);
-
-	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
-		$buttons = elgg_view('output/url', array(
+	$from_user = get_user($message->fromId);
+	
+	if ((elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) && $from_user) {
+		elgg_register_menu_item('title', array(
+			'name' => 'reply',
+			'href' => '#messages-reply-form',
 			'text' => elgg_echo('messages:answer'),
-			'class' => 'elgg-button elgg-button-action',
-			'id' => 'messages-show-reply',
+			'link_class' => 'elgg-button elgg-button-action',
+			'rel' => 'toggle',
 		));
-		$buttons = "<ul class=\"elgg-menu elgg-menu-title\"><li>$buttons</li></ul>";
 	}
 }
 
@@ -51,7 +55,6 @@ $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'buttons' => $buttons,
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/send.php b/mod/messages/pages/messages/send.php
index 884c20cca..b46d0ba52 100644
--- a/mod/messages/pages/messages/send.php
+++ b/mod/messages/pages/messages/send.php
@@ -8,21 +8,20 @@
 gatekeeper();
 
 $page_owner = elgg_get_logged_in_user_entity();
-set_page_owner($page_owner->getGUID());
+elgg_set_page_owner_guid($page_owner->getGUID());
 
 $title = elgg_echo('messages:add');
 
 elgg_push_breadcrumb($title);
 
-$params = messages_prepare_form_vars(get_input('send_to'));
-$params['friends'] = $page_owner->getFriends();
+$params = messages_prepare_form_vars((int)get_input('send_to'));
+$params['friends'] = $page_owner->getFriends('', 50);
 $content = elgg_view_form('messages/send', array(), $params);
 
 $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'buttons' => '',
 ));
 
 echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/sent.php b/mod/messages/pages/messages/sent.php
index f884643e0..3d08cd5ee 100644
--- a/mod/messages/pages/messages/sent.php
+++ b/mod/messages/pages/messages/sent.php
@@ -8,13 +8,20 @@
 gatekeeper();
 
 $page_owner = elgg_get_page_owner_entity();
-if (!$page_owner) {
-	register_error(elgg_echo());
+
+if (!$page_owner || !$page_owner->canEdit()) {
+	$guid = 0;
+	if($page_owner){
+		$guid = $page_owner->getGUID();
+	}
+	register_error(elgg_echo("pageownerunavailable", array($guid)));
 	forward();
 }
 
 elgg_push_breadcrumb(elgg_echo('messages:sent'));
 
+elgg_register_title_button();
+
 $title = elgg_echo('messages:sentmessages', array($page_owner->name));
 
 $list = elgg_list_entities_from_metadata(array(