diff --git a/boot.php b/boot.php
index dc944cdf5..8e4793bb5 100644
--- a/boot.php
+++ b/boot.php
@@ -70,7 +70,7 @@ require_once('include/security.php');
 
 
 define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '10.5.4');
+define('STD_VERSION', '10.5.5');
 define('ZOT_REVISION', '6.0');
 
 define('DB_UPDATE_VERSION', 1263);
diff --git a/view/js/main.js b/view/js/main.js
index 738b303b1..7f76252a6 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -946,13 +946,16 @@ function updateConvItems(mode, data) {
 		scrollToItem();
 	}
 
-	collapseHeight();
+	// A slight delay to give the browser time to render images.
+	// Otherwise height calculation might not be accurate.
+	setTimeout(collapseHeight, 10);
 
-	// reset rotators and cursors we may have set before reaching this place
+	// Reset rotators and cursors we may have set before reaching this place
 	let pageSpinner = document.getElementById("page-spinner");
 	if (pageSpinner) {
 		pageSpinner.style.display = 'none';
 	}
+
 	let profileJotTextLoading = document.getElementById("profile-jot-text-loading");
 	if (profileJotTextLoading) {
 		profileJotTextLoading.style.display = 'none';