# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1265098341 -7200
# Node ID 28ae839b4c093e8f759048baf5cfeba3c093b672
# Parent  69530231af7856be41372b9f90a9442a239562cf
Revision: 201003
Kit: 201005

diff -r 69530231af78 -r 28ae839b4c09 layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Jan 26 12:18:06 2010 +0200
+++ b/layers.sysdef.xml	Tue Feb 02 10:12:21 2010 +0200
@@ -7,7 +7,7 @@
   <systemModel>
     <layer name="mw_layer">
       <module name="messagingmw">
-        <unit unitID="Medo.messagingmw" mrp="" bldFile="&layer_real_source_path;/group" name="messagingmw" />
+        <unit unitID="MeCoDo.messagingmw" mrp="" bldFile="&layer_real_source_path;/group" name="messagingmw" />
       </module>
     </layer>
   </systemModel>
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/biomsgfw/group/messaging_biomsg.mrp
--- a/messagingfw/biomsgfw/group/messaging_biomsg.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/biomsgfw/group/messaging_biomsg.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging_biomsg
 
 #All the subdirectories have to be explicitly referenced
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgconf/group/messaging_config.mrp
--- a/messagingfw/msgconf/group/messaging_config.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgconf/group/messaging_config.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging_config
 source  	\sf\mw\messagingmw\messagingfw\msgconf
 binary  	\sf\mw\messagingmw\messagingfw\msgconf\group all
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgsrvnstore/group/messaging_framework.mrp
--- a/messagingfw/msgsrvnstore/group/messaging_framework.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgsrvnstore/group/messaging_framework.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging_framework
 
 source  \sf\mw\messagingmw\messagingfw\msgsrvnstore
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgsrvnstore/server/test/base/src/TESTSMTM.CPP
--- a/messagingfw/msgsrvnstore/server/test/base/src/TESTSMTM.CPP	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgsrvnstore/server/test/base/src/TESTSMTM.CPP	Tue Feb 02 10:12:21 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+	// Copyright (c) 1998-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"
@@ -21,7 +21,7 @@
 #define _LOCAL_L(a) (TPtrC8((const TText8 *)(a)))
 
 
