Fix Issue #954
Merge branch 'master' of https://github.com/pagekite/Mailpile
Merge pull request #955 from danorton/master

Fix Issue #954