[PrivateMessage]: bugfix & cleanup