diff --git a/src/main/java/org/olat/core/util/mail/ContactMessage.java b/src/main/java/org/olat/core/util/mail/ContactMessage.java
index 55cab89a525f0da48d51d0e48b86ea5f129176d3..6362cd6dd879bcbfcd7db51f72621a06bb566ae0 100644
--- a/src/main/java/org/olat/core/util/mail/ContactMessage.java
+++ b/src/main/java/org/olat/core/util/mail/ContactMessage.java
@@ -103,7 +103,9 @@ public class ContactMessage {
 	}
 	
 	private ContactList cleanEMailList(ContactList emailList) {
-		for (Identity identity: emailList.getIdentiEmails().values()) {
+		Identity[] identityMails = emailList.getIdentiEmails().values()
+				.toArray(new Identity[emailList.getIdentiEmails().size()]);
+		for (Identity identity:identityMails) {
 			if(MailHelper.isDisabledMailAddress(identity, null)) {
 				emailList.remove(identity);
 				if(!disabledIdentities.contains(identity)) {