yes

1 files changed, 13 insertions, 11 deletions

diff --git a/public/assets/js/lib/views/mail/mailbox.js b/public/assets/js/lib/views/mail/mailbox.js
index b7877f2..22a49c5 100644
--- a/public/assets/js/lib/views/mail/mailbox.js
+++ b/public/assets/js/lib/views/mail/mailbox.js
@@ -20,19 +20,21 @@ var MailboxView = View.extend({
   },
   
   populate: function(data){
-    this.boxlist.load(data.boxes)
+    if (data.boxes) {
+      this.boxlist.load(data.boxes)
 
-    var user = data.user
-    var max = data.messages.length-1
-    if (data.messages.length) {
-      $("#no_messages").hide()
+      var user = data.user
+      var max = data.messages.length-1
+      if (data.messages.length) {
+        $("#no_messages").hide()
+      }
+      data.messages.forEach(function(message, i){
+        var $row = this.parse(message, user)
+        if (i === 0) $row.addClass("first")
+        if (i === max) $row.addClass("last")
+        this.$el.append($row)
+      }.bind(this))
     }
-    data.messages.forEach(function(message, i){
-      var $row = this.parse(message, user)
-      if (i === 0) $row.addClass("first")
-      if (i === max) $row.addClass("last")
-      this.$el.append($row)
-    }.bind(this))
     $("body").removeClass('loading')
   },