some (iffy) changes to prevent suppressing the actual sender