diff -r 578830873419 -r ecc8def7944a emailuis/nmailuiengine/inc/nmbaseclientplugin.h
--- a/emailuis/nmailuiengine/inc/nmbaseclientplugin.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailuis/nmailuiengine/inc/nmbaseclientplugin.h	Mon May 03 12:23:15 2010 +0300
@@ -49,7 +49,7 @@
     void refresh();
     void openMessage();
     void deleteMessage();
-    void deleteMessageFromViewerViewToolbar();
+    void deleteMessageFromViewerView();
     void createNewMailViewerToolBar();
     void createNewMail();
     void settings();
@@ -63,10 +63,14 @@
     void markAsRead();
     void markAsUnread();
     void attach();
+    void removeAttachment();
+    void openAttachment();
 
 private slots:
     void mailboxListChanged(const NmId &mailboxId, NmSettings::MailboxEventType type);
     void mailboxPropertyChanged(const NmId &mailboxId, QVariant property, QVariant value);
+    void goOnline(const NmId &mailboxId);
+    void goOffline(const NmId &mailboxId);
 
 protected:
     virtual quint32 pluginId() = 0;
@@ -82,7 +86,7 @@
     NmActionRequest mMenuRequest;
     NmActionRequest mEditorToolBarRequest;
     NmActionRequest mViewerToolBarRequest;
-    NmActionRequest mViewerViewToolbarRequest;
+    NmActionRequest mViewerViewRequest;
     NmUiEngine *mUiEngine; // Singleton instance
     NmSettingsViewLauncher *mSettingsViewLauncher; // owned
 };