diff -r 3533d4323edc -r 968773a0b6ef emailuis/emailui/inc/FreestyleEmailUiAppui.h
--- a/emailuis/emailui/inc/FreestyleEmailUiAppui.h	Wed Sep 01 12:28:57 2010 +0100
+++ b/emailuis/emailui/inc/FreestyleEmailUiAppui.h	Tue Sep 14 20:48:24 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 - 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"
@@ -502,6 +502,9 @@
     // wouldn't have any visible effect.
     void RunFakeSyncAnimL();
 
+    // Sets text to navi pane
+    void SetNaviPaneTextL( const TDesC& aText );
+    
 public: //from MFSMailEventObserver
     /**
      * Framework event message.
@@ -538,14 +541,6 @@
     */
     void StopEndKeyCapture();
 
-    /**
-     * Accessor for navipane decorator object.
-     * @param aViewId: Caller identify itself by giving the view Id (see FreestyleEmailUiConstants.h)
-     * This is used for choosing correct decorator.
-     * @return instance of correct navidecorator. NULL if aView doesn't match.
-     */
-    CAknNavigationDecorator* NaviDecoratorL( const TUid aViewId );
-
 public:
 
     /**
@@ -614,12 +609,6 @@
    	// Send self to background.
    	void SendToBackground();
 
-   	/*
-   	 * Called from ConstructL during start of application.
-   	 * Constructs navipane(s) that are used by different views.
-   	 */
-   	void ConstructNaviPaneL();
-
     // Create custom status pane indicators. (priority and followup)
     void CreateStatusPaneIndicatorsL();
     // Delete custom status pane indicators
@@ -796,8 +785,7 @@
     CEUiExitGuardian* iExitGuardian;
 
     // navipane decorator
-    // (used at least in mail viewer)
-    CAknNavigationDecorator* iNaviDecorator2MailViewer;
+	CAknNavigationDecorator* iNaviDecorator;
 
     // Resource file offset for message editor external resources
     TInt iMsgEditorResourceOffset;