diff --git a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
index d35b8205d1..e115800d4b 100644
--- a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
+++ b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
@@ -62,22 +62,15 @@ class ExecutorBasedEventDrivenDispatcher(_name: String) extends MessageDispatche
   def dispatch(invocation: MessageInvocation) = if (active) {
     executor.execute(new Runnable() {
       def run = {
-        var messageInvocation = invocation.receiver._mailbox.poll
-        while (messageInvocation != null) {
-          messageInvocation.invoke
-          messageInvocation = invocation.receiver._mailbox.poll
-        }
-      }
-         /*         invocation.receiver.synchronized {
-          val messages = invocation.receiver._mailbox.iterator
-          while (messages.hasNext) {
-            messages.next.invoke
-            messages.remove
+        invocation.receiver.synchronized {
+          var messageInvocation = invocation.receiver._mailbox.poll
+          while (messageInvocation != null) {
+            messageInvocation.invoke
+            messageInvocation = invocation.receiver._mailbox.poll
           }
         }
       }
-        */
-      })
+    })
   } else throw new IllegalStateException("Can't submit invocations to dispatcher since it's not started")
 
   def start = if (!active) {
diff --git a/akka-patterns/src/test/scala/AgentTest.scala b/akka-patterns/src/test/scala/AgentTest.scala
index 17ccce8e0a..a415d9c218 100644
--- a/akka-patterns/src/test/scala/AgentTest.scala
+++ b/akka-patterns/src/test/scala/AgentTest.scala
@@ -21,4 +21,4 @@ class AgentTest extends junit.framework.TestCase with Suite with MustMatchers wi
        }
      }
   })
-}
\ No newline at end of file
+}