Rewrote e-mail parser again.
Merge branch 'line-parser'