Merge pull request #3615 from p-wassi/mutt_171