3 files changed, 9 insertions, 6 deletions
diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index 01fe0f431..cb30792e9 100644
--- a/mod/messages/views/default/forms/messages/process.php
+++ b/mod/messages/views/default/forms/messages/process.php
@@ -10,18 +10,21 @@
 
 $messages = $vars['list'];
 if (!$messages) {
-	$messages = elgg_echo('messages:nomessages');
+	echo elgg_echo('messages:nomessages');
+	return true;
 }
 
 echo '<div class="messages-container">';
 echo $messages;
 echo '</div>';
 
-echo '<div class="messages-buttonbank">';
+echo '<div class="elgg-foot messages-buttonbank">';
+
 echo elgg_view('input/submit', array(
 	'value' => elgg_echo('delete'),
 	'name' => 'delete',
-	'class' => 'elgg-button-delete',
+	'class' => 'elgg-button-delete elgg-requires-confirmation',
+	'title' => elgg_echo('deleteconfirm:plural'),
 ));
 
 if ($vars['folder'] == "inbox") {
diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php
index e8a27f03e..9f3f4b57e 100644
--- a/mod/messages/views/default/forms/messages/reply.php
+++ b/mod/messages/views/default/forms/messages/reply.php
@@ -33,6 +33,6 @@ echo elgg_view('input/hidden', array(
 	));
 	?>
 </div>
-<div>
+<div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
 </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 c0a095993..5b7e7830e 100644
--- a/mod/messages/views/default/forms/messages/send.php
+++ b/mod/messages/views/default/forms/messages/send.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Compse message form
+ * Compose message form
  *
  * @package ElggMessages
  * @uses $vars['friends']
@@ -49,6 +49,6 @@ $recipient_drop_down = elgg_view('input/dropdown', array(
 	));
 	?>
 </div>
-<div>
+<div class="elgg-foot">
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
 </div>