     user = @robot.brain.userForId user.name
     user.room = channel.name
 
-    @robot.logger.debug "Received message: #{txt} in channel: #{channel.name}, from: #{user.name}"
+    @robot.logger.debug "Received message: '#{txt}' in channel: #{channel.name}, from: #{user.name}"
 
-    @receive new TextMessage(user, txt)
+    @receive new TextMessage user, txt, message.ts
 
   send: (envelope, messages...) ->
     channel = slack.getChannelGroupOrDMByName envelope.room

    @client = new SlackClient options.token, options.autoReconnect, options.autoMark

    # Setup event handlers
    # TODO: I think hubot would like to know when people come online
    # TODO: Handle eventual events at (re-)connection time for unreads and provide a config for whether we want to process them
    @client.on 'error', @.error
    @client.on 'loggedIn', @.loggedIn

    @robot.name = self.name

  open: =>
    @robot.logger.info 'Slack client now connected'

    # Tell Hubot we're connected so it can load scripts
    @emit "connected"
