--- a/email_plat/email_client_api/inc/emailapidefs.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/email_plat/email_client_api/inc/emailapidefs.h	Fri Feb 19 22:37:30 2010 +0200
@@ -91,7 +91,7 @@
     inline TFolderId() : TBaseId(), iMailboxId() {}
     
     inline TBool operator==( const TFolderId& aFolderId ) const {
-        return ( iMailboxId.iId == aFolderId.iId &&
+        return ( iMailboxId.iId == aFolderId.iMailboxId.iId &&
         iId == aFolderId.iId ); }
         
     inline TBool operator!=( const TFolderId& aFolderId ) const {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/email_widget_api.metaxml	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="2a622bfae811b1680aa73cb3f15ff4b4" dataversion="2.0">
+  <name>Email widget api</name>
+  <description>API for 3rd party email clients to provide data for email widget</description>
+  <type>c++</type>
+  <collection>email_pub</collection>
+  <libs/>
+  <release category="public" sinceversion="3"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/group/bld.inf	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,34 @@
+/*
+* 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:  Build information for widget API for 3rd party email clients
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+../inc/emailobserverinterface.hrh   APP_LAYER_PUBLIC_EXPORT_PATH(emailobserverinterface.hrh)
+../inc/emailobserverplugin.h        APP_LAYER_PUBLIC_EXPORT_PATH(emailobserverplugin.h)
+../inc/emailobserverplugin.inl      APP_LAYER_PUBLIC_EXPORT_PATH(emailobserverplugin.inl)
+../inc/memailobserverlistener.h     APP_LAYER_PUBLIC_EXPORT_PATH(memailobserverlistener.h)
+../inc/memaildata.h     	        APP_LAYER_PUBLIC_EXPORT_PATH(memaildata.h)
+../inc/memailmailboxdata.h          APP_LAYER_PUBLIC_EXPORT_PATH(memailmailboxdata.h)
+../inc/memailmessagedata.h          APP_LAYER_PUBLIC_EXPORT_PATH(memailmessagedata.h)
+../inc/memailapplaunchdata.h        APP_LAYER_PUBLIC_EXPORT_PATH(memailapplaunchdata.h)
+
+// End of File
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/inc/emailobserverinterface.hrh	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2009 - 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:  Interface UID definition for Email Observer.
+*
+*/
+
+#ifndef EMAILOBSERVERINTERFACE_HRH
+#define EMAILOBSERVERINTERFACE_HRH
+
+/**
+ * Ecom interface uid for email observer plugin.
+ */
+#define KEmailObserverInterfaceUid 0x2002A5AE
+
+#endif // EMAILOBSERVERINTERFACE_HRH

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/inc/emailobserverplugin.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,70 @@
+/*
+* Copyright (c) 2009 - 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:  Interface header for Email Observer Plugin API.
+*
+*/
+
+#ifndef EMAILOBSERVERPLUGIN_H
+#define EMAILOBSERVERPLUGIN_H
+
+// System includes
+#include <ecom/ecom.h>
+
+namespace EmailInterface {
+
+// Forward declarations
+class MEmailObserverListener;
+class MEmailData;
+
+/**
+ *  Class that client of this interface user instantiates
+ */
+class CEmailObserverPlugin : public CBase
+    {
+public:
+    /**
+     * Contructor
+     * @param aImplUid implementation identifier used by the ECOM framework
+     * @param aListener callback interface provided by the client/instantiator.
+     *        Plugin should call this when it wants the widget data to be updated
+     * @return plugin instance
+     */
+    inline static CEmailObserverPlugin* NewL(
+        TUid aImplUid,
+        MEmailObserverListener* aListener );
+
+    /** destructor */
+    inline virtual ~CEmailObserverPlugin();
+
+    /**
+     * Accessor for data that needs to be published
+     * Plugin must implement this.
+     * When client calls this, plugin must ensure that all necessary data is accessible/updated
+     * @return interface to email data
+     */
+    virtual MEmailData& EmailDataL() = 0;
+
+private:
+    /**
+     * Unique instance identifier key
+     */
+    TUid iDtor_ID_Key;
+    };
+
+// Inline functions
+#include "emailobserverplugin.inl"
+
+} // namespace
+
+#endif // EMAILOBSERVERPLUGIN_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/inc/emailobserverplugin.inl	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2009 - 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:  Ininline definitions for Email Observer Plugin API.
+*
+*/
+
+#include <ecom/ecom.h>
+
+// ----------------------------------------------------------------------------
+// CEmailObserverPlugin::NewL
+// ----------------------------------------------------------------------------
+//
+inline CEmailObserverPlugin* CEmailObserverPlugin::NewL(
+    TUid aImplUid,
+    MEmailObserverListener* aListener )
+    {
+    TAny* interface = REComSession::CreateImplementationL( aImplUid,
+        _FOFF( CEmailObserverPlugin, iDtor_ID_Key ), aListener );
+    return reinterpret_cast<CEmailObserverPlugin*>( interface );
+    }
+
+// ----------------------------------------------------------------------------
+// CEmailObserverPlugin::~CEmailObserverPlugin
+// ----------------------------------------------------------------------------
+//
+inline CEmailObserverPlugin::~CEmailObserverPlugin()
+    {
+    REComSession::DestroyedImplementation( iDtor_ID_Key );
+    }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/inc/memailapplaunchdata.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,57 @@
+/*
+* Copyright (c) 2009 - 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:  Helper classes for interface.
+*
+*/
+
+#ifndef MEMAILAPPLAUNCHDATA_H
+#define MEMAILAPPLAUNCHDATA_H
+
+#include <e32cmn.h>
+
+namespace EmailInterface {
+
+/**
+ * Container for launch parameters
+ * When user touches the widget, an application launch is initiated with
+ * these parameters
+ * (see MMailboxData::LaunchParameters() )
+ */
+class MEmailLaunchParameters
+    {
+public:
+    /**
+     * Application UID identifying the application to be launched
+     */
+    virtual TUid ApplicationUid() const = 0;
+
+    /**
+     * ViewId within the application
+     */
+    virtual TUid ViewId() const = 0;
+
+    /**
+     * TUid that will be delivered to the launched application
+     */
+    virtual TUid CustomMessageId() const = 0;
+
+    /**
+     * Data that will be delivered to the launched application
+     */
+    virtual const TDesC8& CustomMessage() const = 0;
+    };
+
+} // namespace
+
+#endif // MEMAILAPPLAUNCHDATA_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/inc/memaildata.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2009 - 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:  Helper classes for interface.
+*
+*/
+
+#ifndef MEMAILDATA_H
+#define MEMAILDATA_H
+
+// System includes
+#include <memailmailboxdata.h>
+
+namespace EmailInterface {
+
+/**
+ * Container interface to data that plugin offers
+ * Plugin must ensure that the data is available when MailboxesL() returns
+ * Client will access the data always through this API; no direct references are
+ * stored permanently in the client
+ */
+class MEmailData
+    {
+public:
+    /**
+     * Accessor for mailbox information that this plugin is offering
+     * @ return pointer array of mailbox data interfaces
+     */
+    virtual RPointerArray<MMailboxData>& MailboxesL() = 0;
+    };
+
+} // namespace
+
+#endif // MEMAILDATA_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/inc/memailmailboxdata.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,92 @@
+/*
+* Copyright (c) 2009 - 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:  Helper classes for interface.
+*
+*/
+
+#ifndef MEMAILMAILBOXDATA_H
+#define MEMAILMAILBOXDATA_H
+
+#include <memailmessagedata.h>
+
+namespace EmailInterface {
+
+class MEmailLaunchParameters;
+
+/**
+ *  Container interface for mailbox related info
+ */
+class MMailboxData
+    {
+public:
+    /**
+     * Accessor for mailbox id
+     * @return mailbox identifier
+     */
+    virtual TUint MailboxId() const = 0;
+
+    /**
+     * Accessor for mailbox name
+     * @return mailbox name
+     */
+    virtual const TDesC& Name() const = 0;
+
+    /**
+     * Accessor for mailbox branding icon specifier
+     * @return path descriptor to branding icon
+     *     e.g. "mif(z:\\resource\\apps\\myemailplugin.mif N1 N2)",
+     *     where N1 is integer specifying the icon number in the mif file,
+     *     and N2 is the number of the respective icon mask
+     */
+    virtual const TDesC& BrandingIcon() const = 0;
+
+    /**
+     * Is mailbox's outbox empty or not
+     * @return boolean
+     */
+    virtual TBool IsOutboxEmpty() const = 0;
+
+    /**
+     * Accessor for seen/unseen status
+     * i.e. whether user has been to inbox after last message has been received
+     * @return boolean
+     */
+    virtual TBool Unseen() const = 0;
+
+    /**
+     * Accessor for launching parameters
+     * These parameters specify what application is launched when widget is pressed
+     * @return interface to launch parameters
+     */
+    virtual MEmailLaunchParameters& LaunchParameters() const = 0;
+
+    /**
+     * Accessor for total count of messages in inbox
+     * @return total message count
+     */
+    virtual TInt MessageCount() const = 0;
+
+    /**
+     * Accessor for mailbox's messages. If there are more messages in the array
+     * than fits the widget, only the newest will be published.
+     * Assumption: array must be ordered based on timestamp (i.e. newest in index 0)
+     * Assumption: plugin does not have to upkeep more than 2 latest messages
+     * @return array of messages
+     */
+    virtual const RPointerArray<MMessageData>& LatestMessagesL() const = 0;
+    };
+
+} // namespace
+
+#endif // EMAILMAILBOXDATA_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/inc/memailmessagedata.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,98 @@
+/*
+* Copyright (c) 2009 - 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:  Helper classes for interface.
+*
+*/
+
+#ifndef MEMAILMESSAGEDATA_H
+#define MEMAILMESSAGEDATA_H
+
+// System includes
+#include <e32std.h>
+
+namespace EmailInterface {
+
+/** Email message priority flag */
+enum TEmailPriority
+    {
+    ENormal,
+    ELow,
+    EHigh
+    };
+
+/**
+ * Container interface for message related info
+ * Plugin implementor make implementation for this
+ */
+class MMessageData
+    {
+public:
+    /**
+     * Accessor for message sender information
+     * @return sender as descriptor
+     */
+    virtual const TDesC& Sender() const = 0;
+
+    /**
+     * Accessor for message subject information
+     * @return message subject
+     */
+    virtual const TDesC& Subject() const = 0;
+
+    /**
+     * Accessor for message timestamp information
+     * @return timestamp
+     */
+    virtual TTime TimeStamp() const = 0;
+
+    /**
+     * Accessor for message read/unread status
+     * @return boolean
+     */
+    virtual TBool Unread() const = 0;
+
+    /**
+     * Accessor for message priority status
+     * @return one of message priority values
+     */
+    virtual TEmailPriority Priority() const = 0;
+
+    /**
+     * Accessor for message's attachment status
+     * @return boolean depending whether message has any attachmants or not
+     */
+    virtual TBool Attachments() const = 0;
+
+    /**
+     * Accessor for info whether this is a calendar message or not
+     * @return boolean
+     */
+    virtual TBool CalendarMsg() const = 0;
+
+    /**
+     * Accessor for info whether this message has been replied or not
+     * @return boolean
+     */
+    virtual TBool Replied() const = 0;
+
+    /**
+     * Accessor for info whether this message has been forwarded or not
+     * @return boolean
+     */
+    virtual TBool Forwarded() const = 0;
+    };
+
+} // namespace
+
+#endif // MEMAILMESSAGEDATA_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/inc/memailobserverlistener.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2009 - 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:  Interface header for event listener.
+*
+*/
+
+#ifndef MEMAILOBSERVERLISTENER_H
+#define MEMAILOBSERVERLISTENER_H
+
+namespace EmailInterface {
+
+// Forward declarations
+class MEmailObserverPlugin;
+class MEmailData;
+
+/**
+ * Interface class that is implemented by the plugin instantiator
+ */
+class MEmailObserverListener
+{
+    public:
+    /**
+     * Client callback routine. Client should override this method to implement
+     * event handling routine.
+     * Plugin calls this when it wishes to update data on the widget
+     * @param aEmailData reference to email data provided by the plugin
+     */
+    virtual void EmailObserverEvent( MEmailData& aEmailData ) = 0;
+};
+
+} // namespace
+
+#endif // MEMAILOBSERVERLISTENER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/data/2002C324.rss	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2009 - 2010 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:  Dummy 3rd party email testplugin
+*
+*/
+
+#include <emailobserverinterface.hrh>
+#include <ecom/registryinfo.rh>
+#include "t_testpluginconst.hrh"
+
+RESOURCE REGISTRY_INFO theInfo
+    {
+    dll_uid = KTestPlugin2Uid3;
+    interfaces =
+        {
+        INTERFACE_INFO
+            {
+            interface_uid = KEmailObserverInterfaceUid;
+            implementations =
+                {
+                IMPLEMENTATION_INFO
+                    {
+                    implementation_uid = KTestPlugin2ImplUid;
+                    version_no = 1;
+                    display_name = "3rd party testplugin 2";
+                    default_data = "";
+                    opaque_data = "";
+                    }
+                };
+            }
+        };
+    }
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/group/ABLD.BAT	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,15 @@
+@ECHO OFF
+
+REM Bldmake-generated batch file - ABLD.BAT
+REM ** DO NOT EDIT **
+
+perl -S ABLD.PL "\sf\app\commonemail\email_pub\email_widget_api\tsrc\3rdpartyapitestplugin2\group\\" %1 %2 %3 %4 %5 %6 %7 %8 %9
+if errorlevel==1 goto CheckPerl
+goto End
+
+:CheckPerl
+perl -v >NUL
+if errorlevel==1 echo Is Perl, version 5.003_07 or later, installed?
+goto End
+
+:End

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/group/bld.inf	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,36 @@
+/*
+* 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:
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+//--------------------
+PRJ_TESTEXPORTS
+//--------------------
+../rom/3rdpartyapitestplugin2.iby            CORE_APP_LAYER_IBY_EXPORT_PATH( 3rdpartyapitestplugin2.iby )
+
+//--------------------
+PRJ_MMPFILES
+//--------------------
+
+//--------------------
+PRJ_TESTMMPFILES
+//--------------------
+testplugin2.mmp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/group/testplugin2.mmp	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) 2009 - 2010 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:  Project definition file for 3rd party api testplugin
+*
+*/
+
+
+#include <platform_paths.hrh>       // APP_LAYER_SYSTEMINCLUDE
+#include <data_caging_paths.hrh>    // ECOM_RESOURCE_DIR
+
+#include "../inc/t_testpluginconst.hrh"
+
+TARGET              testplugin2.dll
+TARGETTYPE          PLUGIN
+UID                 0x10009D8D KTestPlugin2Uid3
+
+CAPABILITY          CAP_GENERAL_DLL
+VENDORID            VID_DEFAULT
+
+USERINCLUDE         . ../inc
+USERINCLUDE         ../../../../../inc
+
+APP_LAYER_SYSTEMINCLUDE
+
+START RESOURCE ../data/2002C324.rss
+TARGET          testplugin2
+END
+
+LIBRARY             euser.lib
+LIBRARY             ecom.lib
+LIBRARY             cmaillogger.lib
+
+SOURCEPATH          ../src
+SOURCE              t_testpluginproxy.cpp
+SOURCE              t_testpluginimpl.cpp
+SOURCE              emaildataimpl.cpp
+SOURCE              mailboxdataimpl.cpp
+SOURCE              applaunchdataimpl.cpp
+SOURCE              messagedataimpl.cpp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/inc/applaunchdataimpl.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2009 - 2010 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:  3rd party api testplugin app launcher data
+*
+*/
+
+#ifndef APPLAUNCHDATAIMPL_H
+#define APPLAUNCHDATAIMPL_H
+
+#include <e32base.h>
+#include <e32des8.h>
+
+#include "memailapplaunchdata.h"
+
+NONSHARABLE_CLASS( CAppLaunchDataImpl ) : public EmailInterface::MEmailLaunchParameters
+    {
+    public:
+        static CAppLaunchDataImpl* NewL( TUid aAppUid, TUid aViewUid );
+        virtual ~CAppLaunchDataImpl();
+
+    public:
+        virtual TUid ApplicationUid() const;
+        virtual TUid ViewId() const;
+        virtual TUid CustomMessageId() const;
+        virtual const TDesC8& CustomMessage() const;
+
+    private:
+        CAppLaunchDataImpl( TUid aAppUid, TUid aViewUid );
+        void ConstructL();
+
+    public:    // Data
+        TUid iAppUid;
+        TUid iViewUid;
+        TUid iCustMsgUid;
+        HBufC8* iCustomMessage;
+    };
+
+#endif // APPLAUNCHDATAIMPL_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/inc/emaildataimpl.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2009 - 2010 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:  3rd party api testplugin email data
+*
+*/
+
+#ifndef EMAILDATAIMPL_H
+#define EMAILDATAIMPL_H
+
+#include <e32base.h>
+#include <memaildata.h>
+
+#include "mailboxdataimpl.h"
+
+class MMailboxData;
+
+NONSHARABLE_CLASS( CEmailDataImpl ) : public EmailInterface::MEmailData
+    {
+    public:
+        static CEmailDataImpl* NewL();
+        virtual ~CEmailDataImpl();
+        virtual RPointerArray<EmailInterface::MMailboxData>& MailboxesL();
+        
+    private:
+        CEmailDataImpl();
+        void ConstructL();
+
+    public:    // Data
+        RPointerArray<EmailInterface::MMailboxData> iMailboxes;
+    };
+
+#endif // EMAILDATAIMPL_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/inc/mailboxdataimpl.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,59 @@
+/*
+* Copyright (c) 2009 - 2010 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:  3rd party api testplugin mailbox data
+*
+*/
+
+#ifndef MAILBOXDATAIMPL_H
+#define MAILBOXDATAIMPL_H
+
+#include <e32base.h>
+#include <memailmailboxdata.h>
+#include <memailapplaunchdata.h>
+
+
+class MMessageData;
+class MEmailLaunchParameters;
+class CAppLaunchDataImpl;
+
+NONSHARABLE_CLASS( CMailboxDataImpl ) : public EmailInterface::MMailboxData
+    {
+    public:
+        static CMailboxDataImpl* NewL();
+        virtual ~CMailboxDataImpl();
+
+        virtual TUint MailboxId() const;
+        virtual const TDesC& Name() const;
+        virtual const TDesC& BrandingIcon() const;
+        virtual TBool IsOutboxEmpty() const;
+        virtual TBool Unseen() const;
+        virtual EmailInterface::MEmailLaunchParameters& LaunchParameters() const;
+        virtual TInt MessageCount() const;
+        virtual const RPointerArray<EmailInterface::MMessageData>& LatestMessagesL() const;
+
+    private:
+        CMailboxDataImpl();
+        void ConstructL();
+
+    public:    // Data
+        TInt iMailboxId;
+        HBufC* iName;
+        HBufC* iBrandingIcon;
+        TBool iIsOutboxEmpty;
+        TBool iUnseen;
+        CAppLaunchDataImpl* iAppLaunchParams;
+        RPointerArray<EmailInterface::MMessageData> iMessages;
+    };
+
+#endif // MAILBOXDATAIMPL_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/inc/messagedataimpl.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,58 @@
+/*
+* Copyright (c) 2009 - 2010 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:  3rd party api testplugin message data
+*
+*/
+
+#ifndef MESSAGEDATAIMPL_H
+#define MESSAGEDATAIMPL_H
+
+#include <e32base.h>
+
+class MMessageData;
+
+NONSHARABLE_CLASS( CMessageDataImpl ) : public EmailInterface::MMessageData
+    {
+    public:
+        static CMessageDataImpl* NewL();
+        virtual ~CMessageDataImpl();
+
+        virtual const TDesC& Sender() const;
+        virtual const TDesC& Subject() const;
+        virtual TTime TimeStamp() const;
+        virtual TBool Unread() const;
+        virtual EmailInterface::TEmailPriority Priority() const;
+        virtual TBool Attachments() const;
+        virtual TBool CalendarMsg() const;
+        virtual TBool Replied() const;
+        virtual TBool Forwarded() const;
+
+        void SetFlagsL( const TInt aFlags );
+
+    private:
+        CMessageDataImpl();
+        void ConstructL();
+    public:    // Data
+        HBufC* iSender;
+        HBufC* iSubject;
+        TTime iTimeStamp;
+        TBool iUnread;
+        EmailInterface::TEmailPriority iPriority;
+        TBool iAttachments;
+        TBool iCalendarMsg;
+        TBool iReplied;
+        TBool iForwarded;
+    };
+
+#endif // MESSAGEDATAIMPL_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/inc/t_testpluginconst.hrh	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,19 @@
+/*
+* Copyright (c) 2009 - 2010 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: 3rd party api testplugin constants
+*
+*/
+
+#define    KTestPlugin2Uid3          0x2002C324
+#define    KTestPlugin2ImplUid       0x2002C325

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/inc/t_testpluginimpl.h	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2009 - 2010 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: 3rd party api testplugin
+*
+*/
+
+#ifndef TESTPLUGINIMPL_H
+#define TESTPLUGINIMPL_H
+
+#include <e32base.h>
+#include <emailobserverplugin.h>
+#include <memailmailboxdata.h>
+
+class MEmailObserverListener;
+class CEmailDataImpl;
+
+NONSHARABLE_CLASS( CEmailObserverPluginImpl ) : public EmailInterface::CEmailObserverPlugin
+    {
+    public:
+        static EmailInterface::CEmailObserverPlugin* NewL( EmailInterface::MEmailObserverListener* aListener );
+        virtual ~CEmailObserverPluginImpl();
+        virtual EmailInterface::MEmailData& EmailDataL();
+
+    private:
+        CEmailObserverPluginImpl( EmailInterface::MEmailObserverListener* aListener );
+        void ConstructL();
+        void ReadInitialDatafromPubSubL();
+
+    private:    // Data
+        EmailInterface::MEmailObserverListener* iListener; // not owned
+        CEmailDataImpl* iData;
+    };
+
+#endif // TESTPLUGINIMPL_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/rom/3rdpartyapitestplugin2.iby	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2009 - 2010 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:  Image description file for 3rd party api testplugin
+*
+*/
+
+#ifndef THIRDPARTYAPITESTPLUGIN_IBY
+#define THIRDPARTYAPITESTPLUGIN_IBY
+
+#include <data_caging_paths_for_iby.hrh>
+ECOM_PLUGIN( testplugin2.dll, testplugin2.rsc )
+
+#endif // THIRDPARTYAPITESTPLUGIN_IBY

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/src/applaunchdataimpl.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,78 @@
+/*
+* Copyright (c) 2009 - 2010 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:  3rd party api testplugin app launcher data
+*
+*/
+
+#include "applaunchdataimpl.h"
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CAppLaunchDataImpl* CAppLaunchDataImpl::NewL( TUid aAppUid, TUid aViewUid )
+    {
+    CAppLaunchDataImpl* self = new(ELeave) CAppLaunchDataImpl( aAppUid, aViewUid );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CAppLaunchDataImpl::~CAppLaunchDataImpl()
+    {
+    delete iCustomMessage;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CAppLaunchDataImpl::CAppLaunchDataImpl( TUid aAppUid, TUid aViewUid ) : 
+    iAppUid( aAppUid ), iViewUid( aViewUid ), iCustMsgUid( TUid() ), iCustomMessage( NULL )
+    {
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+void CAppLaunchDataImpl::ConstructL()
+    {
+    iCustomMessage = HBufC8::NewL(1);
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TUid CAppLaunchDataImpl::ApplicationUid() const
+    {
+    return iAppUid;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TUid CAppLaunchDataImpl::ViewId() const
+    {
+    return iViewUid;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TUid CAppLaunchDataImpl::CustomMessageId() const
+    {
+    return iCustMsgUid;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+const TDesC8& CAppLaunchDataImpl::CustomMessage() const
+    {
+    return *iCustomMessage;
+    }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/src/emaildataimpl.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,68 @@
+/*
+* Copyright (c) 2009 - 2010 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: 3rd party test plugin email data
+*
+*/
+
+#include <memaildata.h>
+
+#include "emailtrace.h"
+#include "emaildataimpl.h"
+#include "mailboxdataimpl.h"
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CEmailDataImpl* CEmailDataImpl::NewL()
+    {
+    FUNC_LOG;
+    CEmailDataImpl* self = new(ELeave) CEmailDataImpl();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CEmailDataImpl::~CEmailDataImpl()
+    {
+    for ( TInt i = 0; i < iMailboxes.Count(); i++ )
+        {
+        delete static_cast<CMailboxDataImpl*>(iMailboxes[i]);
+        iMailboxes.Remove(i);
+        }
+    iMailboxes.ResetAndDestroy();
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CEmailDataImpl::CEmailDataImpl()
+    {
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+void CEmailDataImpl::ConstructL()
+    {
+    CMailboxDataImpl* mailbox = CMailboxDataImpl::NewL();
+    iMailboxes.AppendL( mailbox );
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+RPointerArray<EmailInterface::MMailboxData>& CEmailDataImpl::MailboxesL()
+    {
+    FUNC_LOG;
+    return iMailboxes;
+    }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/src/mailboxdataimpl.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,145 @@
+/*
+* Copyright (c) 2009 - 2010 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:  3rd party api testplugin mailbox data
+*
+*/
+
+#include <memaildata.h>
+#include <memailmailboxdata.h>
+#include <memailmessagedata.h>
+
+#include "emailtrace.h"
+#include "mailboxdataimpl.h"
+#include "messagedataimpl.h"
+#include "t_testpluginconst.hrh"
+#include "applaunchdataimpl.h"
+
+// Hardcoded default values
+
+// Path to graphics file with icon/mask numbers (client must provide separate file with brand graphics)
+_LIT( KDefaultBrandingIcon, "mif(Z:\\resource\\apps\\google_brand_graphics.mif 16384 16385)" );
+_LIT( KDefaultName, "HARDCODED" );           // default mailbox name
+const TInt KDefaultMailboxId = 12345;
+const TUid KDefaultAppUid  = { 0x200009EE }; // App to be launched from widget
+const TUid KDefaultViewUid = { 0x00000001 }; // View to be activated from widget
+const TBool KDefaultIsOutboxEmpty( ETrue );
+const TBool KDefaultUnseen( EFalse );
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CMailboxDataImpl* CMailboxDataImpl::NewL()
+    {
+    FUNC_LOG;
+    CMailboxDataImpl* self = new(ELeave) CMailboxDataImpl();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CMailboxDataImpl::~CMailboxDataImpl()
+    {
+    delete iName;
+
+    for ( TInt i = 0; i < iMessages.Count(); i++ )
+        {
+        delete static_cast<CMessageDataImpl*>(iMessages[i]);
+        iMessages.Remove(i);
+        }
+    iMessages.ResetAndDestroy();
+    delete iAppLaunchParams;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CMailboxDataImpl::CMailboxDataImpl() :
+    iName( NULL ),
+    iBrandingIcon( NULL),
+    iIsOutboxEmpty( KDefaultIsOutboxEmpty ),
+    iUnseen( KDefaultUnseen ),
+    iAppLaunchParams( NULL )
+    {
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+void CMailboxDataImpl::ConstructL()
+    {
+    iAppLaunchParams = CAppLaunchDataImpl::NewL( KDefaultAppUid, KDefaultViewUid );
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TUint CMailboxDataImpl::MailboxId() const
+    {
+    FUNC_LOG;
+    return KDefaultMailboxId;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+const TDesC& CMailboxDataImpl::Name() const
+    {
+    FUNC_LOG;
+    return KDefaultName;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+const TDesC& CMailboxDataImpl::BrandingIcon() const
+    {
+    FUNC_LOG;
+    return KDefaultBrandingIcon;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TBool CMailboxDataImpl::IsOutboxEmpty() const
+    {
+    FUNC_LOG;
+    return iIsOutboxEmpty;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+const RPointerArray<EmailInterface::MMessageData>& CMailboxDataImpl::LatestMessagesL() const
+    {
+    FUNC_LOG;
+    return iMessages;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TInt CMailboxDataImpl::MessageCount() const
+    {
+    return iMessages.Count();
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TBool CMailboxDataImpl::Unseen() const
+    {
+    FUNC_LOG;
+    return iUnseen;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+EmailInterface::MEmailLaunchParameters& CMailboxDataImpl::LaunchParameters() const
+    {
+    FUNC_LOG;
+    return *( static_cast<EmailInterface::MEmailLaunchParameters*>( iAppLaunchParams ) );
+    }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/src/messagedataimpl.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,122 @@
+/*
+* Copyright (c) 2009 - 2010 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:  3rd party api testplugin message data
+*
+*/
+
+#include <memaildata.h>
+#include <memailmessagedata.h>
+
+#include "messagedataimpl.h"
+
+// Hardcoded default values
+_LIT( KDefaultSender, "sender@domain.com" );
+_LIT( KDefaultSubject, "Test subject" );
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CMessageDataImpl* CMessageDataImpl::NewL()
+    {
+    CMessageDataImpl* self = new(ELeave) CMessageDataImpl();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CMessageDataImpl::~CMessageDataImpl()
+    {
+    delete iSender;
+    delete iSubject;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CMessageDataImpl::CMessageDataImpl() : iSender( NULL ), iSubject( NULL ),
+    iUnread( EFalse ), iPriority( EmailInterface::ENormal ), iAttachments( EFalse ), iCalendarMsg( EFalse ),
+    iReplied( EFalse ), iForwarded( EFalse )
+    {
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+void CMessageDataImpl::ConstructL()
+    {
+    iTimeStamp.HomeTime();
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+const TDesC& CMessageDataImpl::Sender() const
+    {
+    return KDefaultSender;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+const TDesC& CMessageDataImpl::Subject() const
+    {
+    return KDefaultSubject;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TTime CMessageDataImpl::TimeStamp() const
+    {
+    return iTimeStamp;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TBool CMessageDataImpl::Unread() const
+    {
+    return iUnread;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+EmailInterface::TEmailPriority CMessageDataImpl::Priority() const
+    {
+    return iPriority;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TBool CMessageDataImpl::Attachments() const
+    {
+    return iAttachments;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TBool CMessageDataImpl::CalendarMsg() const
+    {
+    return iCalendarMsg;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TBool CMessageDataImpl::Replied() const
+    {
+    return iReplied;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+TBool CMessageDataImpl::Forwarded() const
+    {
+    return iForwarded;
+    }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/src/t_testpluginimpl.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,67 @@
+/*
+* Copyright (c) 2009 - 2010 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:  3rd party api testplugin
+*
+*/
+
+#include <memailobserverlistener.h>
+#include <memaildata.h>
+
+#include "emailtrace.h"
+#include "t_testpluginimpl.h"
+#include "emaildataimpl.h"
+#include "mailboxdataimpl.h"
+#include "messagedataimpl.h"
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+EmailInterface::CEmailObserverPlugin* CEmailObserverPluginImpl::NewL(
+    EmailInterface::MEmailObserverListener* aListener )
+    {
+    FUNC_LOG;
+    CEmailObserverPluginImpl* self = new(ELeave) CEmailObserverPluginImpl( aListener );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CEmailObserverPluginImpl::~CEmailObserverPluginImpl()
+    {
+    delete iData;
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+CEmailObserverPluginImpl::CEmailObserverPluginImpl( EmailInterface::MEmailObserverListener* aListener ) :
+    iListener( aListener ), iData( NULL )
+    {
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+void CEmailObserverPluginImpl::ConstructL()
+    {
+    iData = CEmailDataImpl::NewL();
+    }
+
+// ---------------------------------------------------------
+// ---------------------------------------------------------
+EmailInterface::MEmailData& CEmailObserverPluginImpl::EmailDataL()
+    {
+    FUNC_LOG;
+    return *( static_cast<EmailInterface::MEmailData*>( iData ) );
+    }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/email_widget_api/tsrc/3rdpartyapitestplugin2/src/t_testpluginproxy.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2009 - 2010 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:  3rd party api testplugin proxy
+*
+*/
+
+#include <ecom/implementationproxy.h>
+
+#include "t_testpluginimpl.h"
+#include "t_testpluginconst.hrh"
+
+// ---------------------------------------------------------
+// Pairs ECom implementation UIDs with a pointer to the instantiation
+// method for that implementation. Required for all ECom implementation
+// collections.
+// ---------------------------------------------------------
+const TImplementationProxy ImplementationTable[] =
+    {
+    { {KTestPlugin2ImplUid}, reinterpret_cast<TProxyNewLPtr>( CEmailObserverPluginImpl::NewL ) }
+    };
+
+// ---------------------------------------------------------
+// Returns an instance of the proxy table.
+// Returns: KErrNone
+// ---------------------------------------------------------
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
+    TInt& aTableCount )
+    {
+    aTableCount = sizeof( ImplementationTable) / sizeof( TImplementationProxy );
+    return ImplementationTable;
+    }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_pub/group/bld.inf	Fri Feb 19 22:37:30 2010 +0200
@@ -0,0 +1,18 @@
+/*
+* 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:  Build information for widget API for 3rd party email clients
+*
+*/
+
+#include "../email_widget_api/group/bld.inf"

--- a/emailcontacts/remotecontactlookup/engine/data/engine.rss	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailcontacts/remotecontactlookup/engine/data/engine.rss	Fri Feb 19 22:37:30 2010 +0200
@@ -88,7 +88,7 @@
 		MENU_ITEM { command = ERclCmdNewSearch; txt = qtn_rcl_opt_new_search; },
 		MENU_ITEM { command = ERclCmdCall; cascade = r_rcl_call_menu_pane; txt = qtn_rcl_opt_call; },
 		MENU_ITEM { command = ERclCmdSend; cascade = r_rcl_send_menu_pane; txt = qtn_rcl_opt_send; },
-		MENU_ITEM { command = ERclCmdHelp; txt = qtn_options_help; },
+//		MENU_ITEM { command = ERclCmdHelp; txt = qtn_options_help; },
 		MENU_ITEM { command = EAknCmdExit; txt = qtn_options_exit; }	
 		};
 	}

--- a/emailservices/emailclientapi/group/emailclientapi.mmp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/group/emailclientapi.mmp	Fri Feb 19 22:37:30 2010 +0200
@@ -19,6 +19,7 @@
 #include <platform_paths.hrh>
 #include "../inc/emailclientapiimpl.hrh"
 #include "../../../inc/emailtraceconfig.hrh"
+#include "../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
 
 
 TARGET          emailclientapi.dll
@@ -28,6 +29,9 @@
 
 VENDORID        VID_DEFAULT
 
+VERSION         KEmailBinaryVersionNumber
+KEmailBinaryDemandPaging
+
 SOURCEPATH      ../src
 SOURCE          emailclientapiimpl.cpp
 SOURCE          emailinterfacefactoryimpl.cpp
@@ -45,12 +49,11 @@
 SOURCE          emailtextcontent.cpp
 SOURCE          emailmultipart.cpp
 
-//user include
+// User include
 USERINCLUDE     ../inc
 USERINCLUDE     ../../../inc
 
-//system include
-
+// System include
 APP_LAYER_SYSTEMINCLUDE
 
 

--- a/emailservices/emailclientapi/inc/emailapiutils.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailapiutils.h	Fri Feb 19 22:37:30 2010 +0200
@@ -19,7 +19,7 @@
 #define EMAILAPIUTILS_H
 
 #include <e32base.h>
-#include "CFSMailCommon.h"
+#include "cfsmailcommon.h"
 #include <emailapidefs.h>
 
 //using namespace EmailInterface;

--- a/emailservices/emailclientapi/inc/emailattachment.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailattachment.h	Fri Feb 19 22:37:30 2010 +0200
@@ -23,7 +23,7 @@
 #include <e32std.h>
 #include <e32base.h>
 
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
 #include <memailcontent.h>
 #include "emailapiutils.h"
 

--- a/emailservices/emailclientapi/inc/emailclientapiimpl.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailclientapiimpl.h	Fri Feb 19 22:37:30 2010 +0200
@@ -22,7 +22,6 @@
 #include <ecom/implementationinformation.h> 
 #include "emailapiutils.h"
 #include "cfsmailcommon.h"
-//#include "emailinternalclientapi.h"
 #include "mfsmaileventobserver.h"    
 #include <memailclientapi.h>
 #include "emailclientpluginmanager.h"

--- a/emailservices/emailclientapi/inc/emailcontent.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailcontent.h	Fri Feb 19 22:37:30 2010 +0200
@@ -20,7 +20,7 @@
 
 #include <memailcontent.h>
 
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
 #include "emailapiutils.h"
 
 using namespace EmailInterface;

--- a/emailservices/emailclientapi/inc/emailfolder.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailfolder.h	Fri Feb 19 22:37:30 2010 +0200
@@ -19,7 +19,7 @@
 #define CEMAILFOLDER_H
 
 #include <emailapidefs.h>
-#include "CFSMailCommon.h"
+#include "cfsmailcommon.h"
 #include <memailfolder.h>
 #include "mfsmaileventobserver.h"
 

--- a/emailservices/emailclientapi/inc/emailmailbox.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailmailbox.h	Fri Feb 19 22:37:30 2010 +0200
@@ -18,7 +18,7 @@
 #ifndef EMAILMAILBOX_H
 #define EMAILMAILBOX_H
 
-#include "CFSMailCommon.h"
+#include "cfsmailcommon.h"
 #include <memailmailbox.h>
 #include "mfsmaileventobserver.h"
 #include "mfsmailrequestobserver.h"

--- a/emailservices/emailclientapi/inc/emailmessage.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailmessage.h	Fri Feb 19 22:37:30 2010 +0200
@@ -19,7 +19,7 @@
 #define EMAILMESSAGE_H
 
 #include <memailmessage.h>
-#include "CFSMailCommon.h"
+#include "cfsmailcommon.h"
 #include "emailapiutils.h"
 
 using namespace EmailInterface;
@@ -132,6 +132,9 @@
     
 private:        
 
+    // Copies/moves flag values from iPluginMessage's flags to local flag member variable
+    void InitializeFlagValues();
+    
     CEmailMessage( CPluginData& aPluginData, CFSMailMessage* aMessage, const TDataOwner aOwner );
     
     void ConstructL();

--- a/emailservices/emailclientapi/inc/emailmessagesearch.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailmessagesearch.h	Fri Feb 19 22:37:30 2010 +0200
@@ -22,8 +22,8 @@
 #include <memailmessagesearch.h>
 #include <emailsorting.h>
 
-#include "CFSMailClient.h"
-#include "MFSMailBoxSearchObserver.h"
+#include "cfsmailclient.h"
+#include "mfsmailboxsearchobserver.h"
 #include "emailapiutils.h"
 
 using namespace EmailInterface;

--- a/emailservices/emailclientapi/inc/emailmultipart.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailmultipart.h	Fri Feb 19 22:37:30 2010 +0200
@@ -19,7 +19,7 @@
 #ifndef EMAILMULTIPART_H_
 #define EMAILMULTIPART_H_
 // INCLUDES
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
 #include <memailcontent.h>
 #include "emailapiutils.h"
 

--- a/emailservices/emailclientapi/inc/emailtextcontent.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/emailtextcontent.h	Fri Feb 19 22:37:30 2010 +0200
@@ -20,7 +20,7 @@
 #define EMAILTEXTCONTENT_H_
 
 // INCLUDES
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
 #include <memailcontent.h>
 #include "emailapiutils.h"
 

--- a/emailservices/emailclientapi/inc/messageiterator.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/inc/messageiterator.h	Fri Feb 19 22:37:30 2010 +0200
@@ -20,7 +20,7 @@
                                                                              
 #include <mmessageiterator.h>                                                                             
 #include "emailapidefs.h"
-#include "CFSMailCommon.h"
+#include "cfsmailcommon.h"
 
 using namespace EmailInterface;
 

--- a/emailservices/emailclientapi/src/emailaddress.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/src/emailaddress.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 #include "emailaddress.h"
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
 #include "emailclientapi.hrh"
 
 CEmailAddress* CEmailAddress::NewL( const TRole aRole, const TDataOwner aOwner )

--- a/emailservices/emailclientapi/src/emailapiutils.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/src/emailapiutils.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 #include    <e32std.h>       
-#include "CFSMailPlugin.h"
+#include "cfsmailplugin.h"
 #include "emailapidefs.h"
 #include "emailclientapiimpldefs.h"
 #include "emailapiutils.h"

--- a/emailservices/emailclientapi/src/emailclientapiimpl.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/src/emailclientapiimpl.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -29,8 +29,8 @@
 #include "emailapiutils.h"
 #include "emailmailbox.h"
 #include <memailaddress.h>
-#include "CFSMailPlugin.h"
-#include "CFSClientAPI.h"
+#include "cfsmailplugin.h"
+#include "cfsclientapi.h"
 #include "emailclientapiimpldefs.h"
 #include "emailmailboxcache.h"
 #include "FreestyleEmailUiConstants.h"

--- a/emailservices/emailclientapi/src/emailcontent.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/src/emailcontent.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -18,7 +18,7 @@
 #include <apmstd.h>
 
 #include "emailcontent.h"
-#include "CFSMailClient.h"
+#include "cfsmailclient.h"
 #include "emailclientapi.hrh"
 #include "emailapiutils.h"
 

--- a/emailservices/emailclientapi/src/emailfolder.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailclientapi/src/emailfolder.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -20,8 +20,8 @@
 #include "emailapiutils.h"
 #include "messageiterator.h"
 #include "emailsorting.h"
-#include "CFSMailFolder.h"
-#include "CFSMailPlugin.h"
+#include "cfsmailfolder.h"
+#include "cfsmailplugin.h"
 #include "emailclientapi.hrh"
 #include "emailclientapiimpldefs.h"
 
@@ -255,7 +255,7 @@
     for ( TInt i=0; i < aSortCriteria.Count(); i++ )
         {
         const TEmailSortCriteria& criteria  = aSortCriteria[i];
-        __ASSERT_ALWAYS( criteria.iField < sizeof( fieldValues ),
+        __ASSERT_ALWAYS( criteria.iField < sizeof( fieldValues ) / sizeof (fieldValues [i] ),
             Panic( EMailPanicSortMapIndexOutOfBounds ) );
         TFSMailSortCriteria fsCriteria;
         fsCriteria.iField = fieldValues[ criteria.iField ];