Fixes leak 19/26

[modest] / src / maemo / ui / modest-msg-view-window-ui.xml

diff --git a/src/maemo/ui/modest-msg-view-window-ui.xml b/src/maemo/ui/modest-msg-view-window-ui.xml
index 54cd9e8..244140e 100644 (file)
--- a/src/maemo/ui/modest-msg-view-window-ui.xml
+++ b/src/maemo/ui/modest-msg-view-window-ui.xml
@@ -30,8 +30,7 @@
 
 <ui>
 
-  <popup name="MenuBar">
-
+  <menubar name="MenuBar">
     <menu name="MessageMenu" action="Email">
       <menuitem name="MessageReplyMenu" action="EmailReply"/>
       <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
@@ -94,18 +93,18 @@
       <menuitem name="CloseWindowMenu"     action="CloseWindow"/>
       <menuitem name="CloseAllWindowsMenu"     action="CloseAllWindows"/>
     </menu>
-  </popup>
+  </menubar>
 
   <toolbar name="ToolBar">
     <toolitem action="ToolbarMessageReply"/> 
     <toolitem action="ToolbarMessageMoveTo"/>
     <toolitem action="ToolbarDeleteMessage"/>
     <toolitem action="FindInMessage"/>
-    <toolitem action="ToolbarMessageBack"/>
-    <toolitem action="ToolbarMessageNext"/>
-    <placeholder name="ProgressbarView">
+    <toolitem action="ToolbarMessageBack" position="bot"/>
+    <toolitem action="ToolbarMessageNext" position="bot"/>
+    <placeholder name="ProgressbarView" position="bot">
     </placeholder>
-    <toolitem action="ToolbarCancel"/>
+    <toolitem action="ToolbarCancel" position="bot"/>
   </toolbar>
 
   <popup name="ToolbarReplyCSM">