(mail-abbrevs-enable, mail-abbrevs-disable): Use mail-mode-hook instead of mail-setup-hook. Otherwise continuing an interrupted message with C-u C-x m for instence, winds up in Mail mode without abbrevs.