- <popup name="FolderViewContextMenu">
- <menuitem action="FoldersNew"/>
- <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="ToolbarReplyCSM" action="ToolbarCSM">
+ <menuitem action="ToolbarMessageForward"/>
+ <menuitem action="ToolbarMessageReplyAll"/>
+ <menuitem action="ToolbarMessageReply"/>