-class CMsvWait: public CActive
+NONSHARABLE_CLASS  (CMsvWait): public CActive
 /**
 @internalComponent
 @released
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtest/group/messaging_test.mrp
--- a/messagingfw/msgtest/group/messaging_test.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtest/group/messaging_test.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging_test
 
 source  \sf\mw\messagingmw\messagingfw\msgtest
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtest/targetautomation/Script/autotest.txt
--- a/messagingfw/msgtest/targetautomation/Script/autotest.txt	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtest/targetautomation/Script/autotest.txt	Tue Feb 02 10:12:21 2010 +0200
@@ -1,9 +1,9 @@
 # Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtest/targetautomation/TechviewStart/start.rpp
--- a/messagingfw/msgtest/targetautomation/TechviewStart/start.rpp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtest/targetautomation/TechviewStart/start.rpp	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 // Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
+// under the terms of the License "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestActions/Capabilities/inc/CMtfTestActionSendEMsvNotifySessionEvent.h
--- a/messagingfw/msgtestfw/TestActions/Capabilities/inc/CMtfTestActionSendEMsvNotifySessionEvent.h	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtestfw/TestActions/Capabilities/inc/CMtfTestActionSendEMsvNotifySessionEvent.h	Tue Feb 02 10:12:21 2010 +0200
@@ -1,9 +1,9 @@
 // Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
+// under the terms of the License "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestActions/Capabilities/src/CMtfTestActionSendEMsvNotifySessionEvent.cpp
--- a/messagingfw/msgtestfw/TestActions/Capabilities/src/CMtfTestActionSendEMsvNotifySessionEvent.cpp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtestfw/TestActions/Capabilities/src/CMtfTestActionSendEMsvNotifySessionEvent.cpp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,9 +1,9 @@
 // Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
+// under the terms of the License "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[GetBtMtmUid]
-actionParam	= btUid
-
-[CreateBtService]
-actionParam	= session btUid _ _ _ _ "BTService" btServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[CreateMessageofType]
-actionParam	= sendAs btUid sendAsMessage
-
-[SendAsAddRecipient]
-actionParam	= sendAsMessage   "00025B016A9D"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo  btUid  0  _ _
-
-[CloseMessage]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
-[CreateChildrenSelDraft]
-actionParam	= session draftsFolderId msgSelection
-
-[GetMessageAtIndex]
-actionParam	= msgSelection 0 msgId
-
-[GetEntry]
-actionParam	= session msgId msgEntry
-
-[VerifyRecipients]
-actionParam	= msgEntry TImHeaderEncodingInf::TFieldList::ETo  "00025B016A9D" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 	CM-SENDAS-CIT-0013-HP
-//! @SYMTestCaseDesc 	Add Recipient Address of type "To" to BT message where number of recepients added <= Number of recipeints supported
-//! @SYMFssID 
-//! @SYMTestStatus 	Defined
-//! @SYMTestPriority	High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	The Recipient Address is added to the BT message, verification of the recipient address is successful
-//! @SYMTestType 	CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateRegistry
-GetBTMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	GetBtMtmUid
-CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateBtService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	ConnectSendAsServer
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	SendAsAddRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CloseMessage
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft1
-CreateChildrenSelection 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateChildrenSelDraft
-GetMessageAtIndex		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	GetMessageAtIndex
-GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	GetEntry
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add_To_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add_To_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,50 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[GetBtMtmUid]
+actionParam	= btUid
+
+[CreateBtService]
+actionParam	= session btUid _ _ _ _ "BTService" btServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[CreateMessageofType]
+actionParam	= sendAs btUid sendAsMessage
+
+[SendAsAddRecipient]
+actionParam	= sendAsMessage   "00025B016A9D"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo  btUid  0  _ _
+
+[CloseMessage]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
+[CreateChildrenSelDraft]
+actionParam	= session draftsFolderId msgSelection
+
+[GetMessageAtIndex]
+actionParam	= msgSelection 0 msgId
+
+[GetEntry]
+actionParam	= session msgId msgEntry
+
+[VerifyRecipients]
+actionParam	= msgEntry TImHeaderEncodingInf::TFieldList::ETo  "00025B016A9D" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add_To_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add_To_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,53 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 	CM-SENDAS-CIT-0013-HP
+//! @SYMTestCaseDesc 	Add Recipient Address of type "To" to BT message where number of recepients added <= Number of recipeints supported
+//! @SYMFssID 
+//! @SYMTestStatus 	Defined
+//! @SYMTestPriority	High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	The Recipient Address is added to the BT message, verification of the recipient address is successful
+//! @SYMTestType 	CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateRegistry
+GetBTMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	GetBtMtmUid
+CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateBtService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	ConnectSendAsServer
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	SendAsAddRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CloseMessage
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft1
+CreateChildrenSelection 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	CreateChildrenSelDraft
+GetMessageAtIndex		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	GetMessageAtIndex
+GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini	GetEntry
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[GetBtMtmUid]
-actionParam	= btUid
-
-[CreateBtService]
-actionParam	= session btUid _ _ _ _ "BTService" btServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[CreateMessageofType]
-actionParam	= sendAs btUid sendAsMessage 
-
-[SendAsAddRecipient]
-actionParam	= sendAsMessage  "00025B016A9D"  _ RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc  btUid 0 _ _
-
-[CloseMessage]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
-[CreateChildrenSelDraft]
-actionParam	= session draftsFolderId msgSelection
-
-[GetMessageAtIndex]
-actionParam	= msgSelection 0 msgId
-
-[GetEntry]
-actionParam	= session msgId msgEntry
-
-[VerifyRecipients]
-actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "00025B016A9D" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID CM-SENDAS-CIT-0013-HP
-//! @SYMTestCaseDesc Add Recipient Address of type "To" to BT message where number of recepients added < Number of recipeints supported
-//! @SYMFssID 
-//! @SYMTestStatus Defined
-//! @SYMTestPriority High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults The Recipient Address is added to the BT message
-//! @SYMTestType CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateRegistry
-GetBTMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	GetBtMtmUid
-CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateBtService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	ConnectSendAsServer
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	SendAsAddRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CloseMessage
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft1
-CreateChildrenSelection 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateChildrenSelDraft
-GetMessageAtIndex		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	GetMessageAtIndex
-GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	GetEntry
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add_Cc_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add_Cc_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,50 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[GetBtMtmUid]
+actionParam	= btUid
+
+[CreateBtService]
+actionParam	= session btUid _ _ _ _ "BTService" btServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[CreateMessageofType]
+actionParam	= sendAs btUid sendAsMessage 
+
+[SendAsAddRecipient]
+actionParam	= sendAsMessage  "00025B016A9D"  _ RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc  btUid 0 _ _
+
+[CloseMessage]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
+[CreateChildrenSelDraft]
+actionParam	= session draftsFolderId msgSelection
+
+[GetMessageAtIndex]
+actionParam	= msgSelection 0 msgId
+
+[GetEntry]
+actionParam	= session msgId msgEntry
+
+[VerifyRecipients]
+actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "00025B016A9D" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add_Cc_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add_Cc_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,53 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID CM-SENDAS-CIT-0013-HP
+//! @SYMTestCaseDesc Add Recipient Address of type "To" to BT message where number of recepients added < Number of recipeints supported
+//! @SYMFssID 
+//! @SYMTestStatus Defined
+//! @SYMTestPriority High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults The Recipient Address is added to the BT message
+//! @SYMTestType CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateRegistry
+GetBTMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	GetBtMtmUid
+CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateBtService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	ConnectSendAsServer
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	SendAsAddRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CloseMessage
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft1
+CreateChildrenSelection 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	CreateChildrenSelDraft
+GetMessageAtIndex		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	GetMessageAtIndex
+GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini	GetEntry
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[GetBtMtmUid]
-actionParam	= btUid
-
-[CreateBtService]
-actionParam	= session btUid _ _ _ _ "BTService" btServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[CreateMessageofType]
-actionParam	= sendAs btUid sendAsMessage 
-
-[SendAsAddRecipient]
-actionParam	= sendAsMessage  "00025B016A9D"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc btUid  -5 _ _
-
-[CloseMessage]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0015-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "Bcc" to BT message, 
-//!				where message type does not support Bcc address
-//! @SYMFssID 
-//! @SYMTestStatus 		Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	The Test should fail with KErrNotSupported
-//! @SYMTestType 		CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateRegistry
-GetBTMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	GetBtMtmUid
-CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateBtService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	ConnectSendAsServer
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	SendAsAddRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CloseMessage
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft1
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add_Bcc_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add_Bcc_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,38 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[GetBtMtmUid]
+actionParam	= btUid
+
+[CreateBtService]
+actionParam	= session btUid _ _ _ _ "BTService" btServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[CreateMessageofType]
+actionParam	= sendAs btUid sendAsMessage 
+
+[SendAsAddRecipient]
+actionParam	= sendAsMessage  "00025B016A9D"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc btUid  -5 _ _
+
+[CloseMessage]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add_Bcc_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add_Bcc_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,51 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0015-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "Bcc" to BT message, 
+//!				where message type does not support Bcc address
+//! @SYMFssID 
+//! @SYMTestStatus 		Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	The Test should fail with KErrNotSupported
+//! @SYMTestType 		CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateRegistry
+GetBTMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	GetBtMtmUid
+CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateBtService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	ConnectSendAsServer
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	SendAsAddRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CloseMessage
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft1
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[GetIrMtmUid]
-actionParam	= irUid
-
-[CreateIrService]
-actionParam	= session irUid _ _ _ _ "IRService" irServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[CreateMessageofType]
-actionParam	= sendAs irUid sendAsMessage
-
-[SendAsAddRecipient]
-actionParam	= sendAsMessage  "0001"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo irUid 0 _ _
-
-[CloseMessage]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
-[CreateChildrenSelDraft]
-actionParam	= session draftsFolderId msgSelection
-
-[GetMessageAtIndex]
-actionParam	= msgSelection 0 msgId
-
-[GetEntry]
-actionParam	= session msgId msgEntry
-
-[VerifyRecipients]
-actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "0001" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0013-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "To" to IR message where number of recepients added < Number of recipeints supported
-//! @SYMFssID 
-//! @SYMTestStatus 		Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	The Recipient Address is added to the IR message
-//! @SYMTestType 		CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateRegistry
-GetIRMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	GetIrMtmUid
-CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateIrService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	ConnectSendAsServer
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	SendAsAddRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CloseMessage
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft1
-CreateChildrenSelection 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateChildrenSelDraft
-GetMessageAtIndex		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	GetMessageAtIndex
-GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	GetEntry
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add_To_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add_To_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,50 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[GetIrMtmUid]
+actionParam	= irUid
+
+[CreateIrService]
+actionParam	= session irUid _ _ _ _ "IRService" irServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[CreateMessageofType]
+actionParam	= sendAs irUid sendAsMessage
+
+[SendAsAddRecipient]
+actionParam	= sendAsMessage  "0001"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo irUid 0 _ _
+
+[CloseMessage]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
+[CreateChildrenSelDraft]
+actionParam	= session draftsFolderId msgSelection
+
+[GetMessageAtIndex]
+actionParam	= msgSelection 0 msgId
+
+[GetEntry]
+actionParam	= session msgId msgEntry
+
+[VerifyRecipients]
+actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "0001" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add_To_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add_To_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,53 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0013-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "To" to IR message where number of recepients added < Number of recipeints supported
+//! @SYMFssID 
+//! @SYMTestStatus 		Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	The Recipient Address is added to the IR message
+//! @SYMTestType 		CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateRegistry
+GetIRMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	GetIrMtmUid
+CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateIrService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	ConnectSendAsServer
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	SendAsAddRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CloseMessage
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft1
+CreateChildrenSelection 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	CreateChildrenSelDraft
+GetMessageAtIndex		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	GetMessageAtIndex
+GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini	GetEntry
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[GetIrMtmUid]
-actionParam	= irUid
-
-[CreateIrService]
-actionParam	= session irUid _ _ _ _ "IRService" irServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[CreateMessageofType]
-actionParam	= sendAs irUid sendAsMessage 
-
-[SendAsAddRecipient1]
-actionParam	= sendAsMessage  "98455102343"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc irUid 0 _ _
-
-[CloseMessage]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
-[CreateChildrenSelDraft]
-actionParam	= session draftsFolderId msgSelection
-
-[GetMessageAtIndex]
-actionParam	= msgSelection 0 msgId
-
-[GetEntry]
-actionParam	= session msgId msgEntry
-
-[VerifyRecipients]
-actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "98455102343" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0015-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "Cc" to IR message where the message type does not support 
-//! @SYMFssID 
-//! @SYMTestStatus 		Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	The Recipient Address is added to the IR message
-//! @SYMTestType 		CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateRegistry
-GetIRMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	GetIrMtmUid
-CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateIrService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	ConnectSendAsServer
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	SendAsAddRecipient1
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CloseMessage
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft1
-CreateChildrenSelection 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateChildrenSelDraft
-GetMessageAtIndex		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	GetMessageAtIndex
-GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	GetEntry
-END_TEST_CASE
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add_Cc_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add_Cc_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,50 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[GetIrMtmUid]
+actionParam	= irUid
+
+[CreateIrService]
+actionParam	= session irUid _ _ _ _ "IRService" irServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[CreateMessageofType]
+actionParam	= sendAs irUid sendAsMessage 
+
+[SendAsAddRecipient1]
+actionParam	= sendAsMessage  "98455102343"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc irUid 0 _ _
+
+[CloseMessage]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
+[CreateChildrenSelDraft]
+actionParam	= session draftsFolderId msgSelection
+
+[GetMessageAtIndex]
+actionParam	= msgSelection 0 msgId
+
+[GetEntry]
+actionParam	= session msgId msgEntry
+
+[VerifyRecipients]
+actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "98455102343" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add_Cc_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add_Cc_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,53 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0015-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "Cc" to IR message where the message type does not support 
+//! @SYMFssID 
+//! @SYMTestStatus 		Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	The Recipient Address is added to the IR message
+//! @SYMTestType 		CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateRegistry
+GetIRMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	GetIrMtmUid
+CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateIrService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	ConnectSendAsServer
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	SendAsAddRecipient1
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CloseMessage
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft1
+CreateChildrenSelection 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	CreateChildrenSelDraft
+GetMessageAtIndex		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	GetMessageAtIndex
+GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini	GetEntry
+END_TEST_CASE
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[GetIrMtmUid]
-actionParam	= irUid
-
-[CreateIrService]
-actionParam	= session irUid _ _ _ _ "IRService" irServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[CreateMessageofType]
-actionParam	= sendAs irUid sendAsMessage
-
-[SendAsAddRecipient]
-actionParam	= sendAsMessage  "98455102343"  ""  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc  irUid  -5 _ _
-
-[CloseMessage]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0016-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "Bcc" to IR message, where the message type does not support Bcc recipient address
-//! @SYMFssID 
-//! @SYMTestStatus 		Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	Addition of Bcc recipient address should fail with KErrNotSupported
-//! @SYMTestType 		CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateRegistry
-GetIRMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	GetIrMtmUid
-CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateIrService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	ConnectSendAsServer
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	SendAsAddRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CloseMessage
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft1
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add_Bcc_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add_Bcc_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,38 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[GetIrMtmUid]
+actionParam	= irUid
+
+[CreateIrService]
+actionParam	= session irUid _ _ _ _ "IRService" irServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[CreateMessageofType]
+actionParam	= sendAs irUid sendAsMessage
+
+[SendAsAddRecipient]
+actionParam	= sendAsMessage  "98455102343"  ""  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc  irUid  -5 _ _
+
+[CloseMessage]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add_Bcc_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add_Bcc_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,50 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0016-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "Bcc" to IR message, where the message type does not support Bcc recipient address
+//! @SYMFssID 
+//! @SYMTestStatus 		Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	Addition of Bcc recipient address should fail with KErrNotSupported
+//! @SYMTestType 		CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateRegistry
+GetIRMTMUId			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	GetIrMtmUid
+CreateService			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateIrService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	ConnectSendAsServer
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	SendAsAddRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CloseMessage
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft1
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[CreateSmsService]
-actionParam	= session _ 0 1 _ _ smsServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[GetSmsMtmUid]
-actionParam	= smsUid
-
-[CreateMessageofType]
-actionParam	= sendAs smsUid sendAsMessage
-
-[SendAsAddRecipient]
-actionParam	= sendAsMessage  "98455102343" _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo smsUid 0 _ _
-
-[SendAsSaveMessageAndClose]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
-[CreateChildrenSelDraft]
-actionParam	= session draftsFolderId msgSelection
-
-[GetMessageAtIndex]
-actionParam	= msgSelection  0  msgId
-
-[GetEntry]
-actionParam	= session msgId msgEntry
-
-[VerifyRecipients]
-actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "98455102343" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0013-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "To" to SMS message where number of recepients added < Number of recipeints supported
-//! @SYMFssID 
-//! @SYMTestStatus	 	Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	The Recipient Address is added to the SMS message
-//! @SYMTestType 		CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	CreateRegistry
-CreateSmsService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	CreateSmsService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	ConnectSendAsServer
-GetSmsConstants  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	GetSmsMtmUid
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	SendAsAddRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	SendAsSaveMessageAndClose
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft1
-CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	CreateChildrenSelDraft
-GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	GetMessageAtIndex
-GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	GetEntry
-VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini	VerifyRecipients
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,50 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[CreateSmsService]
+actionParam	= session _ 0 1 _ _ smsServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[GetSmsMtmUid]
+actionParam	= smsUid
+
+[CreateMessageofType]
+actionParam	= sendAs smsUid sendAsMessage
+
+[SendAsAddRecipient]
+actionParam	= sendAsMessage  "98455102343" _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo smsUid 0 _ _
+
+[SendAsSaveMessageAndClose]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
+[CreateChildrenSelDraft]
+actionParam	= session draftsFolderId msgSelection
+
+[GetMessageAtIndex]
+actionParam	= msgSelection  0  msgId
+
+[GetEntry]
+actionParam	= session msgId msgEntry
+
+[VerifyRecipients]
+actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "98455102343" _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,54 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0013-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "To" to SMS message where number of recepients added < Number of recipeints supported
+//! @SYMFssID 
+//! @SYMTestStatus	 	Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	The Recipient Address is added to the SMS message
+//! @SYMTestType 		CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	CreateRegistry
+CreateSmsService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	CreateSmsService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	ConnectSendAsServer
+GetSmsConstants  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	GetSmsMtmUid
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	SendAsAddRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	SendAsSaveMessageAndClose
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	ChkChildrenCountDraft1
+CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	CreateChildrenSelDraft
+GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	GetMessageAtIndex
+GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	GetEntry
+VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini	VerifyRecipients
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[CreateSmsService]
-actionParam	= session _ 0 1 _ _ smsServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[GetSmsMtmUid]
-actionParam	= smsUid
-
-[CreateMessageofType]
-actionParam	= sendAs smsUid sendAsMessage
-
-[SendAsAddMultipleRecipient]
-actionParam	= sendAsMessage  "9844704790" _ RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo smsUid 0 "9844704790" "lon-cn-exchng2k.msexchange2k.closedtest.intra"
-[SendAsSaveMessageAndClose]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
-[CreateChildrenSelDraft]
-actionParam	= session draftsFolderId msgSelection
-
-[GetMessageAtIndex]
-actionParam	= msgSelection  0  msgId
-
-[GetEntry]
-actionParam	= session msgId msgEntry
-
-[SendAsCheckMultipleRecipientFlag]
-actionParam	= msgEntry
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0014-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "To" to SMS message where number of recepients added < Number of recipeints supported
-//! @SYMFssID 
-//! @SYMTestStatus	 	Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	The Recipient Address is added to the SMS message
-//! @SYMTestType 		CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	CreateRegistry
-CreateSmsService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	CreateSmsService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	ConnectSendAsServer
-GetSmsConstants  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	GetSmsMtmUid
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	CreateMessageofType
-SendAsAddMultipleRecipient	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	SendAsAddMultipleRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	SendAsSaveMessageAndClose
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	ChkChildrenCountDraft1
-CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	CreateChildrenSelDraft
-GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	GetMessageAtIndex
-GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	GetEntry
-SendAsCheckMultipleRecipientFlag c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini	SendAsCheckMultipleRecipientFlag
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,49 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[CreateSmsService]
+actionParam	= session _ 0 1 _ _ smsServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[GetSmsMtmUid]
+actionParam	= smsUid
+
+[CreateMessageofType]
+actionParam	= sendAs smsUid sendAsMessage
+
+[SendAsAddMultipleRecipient]
+actionParam	= sendAsMessage  "9844704790" _ RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo smsUid 0 "9844704790" "lon-cn-exchng2k.msexchange2k.closedtest.intra"
+[SendAsSaveMessageAndClose]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
+[CreateChildrenSelDraft]
+actionParam	= session draftsFolderId msgSelection
+
+[GetMessageAtIndex]
+actionParam	= msgSelection  0  msgId
+
+[GetEntry]
+actionParam	= session msgId msgEntry
+
+[SendAsCheckMultipleRecipientFlag]
+actionParam	= msgEntry
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,54 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0014-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "To" to SMS message where number of recepients added < Number of recipeints supported
+//! @SYMFssID 
+//! @SYMTestStatus	 	Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	The Recipient Address is added to the SMS message
+//! @SYMTestType 		CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	CreateRegistry
+CreateSmsService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	CreateSmsService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	ConnectSendAsServer
+GetSmsConstants  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	GetSmsMtmUid
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	CreateMessageofType
+SendAsAddMultipleRecipient	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	SendAsAddMultipleRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	SendAsSaveMessageAndClose
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	ChkChildrenCountDraft1
+CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	CreateChildrenSelDraft
+GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	GetMessageAtIndex
+GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	GetEntry
+SendAsCheckMultipleRecipientFlag c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini	SendAsCheckMultipleRecipientFlag
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[CreateSmsService]
-actionParam	= session _ 0 1 _ _ smsServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[GetSmsMtmUid]
-actionParam	= smsUid
-
-[CreateMessageofType]
-actionParam	= sendAs smsUid sendAsMessage 
-
-[SendAsAddRecipient]
-actionParam	= sendAsMessage  "98455102343"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc smsUid  0 _ _
-
-[CloseMessage]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
-[CreateChildrenSelDraft]
-actionParam	= session draftsFolderId msgSelection
-
-[GetMessageAtIndex]
-actionParam	= msgSelection  0  msgId
-
-[GetEntry]
-actionParam	= session msgId msgEntry
-
-[VerifyRecipients]
-actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "98455102343" _ 
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0015-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "Cc" to SMS message where the message type does not support Cc address
-//! @SYMFssID 
-//! @SYMTestStatus 		Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	The Recipient Address is added as a "To" address to the SMS message
-//! @SYMTestType 		CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	CreateRegistry
-CreateSmsService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	CreateSmsService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	ConnectSendAsServer
-GetSmsConstants  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	GetSmsMtmUid
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	SendAsAddRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	CloseMessage
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	ChkChildrenCountDraft1
-CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	CreateChildrenSelDraft
-GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	GetMessageAtIndex
-GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	GetEntry
-VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini	VerifyRecipients
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,50 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[CreateSmsService]
+actionParam	= session _ 0 1 _ _ smsServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[GetSmsMtmUid]
+actionParam	= smsUid
+
+[CreateMessageofType]
+actionParam	= sendAs smsUid sendAsMessage 
+
+[SendAsAddRecipient]
+actionParam	= sendAsMessage  "98455102343"  _  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc smsUid  0 _ _
+
+[CloseMessage]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
+[CreateChildrenSelDraft]
+actionParam	= session draftsFolderId msgSelection
+
+[GetMessageAtIndex]
+actionParam	= msgSelection  0  msgId
+
+[GetEntry]
+actionParam	= session msgId msgEntry
+
+[VerifyRecipients]
+actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo "98455102343" _ 
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,54 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0015-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "Cc" to SMS message where the message type does not support Cc address
+//! @SYMFssID 
+//! @SYMTestStatus 		Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	The Recipient Address is added as a "To" address to the SMS message
+//! @SYMTestType 		CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	CreateRegistry
+CreateSmsService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	CreateSmsService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	ConnectSendAsServer
+GetSmsConstants  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	GetSmsMtmUid
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	SendAsAddRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	CloseMessage
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	ChkChildrenCountDraft1
+CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	CreateChildrenSelDraft
+GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	GetMessageAtIndex
+GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	GetEntry
+VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini	VerifyRecipients
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[CreateSmsService]
-actionParam	= session _ 0 1 _ _ smsServiceId
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[GetSmsMtmUid]
-actionParam	= smsUid
-
-[CreateMessageofType]
-actionParam	= sendAs smsUid sendAsMessage
-
-[SendAsAddRecipient]
-actionParam	= sendAsMessage  "98455102343"  ""  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc  smsUid -5 _ _
-
-[SendAsSaveMessageAndClose]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0016-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "Bcc" to SMS message, where message type does not support Bcc address
-//! @SYMFssID 
-//! @SYMTestStatus 		Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 	
-//! @SYMTestExpectedResults 	Addition of Bcc type recipient address should fail with KErrNotSupported
-//! @SYMTestType CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	ResetMessageStore
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateRegistry
-CreateSmsService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateSmsService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	ConnectSendAsServer
-GetSmsConstants  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	GetSmsMtmUid
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	SendAsAddRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	SendAsSaveMessageAndClose
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini	ChkChildrenCountDraft1
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,39 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[CreateSmsService]
+actionParam	= session _ 0 1 _ _ smsServiceId
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[GetSmsMtmUid]
+actionParam	= smsUid
+
+[CreateMessageofType]
+actionParam	= sendAs smsUid sendAsMessage
+
+[SendAsAddRecipient]
+actionParam	= sendAsMessage  "98455102343"  ""  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc  smsUid -5 _ _
+
+[SendAsSaveMessageAndClose]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,50 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0016-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "Bcc" to SMS message, where message type does not support Bcc address
+//! @SYMFssID 
+//! @SYMTestStatus 		Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 	
+//! @SYMTestExpectedResults 	Addition of Bcc type recipient address should fail with KErrNotSupported
+//! @SYMTestType CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	ResetMessageStore
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	ChkChildrenCountDraft0
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	CreateRegistry
+CreateSmsService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	CreateSmsService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	ConnectSendAsServer
+GetSmsConstants  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	GetSmsMtmUid
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	SendAsAddRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	SendAsSaveMessageAndClose
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini	ChkChildrenCountDraft1
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[CreatePopAccount]
-actionParam = "MyAccount" "c:\msgtest\TestFramework\Configurations\EmailSettings\ODCPop3Settings.txt" accountId_1 PopSettings1 PopPrefs1 SmtpSettings1 SmtpPrefs1
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateSmtpService]
-actionParam	= session _ _ _ _ "SmtpService" smtpServiceId
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[CreateSmtpMtm]
-actionParam	= session smtpServiceId clientMtmRegistry smtpMtm
-
-[SetDefaultConfig0]
-actionParam   =  CMtfConfigurationType::TMtfConfigurationType::EMtfSmtpSettings "c:\msgtest\TestFramework\Configurations\EmailSettings\ODCSmtpSettings.txt"
-
-[SetSmtpServiceParams]
-actionParam	= session smtpServiceId	0
-
-[ChangeDfltSmtpService]
-actionParam = smtpServiceId smtpMtm
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[GetSmtpMtmUId]
-actionParam	= smtpUid
-
-[CreateMessageofType]
-actionParam	= sendAs smtpUid sendAsMessage
-
-[SendAsAddRecipient]
-actionParam	= sendAsMessage _ _ RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo smtpUid 0 smtpServiceId recipientAddress
-
-[SaveMessageAndClose]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
-[CreateChildrenSelDraft]
-actionParam	= session draftsFolderId msgSelection
-
-[GetMessageAtIndex]
-actionParam	= msgSelection  0  msgId
-
-[GetEntry]
-actionParam	= session msgId msgEntry
-
-[VerifyRecipients]
-actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo recipientAddress _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0013-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "To" to SMTP message where number of recepients added < Number of recipeints supported
-//! @SYMFssID 
-//! @SYMTestStatus 		Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	The Recipient Address is added to the SMTP message
-//! @SYMTestType CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	ResetMessageStore
-CreatePopAccount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	CreatePopAccount
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateSmtpService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	CreateSmtpService
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	CreateRegistry
-CreateSmtpMtm			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	CreateSmtpMtm
-SetDefaultConfiguration		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	SetDefaultConfig0
-SetSmtpServiceParameters	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	SetSmtpServiceParams
-ChangeDefaultSmtpService 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	ChangeDfltSmtpService
-EXECUTE_TEST_CASE
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	ConnectSendAsServer
-GetSMTPMTMUId  			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	GetSmtpMtmUId
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	SendAsAddRecipient
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	SaveMessageAndClose
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	ChkChildrenCountDraft1
-CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	CreateChildrenSelDraft
-GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	GetMessageAtIndex
-GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	GetEntry
-VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini	VerifyRecipients
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,65 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[CreatePopAccount]
+actionParam = "MyAccount" "c:\msgtest\TestFramework\Configurations\EmailSettings\ODCPop3Settings.txt" accountId_1 PopSettings1 PopPrefs1 SmtpSettings1 SmtpPrefs1
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateSmtpService]
+actionParam	= session _ _ _ _ "SmtpService" smtpServiceId
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[CreateSmtpMtm]
+actionParam	= session smtpServiceId clientMtmRegistry smtpMtm
+
+[SetDefaultConfig0]
+actionParam   =  CMtfConfigurationType::TMtfConfigurationType::EMtfSmtpSettings "c:\msgtest\TestFramework\Configurations\EmailSettings\ODCSmtpSettings.txt"
+
+[SetSmtpServiceParams]
+actionParam	= session smtpServiceId	0
+
+[ChangeDfltSmtpService]
+actionParam = smtpServiceId smtpMtm
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[GetSmtpMtmUId]
+actionParam	= smtpUid
+
+[CreateMessageofType]
+actionParam	= sendAs smtpUid sendAsMessage
+
+[SendAsAddRecipient]
+actionParam	= sendAsMessage _ _ RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo smtpUid 0 smtpServiceId recipientAddress
+
+[SaveMessageAndClose]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
+[CreateChildrenSelDraft]
+actionParam	= session draftsFolderId msgSelection
+
+[GetMessageAtIndex]
+actionParam	= msgSelection  0  msgId
+
+[GetEntry]
+actionParam	= session msgId msgEntry
+
+[VerifyRecipients]
+actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ETo recipientAddress _
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,59 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0013-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "To" to SMTP message where number of recepients added < Number of recipeints supported
+//! @SYMFssID 
+//! @SYMTestStatus 		Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	The Recipient Address is added to the SMTP message
+//! @SYMTestType CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	ResetMessageStore
+CreatePopAccount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	CreatePopAccount
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	ChkChildrenCountDraft0
+CreateSmtpService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	CreateSmtpService
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	CreateRegistry
+CreateSmtpMtm			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	CreateSmtpMtm
+SetDefaultConfiguration		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	SetDefaultConfig0
+SetSmtpServiceParameters	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	SetSmtpServiceParams
+ChangeDefaultSmtpService 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	ChangeDfltSmtpService
+EXECUTE_TEST_CASE
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	ConnectSendAsServer
+GetSMTPMTMUId  			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	GetSmtpMtmUId
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	SendAsAddRecipient
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	SaveMessageAndClose
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	ChkChildrenCountDraft1
+CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	CreateChildrenSelDraft
+GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	GetMessageAtIndex
+GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	GetEntry
+VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini	VerifyRecipients
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-[GetBaseConstants]
-actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
-
-[CreateSession]
-actionParam	= session
-
-[ResetMessageStore]
-actionParam	= session
-
-[CreatePopAccount]
-actionParam = "MyAccount" "c:\msgtest\TestFramework\Configurations\EmailSettings\ODCPop3Settings.txt" accountId_1 PopSettings1 PopPrefs1 SmtpSettings1 SmtpPrefs1
-
-[ChkChildrenCountDraft0]
-actionParam	= session draftsFolderId 0
-
-[CreateSmtpService]
-actionParam	= session _ _ _ _ "SmtpService" smtpServiceId
-
-[CreateRegistry]
-actionParam	= session clientMtmRegistry
-
-[CreateSmtpMtm]
-actionParam	= session smtpServiceId clientMtmRegistry smtpMtm
-
-[SetDefaultConfig0]
-actionParam   =  CMtfConfigurationType::TMtfConfigurationType::EMtfSmtpSettings "c:\msgtest\TestFramework\Configurations\EmailSettings\ODCSmtpSettings.txt"
-
-[SetSmtpServiceParams]
-actionParam	= session smtpServiceId	0
-
-[ChangeDfltSmtpService]
-actionParam = smtpServiceId smtpMtm
-
-[ConnectSendAsServer]
-actionParam	=  10 sendAs
-
-[GetSmtpMtmUId]
-actionParam	= smtpUid
-
-[CreateMessageofType]
-actionParam	= sendAs smtpUid sendAsMessage 
-
-[SendAsAddRecipientTo0]
-actionParam	= sendAsMessage  "odc@ban-xxxxxx01.intra"  "To0"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo  smtpUid 0  smtpServiceId _
-
-[SendAsAddRecipientCc0]
-actionParam	= sendAsMessage  "odc@ban-yyyyyy01.intra"  "Cc0"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc  smtpUid 0 smtpServiceId _
-
-[SendAsAddRecipientBcc0]
-actionParam	= sendAsMessage  "odc@ban-zzzzzz01.intra"  "Bcc0"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc smtpUid 0 smtpServiceId _
-
-[SendAsAddRecipientTo1]
-actionParam	= sendAsMessage  "odc@ban-mmmmmm01.intra"  "To1"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo   smtpUid 0 smtpServiceId _
-
-[SendAsAddRecipientCc1]
-actionParam	= sendAsMessage  "odc@ban-nnnnnn02.intra"  "Cc1"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc  smtpUid 0 smtpServiceId _
-
-[SendAsAddRecipientBcc1]
-actionParam	= sendAsMessage  "odc@ban-oooooo01.intra"  "Bcc1"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc  smtpUid 0 smtpServiceId _
-
-[SendAsAddRecipientBcc2]
-actionParam	= sendAsMessage  "odc@ban-ppppppp01.intra"  "Bcc2"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc  smtpUid 0 smtpServiceId _
-
-[CloseMessage]
-actionParam	= sendAsMessage
-
-[CloseSvrConnection]
-actionParam	= sendAs
-
-[ChkChildrenCountDraft1]
-actionParam	= session draftsFolderId 1
-
-[CreateChildrenSelDraft]
-actionParam	= session draftsFolderId msgSelection
-
-[GetMessageAtIndex]
-actionParam	= msgSelection  0  msgId
-
-[GetEntry]
-actionParam	= session msgId msgEntry
-
-[VerifyRecipientsTo]
-actionParam	= msgEntry  TImHeaderEncodingInfo::TFieldList::ETo "odc@ban-xxxxxx01.intra" "To0" "odc@ban-mmmmmm01.intra" "To1"
-
-[VerifyRecipientsCc]
-actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ECc "odc@ban-yyyyyy01.intra"  "Cc0" "odc@ban-nnnnnn02.intra"  "Cc1"
-
-[VerifyRecipientsBcc]
-actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::EBcc "odc@ban-zzzzzz01.intra"  "Bcc0"  "odc@ban-oooooo01.intra"  "Bcc1" "odc@ban-ppppppp01.intra" "Bcc2"
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.script
--- a/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.script	Tue Jan 26 12:18:06 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-//! @file
-//! @SYMTestCaseID 		CM-SENDAS-CIT-0017-HP
-//! @SYMTestCaseDesc 		Add Recipient Address of type "To", "Cc" and "Bcc" to SMTP message
-//! @SYMFssID 
-//! @SYMTestStatus 		Defined
-//! @SYMTestPriority 		High
-//! @SYMTestActions 
-//! @SYMTestExpectedResults 	The Recipient Address is added to the SMTP message
-//! @SYMTestType 		CIT
-
-
-RUN_UTILS DeleteFile c:\messaging.db
-LOAD_SUITE MessagingTestServer -SharedData
-
-PREFIX RUN_TEST_STEP 1000 MessagingTestServer
-BEGIN_TEST_CASE
-SETUP_TEST_CASE
-GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	GetBaseConstants
-CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	CreateSession
-ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	ResetMessageStore
-CreatePopAccount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	CreatePopAccount
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	ChkChildrenCountDraft0
-CreateSmtpService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	CreateSmtpService
-CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	CreateRegistry
-CreateSmtpMtm			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	CreateSmtpMtm
-SetDefaultConfiguration		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	SetDefaultConfig0
-SetSmtpServiceParameters	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	SetSmtpServiceParams
-ChangeDefaultSmtpService 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	ChangeDfltSmtpService
-EXECUTE_TEST_CASE
-GetSMTPMTMUId  			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	GetSmtpMtmUId
-ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	ConnectSendAsServer
-SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	CreateMessageofType
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	SendAsAddRecipientTo0
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	SendAsAddRecipientCc0
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	SendAsAddRecipientBcc0
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	SendAsAddRecipientTo1
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	SendAsAddRecipientCc1
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	SendAsAddRecipientBcc1
-SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	SendAsAddRecipientBcc2
-SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	CloseMessage
-CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	CloseSvrConnection
-CHECK_POSTCONDITIONS
-CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	ChkChildrenCountDraft1
-CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	CreateChildrenSelDraft
-GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	GetMessageAtIndex
-GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	GetEntry
-VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	VerifyRecipientsTo
-VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	VerifyRecipientsCc
-VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini	VerifyRecipientsBcc
-END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,89 @@
+[GetBaseConstants]
+actionParam	= inboxFolderId outboxFolderId draftsFolderId sentFolderId deletedFolderId
+
+[CreateSession]
+actionParam	= session
+
+[ResetMessageStore]
+actionParam	= session
+
+[CreatePopAccount]
+actionParam = "MyAccount" "c:\msgtest\TestFramework\Configurations\EmailSettings\ODCPop3Settings.txt" accountId_1 PopSettings1 PopPrefs1 SmtpSettings1 SmtpPrefs1
+
+[ChkChildrenCountDraft0]
+actionParam	= session draftsFolderId 0
+
+[CreateSmtpService]
+actionParam	= session _ _ _ _ "SmtpService" smtpServiceId
+
+[CreateRegistry]
+actionParam	= session clientMtmRegistry
+
+[CreateSmtpMtm]
+actionParam	= session smtpServiceId clientMtmRegistry smtpMtm
+
+[SetDefaultConfig0]
+actionParam   =  CMtfConfigurationType::TMtfConfigurationType::EMtfSmtpSettings "c:\msgtest\TestFramework\Configurations\EmailSettings\ODCSmtpSettings.txt"
+
+[SetSmtpServiceParams]
+actionParam	= session smtpServiceId	0
+
+[ChangeDfltSmtpService]
+actionParam = smtpServiceId smtpMtm
+
+[ConnectSendAsServer]
+actionParam	=  10 sendAs
+
+[GetSmtpMtmUId]
+actionParam	= smtpUid
+
+[CreateMessageofType]
+actionParam	= sendAs smtpUid sendAsMessage 
+
+[SendAsAddRecipientTo0]
+actionParam	= sendAsMessage  "odc@ban-xxxxxx01.intra"  "To0"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo  smtpUid 0  smtpServiceId _
+
+[SendAsAddRecipientCc0]
+actionParam	= sendAsMessage  "odc@ban-yyyyyy01.intra"  "Cc0"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc  smtpUid 0 smtpServiceId _
+
+[SendAsAddRecipientBcc0]
+actionParam	= sendAsMessage  "odc@ban-zzzzzz01.intra"  "Bcc0"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc smtpUid 0 smtpServiceId _
+
+[SendAsAddRecipientTo1]
+actionParam	= sendAsMessage  "odc@ban-mmmmmm01.intra"  "To1"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientTo   smtpUid 0 smtpServiceId _
+
+[SendAsAddRecipientCc1]
+actionParam	= sendAsMessage  "odc@ban-nnnnnn02.intra"  "Cc1"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientCc  smtpUid 0 smtpServiceId _
+
+[SendAsAddRecipientBcc1]
+actionParam	= sendAsMessage  "odc@ban-oooooo01.intra"  "Bcc1"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc  smtpUid 0 smtpServiceId _
+
+[SendAsAddRecipientBcc2]
+actionParam	= sendAsMessage  "odc@ban-ppppppp01.intra"  "Bcc2"  RSendAsMessage::TSendAsRecipientType::ESendAsRecipientBcc  smtpUid 0 smtpServiceId _
+
+[CloseMessage]
+actionParam	= sendAsMessage
+
+[CloseSvrConnection]
+actionParam	= sendAs
+
+[ChkChildrenCountDraft1]
+actionParam	= session draftsFolderId 1
+
+[CreateChildrenSelDraft]
+actionParam	= session draftsFolderId msgSelection
+
+[GetMessageAtIndex]
+actionParam	= msgSelection  0  msgId
+
+[GetEntry]
+actionParam	= session msgId msgEntry
+
+[VerifyRecipientsTo]
+actionParam	= msgEntry  TImHeaderEncodingInfo::TFieldList::ETo "odc@ban-xxxxxx01.intra" "To0" "odc@ban-mmmmmm01.intra" "To1"
+
+[VerifyRecipientsCc]
+actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::ECc "odc@ban-yyyyyy01.intra"  "Cc0" "odc@ban-nnnnnn02.intra"  "Cc1"
+
+[VerifyRecipientsBcc]
+actionParam	= msgEntry TImHeaderEncodingInfo::TFieldList::EBcc "odc@ban-zzzzzz01.intra"  "Bcc0"  "odc@ban-oooooo01.intra"  "Bcc1" "odc@ban-ppppppp01.intra" "Bcc2"
\ No newline at end of file
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgtestfw/TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.script	Tue Feb 02 10:12:21 2010 +0200
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+//! @file
+//! @SYMTestCaseID 		CM-SENDAS-CIT-0017-HP
+//! @SYMTestCaseDesc 		Add Recipient Address of type "To", "Cc" and "Bcc" to SMTP message
+//! @SYMFssID 
+//! @SYMTestStatus 		Defined
+//! @SYMTestPriority 		High
+//! @SYMTestActions 
+//! @SYMTestExpectedResults 	The Recipient Address is added to the SMTP message
+//! @SYMTestType 		CIT
+
+
+RUN_UTILS DeleteFile c:\messaging.db
+LOAD_SUITE MessagingTestServer -SharedData
+
+PREFIX RUN_TEST_STEP 1000 MessagingTestServer
+BEGIN_TEST_CASE
+SETUP_TEST_CASE
+GetBaseConstants		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	GetBaseConstants
+CreateSession			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	CreateSession
+ResetMessageStore		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	ResetMessageStore
+CreatePopAccount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	CreatePopAccount
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	ChkChildrenCountDraft0
+CreateSmtpService		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	CreateSmtpService
+CreateRegistry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	CreateRegistry
+CreateSmtpMtm			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	CreateSmtpMtm
+SetDefaultConfiguration		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	SetDefaultConfig0
+SetSmtpServiceParameters	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	SetSmtpServiceParams
+ChangeDefaultSmtpService 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	ChangeDfltSmtpService
+EXECUTE_TEST_CASE
+GetSMTPMTMUId  			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	GetSmtpMtmUId
+ConnectSendAsServer		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	ConnectSendAsServer
+SendAsCreateMessageofType	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	CreateMessageofType
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	SendAsAddRecipientTo0
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	SendAsAddRecipientCc0
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	SendAsAddRecipientBcc0
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	SendAsAddRecipientTo1
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	SendAsAddRecipientCc1
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	SendAsAddRecipientBcc1
+SendAsAddRecipient		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	SendAsAddRecipientBcc2
+SendAsSaveMessageAndClose	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	CloseMessage
+CloseSendAsServerConnection	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	CloseSvrConnection
+CHECK_POSTCONDITIONS
+CheckChildrenCount		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	ChkChildrenCountDraft1
+CreateChildrenSelection  	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	CreateChildrenSelDraft
+GetMessageAtIndex	 	c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	GetMessageAtIndex
+GetEntry			c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	GetEntry
+VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	VerifyRecipientsTo
+VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	VerifyRecipientsCc
+VerifyRecipients  		c:\msgtest\TestFramework\ScriptedTestCases\SendAs\MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini	VerifyRecipientsBcc
+END_TEST_CASE
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/group/bld.inf
--- a/messagingfw/msgtestfw/group/bld.inf	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtestfw/group/bld.inf	Tue Feb 02 10:12:21 2010 +0200
@@ -1104,10 +1104,10 @@
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0003-CreateMultipleMessages.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0003-createmultiplemessages.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0009-SetSubject.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0009-setsubject.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0011-SetBioType.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0011-setbiotype.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0013-add'to'recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add_To_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0013-add_to_recipientaddr.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0014-AddRecipientAddrMaxLimit.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0014-addrecipientaddrmaxlimit.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0015-add'cc'recipientaddr.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0016-add'bcc'recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add_Cc_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0015-add_cc_recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add_Bcc_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0016-add_bcc_recipientaddr.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0018-AddAttachment.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0018-addattachment.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0019-AddAttachmentWithoutMime.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0019-addattachmentwithoutmime.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0020-AddLinkedAttachment.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0020-addlinkedattachment.ini
@@ -1127,10 +1127,10 @@
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0003-CreateMultipleMessages.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0003-createmultiplemessages.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0009-SetSubject.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0009-setsubject.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0011-SetBioType.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0011-setbiotype.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0013-add'to'recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add_To_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0013-add_to_recipientaddr.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0014-AddRecipientAddrMaxLimit.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0014-addrecipientaddrmaxlimit.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0015-add'cc'recipientaddr.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0016-add'bcc'recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add_Cc_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0015-add_cc_recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add_Bcc_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0016-add_bcc_recipientaddr.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0018-AddAttachment.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0018-addattachment.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0019-AddAttachmentWithoutMime.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0019-addattachmentwithoutmime.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0020-AddLinkedAttachment.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0020-addlinkedattachment.ini
@@ -1154,10 +1154,10 @@
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0007-SetBodyTextUsingBuffer.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0007-setbodytextusingbuffer.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0010-SetSubjectNotSupported.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0010-setsubjectnotsupported.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0011-SetBioType.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0011-setbiotype.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0013-add'to'recipientaddr.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0014-add'to'multiplerecipientaddr.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0015-add'cc'recipientaddr.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0016-add'bcc'recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0013-add_to_recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0014-add_to_multiplerecipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0015-add_cc_recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0016-add_bcc_recipientaddr.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0026-ConfirmedSend.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0026-confirmedsend.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0028-ConfirmedSendReject.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0028-confirmedsendreject.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0031-UnConfirmedSend.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0031-unconfirmedsend.ini
@@ -1190,8 +1190,8 @@
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0007-SetBodyTextUsingBuffer.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0007-setbodytextusingbuffer.ini 
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0009-SetSubject.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0009-setsubject.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0012-SetBioTypeNotSupported.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0012-setbiotypenotsupported.ini 
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0013-add'to'recipientaddr.ini
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0017-add'toccbcc'recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0013-add_to_recipientaddr.ini
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0017-add_toccbcc_recipientaddr.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0018-AddAttachment.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0018-addattachment.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0019-AddAttachmentWithoutMime.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0019-addattachmentwithoutmime.ini
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0020-AddLinkedAttachment.ini /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0020-addlinkedattachment.ini
@@ -1222,10 +1222,10 @@
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0003-CreateMultipleMessages.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0003-createmultiplemessages.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0009-SetSubject.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0009-setsubject.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0011-SetBioType.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0011-setbiotype.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add'To'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0013-add'to'recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0013-Add_To_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0013-add_to_recipientaddr.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0014-AddRecipientAddrMaxLimit.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0014-addrecipientaddrmaxlimit.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add'Cc'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0015-add'cc'recipientaddr.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add'Bcc'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0016-add'bcc'recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0015-Add_Cc_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0015-add_cc_recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0016-Add_Bcc_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0016-add_bcc_recipientaddr.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0018-AddAttachment.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0018-addattachment.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0019-AddAttachmentWithoutMime.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0019-addattachmentwithoutmime.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-BT-CIT-0020-AddLinkedAttachment.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-bt-cit-0020-addlinkedattachment.script
@@ -1244,10 +1244,10 @@
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0003-CreateMultipleMessages.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0003-createmultiplemessages.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0009-SetSubject.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0009-setsubject.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0011-SetBioType.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0011-setbiotype.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add'To'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0013-add'to'recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0013-Add_To_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0013-add_to_recipientaddr.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0014-AddRecipientAddrMaxLimit.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0014-addrecipientaddrmaxlimit.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add'Cc'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0015-add'cc'recipientaddr.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add'Bcc'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0016-add'bcc'recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0015-Add_Cc_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0015-add_cc_recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0016-Add_Bcc_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0016-add_bcc_recipientaddr.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0018-AddAttachment.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0018-addattachment.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0019-AddAttachmentWithoutMime.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0019-addattachmentwithoutmime.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-IR-CIT-0020-AddLinkedAttachment.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-ir-cit-0020-addlinkedattachment.script
@@ -1270,10 +1270,10 @@
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0007-SetBodyTextUsingBuffer.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0007-setbodytextusingbuffer.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0010-SetSubjectNotSupported.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0010-setsubjectnotsupported.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0011-SetBioType.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0011-setbiotype.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add'To'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0013-add'to'recipientaddr.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add'To'MultipleRecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0014-add'to'multiplerecipientaddr.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add'Cc'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0015-add'cc'recipientaddr.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add'Bcc'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0016-add'bcc'recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0013-Add_To_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0013-add_to_recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0014-Add_To_MultipleRecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0014-add_to_multiplerecipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0015-Add_Cc_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0015-add_cc_recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0016-Add_Bcc_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0016-add_bcc_recipientaddr.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0036-CancelSend.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0036-cancelsend.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0037-GetProgressInfoMsgClosed.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0037-getprogressinfomsgclosed.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMS-CIT-0041-LaunchEditorAndClose.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-sms-cit-0041-launcheditorandclose.script
@@ -1319,8 +1319,8 @@
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0007-SetBodyTextUsingBuffer.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0007-setbodytextusingbuffer.script 
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0009-SetSubject.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0009-setsubject.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0012-SetBioTypeNotSupported.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0012-setbiotypenotsupported.script 
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add'To'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0013-add'to'recipientaddr.script
-../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add'ToCcBcc'RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0017-add'toccbcc'recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0013-Add_To_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0013-add_to_recipientaddr.script
+../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0017-Add_ToCcBcc_RecipientAddr.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0017-add_toccbcc_recipientaddr.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0018-AddAttachment.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0018-addattachment.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0019-AddAttachmentWithoutMime.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0019-addattachmentwithoutmime.script
 ../TestCases/ScriptedTestCases/SendAs/MSG-SENDAS-SMTP-CIT-0020-AddLinkedAttachment.script /epoc32/winscw/c/msgtest/testframework/scriptedtestcases/sendas/msg-sendas-smtp-cit-0020-addlinkedattachment.script
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestfw/group/messaging_testframework.mrp
--- a/messagingfw/msgtestfw/group/messaging_testframework.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtestfw/group/messaging_testframework.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging_testframework
 
 source  \sf\mw\messagingmw\messagingfw\msgtestfw
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestproduct/framework/group/T_MsgFramework.mph
--- a/messagingfw/msgtestproduct/framework/group/T_MsgFramework.mph	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtestproduct/framework/group/T_MsgFramework.mph	Tue Feb 02 10:12:21 2010 +0200
@@ -1,9 +1,9 @@
 // Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
+// under the terms of the License "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtestproduct/group/messaging_testproduct.mrp
--- a/messagingfw/msgtestproduct/group/messaging_testproduct.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtestproduct/group/messaging_testproduct.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,6 +1,17 @@
-#messaging_testproduct.mrp
 #
-#Copyright (c) 2006 Symbian Software Ltd.  All rights reserved.
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
 #
 component	messaging_testproduct
 source	\sf\mw\messagingmw\messagingfw\msgtestproduct
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgtests/group/messaging.mrp
--- a/messagingfw/msgtests/group/messaging.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgtests/group/messaging.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging
 
 source	\sf\mw\messagingmw\messagingfw\msgtests\documentation
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/msgurlhandler/group/messaging_urlhandler.mrp
--- a/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging_urlhandler
 
 source  \sf\mw\messagingmw\messagingfw\msgurlhandler
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp
--- a/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging_schedulesend
 source  \sf\mw\messagingmw\messagingfw\scheduledsendmtm
 binary	\sf\mw\messagingmw\messagingfw\scheduledsendmtm\group	all
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/sendas/group/messaging_sendas2.mrp
--- a/messagingfw/sendas/group/messaging_sendas2.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/sendas/group/messaging_sendas2.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging_sendas2
 
 source	\sf\mw\messagingmw\messagingfw\sendas
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp
--- a/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	lbs_suplsmstrigger
 
 source	\sf\mw\messagingmw\messagingfw\suplsmshandler\
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp
--- a/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	lbs_suplwappush
 
 source	\sf\mw\messagingmw\messagingfw\suplwappushhandler\
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/MiscPushMsgUtils/inc/CMultipartBinIterator.h
--- a/messagingfw/wappushfw/MiscPushMsgUtils/inc/CMultipartBinIterator.h	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/MiscPushMsgUtils/inc/CMultipartBinIterator.h	Tue Feb 02 10:12:21 2010 +0200
@@ -22,8 +22,8 @@
 #ifndef __CMULTIPARTBINITERATOR_H__
 #define __CMULTIPARTBINITERATOR_H__
 
-#include "wapdecoder.h"
-#include "cmultipartiteratorbase.h"
+#include <push/wapdecoder.h>
+#include <push/cmultipartiteratorbase.h>
 
 //##ModelId=3B659EE10005
 class CMultipartBinIterator : public CMultipartIteratorBase
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/MiscPushMsgUtils/inc/cmultiparttextiterator.h
--- a/messagingfw/wappushfw/MiscPushMsgUtils/inc/cmultiparttextiterator.h	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/MiscPushMsgUtils/inc/cmultiparttextiterator.h	Tue Feb 02 10:12:21 2010 +0200
@@ -26,8 +26,8 @@
 #include <e32std.h>
 #include <e32base.h>
 
-#include "cmultipartiteratorbase.h"
-#include "pushdispatcher.h"
+#include <push/cmultipartiteratorbase.h>
+#include <push/pushdispatcher.h>
 
 
 _LIT(KMultipartText, "multipart/");
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/SISLContentHandlers/strings/siattributetable.st
--- a/messagingfw/wappushfw/SISLContentHandlers/strings/siattributetable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/siattributetable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/SISLContentHandlers/strings/siattributevaluetable.st
--- a/messagingfw/wappushfw/SISLContentHandlers/strings/siattributevaluetable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/siattributevaluetable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/SISLContentHandlers/strings/sitagstable.st
--- a/messagingfw/wappushfw/SISLContentHandlers/strings/sitagstable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/sitagstable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/SISLContentHandlers/strings/slattributetable.st
--- a/messagingfw/wappushfw/SISLContentHandlers/strings/slattributetable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/slattributetable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/SISLContentHandlers/strings/slattributevaluetable.st
--- a/messagingfw/wappushfw/SISLContentHandlers/strings/slattributevaluetable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/slattributevaluetable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/SISLContentHandlers/strings/sltagstable.st
--- a/messagingfw/wappushfw/SISLContentHandlers/strings/sltagstable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/sltagstable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/group/wap-browser_wappush.mrp
--- a/messagingfw/wappushfw/group/wap-browser_wappush.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/group/wap-browser_wappush.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	wap-browser_wappush
 source	\sf\mw\messagingmw\messagingfw\wappushfw
 binary	\sf\mw\messagingmw\messagingfw\wappushfw\group	all
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeTable.mak
--- a/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeTable.mak	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeTable.mak	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeValueTable.mak
--- a/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeValueTable.mak	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeValueTable.mak	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00TagTable.mak
--- a/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00TagTable.mak	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00TagTable.mak	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeTable.st
--- a/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeTable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeTable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeValueTable.st
--- a/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeValueTable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeValueTable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00TagTable.st
--- a/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00TagTable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00TagTable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeTable.st
--- a/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeTable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeTable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeValueTable.st
--- a/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeValueTable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeValueTable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00TagTable.st
--- a/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00TagTable.st	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00TagTable.st	Tue Feb 02 10:12:21 2010 +0200
@@ -2,9 +2,9 @@
 # Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/pushutils/group/bld.inf
--- a/messagingfw/wappushfw/pushutils/group/bld.inf	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/pushutils/group/bld.inf	Tue Feb 02 10:12:21 2010 +0200
@@ -18,12 +18,12 @@
    
 PRJ_EXPORTS
 ../../pushutils/inc/PushMessage.h	SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(push/pushmessage.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../../pushutils/inc/WapDecoder.h	/epoc32/include/push/wapdecoder.h
-#endif
+../../pushutils/inc/WapDecoder.h	SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(push/wapdecoder.h)
 ../../pushutils/inc/PluginKiller.h	SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(push/pluginkiller.h)
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
 ../../pushutils/inc/PushDispatcher.h	/epoc32/include/push/pushdispatcher.h
+#else
+../../pushutils/inc/PushDispatcher.h	SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(Push/pushdispatcher.h)
 #endif
 ../../pushutils/inc/thttpfields.h	SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(thttpfields.h)
 
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/pushutils/inc/PushDispatcher.h
--- a/messagingfw/wappushfw/pushutils/inc/PushDispatcher.h	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/pushutils/inc/PushDispatcher.h	Tue Feb 02 10:12:21 2010 +0200
@@ -18,7 +18,7 @@
 
 /**
  @file
- @internalTechnology
+ @publishedPartner
  @released
 */
 
