3 files changed, 10 insertions, 4 deletions

diff --git a/email-daemon/email-daemon-event.c b/email-daemon/email-daemon-event.c
index 9fb2911..068a4fa 100755
--- a/email-daemon/email-daemon-event.c
+++ b/email-daemon/email-daemon-event.c
@@ -1451,11 +1451,13 @@ static int event_handler_EMAIL_EVENT_SYNC_FLAGS_FIELD_TO_SERVER(char *multi_user
 		if (!emcore_set_flags_field(multi_user_name, account_id, mail_ids, num, field_type, value, &err)) {
 			EM_DEBUG_EXCEPTION("emcore_set_flags_field failed [%d]", err);
 		}
-	} else {
+	}
+#if 0
+	else {
 		/* If the emcore_sync_flags_field_with_server is failed, rollback the db */
 		emcore_set_flags_field(multi_user_name, account_id, mail_ids, num, field_type, value ? 0 : 1, NULL);
 	}
-
+#endif
 	if (error)
 		*error = err;
 
diff --git a/email-daemon/email-daemon-mail.c b/email-daemon/email-daemon-mail.c
index 216a175..24277e6 100755
--- a/email-daemon/email-daemon-mail.c
+++ b/email-daemon/email-daemon-mail.c
@@ -1328,12 +1328,12 @@ INTERNAL_FUNC int emdaemon_set_flags_field(char *multi_user_name, int account_id
 		EM_DEBUG_EXCEPTION("emstorage_get_account_by_id falled [%d]", err);
 		goto FINISH_OFF;
 	}
-
+#if 0 /* UI display issue with read/unread sync */
 	if (!emcore_set_flags_field(multi_user_name, account_id, mail_ids, num, field_type, value, &err))  {
 		EM_DEBUG_EXCEPTION("emcore_set_flags_field falled [%d]", err);
 		goto FINISH_OFF;
 	}
-
+#endif
 	if (onserver && account_tbl->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4) {
 		event_data = em_malloc(sizeof(email_event_t));
 		if (event_data == NULL) {
diff --git a/email-daemon/main.c b/email-daemon/main.c
index b931b64..ec8408c 100755
--- a/email-daemon/main.c
+++ b/email-daemon/main.c
@@ -1430,6 +1430,10 @@ void stb_set_flags_field(HIPC_API a_hAPI)
     int nAPPID = emipc_get_app_id(a_hAPI);
     char *multi_user_name = NULL;
 
+    if (!emnetwork_check_network_status(&err)) {
+	EM_DEBUG_EXCEPTION("Network failed [%d]", err);
+	goto FINISH_OFF;
+    }
     if ((err = emcore_get_user_name(nAPPID, &multi_user_name)) != EMAIL_ERROR_NONE) {
         EM_DEBUG_EXCEPTION("emcore_get_user_info failed : [%d]", err);
         multi_user_name = NULL;