diff --git a/ChangeLog b/ChangeLog
index 5f10dec33..7b1fda531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder -ocsFolder]):
+	send an email only when not in a dav request.
+	([SOGoGCSFolder -delete]): same as above.
+
 	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
 	-supportsQuotas]): test quota support by querying the server
 	capability.
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 7b8732397..68f614230 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -273,7 +273,10 @@ static BOOL sendFolderAdvisories = NO;
 				 withName: displayName
                                  atPath: ocsPath];
 
-  if (!result && sendFolderAdvisories) [self sendFolderAdvisoryTemplate: @"Addition"];
+  if (!result
+      && [[context request] handledByDefaultHandler]
+      && sendFolderAdvisories)
+    [self sendFolderAdvisoryTemplate: @"Addition"];
 
   return (result == nil);
 }
@@ -291,7 +294,9 @@ static BOOL sendFolderAdvisories = NO;
   else
     error = [[self folderManager] deleteFolderAtPath: ocsPath];
 
-  if (!error && sendFolderAdvisories) [self sendFolderAdvisoryTemplate: @"Removal"];
+  if (!error && sendFolderAdvisories
+      && [[context request] handledByDefaultHandler])
+    [self sendFolderAdvisoryTemplate: @"Removal"];
 
   return error;
 }