[CalendarServer-changes] [4358] CalDAVTester/trunk

Thu Jun 18 09:32:31 PDT 2009

Revision: 4358
          http://trac.macosforge.org/projects/calendarserver/changeset/4358
Author:   cdaboo at apple.com
Date:     2009-06-18 09:32:30 -0700 (Thu, 18 Jun 2009)
Log Message:
-----------
X-CALENDARSERVER-EMAIL -> EMAIL.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/implicit/allday/recurring/10.ics
    CalDAVTester/trunk/Resource/implicit/allday/recurring/2.ics
    CalDAVTester/trunk/Resource/implicit/allday/recurring/3.ics
    CalDAVTester/trunk/Resource/implicit/allday/recurring/5.ics
    CalDAVTester/trunk/Resource/implicit/allday/recurring/7.ics
    CalDAVTester/trunk/Resource/implicit/allday/recurring/8.ics
    CalDAVTester/trunk/Resource/implicit/allday/simple/10.ics
    CalDAVTester/trunk/Resource/implicit/allday/simple/2.ics
    CalDAVTester/trunk/Resource/implicit/allday/simple/3.ics
    CalDAVTester/trunk/Resource/implicit/allday/simple/5.ics
    CalDAVTester/trunk/Resource/implicit/allday/simple/7.ics
    CalDAVTester/trunk/Resource/implicit/allday/simple/8.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite1/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite2/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite3/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite4/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite4/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite4/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite5/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite5/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite5/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite6/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite6/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite6/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite7/2.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite7/3.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite7/4.ics
    CalDAVTester/trunk/Resource/implicit/auto1/suite8/1.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite4/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite4/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite5/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite5/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite6/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite6/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite7/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite7/3.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite8/2.ics
    CalDAVTester/trunk/Resource/implicit/auto2/suite8/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite4/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite4/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite5/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite5/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite6/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite6/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite7/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite7/3.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite8/2.ics
    CalDAVTester/trunk/Resource/implicit/auto3/suite8/3.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto4/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto5/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto5/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto5/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto5/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto5/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto5/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto5/suite4/2.ics
    CalDAVTester/trunk/Resource/implicit/auto5/suite4/3.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite4/1.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite4/2.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite4/3.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite6/1.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite6/2.ics
    CalDAVTester/trunk/Resource/implicit/auto6/suite6/3.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite1/2.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite1/3.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite1/4.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite2/2.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite2/3.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite2/4.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite3/2.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite3/3.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite3/4.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite4/2.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite4/3.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite4/4.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite5/2.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite5/3.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite5/4.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite6/2.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite6/3.ics
    CalDAVTester/trunk/Resource/implicit/auto7/suite6/4.ics
    CalDAVTester/trunk/Resource/implicit/cancels/non-recurring-delete/2.ics
    CalDAVTester/trunk/Resource/implicit/cancels/non-recurring-remove/3.ics
    CalDAVTester/trunk/Resource/implicit/cancels/partial-delete-some/3.ics
    CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/3.ics
    CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/4.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-delete-all/2.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-delete-some/3.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-all/3.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-some/3.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/2.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/4.ics
    CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/6.ics
    CalDAVTester/trunk/Resource/implicit/cancels/still-cancelled/3.ics
    CalDAVTester/trunk/Resource/implicit/cancels/still-cancelled/4.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/2.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/3.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/5.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/6.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/2.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/3.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/5.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/7.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/2.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/3.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/5.ics
    CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/6.ics
    CalDAVTester/trunk/Resource/implicit/deletecalendar/4.ics
    CalDAVTester/trunk/Resource/implicit/deletecalendar/6.ics
    CalDAVTester/trunk/Resource/implicit/deletecalendar/7.ics
    CalDAVTester/trunk/Resource/implicit/deletecalendar/8.ics
    CalDAVTester/trunk/Resource/implicit/dropbox/10.ics
    CalDAVTester/trunk/Resource/implicit/dropbox/11.ics
    CalDAVTester/trunk/Resource/implicit/dropbox/12.ics
    CalDAVTester/trunk/Resource/implicit/dropbox/2.ics
    CalDAVTester/trunk/Resource/implicit/dropbox/4.ics
    CalDAVTester/trunk/Resource/implicit/dropbox/6.ics
    CalDAVTester/trunk/Resource/implicit/dropbox/8.ics
    CalDAVTester/trunk/Resource/implicit/dropbox/9.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/10.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/2.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/4.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/5.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/7.ics
    CalDAVTester/trunk/Resource/implicit/privateevents/8.ics
    CalDAVTester/trunk/Resource/implicit/proxy/5.ics
    CalDAVTester/trunk/Resource/implicit/proxy/6.ics
    CalDAVTester/trunk/Resource/implicit/proxy/8.ics
    CalDAVTester/trunk/Resource/implicit/proxy/9.ics
    CalDAVTester/trunk/Resource/implicit/recur1/allday/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/allday/4.ics
    CalDAVTester/trunk/Resource/implicit/recur1/allday/6.ics
    CalDAVTester/trunk/Resource/implicit/recur1/allday/7.ics
    CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/4.ics
    CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/6.ics
    CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/8.ics
    CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/3.ics
    CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/5.ics
    CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/6.ics
    CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/7.ics
    CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/8.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override/6.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override/7.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/10.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/11.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/12.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/14.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/15.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/16.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/4.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/6.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/7.ics
    CalDAVTester/trunk/Resource/implicit/recur1/override_request/8.ics
    CalDAVTester/trunk/Resource/implicit/recur1/rrule/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/rrule/4.ics
    CalDAVTester/trunk/Resource/implicit/recur1/rrule/6.ics
    CalDAVTester/trunk/Resource/implicit/recur1/truncation/2.ics
    CalDAVTester/trunk/Resource/implicit/recur1/truncation/4.ics
    CalDAVTester/trunk/Resource/implicit/recur1/truncation/6.ics
    CalDAVTester/trunk/Resource/implicit/recur1/truncation/7.ics
    CalDAVTester/trunk/Resource/implicit/recur1/truncation/8.ics
    CalDAVTester/trunk/Resource/implicit/recur1/truncation/9.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/11.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/14.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/8.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/alarms/9.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/3.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/3.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/8.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/9.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/11.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/8.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/simple/9.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/5.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/8.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/8.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/10.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/2.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/4.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/6.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/7.ics
    CalDAVTester/trunk/Resource/implicit/scenario2/simple/9.ics
    CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/10.ics
    CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/12.ics
    CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/13.ics
    CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/2.ics
    CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/3.ics
    CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/5.ics
    CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/6.ics
    CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/8.ics
    CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/9.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/2.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/4.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/6.ics
    CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/8.ics
    CalDAVTester/trunk/Resource/implicit/security/attendeepartycrash/2.ics
    CalDAVTester/trunk/Resource/implicit/security/attendeepartycrash/4.ics
    CalDAVTester/trunk/Resource/implicit/security/attendeeswitchorganizer/2.ics
    CalDAVTester/trunk/Resource/implicit/security/attendeeswitchorganizer/4.ics
    CalDAVTester/trunk/Resource/implicit/security/organizerforgery/2.ics
    CalDAVTester/trunk/Resource/implicit/security/organizerforgery/4.ics
    CalDAVTester/trunk/Resource/implicit/security/organizerforgery/6.ics
    CalDAVTester/trunk/Resource/privatecomments/11.ics
    CalDAVTester/trunk/Resource/privatecomments/13.ics
    CalDAVTester/trunk/Resource/privatecomments/14.ics
    CalDAVTester/trunk/Resource/privatecomments/16.ics
    CalDAVTester/trunk/Resource/privatecomments/17.ics
    CalDAVTester/trunk/Resource/privatecomments/19.ics
    CalDAVTester/trunk/Resource/privatecomments/2.ics
    CalDAVTester/trunk/Resource/privatecomments/20.ics
    CalDAVTester/trunk/Resource/privatecomments/22.ics
    CalDAVTester/trunk/Resource/privatecomments/24.ics
    CalDAVTester/trunk/Resource/privatecomments/25.ics
    CalDAVTester/trunk/Resource/privatecomments/27.ics
    CalDAVTester/trunk/Resource/privatecomments/28.ics
    CalDAVTester/trunk/Resource/privatecomments/30.ics
    CalDAVTester/trunk/Resource/privatecomments/32.ics
    CalDAVTester/trunk/Resource/privatecomments/34.ics
    CalDAVTester/trunk/Resource/privatecomments/35.ics
    CalDAVTester/trunk/Resource/privatecomments/37.ics
    CalDAVTester/trunk/Resource/privatecomments/38.ics
    CalDAVTester/trunk/Resource/privatecomments/4.ics
    CalDAVTester/trunk/Resource/privatecomments/41.ics
    CalDAVTester/trunk/Resource/privatecomments/6.ics
    CalDAVTester/trunk/Resource/privatecomments/7.ics
    CalDAVTester/trunk/Resource/privatecomments/9.ics
    CalDAVTester/trunk/Resource/privateevents/28.xml
    CalDAVTester/trunk/Resource/privateevents/38.ics
    CalDAVTester/trunk/Resource/privateevents/49.ics
    CalDAVTester/trunk/Resource/privateevents/50.ics
    CalDAVTester/trunk/scripts/tests/privateevents.xml

