diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrgui/mrfieldbuilderplugin/group/esmrfieldbuilderplugin.mmp
--- a/meetingrequest/mrgui/mrfieldbuilderplugin/group/esmrfieldbuilderplugin.mmp	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrgui/mrfieldbuilderplugin/group/esmrfieldbuilderplugin.mmp	Wed Mar 31 21:08:33 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* 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"
@@ -15,13 +15,11 @@
 *
 */
 
-
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
 #include "../../../inc/esmrinternaluid.h"
 #include "../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
 #include "../../../../inc/emailtraceconfig.hrh"
+#include <data_caging_paths.hrh>
+#include <platform_paths.hrh>
 
 TARGET          esmrfieldbuilderplugin.dll
 TARGETTYPE      PLUGIN
@@ -30,26 +28,23 @@
 CAPABILITY      CAP_ECOM_PLUGIN
 VENDORID        VID_DEFAULT
 
-VERSION         KEmailBinaryVersionNumber
-KEmailBinaryDemandPaging
+// Includes
+APP_LAYER_SYSTEMINCLUDE
 
-// Includes 
-APP_LAYER_SYSTEMINCLUDE
 USERINCLUDE     ../inc
 USERINCLUDE     ../../inc
 USERINCLUDE     ../../../inc
 USERINCLUDE     ../../../../inc
 
 //implementations
-SOURCEPATH      ../src 
-SOURCE          CESMRFieldBuilderPluginProxy.cpp
-SOURCE          CESMRFieldBuilderPlugin.cpp
-
 SOURCEPATH      ../src
+SOURCE          cesmrfieldbuilderpluginproxy.cpp
+SOURCE          cesmrfieldbuilderplugin.cpp
 
 SOURCE          cesmrrepeatuntil.cpp
 SOURCE          cesmrsubjectfield.cpp
 SOURCE          cesmrtimefield.cpp
+SOURCE          cmrtimecontainer.cpp
 SOURCE          cesmrdatefield.cpp
 SOURCE          cesmrlocationfield.cpp
 SOURCE          cesmralarmfield.cpp
@@ -57,11 +52,20 @@
 SOURCE          cesmrdescriptionfield.cpp
 SOURCE          cesmrcheckbox.cpp
 SOURCE          cesmrsingletimefield.cpp
-SOURCE          cesmrbooleanfield.cpp
 SOURCE          cesmrsyncfield.cpp
-SOURCE          cesmrsync.cpp
+SOURCE          cesmrtextitem.cpp
 SOURCE          cesmrpriority.cpp
 SOURCE          cesmrpriorityfield.cpp
+SOURCE		    cmrattachmentsfield.cpp
+SOURCE          cmrunifiededitorfield.cpp
+SOURCE          cmrmulticalenfield.cpp
+SOURCE          cmrviewerattachmentfield.cpp
+SOURCE          cmrattachmentcommandhandler.cpp
+SOURCE          cmrattachmentcommand.cpp
+SOURCE          cmropenattachmentcommand.cpp
+SOURCE          cmrremoveattachmentcommand.cpp
+SOURCE          cmrsaveattachmentcommand.cpp
+SOURCE          cmralarmonofffield.cpp
 
 SOURCE          cesmrviewerlocationfield.cpp
 SOURCE          cesmrviewerstartdatefield.cpp
@@ -77,6 +81,7 @@
 SOURCE          cesmrvieweralarmdatefield.cpp
 SOURCE          cesmrvieweralarmtimefield.cpp
 SOURCE          cesmrviewerdetailedsubjectfield.cpp
+SOURCE          cmrsaveandopenattachmentcommand.cpp
 
 SOURCEPATH              ../data
 START RESOURCE          esmrfieldbuilderplugin.rss
@@ -84,11 +89,12 @@
 END
 
 // Dependencies to mrui components
-LIBRARY esmrgui.lib
-LIBRARY esmrservices.lib           //attachmentinfo handling
-LIBRARY esmrfieldbuildercommon.lib //cesmrfield, cesmrborderlayer etc
-LIBRARY esmrcommon.lib             //esmrhelper::locateresourcefile()
+LIBRARY esmrcommon.lib
+LIBRARY esmrservices.lib
+LIBRARY esmrfieldbuildercommon.lib
 LIBRARY esmrfieldevent.lib
+LIBRARY mrguicommon.lib
+LIBRARY remoteattachment.lib
 
 // Dependencies to Symbian/S60 OS components
 LIBRARY apparc.lib
@@ -111,10 +117,18 @@
 LIBRARY avkon.lib
 LIBRARY aknlayout2.lib
 LIBRARY cdlengine.lib
-LIBRARY cmaillogger.lib
+LIBRARY caleninterimutils2.lib
+LIBRARY eikcore.lib
+LIBRARY npdlib.lib
+LIBRARY apgrfx.lib
+LIBRARY efsrv.lib
+LIBRARY commonui.lib
+LIBRARY apmime.lib
+LIBRARY aknnotify.lib
 
-#ifdef TRACE_INTO_FILE
+#if defined( ENABLE_TRACES ) && defined( TRACE_INTO_FILE )
 LIBRARY flogger.lib
-#endif // TRACE_INTO_FILE
+LIBRARY cmaillogger.lib
+#endif // ENABLE_TRACES && TRACE_INTO_FILE
 
 // End of File