Fix 2text, 2text.3icon.2, 4text.8icon(email style), 4text.1icon.3

P120821-6026, P120821-6027, P120821-6306

Change-Id: I4a5715600d509892297722948125cdc37d496c82

6 files changed, 328 insertions, 670 deletions

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 800e4e6f..370e114c 100644
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -120,8 +120,6 @@
 #define GENLIST_ICON_BIG_SIZE     64
 #define GENLIST_ICON_SIZE_64 64
 
-#define GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT 40
-
 //FIXME: Change from GENLIST_TREESIZE_DEFAULT to below macro
 #define GENLIST_TREESIZE_DEFAULT 32
 
@@ -399,7 +397,6 @@
 #define GENLIST_SWEEP_BG_COLOR_INC 45 45 45 255
 
 #define GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC 255 255 255 255
-#define GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC "#a8a8a8FF"
 #define GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC "#959595"
 #define GENLIST_PART_TEXTBLOCK_READ_STYLE_COLOR_INC "#969696FF"
 #define GENLIST_PART_TEXTBLOCK_UNREAD_STYLE_COLOR_INC "#d2d2d2FF"
diff --git a/themes/widgets/genlist/genlist.edc b/themes/widgets/genlist/genlist.edc
index f968b7f0..98d77389 100644
--- a/themes/widgets/genlist/genlist.edc
+++ b/themes/widgets/genlist/genlist.edc
@@ -59,6 +59,11 @@
          }
       }
       parts {
+         part { name: "bg";
+            description { state: "default" 0.0;
+               color: GENLIST_PART_LIST_BG_COLOR;
+            }
+         }
          part { name: "elm.padding.left";
             type: RECT;
             scale: 1;
diff --git a/themes/widgets/genlist/genlist_groupindex.edc b/themes/widgets/genlist/genlist_groupindex.edc
index b1f8e1a4..d49570ea 100644
--- a/themes/widgets/genlist/genlist_groupindex.edc
+++ b/themes/widgets/genlist/genlist_groupindex.edc
@@ -38,7 +38,7 @@
       }
       parts {
          GENLIST_PART_BASE_EVENT_OFF
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_LEFT( 10 )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "rect";
             type: RECT;
diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 0e4223a8..853f6768 100644
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -20,7 +20,7 @@
 // if size is different for each theme, split it into each theme inc.
 
 
-#define GENLIST_HEIGHT_1LINE 113  // excep bottom 1 line
+#define GENLIST_HEIGHT_1LINE 114
 //FIXME: Change from GENLIST_TREESIZE_DEFAULT to below macro
 #define GENLIST_TREESIZE_DEFAULT 32
 
@@ -30,8 +30,6 @@
 #define GENLIST_PADDING_SIZE_TOP       10
 #define GENLIST_PADDING_SIZE_BOTTOM    10
 
-#define GENLIST_TEXT2_WIDTH_MIN 150
-
 #define GENLIST_SIZE_PASSWORD_ICON 114
 
 #define GENLIST_TEXT_BTN_HEIGHT   72
@@ -130,108 +128,113 @@
          param\
       }
 
-#define GENLIST_DESCRIPT_DOT_LT( NAME, left, top, param ) \
-      description { state: NAME 0.0;\
-         align: 0 0;\
-         rel1 { \
-            relative: 1 1; \
-            to_x: left; \
-            to_y: top; \
-         }\
-         rel2 {\
-            relative: 1 1;\
-            to_x: left;\
-            to_y: top;\
-         }\
-         param\
-      }
-
-#define GENLIST_DESCRIPT_DOT_RT( NAME, right, top, param ) \
-      description { state: NAME 0.0;\
-         align: 1 0;\
+//   |  top     |
+// -----------------
+//  |  HERE  <--| right
+// -----------------
+//  | bottom   |
+#define GENLIST_DESCRIPTION_RTB( right, top, bottom, param ) \
+      description { state: "default" 0.0;\
+         align: 1 0.5;\
          rel1 { \
             relative: 0 1; \
             to_x: right; \
             to_y: top; \
          }\
          rel2 {\
-            relative: 0 1;\
+            relative: 0 0;\
             to_x: right;\
-            to_y: top;\
+            to_y: bottom;\
          }\
          param\
       }
 
-#define GENLIST_DESCRIPT_DOT_LB( NAME, left, bottom, param ) \
-      description { state: NAME 0.0;\
-         align: 0 1;\
+// left |  HERE  | right
+// ---------------------
+//      | bottom |
+#define GENLIST_DESCRIPTION_LRB( left, right, bottom, param ) \
+      description { state: "default" 0.0;\
+         align: 0.5 1;\
          rel1 { \
             relative: 1 0; \
             to_x: left; \
             to_y: bottom; \
          }\
          rel2 {\
-            relative: 1 0;\
-            to_x: left;\
+            relative: 0 0;\
+            to_x: right;\
             to_y: bottom;\
          }\
          param\
-      }\
+      }
 
-#define GENLIST_DESCRIPT_DOT_RB( NAME, right, bottom, param ) \
-      description { state: NAME 0.0;\
-         align: 1 1;\
+//      |   top  |
+// ---------------------
+// left |  HERE  | right
+#define GENLIST_DESCRIPTION_LRT( left, right, top, param ) \
+      description { state: "default" 0.0;\
+         align: 0.5 0;\
          rel1 { \
-            relative: 0 0; \
-            to_x: right; \
-            to_y: bottom; \
+            relative: 1 1; \
+            to_x: left; \
+            to_y: top; \
          }\
          rel2 {\
-            relative: 0 0;\
+            relative: 0 1;\
             to_x: right;\
-            to_y: bottom;\
+            to_y: top;\
          }\
          param\
       }
 
-#define GENLIST_DESCRIPT_LINE_LEFT( NAME, left, top, bottom, param ) \
-      description { state: NAME 0.0;\
-         align: 0 0.5;\
+//      |       top  |
+// ---------------------
+// left | -->  HERE  |
+#define GENLIST_DESCRIPTION_LT( left, top, param ) \
+      description { state: "default" 0.0;\
+         align: 0 0;\
          rel1 { \
             relative: 1 1; \
             to_x: left; \
             to_y: top; \
          }\
          rel2 {\
-            relative: 1 0;\
+            relative: 1 1;\
             to_x: left;\
-            to_y: bottom;\
+            to_y: top;\
          }\
          param\
       }
 
-#define GENLIST_DESCRIPT_LINE_RIGHT( NAME, right, top, bottom, param ) \
-      description { state: NAME 0.0;\
-         align: 1 0.5;\
+
+//      |       top  |
+// ---------------------
+// left |  --> HERE  |
+// ---------------------
+//      |     bottom |
+#define GENLIST_DESCRIPTION_LTB( left, top, bottom, param ) \
+      description { state: "default" 0.0;\
+         align: 0 0.5;\
          rel1 { \
-            relative: 0 1; \
-            to_x: right; \
+            relative: 1 1; \
+            to_x: left; \
             to_y: top; \
          }\
          rel2 {\
-            relative: 0 0;\
-            to_x: right;\
+            relative: 1 0;\
+            to_x: left;\
             to_y: bottom;\
          }\
          param\
       }
 
-#define GENLIST_DESCRIPT_LINE_TOP( NAME, left, right, top, param ) \
-      description { state: NAME 0.0;\
-         align: 0.5 0;\
+
+#define GENLIST_DESCRIPTION_RT( right, top, param ) \
+      description { state: "default" 0.0;\
+         align: 1 0;\
          rel1 { \
-            relative: 1 1; \
-            to_x: left; \
+            relative: 0 1; \
+            to_x: right; \
             to_y: top; \
          }\
          rel2 {\
@@ -242,15 +245,32 @@
          param\
       }
 
-#define GENLIST_DESCRIPT_LINE_BOTTOM( NAME, left, right, bottom, param ) \
+
+#define GENLIST_DESCRIPT_DOT_LB( NAME, left, bottom, param ) \
       description { state: NAME 0.0;\
-         align: 0.5 1;\
+         align: 0 1;\
          rel1 { \
             relative: 1 0; \
             to_x: left; \
             to_y: bottom; \
          }\
          rel2 {\
+            relative: 1 0;\
+            to_x: left;\
+            to_y: bottom;\
+         }\
+         param\
+      }\
+
+#define GENLIST_DESCRIPTION_RB( right, bottom, param ) \
+      description { state: "default" 0.0;\
+         align: 1 1;\
+         rel1 { \
+            relative: 0 0; \
+            to_x: right; \
+            to_y: bottom; \
+         }\
+         rel2 {\
             relative: 0 0;\
             to_x: right;\
             to_y: bottom;\
@@ -274,6 +294,7 @@
             description { state: "default" 0.0; \
                min: 0 HEIGHT; \
                align: 0.5 0.5; \
+               rel2.offset: -1 0;\
                color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR; \
             } \
          }
@@ -327,6 +348,19 @@
             } \
          }
 
+#define GENLIST_PART_COLORBAR \
+         part { name: "elm.icon.colorbar"; \
+            clip_to: "disclip"; \
+            type: SWALLOW; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 10 21; \
+               fixed: 1 1; \
+               rel2.relative: 0 0; \
+               align: 0 0; \
+            } \
+         }
+
 /// Why is this needed??? (event block??)
 #define GENLIST_PART_BASE_EVENT_OFF \
          part { name: "base";\
@@ -481,13 +515,11 @@
                align: 0 0.5; \
                rel1 { \
                   relative: 1 0.5; \
-                  to_x: LEFT; \
-                  to_y: LEFT; \
+                  to: LEFT; \
                } \
                rel2 { \
                   relative: 1 0.5; \
-                  to_x: LEFT; \
-                  to_y: LEFT; \
+                  to: LEFT; \
                } \
             } \
          }
@@ -1443,8 +1475,6 @@
             action: PLAY_SAMPLE "button-pressed" 1.0; \
          }
 
-
-
 #define GENLIST_PROGRAM_REORDER \
          program { name: "reorder_enabled"; \
             signal: "elm,state,reorder,mode_set"; \
diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 8a3df44b..25b68f97 100644
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -344,7 +344,7 @@
       alias: "elm/genlist/item_odd/1text.1icon/default";
       alias: "elm/genlist/item_compress/1text.1icon/default";
       alias: "elm/genlist/item_compress_odd/1text.1icon/default";
-	  alias: "elm/genlist/item/1text.1icon.4/default";
+      alias: "elm/genlist/item/1text.1icon.4/default";
       alias: "elm/genlist/item_odd/1text.1icon.4/default";
       alias: "elm/genlist/item_compress/1text.1icon.4/default";
       alias: "elm/genlist/item_compress_odd/1text.1icon.4/default";
@@ -392,6 +392,40 @@
          GENLIST_PROGRAM_FLIP_1TEXT_1ICON
       }
    }
+// 2.2.1.28
+   group { name: "elm/genlist/item/1text.1icon.divider/default";
+      alias: "elm/genlist/item_odd/1text.1icon.divider/default";
+      inherit: "elm/genlist/item/1text.1icon/default";
+      parts {
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            GENLIST_DESCRIPTION_R("elm.padding.right", fixed: 1 1;)
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         /*
+         part { name: "elm.icon.touch";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            repeat_events: 1;
+            mouse_events: 1;
+            GENLIST_DESCRIPTION_R("elm.padding.right", color: 255 0 0 50; fixed: 1 0; min: 112 112;)
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         */
+      }
+      programs {
+         program {
+            name: "icon_touch";
+            signal: "mouse,up,1";
+            source: "elm.icon.touch";
+            action: SIGNAL_EMIT "mouse,up,1" "elm.icon";
+         }
+      }
+   }
+
 // 2.2.1.4
    group { name: "elm/genlist/item/1text.1icon.6/default";
       alias: "elm/genlist/item_odd/1text.1icon.6/default";
@@ -1291,25 +1325,16 @@
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
+            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.text.2.left",
+               align: 0 0.5;
                color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               min: 0 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text.2";
-               }
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
-               }
+               )
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
@@ -1318,32 +1343,23 @@
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         GENLIST_PART_PADDING_RIGHT_TO("elm.text.2.left", "elm.text.2", 16)
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               min: GENLIST_TEXT2_WIDTH_MIN 0;
-               align: 1.0 0.5;
+            GENLIST_DESCRIPTION_R("elm.padding.right",
                color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
+                  size: GENLIST_LIST_SUB_TEXT_SIZE;
+                  // FIXME: This text never stop in X axis
+                  min: 1 1;
                   align: 1.0 0.5;
                   text_class: "slp_medium";
                }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
