From cc6fcc5fbd109e5f3227d77371e8c7f620c84d1b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 27 Jun 2019 11:56:44 -0400
Subject: [PATCH] (js) Fix access to sub mailbox on page reload

---
 NEWS                                                           | 1 +
 UI/WebServerResources/js/Mailer/Mailer.app.js                  | 2 +-
 UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js | 2 +-
 UI/WebServerResources/package.json                             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 0af949a8f..1019b7973 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ Bug fixes
  - [web] fixed useless scrolling when deleting a message
  - [web] don't hide compose button if messages list is visible
  - [web] fixed next/previous slots with external attendees
+ - [web] fixed restoration of sub mailbox when reloading page
  - [core] allow super users to modify any event (#4216)
  - [core] correctly handle the full cert chain in S/MIME
  - [core] handle multidays events in freebusy data
diff --git a/UI/WebServerResources/js/Mailer/Mailer.app.js b/UI/WebServerResources/js/Mailer/Mailer.app.js
index 821b71eb6..924a2bac5 100644
--- a/UI/WebServerResources/js/Mailer/Mailer.app.js
+++ b/UI/WebServerResources/js/Mailer/Mailer.app.js
@@ -190,7 +190,7 @@
   stateMailbox.$inject = ['$q', '$stateParams', 'stateAccount', 'decodeUriFilter', 'Mailbox'];
   function stateMailbox($q, $stateParams, stateAccount, decodeUriFilter, Mailbox) {
     var mailbox,
-        mailboxId = decodeUriFilter($stateParams.mailboxId),
+        mailboxId = decodeUriFilter(decodeUriFilter($stateParams.mailboxId)),
         _find;
 
     // Recursive find function
diff --git a/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js b/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js
index e29d374a2..75d3d34ed 100644
--- a/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js
+++ b/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js
@@ -91,7 +91,7 @@
       if ($event) {
         $state.go('mail.account.mailbox', {
           accountId: this.mailbox.$account.id,
-          mailboxId: encodeUriFilter(this.mailbox.path)
+          mailboxId: encodeUriFilter(encodeUriFilter(this.mailbox.path))
         });
         $event.stopPropagation();
         $event.preventDefault();
diff --git a/UI/WebServerResources/package.json b/UI/WebServerResources/package.json
index 293100d12..926932f8e 100644
--- a/UI/WebServerResources/package.json
+++ b/UI/WebServerResources/package.json
@@ -11,7 +11,7 @@
     "angular-material": "1.1.19",
     "angular-messages": "1.7.x",
     "angular-sanitize": "1.7.x",
-    "angular-ui-router": "1.0.20",
+    "angular-ui-router": "1.0.x",
     "file-saver": "latest",
     "lodash": "latest",
     "ng-sortable": "1.3.7"