fix_encoding on person fields
dont fix encode if nil
Sort containers by message date and id
Merge pull request #184 from rakoo/discussion-order

Sort containers by message date and id
Merge branch 'develop' into maildir-root
Merge branch 'maildir-root' into running