1 files changed, 17 insertions, 15 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>