diff --git a/index.js b/index.js
index 09ea46c..0e1c9ed 100644
--- a/index.js
+++ b/index.js
@@ -5,6 +5,7 @@ var strftime = require('strftime');
 var strptime = require('micro-strptime').strptime;
 var request = require('request');
 var striptags = require('striptags');
+var moment = require('moment');
 var fs = require('fs');
 var ini = require('ini');
 
@@ -105,8 +106,11 @@ function onHttpIncomingMessage(request, response) {
 }
 
 function formatTimestamp(ts) {
+    /*
     var _ts = strptime(ts, '%A %b %d %Y %H:%M:%S GMT%z');
     return strftime('%F %T', _ts);
+    */
+    return moment(ts, 'ddd MMM D YYYY HH:mm:ss Z').format('YYYY-MM-DD HH:mm:ss')
 }
 
 function forwardMessageToEvo(sender, message, ts) {
diff --git a/package.json b/package.json
index c552f63..bb2b469 100644
--- a/package.json
+++ b/package.json
@@ -22,12 +22,13 @@
   "license": "BSD",
   "dependencies": {
     "ini": "~1.3.4",
-    "yahoomessenger": "~0.1.3-Beta",
-    "url": "~0.11.0",
-    "winston": "~1.1.1",
-    "strftime": "~0.9.2",
     "micro-strptime": "~0.2.2",
+    "moment": "^2.11.2",
     "request": "~2.65.0",
-    "striptags": "~2.0.4"
+    "strftime": "~0.9.2",
+    "striptags": "~2.0.4",
+    "url": "~0.11.0",
+    "winston": "~1.1.1",
+    "yahoomessenger": "~0.1.3-Beta"
   }
 }