[PrivateMessage]: bugfix & cleanup outdated code