diff --git a/res/css/_components.scss b/res/css/_components.scss
index 566b84a7c8..ffaec43b68 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -132,6 +132,7 @@
 @import "./views/elements/_EditableItemList.scss";
 @import "./views/elements/_ErrorBoundary.scss";
 @import "./views/elements/_EventListSummary.scss";
+@import "./views/elements/_EventTilePreview.scss";
 @import "./views/elements/_FacePile.scss";
 @import "./views/elements/_Field.scss";
 @import "./views/elements/_ImageView.scss";
diff --git a/res/css/views/elements/_EventTilePreview.scss b/res/css/views/elements/_EventTilePreview.scss
new file mode 100644
index 0000000000..a8c0deabbe
--- /dev/null
+++ b/res/css/views/elements/_EventTilePreview.scss
@@ -0,0 +1,22 @@
+/*
+Copyright 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_EventTilePreview_loader {
+    &.mx_IRCLayout,
+    &.mx_GroupLayout {
+        padding: 9px 0;
+    }
+}
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
index 5bea8a0706..183ac09268 100644
--- a/src/components/views/elements/EventTilePreview.tsx
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -124,7 +124,7 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
             "mx_GroupLayout": this.props.layout == Layout.Group,
         });
 
-        if (!this.props.userId) return <div className={className} style={{ padding: '9px 0' }}><Spinner /></div>;
+        if (!this.props.userId) return <div className={classnames("mx_EventTilePreview_loader", className)}><Spinner /></div>;
 
         const event = this.fakeEvent(this.state);