     while match = topicExp.exec message
       channelName = match[1]
       channel = @joinChannel channelName
-      @broadcastOwnMessage channel, message
-
-  broadcastOwnMessage: (channel, messageBody) ->
+      @broadcastOwnMessage message, channel
+
+  broadcastOwnMessage: (messageBody, toChannel, fromChannel) ->
     chatItem = 
       author: @username
       body: messageBody
-      meta: {createdAt: new Date()}
-
-    channelMQName = "client-#{channel.name}"
+      meta: {createdAt: new Date().toISOString()}
+
+    chatItem.channel = "#"+fromChannel.name if fromChannel
+
+    channelMQName = "client-#{toChannel.name}"
     @broadcaster.emit channelMQName, JSON.stringify(chatItem)
     chatItem.author = "me"
-    channel.messageReceived chatItem
+    toChannel.messageReceived chatItem
 
 class Channel extends KDEventEmitter
   constructor: (options = {}, data) ->

    """
    <div class='meta'>      
      <span class='time'>[{{#(meta.createdAt)}}] </span>
      <span class="author-wrapper">[{{#(author)}}]: </span>
      <span>{{#(body)}}</span>
    </div>
    """


    channel.view.on "ChatMessageSent", (messageBody) =>
      @parseMessageForChannels messageBody
      @broadcastOwnMessage messageBody, channel 
      if name isnt PUBLIC
        @broadcastOwnMessage messageBody, @channels[PUBLIC], channel

    @broadcaster.on channelName, (msg) ->
      channel.messageReceived msg
