diff --git a/templates/chats.tpl b/templates/chats.tpl
index bb9363b..bd59294 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -9,6 +9,8 @@
 			<!-- BEGIN rooms.users -->
 			<!-- IMPORT partials/chat_contact.tpl -->
 			<!-- END rooms.users -->
+			<span class="teaser-content">{rooms.teaser.content}</span>
+			<span class="teaser-timestamp timeago" title="{rooms.teaser.timestampISO}"></span>
 			</li>
 			<!-- END rooms -->
 		</ul>
diff --git a/templates/partials/chat_contact.tpl b/templates/partials/chat_contact.tpl
index 6e9f2e0..c5d2fa2 100644
--- a/templates/partials/chat_contact.tpl
+++ b/templates/partials/chat_contact.tpl
@@ -1,4 +1,4 @@
-			<div data-username="{../username}" data-uid="{../uid}" >
+			<div data-username="{../username}" data-uid="{../uid}">
 				<!-- IF ../picture -->
 				<img class="user-img" src="{../picture}">
 				<!-- ELSE -->
@@ -6,6 +6,5 @@
 				<!-- ENDIF ../picture -->
 				<i component="user/status" title="[[global:{../status}]]" class="fa fa-circle status {../status}"></i>
 				<span class="username">{../username}</span>
-				<span class="teaser-content">{../teaser.content}</span>
-				<span class="teaser-timestamp timeago" title="{../teaser.timestampISO}"></span>
+
 			</div>
\ No newline at end of file