diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 62c141a..235a3a7 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -69,7 +69,7 @@ scrollBox = propertyList "scroll server" $ props
 		, "echo 'or, type comments below (finish with a dot on its own line)'"
 		, "echo"
 		, "echo Your comments:"
-		, "mail -E -s \"scroll test $t\" joey@kitenet.net"
+		, "timeout --kill-after 1m --foreground 2h mail -E -s \"scroll test $t\" joey@kitenet.net"
 		] `onChange` (g `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes)))
 	& Apt.installed ["bsd-mailx"]
 	-- prevent port forwarding etc by not letting scroll log in via ssh