let me cook
https://github.com/permissionlesstech/bitchat-android/pull/395
https://github.com/permissionlesstech/bitchat-android/pull/393
I haven't read it yet, but after skimming it this looks really cool