diff --git a/src/script/hydra_build.pl b/src/script/hydra_build.pl
index ec2ee1cc..7b2aee9b 100755
--- a/src/script/hydra_build.pl
+++ b/src/script/hydra_build.pl
@@ -182,8 +182,9 @@ sub sendEmailNotification {
             From    => "Hydra Build Daemon <$sender>",
             Subject => "Hydra job $jobName build " . $build->id . " $status",
         ],
-        body => $body,
+        body => "",
     );
+    $email->body_set($body);
 
     print $email->as_string if $ENV{'HYDRA_MAIL_TEST'};
 
diff --git a/src/script/hydra_scheduler.pl b/src/script/hydra_scheduler.pl
index 29740c21..0a0cf1bb 100755
--- a/src/script/hydra_scheduler.pl
+++ b/src/script/hydra_scheduler.pl
@@ -67,8 +67,9 @@ sub sendJobsetErrorNotification() {
             From    => "Hydra Build Daemon <$sender>",
             Subject => "Hydra $projectName:$jobsetName evaluation error",
         ],
-        body => $body,
+        body => ""
     );
+    $email->body_set($body);
 
     print $email->as_string if $ENV{'HYDRA_MAIL_TEST'};