# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1265062123 -7200
# Node ID 4697dfb2d7ad2252a461b3465ed001303baff8aa
# Parent  e9eae96aa1172ee66f2859afb2f64dfe3ba98fc9
Revision: 201003
Kit: 201005

diff -r e9eae96aa117 -r 4697dfb2d7ad email/imum/Mtms/Data/ImumDialogs.rss
--- a/email/imum/Mtms/Data/ImumDialogs.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/email/imum/Mtms/Data/ImumDialogs.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -87,4 +87,4 @@
         };
     }
         
-// End of File
\ No newline at end of file
+// End of File
diff -r e9eae96aa117 -r 4697dfb2d7ad email/imum/Mtms/Data/ImumStrings.rss
--- a/email/imum/Mtms/Data/ImumStrings.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/email/imum/Mtms/Data/ImumStrings.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -115,4 +115,4 @@
     buf = qtn_mce_wait_delete_mail; 
     }
         
-// End of File
\ No newline at end of file
+// End of File
diff -r e9eae96aa117 -r 4697dfb2d7ad email/imum/Utils/Data/ImumFolderSubscription.ra
--- a/email/imum/Utils/Data/ImumFolderSubscription.ra	Tue Jan 26 11:55:08 2010 +0200
+++ b/email/imum/Utils/Data/ImumFolderSubscription.ra	Tue Feb 02 00:08:43 2010 +0200
@@ -146,4 +146,5 @@
                 };
             }
         };
-    }
\ No newline at end of file
+    }
+// End of File
diff -r e9eae96aa117 -r 4697dfb2d7ad email/imum/Utils/Data/ImumMailWizard.ra
--- a/email/imum/Utils/Data/ImumMailWizard.ra	Tue Jan 26 11:55:08 2010 +0200
+++ b/email/imum/Utils/Data/ImumMailWizard.ra	Tue Feb 02 00:08:43 2010 +0200
@@ -454,3 +454,4 @@
     }
 
 // End of File
+
diff -r e9eae96aa117 -r 4697dfb2d7ad layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Jan 26 11:55:08 2010 +0200
+++ b/layers.sysdef.xml	Tue Feb 02 00:08:43 2010 +0200
@@ -7,7 +7,7 @@
   <systemModel>
     <layer name="app_layer">
       <module name="messaging">
-        <unit unitID="Medo.messaging" mrp="" bldFile="&layer_real_source_path;/group" name="messaging" />
+        <unit unitID="MeCoDo.messaging" mrp="" bldFile="&layer_real_source_path;/group" name="messaging" />
       </module>
     </layer>
   </systemModel>
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/bium/bif/CliLogobif.rss
--- a/messagingappbase/bium/bif/CliLogobif.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/bium/bif/CliLogobif.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -56,4 +56,4 @@
 		};
 	}
 
-// End of file
\ No newline at end of file
+// End of file
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/bium/bif/Dmcpbif.rss
--- a/messagingappbase/bium/bif/Dmcpbif.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/bium/bif/Dmcpbif.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -56,4 +56,4 @@
 		};
 	}
 
-// End of file
\ No newline at end of file
+// End of file
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/mce/inc/mceiaupdateutils.h
--- a/messagingappbase/mce/inc/mceiaupdateutils.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/mce/inc/mceiaupdateutils.h	Tue Feb 02 00:08:43 2010 +0200
@@ -24,6 +24,7 @@
 #include <iaupdateobserver.h>
 
 // forward declarations go here:
+class CMceUi;
 class CIAUpdate;
 class CIAUpdateParameters;
 
@@ -38,7 +39,7 @@
  *  @endcode
  *
  */
-class CMceIAUpdateUtils : public CBase,
+class CMceIAUpdateUtils : public CActive,
 public MIAUpdateObserver
     {
 public:
@@ -47,7 +48,7 @@
      * Two-phased constructor.
      * @param aAppUid Uid of the app for which update needs to be checked.
      */
-    static CMceIAUpdateUtils* NewL();
+    static CMceIAUpdateUtils* NewL(CMceUi& aMceUi);
 
 
     /**
@@ -55,18 +56,22 @@
     */
     virtual ~CMceIAUpdateUtils();
 
-    /**
-     * Start IA update process.
-     * @param aAppUid Uid of the app for which update needs to be checked.
+    void StartL( const TUid aAppUid );
+protected: 
+
+     /**
+     * From CActive
      */
-    void StartL( const TUid aAppUid );
+     void RunL();
+     
+     void DoCancel();  
 
 private:
-
+	
     /**
      * C++ default constructor.
      */
-    CMceIAUpdateUtils();
+    CMceIAUpdateUtils(CMceUi& aMceUi);
 
     /**
      * By default Symbian 2nd phase constructor is private.
@@ -77,6 +82,17 @@
      * Cleanup function.
      */
     void Delete();
+	
+	/**
+     * For Setting the active object active immediately.
+     */	
+	void CompleteSelf();
+	
+	/**
+     * Start IA update process.
+     * @param aAppUid Uid of the app for which update needs to be checked.
+     */
+    void DoStartL(TUid aAppUid);
 
 private: // From MIAUpdateObserver
 
@@ -136,6 +152,10 @@
      * Own.
      */
     CIAUpdateParameters* iParameters;
+    
+    TUid 				 iAppUid;
+    
+    CMceUi&              iMceUi;
 
     };
 
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/mce/src/MceMessageListView.cpp
--- a/messagingappbase/mce/src/MceMessageListView.cpp	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/mce/src/MceMessageListView.cpp	Tue Feb 02 00:08:43 2010 +0200
@@ -1517,12 +1517,16 @@
                 if ( tEntry.iMtm == KUidMsgMMSNotification ) 
                     {
                     mmsCount++;
-                    if ( uiData->OperationSupportedL( KMtmUiFunctionDeleteMessage, tEntry ) )
+                    //Coverty fix,NULL RETURN, http://ousrv057/cov.cgi?cid=101801 
+                    if ( uiData )
                         {
-                        //MMS notification delete this entry not supported
-                        mmsNotDeleteCount ++;
+                        if ( uiData->OperationSupportedL( KMtmUiFunctionDeleteMessage, tEntry ) )
+                            {
+                            //MMS notification delete this entry not supported
+                            mmsNotDeleteCount ++;
+                            }
                         }
-                    }
+                     }
                 }
             }
         if ( mmsCount == count )