Modified: CalDAVTester/trunk/Resource/implicit/allday/recurring/10.ics
===================================================================

--- CalDAVTester/trunk/Resource/implicit/allday/recurring/10.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/recurring/10.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,24 +24,24 @@
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
 RRULE:FREQ=WEEKLY;COUNT=10
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060108
 RECURRENCE-ID;VALUE=DATE:20060108
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/allday/recurring/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/recurring/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/recurring/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
 RRULE:FREQ=WEEKLY;COUNT=10
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/allday/recurring/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/recurring/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/recurring/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
 RRULE:FREQ=WEEKLY;COUNT=10
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/allday/recurring/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/recurring/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/recurring/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,24 +24,24 @@
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
 RRULE:FREQ=WEEKLY;COUNT=10
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060108
 RECURRENCE-ID;VALUE=DATE:20060108
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/allday/recurring/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/recurring/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/recurring/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,24 +24,24 @@
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
 RRULE:FREQ=WEEKLY;COUNT=10
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060108
 RECURRENCE-ID;VALUE=DATE:20060108
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/allday/recurring/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/recurring/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/recurring/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,22 +24,22 @@
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
 RRULE:FREQ=WEEKLY;COUNT=10
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060108
 RECURRENCE-ID;VALUE=DATE:20060108
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/allday/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/simple/10.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/simple/10.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -23,12 +23,12 @@
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/allday/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/simple/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/simple/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -23,12 +23,12 @@
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/allday/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/simple/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/simple/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -23,11 +23,11 @@
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/allday/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/simple/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/simple/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -23,12 +23,12 @@
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/allday/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/simple/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/simple/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -23,12 +23,12 @@
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/allday/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/allday/simple/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/allday/simple/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -23,11 +23,11 @@
 BEGIN:VEVENT
 UID:event1 at ninevah.local
 DTSTART;VALUE=DATE:20060101
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite1/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite1/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite1/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite1/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite1/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite1/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite2/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite2/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";
- X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite2/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite2/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185106Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite2/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite2/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite2/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite3/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite3/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-2
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous one
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite3/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite3/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous one
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite3/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite3/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite3/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-2
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous one
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite4/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite4/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,14 +6,14 @@
 DTSTART:20060206T200000Z
 DTEND:20060206T210000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:OPAQUE
@@ -23,14 +23,14 @@
 RECURRENCE-ID:20060208T200000Z
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite4/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite4/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060206T200000Z
 DTEND:20060206T210000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:TRANSPARENT
@@ -23,13 +23,13 @@
 RECURRENCE-ID:20060208T200000Z
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite4/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite4/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite4/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,14 +6,14 @@
 DTSTART:20060206T200000Z
 DTEND:20060206T210000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:OPAQUE
