X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaemo%2Fui%2Fmodest-msg-view-window-ui.xml;h=b700bbbad24940552b9476d386bbb7e004b4e262;hb=104b3bca571361d100f6bad0ab9b901729d4d46c;hp=cc642ec241de9624a424655df6747930d701b609;hpb=cc36ea20ffc9bc9dbd884f511db9bae55f4d97ca;p=modest

diff --git a/src/maemo/ui/modest-msg-view-window-ui.xml b/src/maemo/ui/modest-msg-view-window-ui.xml
index cc642ec..b700bbb 100644
--- a/src/maemo/ui/modest-msg-view-window-ui.xml
+++ b/src/maemo/ui/modest-msg-view-window-ui.xml
@@ -66,13 +66,28 @@
       <separator/>
       <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
       <separator/>
+      <menu name="ViewShowToolbarMenu" action="ViewShowToolbar">
+	<menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
+	<menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
+      </menu>
+      <separator/>
       <menuitem name="ViewPreviousMessageMenu" action="ViewPreviousMessage"/>
       <menuitem name="ViewNextMessageMenu" action="ViewNextMessage"/>
     </menu>
 
+    <menu name="AttachmentsMenu" action="Attachments">
+      <menuitem name="ViewAttachmentMenu" action="ViewAttachment"/>
+      <menuitem name="SaveAttachmentMenu" action="SaveAttachment"/>
+      <menuitem name="RemoveAttachmentMenu" action="RemoveAttachment"/>
+    </menu>
+
    <menu name="ToolsMenu" action="Tools">
       <menuitem name="ToolsAddToContactsMenu" action="ToolsAddToContacts"/>
       <separator/>
+      <menuitem name="ToolsFindInMessageMenu" action="ToolsFindInMessage"/>
+      <menuitem name="ToolsSearchMessagesMenu" action="ToolsSearchMessages"/>
+      <separator/>
+      <menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
    </menu>
 
    <menu name="CloseMenu" action="Close">
@@ -82,10 +97,7 @@
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="ToolbarMessageNew"/>
     <toolitem action="ToolbarMessageReply"/> 
-<!--     <toolitem action="ToolbarMessageReplyAll"/> -->
-<!--     <toolitem action="ToolbarMessageForward"/>  -->
     <toolitem action="ToolbarMessageMoveTo"/>
     <toolitem action="ToolbarDeleteMessage"/>
     <toolitem action="FindInMessage"/>
@@ -97,7 +109,6 @@
   </toolbar>
 
   <popup name="ToolbarReplyCSM">
-      <menuitem name="MessageReplyMenu" action="EmailReply"/>
       <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
       <menuitem name="MessageForwardMenu" action="EmailForward"/>
   </popup>