@@ -1426,60 +1442,30 @@
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION_L("elm.padding.left",
                min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-               }
-               align: 0.0 0.5;
-            }
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
-               }
-               rel2.to_x: "elm.icon";
-               visible: 0;
-            }
-         }
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT)
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_133_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.right";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
+            GENLIST_DESCRIPTION_R("elm.padding.right",
+               min: 300 0;
                color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_LIST_SUB_TEXT_SIZE;
                   min: 0 1;
                   align: 1.0 0.5;
                   text_class: "slp_medium";
                }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
@@ -1487,38 +1473,13 @@
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text2.left";
-            clip_to: "disclip";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.text.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text.2";
-               }
-               visible: 0;
-               align: 1.0 0.5;
-            }
-         }
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.text2.left";
-               }
-               align: 0.0 0.5;
+            GENLIST_DESCRIPTION_LR("elm.padding.icon.right", "elm.text.2",
+               align: 0 0.5;
                color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
@@ -1527,7 +1488,7 @@
                   align: 0.0 0.5;
                   text_class: "list_item";
                }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
@@ -6991,17 +6952,7 @@
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.colorbar";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
-               fixed: 1 1;
-               rel2.relative: 0.0 0.0;
-               align: 0.0 0.0;
-            }
-         }
+         GENLIST_PART_COLORBAR
          part { name: "elm.icon.checkbox";
             clip_to: "disclip";
             type: SWALLOW;
@@ -7151,7 +7102,7 @@
                rel2.to: "elm.text.subject.rect";
                align: 0.0 0.0;
                text {
-                  style: "genlist_email_textblock_unread_style";
+                  style: "genlist_style_email_unread";
                   min: 0 1;
                   max: 0 1;
                   align: 0.0 0.5;
@@ -7159,23 +7110,23 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_selected_style";
+               text.style: "genlist_style_email_selected";
             }
             description { state: "read" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_read_style";
+               text.style: "genlist_style_email_read";
             }
             description { state: "unread" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_unread_style";
+               text.style: "genlist_style_email_unread";
             }
             description { state: "urgency_read" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_urgency_read_style";
+               text.style: "genlist_style_email_urgency_read";
             }
             description { state: "urgency_unread" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_urgency_unread_style";
+               text.style: "genlist_style_email_urgency_unread";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7197,14 +7148,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_email_textblock2_style";
+                  style: "genlist_style_email_name";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock2_selected_style";
+               text.style: "genlist_style_email_name_selected";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7388,8 +7339,7 @@
       }
    }
 
