fix SDK issues

9 files changed, 69 insertions, 23 deletions

diff --git a/packaging/org.tizen.email.spec b/packaging/org.tizen.email.spec
index 3593698..ebad736 100755
--- a/packaging/org.tizen.email.spec
+++ b/packaging/org.tizen.email.spec
@@ -5,7 +5,7 @@
 
 Name:       org.tizen.email
 Summary:    email application
-Version:    0.0.3
+Version:    0.0.4
 Release:    1
 Group:      devel
 License:    Flora
diff --git a/setting/src/email-setting-account-set.c b/setting/src/email-setting-account-set.c
index d3f7a49..c43d84d 100755
--- a/setting/src/email-setting-account-set.c
+++ b/setting/src/email-setting-account-set.c
@@ -412,7 +412,7 @@ static void _set_aol(struct viewdata *vd)
 	email_account_t *account = NULL;
 	account = ugd->new_account;
 
-	int rgb = 0xdaa520ff;
+	int rgb = 0x008080ff;
 
 	account->incoming_server_user_name = g_strdup(account->user_email_address);
 	_set_display_name_with_email_addr(account->user_email_address, &(account->user_display_name));
diff --git a/setting/src/email-view-account-edit.c b/setting/src/email-view-account-edit.c
index 0f3c8f8..5308d77 100755
--- a/setting/src/email-view-account-edit.c
+++ b/setting/src/email-view-account-edit.c
@@ -1427,6 +1427,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_account_name = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_account_name, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_account_name, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_account_name, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_account_name, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_account_name, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_account_name, TRUE);
@@ -1453,6 +1454,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_email_address = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_email_address, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_email_address, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_email_address, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_email_address, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_email_address, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_email_address, FALSE);
@@ -1479,6 +1481,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_user_name = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_user_name, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_user_name, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_user_name, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_user_name, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_user_name, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_user_name, FALSE);
@@ -1505,6 +1508,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_password = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_password, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_password, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_password, EINA_TRUE);
 			elm_entry_password_set(p->entry_password, 1);
 			elm_entry_cnp_mode_set(p->entry_password, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_EMAIL);
@@ -1533,6 +1537,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_smtp_server = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_smtp_server, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_smtp_server, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_smtp_server, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_smtp_server, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_smtp_server, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_smtp_server, TRUE);
@@ -1559,6 +1564,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_smtp_port = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_smtp_port, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_smtp_port, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_smtp_port, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_smtp_port, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_smtp_port, ELM_INPUT_PANEL_LAYOUT_NUMBERONLY);
 			elm_entry_editable_set(p->entry_smtp_port, TRUE);
@@ -1585,6 +1591,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_incoming_server = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_incoming_server, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_incoming_server, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_incoming_server, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_incoming_server, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_incoming_server, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_incoming_server, TRUE);
@@ -1617,6 +1624,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_incoming_port = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_incoming_port, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_incoming_port, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_incoming_port, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_incoming_port, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_incoming_port, ELM_INPUT_PANEL_LAYOUT_NUMBERONLY);
 			elm_entry_editable_set(p->entry_incoming_port, TRUE);
@@ -1649,6 +1657,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_sending_username = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_sending_username, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_sending_username, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_sending_username, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_sending_username, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_sending_username, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 
@@ -1675,6 +1684,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_sending_password = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_sending_password, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_sending_password, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_sending_password, EINA_TRUE);
 			elm_entry_password_set(p->entry_sending_password, 1);
 			elm_entry_cnp_mode_set(p->entry_sending_password, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_sending_password, ELM_INPUT_PANEL_LAYOUT_EMAIL);
diff --git a/setting/src/email-view-account-options.c b/setting/src/email-view-account-options.c
index d1d8ac0..493bdfd 100755
--- a/setting/src/email-view-account-options.c
+++ b/setting/src/email-view-account-options.c
@@ -1312,8 +1312,10 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 		debug_log("");
 		p->ef = elm_layout_add(p->genlist);
 		elm_layout_theme_set(p->ef, "layout", "editfield", "title");
