diff --git a/app/message-action/client/messageAction.html b/app/message-action/client/messageAction.html
index 872c52d58bb3..8d6c73566772 100644
--- a/app/message-action/client/messageAction.html
+++ b/app/message-action/client/messageAction.html
@@ -9,7 +9,7 @@
 				{{/if}}
 
 				{{#if msg_in_chat_window}}
-					<button class="js-actionButton-sendMessage" value="{{msg}}">
+					<button class="{{jsActionButtonClassname msg_processing_type}}" value="{{msg}}">
 						<img class="image-button" src="{{image_url}}" />
 					</button>
 				{{/if}}
@@ -21,7 +21,7 @@
 					</a>
 				{{/if}}
 				{{#if msg_in_chat_window}}
-					<button class="text-button js-actionButton-sendMessage" value="{{msg}}">
+					<button class="text-button {{jsActionButtonClassname msg_processing_type}}" value="{{msg}}">
 						<span class="overflow-ellipsis">{{text}}</span>
 					</button>
 				{{/if}}
diff --git a/app/message-action/client/messageAction.js b/app/message-action/client/messageAction.js
index 8ec8fcee03c3..025c06db224a 100644
--- a/app/message-action/client/messageAction.js
+++ b/app/message-action/client/messageAction.js
@@ -7,4 +7,7 @@ Template.messageAction.helpers({
 	areButtonsHorizontal() {
 		return Template.parentData(1).button_alignment === 'horizontal';
 	},
+	jsActionButtonClassname(processingType) {
+		return `js-actionButton-${ processingType || 'sendMessage' }`;
+	},
 });
diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index b3e5da3b789d..69f739323705 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -856,6 +856,16 @@ Template.room.events({
 			Meteor.call('sendMessage', msgObject);
 		});
 	},
+	'click .js-actionButton-respondWithMessage'(event) {
+		const msg = event.currentTarget.value;
+		if (!msg) {
+			return;
+		}
+
+		const { input } = chatMessages[RoomManager.openedRoom];
+		input.value = msg;
+		input.focus();
+	},
 	'click .js-navigate-to-discussion'(event) {
 		event.preventDefault();
 		const [, { drid }] = this._arguments;