@@ -1824,10 +1828,14 @@
                 aMenuPane->SetItemDimmed( EMceCmdMove, ETrue );
                 //check also open               
                 CBaseMtmUiData* uiData = iMceUi->GetMtmUiDataL( KUidMsgMMSNotification );
-                aMenuPane->SetItemDimmed( EAknCmdOpen, 
-                    uiData->OperationSupportedL( KMtmUiFunctionOpenMessage, currentEntry ) );
-                aMenuPane->SetItemDimmed( EMceCmdDelete, 
-                    uiData->OperationSupportedL( KMtmUiFunctionDeleteMessage, currentEntry ) );               
+                // Coverty change, NULL Return, http://ousrv057/cov.cgi?cid=101800
+                if ( uiData )
+                    {
+                    aMenuPane->SetItemDimmed( EAknCmdOpen, 
+                     uiData->OperationSupportedL( KMtmUiFunctionOpenMessage, currentEntry ) );
+                    aMenuPane->SetItemDimmed( EMceCmdDelete, 
+                     uiData->OperationSupportedL( KMtmUiFunctionDeleteMessage, currentEntry ) );
+                    }                 
                 }
 
             aMenuPane->SetItemDimmed( EMceCmdOutboxSuspend, ETrue );
@@ -3075,7 +3083,11 @@
                 ( currentEntry.iMtm == KUidMsgMMSNotification ) )
                 {
                 CBaseMtmUiData* uiData = iMceUi->GetMtmUiDataL( KUidMsgMMSNotification );
-                skip = uiData->OperationSupportedL( KMtmUiFunctionOpenMessage, currentEntry );
+                // Coverty change, NULL Return, http://ousrv057/cov.cgi?cid=101803
+                if ( uiData )
+                    {
+                	skip = uiData->OperationSupportedL( KMtmUiFunctionOpenMessage, currentEntry );
+                	}	
                 }
             }
         }    
@@ -3803,7 +3815,8 @@
                     iSession->GetEntry( id, serviceId, currentEntry );
                            
                     CBaseMtmUiData* mtmUiData = iMceUi->GetMtmUiDataL( currentEntry.iMtm );
-                    if ( currentEntry.iMtm == KUidMsgMMSNotification &&
+                    // Coverty fix NULL Return, http://ousrv057/cov.cgi?cid=101802
+                    if ( currentEntry.iMtm == KUidMsgMMSNotification && mtmUiData &&
                         mtmUiData->OperationSupportedL(KMtmUiFunctionOpenMessage, currentEntry ) )
                         {
                         // when MMSNotification is in retrieving status, the hide open for MSK
@@ -3812,7 +3825,7 @@
                     else 
                         {
                         resourceId = R_MCE_MSK_BUTTON_OPEN;
-                        }   
+                        } 
                     }
                 else
                     {
@@ -3879,7 +3892,8 @@
                     iSession->GetEntry( id, serviceId, currentEntry );
                            
                     CBaseMtmUiData* mtmUiData = iMceUi->GetMtmUiDataL( currentEntry.iMtm );
-                    if ( currentEntry.iMtm == KUidMsgMMSNotification &&
+                    // Coverty fix, NULL Return, http://ousrv057/cov.cgi?cid=101802
+                    if ( currentEntry.iMtm == KUidMsgMMSNotification && mtmUiData &&
                         mtmUiData->OperationSupportedL(KMtmUiFunctionOpenMessage, currentEntry ) )
                         {
                         // when MMSNotification is in retrieving status, the hide open for MSK
@@ -3888,7 +3902,7 @@
                     else 
                         {
                         resourceId = R_MCE_MSK_BUTTON_OPEN;
-                        }   
+                        } 
                     }
                 else
                     {
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/mce/src/MceOneRowMessageListContainer.cpp
--- a/messagingappbase/mce/src/MceOneRowMessageListContainer.cpp	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/mce/src/MceOneRowMessageListContainer.cpp	Tue Feb 02 00:08:43 2010 +0200
@@ -2050,7 +2050,7 @@
         iTreeListBox->SetTextL(
             treeItemId,
             bufferC3,
-            3,
+            1,
             EFalse );
         }
     else
@@ -2136,7 +2136,7 @@
                 }
             }
         }
-    iTreeListBox->EnableThirdColumn( treeItemId, bufferC3.Length(), EFalse );
+    iTreeListBox->EnableThirdColumn( treeItemId, !IsItemFolder( entry.Id() ), EFalse );
     iTreeListBox->SetEmphasis( treeItemId, entry.Unread(), EFalse );
     TAknTreeItemID parentId = iTreeListBox->Parent( treeItemId );
     if ( parentId > KAknTreeIIDRoot )
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/mce/src/mceiaupdateutils.cpp
--- a/messagingappbase/mce/src/mceiaupdateutils.cpp	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/mce/src/mceiaupdateutils.cpp	Tue Feb 02 00:08:43 2010 +0200
@@ -24,7 +24,7 @@
 #include <featmgr.h>
 
 // user include files go here:
