diff --git a/tomcat-instance/templates/bin/shutdown.sh b/tomcat-instance/templates/bin/shutdown.sh
index 3daf3be6..7ccfc0db 100755
--- a/tomcat-instance/templates/bin/shutdown.sh
+++ b/tomcat-instance/templates/bin/shutdown.sh
@@ -3,5 +3,5 @@
 
 sudo -iu {{ tomcat_instance_name }} systemctl --user stop tomcat
 {% if tomcat_instance_mail is defined %}
-/bin/sh -c date | /usr/bin/mail -s {{ inventory_hostname }}/{{ tomcat_instance_name }} : Shutdown instance {{ tomcat_instance_mail }}
+/bin/sh -c date | /usr/bin/mail -s "{{ inventory_hostname }}/{{ tomcat_instance_name }} : Shutdown instance" {{ tomcat_instance_mail }}
 {% endif %}