+		evas_object_size_hint_weight_set(p->ef, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+		evas_object_show(p->ef);
+
 		p->entry_sig = elm_entry_add(p->genlist);
-		elm_entry_scrollable_set(p->entry_sig, EINA_TRUE);
 		elm_entry_cnp_mode_set(p->entry_sig, ELM_CNP_MODE_PLAINTEXT);
 		elm_entry_input_panel_layout_set(p->entry_sig, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 		if (account_data->options.add_signature) {
@@ -1333,9 +1335,6 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 		elm_object_part_text_set(p->ef, "elm.text", _("IDS_EMAIL_BODY_SIGNATURE"));
 		elm_object_signal_callback_add(p->ef, "elm,eraser,clicked", "elm", _eraser_clicked_cb, p->entry_sig);
 
-		evas_object_size_hint_weight_set(p->ef, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-		evas_object_show(p->ef);
-
 		if (account_data->options.signature)
 			elm_entry_entry_set(p->entry_sig, p->signature_backup);
 
diff --git a/setting/src/email-view-account-setup.c b/setting/src/email-view-account-setup.c
index e1beb05..d7acf20 100755
--- a/setting/src/email-view-account-setup.c
+++ b/setting/src/email-view-account-setup.c
@@ -762,8 +762,6 @@ static void _next_cb(void *data, Evas_Object *obj, void *event_info)
 	debug_log("User Name:%s", account->incoming_server_user_name);
 	debug_log("User Password:%s", account->incoming_server_password);
 
-	ret = _check_null_field(vd);
-
 	if (ugd->popup_one) {
 		evas_object_del(ugd->popup_one);
 		ugd->popup_one = NULL;
@@ -773,6 +771,8 @@ static void _next_cb(void *data, Evas_Object *obj, void *event_info)
 		ugd->popup_validate = NULL;
 	}
 
+	/* check Null field */
+	ret = _check_null_field(vd);
 	if (!ret) {
 		ugd->popup_one = setting_get_notify(vd,
 				dgettext("sys_string", "IDS_COM_POP_WARNING"),
@@ -782,10 +782,10 @@ static void _next_cb(void *data, Evas_Object *obj, void *event_info)
 		return;
 	}
 
+	/* check character validation */
 	buf = g_strdup(account->user_email_address);
 
 	ret = email_get_address_validation(buf);
-
 	if (!ret) {
 		ugd->popup_one = setting_get_notify(vd,
 				dgettext("sys_string", "IDS_COM_POP_WARNING"),
@@ -796,7 +796,6 @@ static void _next_cb(void *data, Evas_Object *obj, void *event_info)
 		free(buf);
 		return;
 	}
-
 	g_free(buf);
 
 	setting_change_view(VIEW_MANUAL_SETUP, ugd);
@@ -921,12 +920,6 @@ static void _manual_cb(void *data, Evas_Object *obj, void *event_info)
 	debug_log("User Name:%s", account->incoming_server_user_name);
 	debug_log("User Password:%s", account->incoming_server_password);
 
-	if (vd->ugd->account_info == OTHERS) {
-		ret = _check_null_field(vd);
-	} else {
-		ret = _check_preset_null_field(vd);
-	}
-
 	if (ugd->popup_one) {
 		evas_object_del(ugd->popup_one);
 		ugd->popup_one = NULL;
@@ -936,6 +929,13 @@ static void _manual_cb(void *data, Evas_Object *obj, void *event_info)
 		ugd->popup_validate = NULL;
 	}
 
+	/* check Null field */
+	if (vd->ugd->account_info == OTHERS) {
+		ret = _check_null_field(vd);
+	} else {
+		ret = _check_preset_null_field(vd);
+	}
+
 	if (!ret) {
 		ugd->popup_one = setting_get_notify(vd,
 				dgettext("sys_string", "IDS_COM_POP_WARNING"),
@@ -945,10 +945,27 @@ static void _manual_cb(void *data, Evas_Object *obj, void *event_info)
 		return;
 	}
 
+	/* check ISP */
+	if (ugd->account_info != OTHERS) {
+		buf = g_strdup(account->user_email_address);
+		ret = _check_preset_isp_name(buf, ugd->account_info);
+		if (ret == FALSE) {
+			debug_log("wrong ISP server name for preset accounts");
+			ugd->popup_one = setting_get_notify(vd,
+					dgettext("sys_string", "IDS_COM_POP_WARNING"),
+					_("IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS"),
+					1, dgettext("sys_string", "IDS_COM_SK_OK"),
+					_popup_ok_cb, NULL, NULL);
+			free(buf);
+			return;
+		}
+		g_free(buf);
+	}
+
+	/* check character validation */
 	buf = g_strdup(account->user_email_address);
 
 	ret = email_get_address_validation(buf);
-
 	if (!ret) {
 		ugd->popup_one = setting_get_notify(vd,
 				dgettext("sys_string", "IDS_COM_POP_WARNING"),
@@ -963,7 +980,7 @@ static void _manual_cb(void *data, Evas_Object *obj, void *event_info)
 	g_free(buf);
 
 	/* account info setting */
-	if (vd->ugd->account_info != OTHERS)
+	if (ugd->account_info != OTHERS)
 		setting_set_account(vd);
 
 	setting_change_view(VIEW_MANUAL_SETUP, ugd);
@@ -1183,8 +1200,10 @@ static void _popup_ok_cb(void *data, Evas_Object *obj, void *event_info)
 		ugd->popup_validate = NULL;
 	}
 
+	elm_object_disabled_set(p->l_button, EINA_FALSE);
 	elm_object_disabled_set(p->r_button, EINA_FALSE);
 	elm_object_disabled_set(p->r_button2, EINA_FALSE);
+	elm_object_disabled_set(p->manual_btn, EINA_FALSE);
 }
 
 static void _popup_cancel_validation_cb(void *data, Evas_Object *obj, void *event_info)
@@ -1394,6 +1413,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_account_name = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_account_name, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_account_name, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_account_name, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_account_name, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_account_name, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_account_name, TRUE);
@@ -1435,6 +1455,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_user_id = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_user_id, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_user_id, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_user_id, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_user_id, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_user_id, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_user_id, TRUE);
@@ -1462,6 +1483,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_display_name = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_display_name, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_display_name, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_display_name, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_display_name, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_display_name, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_display_name, TRUE);
@@ -1491,6 +1513,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_email_address = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_email_address, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_email_address, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_email_address, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_email_address, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_email_address, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_email_address, TRUE);
@@ -1524,6 +1547,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_password = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_password, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_password, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_password, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_password, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_password, EINA_TRUE);
diff --git a/setting/src/email-view-manual-setup.c b/setting/src/email-view-manual-setup.c
index 90bc491..226814e 100755
--- a/setting/src/email-view-manual-setup.c
+++ b/setting/src/email-view-manual-setup.c
@@ -1209,6 +1209,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_account_name = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_account_name, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_account_name, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_account_name, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_account_name, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_account_name, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_account_name, TRUE);
@@ -1235,6 +1236,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_user_name = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_user_name, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_user_name, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_user_name, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_user_name, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_user_name, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_user_name, TRUE);
@@ -1261,6 +1263,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_password = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_password, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_password, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_password, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_password, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_password, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_password, EINA_TRUE);
@@ -1290,6 +1293,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_smtp_server = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_smtp_server, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_smtp_server, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_smtp_server, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_smtp_server, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_smtp_server, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_smtp_server, TRUE);
@@ -1322,6 +1326,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_smtp_port = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_smtp_port, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_smtp_port, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_smtp_port, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_smtp_port, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_smtp_port, ELM_INPUT_PANEL_LAYOUT_NUMBERONLY);
 			elm_entry_editable_set(p->entry_smtp_port, TRUE);
