- if (msg->cm_fields['V'] != NULL) {
- safestrncpy(my.envelope_to, msg->cm_fields['V'], sizeof my.envelope_to);
- }
- else if (msg->cm_fields['R'] != NULL) {
- safestrncpy(my.envelope_to, msg->cm_fields['R'], sizeof my.envelope_to);
- if (msg->cm_fields['D'] != NULL) {
- strcat(my.envelope_to, "@");
- strcat(my.envelope_to, msg->cm_fields['D']);
- }
+ if (!CM_IsEmpty(msg, eenVelopeTo)) {
+ safestrncpy(my.envelope_to, msg->cm_fields[eenVelopeTo], sizeof my.envelope_to);
+ stripallbut(my.envelope_to, '<', '>');
+ }
+ else if (!CM_IsEmpty(msg, eRecipient)) {
+ safestrncpy(my.envelope_to, msg->cm_fields[eRecipient], sizeof my.envelope_to);
+ stripallbut(my.envelope_to, '<', '>');