see https://github.com/pagekite/Mailpile/issues/893
see https://github.com/pagekite/Mailpile/issues/893
Merge branch 'setup-notes' of github.com:Cathryne/Mailpile into Cathryne-setup-notes
Merge branch 'Cathryne-setup-notes'