-
+#include "mceui.h"
 #include "mceiaupdateutils.h"
 #include "MceLogText.h"
 
@@ -34,9 +34,10 @@
 // C++ default constructor.
 // ---------------------------------------------------------------------------
 //
-CMceIAUpdateUtils::CMceIAUpdateUtils()
-: iUpdate( NULL ), iParameters( NULL )
+CMceIAUpdateUtils::CMceIAUpdateUtils(CMceUi& aMceUi)
+: iUpdate( NULL ), iParameters( NULL ),iMceUi( aMceUi ),CActive(EPriorityStandard)
     {
+    CActiveScheduler::Add(this);
     }
 
 
@@ -61,9 +62,9 @@
 // Two-phased constructor.
 // ---------------------------------------------------------------------------
 //
-CMceIAUpdateUtils* CMceIAUpdateUtils::NewL()
+CMceIAUpdateUtils* CMceIAUpdateUtils::NewL(CMceUi& aMceUi)
     {
-    CMceIAUpdateUtils* self = new( ELeave ) CMceIAUpdateUtils;
+    CMceIAUpdateUtils* self = new( ELeave ) CMceIAUpdateUtils(aMceUi);
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
@@ -77,13 +78,14 @@
 CMceIAUpdateUtils::~CMceIAUpdateUtils()
     {
     Delete();
+    Cancel();
     }
 
 // ---------------------------------------------------------------------------
 // Start IA update process.
 // ---------------------------------------------------------------------------
 //
-void CMceIAUpdateUtils::StartL( const TUid aAppUid )
+void CMceIAUpdateUtils::DoStartL( const TUid aAppUid )
     {
     if( iUpdate && iParameters )
         {
@@ -129,9 +131,16 @@
         {
         if ( aAvailableUpdates > 0 )
             {
-            // There were some updates available.
-            MCELOGGER_WRITE("CheckUpdatesComplete --- updates available");
-            iUpdate->UpdateQuery();
+                if((iMceUi.IsForeground())&&(iMceUi.MceViewActive(EMceMainViewActive)))
+                    {
+                    // There were some updates available.
+                    MCELOGGER_WRITE("CheckUpdatesComplete --- updates available");
+                    iUpdate->UpdateQuery();
+                    }
+                else
+                    {
+                    MCELOGGER_WRITE("CheckUpdatesComplete --- But MessageView or Delivery Reports View is active");
+                    }
             }
         else
             {
@@ -190,5 +199,49 @@
             }
         }
     }
+// -----------------------------------------------------------------------------
+// From class MIAUpdateObserver.
+// This callback function is called when an update query operation has completed.
+// -----------------------------------------------------------------------------
+//
+void CMceIAUpdateUtils::StartL(const TUid aAppUid)
+    {
+    if (IsActive())
+        {
+            return;
+         }
+    iAppUid = aAppUid;
+    CompleteSelf();
+    }
+// -----------------------------------------------------------------------------
+// 
+// For Setting the Active Object Active
+// -----------------------------------------------------------------------------
+//
+void CMceIAUpdateUtils::CompleteSelf()
+    {
+    iStatus = KRequestPending;
+    TRequestStatus* pStatus = &iStatus;
+    SetActive();
+    User::RequestComplete( pStatus, KErrNone );
+    }
+// -----------------------------------------------------------------------------
+// From class CActive.
+// For Starting the update in a seperate Thread
+// -----------------------------------------------------------------------------
+//
+void CMceIAUpdateUtils::RunL()
+    {
+    DoStartL( iAppUid );
+    }
+// -----------------------------------------------------------------------------
+// From class CActive.
+// Nothing to do here
+// -----------------------------------------------------------------------------
+//
+void CMceIAUpdateUtils::DoCancel()
+    {
+    
+    }
 
 // EOF
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/mce/src/mceui.cpp
--- a/messagingappbase/mce/src/mceui.cpp	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/mce/src/mceui.cpp	Tue Feb 02 00:08:43 2010 +0200
@@ -427,7 +427,7 @@
     iMailAccountItemArray = new(ELeave) CMceMailAccountItemArray(
         KMceArrayGranularity );
 
-    iMceIAUpdate = CMceIAUpdateUtils::NewL();
+    iMceIAUpdate = CMceIAUpdateUtils::NewL(*this);
 
     if ( iAlwaysOnline )
         {
@@ -4112,6 +4112,7 @@
 
                 else if ( functionInfo.iFuncId == KMtmUiFunctionFetchMMS ) //MMS notification
                     {
+                    data.iFlags |= EEikMenuItemSpecific; 
                     aMenuPane.AddMenuItemL( data, EAknCmdOpen );
                     }
 
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/mceextraitems/group/mceextraitems.rss
--- a/messagingappbase/mceextraitems/group/mceextraitems.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/mceextraitems/group/mceextraitems.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -44,6 +44,15 @@
     {
     items = 
         {
+       MCE_EXTRA_ITEM
+            {
+            title = qtn_mce_conversations;
+            command = "537044288";
+            index = 8;
+            icon_index = EMbmMceextraiconsQgn_prop_im_ibox;      
+            app_icon_index = 537044288;
+            secondary_text = qtn_mce_own_cvs;
+            }          
        };
     }
     
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/mceextraitems/loc/mceextraitems.loc
--- a/messagingappbase/mceextraitems/loc/mceextraitems.loc	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/mceextraitems/loc/mceextraitems.loc	Tue Feb 02 00:08:43 2010 +0200
@@ -36,4 +36,13 @@
 //
 #define qtn_mce_shortcut3 "Shortcut 3"
 
+// d: Conversation application shortcut in the main view. Opens an conversation application 
+// l: list_double_large_graphic_pane_t1
+//
+#define qtn_mce_conversations "Conversations"
+// d: Displayed as the second line for conversations item in Mce main view
+// l: list_double_large_graphic_pane_t2
+
+
+#define qtn_mce_own_cvs "Own conversations"
 // End of File
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/mcesettings/group/mcesettings_diy.loc
--- a/messagingappbase/mcesettings/group/mcesettings_diy.loc	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/mcesettings/group/mcesettings_diy.loc	Tue Feb 02 00:08:43 2010 +0200
@@ -54,4 +54,4 @@
 //
 #define qtn_mce_settings_email_default_options_new "New mailbox"
 
-// End of File
\ No newline at end of file
+// End of File
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/mcesettings/inc/MceSettingsDialog.h
--- a/messagingappbase/mcesettings/inc/MceSettingsDialog.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/mcesettings/inc/MceSettingsDialog.h	Tue Feb 02 00:08:43 2010 +0200
@@ -25,7 +25,7 @@
 
 #include <ConeResLoader.h>
 #include <msvapi.h>
-#include "MceSettingsTitlePaneHandlerDialog.h"
+#include "mcesettingstitlepanehandlerdialog.h"
 #include <MsgArrays.h>
 
 
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/msgavkon/conf/messaging.confml
Binary file messagingappbase/msgavkon/conf/messaging.confml has changed
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/msgavkon/msgindicatorplugin/group/ABLD.BAT
--- a/messagingappbase/msgavkon/msgindicatorplugin/group/ABLD.BAT	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/msgavkon/msgindicatorplugin/group/ABLD.BAT	Tue Feb 02 00:08:43 2010 +0200
@@ -2,9 +2,9 @@
 rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 rem All rights reserved.
 rem This component and the accompanying materials are made available
-rem under the terms of the License "Symbian Foundation License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
 rem which accompanies this distribution, and is available
-rem at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 rem
 rem Initial Contributors:
 rem Nokia Corporation - initial contribution.
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/msgavkon/muiu_internal/flagger/inc/MuiuFlagger.h
--- a/messagingappbase/msgavkon/muiu_internal/flagger/inc/MuiuFlagger.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/msgavkon/muiu_internal/flagger/inc/MuiuFlagger.h	Tue Feb 02 00:08:43 2010 +0200
@@ -22,7 +22,7 @@
 #define CMUIUFLAGGER_H
 
 //  INCLUDES
-#include "MuiuFlags.h"
+#include "muiuflags.h"
 #include <e32cmn.h>
 
 // CONSTANTS
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/msgavkon/muiu_internal/servicesinternal/inc/MuiuContactService.h
--- a/messagingappbase/msgavkon/muiu_internal/servicesinternal/inc/MuiuContactService.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/msgavkon/muiu_internal/servicesinternal/inc/MuiuContactService.h	Tue Feb 02 00:08:43 2010 +0200
@@ -21,7 +21,7 @@
 #define MUIUCONTACTSERVICE_H
 
 #include <e32base.h> // CBase
-#include "MuiuMsvUiServiceUtilitiesInternal.h"
+#include "muiumsvuiserviceutilitiesinternal.h"
 
 class CMuiuContactAddressMatcher;
 class CMsgVoIPExtension;
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/msgavkon/muiu_internal/servicesinternal/inc/MuiuLock.h
--- a/messagingappbase/msgavkon/muiu_internal/servicesinternal/inc/MuiuLock.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/msgavkon/muiu_internal/servicesinternal/inc/MuiuLock.h	Tue Feb 02 00:08:43 2010 +0200
@@ -22,7 +22,7 @@
 
 class CRepository;
 
-#include "MessagingInternalCRKeys.h"
+#include "messaginginternalcrkeys.h"
 
 
 // Lock identifier for messaging settings access
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/ncnlist/inc/NcnSNNotifier.h
--- a/messagingappbase/ncnlist/inc/NcnSNNotifier.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/ncnlist/inc/NcnSNNotifier.h	Tue Feb 02 00:08:43 2010 +0200
@@ -30,7 +30,7 @@
 class CAknSoftNotifier;
 class CAknSoftNotificationParameters;
 class TVwsViewId;
-
+class CRepository;
 /**
 *  Notifies Avkon notifier about new items and idle state status.
 */
@@ -128,6 +128,7 @@
         
         friend class CNcnlist_SNNotifier;
 
+        CRepository* iMuiuSettings;
     };
 
 #endif      // NCNSNNOTIFIER_H
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/ncnlist/src/NcnSNNotifier.cpp
--- a/messagingappbase/ncnlist/src/NcnSNNotifier.cpp	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/ncnlist/src/NcnSNNotifier.cpp	Tue Feb 02 00:08:43 2010 +0200
@@ -26,13 +26,18 @@
 #include    <avkon.rsg>
 #include    <Ncnlist.rsg>
 #include    <aknSDData.h>
+#include    <centralrepository.h>
 #include    "NcnModel.h"
 #include    "CVoiceMailManager.h"
+#include "messaginginternalcrkeys.h"
 
 // ================= DEFINITIONS ============================
 #define KSpeedDialViewId TVwsViewId( TUid::Uid( 0x1000590A ), TUid::Uid( 0x02 ) )
 #define KMceMailViewId TVwsViewId( TUid::Uid( 0x100058C5 ), TUid::Uid( 0x01 ) )
 #define KMceAudioMessageViewId TVwsViewId(TUid::Uid(0x100058C5),TUid::Uid(0x01) )
+// Conversational messaging UIDs.
+#define KConversationApplicationViewUid TVwsViewId(TUid::Uid(0x2002A540),TUid::Uid(0x01))
+const TInt KConversationListViewUid  = 0x01 ;
 
 // ================= LOCAL CONSTANTS ========================
 namespace
@@ -66,6 +71,11 @@
     // Delete notifier
     delete iNotifier;
     iNotifier = NULL;
+    if ( iMuiuSettings )
+       {
+       delete iMuiuSettings;
+       iMuiuSettings = NULL;
+       }
     }
 
 
@@ -95,6 +105,8 @@
     {
     // Create notifier instance
     iNotifier = CAknSoftNotifier::NewL();
+    // Muiu settings repository
+    iMuiuSettings = CRepository::NewL(KCRUidMuiuSettings);
     }
 
 
@@ -323,6 +335,27 @@
         // Notification for audio message
         case ECustomSoftNotification:
         	{
+       		TInt viewtype = 0; // Default is traditional Inbox
+		    if ( iMuiuSettings )
+		        {
+			    // Read the messaging settings
+		        iMuiuSettings->Get(KMuiuMceDefaultView,viewtype);
+		        } 	 
+        	 if ( viewtype == 1 ) // Launch conversations 
+    	        {        	        
+    	        ret = CAknSoftNotificationParameters::NewL(
+                        KNcnResourceFile,
+                        R_NCN_AUDIO_MESSAGE_NOTE,
+                        KNcnNotificationPriority,
+                        R_AVKON_SOFTKEYS_SHOW_EXIT,
+                        CAknNoteDialog::ENoTone,
+                        KConversationApplicationViewUid,
+                        TUid::Uid(KConversationListViewUid),   
+                        EAknSoftkeyShow,
+                        KNullDesC8() );    	        
+    	        }  
+        	 else
+        	    {
         	ret = CAknSoftNotificationParameters::NewL(
                 KNcnResourceFile,
                 R_NCN_AUDIO_MESSAGE_NOTE,
@@ -333,6 +366,7 @@
                 KNcnAudioMessageUid,
                 EAknSoftkeyShow,
                 KNullDesC8() );
+        	    }        	
             ret->SetGroupedTexts( R_NCN_AUDIO_MESSAGE_GROUPED );
             break;
         	}
diff -r e9eae96aa117 -r 4697dfb2d7ad messagingappbase/obexmtms/Rom/obex.hby
--- a/messagingappbase/obexmtms/Rom/obex.hby	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/obexmtms/Rom/obex.hby	Tue Feb 02 00:08:43 2010 +0200
@@ -1,9 +1,9 @@
 // Copyright (c) 2001-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 e9eae96aa117 -r 4697dfb2d7ad messagingappbase/smartmessaging/help/inc/smart.hlp.hrh
--- a/messagingappbase/smartmessaging/help/inc/smart.hlp.hrh	Tue Jan 26 11:55:08 2010 +0200
+++ b/messagingappbase/smartmessaging/help/inc/smart.hlp.hrh	Tue Feb 02 00:08:43 2010 +0200
@@ -2,9 +2,9 @@
 * 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 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 e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/audiomsg/data/audiomessage.rss
--- a/mobilemessaging/audiomsg/data/audiomessage.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/audiomsg/data/audiomessage.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -1053,4 +1053,4 @@
       LBUF {txt=qtn_msg_qry_normal_priority; },
     	LBUF {txt=qtn_msg_qry_low_priority; }
     	};
