diff --git a/client/js/lounge.js b/client/js/lounge.js
index 3bd2e50f..21148a2b 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -444,7 +444,9 @@ $(function() {
 			]);
 
 		if (data.msg.self
-			|| container.find("div:visible").last().hasClass("unread-marker")) {
+			|| container.find("div:visible").last().hasClass("unread-marker")
+			|| (container.find("div:visible").last().hasClass("date-marker")
+				&& container.find("div:visible").last().prev().hasClass("unread-marker"))) {
 			container
 				.find(".unread-marker")
 				.appendTo(container);