diff --git a/Jenkinsfile b/Jenkinsfile
index 8039ceb302..7b33815244 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 #!/usr/bin/env groovy
 
-def buildError = null;
+def buildError
 
 try {
     switch (env.BRANCH_NAME) {
@@ -55,25 +55,19 @@ try {
             }
         }
     }
-
-    mail(
-        to: env.GIT_COMMIT_EMAIL,
-        subject: "Pipeline success: ${env.JOB_NAME} (${env.BUILD_NUMBER})",
-        body: "Check status at ${env.BUILD_URL}"
-    )
 } catch(e) {
-    buildError = e;
+    buildError = e
 }
 
 if (env.GIT_COMMIT_EMAIL) {
     def status
-    def body = "<p>Check status at ${env.BUILD_URL}</p>";
+    def body = "<p>Check status at ${env.BUILD_URL}</p>"
 
     if (buildError) {
         status = 'Failed'
-        body += buildError.getMessage()
+        body += "<p>${buildError.getMessage()}</p>"
     } else {
-        status = 'Success';
+        status = 'Success'
     }
 
     mail(
@@ -81,4 +75,4 @@ if (env.GIT_COMMIT_EMAIL) {
         subject: "Pipeline: ${status}: ${env.JOB_NAME} (${env.BUILD_NUMBER})",
         body: body
     )
-}
\ No newline at end of file
+}