diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29e9027e54e..f817d235f57 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-08  Andreas Schwab  <schwab@suse.de>
+
+	* mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook): Check for
+	self-insert-command, not self-insert.
+
 2007-08-08  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/checkdoc.el (checkdoc-ispell-lisp-words): Remove `iff'.
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index b3e2c051e7d..8862e6ca2d2 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -495,7 +495,7 @@ of a mail alias.  The value is set up, buffer-local, when first needed.")
 
 	     (or (and (integerp last-command-char)
 		      ;; Some commands such as M-> may want to expand first.
-		      (equal this-command 'self-insert)
+		      (equal this-command 'self-insert-command)
 		      (or (eq (char-syntax last-command-char) ?_)
 			  ;; Don't expand on @.
 			  (memq last-command-char '(?@ ?. ?% ?! ?_ ?-))))