Additional mail parsing.
Further progress.