diff --git a/SoObjects/Appointments/MSExchangeFreeBusy.m b/SoObjects/Appointments/MSExchangeFreeBusy.m
index 2028db24b..be8f5919b 100644
--- a/SoObjects/Appointments/MSExchangeFreeBusy.m
+++ b/SoObjects/Appointments/MSExchangeFreeBusy.m
@@ -339,7 +339,7 @@ size_t curl_body_function_freebusy(void *ptr, size_t size, size_t nmemb, void *i
   NSMutableString *s;
 
   s = [NSMutableString stringWithCapacity: 64];
-  [s appendFormat:@"<0x%08X[%@]:", (unsigned int)self, NSStringFromClass([self class])];
+  [s appendFormat:@"<%p[%@]:", self, NSStringFromClass([self class])];
   if (freeBusyViewType)
     [s appendFormat:@" freeBusyViewType='%@'", freeBusyViewType];
   if (mergedFreeBusy)
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 32a2cb390..145869913 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -130,6 +130,16 @@
   return aclManager;
 }
 
+- (void) setIsNew: (BOOL) newIsNew
+{
+  [super setIsNew: newIsNew];
+}
+
+- (BOOL) isNew
+{
+  return [super isNew];
+}
+
 - (NSException *) changeParticipationStatus: (NSString *) newPartStat
                                withDelegate: (iCalPerson *) delegate
                                       alarm: (iCalAlarm *) alarm
diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.h b/SoObjects/Appointments/iCalEntityObject+SOGo.h
index 77134461a..e46da0b69 100644
--- a/SoObjects/Appointments/iCalEntityObject+SOGo.h
+++ b/SoObjects/Appointments/iCalEntityObject+SOGo.h
@@ -46,7 +46,7 @@ extern NSNumber *iCalDistantFutureNumber;
 
 - (iCalPerson *) participantForUser:  (SOGoUser *) theUser
                            attendee: (iCalPerson *) theAttendee;
-- (NSArray *) attendeeUIDs;
+/* - (NSArray *) attendeeUIDs; */
 - (BOOL) isStillRelevant;
 
 - (id) itipEntryWithMethod: (NSString *) method;
diff --git a/SoObjects/Mailer/SOGoDraftObject.h b/SoObjects/Mailer/SOGoDraftObject.h
index cf4e06d27..0b1eeb93f 100644
--- a/SoObjects/Mailer/SOGoDraftObject.h
+++ b/SoObjects/Mailer/SOGoDraftObject.h
@@ -114,7 +114,7 @@
 - (NSArray *) allBareRecipients;
 
 - (NSException *) delete;
-- (NSException *) sendMail;
+/* - (NSException *) sendMail; */
 - (NSException *) sendMailAndCopyToSent: (BOOL) copyToSent; /* default: YES */
 - (NSException *) save;
 
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 1b0f7ac19..96bf80f8e 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -69,6 +69,7 @@
 
 #import "SOGoDraftObject.h"
 
+
 static NSString *contentTypeValue = @"text/plain; charset=utf-8";
 static NSString *htmlContentTypeValue = @"text/html; charset=utf-8";
 static NSString *headerKeys[] = {@"subject", @"to", @"cc", @"bcc", 
@@ -1115,7 +1116,7 @@ static NSString    *userAgent      = nil;
       pmime = [self pathToAttachmentWithName: [NSString stringWithFormat: @".%@.mime", name]];
       if (![[mimeType dataUsingEncoding: NSUTF8StringEncoding] writeToFile: pmime atomically: YES])
         {
-          [[NSFileManager defaultManager] removeItemAtPath: p error: nil];
+          [[NSFileManager defaultManager] removeItemAtPath: p error: NULL];
           return [NSException exceptionWithHTTPStatus: 500 /* Server Error */
                                                reason: @"Could not write attachment to draft!"];
         }
@@ -1782,6 +1783,7 @@ static NSString    *userAgent      = nil;
 //
 //
 //
+/*
 - (NSException *) sendMail
 {
   SOGoUserDefaults *ud;
@@ -1843,6 +1845,7 @@ static NSString    *userAgent      = nil;
     }
   return [self sendMailAndCopyToSent: YES];
 }
+*/
 
 //
 //
diff --git a/SoObjects/Mailer/SOGoMailAccounts.m b/SoObjects/Mailer/SOGoMailAccounts.m
index 4411a5be3..4227e675e 100644
--- a/SoObjects/Mailer/SOGoMailAccounts.m
+++ b/SoObjects/Mailer/SOGoMailAccounts.m
@@ -234,7 +234,7 @@
           labelNode = [labelNodes objectAtIndex: count];
           
           label = [labelNode attribute: @"id"];
-          name = [labelNode textValue];
+          name = [[labelNode firstChild] nodeValue];
           color = [labelNode attribute: @"color"];
 
           [values addObject: name];
diff --git a/SoObjects/Mailer/SOGoMailFolder.h b/SoObjects/Mailer/SOGoMailFolder.h
index cbf0dc867..a1ea8cd81 100644
--- a/SoObjects/Mailer/SOGoMailFolder.h
+++ b/SoObjects/Mailer/SOGoMailFolder.h
@@ -99,8 +99,8 @@
 
 - (NSString *) davCollectionTag;
 
-- (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) properties
-                          matchingSyncToken: (NSString *) syncToken
+- (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) theProperties
+                          matchingSyncToken: (NSString *) theSyncToken
                                    fromDate: (NSCalendarDate *) theStartDate
                                 initialLoad: (BOOL) initialLoadInProgress;
 /* flags */
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 97e10e92d..f9d443386 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -895,7 +895,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
         }
     }
 
