X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fui%2Fmodest-main-window-ui.xml;h=b261c3652faed1b608454b1fe2413fdf546351c4;hp=15311e821c9ab54205e99ef3134914eb58f6639f;hb=92a227dadc4696578fa93e5af21b7a12528de924;hpb=136dbfa76d326f52704b11aa7841e0c9480521d9

diff --git a/src/maemo/ui/modest-main-window-ui.xml b/src/maemo/ui/modest-main-window-ui.xml
index 15311e8..b261c36 100644
--- a/src/maemo/ui/modest-main-window-ui.xml
+++ b/src/maemo/ui/modest-main-window-ui.xml
@@ -76,6 +76,7 @@
         <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
       </menu>
       <separator/>
+      <placeholder name="ViewMenuAdditions" />
    </menu>
     
     <menu name="ToolsMenu" action="Tools">
@@ -87,6 +88,7 @@
         <menuitem name="ToolsSendReceiveAllMenu"  action="ToolsSendReceiveAll"/>
         <menuitem name="ToolsSendReceiveCancelSendingMenu"  action="ToolsSendReceiveCancelSending"/>
         <separator/>
+        <placeholder name="ToolsMenuAdditions" />
       </menu>
       <separator/>
       <menuitem name="ToolsContactsMenu" action="ToolsContacts"/>
@@ -108,11 +110,23 @@
     <toolitem action="ToolbarToggleView"/>
     <toolitem action="ToolbarSort"/>
     <toolitem action="ToolbarSendReceive"/>
+    <placeholder name="ProgressBarView" />
+    <toolitem action="ToolbarCancel"/>
   </toolbar>
 
   <popup name="HeaderViewCSM">
-    <menuitem action="EmailReply"/>
-    <menuitem action="EmailForward"/>
+    <menuitem action="HeaderViewCSMOpen"/>
+    <menuitem action="HeaderViewCSMReply"/>
+    <menuitem action="HeaderViewCSMReplyAll"/>
+    <menuitem action="HeaderViewCSMForward"/>
+    <separator/>
+    <menuitem action="HeaderViewCSMCut"/>
+    <menuitem action="HeaderViewCSMCopy"/>
+    <menuitem action="HeaderViewCSMPaste"/>
+    <separator/>
+    <menuitem action="HeaderViewCSMDelete"/>
+    <menuitem action="HeaderViewCSMCancelSending"/>
+    <menuitem action="HeaderViewCSMHelp"/>
   </popup>
   
   <popup name="FolderViewCSM">
@@ -127,7 +141,7 @@
     <menuitem action="FolderViewCSMHelp"/>
   </popup>
 
-  <popup name="ToolbarReplyCSM">
+  <popup name="ToolbarReplyCSM" action="ToolbarCSM">
     <menuitem action="ToolbarMessageForward"/>
     <menuitem action="ToolbarMessageReplyAll"/>
     <menuitem action="ToolbarMessageReply"/>