Ensure updated items have the same UID (if any)

FastMail insists on this.