Resurrect changes from bnvk lost in rebase
Resurrect changes from bnvk lost in rebase

jparyani/Mailpile,jparyani/Mailpile,laborautonomo/Mailpile,laborautonomo/Mailpile,laborautonomo/Mailpile,jparyani/Mailpile