3 files changed, 48 insertions, 48 deletions

diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index 2c97fcb6f..cb30792e9 100644
--- a/mod/messages/views/default/forms/messages/process.php
+++ b/mod/messages/views/default/forms/messages/process.php
@@ -8,34 +8,36 @@
  * 
  */
 
-echo $vars['list'];
+$messages = $vars['list'];
+if (!$messages) {
+	echo elgg_echo('messages:nomessages');
+	return true;
+}
+
+echo '<div class="messages-container">';
+echo $messages;
+echo '</div>';
+
+echo '<div class="elgg-foot messages-buttonbank">';
 
-echo '<div class="messages-buttonbank">';
 echo elgg_view('input/submit', array(
 	'value' => elgg_echo('delete'),
-	'internalname' => 'delete',
+	'name' => 'delete',
+	'class' => 'elgg-button-delete elgg-requires-confirmation',
+	'title' => elgg_echo('deleteconfirm:plural'),
 ));
 
 if ($vars['folder'] == "inbox") {
 	echo elgg_view('input/submit', array(
 		'value' => elgg_echo('messages:markread'),
-		'internalname' => 'read',
+		'name' => 'read',
 	));
 }
 
 echo elgg_view('input/button', array(
 	'value' => elgg_echo('messages:toggle'),
-	'class' => 'elgg-cancel-button',
-	'internalid' => 'messages-toggle',
+	'class' => 'elgg-button elgg-button-cancel',
+	'id' => 'messages-toggle',
 ));
 
 echo '</div>';
-
-?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$("#messages-toggle").click(function() {
-		$('input[type=checkbox]').click();
-	});
-});
-</script>
diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php
index 22c982ec2..9f3f4b57e 100644
--- a/mod/messages/views/default/forms/messages/reply.php
+++ b/mod/messages/views/default/forms/messages/reply.php
@@ -12,36 +12,27 @@ if (strncmp($reply_title, "RE:", 3) != 0) {
 }
 
 echo elgg_view('input/hidden', array(
-	'internalname' => 'recipient_guid',
+	'name' => 'recipient_guid',
 	'value' => $vars['message']->fromId,
 ));
 ?>
 
-<p>
+<div>
 	<label><?php echo elgg_echo("messages:title"); ?>: <br /></label>
 	<?php echo elgg_view('input/text', array(
-		'internalname' => 'subject',
+		'name' => 'subject',
 		'value' => $reply_title,
 	));
 	?>
-</p>
-<p>
+</div>
+<div>
 	<label><?php echo elgg_echo("messages:message"); ?>:</label>
 	<?php echo elgg_view("input/longtext", array(
-		'internalname' => 'body',
+		'name' => 'body',
 		'value' => '',
 	));
 	?>
-</p>
-<p>
+</div>
+<div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
-</p>
-
-<script type="text/javascript">
-$(document).ready(function() {
-	$("#messages-show-reply").click(function() {
-		$('#messages-reply-form').slideToggle('medium');
-	});
-});
-	
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/mod/messages/views/default/forms/messages/send.php b/mod/messages/views/default/forms/messages/send.php
index 214ff23f9..5b7e7830e 100644
--- a/mod/messages/views/default/forms/messages/send.php
+++ b/mod/messages/views/default/forms/messages/send.php
@@ -1,47 +1,54 @@
 <?php
 /**
- * Compse message form
+ * Compose message form
  *
  * @package ElggMessages
  * @uses $vars['friends']
  */
 
-$recipient_guid = elgg_get_array_value('recipient_guid', $vars, 0);
-$subject = elgg_get_array_value('subject', $vars, '');
-$body = elgg_get_array_value('body', $vars, '');
+$recipient_guid = elgg_extract('recipient_guid', $vars, 0);
+$subject = elgg_extract('subject', $vars, '');
+$body = elgg_extract('body', $vars, '');
 
 $recipients_options = array();
 foreach ($vars['friends'] as $friend) {
 	$recipients_options[$friend->guid] = $friend->name;
 }
 
+if (!array_key_exists($recipient_guid, $recipients_options)) {
+	$recipient = get_entity($recipient_guid);
+	if (elgg_instanceof($recipient, 'user')) {
+		$recipients_options[$recipient_guid] = $recipient->name;
+	}
+}
+
 $recipient_drop_down = elgg_view('input/dropdown', array(
-	'internalname' => 'recipient_guid',
+	'name' => 'recipient_guid',
 	'value' => $recipient_guid,
 	'options_values' => $recipients_options,
 ));
 
 ?>
-<p>
+<div>
 	<label><?php echo elgg_echo("messages:to"); ?>: </label>
 	<?php echo $recipient_drop_down; ?>
-</p>
-<p>
+</div>
+<div>
 	<label><?php echo elgg_echo("messages:title"); ?>: <br /></label>
 	<?php echo elgg_view('input/text', array(
-		'internalname' => 'subject',
+		'name' => 'subject',
 		'value' => $subject,
 	));
 	?>
-</p>
-<p>
+</div>
+<div>
 	<label><?php echo elgg_echo("messages:message"); ?>:</label>
 	<?php echo elgg_view("input/longtext", array(
-		'internalname' => 'body',
+		'name' => 'body',
 		'value' => $body,
 	));
 	?>
-</p>
-<p>
+</div>
+<div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
-</p>
+</div>