Remove 'account' field in messages