--- a/ipsservices/ipssosplugin/inc/ipsplgimap4fetchattachmentop.h	Mon Mar 15 12:39:10 2010 +0200
+++ b/ipsservices/ipssosplugin/inc/ipsplgimap4fetchattachmentop.h	Wed Mar 31 21:08:33 2010 +0300
@@ -216,6 +216,7 @@
             EStateIdle,
             EStateConnecting,
             EStateFetching,
+            EStateWaiting,
             EStateDisconnecting };
         TFetchState iState;
         
@@ -232,7 +233,11 @@
         TMsvId                                  iService;
         TBool                                   iPopulated;
         CIpsFetchProgReport*                    iProgReport;
+        // Temporary fix for handling KErrServerBusy errors from the
+        // messaging service.  Remove these once the appropriate observer
+        // mechanism has been implemented in the messaging service.
         TInt                                    iRetryCount;
+        RTimer                                  iRetryTimer;
     };
 
 #endif //__IPSPLGIMAP4FETCHATTACHMENTOP_H__