Fix more things broken by UnAttach refactorign
Fix more things broken by UnAttach refactorign

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