@@ -55,7 +55,7 @@
 //##ModelId=3B659EE80221
 class PushAppDispatcher
 /**
-@internalTechnology
+@publishedPartner
 @released
 */
 	{
@@ -90,7 +90,7 @@
 //##ModelId=3B659EE902E1
 class PushContentTypeDispatcher 
 /**
-@internalTechnology
+@publishedPartner
 @released
 */
 	{
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/wappushfw/tpushscriptbased/testdata/ineturilist.xml
--- a/messagingfw/wappushfw/tpushscriptbased/testdata/ineturilist.xml	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/wappushfw/tpushscriptbased/testdata/ineturilist.xml	Tue Feb 02 10:12:21 2010 +0200
@@ -3,9 +3,9 @@
  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 the License "Symbian Foundation License v1.0"
+ under the terms of the License "Eclipse Public License v1.0"
  which accompanies this distribution, and is available
- at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
 
  Initial Contributors:
  Nokia Corporation - initial contribution.
diff -r 69530231af78 -r 28ae839b4c09 messagingfw/watcherfw/group/messaging_watcher.mrp
--- a/messagingfw/watcherfw/group/messaging_watcher.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingfw/watcherfw/group/messaging_watcher.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component	messaging_watcher
 
 source	\sf\mw\messagingmw\messagingfw\watcherfw
diff -r 69530231af78 -r 28ae839b4c09 messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp
--- a/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp	Tue Jan 26 12:18:06 2010 +0200
+++ b/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp	Tue Feb 02 10:12:21 2010 +0200
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component           messagingmw_metadata
 source   \sf\mw\messagingmw\messagingmw_info\messagingmw_metadata 
 source   \sf\mw\messagingmw\package_definition.xml