diff --git a/inc/caldav-PUT-functions.php b/inc/caldav-PUT-functions.php
index 8ad8bc64..baea504c 100644
--- a/inc/caldav-PUT-functions.php
+++ b/inc/caldav-PUT-functions.php
@@ -237,7 +237,7 @@ function handle_schedule_request( $ical ) {
  	$deliver_path = preg_replace ( '/^.*caldav.php/','', $request->principal->schedule_inbox_url );
   $ar = new DAVResource($deliver_path);
   write_resource( $request->user_no, $deliver_path . $etag . '.ics' ,
-    $content , $ar->collection_id, $request->user_no,
+    $content , $ar->GetProperty('collection_id'), $request->user_no,
     md5($content), $ncal, $put_action_type='INSERT', $caldav_context=true, $log_action=true, $etag );
   //$etag = md5($content);
   header('ETag: "'. $etag . '"' );
diff --git a/testing/tests/regression-suite/532-iCal4-PROPFIND.result b/testing/tests/regression-suite/532-iCal4-PROPFIND.result
index 6ee82376..d82522bc 100644
--- a/testing/tests/regression-suite/532-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/532-iCal4-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "04833ee3ba208ef1e89c2c0254b99737"
-Content-Length: 19035
+ETag: "cf8ef9f46b19096c9036fef29ec62622"
+Content-Length: 19066
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -314,7 +314,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/.in/</href>
   <propstat>
    <prop>
-    <C:getctag>"1"</C:getctag>
+    <C:getctag>"29a4f57ff8c8564c364d37fac0e18e34"</C:getctag>
     <displayname>User 1 Inbox</displayname>
     <C1:supported-calendar-component-set>
      <C1:comp name="VEVENT"/>
diff --git a/testing/tests/regression-suite/537-iCal4-PROPFIND.result b/testing/tests/regression-suite/537-iCal4-PROPFIND.result
index d7411eb5..72080c1d 100644
--- a/testing/tests/regression-suite/537-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/537-iCal4-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "7b9c0b8208dacb0433461fd66140cc9a"
-Content-Length: 425
+ETag: "60530d57c79ae87c8c63c20c78707c1c"
+Content-Length: 767
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/.in/</href>
   <propstat>
    <prop>
-    <C:getctag>"1"</C:getctag>
+    <C:getctag>"29a4f57ff8c8564c364d37fac0e18e34"</C:getctag>
     <resourcetype>
      <collection/>
      <C1:schedule-inbox/>
@@ -20,4 +20,19 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/.in/15f40cce00b378332164188cf779f0d6.ics</href>
+  <propstat>
+   <prop>
+    <resourcetype/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:getctag/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/553-iPhone-PROPFIND.result b/testing/tests/regression-suite/553-iPhone-PROPFIND.result
index bdf234c2..37e5d3bd 100644
--- a/testing/tests/regression-suite/553-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/553-iPhone-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "2091d92f09f393ede66728896d167240"
-Content-Length: 15401
+ETag: "75ce17e7c56b97eb73a7f8b716f47534"
+Content-Length: 15432
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -276,7 +276,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <displayname>User 1 Inbox</displayname>
-    <C1:getctag>"1"</C1:getctag>
+    <C1:getctag>"29a4f57ff8c8564c364d37fac0e18e34"</C1:getctag>
     <C:supported-calendar-component-set>
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
diff --git a/testing/tests/regression-suite/554-iPhone-PROPFIND.result b/testing/tests/regression-suite/554-iPhone-PROPFIND.result
index bdf234c2..37e5d3bd 100644
--- a/testing/tests/regression-suite/554-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/554-iPhone-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "2091d92f09f393ede66728896d167240"
-Content-Length: 15401
+ETag: "75ce17e7c56b97eb73a7f8b716f47534"
+Content-Length: 15432
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -276,7 +276,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <displayname>User 1 Inbox</displayname>
-    <C1:getctag>"1"</C1:getctag>
+    <C1:getctag>"29a4f57ff8c8564c364d37fac0e18e34"</C1:getctag>
     <C:supported-calendar-component-set>
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
diff --git a/testing/tests/regression-suite/602-Soho-PROPFIND.result b/testing/tests/regression-suite/602-Soho-PROPFIND.result
index 9475718d..e8279870 100644
--- a/testing/tests/regression-suite/602-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/602-Soho-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-ETag: "c54c9883b5a5959588d208034cd782e1"
-Content-Length: 14796
+ETag: "44487da270d6e0c4f71f784688a0896d"
+Content-Length: 15362
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -447,6 +447,28 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/.in/15f40cce00b378332164188cf779f0d6.ics</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>mailto:user1@example.net</href>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:dropbox-home-URL/>
+    <A:notifications-URL/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/.out/</href>
   <propstat>
diff --git a/testing/tests/regression-suite/924-MOVE.result b/testing/tests/regression-suite/924-MOVE.result
index 934bf32d..edb81d9e 100644
--- a/testing/tests/regression-suite/924-MOVE.result
+++ b/testing/tests/regression-suite/924-MOVE.result
@@ -5,9 +5,9 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-    cd_collection: >1397<
+    cd_collection: >1398<
        cd_user_no: >10<
-    ci_collection: >1397<
+    ci_collection: >1398<
        ci_user_no: >10<
         data_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
         item_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
diff --git a/testing/tests/regression-suite/962-BIND.result b/testing/tests/regression-suite/962-BIND.result
index 2f5de117..88860c85 100644
--- a/testing/tests/regression-suite/962-BIND.result
+++ b/testing/tests/regression-suite/962-BIND.result
@@ -6,7 +6,7 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1430<
+          bind_id: >1431<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/user2/<
diff --git a/testing/tests/regression-suite/963-BIND.result b/testing/tests/regression-suite/963-BIND.result
index 2e8ec8c1..ce0f0529 100644
--- a/testing/tests/regression-suite/963-BIND.result
+++ b/testing/tests/regression-suite/963-BIND.result
@@ -8,7 +8,7 @@ Content-Type: text/xml; charset="utf-8"
 <error xmlns="DAV:">
   <DAV::can-overwrite/>A resource already exists at the destination.
 </error>
-          bind_id: >1430<
+          bind_id: >1431<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/user2/<
diff --git a/testing/tests/regression-suite/972-BIND.result b/testing/tests/regression-suite/972-BIND.result
index b3dcf80e..b333493a 100644
--- a/testing/tests/regression-suite/972-BIND.result
+++ b/testing/tests/regression-suite/972-BIND.result
@@ -6,14 +6,14 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1430<
+          bind_id: >1431<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
  parent_container: >/user4/<
  ticket_id_length: >8<
 
-          bind_id: >1431<
+          bind_id: >1432<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
diff --git a/testing/tests/regression-suite/982-BIND.result b/testing/tests/regression-suite/982-BIND.result
index a0029091..6ab6f9fd 100644
--- a/testing/tests/regression-suite/982-BIND.result
+++ b/testing/tests/regression-suite/982-BIND.result
@@ -6,21 +6,21 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1430<
+          bind_id: >1431<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1431<
+          bind_id: >1432<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1435<
+          bind_id: >1436<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
diff --git a/testing/tests/regression-suite/983-BIND.result b/testing/tests/regression-suite/983-BIND.result
index 8cb843ba..9b5c3cf0 100644
--- a/testing/tests/regression-suite/983-BIND.result
+++ b/testing/tests/regression-suite/983-BIND.result
@@ -6,28 +6,28 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1430<
+          bind_id: >1431<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1431<
+          bind_id: >1432<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1435<
+          bind_id: >1436<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
            length: >8<
  parent_container: >/user4/base/<
 
-          bind_id: >1436<
+          bind_id: >1437<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/base/user2/<
diff --git a/testing/tests/regression-suite/984-BIND.result b/testing/tests/regression-suite/984-BIND.result
index 43471299..886a8c23 100644
--- a/testing/tests/regression-suite/984-BIND.result
+++ b/testing/tests/regression-suite/984-BIND.result
@@ -8,28 +8,28 @@ Content-Type: text/xml; charset="utf-8"
 <error xmlns="DAV:">
   <DAV::can-overwrite/>A resource already exists at the destination.
 </error>
-          bind_id: >1430<
+          bind_id: >1431<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1431<
+          bind_id: >1432<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1435<
+          bind_id: >1436<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/base/user1/<
            length: >8<
  parent_container: >/user4/base/<
 
-          bind_id: >1436<
+          bind_id: >1437<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/base/user2/<
diff --git a/testing/tests/regression-suite/985-PROPFIND.result b/testing/tests/regression-suite/985-PROPFIND.result
index 2c2ac814..fca8f188 100644
--- a/testing/tests/regression-suite/985-PROPFIND.result
+++ b/testing/tests/regression-suite/985-PROPFIND.result
@@ -6,7 +6,7 @@
    <prop>
     <displayname>A normal collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1433</href>
+     <href>/caldav.php/.resources/1434</href>
     </resource-id>
     <parent-set>
      <parent>
@@ -90,7 +90,7 @@
    <prop>
     <displayname>A sub collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1434</href>
+     <href>/caldav.php/.resources/1435</href>
     </resource-id>
     <parent-set>
      <parent>
diff --git a/testing/tests/regression-suite/987-PROPFIND.result b/testing/tests/regression-suite/987-PROPFIND.result
index 408e5adf..3d07f2e7 100644
--- a/testing/tests/regression-suite/987-PROPFIND.result
+++ b/testing/tests/regression-suite/987-PROPFIND.result
@@ -6,7 +6,7 @@
    <prop>
     <displayname>A normal collection</displayname>
     <resource-id>
-     <href>/caldav.php/.resources/1433</href>
+     <href>/caldav.php/.resources/1434</href>
     </resource-id>
     <parent-set>
      <parent>