diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index 4efb740afa..07222fc1af 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -119,12 +119,12 @@ object EventHandler extends ListenerManagement {
   case class Info(instance: AnyRef, message: String = "") extends Event
   case class Debug(instance: AnyRef, message: String = "") extends Event
   
-  val error   = "[ERROR] [%s] [%s] [%s] %s\n%s".intern
-  val warning = "[WARN]  [%s] [%s] [%s] %s".intern
-  val info    = "[INFO]  [%s] [%s] [%s] %s".intern
-  val debug   = "[DEBUG] [%s] [%s] [%s] %s".intern
+  val error   = "[ERROR]   [%s] [%s] [%s] %s\n%s".intern
+  val warning = "[WARN]    [%s] [%s] [%s] %s".intern
+  val info    = "[INFO]    [%s] [%s] [%s] %s".intern
+  val debug   = "[DEBUG]   [%s] [%s] [%s] %s".intern
   val generic = "[GENERIC] [%s] [%s]".intern
-  val ID      = "default:error:handler".intern
+  val ID      = "event:handler".intern
 
   val EventHandlerDispatcher = Dispatchers.newExecutorBasedEventDrivenDispatcher(ID).build
 
diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
index 215aab060d..ee31535f28 100644
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@@ -16,9 +16,9 @@ import akka.actor._
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 final case class MessageInvocation(val receiver: ActorRef,
-                              val message: Any,
-                              val sender: Option[ActorRef],
-                              val senderFuture: Option[CompletableFuture[Any]]) {
+                                   val message: Any,
+                                   val sender: Option[ActorRef],
+                                   val senderFuture: Option[CompletableFuture[Any]]) {
   if (receiver eq null) throw new IllegalArgumentException("Receiver can't be null")
 
   def invoke = try {