-// ???
-   /* NOTE: This style is a temporary style for email application. Otherwise do not use this. */
+// Email style (No UX???)
    group { name: "elm/genlist/item/4text.8icon/default";
       alias: "elm/genlist/item_odd/4text.8icon/default";
       alias: "elm/genlist/item_compress/4text.8icon/default";
@@ -7399,6 +7349,9 @@
       data.item: "texts" "elm.text.subject elm.text.name elm.text.date elm.text.preview elm.text.num";
       data.item: "contents" "elm.icon.important elm.icon.important.touch elm.icon.num elm.icon.attach elm.icon.colorbar elm.swallow.outbox.progress elm.icon.checkbox elm.icon.checkbox.touch elm.icon.priority elm.icon.lastverb elm.icon.appointment";
       data.item: "flips" "elm.flip.content";
+      script {
+         public email_state = 0;
+      }
       images {
          image: "00_list_bar_press_1x80.png" COMP;
          image: "M02_button_06_normal.png" COMP;
@@ -7408,41 +7361,21 @@
          GENLIST_PART_BG
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_8_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_8_INC )
+         GENLIST_PART_PADDING_TOP( 8 )
+         GENLIST_PART_PADDING_BOTTOM( 8 )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.colorbar";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
-               fixed: 1 1;
-               rel2.relative: 0.0 0.0;
-               align: 0.0 0.0;
-            }
-         }
-
+         GENLIST_PART_COLORBAR
          part { name: "elm.icon.checkbox.touch";
             clip_to: "disclip";
             type: SWALLOW;
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               max: GENLIST_PADDING_74_INC GENLIST_SIZE_160_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
+               rel1.to: "elm.icon.checkbox";
+               rel1.offset: -GENLIST_PADDING_SIZE_LEFT 0;
+               rel2.to: "elm.icon.checkbox";
+               rel1.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
             }
          }
          part { name: "elm.icon.checkbox";
@@ -7450,171 +7383,76 @@
             type: SWALLOW;
             mouse_events: 1;
             scale: 1;
-            description { state: "default" 0.0;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+            GENLIST_DESCRIPTION_L("elm.padding.left",
+               max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+               max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
                fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-            }
-         }
-         part { name: "elm.padding.icon.checkbox.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.checkbox";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x:  "elm.icon.checkbox";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
+            )
          }
