Merge pull request #40 from chibenwa/MIME4J-299