Model expansion

Beside introducing subject and body as real fields, fixed some pep8 crap.

Include?