diff --git a/skins/base/css/molecules/MessageTile.css b/skins/base/css/molecules/MessageTile.css
index 84f4ca81..dae12e1a 100644
--- a/skins/base/css/molecules/MessageTile.css
+++ b/skins/base/css/molecules/MessageTile.css
@@ -18,18 +18,18 @@ limitations under the License.
 	display: table-row;
 }
 
-.mx_MessageTile .mx_messageTileType {
+.mx_MessageTile_content {
 	display: table-cell;
 }
 
-.mx_MessageTile.sending {
+.mx_MessageTile_sending {
     color: #ddd;
 }
 
-.mx_MessageTile.not_sent {
+.mx_MessageTile_notSent {
     color: #f11;
 }
 
-.mx_MessageTile.highlight {
+.mx_MessageTile_highlight {
     color: #00f;
 }
diff --git a/skins/base/views/molecules/MessageTile.js b/skins/base/views/molecules/MessageTile.js
index d1374442..6808ecd9 100644
--- a/skins/base/views/molecules/MessageTile.js
+++ b/skins/base/views/molecules/MessageTile.js
@@ -50,9 +50,9 @@ module.exports = React.createClass({
         }
         var classes = classNames({
             mx_MessageTile: true,
-            sending: this.props.mxEvent.status == 'sending',
-            not_sent: this.props.mxEvent.status == 'not_sent',
-            highlight: this.shouldHighlight()
+            mx_MessageTile_sending: this.props.mxEvent.status == 'sending',
+            mx_MessageTile_notSent: this.props.mxEvent.status == 'not_sent',
+            mx_MessageTile_highlight: this.shouldHighlight()
         });
         return (
             <div className={classes}>