diff --git a/etc/icinga2/scripts/mail-host-notification.sh b/etc/icinga2/scripts/mail-host-notification.sh
index 3850ad651..0c20ecb65 100755
--- a/etc/icinga2/scripts/mail-host-notification.sh
+++ b/etc/icinga2/scripts/mail-host-notification.sh
@@ -78,7 +78,7 @@ do
     l) HOSTNAME=$OPTARG ;; # required
     n) HOSTDISPLAYNAME=$OPTARG ;; # required
     o) HOSTOUTPUT=$OPTARG ;; # required
-    X) HOSTNOTES="${OPTARG}" ;;
+    X) HOSTNOTES=$OPTARG ;;
     r) USEREMAIL=$OPTARG ;; # required
     s) HOSTSTATE=$OPTARG ;; # required
     t) NOTIFICATIONTYPE=$OPTARG ;; # required
@@ -134,7 +134,7 @@ fi
 ## Check whether host notes was specified.
 if [ -n "$HOSTNOTES" ] ; then
         NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
-Host-Notes:    $HOSTNOTES"
+Host notes: $HOSTNOTES"
 fi
 
 ## Check whether author and comment was specified.
diff --git a/etc/icinga2/scripts/mail-service-notification.sh b/etc/icinga2/scripts/mail-service-notification.sh
index da277adb7..35287439b 100755
--- a/etc/icinga2/scripts/mail-service-notification.sh
+++ b/etc/icinga2/scripts/mail-service-notification.sh
@@ -139,15 +139,15 @@ IPv6:    $HOSTADDRESS6"
 fi
 
 ## Check whether host notes was specified.
-if [ -n "${HOSTNOTES}" ] ; then
+if [ -n "$HOSTNOTES" ] ; then
   NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
-Host-Notes:    $HOSTNOTES"
+Host notes: $HOSTNOTES"
 fi
 
 ## Check whether service notes was specified.
-if [ -n "${SERVICENOTES}" ] ; then
+if [ -n "$SERVICENOTES" ] ; then
   NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
-Service-Notes:   $SERVICENOTES"
+Service notes: $SERVICENOTES"
 fi
 
 ## Check whether author and comment was specified.