 
         if mails = getMails()[recipient]
             for mail in mails
-                context.send "#{robot.brain.userForName(recipient).name}: [From #{mail[0]}] #{mail[1]}"
+                context.send "#{robot.brain.userForName(recipient).name}: [From #{mail[0]}, #{moment.unix(mail[1]).fromNow()}] #{mail[2]}"
             delete getMails()[recipient]
+
+    robot.respond /unmail(\s?.*)/i, (msg) ->
+        # TODO
 
     robot.respond /mail (\S+) (.+)/i, (msg) ->
         [command, recipient, message] = msg.match

#   Mail System
#
# Dependencies:
#   None
#
# Configuration:
#   None
#
# Commands:
#   hubot mail <recipient> <message> - Sends a <message> to <recipient> when found available
#
# Author:
#   MrSaints

module.exports = (robot) ->
    getMails = ->


        if recipient is robot.name
            msg.reply "Thanks, but no thanks! I do not need any mail."
            return

        if recipient is sender
            msg.reply "Are you sure you want to send a mail to yourself? Sad."
            return

        recipient = recipient.toLowerCase()

        getMails()[recipient] or= []
        getMails()[recipient].push [sender, moment().unix(), message]
        msg.reply "Your mail has been prepared for #{recipient}."

    robot.enter (response) ->
