WIP #437 Quick Reply PM
WIP #437 Quick Reply PM

Fixes mix-up with other branches.
Merge pull request #523 from Sama34/wip-437

Implements #437 Quick Reply PM