Index: main/plugin-cms/plugin.xml
===================================================================
--- main/plugin-cms/plugin.xml	(revision 43460)
+++ main/plugin-cms/plugin.xml	(working copy)
@@ -346,6 +346,10 @@
     </feature>
     
     <feature name="workflow">
+        <config>
+            <param-ref id="runtime.mail.massive.sending"/>
+        </config>
+        
         <components>
              <component role="org.ametys.cms.workflow.ContentWorkflowHelper"
                         id="org.ametys.cms.workflow.ContentWorkflowHelper"
@@ -5372,6 +5376,10 @@
          |  Global consistency tool and buttons
          + -->
     <feature name="content.global.consistency">
+        <config>
+            <param-ref id="runtime.mail.massive.sending"/>
+        </config>
+        
         <extensions>
             <extension id="org.ametys.cms.GlobalConsistencyButton"
                        point="org.ametys.core.ui.RibbonControlsManager"
@@ -5776,6 +5784,7 @@
         <config>
             <param-ref id="consistency.scheduler.enabled"/>
             <param-ref id="consistency.scheduler.hour"/>
+            <param-ref id="runtime.mail.massive.sending"/>
         </config>
         <components>
             <component role="org.ametys.cms.content.consistency.ContentConsistencyScheduler"
Index: main/plugin-cms/src/org/ametys/cms/alerts/AlertEngine.java
===================================================================
--- main/plugin-cms/src/org/ametys/cms/alerts/AlertEngine.java	(revision 43460)
+++ main/plugin-cms/src/org/ametys/cms/alerts/AlertEngine.java	(working copy)
@@ -371,7 +371,7 @@
         Set<UserIdentity> users = new HashSet<>();
         for (String right : _instantAlertRights)
         {
-            users.addAll(_rightManager.getAllowedUsers(right, content));
+            users.addAll(_rightManager.getAllowedUsers(right, content).actualAllowedUsers(Config.getInstance().getValueAsBoolean("runtime.mail.massive.sending")));
         }
         
         List<String> params = _getInstantAlertParams(content, message);
@@ -562,7 +562,7 @@
         Set<UserIdentity> users = new HashSet<>();
         for (String right : _awaitingValidationRights)
         {
-            users.addAll(_rightManager.getAllowedUsers(right, content));
+            users.addAll(_rightManager.getAllowedUsers(right, content).actualAllowedUsers(Config.getInstance().getValueAsBoolean("runtime.mail.massive.sending")));
         }
         
         List<String> params = _getAwaitingValidationParams(content);
@@ -586,7 +586,7 @@
         Set<UserIdentity> users = new HashSet<>();
         for (String right : _unmodifiedContentRights)
         {
-            users.addAll(_rightManager.getAllowedUsers(right, content));
+            users.addAll(_rightManager.getAllowedUsers(right, content).actualAllowedUsers(Config.getInstance().getValueAsBoolean("runtime.mail.massive.sending")));
         }
         
         List<String> params = _getUnmodifiedContentParams(content);
@@ -610,7 +610,7 @@
         Set<UserIdentity> users = new HashSet<>();
         for (String right : _reminderRights)
         {
-            users.addAll(_rightManager.getAllowedUsers(right, content));
+            users.addAll(_rightManager.getAllowedUsers(right, content).actualAllowedUsers(Config.getInstance().getValueAsBoolean("runtime.mail.massive.sending")));
         }
         
         List<String> params = _getReminderParams(content);
@@ -634,7 +634,7 @@
         Set<UserIdentity> users = new HashSet<>();
         for (String right : _scheduledArchivingReminderRights)
         {
-            users.addAll(_rightManager.getAllowedUsers(right, content));
+            users.addAll(_rightManager.getAllowedUsers(right, content).actualAllowedUsers(Config.getInstance().getValueAsBoolean("runtime.mail.massive.sending")));
         }
         
         List<String> params = _getScheduledArchivingReminderParams(content);
Index: main/plugin-cms/src/org/ametys/cms/content/consistency/ContentConsistencyEngine.java
===================================================================
--- main/plugin-cms/src/org/ametys/cms/content/consistency/ContentConsistencyEngine.java	(revision 43460)
+++ main/plugin-cms/src/org/ametys/cms/content/consistency/ContentConsistencyEngine.java	(working copy)
@@ -344,7 +344,7 @@
      */
     protected void _sendErrorEmail() throws IOException
     {
-        Set<UserIdentity> users = _rightManager.getAllowedUsers(_MAIL_RIGHT, "/contributor");
+        Set<UserIdentity> users = _rightManager.getAllowedUsers(_MAIL_RIGHT, "/contributor").actualAllowedUsers(Config.getInstance().getValueAsBoolean("runtime.mail.massive.sending"));
         
         Map<String, String> params = _getEmailParams();
         
Index: main/plugin-cms/src/org/ametys/cms/workflow/SendMailFunction.java
===================================================================
--- main/plugin-cms/src/org/ametys/cms/workflow/SendMailFunction.java	(revision 43460)
+++ main/plugin-cms/src/org/ametys/cms/workflow/SendMailFunction.java	(working copy)
@@ -263,13 +263,13 @@
         // First right : add all the granted users.
         if (rightIt.hasNext())
         {
-            users.addAll(_rightManager.getAllowedUsers(rightIt.next(), content));
+            users.addAll(_rightManager.getAllowedUsers(rightIt.next(), content).actualAllowedUsers(Config.getInstance().getValueAsBoolean("runtime.mail.massive.sending")));
         }
         
         // Next rights : retain all the granted users.
         while (rightIt.hasNext())
         {
-            users.retainAll(_rightManager.getAllowedUsers(rightIt.next(), content));
+            users.retainAll(_rightManager.getAllowedUsers(rightIt.next(), content).actualAllowedUsers(Config.getInstance().getValueAsBoolean("runtime.mail.massive.sending")));
         }
         
         return users;
Index: main/plugin-cms/src/org/ametys/cms/workflow/archive/ArchiveContentsEngine.java
===================================================================
--- main/plugin-cms/src/org/ametys/cms/workflow/archive/ArchiveContentsEngine.java	(revision 43460)
+++ main/plugin-cms/src/org/ametys/cms/workflow/archive/ArchiveContentsEngine.java	(working copy)
@@ -440,7 +440,7 @@
         Set<UserIdentity> users = new HashSet<>();
         for (String right : _archiveRights)
         {
-            users.addAll(_rightManager.getAllowedUsers(right, content));
+            users.addAll(_rightManager.getAllowedUsers(right, content).actualAllowedUsers(Config.getInstance().getValueAsBoolean("runtime.mail.massive.sending")));
         }
         
         return users;
Index: test/environment/config.xml
===================================================================
--- test/environment/config.xml	(revision 43460)
+++ test/environment/config.xml	(working copy)
@@ -31,6 +31,7 @@
 	<smtp.mail.password></smtp.mail.password>
 	<smtp.mail.from>test@ametys.org</smtp.mail.from>
 	<smtp.mail.sysadminto>ametys@ametys.org</smtp.mail.sysadminto>
+	<runtime.mail.massive.sending>true</runtime.mail.massive.sending>
 	
 	<cms.contents.comments.postvalidation>true</cms.contents.comments.postvalidation>