diff --git a/src/app/emoji/emoji-select.component.ts b/src/app/emoji/emoji-select.component.ts
index 12af684a..98aca3de 100644
--- a/src/app/emoji/emoji-select.component.ts
+++ b/src/app/emoji/emoji-select.component.ts
@@ -16,6 +16,7 @@ export class EmojiSelectComponent {
 
   // Emojis that should be displayed for selection
   emojiList: string[] = [
+    'question',
     'slight_smile',
     'sunglasses',
     'grin',
diff --git a/src/app/message/message.component.ts b/src/app/message/message.component.ts
index 6ec423d4..1fa059d4 100755
--- a/src/app/message/message.component.ts
+++ b/src/app/message/message.component.ts
@@ -123,6 +123,10 @@ export class MessageComponent {
     this.messageList.nativeElement.scrollTop = this.messageList.nativeElement.scrollHeight;
   }
 
+  isQuestion(str: string): boolean {
+    return str.indexOf(':question:') >= 0 ? true : false;
+  }
+
   ngOnDestroy() {
     this.messageSocket.unsubscribe();
   }
diff --git a/src/app/message/message.css b/src/app/message/message.css
index 613054c5..cb61165a 100644
--- a/src/app/message/message.css
+++ b/src/app/message/message.css
@@ -80,6 +80,10 @@ md-list p[md-line] {
   display: none;
 }
 
+.message-question {
+  background: rgba(180, 231, 206, .6);
+}
+
 .old-chat {
   opacity: .7;
 }
\ No newline at end of file
diff --git a/src/app/message/message.html b/src/app/message/message.html
index 462dd6e8..46ffd1aa 100644
--- a/src/app/message/message.html
+++ b/src/app/message/message.html
@@ -4,7 +4,7 @@
   </div>
 
   <md-list>
-    <div *ngFor="let message of messages" class="message-row">
+    <div *ngFor="let message of messages" class="message-row" [class.message-question]="isQuestion(message.text)">
       <md-list-item>
         <img [routerLink]="['/profile', message.user._id]" md-list-avatar avatar [hash]="message.user.gravatarHash" [size]="40">
         <h3 md-line>