diff --git a/build.gradle b/build.gradle
index 9f2f7d74..b1e986f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ plugins {
 
 // To upgrade Gradle, change the version here, refresh, then run the 'build setup/wrapper' task
 wrapper {
-    gradleVersion = '8.11.1'
+    gradleVersion = '8.12'
 }
 
 // This gives a git-like version for git builds but a proper version
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e2847c82..cea7a793 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ui/src/main/java/io/xeres/ui/support/contentline/ContentImage.java b/ui/src/main/java/io/xeres/ui/support/contentline/ContentImage.java
index cb24475d..07e7157f 100644
--- a/ui/src/main/java/io/xeres/ui/support/contentline/ContentImage.java
+++ b/ui/src/main/java/io/xeres/ui/support/contentline/ContentImage.java
@@ -102,17 +102,24 @@ public ContentImage(Image image, Region parent)
 
 		node.setImage(image);
 		node.setOnContextMenuRequested(event -> contextMenu.show(node, event.getScreenX(), event.getScreenY()));
+		node.setOnMouseClicked(ContentImage::view);
 
 		if (parent != null)
 		{
+			syncImageWidth(node, parent.getWidth());
 			parent.widthProperty().addListener((observable, oldValue, newValue) -> {
-				node.setFitWidth(newValue.doubleValue() - 24); // 12 margins
+				syncImageWidth(node, newValue.doubleValue());
 			});
+
 			node.setPreserveRatio(true);
-			node.setOnMouseClicked(ContentImage::view);
 		}
 	}
 
+	private static void syncImageWidth(ImageView imageView, double width)
+	{
+		imageView.setFitWidth(width - 24); // margins of 12 on each side
+	}
+
 	@Override
 	public Node getNode()
 	{