diff --git a/src/plugins/chatview/message-form.js b/src/plugins/chatview/message-form.js
index 5d54844bf8..3c2158208b 100644
--- a/src/plugins/chatview/message-form.js
+++ b/src/plugins/chatview/message-form.js
@@ -198,7 +198,7 @@ export default class MessageForm extends CustomElement {
         let spoiler_hint,
             hint_el = {};
         if (this.model.get('composing_spoiler')) {
-            hint_el = /** @type {HTMLInputElement} */(this.querySelector('form.sendXMPPMessage input.spoiler-hint'));
+            hint_el = /** @type {HTMLInputElement} */(this.querySelector('form.chat-message-form input.spoiler-hint'));
             spoiler_hint = hint_el.value;
         }
         u.addClass('disabled', textarea);
diff --git a/src/plugins/chatview/styles/chat-bottom-panel.scss b/src/plugins/chatview/styles/chat-bottom-panel.scss
index d1867573ef..9d37995505 100644
--- a/src/plugins/chatview/styles/chat-bottom-panel.scss
+++ b/src/plugins/chatview/styles/chat-bottom-panel.scss
@@ -11,7 +11,7 @@
                 height: calc(100% - (var(--chat-textarea-height) + var(--send-button-height) + 2 * var(--send-button-margin)));
             }
 
-            .sendXMPPMessage {
+            .chat-message-form {
                 -moz-background-clip: padding;
                 -webkit-background-clip: padding-box;
                 border-bottom-radius: var(--chatbox-border-radius);
diff --git a/src/plugins/chatview/styles/index.scss b/src/plugins/chatview/styles/index.scss
index 26c0915c5c..c3e7bbfcc7 100644
--- a/src/plugins/chatview/styles/index.scss
+++ b/src/plugins/chatview/styles/index.scss
@@ -177,7 +177,7 @@
                 font-size: var(--font-size-huge);
                 line-height: var(--line-height-huge);
             }
-            .sendXMPPMessage {
+            .chat-message-form {
                 ul {
                     width: 100%;
                 }
diff --git a/src/plugins/chatview/templates/message-form.js b/src/plugins/chatview/templates/message-form.js
index 6da0ec8fb1..2787f00ebd 100644
--- a/src/plugins/chatview/templates/message-form.js
+++ b/src/plugins/chatview/templates/message-form.js
@@ -21,7 +21,7 @@ export default (el) => {
     const message_value = /** @type {HTMLTextAreaElement} */(el.querySelector('.chat-textarea'))?.value;
 
     return html`
-        <form class="sendXMPPMessage" @submit=${(ev) => el.onFormSubmitted(ev)}>
+        <form class="chat-message-form" @submit=${(ev) => el.onFormSubmitted(ev)}>
             ${show_toolbar ? html`
                 <converse-chat-toolbar
                     class="btn-toolbar chat-toolbar no-text-select"
diff --git a/src/plugins/muc-views/styles/index.scss b/src/plugins/muc-views/styles/index.scss
index a2a1821bc4..2ee8dfbcdd 100644
--- a/src/plugins/muc-views/styles/index.scss
+++ b/src/plugins/muc-views/styles/index.scss
@@ -131,7 +131,7 @@ converse-muc-destroyed {
                             font-size: 120%;
                         }
                     }
-                    .sendXMPPMessage {
+                    .chat-message-form {
                         .chat-textarea {
                             padding: 0.5em;
                             font-size: 110%;
diff --git a/src/plugins/muc-views/styles/muc-bottom-panel.scss b/src/plugins/muc-views/styles/muc-bottom-panel.scss
index 03b9626df2..397126544e 100644
--- a/src/plugins/muc-views/styles/muc-bottom-panel.scss
+++ b/src/plugins/muc-views/styles/muc-bottom-panel.scss
@@ -33,7 +33,7 @@
         }
 
         converse-muc-bottom-panel {
-            .sendXMPPMessage {
+            .chat-message-form {
                 .suggestion-box__results--above {
                     bottom: 4.5em;
                 }
diff --git a/src/plugins/muc-views/templates/message-form.js b/src/plugins/muc-views/templates/message-form.js
index 0ec7bede76..d81af65c74 100644
--- a/src/plugins/muc-views/templates/message-form.js
+++ b/src/plugins/muc-views/templates/message-form.js
@@ -23,7 +23,7 @@ export default (el) => {
         <form class="setNicknameButtonForm hidden">
             <input type="submit" class="btn btn-primary" name="join" value="Join"/>
         </form>
-        <form class="sendXMPPMessage" @submit=${(ev) => el.onFormSubmitted(ev)}>
+        <form class="chat-message-form" @submit=${(ev) => el.onFormSubmitted(ev)}>
             ${show_toolbar
                 ? html` <converse-chat-toolbar
                     class="btn-toolbar chat-toolbar no-text-select"
diff --git a/src/shared/chat/styles/emoji.scss b/src/shared/chat/styles/emoji.scss
index 397be6c085..2324114708 100644
--- a/src/shared/chat/styles/emoji.scss
+++ b/src/shared/chat/styles/emoji.scss
@@ -12,7 +12,7 @@
             vertical-align: -0.1em;
         }
 
-        .sendXMPPMessage {
+        .chat-message-form {
             .toggle-smiley {
                 a.toggle-smiley {
                     padding: 0;