diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 061565790..7fd1a4c35 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -926,7 +926,7 @@ static NSString    *userAgent      = nil;
 
   sourceEnvelope = [sourceMail envelope];
   [self _fillInReplyAddresses: info replyToAll: toAll
-	envelope: sourceEnvelope];
+                     envelope: sourceEnvelope];
   msgID = [sourceEnvelope messageID];
   if ([msgID length] > 0)
     [self setInReplyTo: msgID];
@@ -982,7 +982,7 @@ static NSString    *userAgent      = nil;
 				 @"message/rfc822", @"mimetype",
 				 nil];
       [self saveAttachment: [sourceMail content]
-	    withMetadata: attachment];
+              withMetadata: attachment];
     }
 
   [self storeInfo];
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 833f6f045..54c0df6b8 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -1264,6 +1264,8 @@ static NSArray *reminderValues = nil;
           account = [folder lookupName: @"0" inContext: context acquire: NO];
 
           if ([account updateFilters])
+            // If Sieve is not enabled, the SOGoSieveManager will immediatly return a positive answer
+            // See [SOGoSieveManager updateFiltersForAccount:withUsername:andPassword:]
             results = [self responseWithStatus: 200
                          andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
 
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index 62eaac684..8670dc383 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -1057,8 +1057,7 @@ _computeBlocksPosition (NSArray *blocks)
   [self _prepareEventBlocks: &blocks withAllDays: &allDayBlocks];
   events = [self _fetchFields: eventsFields
            forComponentOfType: @"vevent"];
-  eventsBlocks
-  = [NSArray arrayWithObjects: events, allDayBlocks, blocks, nil];
+  eventsBlocks = [NSArray arrayWithObjects: events, allDayBlocks, blocks, nil];
   max = [events count];
   for (count = 0; count < max; count++)
   {