<menu name="ViewMenu" action="View">
<menuitem name="ViewSortMenu" action="ViewSort"/>
<separator/>
- <menuitem name="ViewFoldersMenu" action="ViewFolders"/>
- <menuitem name="ShowToggleFullscreenMenu" action="ShowToggleFullscreen"/>
+ <menuitem name="ViewToggleFoldersMenu" action="ViewToggleFolders"/>
+ <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
<separator/>
<menu name="ViewShowToolbarMainMenu" action="ViewShowToolbar">
<menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
<menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
</menu>
<separator/>
+ <placeholder name="ViewMenuAdditions" />
</menu>
<menu name="ToolsMenu" action="Tools">
<toolitem action="ToolbarToggleView"/>
<toolitem action="ToolbarSort"/>
<toolitem action="ToolbarSendReceive"/>
+ <placeholder name="ProgressBarView" />
+ <toolitem action="ToolbarCancel"/>
</toolbar>
- <popup name="HeaderViewContextMenu">
+ <popup name="HeaderViewCSM">
<menuitem action="EmailReply"/>
<menuitem action="EmailForward"/>
</popup>
- <popup name="FolderViewContextMenu">
- <menuitem action="EmailNewFolder"/>
- <menuitem action="FoldersDelete"/>
- <menuitem action="FoldersRename"/>
- <menuitem action="FoldersMoveToTrash"/>
+ <popup name="FolderViewCSM">
+ <menuitem action="FolderViewCSMNewFolder"/>
+ <menuitem action="FolderViewCSMRenameFolder"/>
+ <separator/>
+ <menuitem action="FolderViewCSMPasteMsgs"/>
+ <separator/>
+ <menuitem action="FolderViewCSMDeleteFolder"/>
+ <separator/>
+ <menuitem action="FolderViewCSMSearchMessages"/>
+ <menuitem action="FolderViewCSMHelp"/>
</popup>
- <popup name="ToolbarReplyContextMenu">
+ <popup name="ToolbarReplyCSM">
<menuitem action="ToolbarMessageForward"/>
<menuitem action="ToolbarMessageReplyAll"/>
<menuitem action="ToolbarMessageReply"/>