diff --git a/akka-docs/rst/java/mailboxes.rst b/akka-docs/rst/java/mailboxes.rst
index ea6f4b4eb6..d51747dede 100644
--- a/akka-docs/rst/java/mailboxes.rst
+++ b/akka-docs/rst/java/mailboxes.rst
@@ -92,9 +92,10 @@ fall-back to the default mailbox configuration section.
 Builtin Mailbox Implementations
 ===============================
 
-Akka comes shipped with a number of default mailbox implementations:
+Akka comes shipped with a number of mailbox implementations:
 
 * UnboundedMailbox
+  - The default mailbox
 
   - Backed by a ``java.util.concurrent.ConcurrentLinkedQueue``
 
@@ -102,6 +103,18 @@ Akka comes shipped with a number of default mailbox implementations:
 
   - Bounded: No
 
+  - Configuration name: "unbounded" or "akka.dispatch.UnboundedMailbox"
+
+* SingleConsumerOnlyUnboundedMailbox
+
+  - Backed by a very efficient Multiple Producer Single Consumer queue, cannot be used with BalancingDispatcher
+
+  - Blocking: No
+
+  - Bounded: No
+
+  - Configuration name: "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+
 * BoundedMailbox
 
   - Backed by a ``java.util.concurrent.LinkedBlockingQueue``
@@ -110,6 +123,8 @@ Akka comes shipped with a number of default mailbox implementations:
 
   - Bounded: Yes
 
+  - Configuration name: "bounded" or "akka.dispatch.BoundedMailbox"
+
 * UnboundedPriorityMailbox
 
   - Backed by a ``java.util.concurrent.PriorityBlockingQueue``
@@ -118,6 +133,8 @@ Akka comes shipped with a number of default mailbox implementations:
 
   - Bounded: No
 
+  - Configuration name: "akka.dispatch.UnboundedPriorityMailbox"
+
 * BoundedPriorityMailbox
 
   - Backed by a ``java.util.PriorityBlockingQueue`` wrapped in an ``akka.util.BoundedBlockingQueue``
@@ -126,6 +143,8 @@ Akka comes shipped with a number of default mailbox implementations:
 
   - Bounded: Yes
 
+  - Configuration name: "akka.dispatch.BoundedPriorityMailbox"
+
 * Durable mailboxes, see :ref:`durable-mailboxes-java`.
 
 Mailbox configuration examples
diff --git a/akka-docs/rst/scala/mailboxes.rst b/akka-docs/rst/scala/mailboxes.rst
index ccd1c6076d..cef00ad0fc 100644
--- a/akka-docs/rst/scala/mailboxes.rst
+++ b/akka-docs/rst/scala/mailboxes.rst
@@ -92,9 +92,10 @@ fall-back to the default mailbox configuration section.
 Builtin implementations
 =======================
 
-Akka comes shipped with a number of default mailbox implementations:
+Akka comes shipped with a number of mailbox implementations:
 
 * UnboundedMailbox
+  - The default mailbox
 
   - Backed by a ``java.util.concurrent.ConcurrentLinkedQueue``
 
@@ -102,6 +103,18 @@ Akka comes shipped with a number of default mailbox implementations:
 
   - Bounded: No
 
+  - Configuration name: "unbounded" or "akka.dispatch.UnboundedMailbox"
+
+* SingleConsumerOnlyUnboundedMailbox
+
+  - Backed by a very efficient Multiple Producer Single Consumer queue, cannot be used with BalancingDispatcher
+
+  - Blocking: No
+
+  - Bounded: No
+
+  - Configuration name: "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+
 * BoundedMailbox
 
   - Backed by a ``java.util.concurrent.LinkedBlockingQueue``
@@ -110,6 +123,8 @@ Akka comes shipped with a number of default mailbox implementations:
 
   - Bounded: Yes
 
+  - Configuration name: "bounded" or "akka.dispatch.BoundedMailbox"
+
 * UnboundedPriorityMailbox
 
   - Backed by a ``java.util.concurrent.PriorityBlockingQueue``
@@ -118,6 +133,8 @@ Akka comes shipped with a number of default mailbox implementations:
 
   - Bounded: No
 
+  - Configuration name: "akka.dispatch.UnboundedPriorityMailbox"
+
 * BoundedPriorityMailbox
 
   - Backed by a ``java.util.PriorityBlockingQueue`` wrapped in an ``akka.util.BoundedBlockingQueue``
@@ -126,6 +143,8 @@ Akka comes shipped with a number of default mailbox implementations:
 
   - Bounded: Yes
 
+  - Configuration name: "akka.dispatch.BoundedPriorityMailbox"
+
 * Durable mailboxes, see :ref:`durable-mailboxes-scala`.
 
 Mailbox configuration examples