@@ -23,14 +23,14 @@
 RECURRENCE-ID:20060208T200000Z
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring conflict
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite5/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite5/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,14 +6,14 @@
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring without conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite5/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite5/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring without conflict
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite5/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite5/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite5/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,14 +6,14 @@
 DTSTART:20060206T100000Z
 DTEND:20060206T110000Z
 RRULE:FREQ=DAILY;COUNT=5
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring without conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite6/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite6/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-5
 DTSTART:20060210T104500Z
 DTEND:20060210T114500Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous recurring one
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite6/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite6/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-5
 DTSTART:20060210T104500Z
 DTEND:20060210T114500Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous recurring one
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite6/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite6/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite6/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-5
 DTSTART:20060210T104500Z
 DTEND:20060210T114500Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - same time as previous recurring one
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite7/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite7/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,14 +6,14 @@
 DTSTART:20060210T080000Z
 DTEND:20060210T081000Z
 RRULE:FREQ=HOURLY;COUNT=8
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:OPAQUE
@@ -23,14 +23,14 @@
 RECURRENCE-ID:20060210T100000Z
 DTSTART:20060210T100000Z
 DTEND:20060210T101000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite7/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite7/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060210T080000Z
 DTEND:20060210T081000Z
 RRULE:FREQ=HOURLY;COUNT=8
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:TRANSPARENT
@@ -23,13 +23,13 @@
 RECURRENCE-ID:20060210T100000Z
 DTSTART:20060210T100000Z
 DTEND:20060210T101000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite7/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite7/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite7/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,14 +6,14 @@
 DTSTART:20060210T080000Z
 DTEND:20060210T081000Z
 RRULE:FREQ=HOURLY;COUNT=8
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:OPAQUE
@@ -23,14 +23,14 @@
 RECURRENCE-ID:20060210T100000Z
 DTSTART:20060210T100000Z
 DTEND:20060210T101000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example - recurring with recurring conflict
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto1/suite8/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/suite8/1.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto1/suite8/1.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ vered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Example
 TRANSP:OPAQUE
 STATUS:CANCELLED

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite1/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite1/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite1/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite1/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite2/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite2/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite2/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite2/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -21,13 +21,13 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite3/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite3/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,12 +34,12 @@
 DTSTART:20060222T210000Z
 DTEND:20060222T220000Z
 RECURRENCE-ID:20060222T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite3/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite3/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -21,13 +21,13 @@
 DTSTART:20060215T210000Z
 DTEND:20060215T220000Z
 RECURRENCE-ID:20060215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -36,13 +36,13 @@
 DTSTART:20060222T210000Z
 DTEND:20060222T220000Z
 RECURRENCE-ID:20060222T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite4/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite4/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,11 +5,11 @@
 UID:event-2
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite4/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite4/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite5/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite5/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,11 +5,11 @@
 UID:event-2
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,12 +33,12 @@
 DTSTART:20060222T110000Z
 DTEND:20060222T120000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite5/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite5/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -21,13 +21,13 @@
 DTSTART:20060222T110000Z
 DTEND:20060222T120000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite6/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite6/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,11 +5,11 @@
 UID:event-2
 DTSTART:20060208T100000Z
 DTEND:20060208T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,12 +33,12 @@
 DTSTART:20060222T203000Z
 DTEND:20060222T213000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite6/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite6/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060215T110000Z
 DTEND:20060215T120000Z
 RECURRENCE-ID:20060215T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -21,13 +21,13 @@
 DTSTART:20060222T203000Z
 DTEND:20060222T213000Z
 RECURRENCE-ID:20060222T100000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #2
 TRANSP:TRANSPARENT
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite7/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite7/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,11 +20,11 @@
 DTSTART:20070215T210000Z
 DTEND:20070215T220000Z
 RECURRENCE-ID:20070215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite7/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite7/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20070215T200000Z
 SUMMARY:Recurring event

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite8/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite8/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite8/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,11 +20,11 @@
 DTSTART:20070215T210000Z
 DTEND:20070215T220000Z
 RECURRENCE-ID:20070215T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,11 +33,11 @@
 DTSTART:20070222T210000Z
 DTEND:20070222T220000Z
 RECURRENCE-ID:20070222T200000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - override #1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto2/suite8/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto2/suite8/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto2/suite8/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-3
 DTSTART:20070208T200000Z
 DTEND:20070208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20070110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20070309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20070215T200000Z
 EXDATE:20070222T200000Z

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite1/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite1/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite1/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite1/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite2/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite2/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
  message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 SUMMARY:Recurring event

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite2/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite2/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 SUMMARY:Recurring event

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite3/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite3/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 EXDATE:20060308T200000Z,20060322T200000Z,20060405T200000Z

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite3/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite3/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060215T200000Z
 EXDATE:20060308T200000Z,20060322T200000Z,20060405T200000Z

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite4/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite4/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -33,12 +33,12 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -47,12 +47,12 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -61,12 +61,12 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite4/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite4/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -20,13 +20,13 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -35,13 +35,13 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -50,13 +50,13 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -65,13 +65,13 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite5/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite5/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
  message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -20,11 +20,11 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -33,13 +33,13 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
  message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -48,13 +48,13 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
  message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -63,13 +63,13 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Scheduling 
  message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite5/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite5/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
@@ -21,13 +21,13 @@
 UID:event-2
 DTSTART:20060223T210000Z
 DTEND:20060223T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -36,13 +36,13 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -51,13 +51,13 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite6/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite6/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;S
  cheduling message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060223T200000Z
 SUMMARY:Recurring event with overridden instances
@@ -21,11 +21,11 @@
 UID:event-2
 DTSTART:20060216T210000Z
 DTEND:20060216T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -34,11 +34,11 @@
 UID:event-2
 DTSTART:20060309T210000Z
 DTEND:20060309T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060309T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -47,13 +47,13 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;S
  cheduling message has been delivered";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite6/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite6/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-2
 DTSTART:20060209T200000Z
 DTEND:20060209T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060223T200000Z
 EXDATE:20060216T200000Z
@@ -22,12 +22,12 @@
 UID:event-2
 DTSTART:20060324T210000Z
 DTEND:20060324T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060323T200000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite7/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite7/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite7/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,11 +5,11 @@
 UID:event-3
 DTSTART:20060209T100000Z
 DTEND:20060209T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -18,12 +18,12 @@
 UID:event-3
 DTSTART:20060216T110000Z
 DTEND:20060216T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -32,12 +32,12 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite7/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite7/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite7/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-3
 DTSTART:20060216T110000Z
 DTEND:20060216T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060216T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE
@@ -20,13 +20,13 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite8/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite8/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite8/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,11 +5,11 @@
 UID:event-3
 DTSTART:20060209T100000Z
 DTEND:20060209T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=WEEKLY;COUNT=20
 EXDATE:20060216T100000Z
 SUMMARY:Recurring event with overridden instances
@@ -19,12 +19,12 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto3/suite8/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto3/suite8/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto3/suite8/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-3
 DTSTART:20060223T110000Z
 DTEND:20060223T120000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RECURRENCE-ID:20060223T100000Z
 SUMMARY:Recurring event with overridden instances
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite1/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite1/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite1/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite1/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite2/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite2/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite2/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite2/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -21,13 +21,13 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite3/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite3/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,11 +34,11 @@
 RECURRENCE-ID:20060204T200000Z
 DTSTART:20060203T200000Z
 DTEND:20060203T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto4/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto4/suite3/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto4/suite3/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060201T200000Z
 DTEND:20060201T210000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 EXDATE:20060204T200000Z
 SUMMARY:Recurring event
@@ -22,13 +22,13 @@
 RECURRENCE-ID:20060203T200000Z
 DTSTART:20060203T210000Z
 DTEND:20060203T220000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:3rd-day override
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto5/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto5/suite1/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto5/suite1/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060209T000000Z
 DTEND:20060209T230000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto5/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto5/suite1/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto5/suite1/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060209T000000Z
 DTEND:20060209T230000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto5/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto5/suite2/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto5/suite2/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-2
 DTSTART:20060207T100000Z
 DTEND:20060207T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event - 2
 TRANSP:OPAQUE
