diff --git a/themes/bootstrap/public/mailbox.js b/themes/bootstrap/public/mailbox.js
index e807b1c..5a624c6 100644
--- a/themes/bootstrap/public/mailbox.js
+++ b/themes/bootstrap/public/mailbox.js
@@ -22,17 +22,15 @@ function deleteMessage(id) {
   })
 }
 
-// Delete the mailbox
-function deleteMailBox() {
-  cont = confirm("Are you sure you want delete the Mailbox?")
-  if (cont == false) {
-    return;
+// deleteMailbox clears the mailbox
+function deleteMailbox() {
+  if (confirm("Are you sure you want delete this mailbox?")) {
+    $.ajax({
+      type: 'DELETE',
+      url: '/api/v1/mailbox/' + mailbox,
+      success: loadList
+    })
   }
-  $.ajax({
-    type: 'DELETE',
-    url: '/api/v1/mailbox/' + mailbox,
-    success: loadList
-  })
 }
 
 // flashTooltip temporarily changes the text of a tooltip
diff --git a/themes/bootstrap/templates/mailbox/index.html b/themes/bootstrap/templates/mailbox/index.html
index 8103bac..d9a570c 100644
--- a/themes/bootstrap/templates/mailbox/index.html
+++ b/themes/bootstrap/templates/mailbox/index.html
@@ -62,8 +62,8 @@ $(document).ready(function() {
               data-toggle="tooltip"
               data-placement="top"
               title="Delete Mailbox"
-              onclick="deleteMailBox()">
-        <span class="glyphicon glyphicon-remove"></span>
+              onclick="deleteMailbox()">
+        <span class="glyphicon glyphicon-trash"></span>
       </button>
     </div>
   </div>