--- a/emailservices/emailservermonitor/src/main.cpp	Fri Feb 19 22:37:30 2010 +0200
+++ b/emailservices/emailservermonitor/src/main.cpp	Fri Mar 12 15:41:14 2010 +0200
@@ -76,11 +76,6 @@
 
     // Start email shutter functionality
     CEmailShutter* shutter = CEmailShutter::NewLC();
-    if( mode == EEsmModeRestartAfterInstallation )
-        {
-        shutter->SetPsKeyInstallationFinished();
-        shutter->RestartServicesAfterInstallation();
-        }
     shutter->StartObservingShutdownEvent();
 
     CEmailServerMonitor* monitor = NULL;
@@ -88,6 +83,11 @@
         {
         // Start email server observing functionality
         monitor = CEmailServerMonitor::NewLC();
+        monitor->SetShutter( shutter );
+        if( mode == EEsmModeRestartAfterInstallation )
+            {
+            monitor->SetRestartExternalServicesFlag();
+            }
         monitor->Start();
         shutter->SetMonitor( monitor );
         }