diff --git a/ChangeLog b/ChangeLog
index a3ebdf3a0..e35b585f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-07-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMailFolderTable.[hm]: removed useless class.
+
 	* OpenChange/MAPIStoreTable.m (-lookupChild:)): new method that
 	subclasses must override and that a child object matching the
 	table type.
diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index b76eb89d7..cda60674a 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -81,7 +81,6 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	MAPIStoreMailAttachment.m \
 	MAPIStoreMailContext.m \
 	MAPIStoreMailFolder.m \
-	MAPIStoreMailFolderTable.m \
 	MAPIStoreDraftsMessage.m \
 	MAPIStoreMailMessage.m \
 	MAPIStoreMailMessageTable.m \
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index 550f5272c..aed160383 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -42,7 +42,6 @@
 #import "MAPIStoreDraftsMessage.h"
 #import "MAPIStoreMailMessage.h"
 #import "MAPIStoreMailMessageTable.h"
-#import "MAPIStoreMailFolderTable.h"
 #import "MAPIStoreTypes.h"
 #import "NSString+MAPIStore.h"
 
diff --git a/OpenChange/MAPIStoreMailFolderTable.h b/OpenChange/MAPIStoreMailFolderTable.h
deleted file mode 100644
index 2c9a2b7c4..000000000
--- a/OpenChange/MAPIStoreMailFolderTable.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* MAPIStoreMailFolderTable.h - this file is part of SOGo
- *
- * Copyright (C) 2010 Inverse inc
- *
- * 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 3, 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 MAPISTOREMAILFOLDERTABLE_H
-#define MAPISTOREMAILFOLDERTABLE_H
-
-#import "MAPIStoreFolderTable.h"
-
-@interface MAPIStoreMailFolderTable : MAPIStoreFolderTable
-@end
-
-#endif /* MAPISTOREMAILFOLDERTABLE_H */
diff --git a/OpenChange/MAPIStoreMailFolderTable.m b/OpenChange/MAPIStoreMailFolderTable.m
deleted file mode 100644
index 98b78ebe5..000000000
--- a/OpenChange/MAPIStoreMailFolderTable.m
+++ /dev/null
@@ -1,39 +0,0 @@
-/* MAPIStoreMailFolderTable.m - this file is part of SOGo
- *
- * Copyright (C) 2010 Inverse inc
- *
- * 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 3, 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 <NGExtensions/NSObject+Logs.h>
-
-#import <EOControl/EOQualifier.h>
-
-#import <Mailer/SOGoMailFolder.h>
-
-#import "NSString+MAPIStore.h"
-#import "NSValue+MAPIStore.h"
-#import "MAPIStoreTypes.h"
-
-#import "MAPIStoreMailFolderTable.h"
-
-@implementation MAPIStoreMailFolderTable
-
-@end