-
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.checkbox.right", "elm.icon.checkbox", GENLIST_PADDING_SIZE_DEFAULT)
          part { name: "elm.icon.important";
             clip_to: "disclip";
             type: SWALLOW;
             mouse_events: 1;
             scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_56_INC GENLIST_SIZE_SLIDE_60_INC;
+            GENLIST_DESCRIPTION_RT("elm.padding.right", "elm.padding.top",
+               min: 56 60;
                fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 1.0 0.0;
-            }
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
          part { name: "elm.icon.important.touch";
             clip_to: "disclip";
             type: SWALLOW;
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_56_INC GENLIST_SIZE_SLIDE_60_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 1.0 0.0;
+               rel1.to: "elm.icon.important";
+               rel2.to: "elm.icon.important";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
-         part { name: "elm.padding.icon.important.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1{
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.important";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.important";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon.important.left", "elm.icon.important", GENLIST_PADDING_SIZE_DEFAULT)
+         // This part is used?
          part { name: "elm.icon.num";
             clip_to: "disclip";
             type: IMAGE;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-               max: 0 GENLIST_SIZE_SLIDE_60_INC;
+            GENLIST_DESCRIPTION_RT("elm.padding.icon.important.left", "elm.padding.top",
+               max: 0 60;
                fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  offset: 0 GENLIST_SIZE_8_INC;
-                  to_x: "elm.padding.icon.important.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  offset: 0 GENLIST_SIZE_8_INC;
-                  to_x: "elm.padding.icon.important.left";
-                  to_y: "elm.padding.top";
-               }
-               align: 1.0 0.0;
+               rel1.offset: 0 8;
+               rel2.offset: 0 8;
                image.normal: "M02_button_06_normal.png";
                image.border: 5 5 5 5;
-            }
+            )
             description { state: "num_enable" 0.0;
                inherit: "default" 0.0;
-               max: GENLIST_HEIGHT_62_INC GENLIST_SIZE_SLIDE_60_INC;
-               min: GENLIST_SIZE_46_INC GENLIST_SIZE_44_INC;
+               max: 62 60;
+               min: 46 44;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
+         // This part is used?
          part { name: "elm.text.num";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-               max: 0 GENLIST_SIZE_SLIDE_60_INC;
+            GENLIST_DESCRIPTION_RT("elm.padding.icon.important.left", "elm.padding.top",
+               max: 0 60;
                fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  offset: 0 GENLIST_SIZE_8_INC;
-                  to_x: "elm.padding.icon.important.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  offset: 0 GENLIST_SIZE_8_INC;
-                  to_x: "elm.padding.icon.important.left";
-                  to_y: "elm.padding.top";
-               }
-               align: 1.0 0.0;
-            }
+               rel1.offset: 0 8;
+               rel2.offset: 0 8;
+            )
             description { state: "num_enable" 0.0;
                inherit: "default" 0.0;
-               max: GENLIST_HEIGHT_62_INC GENLIST_SIZE_SLIDE_60_INC;
-               min: GENLIST_SIZE_46_INC GENLIST_SIZE_44_INC;
+               max: 62 60;
+               min: 46 44;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: 32;
                   min: 1 1;
                   align: 0.5 0.5;
                   text_class: "slp_medium";
@@ -7623,29 +7461,17 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
          part { name: "elm.icon.attach";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_SLIDE_60_INC;
+            GENLIST_DESCRIPTION_RT("elm.icon.num", "elm.padding.top",
+               min: 0 60;
                fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.num";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.num";
-                  to_y: "elm.padding.top";
-               }
-               align: 1.0 0.0;
-            }
+            )
             description { state: "attach_enable" 0.0;
                inherit: "default" 0.0;
-               min: GENLIST_SIZE_48_INC GENLIST_SIZE_SLIDE_60_INC;
+               min: 48 60;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7654,38 +7480,27 @@
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION_LRT("elm.padding.icon.checkbox.right", "elm.icon.attach", "elm.padding.top",
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
                fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2{
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.attach";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
                text {
-                  style: "genlist_email_textblock_unread_style";
+                  style: "genlist_style_email_unread";
                   min: 0 1;
                   max: 0 1;
-                  align: 0.0 0.5;
+                  align: 0 0.5;
                }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_selected_style";
+               text.style: "genlist_style_email_selected";
             }
             description { state: "read" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_read_style";
+               text.style: "genlist_style_email_read";
             }
             description { state: "unread" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_unread_style";
+               text.style: "genlist_style_email_unread";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7711,7 +7526,6 @@
                visible: 0;
             }
          }
-
          part { name: "elm.icon.priority";
             clip_to: "disclip";
             type: SWALLOW;
@@ -7838,14 +7652,14 @@
                }
                align: 0.0 0.0;
                text {
-                  style: "genlist_email_textblock2_style";
+                  style: "genlist_style_email_name";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock2_selected_style";
+               text.style: "genlist_style_email_name_selected";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7929,13 +7743,17 @@
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.subject";
-            target: "elm.text.name";
-            target: "elm.text.date";
-            target: "elm.text.preview";
             transition: LINEAR 0.1;
+            script {
+               set_state(PART:"bg_image", "default", 0.0);
+               set_state(PART:"elm.text.name", "default", 0.0);
+               set_state(PART:"elm.text.date", "default", 0.0);
+               set_state(PART:"elm.text.preview", "default", 0.0);
+               if (get_int(email_state) == 1)
+                 set_state(PART:"elm.text.subject", "read", 0.0);
+              else
+                 set_state(PART:"elm.text.subject", "unread", 0.0);
+            }
          }
          program { name: "go_disabled";
             signal: "elm,state,disabled";
@@ -7952,14 +7770,18 @@
          program { name: "go_read";
             signal: "elm,state,read";
             source: "elm";
-            action: STATE_SET "read" 0.0;
-            target: "elm.text.subject";
+            script {
+              set_int(email_state, 1);
+              set_state(PART:"elm.text.subject", "read", 0.0);
+            }
          }
          program { name: "go_unread";
             signal: "elm,state,unread";
             source: "elm";
-            action: STATE_SET "unread" 0.0;
-            target: "elm.text.subject";
+            script {
+              set_int(email_state, 0);
+              set_state(PART:"elm.text.subject", "unread", 0.0);
+            }
          }
          program { name: "go_attach";
             signal: "elm,state,attach";
@@ -8127,7 +7949,7 @@
                rel2.to: "elm.text1.rect";
                align: 0.0 0.0;
                text {
-                  style: "genlist_email_textblock_unread_style";
+                  style: "genlist_style_email_unread";
                   min: 0 1;
                   max: 0 1;
                   align: 0.0 0.5;
@@ -8135,23 +7957,23 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_selected_style";
+               text.style: "genlist_style_email_selected";
             }
             description { state: "read" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_read_style";
+               text.style: "genlist_style_email_read";
             }
             description { state: "unread" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_unread_style";
+               text.style: "genlist_style_email_unread";
             }
             description { state: "urgency_read" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_urgency_read_style";
+               text.style: "genlist_style_email_urgency_read";
             }
             description { state: "urgency_unread" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_urgency_unread_style";
+               text.style: "genlist_style_email_urgency_unread";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8172,14 +7994,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_email_textblock2_style";
+                  style: "genlist_style_email_name";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock2_selected_style";
+               text.style: "genlist_style_email_name_selected";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8413,11 +8235,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BASE( 129 )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 10 )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.swallow.colorbar";
@@ -8425,7 +8247,7 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
+               min: 10 21;
                fixed: 1 1;
                rel2.relative: 0.0 0.0;
                align: 0.0 0.0;
@@ -8435,143 +8257,71 @@
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.padding.bottom",
                fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.5;
-            }
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", GENLIST_PADDING_16_INC)
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION_LRB("elm.padding.left", "elm.padding.icon2.left", "elm.padding.bottom",
                min: 0 GENLIST_SIZE_48_INC;
                fixed: 0 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 1.0;
                color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_LIST_SUB_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
                }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         // virtual padding for limiting flexible text
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.text1.right", "elm.icon.2", GENLIST_ICON_SMALL_SIZE+32)
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: GENLIST_SIZE_560_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.2";
-               }
-               align: 0.0 0.5;
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.text1.right", "elm.padding.top", "elm.text.2",
+               align: 0 0.5;
                color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 1 1;
-                  align: 0.0 0.5;
+                  min: 0 1;
+                  max: 1 1;
+                  align: 0 0.5;
                   text_class: "list_item";
                }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.text.1";
-               }
-               rel2.to_x: "elm.text.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.left", "elm.text.1", GENLIST_PADDING_16_INC)
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION("elm.padding.icon1.left", "elm.padding.icon2.left", "elm.padding.top", "elm.text.2",
                min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.text.2";
-               }
-               align: 0.0 0.5;
-            }
+               align: 0 0.5;
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
@@ -9555,7 +9305,7 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_email_textblock_unread_style";
+                  style: "genlist_style_email_unread";
                   min: 0 1;
                   max: 0 1;
                   align: 0.0 0.5;
