diff -r e8f259fad141 -r c3c9c6dcfb80 emailuis/emailui/inc/FreestyleEmailUiAppui.h
--- a/emailuis/emailui/inc/FreestyleEmailUiAppui.h	Tue May 11 15:57:15 2010 +0300
+++ b/emailuis/emailui/inc/FreestyleEmailUiAppui.h	Tue May 25 12:23:16 2010 +0300
@@ -450,11 +450,9 @@
     TInt ViewLoadIdleCallbackFunctionL();
 
     /**
-     * Sets the manual mailbox syncronisation/connection flag if the
-     * user chose to synchorise/connect mail boxes from the menu
+     * Sets the manual mailbox connection flag if the
+     * user chose to connect mail boxes from the menu
      */
-    void ManualMailBoxSync( TBool aManualMailBoxSync );
-    void ManualMailBoxSyncAll( TBool aManualMailBoxSyncAll );
     void ManualMailBoxConnectAll( TBool aManualMailBoxConnectAll );
     void ManualMailBoxDisconnectAll( TBool aManualMailBoxConnectAll );
 
@@ -502,6 +500,11 @@
     // returns last seen pointer position
     const TPoint& LastSeenPointerPosition() const;
     
+    // Runs fake sync animation (needed for better user experience as
+    // otherwise in some connection/sync states pressing "send & receive"
+    // wouldn't have any visible effect.
+    void RunFakeSyncAnimL();
+    
 public: //from MFSMailEventObserver
     /**
      * Framework event message.
@@ -771,9 +774,7 @@
     // For feature manager
     TBool iFeatureManagerInitialized;
 
-    //ETrue if user started the sync/connect all
-    TBool iManualMailBoxSync;
-    TBool iManualMailBoxSyncAll;
+    // ETrue if user started the connect all
     TBool iManualMailBoxConnectAll;
     TBool iManualMailBoxDisconnectAll;
 
@@ -810,6 +811,7 @@
     CCustomStatuspaneIndicators* iStatusPaneIndicators;
     TBool iConnectionStatusVisible;
     CFSEmailUiGenericTimer* iConnectionStatusIconAnimTimer;
+    CFSEmailUiGenericTimer* iFakeSyncAnimStopTimer;
     CFbsBitmap* iConnectionIconBitmap;
     CFbsBitmap* iConnectionIconMask;
     TInt iConnectionStatusIconAngle;