-  return error;
+  return (WOResponse *) error;
 }
 
 - (NSDictionary *) statusForFlags: (NSArray *) flags
@@ -2234,7 +2234,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
 // 
 // FIXME: refactor MAPIStoreMailFolder.m - synchroniseCache to use this method
 //
-- (NSArray *) syncTokenFieldsWithProperties: (NSArray *) theProperties
+- (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) theProperties
                           matchingSyncToken: (NSString *) theSyncToken
                                    fromDate: (NSCalendarDate *) theStartDate
                                 initialLoad: (BOOL) initialLoadInProgress
@@ -2245,18 +2245,13 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
   NSDictionary *d;
   id fetchResults;
 
-  int uidnext, highestmodseq, i; 
+  int highestmodseq = 0, i;
 
   allTokens = [NSMutableArray array];
 
-  if ([theSyncToken isEqualToString: @"-1"])
-    {
-      uidnext = highestmodseq = 0;
-    }
-  else
+  if (![theSyncToken isEqualToString: @"-1"])
     {
       a = [theSyncToken componentsSeparatedByString: @"-"];
-      uidnext = [[a objectAtIndex: 0] intValue];
       highestmodseq = [[a objectAtIndex: 1] intValue];
     }
   
diff --git a/SoObjects/SOGo/BSONCodec.m b/SoObjects/SOGo/BSONCodec.m
index 2b5b9d1eb..695d19628 100644
--- a/SoObjects/SOGo/BSONCodec.m
+++ b/SoObjects/SOGo/BSONCodec.m
@@ -600,7 +600,7 @@ static NSDictionary *BSONTypes()
 
   /* We may have the zone using the UTC offset
      or abbreviation (deprecated) */
-  if (timezone && strlen(timezone) > 0 && (timezone[0] == '+' || timezone[0] == '-'))
+  if (strlen(timezone) > 0 && (timezone[0] == '+' || timezone[0] == '-'))
     {
       NSCalendarDate *tzDate;
 
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 9801e4aee..b905c4b37 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -1043,8 +1043,8 @@
   if (nameInContainer) 
     [_ms appendFormat:@" name=%@", nameInContainer];
   if (container)
-    [_ms appendFormat:@" container=0x%08X/%@", 
-         (unsigned int)container, [container valueForKey:@"nameInContainer"]];
+    [_ms appendFormat:@" container=%p/%@", 
+         container, [container valueForKey:@"nameInContainer"]];
 }
 
 - (NSString *) description
@@ -1052,7 +1052,7 @@
   NSMutableString *ms;
 
   ms = [NSMutableString stringWithCapacity:64];
-  [ms appendFormat:@"<0x%08X[%@]:", (unsigned int) self, NSStringFromClass([self class])];
+  [ms appendFormat:@"<%p[%@]:", self, NSStringFromClass([self class])];
   [self appendAttributesToDescription:ms];
   [ms appendString:@">"];
 
@@ -1061,8 +1061,8 @@
 
 - (NSString *) loggingPrefix
 {
-  return [NSString stringWithFormat:@"<0x%08X[%@]:%@>",
-		   (unsigned int) self, NSStringFromClass([self class]),
+  return [NSString stringWithFormat:@"<%p[%@]:%@>",
+		   self, NSStringFromClass([self class]),
 		   [self nameInContainer]];
 }
 
diff --git a/Tests/Unit/TestSBJsonParser.m b/Tests/Unit/TestSBJsonParser.m
index 974751f9f..c95c400ce 100644
--- a/Tests/Unit/TestSBJsonParser.m
+++ b/Tests/Unit/TestSBJsonParser.m
@@ -91,6 +91,7 @@
   test ([obtained compare: expected] == NSOrderedSame);
 #endif
 
+  locale = nil;
   result = [parser objectWithString: @"[ -312.3456 ]"];
   obtained = [result objectAtIndex: 0];
   expected = [NSDecimalNumber decimalNumberWithString: @"-312.3456" locale: locale];
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.h b/UI/MailPartViewers/UIxMailPartICalViewer.h
index e0383005a..c5acd7e5b 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.h
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.h
@@ -39,6 +39,11 @@
 }
 
 - (iCalEvent *) authorativeEvent;
+- (NSString *) endDate;
+- (NSString *) endTime;
+- (NSString *) startDate;
+- (NSString *) startTime;
+- (BOOL) isEndDateOnSameDay;
 
 @end
 
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index bc372eb7b..67a3e240f 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -869,7 +869,7 @@ static NSArray *infoKeys = nil;
     {
       error = [self validateForSend];
       if (!error)
-        error = [co sendMail];
+        error = [co sendMailAndCopyToSent: YES];
       else
 	error = [self failedToSaveFormResponse: [error reason]];
     }
diff --git a/UI/Scheduler/UIxCalFolderActions.m b/UI/Scheduler/UIxCalFolderActions.m
index ad90b2aa5..8226b6b0b 100644
--- a/UI/Scheduler/UIxCalFolderActions.m
+++ b/UI/Scheduler/UIxCalFolderActions.m
@@ -21,9 +21,15 @@
 */
 
 #import <Foundation/NSValue.h>
+
+#import <NGHttp/NGHttpRequest.h>
 #import <NGObjWeb/NSException+HTTP.h>
+#define COMPILING_NGOBJWEB 1 /* httpRequest is needed in
+                                importAction */
 #import <NGObjWeb/WORequest.h>
+#undef COMPILING_NGOBJWEB
 #import <NGObjWeb/WOResponse.h>
+#import <NGMime/NGMimeMultipartBody.h>
 
 #import <NGCards/iCalCalendar.h>