--- a/emailuis/uicomponents/inc/fslayoutmanager.h	Mon Mar 15 12:39:10 2010 +0200
+++ b/emailuis/uicomponents/inc/fslayoutmanager.h	Wed Mar 31 21:08:33 2010 +0300
@@ -72,7 +72,6 @@
     /**  Layout Metrics. */
     enum TFsLayoutMetrics
         {
-        //<CMAIL>
         EFsLmApplicationWindow,
         EFsLmAreaTopPane,
         EFsLmBgSpFsCtrlbarPane,
@@ -192,8 +191,27 @@
         EFsLmScreen,
         EFsLmSpFsScrollPane,
         EFsLmSpFsActionMenuListGenePaneG1,
-        EFsLmSpFsActionMenuListGenePaneT1        
-        //</CMAIL>
+        EFsLmSpFsActionMenuListGenePaneT1,
+        
+        // command button area
+        
+        ECmailDdmenuBtn01Pane,
+        ECmailDdmenuBtn01PaneG1,
+        ECmailDdmenuBtn01PaneT1,
+        ECmailDdmenuBtn01PaneG2,
+        ECmailDdmenuBtn01PaneCP,
+        
+        ECmailDdmenuBtn02Pane,
+        ECmailDdmenuBtn02PaneG1,
+        ECmailDdmenuBtn02PaneG2,
+        ECmailDdmenuBtn02PaneT1,
+        ECmailDdmenuBtn02PaneT2,
+        ECmailDdmenuBtn02PaneCP,
+
+        ECmailDdmenuBtn03Pane,
+        ECmailDdmenuBtn03PaneG1,
+        ECmailDdmenuBtn03PaneT1,
+        ECmailDdmenuBtn03PaneCP
         };
 
     /**  Collection of data of text position and font. */