Attempting to fix checking if a from header and reply-to header is set.