From 679b5383682bbeeaaecb190f73ff00e7a2f69269 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 3 Jul 2019 13:03:48 -0400
Subject: [PATCH] (js) Test threadsCollapsed settings before read

---
 UI/WebServerResources/js/Mailer/Mailbox.service.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index d3f837b07..c5cb37d25 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -166,8 +166,10 @@
       this.id = this.$id();
       this.$acl = new Mailbox.$$Acl('Mail/' + this.id);
       if (this.threaded) {
-        this.$collapsedThreads = Mailbox.$Preferences.settings.Mail.threadsCollapsed['/' + this.id] || [];
-      }
+        this.$collapsedThreads = [];
+        if (Mailbox.$Preferences.settings.Mail.threadsCollapsed && Mailbox.$Preferences.settings.Mail.threadsCollapsed['/' + this.id]) {
+          this.$collapsedThreads = Mailbox.$Preferences.settings.Mail.threadsCollapsed['/' + this.id];
+        }
     }
     this.$displayName = this.name;
     if (this.type) {