--- a/creator/inc/creator_scriptelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_scriptelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -227,16 +227,12 @@
     virtual void AddToCacheL();
     virtual TBool IsCommandElement() const;
     virtual void ExecuteCommandL();
-    
-    void AsyncExecuteCommand();
     //virtual void SaveCommandResultsL();
     //virtual void DiscardCommandResultsL();
     virtual TBool IsRoot() const;
     virtual RPointerArray<CCreatorModuleBaseParameters>& CommandParameters();
     virtual const RPointerArray<CCreatorModuleBaseParameters>& CommandParameters() const;
     
-    void AsyncExecuteCommandAndWaitL();
-    
 protected:
 
     /**
@@ -290,11 +286,6 @@
      */
     void IncreasePhoneNumL( const TDesC& aOriginal, TInt aDelta, HBufC* aIncreased ) const;
     
-    static TInt ExecuteCommandCB( TAny *aPtr );
-    virtual void AsyncExecuteCommandL();
-    void StartNextLoop();
-    void AsyncCommandFinished();
-
 protected:
     
     // Sub-element array
@@ -312,11 +303,6 @@
     TBool iIsRoot;
     CCreatorEngine* iEngine;
     RPointerArray<CCreatorModuleBaseParameters> iParameters;
-    
-    CAsyncCallBack iAsyncCallback;
-    CActiveSchedulerWait iWaiter;
-    volatile TInt iAsyncOpError;
-    TInt iLoopIndex;
 };
 
 /**
@@ -345,4 +331,19 @@
     CCreatorCalendarElementBase(CCreatorEngine* aEngine);
 };
 
+/**
+ * Message elements
+ */
+
+/**
+ * Base class for message elements
+ */
+class CCreatorMessageElementBase : public CCreatorScriptElement
+{
+public:
+    static CCreatorMessageElementBase* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
+protected:
+    CCreatorMessageElementBase(CCreatorEngine* aEngine);
+};
+
 #endif /*CREATORSCRIPTELEMENT_H_*/