diff --git a/ChangeLog b/ChangeLog
index 5a0d24007..1ca2a737c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/NSObject+Owner.[hm]: removed module since it's a
+	bad way of handling ownership that way.
+
 	* SoObjects/Contacts/SOGoContactLDAPFolder.m
 	([SOGoContactLDAPFolder -_qualifierForFilter:filter]): search also
 	on "cn", just like Mozilla.
diff --git a/SoObjects/SOGo/NSObject+Owner.h b/SoObjects/SOGo/NSObject+Owner.h
deleted file mode 100644
index 5237b559c..000000000
--- a/SoObjects/SOGo/NSObject+Owner.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* NSObject+Owner.h - this file is part of SOGo
- *
- * Copyright (C) 2006 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 NSOBJECT_OWNER_H
-#define NSOBJECT_OWNER_H
-
-#import <Foundation/NSObject.h>
-
-@class NSString;
-
-@interface NSObject (SOGoOwnerExtension)
-
-- (void) setOwnerByLogin: (NSString *) login;
-- (NSString *) ownerLogin;
-
-@end
-
-#endif /* NSOBJECT+OWNER_H */
diff --git a/SoObjects/SOGo/NSObject+Owner.m b/SoObjects/SOGo/NSObject+Owner.m
deleted file mode 100644
index 29f488b41..000000000
--- a/SoObjects/SOGo/NSObject+Owner.m
+++ /dev/null
@@ -1,54 +0,0 @@
-/* NSObject+Owner.m - this file is part of SOGo
- *
- * Copyright (C) 2006 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.
- */
-
-#include <stdio.h>
-
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-
-#import "NSObject+Owner.h"
-
-static NSMutableDictionary *ownerTable = nil;
-
-@implementation NSObject (SOGoOwnerExtension)
-
-- (void) setOwnerByLogin: (NSString *) login
-{
-  if (!ownerTable)
-    ownerTable = [NSMutableDictionary new];
-
-  [ownerTable setObject: login forKey: self];
-}
-
-- (NSString *) ownerLogin
-{
-  NSString *login;
-
-  if (ownerTable)
-    login = [ownerTable objectForKey: self];
-  else
-    login = nil;
-
-  return login;
-}
-
-@end