--- a/messagingapp/msgui/unifiededitor/inc/msgattachmentcontainer.h	Fri Apr 16 14:56:15 2010 +0300
+++ b/messagingapp/msgui/unifiededitor/inc/msgattachmentcontainer.h	Mon May 03 12:29:07 2010 +0300
@@ -21,13 +21,20 @@
 #include "msgunieditorattachment.h"
 
 class QGraphicsLinearLayout;
-class MmsInsertCheckOperation;
+class MmsConformanceCheck;
 
 class MsgAttachmentContainer : public HbWidget
     {
     Q_OBJECT
 
 public:
+    /**
+     * Add Attachment success/failure states
+     */
+    enum AddAttachmentStatus
+    {
+        EAddSuccess = 0, EAddNotSupported, EAddSizeExceed
+    };
 
     /**
      * Constructor
@@ -42,8 +49,10 @@
     /**
      * add attachment to the container
 	 * @param filepath of the attachment
+	 * @return add operation status
      */
-    void addAttachment(const QString& filepath);
+    MsgAttachmentContainer::AddAttachmentStatus addAttachment(
+            const QString& filepath);
 
     /**
      * count of attachments in the container
@@ -56,12 +65,25 @@
      * @return attachments list
      */
     MsgUnifiedEditorAttachmentList attachmentList();
+    
+    /**
+     * Check if the container hold multimedia content
+     * @return true, if multimedia content is present
+     *         false, otherwise.
+     */
+    bool hasMMContent();
+    
+    /**
+     * Size of the attachment container
+     * @return size
+     */
+    int containerSize();
 
 signals:
     /**
-     * emit when container holds MM content
+     * emit when container content changes
      */
-    void mmContentAdded(bool isAdded);
+    void contentChanged();
 
     /**
      * emit to indicate view that container is now empty
@@ -69,11 +91,6 @@
      */
     void emptyAttachmentContainer();
     
-    /**
-     * Emitted when msg's attachment container size changes
-     */
-    void sizeChanged(int aSize);
-
 private slots:
     /**
      * delete attachment from the container
@@ -82,12 +99,6 @@
     
 private:
     /**
-     * Size of the attachment container
-     * @return size
-     */
-    int containerSize();
-
-    /**
      * size of the msg
      */
     int messageSize();
@@ -104,9 +115,9 @@
     QGraphicsLinearLayout* mLayout;
     
     /**
-     * MMs insert check utility class
+     * MMS conformance check utility class
      */
-    MmsInsertCheckOperation* mMmsInsertCheckOp;
+    MmsConformanceCheck* mMmsConformanceCheck;
 
     /**
      * attachment list