Update to apply cleanly to mutt-1.5.23