/* Keep track of the envelope-from address (use body-from if not found) */
if (msg->cm_fields['P'] != NULL) {
safestrncpy(my.envelope_from, msg->cm_fields['P'], sizeof my.envelope_from);
/* Keep track of the envelope-from address (use body-from if not found) */
if (msg->cm_fields['P'] != NULL) {
safestrncpy(my.envelope_from, msg->cm_fields['P'], sizeof my.envelope_from);