diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index d0bfda31e..d3f5d3b5f 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -22,6 +22,7 @@
 #import "SOGoAppointmentObject.h"
 
 #import <SOGo/AgenorUserManager.h>
+#import <SOGo/SOGoObject.h>
 #import <SaxObjC/SaxObjC.h>
 #import <NGCards/NGCards.h>
 #import <NGCards/iCalCalendar.h>
@@ -38,8 +39,7 @@
 #import "NSArray+Appointments.h"
 
 @interface SOGoAppointmentObject (PrivateAPI)
-- (NSString *)homePageURLForPerson:(iCalPerson *)_person;
-- (NSTimeZone *)viewTimeZoneForPerson:(iCalPerson *)_person;
+- (NSString *) homePageURLForPerson: (iCalPerson *) _person;
   
 - (void)sendEMailUsingTemplateNamed:(NSString *)_pageName
   forOldAppointment:(iCalEvent *)_newApt
@@ -230,6 +230,10 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
 	      [self nameInContainer], folder];
       continue;
     }
+    if ([apt isKindOfClass: [NSException class]]) {
+      [self logWithFormat:@"Exception: %@", [(NSException *) apt reason]];
+      continue;
+    }
     
     if ((error = [apt primarySaveContentString:_iCal]) != nil) {
       [self logWithFormat:@"Note: failed to save iCal in folder: %@", folder];
@@ -619,14 +623,6 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
   return [NSString stringWithFormat:@"%@%@", baseURL, uid];
 }
 
-- (NSTimeZone *) viewTimeZoneForPerson: (iCalPerson *) _person
-{
-  /* TODO: get this from user config as soon as this is available and only
-   *       fall back to default timeZone if config data is not available
-   */
-  return [self serverTimeZone];
-}
-
 - (NSException *) saveContentString: (NSString *) contentString
                         baseVersion: (unsigned int) baseVersion
 {
@@ -728,7 +724,7 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
     [p setNewApt:_newApt];
     [p setOldApt:_oldApt];
     [p setHomePageURL:[self homePageURLForPerson:attendee]];
-    [p setViewTZ:[self viewTimeZoneForPerson:attendee]];
+    [p setViewTZ: [self userTimeZone: cn]];
     subject = [p getSubject];
     text    = [p getBody];
 
diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m
index 27a4bdfbb..bdee3d22a 100644
--- a/SoObjects/Appointments/SOGoTaskObject.m
+++ b/SoObjects/Appointments/SOGoTaskObject.m
@@ -36,7 +36,6 @@
 
 @interface SOGoTaskObject (PrivateAPI)
 - (NSString *)homePageURLForPerson:(iCalPerson *)_person;
-- (NSTimeZone *)viewTimeZoneForPerson:(iCalPerson *)_person;
   
 - (void)sendEMailUsingTemplateNamed:(NSString *)_pageName
   forOldTask:(iCalToDo *)_newApt
@@ -258,6 +257,10 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
 	      [self nameInContainer], folder];
       continue;
     }
+    if ([task isKindOfClass: [NSException class]]) {
+      [self logWithFormat:@"Exception: %@", [(NSException *) task reason]];
+      continue;
+    }
     
     if ((error = [task primaryDelete]) != nil) {
       [self logWithFormat:@"Note: failed to delete in folder: %@", folder];
@@ -619,15 +622,6 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
   return [NSString stringWithFormat:@"%@%@", baseURL, uid];
 }
 
-- (NSTimeZone *) viewTimeZoneForPerson: (iCalPerson *) _person
-{
-  /* TODO: get this from user config as soon as this is available and only
-   *       fall back to default timeZone if config data is not available
-   */
-  return [self serverTimeZone];
-}
-
-
 - (void)sendEMailUsingTemplateNamed:(NSString *)_pageName
   forOldTask:(iCalToDo *)_oldApt
   andNewTask:(iCalToDo *)_newApt
@@ -700,7 +694,7 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
     [p setNewApt: _newApt];
     [p setOldApt: _oldApt];
     [p setHomePageURL:[self homePageURLForPerson:attendee]];
-    [p setViewTZ:[self viewTimeZoneForPerson:attendee]];
+    [p setViewTZ: [self userTimeZone: cn]];
     subject = [p getSubject];
     text    = [p getBody];