diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index bde5590ec9e..763001d0845 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -83,7 +83,7 @@
 					<NcActionSeparator />
 
 					<NcActionButton
-						v-if="supportReminders"
+						v-if="supportReminders && !isCurrentGuest"
 						key="set-reminder-menu"
 						is-menu
 						@click.stop="submenu = 'reminder'">
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 2e9cb911e35..2563a27d7b2 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -516,6 +516,8 @@ export default {
 
 		canEditMessage() {
 			return hasTalkFeature(this.token, 'edit-messages')
+				&& !this.isReadOnly && !this.noChatPermission
+				&& !this.actorStore.isActorGuest
 		},
 
 		supportThreads() {
diff --git a/src/components/SettingsDialog/SettingsDialog.vue b/src/components/SettingsDialog/SettingsDialog.vue
index 1c9503e9277..6f48bc4396f 100644
--- a/src/components/SettingsDialog/SettingsDialog.vue
+++ b/src/components/SettingsDialog/SettingsDialog.vue
@@ -117,15 +117,15 @@
 			v-if="!disableKeyboardShortcuts">
 			<NcHotkeyList>
 				<NcHotkey :label="t('spreed', 'Toggle full screen')" hotkey="F" />
-				<NcHotkey :label="t('spreed', 'Return to Home screen')" hotkey="Escape" />
+				<NcHotkey v-if="!isGuest" :label="t('spreed', 'Return to Home screen')" hotkey="Escape" />
 				<!-- FIXME Overriden by Unified Search -->
-				<NcHotkey :label="t('spreed', 'Search')" hotkey="Control F" />
+				<NcHotkey v-if="!isGuest" :label="t('spreed', 'Search')" hotkey="Control F" />
 			</NcHotkeyList>
 
 			<NcHotkeyList :label="t('spreed', 'Shortcuts while in a chat')">
 				<NcHotkey :label="t('spreed', 'Focus the chat input')" hotkey="C" />
 				<NcHotkey :label="t('spreed', 'Unfocus the chat input to use shortcuts')" hotkey="Escape" />
-				<NcHotkey :label="t('spreed', 'Edit your last message')" hotkey="Control ArrowUp" />
+				<NcHotkey v-if="!isGuest" :label="t('spreed', 'Edit your last message')" hotkey="Control ArrowUp" />
 			</NcHotkeyList>
 
 			<NcHotkeyList :label="t('spreed', 'Shortcuts while in a call')">