diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala
index 9a8e65618f..bd2ee78f5c 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala
@@ -64,6 +64,17 @@ object ActorMailboxSpec {
       mailbox-type = "akka.dispatch.BoundedMailbox"
     }
 
+    bounded-control-aware-mailbox {
+      mailbox-capacity = 1000
+      mailbox-push-timeout-time = 10s
+      mailbox-type = "akka.dispatch.BoundedControlAwareMailbox"
+    }
+
+    unbounded-control-aware-mailbox {
+      mailbox-type = "akka.dispatch.UnboundedControlAwareMailbox"
+    }
+
+
     mc-bounded-mailbox {
       mailbox-capacity = 1000
       mailbox-push-timeout-time = 10s
@@ -77,11 +88,21 @@ object ActorMailboxSpec {
       }
       /default-override-from-trait {
       }
+      /default-override-from-trait-bounded-control-aware {
+      }
+      /default-override-from-trait-unbounded-control-aware {
+      }
       /default-override-from-stash {
       }
       /default-bounded {
         mailbox = bounded-mailbox
       }
+      /default-bounded-control-aware {
+        mailbox = bounded-control-aware-mailbox
+      }
+      /default-unbounded-control-aware {
+        mailbox = unbounded-control-aware-mailbox
+      }
       /default-bounded-mailbox-with-zero-pushtimeout {
         mailbox = bounded-mailbox-with-zero-pushtimeout
       }
@@ -154,21 +175,38 @@ object ActorMailboxSpec {
 
   class BoundedQueueReportingActor extends QueueReportingActor with RequiresMessageQueue[BoundedMessageQueueSemantics]
 
+  class BoundedControlAwareQueueReportingActor extends QueueReportingActor
+    with RequiresMessageQueue[BoundedControlAwareMessageQueueSemantics]
+
+  class UnboundedControlAwareQueueReportingActor extends QueueReportingActor
+    with RequiresMessageQueue[UnboundedControlAwareMessageQueueSemantics]
+
   class StashQueueReportingActor extends QueueReportingActor with Stash
 
   class StashQueueReportingActorWithParams(i: Int, s: String) extends StashQueueReportingActor
 
   val UnboundedMailboxTypes = Seq(classOf[UnboundedMessageQueueSemantics])
   val BoundedMailboxTypes = Seq(classOf[BoundedMessageQueueSemantics])
+
   val UnboundedDeqMailboxTypes = Seq(
     classOf[DequeBasedMessageQueueSemantics],
     classOf[UnboundedMessageQueueSemantics],
     classOf[UnboundedDequeBasedMessageQueueSemantics])
+
   val BoundedDeqMailboxTypes = Seq(
     classOf[DequeBasedMessageQueueSemantics],
     classOf[BoundedMessageQueueSemantics],
     classOf[BoundedDequeBasedMessageQueueSemantics])
 
+  val BoundedControlAwareMailboxTypes = Seq(
+    classOf[BoundedMessageQueueSemantics],
+    classOf[ControlAwareMessageQueueSemantics],
+    classOf[BoundedControlAwareMessageQueueSemantics])
+  val UnboundedControlAwareMailboxTypes = Seq(
+    classOf[UnboundedMessageQueueSemantics],
+    classOf[ControlAwareMessageQueueSemantics],
+    classOf[UnboundedControlAwareMessageQueueSemantics])
+
   trait MCBoundedMessageQueueSemantics extends MessageQueue with MultipleConsumerSemantics
   final case class MCBoundedMailbox(val capacity: Int, val pushTimeOut: FiniteDuration)
     extends MailboxType with ProducesMessageQueue[MCBoundedMessageQueueSemantics] {
@@ -232,6 +270,24 @@ class ActorMailboxSpec(conf: Config) extends AkkaSpec(conf) with DefaultTimeout
       checkMailboxQueue(Props[QueueReportingActor], "default-unbounded-deque", UnboundedDeqMailboxTypes)
     }
 
+    "get a bounded control aware message queue when it's configured as mailbox" in {
+      checkMailboxQueue(Props[QueueReportingActor], "default-bounded-control-aware", BoundedControlAwareMailboxTypes)
+    }
+
+    "get an unbounded control aware message queue when it's configured as mailbox" in {
+      checkMailboxQueue(Props[QueueReportingActor], "default-unbounded-control-aware", UnboundedControlAwareMailboxTypes)
+    }
+
+    "get an bounded control aware message queue when it's only configured with RequiresMailbox" in {
+      checkMailboxQueue(Props[BoundedControlAwareQueueReportingActor],
+        "default-override-from-trait-bounded-control-aware", BoundedControlAwareMailboxTypes)
+    }
+
+    "get an unbounded control aware message queue when it's only configured with RequiresMailbox" in {
+      checkMailboxQueue(Props[UnboundedControlAwareQueueReportingActor],
+        "default-override-from-trait-unbounded-control-aware", UnboundedControlAwareMailboxTypes)
+    }
+
     "fail to create actor when an unbounded dequeu message queue is configured as mailbox overriding RequestMailbox" in {
       intercept[ConfigurationException](system.actorOf(Props[BoundedQueueReportingActor], "default-unbounded-deque-override-trait"))
     }
diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
index 404dbf9cc9..7b578f8e01 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
@@ -842,7 +842,7 @@ final case class UnboundedControlAwareMailbox() extends MailboxType with Produce
 }
 
 object UnboundedControlAwareMailbox {
-  class MessageQueue extends ControlAwareMessageQueueSemantics with UnboundedMessageQueueSemantics {
+  class MessageQueue extends UnboundedControlAwareMessageQueueSemantics with java.io.Serializable {
     val controlQueue: Queue[Envelope] = new ConcurrentLinkedQueue[Envelope]()
     val queue: Queue[Envelope] = new ConcurrentLinkedQueue[Envelope]()
   }
@@ -862,7 +862,7 @@ final case class BoundedControlAwareMailbox(capacity: Int, override final val pu
 }
 
 object BoundedControlAwareMailbox {
-  class MessageQueue(val capacity: Int, val pushTimeOut: FiniteDuration) extends BoundedControlAwareMessageQueueSemantics {
+  class MessageQueue(val capacity: Int, val pushTimeOut: FiniteDuration) extends BoundedControlAwareMessageQueueSemantics with java.io.Serializable {
 
     private final val size = new AtomicInteger(0)
     private final val putLock = new ReentrantLock()