Changes in Message.class (User identifier fix)