2 files changed, 6 insertions, 3 deletions
diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index 7e182b8f0..cb30792e9 100644
--- a/mod/messages/views/default/forms/messages/process.php
+++ b/mod/messages/views/default/forms/messages/process.php
@@ -10,7 +10,8 @@
 
 $messages = $vars['list'];
 if (!$messages) {
-	$messages = elgg_echo('messages:nomessages');
+	echo elgg_echo('messages:nomessages');
+	return true;
 }
 
 echo '<div class="messages-container">';
@@ -18,10 +19,12 @@ echo $messages;
 echo '</div>';
 
 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/send.php b/mod/messages/views/default/forms/messages/send.php
index b0638e0c0..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']