Mod mbox-parser.py

Changes and updates