This is a manual merge of branch drop split view intro trunk.

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

diff --git a/src/hildon2/ui/modest-msg-edit-window-ui.xml b/src/hildon2/ui/modest-msg-edit-window-ui.xml
index 842ed9e..0845ca2 100644 (file)
--- a/src/hildon2/ui/modest-msg-edit-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-edit-window-ui.xml
@@ -49,7 +49,6 @@
     </menu>
 
     <menu name="FormatMenu" action="Format">
-      <menuitem name="SelectFontMenu" action="SelectFont"/>
       <menu name="AlignmentMenu" action="Alignment">
          <menuitem name="AlignmentLeftMenu" action="AlignmentLeft"/>
          <menuitem name="AlignmentCenterMenu" action="AlignmentCenter"/>
@@ -91,5 +90,9 @@
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
   <accelerator name="AccelCloseWindow" action="CloseWindowShortcut"/>
+  <accelerator name="CutMenu" action="Cut"/>
+  <accelerator name="CopyMenu" action="Copy"/>
+  <accelerator name="PasteMenu" action="Paste"/>
+  <accelerator name="SelectAllMenu" action="SelectAll"/>
 
 </ui>