diff -r ecc8def7944a -r 2dc6caa42ec3 emailuis/nmailuiengine/inc/nmbaseclientplugin.h
--- a/emailuis/nmailuiengine/inc/nmbaseclientplugin.h	Mon May 03 12:23:15 2010 +0300
+++ b/emailuis/nmailuiengine/inc/nmbaseclientplugin.h	Fri May 14 15:41:10 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -28,13 +28,10 @@
 #include "nmsettingscommon.h"
 
 class NmUiEngine;
-class NmSettingsViewLauncher;
+
 
-/*!
- \class NmBaseClientPlugin
- \brief
- */
-class NMUIENGINE_EXPORT NmBaseClientPlugin : public QObject, public NmUiExtensionInterface
+class NMUIENGINE_EXPORT NmBaseClientPlugin : public QObject,
+                                             public NmUiExtensionInterface
 {
     Q_OBJECT
     Q_INTERFACES(NmUiExtensionInterface)
@@ -65,6 +62,7 @@
     void attach();
     void removeAttachment();
     void openAttachment();
+    void search();
 
 private slots:
     void mailboxListChanged(const NmId &mailboxId, NmSettings::MailboxEventType type);
@@ -82,13 +80,14 @@
     void handleRequest(NmActionResponseCommand command, const NmActionRequest &request);
     void updateEnvelopeProperty(NmEnvelopeProperties property);
 
+protected:
+    NmActionRequest mMenuRequest;
+    NmUiEngine *mUiEngine; // Singleton instance
+            
 private:
-    NmActionRequest mMenuRequest;
     NmActionRequest mEditorToolBarRequest;
     NmActionRequest mViewerToolBarRequest;
     NmActionRequest mViewerViewRequest;
-    NmUiEngine *mUiEngine; // Singleton instance
-    NmSettingsViewLauncher *mSettingsViewLauncher; // owned
 };
 
 #endif /* NMBASECLIENTPLUGIN_H_ */