Added from_user_id to messages