2 files changed, 9 insertions, 7 deletions
diff --git a/web-ui/app/js/dispatchers/middle_pane_dispatcher.js b/web-ui/app/js/dispatchers/middle_pane_dispatcher.js
index 59263af2..7a53b769 100644
--- a/web-ui/app/js/dispatchers/middle_pane_dispatcher.js
+++ b/web-ui/app/js/dispatchers/middle_pane_dispatcher.js
@@ -29,8 +29,8 @@ define(['flight/lib/component', 'page/events', 'helpers/triggering', 'mail_view/
       return child_div;
     };
 
-    this.resetChildDiv = function() {
-      this.select('middlePane').empty();
+    this.resetChildDiv = function(component_id) {
+      $('#' + component_id).remove();
     };
 
     this.refreshMailList =  function (ev, data) {
@@ -52,12 +52,12 @@ define(['flight/lib/component', 'page/events', 'helpers/triggering', 'mail_view/
     };
 
     this.onMailsChange = function (ev, data) {
+      this.resetChildDiv(this.attr.noMailsAvailablePane);
       if (data.mails.length > 0) {
         NoMailsAvailablePane.teardownAll();
-        this.resetChildDiv();
       } else {
         var child_div = this.createChildDiv(this.attr.noMailsAvailablePane);
-        NoMailsAvailablePane.attachTo(child_div);
+        NoMailsAvailablePane.attachTo(child_div, {tag: data.tag});
       }
     };
 
diff --git a/web-ui/app/js/mail_view/ui/no_mails_available_pane.js b/web-ui/app/js/mail_view/ui/no_mails_available_pane.js
index edcaade0..32b6bc19 100644
--- a/web-ui/app/js/mail_view/ui/no_mails_available_pane.js
+++ b/web-ui/app/js/mail_view/ui/no_mails_available_pane.js
@@ -29,15 +29,17 @@ define(
     return defineComponent(noMailsAvailablePane);
 
     function noMailsAvailablePane() {
+      this.defaultAttrs({
+        tag: null 
+      });
 
       this.render = function() {
-        this.$node.html(templates.noMailsAvailable());
+        this.attr.tag = this.attr.tag.toUpperCase();
+        this.$node.html(templates.noMailsAvailable(this.attr));
       };
 
       this.after('initialize', function () {
         this.render();
-
-        // this.on(document, events.dispatchers.middlePane.clear, this.teardown);
       });
     }
   }