Added mutt handling