diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index 8417f91f..dacfad92 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -23,21 +23,16 @@ const DateUtils = require('matrix-react-sdk/lib/DateUtils');
 module.exports = React.createClass({
     displayName: 'MessageTimestamp',
 
+    propTypes: {
+        showTwelveHour: React.PropTypes.bool,
+    },
+
     render: function() {
-        var date = new Date(this.props.ts);
-        if (UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps')) {
-          return (
-              <span style={{ textAlign: 'center' }} className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
-                  { DateUtils.formatTime(date) }
-              </span>
-            );
-          }
-        else {
-          return (
-              <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
-                  { DateUtils.formatTime(date) }
-              </span>
-            );
-          }
+        const date = new Date(this.props.ts);
+        return (
+            <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
+                { DateUtils.formatTime(date, this.props.showTwelveHour) }
+            </span>
+        );
     },
 });
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index 5943cfdc..3ea25ba2 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -94,7 +94,7 @@ limitations under the License.
  */
 .mx_EventTile_selected .mx_EventTile_line {
     border-left: $accent-color 5px solid;
-    padding-left: 60px;
+    padding-left: px;
     background-color: $event-selected-color;
 }
 
@@ -263,8 +263,12 @@ limitations under the License.
     cursor: pointer;
 }
 
-.mx_EventTile_e2eIcon_12hr {
-  padding-left: 5px;
+.mx_EventTile_12hr .mx_EventTile_e2eIcon {
+    padding-left: 5px;
+}
+
+.mx_EventTile_12hr .mx_MessageTimestamp {
+    text-align: center;
 }
 
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,