diff --git a/plone/app/discussion/configure.zcml b/plone/app/discussion/configure.zcml
index ef2b4e6..f72c5c9 100644
--- a/plone/app/discussion/configure.zcml
+++ b/plone/app/discussion/configure.zcml
@@ -10,9 +10,19 @@
     <five:registerPackage package="." />
 
     <include package="plone.indexer" />
-    <include package="plone.uuid" />
-    <include package="plone.app.uuid" />
-    
+	
+	<!-- XXX: Excluding plone.app.uuid for Plone 3 is only a temporary 'fix'. 
+	     plone.app.uuid causes the IObjectAddedEvent to be fired twice on 
+		 Plone 3. This causes the email notifications to be send twice.
+		 
+		 This means that https://dev.plone.org/plone/ticket/10652 is fixed only
+		 for Plone 4.
+    -->
+    <configure zcml:condition="have plone-4">
+        <include package="plone.uuid" />
+        <include package="plone.app.uuid" />
+	</configure>
+
     <include file="permissions.zcml" />
     <include file="notifications.zcml" />
     <include file="subscribers.zcml" />