diff --git a/legacy/elementary/src/bin/test_layout.c b/legacy/elementary/src/bin/test_layout.c
index 1a0a0468dd..05bf3d710d 100644
--- a/legacy/elementary/src/bin/test_layout.c
+++ b/legacy/elementary/src/bin/test_layout.c
@@ -4,6 +4,13 @@
 #endif
 #ifndef ELM_LIB_QUICKLAUNCH
 #include <Elementary_Cursor.h>
+
+static void
+_clicked_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   elm_layout_text_set(data, "text", elm_button_label_get(obj));
+}
+
 void
 test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
@@ -29,16 +36,19 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Button 1");
    elm_layout_content_set(ly, "element1", bt);
+   evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Button 2");
    elm_layout_content_set(ly, "element2", bt);
+   evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Button 3");
    elm_layout_content_set(ly, "element3", bt);
+   evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
    evas_object_show(bt);
 
    elm_layout_part_cursor_set(ly, "text", ELM_CURSOR_WATCH);
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 65ae4bc70b..eb726f0696 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -874,6 +874,8 @@ extern "C" {
    EAPI Eina_Bool    elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, const char *style);
    EAPI void         elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
    EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow);
+   EAPI void         elm_layout_text_set(Evas_Object *obj, const char *part, const char *text);
+   EAPI const char  *elm_layout_text_get(const Evas_Object *obj, const char *part);
 
    EAPI void         elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child);
    EAPI void         elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child);
diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c
index 5b8e54bba5..a5cfa137b1 100644
--- a/legacy/elementary/src/lib/elm_layout.c
+++ b/legacy/elementary/src/lib/elm_layout.c
@@ -33,7 +33,8 @@ struct _Subinfo
      BOX_PREPEND,
      BOX_INSERT_BEFORE,
      BOX_INSERT_AT,
-     TABLE_PACK
+     TABLE_PACK,
+     TEXT
    } type;
    union {
       union {
@@ -43,6 +44,9 @@ struct _Subinfo
       struct {
          unsigned short col, row, colspan, rowspan;
       } table;
+      struct {
+         const char *text;
+      } text;
    } p;
 };
 
@@ -74,6 +78,8 @@ _del_hook(Evas_Object *obj)
    EINA_LIST_FREE(wd->subs, si)
      {
 	eina_stringshare_del(si->part);
+        if (si->type == TEXT)
+          eina_stringshare_del(si->p.text.text);
 	free(si);
      }
    EINA_LIST_FREE(wd->parts_cursors, pc) _part_cursor_free(pc);
@@ -253,6 +259,19 @@ _signal_size_eval(void *data, Evas_Object *obj __UNUSED__, const char *emission
    _request_sizing_eval(data);
 }
 
+static void
+_parts_text_fix(Widget_Data *wd)
+{
+   const Eina_List *l;
+   Subinfo *si;
+
+   EINA_LIST_FOREACH(wd->subs, l, si)
+     {
+        if (si->type == TEXT)
+          edje_object_part_text_set(wd->lay, si->part, si->p.text.text);
+     }
+}
+
 /**
  * Add a new layout to the parent
  *
@@ -312,6 +331,7 @@ elm_layout_file_set(Evas_Object *obj, const char *file, const char *group)
    Eina_Bool ret = edje_object_file_set(wd->lay, file, group);
    if (ret)
      {
+        _parts_text_fix(wd);
         _request_sizing_eval(wd);
         _parts_cursors_apply(wd);
      }
@@ -342,6 +362,7 @@ elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, cons
    Eina_Bool ret = _elm_theme_object_set(obj, wd->lay, clas, group, style);
    if (ret)
      {
+        _parts_text_fix(wd);
         _request_sizing_eval(wd);
         _parts_cursors_apply(wd);
      }
@@ -429,6 +450,74 @@ elm_layout_content_unset(Evas_Object *obj, const char *swallow)
    return NULL;
 }
 
+/**
+ * Set the text of the given part
+ *
+ * @param obj The layout object
+ * @param part The TEXT part where to set the text
+ * @param text The text to set
+ *
+ * @ingroup Layout
+ */
+EAPI void
+elm_layout_text_set(Evas_Object *obj, const char *part, const char *text)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Subinfo *si = NULL;
+   Eina_List *l;
+   ELM_CHECK_WIDTYPE(obj, widtype);
+
+   EINA_LIST_FOREACH(wd->subs, l, si)
+     {
+        if ((si->type == TEXT) && (!strcmp(part, si->part)))
+          {
+             if (!text)
+               {
+                  eina_stringshare_del(si->part);
+                  eina_stringshare_del(si->p.text.text);
+                  free(si);
+                  edje_object_part_text_set(wd->lay, part, NULL);
+                  wd->subs = eina_list_remove_list(wd->subs, l);
+                  return;
+               }
+             else
+               break;
+          }
+        si = NULL;
+     }
+
+   if (!si)
+     {
+        si = ELM_NEW(Subinfo);
+        if (!si) return;
+        si->type = TEXT;
+        si->part = eina_stringshare_add(part);
+        wd->subs = eina_list_append(wd->subs, si);
+     }
+
+   eina_stringshare_replace(&si->p.text.text, text);
+   edje_object_part_text_set(wd->lay, part, text);
+   _request_sizing_eval(wd);
+}
+
+/**
+ * Get the text set in the given part
+ *
+ * @param obj The layout object
+ * @param part The TEXT part to retrieve the text off
+ *
+ * @return The text set in @p part
+ *
+ * @ingroup Layout
+ */
+EAPI const char *
+elm_layout_text_get(const Evas_Object *obj, const char *part)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return edje_object_part_text_get(wd->lay, part);
+}
+
 /**
  * Append child to layout box part.
  *