Return-path patch improvement: skip Return-path comes from headers
if we already generate our own.
Previous variant produce two and more Return-Path'es