Slight changes, mailcap+ps1