diff --git a/ChangeLog b/ChangeLog
index 2be69a423..1d2532981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 
 	* SoObjects/SOGo/SOGoGCSFolder.m: Remove color from user settings on
 	unsubscribe.
+	* SoObjects/SOGo/SOGoGCSFolder.m: Re-fixed to also remove from InactiveFolders
+	and FolderSyncTags.
 	* UI/MailerUI/UIxMailFolderActions.m (_trashedURLOfFolder:withCO:): Fixed
 	issue when deleting a folder with the same name as one already in the Trash.
 
diff --git a/NEWS b/NEWS
index 430130bac..4dcf3fa80 100644
--- a/NEWS
+++ b/NEWS
@@ -3,14 +3,17 @@
 - improved search behavior of users folders (UIxContactsUserFolders)
 - the editor window in the web interface now appears directly when editing an exception occurence of a repeating event (no more dialog window, as in Lightning)
 - implemented the webdav sync spec from Cyrus Daboo, in order to reduce useless payload on databases
+- greatly reduced the number of SQL requests performed in many situations
 - added HTML composition in the web mail module
-- added drag and drop in the addressbook module
+- added drag and drop in the address book and email modules
+- improved the attendees modification dialog by implementing slots management
+- added the capability to display the size of messages in the mail module
 
 1.0-20090605 (1.0.2)
 --------------------
 - basic alarm implementation for the web interface
 - added Welsh translation, thanks to Iona Bailey
-- added Russh translation, thanks to Alex Kabakaev
+- added Russian translation, thanks to Alex Kabakaev
 - added support for Oracle RAC
 - added "scope" parameter to LDAP sources
 - now possible to use SSL (or TLS) for LDAP sources
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index cac055133..d61753adf 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -658,7 +658,7 @@ static NSArray *childRecordFields = nil;
   NSMutableArray *folderSubscription;
   NSString *subscriptionPointer, *mailInvitationURL;
   NSUserDefaults *ud;
-  NSMutableDictionary *moduleSettings;
+  NSMutableDictionary *moduleSettings, *tmp;
 
   if ([owner isEqualToString: [subscribingUser login]])
     {
@@ -692,8 +692,18 @@ static NSArray *childRecordFields = nil;
         [folderSubscription addObjectUniquely: subscriptionPointer];
       else
         {
-          [[moduleSettings objectForKey: @"FolderColors"] 
-            removeObjectForKey: subscriptionPointer];
+          tmp = [moduleSettings objectForKey: @"FolderColors"];
+          if (tmp)
+            [tmp removeObjectForKey: subscriptionPointer];
+
+          tmp = [moduleSettings objectForKey: @"InactiveFolders"];
+          if (tmp)
+            [tmp removeObjectForKey: subscriptionPointer];
+
+          tmp = [moduleSettings objectForKey: @"FolderSyncTags"];
+          if (tmp)
+            [tmp removeObjectForKey: subscriptionPointer];
+
           [folderSubscription removeObject: subscriptionPointer];
         }