diff -r d189ee25cf9d -r 3533d4323edc ipsservices/ipssosaoplugin/src/IpsSosAOPluginTimer.cpp
--- a/ipsservices/ipssosaoplugin/src/IpsSosAOPluginTimer.cpp	Tue Aug 31 15:04:17 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOPluginTimer.cpp	Wed Sep 01 12:28:57 2010 +0100
@@ -16,7 +16,15 @@
 *
 */
 
-#include "ipssosaopluginheaders.h"
+
+#include "emailtrace.h"
+#include "IpsSosAOPluginTimer.h"
+
+//<cmail> //internal dependency removed
+/*#ifdef _DEBUG
+#include "../../internal/IpsSosAOPluginTester/inc/IpsSosAOPluginTester.hrh"
+#endif // _DEBUG*/
+//</cmail>
 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
@@ -76,6 +84,12 @@
     time = time + aSeconds;
     iTimer.At( iStatus, time );
     SetActive();
+    
+//<cmail> removing flags
+/*#ifdef IPSAOPLUGINTESTER_MBOXLOGICTEST   
+    iTestActivationTime = time;
+#endif // IPSAOPLUGINTESTER_MBOXLOGICTEST*/
+//</cmail>    
     }
     
 // ----------------------------------------------------------------------------
@@ -106,6 +120,27 @@
     return KErrNone;            
     }
 
+//<cmail> removing flags
+/*#ifdef IPSAOPLUGINTESTER_MBOXLOGICTEST
+// ----------------------------------------------------------------------------
+// TEST USAGE
+// ----------------------------------------------------------------------------
+//
+TInt CIpsSosAOPluginTimer::GetSecondsToTrick()
+    {
+    if ( !IsActive() )
+        {
+        return KErrNotFound;
+        }
+    
+    TTime now;
+    now.HomeTime();
+    TTimeIntervalSeconds secs;
+    iTestActivationTime.SecondsFrom( now, secs );
+    return secs.Int();
+    }
+#endif // IPSAOPLUGINTESTER_MBOXLOGICTEST*/
+//</cmail>    
 
 //EOF