Merge
Fixed so there's no explicit subject on new messages.
Undid previous blooper.
Added json output filter.