Fix for private messages including @username