Remove Hildon1 conditional code from hildon2.

[modest] / src / hildon2 / ui / modest-msg-view-window-ui.xml

diff --git a/src/hildon2/ui/modest-msg-view-window-ui.xml b/src/hildon2/ui/modest-msg-view-window-ui.xml
index 6a18306..aca66e5 100644 (file)
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-view-window-ui.xml
@@ -52,14 +52,16 @@
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="ToolbarMessageReply"/> 
-    <toolitem action="ToolbarMessageMoveTo"/>
+    <toolitem action="ToolbarMessageReply"/>
+    <toolitem action="ToolbarMessageReplyAll"/>
+    <toolitem action="ToolbarMessageForward"/>
     <toolitem action="ToolbarDeleteMessage"/>
-    <toolitem action="FindInMessage"/>
+    <toolitem action="ToolbarDownloadExternalImages"/>
     <toolitem action="ToolbarMessageBack" position="bot"/>
     <toolitem action="ToolbarMessageNext" position="bot"/>
   </toolbar>
 
+  <accelerator name="AccelEmailReply" action="EmailReply"/>
   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>