Fixes #1555

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1579 from live627/pm_labeled_messages

Fixes #1555