diff --git a/src/app/party.coffee b/src/app/party.coffee
index 87b091cb20..2c92cf873f 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -166,12 +166,17 @@ module.exports.app = (appExports, model, app) ->
     return unless /\S/.test text
     chat.unshift
       id: model.id()
+      contributor: user.get('backer.contributor')
+      npc: user.get('backer.npc')
       text: text
       user: helpers.username(model.get('_user.auth'), model.get('_user.profile.name'))
       timestamp: +new Date
     model.set(input, '')
     chat.remove 200 # keep a max messages cap
 
+  model.on 'unshift', '_party.chat', -> $('.chatroom [rel="tooltip"]').tooltip()
+  model.on 'unshift', '_tavern.chat.messages', -> $('.chatroom [rel="tooltip"]').tooltip()
+
   appExports.partySendChat = ->
     sendChat('_party.chat', '_chatMessage')
     model.set '_user.party.lastMessageSeen', model.get('_party.chat')[0].id
diff --git a/views/app/game-pane.html b/views/app/game-pane.html
index 8bc8760a63..99a1e085a7 100644
--- a/views/app/game-pane.html
+++ b/views/app/game-pane.html
@@ -89,12 +89,9 @@
                 <textarea x-bind='keyup:tavernMessageKeyup'>{_tavernMessage}</textarea><br/>
                 <input class=btn type=submit value=Submit />
             </form>
-            <ul class='unstyled tavern-chat'>
+            <ul class='unstyled tavern-chat chatroom'>
                 {#each _tavern.chat.messages as :message}
-                    <li>
-                        <hr/>
-                        <span class='badge'>{:message.user}</span> {:message.text} - <span class='muted'>{friendlyTimestamp(:message.timestamp)}</span>
-                    </li>
+                    <li><app:party:chat-message message={{:message}} /></li>
                 {/}
             </ul>
         </div>
diff --git a/views/app/party.html b/views/app/party.html
index 75995c9ace..f56158561a 100644
--- a/views/app/party.html
+++ b/views/app/party.html
@@ -25,12 +25,9 @@
                     <textarea>{_chatMessage}</textarea><br/>
                     <input class=btn type=submit value=Submit />
                 </form>
-               <ul class='unstyled'>
+               <ul class='unstyled chatroom'>
                {#each _party.chat as :message}
-                   <li>
-                       <hr/>
-                       <span class='badge'>{:message.user}</span> {:message.text} - <span class='muted'>{friendlyTimestamp(:message.timestamp)}</span>
-                   </li>
+                   <li><app:party:chat-message message={{:message}} /></li>
                {/}
                </ul>
             </div>
@@ -58,3 +55,12 @@
         </form>
 
     {/}
+
+
+<chat-message:>
+    <hr/>
+    <span
+        class="badge {{#if @message.contributor}}badge-inverse{{else if @message.npc}}badge-success{{/}} chat-{{@message.id}}"
+        rel='tooltip' title="{{@message.contributor}}{{@message.npc}}">
+        {@message.user}</span> {@message.text} - <span class='muted'>{friendlyTimestamp(@message.timestamp)}
+    </span>
\ No newline at end of file