<menuitem name="EmailContentsMenu" action="EmailContents"/>
<menuitem name="EmailPurgeAttachmentsMenu" action="EmailPurgeAttachments"/>
<separator/>
+ <menuitem name="EmailRenameMenu" action="EmailRenameFolder"/>
<menuitem name="EmailDeleteMenu" action="EmailDelete"/>
<separator/>
<menuitem name="EmailDetailsMenu" action="EmailDetails"/>
</menu>
<menu name="EditMenu" action="Edit">
- <menuitem name="EditUndoMenu" action="EditUndo"/>
- <separator/>
- <menuitem name="EditCutMenu" action="EditCut"/>
- <menuitem name="EditCopyMenu" action="EditCopy"/>
- <menuitem name="EditPasteMenu" action="EditPaste"/>
- <separator/>
+<!-- <menuitem name="EditCutMenu" action="EditCut"/> -->
+<!-- <menuitem name="EditCopyMenu" action="EditCopy"/> -->
+<!-- <menuitem name="EditPasteMenu" action="EditPaste"/> -->
+<!-- <separator/> -->
<menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
<menuitem name="EditMarkAsReadMenu" action="EditMarkAsRead"/>
<menuitem name="EditMarkAsUnreadMenu" action="EditMarkAsUnread"/>
<menu name="ViewMenu" action="View">
<menuitem name="ViewSortMenu" action="ViewSort"/>
<separator/>
- <menuitem name="ViewToggleFoldersMenu" action="ViewToggleFolders"/>
+ <menuitem name="ViewToggleFoldersMenu" action="ToggleFolders"/>
<menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
<separator/>
<menu name="ViewShowToolbarMainMenu" action="ViewShowToolbar">
<toolitem action="ToolbarMessageNew"/>
<toolitem action="ToolbarMessageReply"/>
<toolitem action="ToolbarDeleteMessage"/>
- <toolitem action="ToolbarToggleView"/>
- <toolitem action="ToolbarSort"/>
- <toolitem action="ToolbarSendReceive"/>
- <placeholder name="ProgressBarView" />
- <toolitem action="ToolbarCancel"/>
+ <toolitem action="ToggleFolders"/>
+ <toolitem action="ToolbarSort" position="bot"/>
+ <toolitem action="ToolbarSendReceive" position="bot"/>
+ <placeholder name="ProgressBarView" position="bot"/>
+ <toolitem action="ToolbarCancel" position="bot"/>
</toolbar>
<popup name="HeaderViewCSM">
- <menuitem action="EmailReply"/>
- <menuitem action="EmailForward"/>
+ <menuitem action="HeaderViewCSMReply"/>
+ <menuitem action="HeaderViewCSMReplyAll"/>
+ <menuitem action="HeaderViewCSMForward"/>
+ <menuitem action="HeaderViewCSMCancelSending"/>
+<!-- <separator/> -->
+<!-- <menuitem action="HeaderViewCSMCut"/> -->
+<!-- <menuitem action="HeaderViewCSMCopy"/> -->
+<!-- <menuitem action="HeaderViewCSMPaste"/> -->
+ <separator/>
+ <menuitem action="HeaderViewCSMDelete"/>
+ <menuitem action="HeaderViewCSMHelp"/>
</popup>
-
+
<popup name="FolderViewCSM">
<menuitem action="FolderViewCSMNewFolder"/>
<menuitem action="FolderViewCSMRenameFolder"/>
+ <menuitem action="FolderViewCSMDeleteFolder"/>
<separator/>
- <menuitem action="FolderViewCSMPasteMsgs"/>
+<!-- <menuitem action="FolderViewCSMPasteMsgs"/> -->
<separator/>
- <menuitem action="FolderViewCSMDeleteFolder"/>
<separator/>
<menuitem action="FolderViewCSMSearchMessages"/>
<menuitem action="FolderViewCSMHelp"/>
</popup>
- <popup name="ToolbarReplyCSM">
+ <popup name="ToolbarReplyCSM" action="ToolbarCSM">
<menuitem action="ToolbarMessageForward"/>
<menuitem action="ToolbarMessageReplyAll"/>
- <menuitem action="ToolbarMessageReply"/>
+<!-- <menuitem action="ToolbarMessageReply"/> -->
</popup>
+ <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
+ <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
<accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
</ui>