diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 6450df6e..0b9617b3 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -329,18 +329,6 @@
        "description": "",
        "message": "%d hours"
     },
-    "timestampFormat_y" : {
-       "description": "",
-       "message": "MMM D, YYYY"
-    },
-    "timestampFormat_m" : {
-       "description": "",
-       "message": "MMM D"
-    },
-    "timestampFormat_d" : {
-       "description": "",
-       "message": "ddd"
-    },
     "extendedTimestamp_s": {
        "description": "",
        "message": "now"
@@ -360,17 +348,5 @@
     "extendedTimestamp_hh": {
        "description": "",
        "message": "%d hours ago"
-    },
-    "extendedTimestampFormat_y" : {
-       "description": "",
-       "message": "MMM D, YYYY LT"
-    },
-    "extendedTimestampFormat_m" : {
-       "description": "",
-       "message": "MMM D LT"
-    },
-    "extendedTimestampFormat_d" : {
-       "description": "",
-       "message": "ddd LT"
-   }
+    }
 }
diff --git a/js/views/timestamp_view.js b/js/views/timestamp_view.js
index 133683b2..e356b633 100644
--- a/js/views/timestamp_view.js
+++ b/js/views/timestamp_view.js
@@ -71,9 +71,9 @@
             return i18n("timestamp_"+string).replace(/%d/i, number);
         },
         _format: {
-            y: i18n('timestampFormat_y'),
-            m: i18n('timestampFormat_m'),
-            d: i18n('timestampFormat_d')
+            y: "MMM D, YYYY",
+            m: "MMM D",
+            d: "ddd"
         }
     });
     Whisper.ExtendedTimestampView = Whisper.TimestampView.extend({
@@ -81,9 +81,9 @@
             return i18n("extendedTimestamp_"+string).replace(/%d/i, number);
         },
         _format: {
-            y: i18n('extendedTimestampFormat_y'),
-            m: i18n('extendedTimestampFormat_m'),
-            d: i18n('extendedTimestampFormat_d')
+            y: "MMM D, YYYY LT",
+            m: "MMM D LT",
+            d: "ddd LT"
         }
     });
 })();