diff --git a/akka-docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java b/akka-docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java
index 9a07c5190e..90ed9b8bcb 100644
--- a/akka-docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java
+++ b/akka-docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java
@@ -41,8 +41,8 @@ public class MyUnboundedMailbox
     }
 
     public void cleanUp(ActorRef owner, MessageQueue deadLetters) {
-      for (Envelope handle : queue) {
-        deadLetters.enqueue(owner, handle);
+      while(!queue.isEmpty()) {
+        deadLetters.enqueue(owner, dequeue());
       }
     }
   }