Correct handling of <subject>
fix metadata flush
Merge pull request #1 from netvandal/master

Correct handling of <subject>