diff -r 2c54b51f39c4 -r bb2d3e476f29 notes/notesui/noteseditor/data/xml/notesnoteeditor.docml
--- a/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml	Mon Jul 26 13:54:38 2010 +0530
+++ b/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml	Mon Aug 09 18:30:52 2010 +0530
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.9">
+<hbdocument version="1.1">
     <object name="makeFavoriteAction" type="HbAction">
         <string locid="txt_notes_opt_mark_as_favorite" name="text" value="Mark as favourite"/>
     </object>
@@ -10,8 +10,8 @@
         <string locid="txt_notes_opt_discard_changes" name="text" value="Discard changes"/>
     </object>
     <object name="newNoteAction" type="HbAction">
-	<string locid="txt_notes_opt_new_note" name="text" value="New note"/>
-    </object>	
+        <string locid="txt_notes_opt_new_note" name="text" value="New note"/>
+    </object>
     <object name="deleteAction" type="HbAction">
         <icon iconName="qtg_mono_delete" name="icon"/>
     </object>
@@ -21,48 +21,55 @@
     <widget name="notesEditorView" type="HbView">
         <widget name="noteEditorWidget" role="HbView:widget" type="HbWidget">
             <widget name="notesEditorSubHeading" type="HbGroupBox">
-	        <string name="heading" value=" "/>
-    	        <bool name="collapsable" value="FALSE"/>
+                <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="PREFERRED"/>
+                <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="MINIMUM"/>
+                <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="MAXIMUM"/>
+                <bool name="collapsable" value="FALSE"/>
+                <bool name="visible" value="TRUE"/>
+                <string name="heading" value="                "/>
             </widget>
             <widget name="editorHeading" type="HbLabel">
-	        <enums name="alignment" value="AlignLeft|AlignLeading"/>
+                <enums name="alignment" value="AlignLeft|AlignLeading"/>
                 <sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED" width="48un"/>
-                <string locid="txt_notes_subhead_new_note" name="plainText" value="New note"/>
-             </widget>
-	     <widget name="favoriteIcon" type="HbLabel">
-                 <enums name="alignment" value="AlignRight|AlignTrailing"/>
-                 <sizehint height="var(hb-param-graphic-size-secondary)" type="PREFERRED" width="4un"/>
-            </widget>            
-            <widget name="textEdit" type="HbTextEdit"/>
+                <string locid="txt_notes_subhead_new_note" name="plainText"/>
+            </widget>
+            <widget name="favoriteIcon" type="HbLabel">
+                <enums name="alignment" value="AlignRight|AlignTrailing"/>
+                <sizehint height="var(hb-param-graphic-size-secondary)" type="PREFERRED" width="4un"/>
+                <icon iconName=" " name="icon"/>
+            </widget>
+            <widget name="textEdit" type="HbTextEdit">
+                <string name="plainText"/>
+            </widget>
             <layout type="anchor">
-                <anchoritem dst="notesEditorSubHeading" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+            <anchoritem dst="notesEditorSubHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
                 <anchoritem dst="notesEditorSubHeading" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
-                <anchoritem dst="notesEditorSubHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-                <anchoritem dst="notesEditorSubHeading" dstEdge="BOTTOM" spacing="0un" src="textEdit" srcEdge="TOP"/>
+                <anchoritem dst="notesEditorSubHeading" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="editorHeading" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="notesEditorSubHeading" srcEdge="LEFT"/>
+                <anchoritem dst="editorHeading" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="TOP"/>
+                <anchoritem dst="editorHeading" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="BOTTOM"/>
+                <anchoritem dst="favoriteIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="editorHeading" srcEdge="RIGHT"/>
+                <anchoritem dst="favoriteIcon" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="TOP"/>
+                <anchoritem dst="favoriteIcon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="notesEditorSubHeading" srcEdge="RIGHT"/>
+                <anchoritem dst="favoriteIcon" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" src="notesEditorSubHeading" srcEdge="BOTTOM"/>
                 <anchoritem dst="textEdit" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
+                <anchoritem dst="textEdit" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="notesEditorSubHeading" srcEdge="BOTTOM"/>
                 <anchoritem dst="textEdit" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
                 <anchoritem dst="textEdit" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
-                <anchoritem dst="editorHeading" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
-                <anchoritem dst="editorHeading" dstEdge="TOP" spacing="0.5un" src="" srcEdge="TOP"/>
-                <anchoritem dst="editorHeading" dstEdge="BOTTOM" spacing="0un" src="textEdit" srcEdge="TOP"/>
-		<anchoritem dst="favoriteIcon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="favoriteIcon" dstEdge="BOTTOM" spacing="0un" src="textEdit" srcEdge="TOP"/>
-                <anchoritem dst="favoriteIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="editorHeading" srcEdge="RIGHT"/>
-		<anchoritem dst="favoriteIcon" dstEdge="TOP" spacing="0.5un" src="" srcEdge="TOP"/>
             </layout>
         </widget>
         <widget name="viewMenu" role="HbView:menu" type="HbMenu">
-            <ref object="makeFavoriteAction" role="HbMenu:addAction"/>
-            <ref object="makeAsTodoAction" role="HbMenu:addAction"/>
+            <ref object="makeFavoriteAction" role="HbWidget:addAction"/>
+            <ref object="makeAsTodoAction" role="HbWidget:addAction"/>
         </widget>
         <widget name="viewToolbar" role="HbView:toolBar" type="HbToolBar">
             <enums name="orientation" value="Horizontal"/>
-            <ref object="addToCalendarAction" role="HbToolBar:addAction"/>
-            <ref object="deleteAction" role="HbToolBar:addAction"/>
+            <ref object="addToCalendarAction" role="HbWidget:addAction"/>
+            <ref object="deleteAction" role="HbWidget:addAction"/>
         </widget>
         <string locid="txt_notes_title_notes" name="title" value="Notes"/>
     </widget>
-    <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
     </metadata>
 </hbdocument>