@@ -1348,6 +1353,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_incoming_server = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_incoming_server, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_incoming_server, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_incoming_server, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_incoming_server, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_incoming_server, ELM_INPUT_PANEL_LAYOUT_EMAIL);
 			elm_entry_editable_set(p->entry_incoming_server, TRUE);
@@ -1374,6 +1380,7 @@ static Evas_Object *_gl_ef_content_get_cb(void *data, Evas_Object *obj, const ch
 			p->entry_incoming_port = elm_entry_add(p->genlist);
 			elm_entry_scrollable_set(p->entry_incoming_port, EINA_TRUE);
 			elm_entry_single_line_set(p->entry_incoming_port, EINA_TRUE);
+			elm_entry_input_panel_return_key_disabled_set(p->entry_incoming_port, EINA_TRUE);
 			elm_entry_cnp_mode_set(p->entry_incoming_port, ELM_CNP_MODE_PLAINTEXT);
 			elm_entry_input_panel_layout_set(p->entry_incoming_port, ELM_INPUT_PANEL_LAYOUT_NUMBERONLY);
 			elm_entry_editable_set(p->entry_incoming_port, TRUE);
diff --git a/setting/src/email-view-setting.c b/setting/src/email-view-setting.c
index fc25daa..334a076 100755
--- a/setting/src/email-view-setting.c
+++ b/setting/src/email-view-setting.c
@@ -525,7 +525,7 @@ static void _color_rect_cb(void *data, Evas * evas, Evas_Object *obj, void *even
 	elm_colorselector_palette_color_add(p->colorselector, 0xff, 0xd7, 0x00, 0xff);
 	elm_colorselector_palette_color_add(p->colorselector, 0xad, 0xff, 0x2f, 0xff);
 	elm_colorselector_palette_color_add(p->colorselector, 0x00, 0x64, 0x00, 0xff);
-	elm_colorselector_palette_color_add(p->colorselector, 0x19, 0x19, 0x70, 0xff);
+	elm_colorselector_palette_color_add(p->colorselector, 0x00, 0x00, 0xff, 0xff);
 	elm_colorselector_palette_color_add(p->colorselector, 0x80, 0x00, 0x80, 0xff);
 	elm_colorselector_palette_color_add(p->colorselector, 0x00, 0xbf, 0xff, 0xff);
 	elm_colorselector_palette_color_add(p->colorselector, 0x77, 0x88, 0x99, 0xff);
diff --git a/setting/src/email-view-sync-schedule.c b/setting/src/email-view-sync-schedule.c
index 9700ea7..fabda9b 100755
--- a/setting/src/email-view-sync-schedule.c
+++ b/setting/src/email-view-sync-schedule.c
@@ -983,10 +983,13 @@ static Evas_Object *_gl_onoff_content_get_cb(void *data, Evas_Object *obj, const
 		evas_object_smart_callback_add(check, "changed", _onoff_cb, vd);
 		evas_object_propagate_events_set(check, EINA_FALSE);
 
-		if (account_data->sync_disabled)
+		if (account_data->sync_disabled) {
 			elm_check_state_set(check, EINA_FALSE);
-		else
+			elm_object_item_disabled_set(p->gl_sync_item, EINA_TRUE);
+		} else {
 			elm_check_state_set(check, EINA_TRUE);
+			elm_object_item_disabled_set(p->gl_sync_item, EINA_FALSE);
+		}
 
 		p->onoff = check;
 
diff --git a/setting/src/email-view-sync-setup.c b/setting/src/email-view-sync-setup.c
index 2202662..98b5e82 100755
--- a/setting/src/email-view-sync-setup.c
+++ b/setting/src/email-view-sync-setup.c
@@ -1004,10 +1004,13 @@ static Evas_Object *_gl_onoff_content_get_cb(void *data, Evas_Object *obj, const
 		evas_object_smart_callback_add(check, "changed", _onoff_cb, vd);
 		evas_object_propagate_events_set(check, EINA_FALSE);
 
-		if (account_data->sync_disabled)
+		if (account_data->sync_disabled) {
 			elm_check_state_set(check, EINA_FALSE);
-		else
+			elm_object_item_disabled_set(p->gl_sync_item, EINA_TRUE);
+		} else {
 			elm_check_state_set(check, EINA_TRUE);
+			elm_object_item_disabled_set(p->gl_sync_item, EINA_FALSE);
+		}
 
 		p->onoff = check;