diff --git a/application/Espo/Services/EmailAccount.php b/application/Espo/Services/EmailAccount.php
index b5037a98bf..f5b777c159 100644
--- a/application/Espo/Services/EmailAccount.php
+++ b/application/Espo/Services/EmailAccount.php
@@ -377,7 +377,7 @@ class EmailAccount extends Record implements
         }
 
         foreach ($monitoredFolders as $folder) {
-            $folder = mb_convert_encoding(trim($folder), 'UTF7-IMAP', 'UTF-8');
+            $folder = mb_convert_encoding($folder, 'UTF7-IMAP', 'UTF-8');
 
             $portionLimit = $this->getConfig()->get('personalEmailMaxPortionSize', self::PORTION_LIMIT);
 
diff --git a/application/Espo/Services/InboundEmail.php b/application/Espo/Services/InboundEmail.php
index 689db23312..3c60f287c5 100644
--- a/application/Espo/Services/InboundEmail.php
+++ b/application/Espo/Services/InboundEmail.php
@@ -268,7 +268,7 @@ class InboundEmail extends RecordService implements
         }
 
         foreach ($monitoredFolders as $folder) {
-            $folder = mb_convert_encoding(trim($folder), 'UTF7-IMAP', 'UTF-8');
+            $folder = mb_convert_encoding($folder, 'UTF7-IMAP', 'UTF-8');
 
             $portionLimit = $this->config->get('inboundEmailMaxPortionSize', self::PORTION_LIMIT);
 
diff --git a/client/src/views/notification/badge.js b/client/src/views/notification/badge.js
index 083c56be9a..f2356cd1b4 100644
--- a/client/src/views/notification/badge.js
+++ b/client/src/views/notification/badge.js
@@ -158,11 +158,14 @@ define('views/notification/badge', 'view', function (Dep) {
         },
 
         checkBypass: function () {
-            var last = this.getRouter().getLast() || {};
+            let last = this.getRouter().getLast() || {};
+
+            let pageAction = (last.options || {}).page || null;
 
             if (
                 last.controller === 'Admin' &&
-                ~['upgrade', 'extensions'].indexOf(last.action)
+                last.action === 'page' &&
+                ~['upgrade', 'extensions'].indexOf(pageAction)
             ) {
                 return true;
             }