-    }
\ No newline at end of file
+    }
diff -r e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/mmsui/notviewer/NotViewer.rss
--- a/mobilemessaging/mmsui/notviewer/NotViewer.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/mmsui/notviewer/NotViewer.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -121,7 +121,7 @@
 RESOURCE AVKON_BUTTON_STATE_EXTENSION r_notviewer_delete_button_state_extension 
     { 
     bmbSkinIdMajor= EAknsMajorGeneric; 
-    bmbSkinIdMinor= EAknsMinorGenericQgnIndiTbMsgDelete; 
+    bmbSkinIdMinor= EAknsMinorGenericQgnIndiMgTbDelete; 
     } 
     
 RESOURCE AVKON_TOOLBAR r_notviewer_app_toolbar
diff -r e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/mmsui/notviewer/NotViewer_reg.rss
--- a/mobilemessaging/mmsui/notviewer/NotViewer_reg.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/mmsui/notviewer/NotViewer_reg.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -56,4 +56,3 @@
 
 
 // End of File
-  
\ No newline at end of file
diff -r e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/mmsui/viewer/MmsViewer_reg.rss
--- a/mobilemessaging/mmsui/viewer/MmsViewer_reg.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/mmsui/viewer/MmsViewer_reg.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -47,4 +47,3 @@
 	}
 
 // End of File
