diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js
index bd01d203a..4f5e5002d 100644
--- a/dev/Common/Selector.js
+++ b/dev/Common/Selector.js
@@ -269,8 +269,6 @@ export class Selector {
 					this.actionClick(focused);
 					return false;
 				}
-
-				return true;
 			});
 
 			shortcuts.add('arrowup,arrowdown', 'meta', keyScope, () => false);
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 1ba662c3e..3ca57a8aa 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1085,7 +1085,6 @@ class ComposePopupView extends AbstractViewPopup {
 			this.identitiesDropdownTrigger(true);
 			return false;
 		}
-		return true;
 	}
 
 	onBuild(dom) {
diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js
index 96c9fb0fe..be758352c 100644
--- a/dev/View/User/AbstractSystemDropDown.js
+++ b/dev/View/User/AbstractSystemDropDown.js
@@ -109,7 +109,6 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight {
 				showScreenPopup(KeyboardShortcutsHelpPopupView);
 				return false;
 			}
-			return true;
 		});
 	}
 }
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 46c2d574b..c92adaecb 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -746,8 +746,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 				dispatchEvent(new CustomEvent('mailbox.message-view.toggle-full-screen'));
 				return false;
 			}
-
-			return true;
 		});
 
 		if (Settings.capa(Capa.MessageListActions)) {
@@ -859,8 +857,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 				this.cancelThreadUid();
 				return false;
 			}
-
-			return true;
 		});
 
 		// change focused state
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 6a4c473f3..3d97f04e1 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -307,6 +307,8 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 	}
 
 	onBuild(dom) {
+		this.oMessageScrollerDom = dom.querySelector('.messageItem');
+
 		this.fullScreenMode.subscribe(value =>
 			value && MessageUserStore.message() && AppUserStore.focusedState(Scope.MessageView));
 
@@ -414,8 +416,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 
 		keyScopeReal.subscribe(value => this.messageDomFocused(Scope.MessageView === value && !inFocus()));
 
-		this.oMessageScrollerDom = dom.querySelector('.messageItem');
-
 		// initShortcuts
 
 		// exit fullscreen, back
@@ -436,8 +436,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 
 				return false;
 			}
-
-			return true;
 		});
 
 		// fullscreen
@@ -461,14 +459,12 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 				this.replyAllCommand();
 				return false;
 			}
-			return true;
 		});
 		shortcuts.add('mailreply', 'shift', [Scope.MessageList, Scope.MessageView], () => {
 			if (MessageUserStore.message()) {
 				this.replyAllCommand();
 				return false;
 			}
-			return true;
 		});
 
 		// forward
@@ -477,8 +473,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 				this.forwardCommand();
 				return false;
 			}
-
-			return true;
 		});
 
 		// message information
@@ -496,7 +490,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 				message.body.querySelectorAll('.rlBlockquoteSwitcher').forEach(node => node.click());
 				return false;
 			}
-			return true;
 		});
 
 		shortcuts.add('arrowup,arrowleft', 'meta', [Scope.MessageList, Scope.MessageView], () => {
@@ -527,10 +520,8 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 
 		// change focused state
 		shortcuts.add('arrowleft', '', Scope.MessageView, () => {
-			if (!this.fullScreenMode() && MessageUserStore.message() && SettingsUserStore.usePreviewPane()) {
-				if (this.oMessageScrollerDom && 0 < this.oMessageScrollerDom.scrollLeft) {
-					return true;
-				}
+			if (!this.fullScreenMode() && MessageUserStore.message() && SettingsUserStore.usePreviewPane()
+			 && !this.oMessageScrollerDom.scrollLeft) {
 				AppUserStore.focusedState(Scope.MessageList);
 				return false;
 			}
@@ -603,19 +594,11 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
 	}
 
 	scrollMessageToTop() {
-		if (this.oMessageScrollerDom) {
-			if (50 < this.oMessageScrollerDom.scrollTop) {
-				this.oMessageScrollerDom.scrollTop = 50;
-			} else {
-				this.oMessageScrollerDom.scrollTop = 0;
-			}
-		}
+		this.oMessageScrollerDom.scrollTop = (50 < this.oMessageScrollerDom.scrollTop) ? 50 : 0;
 	}
 
 	scrollMessageToLeft() {
-		if (this.oMessageScrollerDom) {
-			this.oMessageScrollerDom.scrollLeft = 0;
-		}
+		this.oMessageScrollerDom.scrollLeft = 0;
 	}
 
 	downloadAsZip() {