@@ -20,12 +20,12 @@
 RECURRENCE-ID:20060209T100000Z
 DTSTART:20060209T100000Z
 DTEND:20060209T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - 2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto5/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto5/suite2/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto5/suite2/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060207T100000Z
 DTEND:20060207T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event - 2
 TRANSP:OPAQUE
@@ -21,13 +21,13 @@
 RECURRENCE-ID:20060209T100000Z
 DTSTART:20060209T100000Z
 DTEND:20060209T110000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - 2
 TRANSP:TRANSPARENT
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto5/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto5/suite3/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto5/suite3/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,11 +5,11 @@
 UID:event-3
 DTSTART:20060207T120000Z
 DTEND:20060207T130000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event - 3
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 RECURRENCE-ID:20060209T120000Z
 DTSTART:20060209T123000Z
 DTEND:20060209T133000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - 3
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto5/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto5/suite3/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto5/suite3/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 RECURRENCE-ID:20060209T120000Z
 DTSTART:20060209T123000Z
 DTEND:20060209T133000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - 3
 TRANSP:TRANSPARENT
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto5/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto5/suite4/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto5/suite4/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,11 +5,11 @@
 UID:event-4
 DTSTART:20060207T150000Z
 DTEND:20060207T160000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 RRULE:FREQ=DAILY;COUNT=5
 SUMMARY:Recurring event - 4
 TRANSP:OPAQUE
@@ -19,12 +19,12 @@
 RECURRENCE-ID:20060209T150000Z
 DTSTART:20060209T153000Z
 DTEND:20060209T163000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - 4
 TRANSP:OPAQUE
 END:VEVENT
@@ -33,12 +33,12 @@
 RECURRENCE-ID:20060210T150000Z
 DTSTART:20060210T153000Z
 DTEND:20060210T163000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - 4
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto5/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto5/suite4/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto5/suite4/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 RECURRENCE-ID:20060209T150000Z
 DTSTART:20060209T153000Z
 DTEND:20060209T163000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - 4
 TRANSP:TRANSPARENT
 END:VEVENT
@@ -21,13 +21,13 @@
 RECURRENCE-ID:20060210T150000Z
 DTSTART:20060210T153000Z
 DTEND:20060210T163000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Recurring event - 4
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite1/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite1/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,12 +6,12 @@
 DTSTART:20060104T000000Z
 DTEND:20060104T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite1/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite1/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060104T000000Z
 DTEND:20060104T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite2/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite2/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,12 +6,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT
@@ -20,12 +20,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,12 +34,12 @@
 DTSTART:20060102T000000Z
 DTEND:20060102T010000Z
 RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT
@@ -48,12 +48,12 @@
 DTSTART:20060103T000000Z
 DTEND:20060103T010000Z
 RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite2/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite2/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:TRANSPARENT
 END:VEVENT
@@ -21,13 +21,13 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT
@@ -36,13 +36,13 @@
 DTSTART:20060102T000000Z
 DTEND:20060102T010000Z
 RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT
@@ -51,13 +51,13 @@
 DTSTART:20060103T000000Z
 DTEND:20060103T010000Z
 RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite3/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite3/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -7,12 +7,12 @@
 DTEND:20060104T010000Z
 RRULE:FREQ=DAILY;COUNT=100
 EXDATE:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite3/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite3/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -7,13 +7,13 @@
 DTEND:20060104T010000Z
 RRULE:FREQ=DAILY;COUNT=100
 EXDATE:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite4/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite4/1.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite4/1.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,12 +6,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -20,12 +20,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,12 +34,12 @@
 DTSTART:20060102T000000Z
 DTEND:20060102T010000Z
 RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -48,12 +48,12 @@
 DTSTART:20060103T000000Z
 DTEND:20060103T010000Z
 RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite4/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite4/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,12 +6,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -20,12 +20,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,12 +34,12 @@
 DTSTART:20060102T000000Z
 DTEND:20060102T010000Z
 RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -48,12 +48,12 @@
 DTSTART:20060103T000000Z
 DTEND:20060103T010000Z
 RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -62,12 +62,12 @@
 DTSTART:20060105T000000Z
 DTEND:20060105T010000Z
 RECURRENCE-ID:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite4/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite4/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:TRANSPARENT
 END:VEVENT
@@ -21,13 +21,13 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -36,13 +36,13 @@
 DTSTART:20060102T000000Z
 DTEND:20060102T010000Z
 RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -51,13 +51,13 @@
 DTSTART:20060103T000000Z
 DTEND:20060103T010000Z
 RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT
@@ -66,13 +66,13 @@
 DTSTART:20060105T000000Z
 DTEND:20060105T010000Z
 RECURRENCE-ID:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 1
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite6/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite6/1.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite6/1.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,12 +6,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -20,12 +20,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,12 +34,12 @@
 DTSTART:20060102T000000Z
 DTEND:20060102T010000Z
 RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -48,12 +48,12 @@
 DTSTART:20060103T000000Z
 DTEND:20060103T010000Z
 RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite6/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite6/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,12 +6,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -20,12 +20,12 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -34,12 +34,12 @@
 DTSTART:20060102T000000Z
 DTEND:20060102T010000Z
 RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -48,12 +48,12 @@
 DTSTART:20060103T000000Z
 DTEND:20060103T010000Z
 RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -62,12 +62,12 @@
 DTSTART:20060105T000000Z
 DTEND:20060105T010000Z
 RECURRENCE-ID:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto6/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto6/suite6/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto6/suite6/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -6,13 +6,13 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RRULE:FREQ=DAILY;COUNT=100
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -21,13 +21,13 @@
 DTSTART:20060101T000000Z
 DTEND:20060101T010000Z
 RECURRENCE-ID:20060101T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -36,13 +36,13 @@
 DTSTART:20060102T000000Z
 DTEND:20060102T010000Z
 RECURRENCE-ID:20060102T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -51,13 +51,13 @@
 DTSTART:20060103T000000Z
 DTEND:20060103T010000Z
 RECURRENCE-ID:20060103T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT
