Adding userId to 'to' and 'from' in messages