diff --git a/src/skins/vector/views/atoms/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
similarity index 94%
rename from src/skins/vector/views/atoms/MessageTimestamp.js
rename to src/components/views/messages/MessageTimestamp.js
index 5795e55657..a7289ca5b8 100644
--- a/src/skins/vector/views/atoms/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -17,7 +17,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var DateUtils = require('../../../../DateUtils');
+var DateUtils = require('../../../DateUtils');
 
 module.exports = React.createClass({
     displayName: 'MessageTimestamp',
diff --git a/src/skins/vector/skindex.js b/src/skins/vector/skindex.js
index 49655587cb..459ed81ae7 100644
--- a/src/skins/vector/skindex.js
+++ b/src/skins/vector/skindex.js
@@ -25,6 +25,7 @@ var skin = {};
 
 // Vector-specific stuff
 skin['elements.Spinner'] = require('../../components/views/elements/Spinner');
+skin['messages.MessageTimestamp'] = require('../../components/views/messages/MessageTimestamp');
 
 // TODO: Fix this so matrix-react-sdk stuff is in react SDK skindex
 skin['avatars.RoomAvatar'] = require('matrix-react-sdk/lib/components/views/avatars/RoomAvatar');
@@ -35,7 +36,7 @@ skin['atoms.EditableText'] = require('./views/atoms/EditableText');
 skin['atoms.EnableNotificationsButton'] = require('./views/atoms/EnableNotificationsButton');
 skin['atoms.ImageView'] = require('./views/atoms/ImageView');
 skin['atoms.LogoutButton'] = require('./views/atoms/LogoutButton');
-skin['atoms.MessageTimestamp'] = require('./views/atoms/MessageTimestamp');
+
 skin['atoms.create_room.CreateRoomButton'] = require('./views/atoms/create_room/CreateRoomButton');
 skin['atoms.create_room.Presets'] = require('./views/atoms/create_room/Presets');
 skin['atoms.create_room.RoomAlias'] = require('./views/atoms/create_room/RoomAlias');
diff --git a/src/skins/vector/views/molecules/EventTile.js b/src/skins/vector/views/molecules/EventTile.js
index f3f8ae7096..db6367880b 100644
--- a/src/skins/vector/views/molecules/EventTile.js
+++ b/src/skins/vector/views/molecules/EventTile.js
@@ -209,7 +209,7 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp');
+        var MessageTimestamp = sdk.getComponent('messages.MessageTimestamp');
         var SenderProfile = sdk.getComponent('molecules.SenderProfile');
         var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
 
diff --git a/src/skins/vector/views/molecules/MRoomMemberTile.js b/src/skins/vector/views/molecules/MRoomMemberTile.js
index 9dd51a5562..025fb6f01d 100644
--- a/src/skins/vector/views/molecules/MRoomMemberTile.js
+++ b/src/skins/vector/views/molecules/MRoomMemberTile.js
@@ -33,7 +33,7 @@ module.exports = React.createClass({
         var timestamp = this.props.last ? <MessageTimestamp ts={this.props.mxEvent.getTs()} /> : null;
         var text = this.getMemberEventText();
         if (!text) return <div/>;
-        var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp');
+        var MessageTimestamp = sdk.getComponent('messages.MessageTimestamp');
         var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         return (
             <div className="mx_MessageTile mx_MessageTile_notice">