diff -r 4ce476e64c59 -r 8592a65ad3fb emailuis/emailui/inc/ncscomposeview.h
--- a/emailuis/emailui/inc/ncscomposeview.h	Wed Mar 31 21:08:33 2010 +0300
+++ b/emailuis/emailui/inc/ncscomposeview.h	Wed Apr 14 15:42:15 2010 +0300
@@ -171,15 +171,22 @@
     /**
     * NewMessage
     * Returns pointer to current composer message
-    */    
+    */
     CFSMailMessage* NewMessage();
 
     /**
-    * CommitL
-    * Commits changes to message
+    * Commits changes to message. This method sets the field contents from
+    * the UI to the message object, but does not save the message unless
+    * explicitely requested.
     */
-    void CommitL( TBool aParseAddresses = ETrue, 
-                  TFieldToCommit aFieldToCommit = EAllFields );
+    void CommitL( TBool aParseAddresses = ETrue,
+        TFieldToCommit aFieldToCommit = EAllFields, TBool aSaveNow = EFalse );
+
+    /**
+     * Saves the message content, if it has been changed since the last save.
+     */
+    TInt SaveMessage();
+    void SaveMessageL();
 
     void DialogDismissedL( TInt aButtonId );
     
@@ -641,6 +648,12 @@
     
     // Popup menu for attachment list.
     CAknStylusPopUpMenu* iStylusPopUpMenu;
+
+    // Flag to indicate whether message text part has been modified.
+    TBool iMessageTextPartModified;
+
+    // Flag to indicate whether message has been modified.
+    TBool iMessageModified;
     };
 
 /**