diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrcommon/inc/esmrcommands.h
--- a/meetingrequest/mrcommon/inc/esmrcommands.h	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrcommon/inc/esmrcommands.h	Wed Mar 31 21:08:33 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -19,6 +19,7 @@
 #define ESMRCOMMANDS_H
 
 #include <avkon.hrh>
+#include <calencommands.hrh>
 
 /**
  * Enumeration for ES MR commands.
@@ -36,6 +37,7 @@
     EESMRCmdSendMR,                      // Send Meeting request
     EESMRCmdSendMRUpdate,                // Send MR update
     EESMRCmdSaveMR,                      // Save MR
+    EESMRCmdSaveCloseMR,				 // Save and Close MR
     EESMRCmdEdit,                        // Edit MR
     EESMRCmdEditLocal,                   // Locally edit meeting request
     EESMRCmdReply,                       // Reply to one recipient
@@ -50,7 +52,7 @@
     EESMRCmdPriorityOptions,             // Cascade menu command for priority options
     EESMRCmdAddAttendees,                // add attendees to meeting
     EESMRCmdShowAllAttendees,            // show all attendees of attendee viever field
-    EESMRCmdForward,                     // Forward MR
+    EESMRCmdForwardOptions,              // Cascade menu command for forward options
     EESMRCmdForceExit,                   // Exit without saving
     EESMRCmdAlarmOn,
     EESMRCmdAlarmOff,
@@ -60,16 +62,18 @@
     EESMRCmdOpenAlarmQuery,
     EESMRCmdOpenLocationContextMenu,
     EESMRCmdCheckEvent,
-    EESMRCmdClipboardCopy,				// Copy to clipboard in viewer options menu
-    EESMRCmdTodoMarkAsDone,			    // todoviewer options menu
-    EESMRCmdTodoMarkAsNotDone,			// todoviewer options menu
+    EESMRCmdClipboardCopy,              // Copy to clipboard in viewer options menu
+    EESMRCmdTodoMarkAsDone,             // todoviewer options menu
+    EESMRCmdTodoMarkAsNotDone,          // todoviewer options menu
+    EESMRCmdOpenUnifiedEditorQuery,     // Open query for event type
+    EESMRCmdOpenMultiCalenSelectQuery,        // Open query for multi calen selection dialog
 
-    /** 
+    /**
      * Tracking view commands
      */
-    EESMRCmdViewTrack,					// Show tracking view
-    EESMRCmdCall,						// Call the selected participant
-    EESMRCmdBack,						// Back to previos dialog
+    EESMRCmdViewTrack,                  // Show tracking view
+    EESMRCmdCall,                       // Call the selected participant
+    EESMRCmdBack,                       // Back to previos dialog
 
     /**
      * Calendar Entry UI Specific commands
@@ -87,7 +91,9 @@
     EESMRTentativeWithoutAttachmentCheck,       // Tentative MR without attachment check
     EESMRDeclineWithoutAttachmentCheck,         // Decline MR without attachment check
     EESMRRemoveFromDbWithoutAttachmentCheck,    // Remove from calendar without attachment check
-
+    EMRLaunchAttachmentContextMenu,             // Launch context menu for attachment field
+    EMRCmdHideAttachmentIndicator,              // Hide attachment indicator from UI
+   
     /**
      * Attendee field contact handling related
      */
@@ -102,13 +108,13 @@
 
     /** Attachment field specific command */
     EESMRCmdMskOpenEmailAttachment,
-    
+
     /**
      * MR Contact Action Plugin specific command
      * to notify that editor is inialized and ready
      * to be shown on screen
      * */
-    EESMRCmdEditorInitializationComplete,    
+    EESMRCmdEditorInitializationComplete,
 
     /**
      * Location integration
@@ -123,16 +129,57 @@
     EESMRCmdLandmarks,
     EESMRCmdDisableWaypointIcon,
     EESMRCmdEnableWaypointIcon,
-    
+
     /**
-     * Middle softkey restoration 
+     * Middle softkey restoration
      */
     EESMRCmdRestoreMiddleSoftKey,
-    
+
     /**
      * Text size of field exceeded
      */
     EESMRCmdSizeExceeded,
+
+    EESMRCmdLongtapDetected,
+
+    /**
+     * Attachment field
+     */
+    EESMRViewerOpenAttachment,
+    EESMRViewerSaveAttachment,
+    EESMRViewerOpenAndSaveAttachment,
+    EESMRViewerSaveAllAttachments,
+    EESMRViewerCancelAttachmentDownload,
+    
+    EESMREditorOpenAttachment,
+    EESMREditorRemoveAttachment,
+    EESMREditorRemoveAllAttachments,
+    EESMREditorAddAttachment,
+
+    /**
+     * Unified editor commands
+     */
+    EMRCommandSwitchToMR,
+    EMRCommandSwitchToMeeting,
+    EMRCommandSwitchToMemo,
+    EMRCommandSwitchToAnniversary,
+    EMRCommandSwitchToTodo,
+    EESMRCmdCalendarChange, //switch calendar
+
+    /**
+     * My Locations view commands
+     */
+    EMRCommandMyLocations,
+    
+    /**
+     * Other commands
+     */
+    EMRDialogOptionsMenuExit,
+
+    /**
+     * Environment change
+     */
+    EMRCmdDoEnvironmentChange,
     
     /**
      * FS Email specific command range
@@ -149,16 +196,6 @@
     EESMRCmdSendAs = 30000,
 
     /**
-     * Printing Framework
-     */
-    EESMRCmdPrint = 100155,
-    EESMRCmdPrint_Reserved1,
-    EESMRCmdPrint_Reserved2,
-    EESMRCmdPrint_Reserved3,
-    EESMRCmdPrint_Reserved4,
-
-
-    /**
      * Action menu command items
      */
     EESMRCmdActionMenu = 999500,        // Action menu command
@@ -166,6 +203,19 @@
     EESMRCmdActionMenuLast = 999600     // Last dynamic submenu command
     };
 
+/**
+ * Enumeration for MR plugin commands.
+ * Define mrplugin command ids after RECAL Calendar's last commands
+ */
+enum TMRCalenPluginCommands
+    {
+    /**
+     *Plugin Commands
+     */
+    EMRPluginCommandBase = ECalenLastCommand,   // Last TCalenCommandId
+    EMRLaunchMeetingViewer                       // Use meeting viewer to open entry
+    };
+
 #endif // ESMRCOMMANDS_H
 
 // EOF