diff --git a/plone/app/discussion/browser/captcha.zcml b/plone/app/discussion/browser/captcha.zcml
index 114caf0..7ff9e35 100644
--- a/plone/app/discussion/browser/captcha.zcml
+++ b/plone/app/discussion/browser/captcha.zcml
@@ -1,16 +1,16 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:meta="http://namespaces.zope.org/meta"	
+    xmlns:meta="http://namespaces.zope.org/meta"    
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone.app.discussion">
 
-	<!-- 
-	  Plone 3 fixes
-	 
-	  Plone 3 / Zope 2.10 does not recognize the meta:provides feature. 
+    <!-- 
+      Plone 3 fixes
+     
+      Plone 3 / Zope 2.10 does not recognize the meta:provides feature. 
       Therefore we claim to provide this feature when a suitable package is
       installed. 
-	-->
+    -->
     <configure zcml:condition="installed plone.formwidget.captcha">
         <meta:provides feature="plone.app.discussion-captcha" />
     </configure>
@@ -35,7 +35,7 @@
             provides="plone.z3cform.fieldsets.interfaces.IFormExtender" />
         <adapter
             factory=".validator.CaptchaValidator"
-			provides="z3c.form.interfaces.IValidator"
+            provides="z3c.form.interfaces.IValidator"
             />
     </configure>
 
@@ -44,7 +44,7 @@
         <adapter
             factory="collective.akismet.validator.AkismetValidator"
             provides="z3c.form.interfaces.IValidator"
-            />    	
+            />        
     </configure>
-	
+    
 </configure>
\ No newline at end of file
diff --git a/plone/app/discussion/browser/configure.zcml b/plone/app/discussion/browser/configure.zcml
index 35c8119..4f413e7 100644
--- a/plone/app/discussion/browser/configure.zcml
+++ b/plone/app/discussion/browser/configure.zcml
@@ -70,7 +70,7 @@
         class=".moderation.ModerateCommentsEnabled"
         permission="zope2.View"
         />
-		
+        
     <!-- Delete comment view -->
     <browser:page
         for="plone.app.discussion.interfaces.IComment"
diff --git a/plone/app/discussion/configure.zcml b/plone/app/discussion/configure.zcml
index 551d6e9..7b09857 100644
--- a/plone/app/discussion/configure.zcml
+++ b/plone/app/discussion/configure.zcml
@@ -10,18 +10,18 @@
     <five:registerPackage package="." />
 
     <include package="plone.indexer" />
-	
-	<!-- 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.
+    
+    <!-- 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>
+    </configure>
 
     <include file="permissions.zcml" />
     <include file="notifications.zcml" />
@@ -60,7 +60,7 @@
     </class>
 
  
-	<!-- XXX: Excluding plone.uuid for Plone 3 is only a temporary 'fix'.
+    <!-- XXX: Excluding plone.uuid for Plone 3 is only a temporary 'fix'.
          See the comment above -->
     <configure zcml:condition="have plone-4">
     <class class=".comment.Comment">
diff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml
index c9e63db..da650b2 100644
--- a/plone/app/discussion/subscribers.zcml
+++ b/plone/app/discussion/subscribers.zcml
@@ -85,7 +85,6 @@
                zope.app.container.interfaces.IObjectRemovedEvent"
           handler=".comment.notify_content_object_deleted"
           />
-		  
     </configure>
 
     <!-- Control panel event subscribers -->