diff --git a/ChangeLog b/ChangeLog
index 79ae3e64b..346874bf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/DOMNode+SOGo.h: new category module that
+	implement helper methods for DOM processing.
+
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
 	(davCalendarQuery:): specify default values for "start" and "end"
 	whenever one of them is missing.
diff --git a/SoObjects/SOGo/DOMNode+SOGo.h b/SoObjects/SOGo/DOMNode+SOGo.h
new file mode 100644
index 000000000..d08375cdc
--- /dev/null
+++ b/SoObjects/SOGo/DOMNode+SOGo.h
@@ -0,0 +1,40 @@
+/* DOMNode+SOGo.h - this file is part of $PROJECT_NAME_HERE$
+ *
+ * Copyright (C) 2009 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 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 S_GO_SOOBJECTS_SOGO_DOMNODE_SOGO_H
+#define S_GO_SOOBJECTS_SOGO_DOMNODE_SOGO_H
+
+#import <DOM/DOMNode.h>
+
+@interface NGDOMNodeWithChildren (SOGoDOMExtensions)
+
+- (id <DOMNodeList>) childNodesWithTag: (NSString *) tagName;
+- (id <DOMNodeList>) childNodesWithTag: (NSString *) tagName
+                           inNamespace: (NSString *) namespace;
+
+- (id<NSObject,DOMNode>) firstNodeWithTag: (NSString *) tagName;
+- (id<NSObject,DOMNode>) firstNodeWithTag: (NSString *) tagName
+                              inNamespace: (NSString *) namespace;
+
+@end
+
+#endif /* S_GO_SOOBJECTS_SOGO_DOMNODE_SOGO_H */
diff --git a/SoObjects/SOGo/DOMNode+SOGo.m b/SoObjects/SOGo/DOMNode+SOGo.m
new file mode 100644
index 000000000..27a33b63e
--- /dev/null
+++ b/SoObjects/SOGo/DOMNode+SOGo.m
@@ -0,0 +1,90 @@
+/* DOMNode+SOGo.m - this file is part of $PROJECT_NAME_HERE$
+ *
+ * Copyright (C) 2009 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 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/NSArray.h>
+#import <Foundation/NSString.h>
+
+#import <DOM/DOMProtocols.h>
+
+#import "DOMNode+SOGo.h"
+
+@implementation NGDOMNodeWithChildren (SOGo)
+
+- (id <DOMNodeList>) childNodesWithTag: (NSString *) tagName
+                           inNamespace: (NSString *) namespace
+{
+  id <DOMNodeList> nodes;
+  NSMutableArray <DOMNodeList> *childNodesWithTag;
+  id <NSObject, DOMNode> currentNode;
+  unsigned int count, max;
+
+  childNodesWithTag = [NSMutableArray array];
+
+  nodes = [self childNodes];
+  max = [nodes length];
+  for (count = 0; count < max; count++)
+    {
+      currentNode = [nodes objectAtIndex: count];
+      if ([[currentNode nodeName] isEqualToString: tagName]
+          && (!namespace
+              || [[currentNode nodeName] isEqualToString: namespace]))
+        [childNodesWithTag addObject: currentNode];
+    }
+
+  return childNodesWithTag;
+}
+
+- (id <DOMNodeList>) childNodesWithTag: (NSString *) tagName
+{
+  return [self childNodesWithTag: tagName inNamespace: nil];
+}
+
+- (id <NSObject, DOMNode>) firstNodeWithTag: (NSString *) tagName
+                                inNamespace: (NSString *) namespace
+{
+  id <DOMNodeList> nodes;
+  id <NSObject, DOMNode> node, currentNode;
+  unsigned int count, max;
+
+  node = nil;
+
+  nodes = [self childNodes];
+  max = [nodes length];
+  for (count = 0; !node && count < max; count++)
+    {
+      currentNode = [nodes objectAtIndex: count];
+      if ([[currentNode nodeName] isEqualToString: tagName]
+          && (!namespace
+              || [[currentNode nodeName] isEqualToString: namespace]))
+        node = currentNode;
+    }
+
+  return node;
+}
+
+- (id<NSObject,DOMNode>) firstNodeWithTag: (NSString *) tagName
+{
+  return [self firstNodeWithTag: tagName inNamespace: nil];
+}
+
+
+@end