--- a/epoc32/include/app/csmsemailfields.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/app/csmsemailfields.h	Wed Mar 31 12:33:34 2010 +0100
@@ -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" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -20,15 +20,25 @@
 #include <s32file.h>
 #include <badesca.h>
 
+#if (defined SYMBIAN_MESSAGESTORE_HEADER_BODY_USING_SQLDB)
+#include <smut.h>
+#include <msvstd.h>
+#endif
+
 class CMsvStore;
 
+#if (defined SYMBIAN_MESSAGESTORE_HEADER_BODY_USING_SQLDB)
+class CHeaderFields;
+#endif
+
+
 /**
 Encapsulates the address and subject fields for Email sent over SMS.
 
 @publishedAll
 @released
 */
-class CSmsEmailFields : public CBase
+NONSHARABLE_CLASS (CSmsEmailFields) : public CBase
 	{
 public:
 	IMPORT_C static CSmsEmailFields* NewL();
@@ -50,6 +60,15 @@
 	
 	void RestoreL(CMsvStore& aStore);
 	void StoreL(CMsvStore& aStore) const;
+
+#if (defined SYMBIAN_MESSAGESTORE_HEADER_BODY_USING_SQLDB)
+	void StoreDBL(CMsvStore& aStore);
+	void ReStoreDBL(CMsvStore& aStore);
+	TInt ConvertToTInt(TDesC16& aStr);
+	void GetRecipientListL(TDesC16& aStr);
+	TInt GetBufSize();
+#endif
+
 private:
 	CSmsEmailFields();
 	void ConstructL();