diff --git a/BitKeeper/triggers/post-incoming.mail b/BitKeeper/triggers/post-incoming.mail
index 6df1d183..6006c3c5 100644
--- a/BitKeeper/triggers/post-incoming.mail
+++ b/BitKeeper/triggers/post-incoming.mail
@@ -37,17 +37,14 @@ if [ -z "$(echo ${BKD_HOST} | grep bkbits.net)" ]; then
 	exit 0
 fi
 
+EMAIL="ntfs-cvs <linux-ntfs-cvs@lists.sourceforge.net>"
+REPLYTO="Anton Altaparmakov <aia21@cantab.net>"
+
+SUBJECT="Subject: bk-$(echo ${BKD_ROOT} 2>/dev/null | sed "s#.*/##" 2>/dev/null): ChangeSet@${rev} by ${BK_USER}@${BK_HOST}"
+
 # For each ChangeSet, send an email.
 bk changes -f -d'$unless(:MERGE:){:CSETREV:\n}' - < "${BK_CSETLIST}" 2>/dev/null | while read rev; do
-
 {
-cat <<EOT
-From: Anton Altaparmakov <aia21@cantab.net>
-To: ntfs-cvs <linux-ntfs-cvs@lists.sourceforge.net>
-Subject: bk-$(echo ${BKD_ROOT} 2>/dev/null | sed "s#.*/##" 2>/dev/null): ChangeSet@${rev} by ${BK_USER}@${BK_HOST}
-
-EOT
-
 bk changes -f -d'$unless(:MERGE:){ChangeSet|:CSETREV:\n}' -r$rev 2>/dev/null |
 bk -R prs -h -d'$unless(:MERGE:){ChangeSet@:I:, 20:Dy:-:Dm:-:Dd: :T::TZ:, :P:@:HOST:\n}' - 2>/dev/null
 
@@ -74,7 +71,7 @@ EOT
 
 bk export -tpatch -du -h -r$rev 2>/dev/null
 
-} | sendmail -ti
+} | mail -R "\"${REPLYTO}\"" -s "\"${SUBJECT}\"" "\"${EMAIL}\""
 
 done