Recipient upload rework