diff --git a/templates/chats.tpl b/templates/chats.tpl
index a655d31..5623b0a 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -11,25 +11,7 @@
 		</ul>
 		<ul component="chat/recent" class="chats-list" data-nextstart="{nextStart}">
 			<!-- BEGIN rooms -->
-			<li component="chat/recent/room" data-roomid="{rooms.roomId}" class="<!-- IF ../unread -->unread<!-- ENDIF ../unread -->">
-				<i class="fa fa-times pull-right leave" component="chat/leave"></i>
-				<!-- IF rooms.lastUser.uid -->
-				<div data-username="{rooms.lastUser.username}" data-uid="{rooms.lastUser.uid}">
-					<!-- IF rooms.lastUser.picture -->
-					<img class="user-img" src="{rooms.lastUser.picture}">
-					<!-- ELSE -->
-					<div class="user-icon user-img" style="background-color: {rooms.lastUser.icon:bgColor};">{rooms.lastUser.icon:text}</div>
-					<!-- ENDIF rooms.lastUser.picture -->
-					<i component="user/status" title="[[global:{rooms.lastUser.status}]]" class="fa fa-circle status {rooms.lastUser.status}"></i>
-					<span class="username">{rooms.usernames}</span>
-				</div>
-				<!-- ELSE -->
-				[[modules:chat.no-users-in-room]]
-				<!-- ENDIF rooms.lastUser.uid -->
-
-				<span class="teaser-content">{rooms.teaser.content}</span>
-				<span class="teaser-timestamp timeago pull-right" title="{rooms.teaser.timestampISO}"></span>
-			</li>
+			<!-- IMPORT partials/chat_recent_room.tpl -->
 			<!-- END rooms -->
 		</ul>
 	</div>
diff --git a/templates/partials/chat_recent_room.tpl b/templates/partials/chat_recent_room.tpl
new file mode 100644
index 0000000..ae15d50
--- /dev/null
+++ b/templates/partials/chat_recent_room.tpl
@@ -0,0 +1,19 @@
+<li component="chat/recent/room" data-roomid="{rooms.roomId}" class="<!-- IF rooms.unread -->unread<!-- ENDIF rooms.unread -->">
+	<i class="fa fa-times pull-right leave" component="chat/leave"></i>
+	<!-- IF rooms.lastUser.uid -->
+	<div data-username="{rooms.lastUser.username}" data-uid="{rooms.lastUser.uid}">
+		<!-- IF rooms.lastUser.picture -->
+		<img class="user-img" src="{rooms.lastUser.picture}">
+		<!-- ELSE -->
+		<div class="user-icon user-img" style="background-color: {rooms.lastUser.icon:bgColor};">{rooms.lastUser.icon:text}</div>
+		<!-- ENDIF rooms.lastUser.picture -->
+		<i component="user/status" title="[[global:{rooms.lastUser.status}]]" class="fa fa-circle status {rooms.lastUser.status}"></i>
+		<span class="username">{rooms.usernames}</span>
+	</div>
+	<!-- ELSE -->
+	[[modules:chat.no-users-in-room]]
+	<!-- ENDIF rooms.lastUser.uid -->
+
+	<span class="teaser-content">{rooms.teaser.content}</span>
+	<span class="teaser-timestamp timeago pull-right" title="{rooms.teaser.timestampISO}"></span>
+</li>
\ No newline at end of file