Fix a few things about how keys are attached
Fix a few things about how keys are attached

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