@@ -66,13 +66,13 @@
 DTSTART:20060105T000000Z
 DTEND:20060105T010000Z
 RECURRENCE-ID:20060105T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;PARTSTAT=ACCEPTED;CN=$resourcename1::$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:Blocking event - 2
 TRANSP:OPAQUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite1/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite1/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -4,14 +4,14 @@
 BEGIN:VEVENT
 UID:event-1
 DTSTART:20060208
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite1/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite1/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -4,13 +4,13 @@
 BEGIN:VEVENT
 UID:event-1
 DTSTART:20060208
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite1/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite1/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -4,14 +4,14 @@
 BEGIN:VEVENT
 UID:event-1
 DTSTART:20060208
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite2/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite2/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-2
 DTSTART:20060208T010000Z
 DTEND:20060208T020000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite2/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite2/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-2
 DTSTART:20060208T010000Z
 DTEND:20060208T020000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite2/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite2/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite2/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-2
 DTSTART:20060208T010000Z
 DTEND:20060208T020000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite3/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite3/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite3/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-3
 DTSTART:20060208T220000Z
 DTEND:20060209T020000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite3/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite3/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite3/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-3
 DTSTART:20060208T220000Z
 DTEND:20060209T020000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite3/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite3/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite3/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-3
 DTSTART:20060208T220000Z
 DTEND:20060209T020000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite4/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite4/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite4/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-4
 DTSTART:20060209T120000Z
 DTEND:20060209T130000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite4/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite4/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite4/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-4
 DTSTART:20060209T120000Z
 DTEND:20060209T130000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite4/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite4/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite4/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,14 +5,14 @@
 UID:event-4
 DTSTART:20060209T120000Z
 DTEND:20060209T130000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite5/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite5/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite5/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -4,14 +4,14 @@
 BEGIN:VEVENT
 UID:event-5
 DTSTART:20060209
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite5/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite5/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite5/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -4,13 +4,13 @@
 BEGIN:VEVENT
 UID:event-5
 DTSTART:20060209
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite5/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite5/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite5/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -4,14 +4,14 @@
 BEGIN:VEVENT
 UID:event-5
 DTSTART:20060209
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite6/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite6/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite6/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -4,14 +4,14 @@
 BEGIN:VEVENT
 UID:event-6
 DTSTART:20060209
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE
@@ -21,14 +21,14 @@
 UID:event-6
 DTSTART:20060209
 RECURRENCE-ID:20060209
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ;Scheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Success":$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite6/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite6/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite6/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -4,13 +4,13 @@
 BEGIN:VEVENT
 UID:event-6
 DTSTART:20060209
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT
@@ -21,13 +21,13 @@
 UID:event-6
 DTSTART:20060209
 RECURRENCE-ID:20060209
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/auto7/suite6/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto7/suite6/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/auto7/suite6/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -4,14 +4,14 @@
 BEGIN:VEVENT
 UID:event-6
 DTSTART:20060209
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE
@@ -21,14 +21,14 @@
 UID:event-6
 DTSTART:20060209
 RECURRENCE-ID:20060209
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2
- ;Scheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ ;Scheduling message has been delivered";EMAIL=$email1::$cuaddrurn1:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/non-recurring-delete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/non-recurring-delete/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/non-recurring-delete/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/non-recurring-remove/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/non-recurring-remove/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/non-recurring-remove/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event6 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 6
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/partial-delete-some/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/partial-delete-some/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/partial-delete-some/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 5
 END:VEVENT
 BEGIN:VEVENT
@@ -37,11 +37,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060104T100000
 DTSTART;TZID=US/Eastern:20060104T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 5
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 10
 END:VEVENT
 BEGIN:VEVENT
@@ -37,11 +37,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060104T100000
 DTSTART;TZID=US/Eastern:20060104T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 10
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/partial-remove-some/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 10
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-delete-all/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-delete-all/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-delete-all/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 STATUS:CANCELLED
 RRULE:FREQ=DAILY;COUNT=5

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-delete-some/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-delete-some/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-delete-some/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 STATUS:CANCELLED
 RRULE:FREQ=DAILY;COUNT=5
@@ -38,11 +38,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 STATUS:CANCELLED
 END:VEVENT
@@ -51,11 +51,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060104T100000
 DTSTART;TZID=US/Eastern:20060104T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-all/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-all/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-all/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event7 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 7
 STATUS:CANCELLED
 RRULE:FREQ=DAILY;COUNT=5

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-some/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-some/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-some/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event8 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 8
 RRULE:FREQ=DAILY;COUNT=5
 END:VEVENT
@@ -37,11 +37,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 8
 END:VEVENT
 BEGIN:VEVENT
@@ -49,11 +49,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060104T100000
 DTSTART;TZID=US/Eastern:20060104T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 8
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=WEEKLY;COUNT=52
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -42,9 +42,9 @@
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=WEEKLY;COUNT=52
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -42,9 +42,9 @@
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
@@ -56,9 +56,9 @@
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090413T150000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 STATUS:CANCELLED
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/recurring-remove-twice/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 9
 UID:event9 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=WEEKLY;COUNT=52
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -42,9 +42,9 @@
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090330T150000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT
@@ -56,9 +56,9 @@
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090413T150000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 STATUS:CANCELLED
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -71,9 +71,9 @@
 SUMMARY:event 9
 UID:event9 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20090406T150000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 STATUS:CANCELLED
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/cancels/still-cancelled/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/still-cancelled/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/still-cancelled/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event8 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 8
 RRULE:FREQ=DAILY;COUNT=5
 END:VEVENT
@@ -37,11 +37,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060104T100000
 DTSTART;TZID=US/Eastern:20060104T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 8
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/cancels/still-cancelled/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/cancels/still-cancelled/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/cancels/still-cancelled/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event8 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 8
 RRULE:FREQ=DAILY;COUNT=5
 END:VEVENT
@@ -37,11 +37,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 8
 END:VEVENT
 BEGIN:VEVENT
@@ -49,11 +49,11 @@
 RECURRENCE-ID;TZID=US/Eastern:20060104T100000
 DTSTART;TZID=US/Eastern:20060104T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 8
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,10 +24,10 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
@@ -36,12 +36,12 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ vered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/oneinstance-rewrite/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,10 +24,10 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
@@ -36,12 +36,12 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/organizer-merge/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
@@ -38,12 +38,12 @@
 RECURRENCE-ID;TZID=US/Eastern:20060101T100000
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,10 +24,10 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
@@ -36,12 +36,12 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -49,12 +49,12 @@
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -39,11 +39,11 @@
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ vered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -38,12 +38,12 @@
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ vered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/compatibility/twoinstance-rewrite/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,10 +24,10 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
@@ -36,12 +36,12 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -49,12 +49,12 @@
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/deletecalendar/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/deletecalendar/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event5 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/deletecalendar/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/deletecalendar/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/deletecalendar/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/deletecalendar/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event5 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/dropbox/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/dropbox/10.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/dropbox/10.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 ATTACH;VALUE=URI:$host:$dropboxpath1:/
  6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist

Modified: CalDAVTester/trunk/Resource/implicit/dropbox/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/dropbox/11.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/dropbox/11.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ vered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-APPLE-DROPBOX:$dropboxpath1:/6073432E-644B-4965-B6F7
  -C3F08E70BBF9.dropbox

Modified: CalDAVTester/trunk/Resource/implicit/dropbox/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/dropbox/12.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/dropbox/12.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ vered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 ATTACH;VALUE=URI:$host:$dropboxpath1:/
  6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd-2.plist

Modified: CalDAVTester/trunk/Resource/implicit/dropbox/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/dropbox/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/dropbox/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 ATTACH;VALUE=URI:$host:$dropboxpath1:/
  6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist

