diff --git a/src/classic/goep_server.c b/src/classic/goep_server.c
index d8a28a8e9..913c0e677 100644
--- a/src/classic/goep_server.c
+++ b/src/classic/goep_server.c
@@ -606,6 +606,14 @@ uint8_t goep_server_response_create_general(uint16_t goep_cid){
     return obex_message_builder_response_create_general(buffer, buffer_len, OBEX_RESP_SUCCESS);
 }
 
+uint16_t goep_server_response_get_max_message_size(uint16_t goep_cid){
+    goep_server_connection_t * connection = goep_server_get_connection_for_goep_cid(goep_cid);
+    if (connection == NULL) {
+        return 0;
+    }
+    return goep_server_get_outgoing_buffer_len(connection);
+}
+
 uint16_t goep_server_response_get_max_body_size(uint16_t goep_cid){
     goep_server_connection_t * connection = goep_server_get_connection_for_goep_cid(goep_cid);
     if (connection == NULL) {
diff --git a/src/classic/goep_server.h b/src/classic/goep_server.h
index 01c0b8b75..615102e1f 100644
--- a/src/classic/goep_server.h
+++ b/src/classic/goep_server.h
@@ -127,6 +127,13 @@ uint8_t goep_server_accept_connection(uint16_t goep_cid);
  */
 uint8_t goep_server_decline_connection(uint16_t goep_cid);
 
+/**
+ * @brief Get max size of GOEP message
+ * @param goep_cid
+ * @return size in bytes or 0
+ */
+uint16_t goep_server_response_get_max_message_size(uint16_t goep_cid);
+
 /**
  * Request GOEP_SUBEVENT_CAN_SEND_NOW
  * @param goep_cid
@@ -156,8 +163,6 @@ uint8_t goep_server_response_create_general(uint16_t goep_cid);
 /**
  * @brief Get max size of body data that can be added to current response with goep_server_header_add_end_of_body
  * @param goep_cid
- * @param data
- * @param length
  * @return size in bytes or 0
  */
 uint16_t goep_server_response_get_max_body_size(uint16_t goep_cid);
@@ -165,7 +170,7 @@ uint16_t goep_server_response_get_max_body_size(uint16_t goep_cid);
 /**
  * @brief Add who header to current response
  * @param goep_cid
- * @param who - 16 bytes
+ * @param who 16 bytes
  * @return status
  */
 uint8_t goep_server_header_add_who(uint16_t goep_cid, const uint8_t * who);