diff -u old/changeme new/changeme
--- old/changeme	2003-11-01 11:31:10.000000000 -0500
+++ new/changeme	2003-11-01 11:27:09.000000000 -0500
@@ -13,9 +13,10 @@
 #
 (
    echo "Subject: $MSG"
-   echo " "
+   echo "To: $SYSADMIN"
+   echo
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+) | $APCUPSD_MAIL $SYSADMIN
 exit 0
diff -u old/commfailure new/commfailure
--- old/commfailure	2003-11-01 11:31:26.000000000 -0500
+++ new/commfailure	2003-11-01 11:27:13.000000000 -0500
@@ -13,9 +13,10 @@
 #
 (
    echo "Subject: $MSG"
-   echo " "
+   echo "To: $SYSADMIN"
+   echo
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+) | $APCUPSD_MAIL $SYSADMIN
 exit 0
diff -u old/commok new/commok
--- old/commok	2003-11-01 11:31:33.000000000 -0500
+++ new/commok	2003-11-01 11:27:16.000000000 -0500
@@ -13,9 +13,10 @@
 #
 (
    echo "Subject: $MSG"
-   echo " "
+   echo "To: $SYSADMIN"
+   echo
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+) | $APCUPSD_MAIL $SYSADMIN
 exit 0
diff -u old/mainsback new/mainsback
--- old/mainsback	2003-11-01 11:30:55.000000000 -0500
+++ new/mainsback	2003-11-01 11:27:21.000000000 -0500
@@ -13,9 +13,10 @@
 #
 (
    echo "Subject: $MSG"
-   echo " "
+   echo "To: $SYSADMIN"
+   echo
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+) | $APCUPSD_MAIL $SYSADMIN
 exit 0
diff -u old/masterconnect new/masterconnect
--- old/masterconnect	2003-11-01 11:31:43.000000000 -0500
+++ new/masterconnect	2003-11-01 11:27:30.000000000 -0500
@@ -13,9 +13,10 @@
 #
 (
    echo "Subject: $MSG"
-   echo " "
+   echo "To: $SYSADMIN"
+   echo
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+) | $APCUPSD_MAIL $SYSADMIN
 exit 0
diff -u old/mastertimeout new/mastertimeout
--- old/mastertimeout	2003-11-01 11:31:52.000000000 -0500
+++ new/mastertimeout	2003-11-01 11:27:33.000000000 -0500
@@ -13,9 +13,10 @@
 #
 (
    echo "Subject: $MSG"
-   echo " "
+   echo "To: $SYSADMIN"
+   echo
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+) | $APCUPSD_MAIL $SYSADMIN
 exit 0
diff -u old/onbattery new/onbattery
--- old/onbattery	2003-11-01 11:32:03.000000000 -0500
+++ new/onbattery	2003-11-01 11:27:35.000000000 -0500
@@ -13,9 +13,10 @@
 #
 (
    echo "Subject: $MSG"
-   echo " "
+   echo "To: $SYSADMIN"
+   echo
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+) | $APCUPSD_MAIL $SYSADMIN
 exit 0