Bugfix
Instructions for Nathan while I'm away
Futureproofing for coming messaging security update.