tweak-labels: use to_enum and safe_id
Merge branch 'sup-for-two-dev' into rmail-to-mail-initial