@@ -23182,9 +22932,9 @@
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
-         GENLIST_PADDING("elm.icon.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.text.4", "elm.padding.top", "elm.padding.bottom", fixed: 1 0; min:16 0; visible: 0;))
-         GENLIST_PADDING("elm.text.1.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.icon.1", "elm.padding.top", "elm.padding.bottom", fixed: 1 0; min:16 0; visible: 0;))
-         GENLIST_PADDING("elm.text.3.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.text.2", "elm.padding.top", "elm.padding.bottom", fixed: 1 0; min:16 0; visible: 0;))
+         GENLIST_PADDING("elm.icon.right", GENLIST_DESCRIPTION_RTB("elm.text.4", "elm.padding.top", "elm.padding.bottom", fixed: 1 0; min:16 0; visible: 0;))
+         GENLIST_PADDING("elm.text.1.right", GENLIST_DESCRIPTION_RTB("elm.icon.1", "elm.padding.top", "elm.padding.bottom", fixed: 1 0; min:16 0; visible: 0;))
+         GENLIST_PADDING("elm.text.3.right", GENLIST_DESCRIPTION_RTB("elm.text.2", "elm.padding.top", "elm.padding.bottom", fixed: 1 0; min:16 0; visible: 0;))
          part { name: "elm.bubble";
             type: IMAGE;
             description{ state: "default" 0.0;
@@ -23211,7 +22961,7 @@
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RT("default", "elm.padding.right", "elm.padding.top",
+            GENLIST_DESCRIPTION_RT("elm.padding.right", "elm.padding.top",
                color: GENLIST_LIST_BUBBLE_TEXT_COLOR;
                fixed: 1 1;
                min: GENLIST_ICON_MEDIUM_SIZE 60;
@@ -23230,7 +22980,7 @@
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RT("default", "elm.icon.right", "elm.padding.top",
+            GENLIST_DESCRIPTION_RT("elm.icon.right", "elm.padding.top",
                color: 0 255 255 255;
                fixed: 1 1;
                min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
@@ -23240,7 +22990,7 @@
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RB("default", "elm.padding.right", "elm.padding.bottom",
+            GENLIST_DESCRIPTION_RB("elm.padding.right", "elm.padding.bottom",
                color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                fixed: 1 1;
                min: 0 48;
@@ -23355,7 +23105,7 @@
             clip_to: "disclip";
             type: TEXTBLOCK;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RT("default", "elm.padding.right", "elm.padding.top",
+            GENLIST_DESCRIPTION_RT("elm.padding.right", "elm.padding.top",
                fixed: 1 1;
                min: GENLIST_ICON_MEDIUM_SIZE 60;
                max: GENLIST_ICON_MEDIUM_SIZE 60;
@@ -23371,7 +23121,7 @@
             clip_to: "disclip";
             type: TEXTBLOCK;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RB("default", "elm.padding.right", "elm.padding.bottom",
+            GENLIST_DESCRIPTION_RB("elm.padding.right", "elm.padding.bottom",
                fixed: 1 1;
                min: 0 48;
                max: 300 48;
@@ -24243,46 +23993,29 @@
          GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 10 )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION_L("elm.padding.left",
                min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-               }
-               align: 0.0 0.5;
-            }
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT)
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.text4.left", "elm.padding.top", "elm.text.3",
                color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               fixed: 0 1;
-               min: 0 GENLIST_SIZE_SLIDE_60_INC;
-               rel1 { relative: 1.0 1.0;
-                  to_x: "elm.icon.1";
-                  to_y: "elm.padding.top";
-               }
-               rel2 { relative: 0.0 1.0;
-                  to_x: "elm.padding.text1.right";
-                  to_y: "elm.padding.text1.right";
-               }
+               min: 0 60;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_LIST_MAIN_TEXT_SIZE;
@@ -24290,7 +24023,7 @@
                   align: 0.0 0.5;
                   text_class: "list_item";
                }
-            }
+            )
             description { state: "read" 0.0;
                inherit: "default" 0.0;
                color: GENLIST_LIST_MAIN_TEXT_READ_COLOR;
@@ -24301,190 +24034,83 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text1.right";
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.text4.left", "elm.bubble", GENLIST_PADDING_SIZE_DEFAULT)
+         part { name: "elm.bubble";
             clip_to: "disclip";
-            type: RECT;
-            scale: 1;
+            type: IMAGE;
             description { state: "default" 0.0;
-               fixed: 1 1 ;
-               align: 1.0 0.0;
-               visible: 0;
-               min: GENLIST_PADDING_16_INC GENLIST_SIZE_SLIDE_60_INC;
-               max: GENLIST_PADDING_16_INC GENLIST_SIZE_SLIDE_60_INC;
-               rel1 { relative: 0.0 1.0;
-                  to_x: "elm.text.2";
-                  to_y: "elm.padding.top";
-               }
-               rel2 { relative: 0.0 1.0;
-                  to_x: "elm.text.2";
-                  to_y: "elm.padding.top";
+               rel1.to: "elm.text.4";
+               rel2.to: "elm.text.4";
+               // bubble is larger than text in X axis (left, right)
+               rel1.offset: -5 0;
+               rel2.offset: 5 0;
+               image {
+                  normal: "00_winset_list_bubble_bg.png";
+                  border:  6 6 0 0;
                }
             }
          }
-         part { name: "elm.text.2";
+         part { name: "elm.text.4";
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            description { state: "default" 0.0;
-               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
-               fixed: 0 1;
-               align: 1.0 1.0;
-               min: 0 GENLIST_SIZE_SLIDE_60_INC;
-               rel1 { relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 { relative: 0.0 1.0;
-                 to_x: "elm.padding.right";
-                 to_y: "elm.padding.bottom";
-               }
+            GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.text.2",
+               // bubble is larger than text in X axis (left, right)
+               rel1.offset: -5 0;
+               rel2.offset: -5 0;
+               color: GENLIST_LIST_BUBBLE_TEXT_COLOR;
+               min: 0 48;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
                   min: 1 1;
-                  align: 0.5 0.5;
+                  align: 1 0.5;
                   text_class: "slp_medium";
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
-            }
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.bubble";
-            type: IMAGE;
-            description{ state: "default" 0.0;
-               fixed: 0 1;
-               min: GENLIST_SIZE_48_INC GENLIST_SIZE_48_INC;
-               rel1 { relative: 0 0;
-                  to_x: "elm.padding.bubble.text4.left";
-                  to_y: "elm.padding.bubble.text4.left";
-               }
-               rel2 { relative: 1 1;
-                  to_x: "elm.padding.bubble.text4.right";
-                  to_y: "elm.padding.bubble.text4.right";
-               }
-               image {
-                  normal: "00_winset_list_bubble_bg.png";
-                  border:  6 6 0 0;
-               }
-            }
-         }
-         part { name: "elm.padding.bubble.text4.left";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 1 0;
-               visible: 0;
-               min: GENLIST_SIZE_10_INC GENLIST_SIZE_48_INC;
-               max: GENLIST_SIZE_10_INC GENLIST_SIZE_48_INC;
-               rel1 { relative: 0 1;
-                  to_x: "elm.text.4";
-                  to_y: "elm.padding.top";
-               }
-               rel2 { relative: 0 0;
-                  to_x: "elm.text.4";
-                  to_y: "elm.text.2";
-               }
-
-            }
-         }
-         part { name: "elm.padding.bubble.text4.right";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 1 0;
-               visible: 0;
-               min: GENLIST_SIZE_10_INC GENLIST_SIZE_48_INC;
-               max: GENLIST_SIZE_10_INC GENLIST_SIZE_48_INC;
-               rel1 { relative: 0 1;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 { relative: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.2";
-               }
-            }
-         }
-         part { name: "elm.text.4";
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            description { state: "default" 0.0;
-               color: GENLIST_LIST_BUBBLE_TEXT_COLOR;
-               fixed: 0 1;
-               align: 1.0 0.0;
-               min: GENLIST_SIZE_28_INC GENLIST_SIZE_48_INC;
-               rel1 { relative: 0 1;
-                  to_x: "elm.padding.bubble.text4.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 { relative: 0 0;
-                  to_x: "elm.padding.bubble.text4.right";
-                  to_y: "elm.text.2";
-               }
+            GENLIST_DESCRIPTION_RB("elm.padding.right", "elm.padding.bottom",
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
+               min: 0 60;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_LIST_SUB_TEXT_SIZE;
                   min: 1 1;
                   align: 0.5 0.5;
                   text_class: "slp_medium";
                }
+            )
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text3.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 1.0 0.0;
-               visible: 0;
-               min: GENLIST_PADDING_16_INC GENLIST_SIZE_48_INC;
-               max: GENLIST_PADDING_16_INC GENLIST_SIZE_48_INC;
-               rel1 { relative: 0 0;
-                  to_x: "elm.padding.bubble.text4.left";
-                  to_y: "elm.padding.bubble.text4.left";
-               }
-               rel2 { relative: 0 0;
-                  to_x: "elm.padding.bubble.text4.left";
-                  to_y: "elm.padding.bottom";
-               }
-            }
-         }
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.text2.left", "elm.text.2", GENLIST_PADDING_SIZE_DEFAULT)
          part { name: "elm.text.3";
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            description { state: "default" 0.0;
-               color: GENLIST_NAME_TEXT_COLOR;
-               fixed: 0 1;
-               align: 0.0 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               rel1 { relative: 1 1;
-                  to_x: "elm.icon.1";
-                  to_y: "elm.text.1";
-               }
-               rel2 { relative: 0 1;
-                  to_x: "elm.padding.text3.right";
-                  to_y: "elm.padding.text3.right";
-               }
+            GENLIST_DESCRIPTION_LRB("elm.padding.icon1.right", "elm.padding.text2.left", "elm.padding.bottom",
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
+               align: 0 1;
+               min: 0 48;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_LIST_SUB_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
                }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -24504,6 +24130,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
@@ -24512,6 +24139,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_read";
diff --git a/themes/widgets/genlist/genlist_textblock_style.edc b/themes/widgets/genlist/genlist_textblock_style.edc
index 4b3cab59..c9e2d856 100644
--- a/themes/widgets/genlist/genlist_textblock_style.edc
+++ b/themes/widgets/genlist/genlist_textblock_style.edc
@@ -53,7 +53,7 @@ styles {
       TEXTBLOCK_TAG
    }
    style { name: "genlist_style_list_sub_text_focus";
-      base: "font=SLP:style=Medium font_size="GENLIST_LIST_SUB_TEXT_SIZE" color="GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR_STYLE" ellipsis=1.0";
+      base: "font=SLP:style=Medium font_size="GENLIST_LIST_SUB_TEXT_SIZE" color="GENLIST_LIST_SUB_TEXT_FOCUS_COLOR_STYLE" ellipsis=1.0";
       TEXTBLOCK_TAG
    }
    style { name: "genlist_style_name_text";
@@ -90,34 +90,32 @@ styles {
    }
 
    /* email styles */
-   style { name: "genlist_email_textblock_selected_style";
+   style { name: "genlist_style_email_selected";
       base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_email_textblock_read_style";
+   style { name: "genlist_style_email_read";
       base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_READ_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_email_textblock_unread_style";
+   style { name: "genlist_style_email_unread";
       base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_email_textblock_urgency_unread_style";
+   style { name: "genlist_style_email_urgency_unread";
       base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_email_textblock_urgency_read_style";
+   style { name: "genlist_style_email_urgency_read";
       base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_email_textblock2_style";
-      base: "font=SLP:style=Medium font_size="GENLIST_FONT_32_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+   style { name: "genlist_style_email_name";
+      base: "font=SLP:style=Medium font_size="GENLIST_LIST_SUB_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_email_textblock2_selected_style";
-      base: "font=SLP:style=Medium font_size="GENLIST_FONT_32_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
+   style { name: "genlist_style_email_name_selected";
+      base: "font=SLP:style=Medium font_size="GENLIST_LIST_SUB_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-
-
 }