Modified: CalDAVTester/trunk/Resource/implicit/dropbox/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/dropbox/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/dropbox/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/dropbox/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/dropbox/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/dropbox/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 ATTACH;VALUE=URI:$host:$dropboxpath1:/
  6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist

Modified: CalDAVTester/trunk/Resource/implicit/dropbox/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/dropbox/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/dropbox/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 ATTACH;VALUE=URI:$host:$dropboxpath1:/
  6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist

Modified: CalDAVTester/trunk/Resource/implicit/dropbox/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/dropbox/9.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/dropbox/9.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;Sched
- uling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ uling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 ATTACH;VALUE=URI:$host:$dropboxpath1:/
  6073432E-644B-4965-B6F7-C3F08E70BBF9.dropbox/caldavd.plist

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/10.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/10.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;S
- uccess";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ uccess";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,9 +25,9 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 REQUEST-STATUS:2.0;Success
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/privateevents/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/privateevents/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/privateevents/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;S
- uccess";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ uccess";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/proxy/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/proxy/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username2:;EMAIL=$email2::$cuaddrurn2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/proxy/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/proxy/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,12 +5,12 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username2:;EMAIL=$email2::$cuaddrurn2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/proxy/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/proxy/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Success";
- X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username2:;EMAIL=$email2::$cuaddrurn2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/proxy/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/proxy/9.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/proxy/9.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -5,13 +5,13 @@
 UID:event-1
 DTSTART:20060208T200000Z
 DTEND:20060208T210000Z
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060110T231240Z
 DESCRIPTION:Call-in
 DTSTAMP:20060309T185105Z
 ORGANIZER;CN=$username2:;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 STATUS:CONFIRMED
 SUMMARY:Example
 TRANSP:OPAQUE

Modified: CalDAVTester/trunk/Resource/implicit/recur1/allday/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/allday/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/allday/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -28,10 +28,10 @@
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
@@ -41,9 +41,9 @@
 RECURRENCE-ID;VALUE=DATE:20060102
 SUMMARY:event 1-2
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/allday/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/allday/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/allday/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;VALUE=DATE:20060101
 DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -39,11 +39,11 @@
 DTSTART;VALUE=DATE:20060102
 DURATION:PT1H
 RECURRENCE-ID;VALUE=DATE:20060102
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1-2
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/recur1/allday/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/allday/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/allday/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -28,10 +28,10 @@
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
@@ -41,9 +41,9 @@
 RECURRENCE-ID;VALUE=DATE:20060102
 SUMMARY:event 1-2 changed
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/allday/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/allday/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/allday/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;VALUE=DATE:20060101
 DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=2
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -39,11 +39,11 @@
 DTSTART;VALUE=DATE:20060102
 DURATION:PT1H
 RECURRENCE-ID;VALUE=DATE:20060102
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1-2 changed
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 RRULE:FREQ=DAILY;COUNT=5
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 RRULE:FREQ=DAILY;COUNT=5
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 RRULE:FREQ=DAILY;COUNT=5
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/attendeedelete/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 RRULE:FREQ=DAILY;COUNT=5
 END:VEVENT
@@ -38,12 +38,12 @@
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -38,10 +38,10 @@
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -26,11 +26,11 @@
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
 EXDATE:20060102T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -38,10 +38,10 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -37,10 +37,10 @@
 DTSTART;TZID=US/Eastern:20060102T120000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T120000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -38,10 +38,10 @@
 DTSTART;TZID=US/Eastern:20060102T120000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T120000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/dtstart_change/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -26,11 +26,11 @@
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
 EXDATE:20060102T170000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -41,11 +41,11 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -28,10 +28,10 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
 X-APPLE-NEEDS-REPLY:TRUE
 TRANSP:TRANSPARENT
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
 RRULE:FREQ=DAILY;COUNT=3
 X-APPLE-NEEDS-REPLY:TRUE
 TRANSP:TRANSPARENT
@@ -42,10 +42,10 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
 X-APPLE-NEEDS-REPLY:TRUE
 TRANSP:TRANSPARENT
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -28,10 +28,10 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
 X-APPLE-NEEDS-REPLY:TRUE
 TRANSP:TRANSPARENT
 STATUS:CANCELLED

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
 RRULE:FREQ=DAILY;COUNT=3
 X-APPLE-NEEDS-REPLY:TRUE
 TRANSP:TRANSPARENT
@@ -43,10 +43,10 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
 X-APPLE-NEEDS-REPLY:TRUE
 TRANSP:TRANSPARENT
 STATUS:CANCELLED

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/10.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/10.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -41,9 +41,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/11.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/11.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -29,8 +29,8 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/12.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/12.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -42,9 +42,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/14.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/14.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 1 - master
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -41,9 +41,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/15.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/15.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -28,9 +28,9 @@
 DURATION:PT1H
 SUMMARY:event 1 - master
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -41,8 +41,8 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/16.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/16.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1 - master
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -42,9 +42,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 BEGIN:VEVENT
@@ -41,9 +41,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -29,9 +29,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;
- X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/override_request/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override_request/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override_request/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
@@ -42,9 +42,9 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/recur1/rrule/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/rrule/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/rrule/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/rrule/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/rrule/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/rrule/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/recur1/rrule/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/rrule/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/rrule/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=WEEKLY;COUNT=52;INTERVAL=1;BYDAY=MO,WE,FR;WKST=SU
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/truncation/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/truncation/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/truncation/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/truncation/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/truncation/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/truncation/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/recur1/truncation/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/truncation/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/truncation/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060201T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -38,12 +38,12 @@
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -51,12 +51,12 @@
 DTSTART;TZID=US/Eastern:20060105T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060105T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/truncation/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/truncation/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/truncation/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -37,11 +37,11 @@
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/truncation/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/truncation/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/truncation/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -38,12 +38,12 @@
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/recur1/truncation/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/truncation/9.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/recur1/truncation/9.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 RRULE:FREQ=DAILY;UNTIL=20060104T150000Z
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -37,11 +37,11 @@
 DTSTART;TZID=US/Eastern:20060103T100000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060103T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/11.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/11.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
- uccess";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ uccess";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/14.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/14.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060102T100000
 LAST-MODIFIED:20051222T215953Z
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
- uccess";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ uccess";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T215953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 4
 UID:event4 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 BEGIN:VALARM
 ACTION:DISPLAY
 DESCRIPTION:Alarm for Organizer!

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/alarms/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/alarms/9.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/alarms/9.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event4 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/attendeedelete/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/duplicate-attendee/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -28,19 +28,19 @@
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 SUMMARY:event 2
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 END:VEVENT
 BEGIN:VEVENT
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T110000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2.1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;TZID=US/Eastern:20060102T110000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2.1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,7 +27,7 @@
 RRULE:FREQ=DAILY;COUNT=3
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 END:VEVENT
 BEGIN:VEVENT
