diff --git a/ChangeLog b/ChangeLog
index 74392ab5d..c1048a989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 	* UI/WebServerResources/MailerUI.js: Fixed Mantis #45
 	* UI/WebServerResources/ContactsUI.js: Fixed Mantis #45
 	* UI/MailerUI/UIxMailListView.m: Made "Size" column sortable
+	* SoObjects/SOGo/SOGoGCSFolder.m: Fixed Mantis #48
 
 2009-07-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index d61753adf..bc54e036e 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -655,10 +655,10 @@ static NSArray *childRecordFields = nil;
      fromMailInvitation: (BOOL) isMailInvitation
              inResponse: (WOResponse *) response
 {
-  NSMutableArray *folderSubscription;
+  NSMutableArray *folderSubscription, *tmpA;
   NSString *subscriptionPointer, *mailInvitationURL;
   NSUserDefaults *ud;
-  NSMutableDictionary *moduleSettings, *tmp;
+  NSMutableDictionary *moduleSettings, *tmpD;
 
   if ([owner isEqualToString: [subscribingUser login]])
     {
@@ -692,17 +692,17 @@ static NSArray *childRecordFields = nil;
         [folderSubscription addObjectUniquely: subscriptionPointer];
       else
         {
-          tmp = [moduleSettings objectForKey: @"FolderColors"];
-          if (tmp)
-            [tmp removeObjectForKey: subscriptionPointer];
+          tmpD = [moduleSettings objectForKey: @"FolderColors"];
+          if (tmpD)
+            [tmpD removeObjectForKey: subscriptionPointer];
 
-          tmp = [moduleSettings objectForKey: @"InactiveFolders"];
-          if (tmp)
-            [tmp removeObjectForKey: subscriptionPointer];
+          tmpA = [moduleSettings objectForKey: @"InactiveFolders"];
+          if (tmpA)
+            [tmpA removeObject: [self nameInContainer]];
 
-          tmp = [moduleSettings objectForKey: @"FolderSyncTags"];
-          if (tmp)
-            [tmp removeObjectForKey: subscriptionPointer];
+          tmpD = [moduleSettings objectForKey: @"FolderSyncTags"];
+          if (tmpD)
+            [tmpD removeObjectForKey: subscriptionPointer];
 
           [folderSubscription removeObject: subscriptionPointer];
         }