diff --git a/src/App.js b/src/App.js
index f3f3872bf..934b96713 100644
--- a/src/App.js
+++ b/src/App.js
@@ -186,7 +186,7 @@ export default {
       return useShoutStore().joined
     },
     isChats() {
-      return this.$route.name === 'chat' || this.$route.name === 'chats' || this.$route.name === 'conversation2'
+      return this.$route.name === 'chat' || this.$route.name === 'chats'
     },
     isListEdit() {
       return this.$route.name === 'lists-edit'
@@ -205,7 +205,7 @@ export default {
       )
     },
     hideShoutbox() {
-      return this.isChats || useMergedConfigStore().mergedConfig.hideShoutbox
+      return useMergedConfigStore().mergedConfig.hideShoutbox
     },
     reverseLayout() {
       const { thirdColumnMode, sidebarRight: reverseSetting } =
diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js
index c95895def..3bbb93d60 100644
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -60,7 +60,7 @@ const ChatListItem = {
           name: 'chat',
           params: {
             username: this.currentUser.screen_name,
-            chatUserId: this.chat.account.id,
+            recipient_id: this.chat.account.id,
           },
         })
       }
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
index e23ca3bd0..becf1c0b0 100644
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@@ -12,7 +12,7 @@
   }
 
   .attachments {
-    min-width: 10em;
+    min-width: 30em;
   }
 
   .quoted-post {
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index 62818d23e..c3deac0a5 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -108,7 +108,6 @@
                 fixed-pinned
                 use-default-buttons
                 hide-labels
-                in-chat-view
                 @toggle-replying="$emit('replyRequested', message)"
               />
               <div
diff --git a/src/components/chat_view/chat_view.scss b/src/components/chat_view/chat_view.scss
index 87028c7c4..d8031b1a7 100644
--- a/src/components/chat_view/chat_view.scss
+++ b/src/components/chat_view/chat_view.scss
@@ -1,5 +1,7 @@
 .chat-view {
   display: flex;
+  margin-bottom: -1em;
+  margin-top: -1em;
 
   .chat-list-wrapper {
     display: flex;
diff --git a/src/components/chat_view/chat_view.vue b/src/components/chat_view/chat_view.vue
index bc75ef64d..f0a40ebc6 100644
--- a/src/components/chat_view/chat_view.vue
+++ b/src/components/chat_view/chat_view.vue
@@ -103,11 +103,11 @@
             :disable-preview="!isConversation"
             :disable-draft="!isConversation"
 
-            :disable-submit="isConversation ? !!replyStatus : (errorLoadingChat || !chat)"
+            :disable-submit="isConversation ? false : (errorLoadingChat || !chat)"
             :optimistic-posting="!isConversation"
 
-            chat-view
-            preserve-focus
+            :submit-on-enter="!mobileLayout"
+            :preserve-focus="!mobileLayout"
             :auto-focus="!mobileLayout"
             :placeholder="formPlaceholder"
             :file-limit="isConversation ? null : 1"
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 3b5daf56f..6b26103ef 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -98,13 +98,13 @@ const PostStatusForm = {
     draftId: String, // ID of the draft to be used
 
     // Chats stuff
-    chatView: Boolean, // Used for the "submit on enter" user setting
     maxHeight: Number,
     placeholder: String,
     postHandler: Function, // Used to override poster to use chats one instead of status one
     preserveFocus: Boolean, // Keep focus on form after posting
     autoFocus: Boolean, // Steal focus when form is opened
     fileLimit: Number, // Chats only support 1 attachment :(
+    submitOnEnter: Boolean,
     emojiPickerPlacement: String,
     optimisticPosting: Boolean, // Don't wait for confirmation that post is done
 
@@ -562,9 +562,6 @@ const PostStatusForm = {
         useMergedConfigStore().mergedConfig.hideScopeNotice
       )
     },
-    submitOnEnter() {
-      return this.chatView && this.mergedConfig.chatSubmitOnEnter
-    },
 
     // Global stuff
     currentUser() {
diff --git a/src/components/settings_modal/tabs/composing_tab.vue b/src/components/settings_modal/tabs/composing_tab.vue
index b8c156bd3..755539096 100644
--- a/src/components/settings_modal/tabs/composing_tab.vue
+++ b/src/components/settings_modal/tabs/composing_tab.vue
@@ -83,13 +83,6 @@
             {{ $t('settings.subject_line_behavior') }}
           </ChoiceSetting>
         </li>
-        <li>
-          <BooleanSetting
-            path="chatSubmitOnEnter"
-          >
-            {{ $t('settings.submit_on_enter_in_chats') }}
-          </BooleanSetting>
-        </li>
       </ul>
       <h3 v-if="expertLevel > 0">
         {{ $t('settings.attachments') }}
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index edc969b5b..842944965 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -18,7 +18,6 @@ import {
   faChevronDown,
   faChevronRight,
   faComments,
-  faList,
   faExternalLinkAlt,
   faEye,
   faEyeSlash,
@@ -59,7 +58,6 @@ library.add(
   faPencil,
   faShareAlt,
   faComments,
-  faList,
   faExternalLinkAlt,
   faHistory,
 )
diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js
index b3762b8ec..8dde74364 100644
--- a/src/components/status_action_buttons/buttons_definitions.js
+++ b/src/components/status_action_buttons/buttons_definitions.js
@@ -222,30 +222,13 @@ export const BUTTONS = [
     // =========
     // OPEN IN CHAT VIEW
     // =========
-    name: 'chat_view',
+    name: 'edit',
     icon: 'comments',
     label: 'status.open_in_chat_view',
-    if({ chatView }) {
-      return !chatView
-    },
     action({ router, status }) {
       router.push({ name: 'conversation2', params: { statusId: status.id } })
     },
   },
-  {
-    // =========
-    // OPEN IN THREAD VIEW
-    // =========
-    name: 'thread_view',
-    icon: 'list',
-    label: 'status.open_in_thread_view',
-    if({ chatView }) {
-      return chatView
-    },
-    action({ router, status }) {
-      router.push({ name: 'conversation', params: { id: status.id } })
-    },
-  },
   {
     // =========
     // DELETE
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index 73ac6ff7e..d9c7943b7 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -39,10 +39,6 @@ const StatusActionButtons = {
       type: Boolean,
       default: false,
     },
-    inChatView: {
-      type: Boolean,
-      default: false,
-    },
   },
   emits: ['toggleReplying', 'onSuccess', 'onError'],
   data() {
@@ -102,7 +98,6 @@ const StatusActionButtons = {
         router: this.$router,
         currentUser: this.currentUser,
         loggedIn: !!this.currentUser,
-        chatView: !!this.inChatView,
       }
     },
     triggerAttrs() {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 60fcaf1dd..120054ddf 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -780,7 +780,6 @@
     "subject_line_email": "Like email: \"re: subject\"",
     "subject_line_mastodon": "Like mastodon: copy as is",
     "subject_line_noop": "Do not copy",
-    "submit_on_enter_in_chats": "Send message on Enter in chats",
     "force_theme_recompilation_debug": "Disable theme cahe, force recompile on each boot",
     "conversation_display": "Conversation display style",
     "conversation_display_tree": "Tree-style",
@@ -1649,7 +1648,6 @@
     "edit": "Edit status",
     "edited_at": "(last edited {time})",
     "open_in_chat_view": "Open in chat view",
-    "open_in_thread_view": "Open in thread view",
     "pin": "Pin on profile",
     "unpin": "Unpin from profile",
     "pinned": "Pinned",
diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js
index 9935e88ce..d9a2ba247 100644
--- a/src/modules/default_config_state.js
+++ b/src/modules/default_config_state.js
@@ -673,11 +673,6 @@ export const LOCAL_DEFAULT_CONFIG_DEFINITIONS = {
     type: 'string',
     default: null,
   },
-  chatSubmitOnEnter: {
-    description: 'Post status on enter key in chats and chat view',
-    type: 'boolean',
-    default: false,
-  },
   themeDebug: {
     description:
       'Debug mode that uses computed backgrounds instead of real ones to debug contrast functions',