diff --git a/inc/caldav-REPORT-calquery.php b/inc/caldav-REPORT-calquery.php
index af5f7e92..4c63eb6e 100644
--- a/inc/caldav-REPORT-calquery.php
+++ b/inc/caldav-REPORT-calquery.php
@@ -230,7 +230,15 @@ function BuildSqlFilter( $filter ) {
 
 $responses = array();
 
-$where = " WHERE caldav_data.dav_name ~ ".qpg("^".$request->path)." ";
+/**
+* FIXME: Once we are past DB version 1.2.1 we can change this query more radically.  The best performance to
+* date seems to be:
+*   SELECT caldav_data.*,calendar_item.* FROM collection JOIN calendar_item USING (collection_id,user_no)
+*         JOIN caldav_data USING (dav_id) WHERE collection.dav_name = '/user1/home/'
+*              AND caldav_data.caldav_type = 'VEVENT' ORDER BY caldav_data.user_no, caldav_data.dav_name;
+*/
+
+$where = " WHERE caldav_data.user_no = $request->user_no AND caldav_data.dav_name ~ ".qpg("^".$request->path)." ";
 if ( is_array($qry_filters) ) {
   dbg_log_array( "calquery", "qry_filters", $qry_filters, true );
   $where .= BuildSqlFilter( $qry_filters );
@@ -243,7 +251,9 @@ if ( isset($c->hide_TODO) && $c->hide_TODO && ! $request->AllowedTo('all') ) {
   $where .= "AND caldav_data.caldav_type NOT IN ('VTODO') ";
 }
 
-$qry = new PgQuery( "SELECT * FROM caldav_data INNER JOIN calendar_item USING(user_no, dav_name)". $where . " ORDER BY caldav_data.user_no, caldav_data.dav_name" );
+$sql = "SELECT * FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name)". $where;
+if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= " ORDER BY dav_id";
+$qry = new PgQuery( $sql );
 if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows > 0 ) {
   while( $calendar_object = $qry->Fetch() ) {
     if ( !$need_post_filter || apply_filter( $qry_filters, $calendar_object ) ) {
diff --git a/testing/tests/regression-suite/105-Evo-REPORT-1.result b/testing/tests/regression-suite/105-Evo-REPORT-1.result
index 71e5b574..d1b8ec66 100644
--- a/testing/tests/regression-suite/105-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/105-Evo-REPORT-1.result
@@ -1,21 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "278939915085a441aa95fa319fc3bb3a"
+ETag: "ca51ab493acbf1f9847c2cd95ef33026"
 Content-Length: 552
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <response>
-  <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
   <propstat>
@@ -25,4 +16,13 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/107-Evo-REPORT-1.result b/testing/tests/regression-suite/107-Evo-REPORT-1.result
index e7f99b77..effa59ec 100644
--- a/testing/tests/regression-suite/107-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/107-Evo-REPORT-1.result
@@ -1,21 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "83ce5baee07017b4b40318062103c2ce"
+ETag: "060f992b9ee715662940929074dc1f57"
 Content-Length: 530
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <response>
-  <href>/user1/home/20061101T073004Z.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
   <propstat>
@@ -25,4 +16,13 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/user1/home/20061101T073004Z.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/108-Evo-REPORT-1.result b/testing/tests/regression-suite/108-Evo-REPORT-1.result
index 9038e8bc..7d995359 100644
--- a/testing/tests/regression-suite/108-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/108-Evo-REPORT-1.result
@@ -1,21 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "9f89b851745eccbc4d1da3bf3f0bb9c7"
+ETag: "d937ad45e618e42c4cd4a78932f2debd"
 Content-Length: 570
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <response>
-  <href>/calendar/caldav.php/user1/home/20061101T073004Z.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>/calendar/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
   <propstat>
@@ -25,4 +16,13 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/calendar/caldav.php/user1/home/20061101T073004Z.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/203-Moz-REPORT-2.result b/testing/tests/regression-suite/203-Moz-REPORT-2.result
index c1f39df6..4e4e9650 100644
--- a/testing/tests/regression-suite/203-Moz-REPORT-2.result
+++ b/testing/tests/regression-suite/203-Moz-REPORT-2.result
@@ -1,12 +1,54 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "6df625ac708940d88e7e400fa0cd2092"
+ETag: "8934fd37910f21f30796db44716c7ca5"
 Content-Length: 2390
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
+ <response>
+  <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:New Zealand Standard Time
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20061102T090217Z
+DTSTART;TZID=New Zealand Standard Time:20061102T123000
+DURATION:PT1H
+LAST-MODIFIED:20061104T002921Z
+SEQUENCE:1
+SUMMARY:Lunch with David
+UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
+END:VEVENT
+END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
   <propstat>
@@ -51,48 +93,6 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
-</calendar-data>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
-  <propstat>
-   <prop>
-    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20061102T090217Z
-DTSTART;TZID=New Zealand Standard Time:20061102T123000
-DURATION:PT1H
-LAST-MODIFIED:20061104T002921Z
-SEQUENCE:1
-SUMMARY:Lunch with David
-UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
-END:VEVENT
-END:VCALENDAR
 </calendar-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result b/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result
index ce3399e9..d02a0701 100644
--- a/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result
+++ b/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result
@@ -1,58 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "4a177807973966b4873ffa2f0080b4a1"
+ETag: "532e1a9f851cc9b778320e16e9936baa"
 Content-Length: 4224
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <response>
-  <href>/calendar/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"00ad5eb1eb5507884710b0b66aa5d5c4"</getetag>
-    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
-PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTODO
-CREATED:20070805T201647Z
-LAST-MODIFIED:20070805T201834Z
-DTSTAMP:20070805T201647Z
-UID:0575d895-a006-4ed8-9be6-0d1b6b6b1f96
-SUMMARY:Due 7/8/7 16:30\, completed
-STATUS:COMPLETED
-DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070807T163000
-COMPLETED:20070805T201737Z
-PERCENT-COMPLETE:100
-X-MOZ-LOCATIONPATH:0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
-DESCRIPTION:Due on 7/8/7 at 4:30pm\, but completed alread on 6/8/7
-CATEGORIES:Projects
-END:VTODO
-END:VCALENDAR
-</calendar-data>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>/calendar/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
   <propstat>
@@ -98,6 +52,52 @@ DESCRIPTION:This task is in progress (50% complete) and has not been
  cancelled.
 END:VTODO
 END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/calendar/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"00ad5eb1eb5507884710b0b66aa5d5c4"</getetag>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTODO
+CREATED:20070805T201647Z
+LAST-MODIFIED:20070805T201834Z
+DTSTAMP:20070805T201647Z
+UID:0575d895-a006-4ed8-9be6-0d1b6b6b1f96
+SUMMARY:Due 7/8/7 16:30\, completed
+STATUS:COMPLETED
+DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070807T163000
+COMPLETED:20070805T201737Z
+PERCENT-COMPLETE:100
+X-MOZ-LOCATIONPATH:0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
+DESCRIPTION:Due on 7/8/7 at 4:30pm\, but completed alread on 6/8/7
+CATEGORIES:Projects
+END:VTODO
+END:VCALENDAR
 </calendar-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/900-Moz-REPORT.result b/testing/tests/regression-suite/900-Moz-REPORT.result
index 60c82457..57c0603b 100644
--- a/testing/tests/regression-suite/900-Moz-REPORT.result
+++ b/testing/tests/regression-suite/900-Moz-REPORT.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "fea25d8795124283031b5cb5ecb29b04"
+ETag: "66f362ee8f18d43b5d6c28a036289067"
 Keep-Alive: timeout=15, max=100
 Connection: Keep-Alive
 Transfer-Encoding: chunked
@@ -9,6 +9,96 @@ Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
+ <response>
+  <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
+VERSION:2.0
+BEGIN:VEVENT
+CREATED:20061120T041336Z
+LAST-MODIFIED:20061120T041709Z
+DTSTAMP:20061120T041709Z
+UID:4aaf8f37-f232-4c8e-a72e-e171d4c4fe54
+SUMMARY:Weekly Project Meeting
+PRIORITY:0
+CLASS:PUBLIC
+RRULE:FREQ=WEEKLY;COUNT=26;INTERVAL=1;BYDAY=TH
+DTSTART;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061102T100000
+DTEND;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061102T110000
+CATEGORIES:Projects
+X-MOZ-LOCATIONPATH:4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Pacific/Auckland
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
+VERSION:2.0
+BEGIN:VEVENT
+CREATED:20061223T032350Z
+LAST-MODIFIED:20061223T033144Z
+DTSTAMP:20061223T033144Z
+UID:9d050be7-8a02-4355-8ed3-02a9fc5f473f
+SUMMARY:Confidential Event
+PRIORITY:0
+STATUS:CONFIRMED
+CLASS:CONFIDENTIAL
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T160000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
+X-MOZ-LOCATIONPATH:9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics
+LOCATION:In a confidential place
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
   <propstat>
@@ -56,45 +146,94 @@ END:VCALENDAR
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
+  <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
   <propstat>
    <prop>
-    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
-PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
-VERSION:2.0
-BEGIN:VEVENT
-CREATED:20061120T041336Z
-LAST-MODIFIED:20061120T041709Z
-DTSTAMP:20061120T041709Z
-UID:4aaf8f37-f232-4c8e-a72e-e171d4c4fe54
-SUMMARY:Weekly Project Meeting
-PRIORITY:0
-CLASS:PUBLIC
-RRULE:FREQ=WEEKLY;COUNT=26;INTERVAL=1;BYDAY=TH
-DTSTART;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061102T100000
-DTEND;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061102T110000
-CATEGORIES:Projects
-X-MOZ-LOCATIONPATH:4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics
-END:VEVENT
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20050126_1/Pacific/Auckland
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
+VERSION:2.0
+BEGIN:VEVENT
+CREATED:20061223T051646Z
+LAST-MODIFIED:20061223T051713Z
+DTSTAMP:20061223T051713Z
+UID:fbd57454-d966-4a14-8341-abe1edb1ae66
+SUMMARY:Tentative Event
+STATUS:TENTATIVE
+CLASS:PUBLIC
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T190000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T210000
+X-MOZ-LOCATIONPATH:fbd57454-d966-4a14-8341-abe1edb1ae66.ics
+LOCATION:Never never land
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20071203T202630Z
+LAST-MODIFIED:20071203T202834Z
+DTSTAMP:20071203T202630Z
+UID:e70576e9-c1e0-431e-a507-0386fd82f223
+SUMMARY:Morning Meeting
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,TH
+DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071211T074500
+DTEND;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071211T083000
+X-MOZ-LOCATIONPATH:e70576e9-c1e0-431e-a507-0386fd82f223.ics
+LOCATION:Suzies Coffee Lounge
+DESCRIPTION:Twice-weekly breakfast meeting
+CATEGORIES:Business
+BEGIN:VALARM
+TRIGGER;VALUE=DURATION:-PT10M
+DESCRIPTION:Mozilla Alarm: Morning Meeting
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR
 </calendar-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -141,45 +280,23 @@ END:VCALENDAR
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
+  <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
   <propstat>
    <prop>
-    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
-PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
-VERSION:2.0
-BEGIN:VEVENT
-CREATED:20061223T032350Z
-LAST-MODIFIED:20061223T033144Z
-DTSTAMP:20061223T033144Z
-UID:9d050be7-8a02-4355-8ed3-02a9fc5f473f
-SUMMARY:Confidential Event
-PRIORITY:0
-STATUS:CONFIRMED
-CLASS:CONFIDENTIAL
-DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T160000
-DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
-X-MOZ-LOCATIONPATH:9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics
-LOCATION:In a confidential place
-END:VEVENT
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:da81c0ee-7871-11db-c6d6-f6927c144649
+DTSTART:20061103T073000
+DTEND:20061103T093000
+DESCRIPTION:
+LOCATION:Olivia's
+RRULE:FREQ=MONTHLY
+STATUS:CONFIRMED
+SUMMARY:Morning Mgmt Mtg
+END:VEVENT
+END:VCALENDAR
 </calendar-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -235,123 +352,6 @@ ATTACH;VALUE=URI:Basso
 END:VALARM
 END:VEVENT
 END:VCALENDAR
-</calendar-data>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
-  <propstat>
-   <prop>
-    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:da81c0ee-7871-11db-c6d6-f6927c144649
-DTSTART:20061103T073000
-DTEND:20061103T093000
-DESCRIPTION:
-LOCATION:Olivia's
-RRULE:FREQ=MONTHLY
-STATUS:CONFIRMED
-SUMMARY:Morning Mgmt Mtg
-END:VEVENT
-END:VCALENDAR
-</calendar-data>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
-  <propstat>
-   <prop>
-    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
-PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20071203T202630Z
-LAST-MODIFIED:20071203T202834Z
-DTSTAMP:20071203T202630Z
-UID:e70576e9-c1e0-431e-a507-0386fd82f223
-SUMMARY:Morning Meeting
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,TH
-DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071211T074500
-DTEND;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071211T083000
-X-MOZ-LOCATIONPATH:e70576e9-c1e0-431e-a507-0386fd82f223.ics
-LOCATION:Suzies Coffee Lounge
-DESCRIPTION:Twice-weekly breakfast meeting
-CATEGORIES:Business
-BEGIN:VALARM
-TRIGGER;VALUE=DURATION:-PT10M
-DESCRIPTION:Mozilla Alarm: Morning Meeting
-ACTION:DISPLAY
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-</calendar-data>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
-  <propstat>
-   <prop>
-    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
-PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
-VERSION:2.0
-BEGIN:VEVENT
-CREATED:20061223T051646Z
-LAST-MODIFIED:20061223T051713Z
-DTSTAMP:20061223T051713Z
-UID:fbd57454-d966-4a14-8341-abe1edb1ae66
-SUMMARY:Tentative Event
-STATUS:TENTATIVE
-CLASS:PUBLIC
-DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T190000
-DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T210000
-X-MOZ-LOCATIONPATH:fbd57454-d966-4a14-8341-abe1edb1ae66.ics
-LOCATION:Never never land
-END:VEVENT
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
 </calendar-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>