1 files changed, 2 insertions, 2 deletions

diff --git a/ymir.nix b/ymir.nix
index ce5f42d1..fd373220 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -904,7 +904,7 @@ in rec {
     serviceConfig = {
       Type = "oneshot";
     };
-    scriptArgs = "%I %H %m %b";
+    scriptArgs = "%I \"Hostname: %H\" \"Machine-ID: %m\" \"Boot-ID: %b\"";
     script = ''
       #!${pkgs.stdenv.shell}
       MAILTO="root"
@@ -921,7 +921,7 @@ in rec {
       ${config.security.wrapperDir}/sendmail $MAILTO <<EOF
       From:$MAILFROM
       To:$MAILTO
-      Subject:Status mail for unit: $UNIT
+      Subject:Status of $UNIT
 
       Status report for unit: $UNIT
       $EXTRA