diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index e8035afd8..21f100185 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -364,7 +364,7 @@ public class MessagingController implements Runnable
             return mListeners;
         }
 
-        Set<MessagingListener> listeners = new CopyOnWriteArraySet<MessagingListener>(mListeners);
+        Set<MessagingListener> listeners = new HashSet<MessagingListener>(mListeners);
         listeners.add(listener);
         return listeners;