-  
\ No newline at end of file
diff -r e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/postcard/postcard/Postcard_reg.rss
--- a/mobilemessaging/postcard/postcard/Postcard_reg.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/postcard/postcard/Postcard_reg.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -37,4 +37,3 @@
     }
 
 // End of File
-  
\ No newline at end of file
diff -r e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/smsui/viewer/SmsViewer_reg.rss
--- a/mobilemessaging/smsui/viewer/SmsViewer_reg.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/smsui/viewer/SmsViewer_reg.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -44,4 +44,3 @@
 	type = KMsgServiceView;
 	}
 // End of File
-  
\ No newline at end of file
diff -r e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/unieditor/application/data/UniEditor_reg.rss
--- a/mobilemessaging/unieditor/application/data/UniEditor_reg.rss	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/unieditor/application/data/UniEditor_reg.rss	Tue Feb 02 00:08:43 2010 +0200
@@ -63,4 +63,3 @@
 	}
 
 // End of File
-  
\ No newline at end of file
diff -r e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/unieditor/application/src/UniEditorHeader.cpp
--- a/mobilemessaging/unieditor/application/src/UniEditorHeader.cpp	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/unieditor/application/src/UniEditorHeader.cpp	Tue Feb 02 00:08:43 2010 +0200
@@ -528,6 +528,10 @@
             iMtm.SetSubjectL( description );
             modified = ETrue;
             }
