Fixed From header parsing.
Merge branch 'dev' into test