@@ -35,12 +35,12 @@
 DTSTART;TZID=US/Eastern:20060102T110000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2.1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-organizer/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,14 +25,14 @@
 DTSTART;TZID=US/Eastern:20060102T110000
 DURATION:PT1H
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=user01 at exampl
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=user01 at exampl
  e.com:$cuaddrurn1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=use
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;EMAIL=use
  r02 at example.com:$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=user01 at example.com:$cuaddrurn1:
+ vered";EMAIL=user01 at example.com:$cuaddrurn1:
 SUMMARY:event 2.1
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-FOOBAR:My X-property is here
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/no-x-properties/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-FOOBAR:My X-property is here
 X-BARFOO:Another X-property here

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/organizerdelete/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=user01 at exampl
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=user01 at exampl
  e.com:$cuaddrurn1:
-ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=use
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED;EMAIL=use
  r02 at example.com:$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=User 01;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=user01 at example.com:$cuaddrurn1:
+ vered";EMAIL=user01 at example.com:$cuaddrurn1:
 SUMMARY:event 2
 STATUS:CANCELLED
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 4-1
 UID:event4-1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 RRULE:FREQ=DAILY;COUNT=3
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4-1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event4-1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 4-1
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,10 +27,10 @@
 DURATION:PT1H
 SUMMARY:event 4-1 changed
 UID:event4-1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 RRULE:FREQ=DAILY;COUNT=3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/9.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/recurring-alarms/9.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event4-1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=user01 at example.com:$cuaddrurn1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=user02 at example.com:$cuaddrurn2:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=user01 at example.com:$cuaddrurn1:
+ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=user02 at example.com:$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01;X-CALENDARSERVER-EMAIL=user01 at example.com:$cuaddrurn1:
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:$cuaddrurn1:
 SUMMARY:event 4-1 changed
 RRULE:FREQ=DAILY;COUNT=3
 TRANSP:TRANSPARENT
@@ -38,11 +38,11 @@
 UID:event4-1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=user01 at example.com:$cuaddrurn1:
-ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=user02 at example.com:$cuaddrurn2:
+ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED;EMAIL=user01 at example.com:$cuaddrurn1:
+ATTENDEE;CN=User 02;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=user02 at example.com:$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=User 01;X-CALENDARSERVER-EMAIL=user01 at example.com:$cuaddrurn1:
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:$cuaddrurn1:
 SUMMARY:event 4-1 changed
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/11.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/11.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/simple/9.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/simple/9.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -28,8 +28,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,8 +27,8 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -28,8 +28,8 @@
 SUMMARY:event 1
 UID:event1 at ninevah.local
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ vered";EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060401T150000
 DTEND;TZID=US/Eastern:20060401T160000
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,11 +25,11 @@
 DTSTART;TZID=US/Eastern:20060401T150000
 DTEND;TZID=US/Eastern:20060401T160000
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060401T150000
 DTEND;TZID=US/Eastern:20060401T160000
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/dstshift/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060401T150000
 DTEND;TZID=US/Eastern:20060401T160000
 RRULE:FREQ=DAILY;INTERVAL=1;COUNT=14
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 BEGIN:VEVENT
@@ -38,12 +38,12 @@
 DTSTART;TZID=US/Eastern:20060402T150000
 DTEND;TZID=US/Eastern:20060402T160000
 RECURRENCE-ID;TZID=US/Eastern:20060402T150000
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/10.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/10.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=DECLINED;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scenario2/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scenario2/simple/9.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scenario2/simple/9.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ ss";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/10.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/10.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,13 +24,13 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
-ATTENDEE;CN=$username4:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email4::$cuaddrurn4:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username4:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/12.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/12.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,13 +24,13 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/13.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/13.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
-ATTENDEE;CN=$username4:;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email4::$cuaddrurn4:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username4:;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/3.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/3.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,13 +24,13 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
-ATTENDEE;CN=$username4:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email4::$cuaddrurn4:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username4:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/5.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/5.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,15 +24,15 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
-ATTENDEE;CN=$username4:;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email4::$cuaddrurn4:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username4:;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,13 +24,13 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
-ATTENDEE;CN=$username4:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email4::$cuaddrurn4:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username4:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,15 +24,15 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-AGENT=CLIENT;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;SCHEDULE-AGENT=SERVER;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
-ATTENDEE;CN=$username4:;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email4::$cuaddrurn4:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username4:;SCHEDULE-AGENT=NONE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/9.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduleagent/simple/9.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,13 +24,13 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
-ATTENDEE;CN=$username4:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email4::$cuaddrurn4:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username4:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email4::$cuaddrurn4:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/13.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/14.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,10 +25,10 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/17.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 CREATED:20060101T151000Z
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/20.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -26,10 +26,10 @@
 DTSTART;TZID=US/Eastern:20060101T140000
 DURATION:PT1H
 ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ vered";CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
 SUMMARY:event 1
 UID:event1 at ninevah.local
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/8.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/scheduletag/organizerreinvite/8.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1 - changed
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/security/attendeepartycrash/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/security/attendeepartycrash/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/security/attendeepartycrash/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/security/attendeepartycrash/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/security/attendeepartycrash/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/security/attendeepartycrash/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/security/attendeeswitchorganizer/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/security/attendeeswitchorganizer/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/security/attendeeswitchorganizer/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/security/attendeeswitchorganizer/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/security/attendeeswitchorganizer/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/security/attendeeswitchorganizer/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/security/organizerforgery/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/security/organizerforgery/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/security/organizerforgery/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/implicit/security/organizerforgery/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/security/organizerforgery/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/security/organizerforgery/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/implicit/security/organizerforgery/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/security/organizerforgery/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/implicit/security/organizerforgery/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -25,12 +25,12 @@
 DTSTART;TZID=US/Eastern:20060101T120000
 DURATION:PT1H
 ATTENDEE;CN=$username1:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="5.3;O
- rganizer change not allowed";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ rganizer change not allowed";EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="5.3;O
- rganizer change not allowed";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ rganizer change not allowed";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username3:;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ORGANIZER;CN=$username3:;EMAIL=$email3::$cuaddrurn3:
 SUMMARY:spoofed event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/11.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/11.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted - again!

Modified: CalDAVTester/trunk/Resource/privatecomments/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/13.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/13.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:

Modified: CalDAVTester/trunk/Resource/privatecomments/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/14.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/14.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/privatecomments/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/16.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/16.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ ss";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:

Modified: CalDAVTester/trunk/Resource/privatecomments/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/17.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/17.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-CALENDARSERVER-PRIVATE-COMMENT:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/19.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/19.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 RRULE:FREQ=DAILY;COUNT=10
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/2.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/2.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/20.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/20.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 RRULE:FREQ=DAILY;COUNT=10
 TRANSP:TRANSPARENT

Modified: CalDAVTester/trunk/Resource/privatecomments/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/22.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/22.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 RRULE:FREQ=DAILY;COUNT=10
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
@@ -40,12 +40,12 @@
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have declined this one. So 

