diff --git a/src/skins/vector/css/molecules/EventTile.css b/src/skins/vector/css/molecules/EventTile.css
index a9067e5b..ee3f79f3 100644
--- a/src/skins/vector/css/molecules/EventTile.css
+++ b/src/skins/vector/css/molecules/EventTile.css
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_EventTile {
     max-width: 100%;
     clear: both;
-    margin-top: 32px;
+    margin-top: 24px;
     margin-left: 56px;
 }
 
@@ -53,6 +53,10 @@ limitations under the License.
     float: right;
 }
 
+.mx_EventTile_line {
+    position: relative;
+}
+
 .mx_EventTile_content {
     padding-right: 100px;
     display: block;
@@ -91,9 +95,9 @@ limitations under the License.
 }
 
 .mx_EventTile_editButton {
-    clear: right;
-    float: right;
-    display: inline-block;
+    position: absolute;
+    right: 0px;
+    top: 15px;
     visibility: hidden;
     border: 0px;
     outline: none;
diff --git a/src/skins/vector/views/molecules/EventTile.js b/src/skins/vector/views/molecules/EventTile.js
index dee1dcc9..40a50cfd 100644
--- a/src/skins/vector/views/molecules/EventTile.js
+++ b/src/skins/vector/views/molecules/EventTile.js
@@ -122,7 +122,7 @@ module.exports = React.createClass({
             <div className={classes}>
                 { avatar }
                 { sender }
-                <div>
+                <div className="mx_EventTile_line">
                     { timestamp }
                     { editButton }
                     <EventTileType mxEvent={this.props.mxEvent} />