diff --git a/features/lwipstack/lwip-sys/arch/sys_arch.h b/features/lwipstack/lwip-sys/arch/sys_arch.h
index 6a968db966..728da3ca9a 100644
--- a/features/lwipstack/lwip-sys/arch/sys_arch.h
+++ b/features/lwipstack/lwip-sys/arch/sys_arch.h
@@ -46,7 +46,7 @@ typedef struct {
 } sys_mutex_t;
 
 // === MAIL BOX ===
-#define MB_SIZE      8
+#define MB_SIZE      MBED_CONF_LWIP_MBOX_SIZE
 
 typedef struct {
     osEventFlagsId_t                id;
diff --git a/features/lwipstack/lwipopts.h b/features/lwipstack/lwipopts.h
index fd2a4fab13..8146459e38 100644
--- a/features/lwipstack/lwipopts.h
+++ b/features/lwipstack/lwipopts.h
@@ -93,8 +93,9 @@
 #define LWIP_RAW                    0
 #endif
 
-#define TCPIP_MBOX_SIZE             8
-#define DEFAULT_TCP_RECVMBOX_SIZE   8
+#define MEMP_NUM_TCPIP_MSG_INPKT    MBED_CONF_LWIP_MEMP_NUM_TCPIP_MSG_INPKT
+#define TCPIP_MBOX_SIZE             MBED_CONF_LWIP_TCPIP_MBOX_SIZE
+#define DEFAULT_TCP_RECVMBOX_SIZE   MBED_CONF_LWIP_DEFAULT_TCP_RECVMBOX_SIZE
 #define DEFAULT_UDP_RECVMBOX_SIZE   8
 #define DEFAULT_RAW_RECVMBOX_SIZE   8
 #define DEFAULT_ACCEPTMBOX_SIZE     8
diff --git a/features/lwipstack/mbed_lib.json b/features/lwipstack/mbed_lib.json
index 5db1c5fc1b..402b5cac4f 100644
--- a/features/lwipstack/mbed_lib.json
+++ b/features/lwipstack/mbed_lib.json
@@ -77,10 +77,26 @@
             "help": "Number of simultaneously queued TCP segments. Current default (used if null here) is set to 16 in opt.h, unless overridden by target Ethernet drivers.",
             "value": null
         },
+        "memp-num-tcpip-msg-inpkt": {
+            "help": "Number of simultaneously queued TCP messages that are received",
+            "value": 8
+        },
         "tcp-mss": {
             "help": "TCP Maximum segment size. Current default (used if null here) is set to 536 in opt.h, unless overridden by target Ethernet drivers.",
             "value": null
         },
+        "tcpip-mbox-size": {
+            "help": "TCPIP mailbox size",
+            "value": 8
+        },
+        "default-tcp-recvmbox-size": {
+            "help": "Default TCPIP receive mailbox size",
+            "value": 8
+        },
+        "mbox-size": {
+            "help": "mailbox size",
+            "value": 8
+        },
         "tcp-snd-buf": {
             "help": "TCP sender buffer space (bytes). Current default (used if null here) is set to (2 * TCP_MSS) in opt.h, unless overridden by target Ethernet drivers.",
             "value": null