Bug fix PM

Resolved issues regarding posting PMs. It works as expected now.
Merge branch 'yama'