envelope-from information in that "From " line. Instead, convert it into a "Return-Path:" line, just as MMDF would do. This is the least obnoxious (standards-wise) way to transmit the envelope-from information in POP.