New mbox parser

Fixed merge conflicts with develop.