Fixes NB#124155, done button in "select contacts" for name dialog does not close...

[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 d0ac420..fd53467 100644 (file)
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-view-window-ui.xml
@@ -52,24 +52,18 @@
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="ToolbarMessageReply"/> 
-    <toolitem action="ToolbarMessageMoveTo"/>
+    <toolitem action="ToolbarMessageReply"/>
+    <toolitem action="ToolbarMessageReplyAll"/>
     <toolitem action="ToolbarDeleteMessage"/>
-    <toolitem action="FindInMessage"/>
+    <toolitem action="ToolbarDownloadExternalImages"/>
     <toolitem action="ToolbarMessageBack" position="bot"/>
     <toolitem action="ToolbarMessageNext" position="bot"/>
-    <placeholder name="ProgressbarView" position="bot">
-    </placeholder>
-    <toolitem action="ToolbarCancel" position="bot"/>
   </toolbar>
 
-  <popup name="ToolbarReplyCSM">
-      <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
-      <menuitem name="MessageForwardMenu" action="EmailForward"/>
-  </popup>
-
+  <accelerator name="AccelEmailReply" action="EmailReply"/>
   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
+  <accelerator name="AccelFindInMessage" action="FindInMessage"/>
 
   </ui>