diff --git a/src/addon/mod/chat/pages/chat/chat.html b/src/addon/mod/chat/pages/chat/chat.html
index 4141ba329..2e08fe598 100644
--- a/src/addon/mod/chat/pages/chat/chat.html
+++ b/src/addon/mod/chat/pages/chat/chat.html
@@ -40,6 +40,11 @@
                         <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
                         {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepwho} }} </span>
                     </ion-badge>
+
+                    <ion-badge text-wrap color="info" *ngIf="!message.system && !message.beep">
+                        <span><core-icon name="fa-asterisk"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
+                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message" (afterRender)="last && scrollToBottom()"></core-format-text></strong></span>
+                    </ion-badge>
                 </div>
 
                 <ion-item text-wrap *ngIf="!message.special" class="addon-message" [class.addon-message-mine]="message.userid == currentUserId" [class.addon-message-not-mine]="message.userid != currentUserId" [class.addon-message-no-user]="!message.showUserData" [@coreSlideInOut]="message.userid == currentUserId ? '' : 'fromLeft'">
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index a8a0760cc..feba43697 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -221,6 +221,11 @@ export class AddonModChatChatPage {
 
                         message.special = message.system || !!message.beep;
 
+                        if (message.message.substr(0, 4) == '/me ') {
+                            message.special = true;
+                            message.message = message.message.substr(4).trim();
+                        }
+
                         message.showUserData = this.showUserData(message, prevMessage);
                         prevMessage ?
                             prevMessage.showTail = this.showTail(prevMessage, message) : null;