diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 7c6758eca..457e22dc2 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -202,6 +202,7 @@
 
   if (!object)
     {
+      folder = [container lookupCalendarFolderForUID: uid];
       object = [SOGoAppointmentObject objectWithName: nameInContainer
 				      inContainer: folder];
       [object setIsNew: YES];
diff --git a/UI/MailPartViewers/UIxMailPartICalActions.m b/UI/MailPartViewers/UIxMailPartICalActions.m
index 70ebc78c9..a58978018 100644
--- a/UI/MailPartViewers/UIxMailPartICalActions.m
+++ b/UI/MailPartViewers/UIxMailPartICalActions.m
@@ -95,6 +95,7 @@
   
   if (!eventObject)
     {
+      folder = [user personalCalendarFolderInContext: context];
       eventObject = [SOGoAppointmentObject objectWithName: uid
 					   inContainer: folder];
       [eventObject setIsNew: YES];