+        else
+            {
+            iMtm.SetSubjectL( KNullDesC() );
+            }
         }
     // variation has changed On->Off and message opened from Drafts
     else if ( modified )
diff -r e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/unieditor/application/src/UniEditorSaveOperation.cpp
--- a/mobilemessaging/unieditor/application/src/UniEditorSaveOperation.cpp	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/unieditor/application/src/UniEditorSaveOperation.cpp	Tue Feb 02 00:08:43 2010 +0200
@@ -663,9 +663,12 @@
         length = subject.Length();     
         // Saving as pure text from the editor which may contain emoticons.
         HBufC *text = iHeader.SubjectControl()->Editor().GetTextInHBufL();
+        if(text)
+            {
         CleanupStack::PushL( text );
         description.Copy( text->Ptr(), length );
         CleanupStack::PopAndDestroy( text );
+            
        
 
         while( length-- )
@@ -677,6 +680,11 @@
         description.Trim();
         return description.AllocL();
         }
+        else
+         {
+            return KNullDesC().AllocL();
+            }
+        }
         
     return NULL;
     }
diff -r e9eae96aa117 -r 4697dfb2d7ad mobilemessaging/unieditor/inc/UniMsvEntry.h
--- a/mobilemessaging/unieditor/inc/UniMsvEntry.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/mobilemessaging/unieditor/inc/UniMsvEntry.h	Tue Feb 02 00:08:43 2010 +0200
@@ -24,7 +24,7 @@
 
 #include <msvstd.h>
 #include <mmsconst.h>
-#include <unieditorconsts.h>
+#include <UniEditorConsts.h>
 
 // CONSTANTS
 
@@ -112,7 +112,7 @@
 
     };
 
-#include <unimsventry.inl>
+#include <UniMsvEntry.inl>
 
 #endif      // __UNIMSVENTRY_H
             
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/email_domain_utilities_api/inc/ImumDaSettingsData.h
--- a/msg_plat/email_domain_utilities_api/inc/ImumDaSettingsData.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/email_domain_utilities_api/inc/ImumDaSettingsData.h	Tue Feb 02 00:08:43 2010 +0200
@@ -21,7 +21,7 @@
 #define C_IMUMDASETTINGSDATA_H
 
 #include <msvstd.h>                     // TMsvId
-#include <imumdasettingskeys.h>         // Settings data keys
+#include <ImumDaSettingsKeys.h>         // Settings data keys
 
 class MImumDaSettingsDataCollection;
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/email_domain_utilities_api/inc/ImumDaSettingsDataCollection.h
--- a/msg_plat/email_domain_utilities_api/inc/ImumDaSettingsDataCollection.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/email_domain_utilities_api/inc/ImumDaSettingsDataCollection.h	Tue Feb 02 00:08:43 2010 +0200
@@ -20,7 +20,7 @@
 #define M_IMUMDASETTINGSDATACOLLECTION_H 
 
 #include <msvstd.h>                     // TMsvId
-#include <imumdasettingskeys.h>         // Settings data keys
+#include <ImumDaSettingsKeys.h>         // Settings data keys
 
 class MImumDaSettingsDataCollection;
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_center_ui_utilities_api/inc/MsgFolderSelectionDialog.h
--- a/msg_plat/messaging_center_ui_utilities_api/inc/MsgFolderSelectionDialog.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_center_ui_utilities_api/inc/MsgFolderSelectionDialog.h	Tue Feb 02 00:08:43 2010 +0200
@@ -22,7 +22,7 @@
 #define MSGFOLDERSELECTIONDIALOG_H__
 
 //  INCLUDES
-#include <coneresloader.h>
+#include <ConeResLoader.h>
 
 
 // FORWARD DECLARATIONS
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_center_ui_utilities_api/inc/MsvFactorySettings.h
--- a/msg_plat/messaging_center_ui_utilities_api/inc/MsvFactorySettings.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_center_ui_utilities_api/inc/MsvFactorySettings.h	Tue Feb 02 00:08:43 2010 +0200
@@ -21,7 +21,7 @@
 #define MSVFACTORYSETTINGS_H__
 
 //  INCLUDES
-#include <mtmextendedcapabilities.hrh>
+#include <MtmExtendedCapabilities.hrh>
 
 // CLASS DECLARATION
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_center_ui_utilities_api/inc/MuiuMsgEditorServerWatchingOperation.h
--- a/msg_plat/messaging_center_ui_utilities_api/inc/MuiuMsgEditorServerWatchingOperation.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_center_ui_utilities_api/inc/MuiuMsgEditorServerWatchingOperation.h	Tue Feb 02 00:08:43 2010 +0200
@@ -20,8 +20,8 @@
 
 
 #include <msvapi.h>        // CMsvOperation
