further fixes for mutt