WIP #437 Quick Reply PM

Fixes mix-up with other branches.