-#include <aknserverapp.h>  // MAknServerAppExitObserver
-#include <muiumsgeditorlauncher.h>  // TEditorParameters 
+#include <AknServerApp.h>  // MAknServerAppExitObserver
+#include <MuiuMsgEditorLauncher.h>  // TEditorParameters 
 
 class CMuiuMsgEditorService;
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_center_ui_utilities_api/inc/MuiuMsgEditorServiceSession.h
--- a/msg_plat/messaging_center_ui_utilities_api/inc/MuiuMsgEditorServiceSession.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_center_ui_utilities_api/inc/MuiuMsgEditorServiceSession.h	Tue Feb 02 00:08:43 2010 +0200
@@ -23,7 +23,7 @@
 
 #include <f32file.h>
 #include <eikdoc.h>
-#include <aknserverapp.h>
+#include <AknServerApp.h>
 
 enum TMuiuMsgEditorServiceCmds
 	{
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_center_ui_utilities_api/inc/MuiuMsvProgressReporterOperation.h
--- a/msg_plat/messaging_center_ui_utilities_api/inc/MuiuMsvProgressReporterOperation.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_center_ui_utilities_api/inc/MuiuMsvProgressReporterOperation.h	Tue Feb 02 00:08:43 2010 +0200
@@ -24,7 +24,7 @@
 
 //  INCLUDES
 #include <msvapi.h>
-#include <msvprgreporter.h>
+#include <MsvPrgReporter.h>
 
 
 // FORWARD DECLARATIONS
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_media_resolver_api/inc/MsgAudioInfo.h
--- a/msg_plat/messaging_media_resolver_api/inc/MsgAudioInfo.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_media_resolver_api/inc/MsgAudioInfo.h	Tue Feb 02 00:08:43 2010 +0200
@@ -26,7 +26,7 @@
 #include <e32std.h>
 
 #include <mdaaudiosampleplayer.h> // MMdaAudioPlayerCallback & CMdaAudioPlayerUtility
-#include <msgmediainfo.h>
+#include <MsgMediaInfo.h>
 
 // CONSTANTS
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_media_resolver_api/inc/MsgImageInfo.h
--- a/msg_plat/messaging_media_resolver_api/inc/MsgImageInfo.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_media_resolver_api/inc/MsgImageInfo.h	Tue Feb 02 00:08:43 2010 +0200
@@ -25,7 +25,7 @@
 
 #include <e32std.h>
 
-#include <msgmediainfo.h>
+#include <MsgMediaInfo.h>
 
 // CONSTANTS
 
@@ -169,6 +169,6 @@
         TUint32 iFrameFlags;
     };
 
-#include <msgimageinfo.inl>
+#include <MsgImageInfo.inl>
 
 #endif // __MSGIMAGEINFO_H
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_media_resolver_api/inc/MsgMediaInfo.h
--- a/msg_plat/messaging_media_resolver_api/inc/MsgMediaInfo.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_media_resolver_api/inc/MsgMediaInfo.h	Tue Feb 02 00:08:43 2010 +0200
@@ -29,7 +29,7 @@
 #include <f32file.h>
 #include <apmstd.h>
 
-#include <msgmedia.hrh>
+#include <MsgMedia.hrh>
 
 // CONSTANTS
 
@@ -313,6 +313,6 @@
         TUid            iHandlerAppUid;
         };
 
-#include <msgmediainfo.inl>
+#include <MsgMediaInfo.inl>
 
 #endif // __MSGMEDIAINFO_H
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_media_resolver_api/inc/MsgMediaResolver.h
--- a/msg_plat/messaging_media_resolver_api/inc/MsgMediaResolver.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_media_resolver_api/inc/MsgMediaResolver.h	Tue Feb 02 00:08:43 2010 +0200
@@ -28,8 +28,8 @@
 #include <f32file.h>
 #include <apgcli.h>  // RApaLsSession
 
-#include <msgmedia.hrh>
-#include <msgmediainfo.h>
+#include <MsgMedia.hrh>
+#include <MsgMediaInfo.h>
 
 // CONSTANTS
 
@@ -218,6 +218,6 @@
         CActiveSchedulerWait     iWait;
     };
 
-#include <msgmediaresolver.inl>
+#include <MsgMediaResolver.inl>
 
 #endif // __MSGMEDIARESOLVER_H
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_media_resolver_api/inc/MsgTextInfo.h
--- a/msg_plat/messaging_media_resolver_api/inc/MsgTextInfo.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_media_resolver_api/inc/MsgTextInfo.h	Tue Feb 02 00:08:43 2010 +0200
@@ -26,7 +26,7 @@
 #include <e32std.h>
 #include <f32file.h>
 
-#include <msgmediainfo.h>
+#include <MsgMediaInfo.h>
 
 // CONSTANTS
 
@@ -128,6 +128,6 @@
 
     };
 
-#include <msgtextinfo.inl>
+#include <MsgTextInfo.inl>
 
 #endif // __MSGTEXTINFO_H
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/messaging_media_resolver_api/inc/MsgVideoInfo.h
--- a/msg_plat/messaging_media_resolver_api/inc/MsgVideoInfo.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/messaging_media_resolver_api/inc/MsgVideoInfo.h	Tue Feb 02 00:08:43 2010 +0200
@@ -30,7 +30,7 @@
 #include <videoplayer.h>
 
 // Base Class
-#include <msgmediainfo.h>
+#include <MsgMediaInfo.h>
 
 // CONSTANTS
 
@@ -177,6 +177,6 @@
 
     };
 
-#include <msgvideoinfo.inl>
+#include <MsgVideoInfo.inl>
 
 #endif // __MSGVIDEOINFO_H
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/mms_conformance_api/inc/MmsConformance.h
--- a/msg_plat/mms_conformance_api/inc/MmsConformance.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/mms_conformance_api/inc/MmsConformance.h	Tue Feb 02 00:08:43 2010 +0200
@@ -27,7 +27,7 @@
 #include <e32std.h>
 #include <e32base.h> // CBase
 
