diff --git a/ChangeLog b/ChangeLog
index 8ce905a88..23834091d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-09-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolders.m: new class
+	module, equivalent to the SOGoParentFolder's child
+	SOGoContactFolders, but for calendars.
+
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -labelForKey:key]): new
 	method that returns translated strings for controller bundles
 	(same as what UIxComponent does for view bundles).
diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.h b/SoObjects/Appointments/SOGoAppointmentFolders.h
new file mode 100644
index 000000000..287a09048
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAppointmentFolders.h
@@ -0,0 +1,32 @@
+/* SOGoAppointmentFolders.h - this file is part of SOGo
+ *
+ * Copyright (C) 2007 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef SOGOAPPOINTMENTFOLDERS_H
+#define SOGOAPPOINTMENTFOLDERS_H
+
+#import <SoObjects/SOGo/SOGoParentFolder.h>
+
+@interface SOGoAppointmentFolders : SOGoParentFolder
+
+@end
+
+#endif /* SOGOAPPOINTMENTFOLDERS_H */
diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m
new file mode 100644
index 000000000..151f66fc8
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAppointmentFolders.m
@@ -0,0 +1,46 @@
+/* SOGoAppointmentFolders.m - this file is part of SOGo
+ *
+ * Copyright (C) 2007 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/NSString.h>
+
+#import "SOGoAppointmentFolder.h"
+
+#import "SOGoAppointmentFolders.h"
+
+@implementation SOGoAppointmentFolders
+
++ (NSString *) gcsFolderType
+{
+  return @"Appointment";
+}
+
++ (Class) subFolderClass
+{
+  return [SOGoAppointmentFolder class];
+}
+
+- (NSString *) defaultFolderName
+{
+  return @"Personal calendar";
+}
+
+@end