Fix sync back of labels after before-add-message hook modifies incoming message labels