diff --git a/src/app/message-types/bot-messages.ts b/src/app/message-types/bot-messages.ts
index a38fcbf..4b7fd94 100644
--- a/src/app/message-types/bot-messages.ts
+++ b/src/app/message-types/bot-messages.ts
@@ -4,6 +4,7 @@ export interface MessageData {
   originator?: string;
   timestamp?: Date;
   typing?: boolean;
+  command?: any;
   message: string;
 }
 
diff --git a/src/app/messages/messages.component.html b/src/app/messages/messages.component.html
index 997c9fa..9704cf0 100644
--- a/src/app/messages/messages.component.html
+++ b/src/app/messages/messages.component.html
@@ -1,7 +1,8 @@
 <div class="tfw-messages-main">
   <div class="tfw-grid-message"
        *ngFor="let message of messages.slice(); let last = last"
-       [class.highlighted-message]="last">
+       [class.highlighted-message]="last"
+       (click)="sendMessageCommand(message)">
     <div class="tfw-grid-message-header">
       <img class="tao-grid-center-left" src="images/avataobot.svg"/>
       <div class="tao-grid-center-left originator">{{message.originator}}</div>
diff --git a/src/app/messages/messages.component.ts b/src/app/messages/messages.component.ts
index 8b3657d..32c4b51 100644
--- a/src/app/messages/messages.component.ts
+++ b/src/app/messages/messages.component.ts
@@ -65,4 +65,10 @@ export class MessagesComponent implements OnInit {
       'key': 'message.queue.drain'
     });
   }
+
+  sendMessageCommand(message: MessageData) {
+    if ('command' in message) {
+      this.websocketService.send(message.command);
+    }
+  }
 }