diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index ae1ba7b5d..2225df987 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -78,7 +78,6 @@
 			background-color: transparent;
 			vertical-align: middle;
 			color: var(--folders-disabled-color, #666);
-			cursor: default;
 			font-size: 14px;
 			border-left: 3px solid transparent;
 
@@ -89,7 +88,6 @@
 			&.selectable {
 
 				color: var(--folders-color, #333);
-				cursor: pointer;
 
 				&:hover {
 					background-color: var(--folders-hover-bg-color, #333);
@@ -116,6 +114,7 @@
 				}
 			}
 			&:not(.selectable) {
+				cursor: default;
 				font-style: italic;
 			}
 
diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index 467604710..f89931e62 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -86,9 +86,10 @@ export class FolderListMailBoxUserView extends AbstractViewLeft {
 							setFolderHash(folder.fullNameRaw, '');
 						}
 
-						rl.route.setHash((event.target.matches('.flag-icon') && !folder.isFlagged())
-							? mailBox(folder.fullNameHash, 1, 'is:flagged')
-							: mailBox(folder.fullNameHash)
+						rl.route.setHash(
+							mailBox(folder.fullNameHash, 1,
+								(event.target.matches('.flag-icon') && !folder.isFlagged()) ? 'is:flagged' : ''
+							)
 						);
 					}
 
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index f50ee5577..55615001d 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -607,16 +607,14 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 			.filter(v => v);
 		if (hashes.length) {
 			Remote.attachmentsActions('Zip', hashes, this.downloadAsZipLoading)
-				.then((result) => {
+				.then(result => {
 					if (result && result.Result && result.Result.FileHash) {
 						rl.app.download(attachmentDownload(result.Result.FileHash));
 					} else {
 						this.downloadAsZipError(true);
 					}
 				})
-				.catch(() => {
-					this.downloadAsZipError(true);
-				});
+				.catch(() => this.downloadAsZipError(true));
 		} else {
 			this.highlightUnselectedAttachments(true);
 		}