-#include <msgmedia.hrh>
+#include <MsgMedia.hrh>
 
 // CONSTANTS
 
@@ -418,6 +418,6 @@
         
     };
 
-#include <mmsconformance.inl>
+#include <MmsConformance.inl>
 
 #endif // __MMSCONFORMANCE_H
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/mms_engine_settings_api/inc/MmsEngineInternalCRKeys.h
--- a/msg_plat/mms_engine_settings_api/inc/MmsEngineInternalCRKeys.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/mms_engine_settings_api/inc/MmsEngineInternalCRKeys.h	Tue Feb 02 00:08:43 2010 +0200
@@ -21,7 +21,7 @@
 #ifndef MMSENGINEINTERNALCRKEYS_H
 #define MMSENGINEINTERNALCRKEYS_H
 
-#include <mmsenginedomaincrkeys.h>
+#include <MmsEngineDomainCRKeys.h>
 
 #endif      // MMSENGINEINTERNALCRKEYS_H
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/new_contacts_note_status_api/inc/NcnListInternalCRKeys.h
--- a/msg_plat/new_contacts_note_status_api/inc/NcnListInternalCRKeys.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/new_contacts_note_status_api/inc/NcnListInternalCRKeys.h	Tue Feb 02 00:08:43 2010 +0200
@@ -22,7 +22,7 @@
 #define NCNLISTINTERNALCRKEYS_H
 
 
-#include <ncnlistdomaincrkeys.h>
+#include <NcnListDomainCRKeys.h>
 
 #endif      // NCNLISTINTERNALCRKEYS_H
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/new_contacts_note_variables_api/inc/NcnListInternalPSKeys.h
--- a/msg_plat/new_contacts_note_variables_api/inc/NcnListInternalPSKeys.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/new_contacts_note_variables_api/inc/NcnListInternalPSKeys.h	Tue Feb 02 00:08:43 2010 +0200
@@ -22,7 +22,7 @@
 #define NCNLISTINTERNALPSKEYS_H
 
 
-#include <ncnlistdomainpskeys.h>
+#include <NcnListDomainPSKeys.h>
 
 #endif      // NCNLISTINTERNALPSKEYS_H
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/new_message_notification_api/inc/MNcnInternalNotification.h
--- a/msg_plat/new_message_notification_api/inc/MNcnInternalNotification.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/new_message_notification_api/inc/MNcnInternalNotification.h	Tue Feb 02 00:08:43 2010 +0200
@@ -22,8 +22,8 @@
 #define __MNCNINTERNALNOTIFICATION_H__
 
 //  INCLUDES
-#include <mncnnotification.h>
-#include <ncnnotificationdefs.h>
+#include <MNcnNotification.h>
+#include <NcnNotificationDefs.h>
 
 // FORWARD DECLARATIONS
 
@@ -144,7 +144,7 @@
         virtual void CancelMarkUnread( ) = 0;
     };
 
-#include <mncninternalnotification.inl>
+#include <MNcnInternalNotification.inl>
 
 #endif // __MNCNINTERNALNOTIFICATION_H__
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/sim_dialog_launch_api/inc/simdlgplugin.inl
--- a/msg_plat/sim_dialog_launch_api/inc/simdlgplugin.inl	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/sim_dialog_launch_api/inc/simdlgplugin.inl	Tue Feb 02 00:08:43 2010 +0200
@@ -16,7 +16,7 @@
  */
 
 // INCLUDE FILES
-#include <ecom/ECom.h>
+#include <ecom/ecom.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_plat/smil_player_launch_api/inc/SmilPlayerDialog.h
--- a/msg_plat/smil_player_launch_api/inc/SmilPlayerDialog.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_plat/smil_player_launch_api/inc/SmilPlayerDialog.h	Tue Feb 02 00:08:43 2010 +0200
@@ -21,9 +21,9 @@
 #define SMILPLAYERDIALOG_H
 
 // INCLUDES
-#include <akndialog.h>
+#include <AknDialog.h>
 #include <remconcoreapitargetobserver.h>
-#include <coneresloader.h>
+#include <ConeResLoader.h>
 
 // FORWARD DECLARATIONS
 class TCoeHelpContext;
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_pub/open_new_message_notification_api/inc/MNcnNotification.h
--- a/msg_pub/open_new_message_notification_api/inc/MNcnNotification.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_pub/open_new_message_notification_api/inc/MNcnNotification.h	Tue Feb 02 00:08:43 2010 +0200
@@ -172,7 +172,7 @@
         TUid iDtor_ID_Key;
     };
 
-#include <mncnnotification.inl>
+#include <MNcnNotification.inl>
 
 #endif // __MNCNNOTIFICATION_H__
 
diff -r e9eae96aa117 -r 4697dfb2d7ad msg_pub/plugin_bio_control_api/inc/CRichBio.h
--- a/msg_pub/plugin_bio_control_api/inc/CRichBio.h	Tue Jan 26 11:55:08 2010 +0200
+++ b/msg_pub/plugin_bio_control_api/inc/CRichBio.h	Tue Feb 02 00:08:43 2010 +0200
@@ -26,7 +26,7 @@
 #include <coecntrl.h>           // CCoeControl
 #include <badesca.h>            // CDesC16ArrayFlat
 #include <txtfrmat.h>           // TCharFormat
-#include <msgeditor.hrh>        // TMsgCursorLocation
+#include <MsgEditor.hrh>        // TMsgCursorLocation
 
 // DATA TYPES