Modified: CalDAVTester/trunk/Resource/privatecomments/24.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/24.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/24.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ ss";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have declined!

Modified: CalDAVTester/trunk/Resource/privatecomments/25.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/25.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/25.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,13 +24,13 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=ACCEPTED;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ vered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-CALENDARSERVER-PRIVATE-COMMENT:Hey this looks cool
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/27.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/27.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/27.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ cheduling message has been delivered";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/28.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/28.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/28.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/privatecomments/30.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/30.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/30.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";CN=$username1:;
- X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/32.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/32.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/32.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli
- vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ vered";EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/34.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/34.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/34.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
 ORGANIZER;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";CN=$username1:;
- X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-CALENDARSERVER-PRIVATE-COMMENT:
 END:VEVENT

Modified: CalDAVTester/trunk/Resource/privatecomments/35.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/35.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/35.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:

Modified: CalDAVTester/trunk/Resource/privatecomments/37.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/37.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/37.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:

Modified: CalDAVTester/trunk/Resource/privatecomments/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/38.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/38.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,11 +24,11 @@
 UID:event3 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 3
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:Add something here.

Modified: CalDAVTester/trunk/Resource/privatecomments/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/4.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/4.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/privatecomments/41.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/41.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/41.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 RRULE:FREQ=DAILY;COUNT=10
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
@@ -40,12 +40,12 @@
 RECURRENCE-ID;TZID=US/Eastern:20060102T100000
 DTSTART;TZID=US/Eastern:20060102T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 2
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have declined this one - no reason.

Modified: CalDAVTester/trunk/Resource/privatecomments/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/6.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/6.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/privatecomments/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/7.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/7.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,12 +24,12 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 TRANSP:TRANSPARENT
 X-APPLE-NEEDS-REPLY:TRUE

Modified: CalDAVTester/trunk/Resource/privatecomments/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/9.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privatecomments/9.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -24,14 +24,14 @@
 UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
- ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ ss";EMAIL=$email2::$cuaddrurn2:
 ATTENDEE;CN=$username3:;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
- cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+ cheduling message has been delivered";EMAIL=$email3::$cuaddrurn3:
 CREATED:20060101T150000Z
 DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event 1
 X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
  ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted!

Modified: CalDAVTester/trunk/Resource/privateevents/28.xml
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/28.xml	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privateevents/28.xml	2009-06-18 16:32:30 UTC (rev 4358)
@@ -7,7 +7,7 @@
 <C:comp-filter name="VCALENDAR">
 <C:comp-filter name="VEVENT">
 <C:prop-filter name="ORGANIZER">
-<C:param-filter name="X-CALENDARSERVER-EMAIL">
+<C:param-filter name="EMAIL">
 <C:text-match>example</C:text-match>
 </C:param-filter>
 </C:prop-filter>

Modified: CalDAVTester/trunk/Resource/privateevents/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/38.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privateevents/38.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -55,10 +55,10 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2;Scheduling mess
- age has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ age has been delivered";EMAIL=$email2::$cuaddrurn2:
 DTSTAMP:20051222T205953Z
 LOCATION:confidential 1
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event confidential access 1
 BEGIN:VALARM
 ACTION:DISPLAY
@@ -71,10 +71,10 @@
 DTSTART;TZID=US/Eastern:20060101T100000
 DURATION:PT1H
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2;Scheduling mess
- age has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ age has been delivered";EMAIL=$email2::$cuaddrurn2:
 DTSTAMP:20051222T205953Z
 LOCATION:restricted 1
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 SUMMARY:event restricted access 1
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/privateevents/49.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/49.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privateevents/49.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event confidential access 2
 LOCATION:confidential 2
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";
- X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ EMAIL=$email2::$cuaddrurn2:
 UID:54E181BC7CCC373042B28842FFC-40 at ninevah.local
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/privateevents/50.ics
===================================================================
--- CalDAVTester/trunk/Resource/privateevents/50.ics	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/Resource/privateevents/50.ics	2009-06-18 16:32:30 UTC (rev 4358)
@@ -27,9 +27,9 @@
 DURATION:PT1H
 SUMMARY:event restricted access 2
 LOCATION:restricted 2
-ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;SCHEDULE-STATUS="1.2;Scheduling message has been delivered";
- X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ EMAIL=$email2::$cuaddrurn2:
 UID:54E181BC7CCC373042B28842FFD-42 at ninevah.local
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/scripts/tests/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privateevents.xml	2009-06-17 23:44:41 UTC (rev 4357)
+++ CalDAVTester/trunk/scripts/tests/privateevents.xml	2009-06-18 16:32:30 UTC (rev 4358)
@@ -1182,7 +1182,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 1</value>
 						<value>LOCATION:confidential 1</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -1408,7 +1408,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -1532,7 +1532,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 1</value>
 						<value>LOCATION:restricted 1</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -1761,7 +1761,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2028,7 +2028,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2059,8 +2059,8 @@
 						<name>notcontains</name>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2091,8 +2091,8 @@
 						<name>notcontains</name>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2123,7 +2123,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2154,8 +2154,8 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2186,8 +2186,8 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2217,7 +2217,7 @@
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -2252,8 +2252,8 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2284,8 +2284,8 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2315,7 +2315,7 @@
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -2350,8 +2350,8 @@
 					<arg>
 						<name>notcontains</name>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2382,8 +2382,8 @@
 					<arg>
 						<name>notcontains</name>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2562,7 +2562,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2593,8 +2593,8 @@
 						<name>notcontains</name>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2625,8 +2625,8 @@
 						<name>notcontains</name>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2657,7 +2657,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2688,8 +2688,8 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2720,8 +2720,8 @@
 					</arg>
 					<arg>
 						<name>notcontains</name>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2751,7 +2751,7 @@
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -2786,8 +2786,8 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2818,8 +2818,8 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2849,7 +2849,7 @@
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -2884,8 +2884,8 @@
 					<arg>
 						<name>notcontains</name>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -2916,8 +2916,8 @@
 					<arg>
 						<name>notcontains</name>
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
-						<value>ATTENDEE;CN=$username2:;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ATTENDEE;CN=$username2:;EMAIL=$email2::$cuaddrurn2:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -4156,7 +4156,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -4183,7 +4183,7 @@
 						<value>VERSION:2.0</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 					<arg>
@@ -4263,7 +4263,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event confidential access 2</value>
 						<value>LOCATION:confidential 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
@@ -4291,7 +4291,7 @@
 						<value>DTSTART;TZID=US/Eastern:20060101T100000</value>
 						<value>SUMMARY:event restricted access 2</value>
 						<value>LOCATION:restricted 2</value>
-						<value>ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:</value>
+						<value>ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:</value>
 						<value>BEGIN:VALARM</value>
 					</arg>
 				</verify>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090618/f5f032da/attachment-0001.html>
