Merge with latest common/composer/main/po/viewer codes
authorSungbok Park <parksb@samsung.com>
Mon, 10 Dec 2012 14:18:34 +0000 (23:18 +0900)
committerSungbok Park <parksb@samsung.com>
Mon, 10 Dec 2012 14:18:34 +0000 (23:18 +0900)
85 files changed:
CMakeLists.txt
account/src/email-account.c
common/include/email-common-types.h
common/include/email-engine.h
common/src/email-engine.c
common/src/email-utils.c
composer/CMakeLists.txt
composer/include/email-composer-callback.h
composer/include/email-composer-util.h
composer/include/email-composer.h
composer/src/email-composer-attachment.c
composer/src/email-composer-callback.c
composer/src/email-composer-contents.c
composer/src/email-composer-predictive-search.c
composer/src/email-composer-recipient.c
composer/src/email-composer-util.c
composer/src/email-composer.c
composer/theme/email-composer-edc-common.edc
images/M02_email_icon_favorite_off.png [deleted file]
images/M02_email_icon_favorite_on.png [deleted file]
mailbox/src/email-mailbox.c
main/CMakeLists.txt
main/email-setting-efl.account.xml [moved from main/org.tizen.email.account.xml with 100% similarity]
main/email.c
main/org.tizen.email.xml
po/CMakeLists.txt
po/ar.po
po/az.po
po/bg.po
po/ca.po
po/cs.po
po/da.po
po/de_DE.po
po/el_GR.po
po/en.po
po/en_PH.po
po/en_US.po
po/es_ES.po
po/es_MX.po [new file with mode: 0755]
po/es_US.po
po/et.po
po/eu.po
po/fi.po
po/fr_CA.po
po/fr_FR.po
po/ga.po
po/gl.po
po/hi.po
po/hr.po
po/hu.po
po/hy.po
po/is.po
po/it_IT.po
po/ja_JP.po
po/ka.po
po/kk.po
po/ko_KR.po
po/lt.po
po/lv.po
po/mk.po
po/nb.po
po/nl_NL.po
po/pl.po
po/pt_BR.po
po/pt_PT.po
po/ro.po
po/ru_RU.po
po/sk.po
po/sl.po
po/sr.po
po/sv.po
po/tr_TR.po
po/uk.po
po/uz.po
po/zh_CN.po
po/zh_HK.po
po/zh_SG.po
po/zh_TW.po
setting/src/email-setting.c
viewer/CMakeLists.txt
viewer/include/email-viewer-js.h [deleted file]
viewer/include/email-viewer-utils.h
viewer/src/email-viewer-utils.c
viewer/src/email-viewer-webview.c
viewer/src/email-viewer.c

index 3f16d01..e9e1d5e 100755 (executable)
@@ -8,7 +8,6 @@ SET(DATADIR "${PREFIX}/data")
 SET(LOCALEDIR "${RESDIR}/locale")
 SET(EDJDIR "${RESDIR}/edje")
 SET(IMGDIR "${RESDIR}/images")
-SET(JSDIR "${RESDIR}/js")
 SET(XMLDIR "${RESDIR}/xml")
 SET(SHAREDIR "/usr/share")
 SET(ICONDIR "${SHAREDIR}/icons/default/small")
@@ -20,7 +19,6 @@ ADD_DEFINITIONS("-DDATADIR=\"${DATADIR}\"")
 ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
 ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"")
 ADD_DEFINITIONS("-DIMGDIR=\"${IMGDIR}\"")
-ADD_DEFINITIONS("-DJSDIR=\"${JSDIR}\"")
 ADD_DEFINITIONS("-DICONDIR=\"${ICONDIR}\"")
 
 # Add your submodule directory name
index 3cd0d10..3842da1 100755 (executable)
@@ -38,8 +38,6 @@ static void on_message(ui_gadget_h ug, service_h msg, service_h service, void *p
 static void on_event(ui_gadget_h ug, enum ug_event event, service_h service, void *priv);
 static void on_key_event(ui_gadget_h ug, enum ug_key_event event, service_h service, void *priv);
 
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event);
-
 /* view logic */
 static Evas_Object *create_frameview(EmailAccountUGD *ugd);
 
@@ -154,8 +152,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi
                ug_data->base = create_frameview(ug_data);
        }
 
-       evas_object_smart_callback_add(ug_data->win, "profile,changed", _win_profile_changed_cb, ug_data);
-
        return ug_data->base;
 }
 
@@ -354,26 +350,6 @@ static Evas_Object *create_frameview(EmailAccountUGD * ug_data)
        return ug_data->ly;
 }
 
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event)
-{
-       debug_log("");
-       if (!data) {
-               debug_log("data is NULL");
-               return;
-       }
-
-       EmailAccountUGD *ug_data = (EmailAccountUGD *)data;
-
-       const char *profile = elm_config_profile_get();
-       if (!g_strcmp0(profile, "desktop"))
-               elm_layout_theme_set(ug_data->ly, "layout", "application", "noindicator");
-       else
-               elm_layout_theme_set(ug_data->ly, "layout", "application", "default");
-
-       evas_object_size_hint_weight_set(ug_data->ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_show(ug_data->ly);
-}
-
 void _create_account_view(EmailAccountUGD *ug_data)
 {
        debug_log("");
index f8cf57e..9f34fda 100755 (executable)
@@ -37,9 +37,6 @@
 #define EMAIL_BUNDLE_KEY_MAILBOX                       "MAILBOX_ID"
 #define EMAIL_BUNDLE_KEY_MAILBOX_ALIAS         "MAILBOX_ALIAS"
 #define EMAIL_BUNDLE_KEY_USER_EMAIL            "USER_EMAIL"
-#define EMAIL_BUNDLE_KEY_UPDATE                        "UPDATE"
-#define EMAIL_BUNDLE_KEY_SAVE_ALL                      "SAVE_ALL"
-#define EMAIL_BUNDLE_KEY_CANCEL_ALL                    "CANCEL_ALL"
 #define EMAIL_BUNDLE_KEY_VIEW_TYPE                     "VIEW_TYPE"
 #define EMAIL_BUNDLE_KEY_RUN_TYPE                      "RUN_TYPE"
 #define EMAIL_BUNDLE_KEY_MAIL_ID                       "MAIL_ID"
@@ -72,8 +69,6 @@
 #define UG_NAME_EMAIL_SETTING          "email-setting-efl"
 #define UG_NAME_EMAIL_ACCOUNT          "email-account-efl"
 #define UG_NAME_EMAIL_DOCUMENT         "email-docsearch-efl"
-#define UG_NAME_CONTACT                        "contacts-tabui-efl"
-#define UG_NAME_MESSAGE_COMPOSER       "msg-composer-efl"
 
 /* define bundle value */
 #define EMAIL_BUNDLE_VAL_ALL_ACCOUNT                   "ALL_ACCOUNT"
index fa12ca2..2d6afce 100755 (executable)
@@ -19,6 +19,7 @@
 
 #include <glib.h>
 #include <email-api.h>
+#include "email-common-types.h"
 
 G_BEGIN_DECLS
 
index cabd555..c53a057 100755 (executable)
@@ -23,7 +23,6 @@
 #include <vconf.h>
 #include <ui-gadget-module.h>
 
-#include "email-common-types.h"
 #include "email-debug.h"
 #include "email-utils.h"
 #include "email-engine.h"
@@ -364,6 +363,7 @@ gboolean email_engine_sync_folder(gint account_id, int mailbox_id, int *handle)
 void email_engine_stop_working(gint account_id, int handle)
 {
        debug_log("");
+       debug_log("account_id:%d, handle:%d", account_id, handle);
 
        RETURN_IF_FAIL(account_id > ACCOUNT_MIN);
        RETURN_IF_FAIL(handle != 0);
@@ -391,6 +391,7 @@ gboolean email_engine_check_seen_mail(gint account_id, gint mail_id)
 
        if ((err = email_get_mail_data(mail_id, &mail_info)) != EMAIL_ERROR_NONE) {
                debug_log("fail to get mail data - err (%d)", err);
+               email_free_mail_data(&mail_info, 1);
                return 0;
        }
 
@@ -422,6 +423,7 @@ int email_engine_check_body_download(int mail_id)
 
        if ((err = email_get_mail_data(mail_id, &mail_info)) != EMAIL_ERROR_NONE) {
                debug_log("fail to get mail data - err (%d)", err);
+               email_free_mail_data(&mail_info, 1);
                return 0;
        }
 
@@ -703,6 +705,12 @@ gboolean email_engine_get_account_info(gint account_id, EmailAccountInfo **accou
        if (info) {
                free(info);
        }
+       if (account) {
+               err = email_free_account(&account, 1);
+               if (err != EMAIL_ERROR_NONE) {
+                       debug_critical("failed to free account info - err (%d)", err);
+               }
+       }
        return FALSE;
 }
 
index d66632c..256fb7c 100755 (executable)
@@ -25,6 +25,7 @@
 #include <drm_client.h>
 #include <drm_client_types.h>
 #include <pthread.h>
+#include <media_content.h>
 
 #include "email-utils.h"
 
@@ -830,7 +831,7 @@ int email_attachments_save_file(const gchar *path, gchar *newpath, gboolean(*cop
        debug_log("new_path:%s", new_path);
 
        /* Move for DRM file */
-       
+
        ret = media_content_connect();
        if (!ret) {
                _create_download_folder();
@@ -855,7 +856,7 @@ int email_attachments_save_file(const gchar *path, gchar *newpath, gboolean(*cop
                ret = media_content_disconnect();
                if (ret) {
                        debug_log("media_content_disconnect() is failed!");
-               }               
+               }
        } else {
                debug_log("media_content_connect() is failed!");
        }
@@ -1003,8 +1004,6 @@ gboolean email_drm_file_forward_lock_check(const gchar *path)
 
        drm_file_info_s drm_info;
 
-//     memset(&drm_info, 0, sizeof(drm_file_info_s));
-
        if (drm_get_file_info(path, &drm_info)) {
                debug_log("drm_info.oma_info.method (%d)", drm_info.oma_info.method);
                if (drm_info.oma_info.method == DRM_METHOD_TYPE_FORWARD_LOCK || drm_info.oma_info.method == DRM_METHOD_TYPE_COMBINED_DELIVERY) {
@@ -1179,7 +1178,6 @@ int email_get_contacts_email_address(contacts_record_h record, char *email_addr)
        debug_log("");
        int ct_ret = CONTACTS_ERROR_NONE;
        ct_ret = contacts_record_get_str_p(record, _contacts_contact_email.email, &email_addr);
-//     contacts_list_item->email_address = g_strdup(email_addr);
        return ct_ret;
 }
 
@@ -1188,7 +1186,6 @@ int email_get_contacts_image_thumbnail_path(contacts_record_h record, char *imag
        debug_log("");
        int ct_ret = CONTACTS_ERROR_NONE;
        ct_ret = contacts_record_get_str_p(record, _contacts_contact_email.image_thumbnail_path, &image_thumbnail_path);
-//     contacts_list_item->image_path = g_strdup(image_path);
        return ct_ret;
 }
 
@@ -1197,7 +1194,6 @@ int email_get_contacts_first_name(contacts_record_h record, char *first_name)
        debug_log("");
        int ct_ret = CONTACTS_ERROR_NONE;
        ct_ret = contacts_record_get_str_p(record, _contacts_name.first, &first_name);
-//     contacts_list_item->image_path = g_strdup(first_name);
        return ct_ret;
 }
 
@@ -1206,7 +1202,6 @@ int email_get_contacts_last_name(contacts_record_h record, char *last_name)
        debug_log("");
        int ct_ret = CONTACTS_ERROR_NONE;
        ct_ret = contacts_record_get_str_p(record, _contacts_name.last, &last_name);
-//     contacts_list_item->image_path = g_strdup(last_name);
        return ct_ret;
 }
 
@@ -1246,7 +1241,6 @@ int email_get_contacts_list_info(contacts_list_h list, EMAIL_CONTACT_LIST_INFO_S
                                }
 
                                if ((ct_ret = contacts_record_get_str_p(ct_value, _contacts_contact_email.email, &email_addr)) == CONTACTS_ERROR_NONE){
-//                             if ((ct_ret = email_get_contacts_email_address(ct_value, &email_addr)) == CONTACTS_ERROR_NONE) {
                                        if (email_addr != NULL) {
                                                ct_list_info->email_address = g_strdup(email_addr);
                                        }
@@ -1256,7 +1250,6 @@ int email_get_contacts_list_info(contacts_list_h list, EMAIL_CONTACT_LIST_INFO_S
 
                                if (!ct_list_info->display && email_addr) {
                                        strncpy(ct_list_info->display_name, email_addr, sizeof(ct_list_info->display_name) - 1);
-                                       //display_name = g_strdup(email_addr);
                                } else {
                                        if (strlen(ct_list_info->display) > 0) {
                                                snprintf(ct_list_info->display_name, sizeof(ct_list_info->display_name), "%s", ct_list_info->display);
@@ -1285,14 +1278,7 @@ int email_num_id_get_contacts_record(int num_id, contacts_record_h* out_record)
                debug_log("_contacts_number, db_get_record is failed : ct_ret = [%d]", ct_ret);
                return ct_ret;
        }
-#if 0
-       /* get number str */
-       ct_ret = contacts_record_get_str_p(out_record, _contacts_contact_email.number, &number_str);
-       if (ct_ret != CONTACTS_ERROR_NONE) {
-               D_EMSG("contacts_record_get_str_p is failed : ct_ret = [%d]", ct_ret);
-               goto ERROR_EXIT;
-       }
-#endif
        return ct_ret;
 }
+
 /* EOF */
index 80d5088..899f8f8 100755 (executable)
@@ -24,8 +24,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/common/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs-composer REQUIRED ecore ecore-file glib-2.0 gobject-2.0 edbus
-                                       appcore-common elementary capi-appfw-application capi-media-metadata-extractor capi-media-image-util status
-                                       sysman dlog email-service contacts-service2
+                                       appcore-common elementary capi-appfw-application
+                                       capi-media-metadata-extractor capi-media-image-util status
+                                       sysman dlog email-service contacts-service2 libexif
                                        efreet-mime ewebkit2 ui-gadget-1 bundle ethumb ecore-x)
 
 FOREACH(flag ${pkgs-composer_CFLAGS})
@@ -47,9 +48,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DDEBUG")
-ADD_DEFINITIONS("-D_TEMPORARY_FIX_FOR_ROTATION_")
 ADD_DEFINITIONS("-D_POPUP_WITH_LIST")
-ADD_DEFINITIONS("-D_ALWAYS_CC_MYSELF")
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${CMAKE_LDFLAGS} ${pkgs-composer_LDFLAGS})
index 533a6b7..2e7cf30 100755 (executable)
@@ -20,7 +20,7 @@
 void _composer_mbe_changed_cb(void *data, Evas_Object *obj, void *event_info);
 void _composer_mbe_longpressed_cb(void *data, Evas_Object *obj, void *event_info);
 void _composer_edit_field_changed_cb(void *data, Evas_Object *obj, void *event_info);
-void _composer_more_button_cb(void *data, Evas_Object *obj, void *event_info);
+void _composer_more_toolbar_button_cb(void *data, Evas_Object *obj, void *event_info);
 void _composer_back_button_cb(void *data, Evas_Object *obj, void *event_info);
 void _composer_mbe_added_cb(void *data, Evas_Object *obj, void *event_info);
 void _composer_mbe_deleted_cb(void *data, Evas_Object *obj, void *event_info);
@@ -54,8 +54,13 @@ void _composer_from_show_popup(EmailComposerUGD *ugd);
 char *_composer_from_gl_text_get(void *data, Evas_Object *obj, const char *part);
 Evas_Object *_composer_from_gl_content_get(void *data, Evas_Object *obj, const char *part);
 
+void _composer_select_myemail_popup(EmailComposerUGD *ugd);
+char *_composer_myemail_gl_text_get(void *data, Evas_Object *obj, const char *part);
+Evas_Object *_composer_myemail_gl_content_get(void *data, Evas_Object *obj, const char *part);
+
 void _composer_cbar_cc_clicked(void *data, Evas_Object *obj, void *event_info);
 
+void _composer_cbar_send_myself_clicked(void *data, Evas_Object *obj, void *event_info);
 void _composer_cbar_add_me_clicked(void *data, Evas_Object *obj, void *event_info);
 void _composer_cbar_save_as_draft_clicked(void *data, Evas_Object *obj, void *event_info);
 void _composer_cbar_priority_clicked(void *data, Evas_Object *obj, void *event_info);
index e273c4f..5d12558 100755 (executable)
@@ -19,6 +19,9 @@
 
 #define GET_VALUE_WITH_RATE(total, rate) ((int)((float)(total) * rate / 100))
 
+char *_composer_get_file_ext(const char *a_pszfile_name);
+int _composer_copy_temp_file(const char *src_file_path, char *dst_file_path, int size_dst_file_path);
+
 Eina_Bool email_composer_change_image_paths_to_relative(char *src_html_content, char **dest_buffer);
 Eina_List *email_composer_change_str_to_EinaList(EmailComposerUGD *ugd, const char *str, char *token);
 Eina_List *email_composer_change_GList_to_EinaList(GList * l);
@@ -86,7 +89,6 @@ void _composer_show_download_attachment_popup(EmailComposerUGD *ugd);
 Eina_Bool _composer_show_progress_popup(void *data);
 void _composer_download_attachment(EmailComposerUGD *ugd);
 void _composer_update_attachment_info(EmailComposerUGD *ugd, int index);
-void _composer_attachment_cancel_download(EmailComposerUGD *ugd);
 void _composer_cancel_download_attachment(EmailComposerUGD *ugd);
 
 Evas_Object *_composer_create_noti(EmailComposerUGD *ugd, bool use_win, char *title, char *content,
@@ -112,8 +114,5 @@ void _composer_display_position(void *data);
 void _composer_print_hit_test_result(Ewk_Hit_Test *hit_test);
 void _composer_coords_ewk_to_evas(Evas_Object *view, int ewkX, int ewkY, int *evasX, int *evasY);
 void _composer_coords_evas_to_ewk(Evas_Object *view, int evasX, int evasY, int *ewkX, int *ewkY);
-void _composer_set_option_tray_menu(int num, EmailComposerUGD *ugd);
-void _composer_unset_option_tray_menu(int num, EmailComposerUGD *ugd);
-
 
 #endif                         /* __DEF_email_composer_util_H__ */
index 61150fd..f15ba49 100755 (executable)
@@ -101,9 +101,7 @@ struct ug_data {
        bool is_main_scroller_scrolling;
        bool is_webview_scrolling;
 
-#ifdef _TEMPORARY_FIX_FOR_ROTATION_
        bool temporary_fix_for_rotation;
-#endif
 
        Evas_Object *priv_selected_entry;
        Evas_Object *selected_entry;
@@ -132,6 +130,8 @@ struct ug_data {
 
        Evas_Object *send_btn;
        Evas_Object *cancel_btn;
+       Evas_Object *send_btm_btn;
+       Evas_Object *cancel_btm_btn;
 
        bool is_hided;
 
@@ -183,6 +183,8 @@ struct ug_data {
 
        Evas_Object *body_ewkview;
 
+       Evas_Object *context_popup;
+
        Eina_Bool has_body_html;
        char *saved_html_path;
        char *saved_html_content;
@@ -224,6 +226,7 @@ struct ug_data {
        bool b_sending;
 
        Ecore_IMF_Context *imf_context;
+       bool is_ime_hided;
 
        Evas_Object *account_gen_list;
        bool b_launch_finished;
index 247565d..5d8e0d1 100755 (executable)
 #include "email-composer-recipient.h"
 #include "email-composer-js.h"
 
-#ifdef _ATTACHMENT_UI_
 static int toggle = 0;
 static Evas_Object *_g_attach_btn;
-#endif
+
 EmailComposerUGD *g_ugd;
 
 static void _composer_attachment_delete_icon_clicked_cb(void *data, Evas_Object *obj, void *event_info);
-#ifdef _ATTACHMENT_UI_
 static void _composer_attachment_contracted_item_clicked_cb(void *data, Evas_Object *obj, void *event_info);
-#else
-static void _composer_attachment_delete_all_icon_clicked_cb(void *data, Evas_Object *obj, void *event_info);
-static void _composer_attachment_contracted_item_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
-#endif
 static void _composer_attachment_unfocus(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _composer_attachment_mouse_clicked(void *data, Evas_Object *obj, const char *emission, const char *source);
 
@@ -80,16 +74,10 @@ int _composer_get_attachments_total_size(EmailComposerUGD *ugd)
                                debug_error("stat Error(%d): %s", errno, strerror(errno));
                                attach_size += attachment_data->attachment_size;
                                continue;
-//                             return COMPOSER_ERROR_INVALID_FILE;
                        }
 
                        debug_log("file size in byte : %d", file_info.st_size);
 
-/*                     if (file_info.st_size / 1024 > 1)
-                               temp_file_size = file_info.st_size / 1024;
-                       else
-                               temp_file_size = 1;
-*/
                        attach_size += file_info.st_size;
                }
        }
@@ -187,8 +175,6 @@ int _composer_get_inline_images_size(EmailComposerUGD *ugd)
 
                        eina_list_free(inline_list);
                }
-
-               //eina_list_free(listOfImageUrls);
        }
 
        debug_log("Inline images total size : %d", total_size);
@@ -227,7 +213,6 @@ void _composer_attachment_reset(EmailComposerUGD *ugd)
        }
 
        if (ugd->attachment_item_box) {
-               //elm_box_unpack(ugd->subject_box, ugd->attachment_item_box);
                evas_object_del(ugd->attachment_item_box);
                ugd->attachment_item_box = NULL;
        }
@@ -325,11 +310,6 @@ void _composer_attachment_create_list(EmailComposerUGD *ugd, Eina_List *attachme
                        break;
                }
 
-/*             if (file_info.st_size / 1024 > 1)
-                       temp_file_size = file_info.st_size / 1024;
-               else
-                       temp_file_size = 1;
-*/
                total_attachments_size += file_info.st_size;
 
                if (total_attachments_size > MAX_ATTACHMENT_SIZE) {
@@ -395,27 +375,27 @@ void _composer_attachment_create_list(EmailComposerUGD *ugd, Eina_List *attachme
        if (_composer_check_recipient_is_empty(ugd)) {
                if (!ugd->bSendBtnDisabled) {
                        elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
+                       elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                        ugd->bSendBtnDisabled = true;
                }
        } else {
                if (ugd->bSendBtnDisabled) {
                        elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
+                       elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
                        ugd->bSendBtnDisabled = false;
                }
        }
 
        eina_list_free(attachment_list);
        attachment_list = NULL;
-#ifdef _ATTACHMENT_UI_
+
        _composer_attachment_contract_items(ugd);
-#endif
 }
 
 void _composer_attachment_create_list_box(EmailComposerUGD *ugd, email_attachment_data_t *attachment_data)
 {
        debug_log("file path: %s", attachment_data->attachment_path);
 
-//     if (attachment_data->attachment_path) {
                if (attachment_data->inline_content_status == EINA_FALSE) {
                        g_ugd = ugd;
 
@@ -456,7 +436,6 @@ void _composer_attachment_create_list_box(EmailComposerUGD *ugd, email_attachmen
                        ugd->attachment_item_obj_list = eina_list_append(ugd->attachment_item_obj_list, attachment_base);
                        _composer_attachment_set_attach_data(ugd, attachment_base, attachment_data);
                }
-//     }
 }
 
 void _composer_attachment_update_thumbnail(EmailComposerUGD *ugd, Evas_Object *parent, char *filePath)
@@ -538,7 +517,7 @@ Evas_Object *_composer_attachment_add_delete_icon(EmailComposerUGD *ugd, Evas_Ob
 
        Evas_Object *delete_icon = elm_button_add(parent);
        evas_object_show(delete_icon);
-#ifdef _ATTACHMENT_UI_
+
        if (ugd->attachment_list_compressed) {
                _g_attach_btn = delete_icon;
                elm_object_style_set(delete_icon, "expand/closed");
@@ -551,16 +530,7 @@ Evas_Object *_composer_attachment_add_delete_icon(EmailComposerUGD *ugd, Evas_Ob
 
                evas_object_smart_callback_add(delete_icon, "clicked", _composer_attachment_delete_icon_clicked_cb, ugd);
        }
-#else
-       elm_object_style_set(delete_icon, "minus");
-//     elm_object_focus_allow_set(delete_icon, EINA_TRUE);
-       elm_object_part_content_set(parent, "attachment.delete.icon", delete_icon);
-
-       if (ugd->attachment_list_compressed)
-               evas_object_smart_callback_add(delete_icon, "clicked", _composer_attachment_delete_all_icon_clicked_cb, ugd);
-       else
-               evas_object_smart_callback_add(delete_icon, "clicked", _composer_attachment_delete_icon_clicked_cb, ugd);
-#endif
+
        return delete_icon;
 }
 
@@ -579,7 +549,6 @@ void _composer_attachment_add_filename(EmailComposerUGD *ugd, email_attachment_d
                snprintf(temp_name, sizeof(temp_name), _("IDS_EMAIL_BODY_PD_ATTACHMENTS"), eina_list_count(ugd->attachment_item_obj_list));
                file_name = g_strdup(temp_name);
        } else {
-               // TODO: what does the below line mean?
                if (ugd->new_mail_info->mail_data->file_path_html && (g_strcmp0(ugd->new_mail_info->mail_data->file_path_html, attachment_data->attachment_path) == 0)) {
                        size = email_get_file_size(attachment_data->attachment_path);
                        debug_log("Original html body size(%d)", size);
@@ -841,7 +810,6 @@ int _composer_attachment_make_ethumb(const char *source, char *target)
 
                                if (ecore_file_exists(filename)) {
                                        strncpy(target, filename, MAX_ATTACHMENT_FILE_LEN);
-//                                     snprintf(thumb_path, sizeof(thumb_path), "%s", filename);
                                        debug_log("file : %s, thumb_path : %s", source, target);
                                }
                                g_free(video_thumbnail);
@@ -896,8 +864,6 @@ static void _composer_attachment_delete_item_from_fw_attachment_list(EmailCompos
                if (info) {
                        debug_log("%d , %d", info->attach_id, attachment_data->attachment_id);
                        if (info->attach_id == attachment_data->attachment_id) {
-                               //info->downloaded = true;
-                               //info->path = email_engine_get_attachment_path(info->attach_id);
                                ugd->fw_attachment_list = g_list_remove(ugd->fw_attachment_list, info);
                                debug_log("2. %d", g_list_length(ugd->fw_attachment_list));
                                ugd->fw_dn_cnt = g_list_length(ugd->fw_attachment_list);
@@ -938,7 +904,6 @@ static void _composer_attachment_delete_icon_clicked_cb(void *data, Evas_Object
        elm_box_unpack(ugd->attachment_item_box, object);
        evas_object_del(object);
 
-#ifdef _ATTACHMENT_UI_
        if (ugd->attachment_contracted_item) {
                Evas_Object *contracted_item = evas_object_data_get(ugd->attachment_contracted_item, "attachment_item");
                debug_log("contracted_item = %p", contracted_item);
@@ -954,7 +919,7 @@ static void _composer_attachment_delete_icon_clicked_cb(void *data, Evas_Object
                        ugd->attachment_list_compressed = FALSE;
                }
        }
-#endif
+
        if (ugd->attachment_item_obj_list == NULL) {
                ugd->selected_entry = ugd->priv_selected_entry;
                ugd->priv_selected_entry = NULL;
@@ -967,86 +932,10 @@ static void _composer_attachment_delete_icon_clicked_cb(void *data, Evas_Object
                attachment_data = NULL;
        }
        _composer_mbe_set_focus(ugd);
-#ifdef _ATTACHMENT_UI_
+
        elm_box_recalculate(ugd->attachment_item_box);
        elm_layout_sizing_eval(ugd->main_layout);
-#endif
-}
-
-#ifndef _ATTACHMENT_UI_
-static void _composer_attachment_delete_all_icon_clicked_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-
-       if (data == NULL)
-               return;
-
-       if (obj == NULL)
-               return;
-
-       EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-
-       Eina_Iterator *it = NULL;
-       Evas_Object *attachment_obj = NULL;
-       email_attachment_data_t *attachment_data = NULL;
-
-       it = eina_list_iterator_new(ugd->attachment_item_obj_list);
-
-       while (eina_iterator_next(it, (void **)&attachment_obj)) {
-
-               attachment_data = evas_object_data_get(attachment_obj, "attachment_data");
-
-               if (attachment_data) {
-                       debug_log("attachment_data file name to be removed : %s", attachment_data->attachment_path);
-
-                       email_free_attachment_data(&attachment_data, 1);
-                       attachment_data = NULL;
-               }
-
-               elm_box_unpack(ugd->attachment_item_box, attachment_obj);
-               evas_object_del(attachment_obj);
-       }
-
-       ugd->new_mail_info->mail_data->attachment_count = 0;
-
-       if (ugd->attachment_item_box) {
-               evas_object_del(ugd->attachment_item_box);
-               ugd->attachment_item_box = NULL;
-       }
-
-       if (it) {
-               eina_iterator_free(it);
-       }
-
-       if (ugd->attachment_item_obj_list) {
-               eina_list_free(ugd->attachment_item_obj_list);
-               ugd->attachment_item_obj_list = NULL;
-       }
-
-       if (ugd->attachment_contracted_item) {
-               elm_box_unpack(ugd->attachment_item_box, ugd->attachment_contracted_item);
-               evas_object_del(ugd->attachment_contracted_item);
-               ugd->attachment_contracted_item = NULL;
-               ugd->attachment_list_compressed = FALSE;
-       }
-
-       if (_composer_check_recipient_is_empty(ugd)) {
-               if (!ugd->bSendBtnDisabled) {
-                       elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
-                       ugd->bSendBtnDisabled = true;
-               }
-       } else {
-               if (ugd->bSendBtnDisabled) {
-                       elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
-                       ugd->bSendBtnDisabled = false;
-               }
-       }
-
-       if (ugd->selected_entry == ugd->body_ewkview) {
-               _composer_mbe_set_focus(ugd);
-       }
 }
-#endif
 
 bool _composer_attachment_duplicate_check(EmailComposerUGD *ugd, char *pszAttachedFilePath)
 {
@@ -1089,12 +978,7 @@ void _composer_attachment_expand_items(EmailComposerUGD *ugd)
 
        if (ugd->attachment_list_compressed == EINA_FALSE)
                return;
-#ifndef _ATTACHMENT_UI_
-       if (ugd->attachment_contracted_item) {
-               elm_box_unpack(ugd->attachment_item_box, ugd->attachment_contracted_item);
-               evas_object_hide(ugd->attachment_contracted_item);
-       }
-#endif
+
        Eina_List *list = NULL;
        Evas_Object *attachment_item = NULL;
 
@@ -1106,10 +990,9 @@ void _composer_attachment_expand_items(EmailComposerUGD *ugd)
        }
 
        ugd->attachment_list_compressed = EINA_FALSE;
-#ifdef _ATTACHMENT_UI_
+
        elm_box_recalculate(ugd->attachment_item_box);
        elm_layout_sizing_eval(ugd->main_layout);
-#endif
 }
 
 void _composer_attachment_contract_items(EmailComposerUGD *ugd)
@@ -1135,29 +1018,23 @@ void _composer_attachment_contract_items(EmailComposerUGD *ugd)
                }
 
                if (ugd->attachment_contracted_item) {
-#ifndef _ATTACHMENT_UI_
-                       elm_box_pack_start(ugd->attachment_item_box, ugd->attachment_contracted_item);
-                       evas_object_show(ugd->attachment_contracted_item);
-#endif
                        Evas_Object *contracted_item = evas_object_data_get(ugd->attachment_contracted_item, "attachment_item");
                        debug_log("contracted_item = %p", contracted_item);
                        _composer_attachment_add_filename(ugd, NULL, contracted_item);
                } else {
                        _composer_attachment_create_contracted_box(ugd);
                }
-#ifdef _ATTACHMENT_UI_
+
                if (toggle == 0) {
                        char buf[PATH_MAX];
                        snprintf(buf, sizeof(buf), "expand/closed");
                        elm_object_style_set(_g_attach_btn, buf);
                        toggle = 1;
                }
-#endif
        }
-#ifdef _ATTACHMENT_UI_
+
        elm_box_recalculate(ugd->attachment_item_box);
        elm_layout_sizing_eval(ugd->main_layout);
-#endif
 }
 
 void _composer_attachment_create_contracted_box(EmailComposerUGD *ugd)
@@ -1174,9 +1051,7 @@ void _composer_attachment_create_contracted_box(EmailComposerUGD *ugd)
        _composer_attachment_add_thumbnail(ugd, contracted_item, NULL);
        _composer_attachment_add_delete_icon(ugd, contracted_item);
        _composer_attachment_add_filename(ugd, NULL, contracted_item);
-#ifndef _ATTACHMENT_UI_
-       edje_object_signal_callback_add(_EDJ(contracted_item), "clicked", "*", _composer_attachment_contracted_item_clicked_cb, ugd);
-#endif
+
        Evas_Object *contracted_base = elm_layout_add(ugd->attachment_item_box);
        elm_layout_theme_set(contracted_base, "layout", "application", "noindicator");
        evas_object_size_hint_weight_set(contracted_base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -1194,14 +1069,12 @@ void _composer_attachment_create_contracted_box(EmailComposerUGD *ugd)
        evas_object_data_set(ugd->attachment_contracted_item, "attachment_item", contracted_item);
 }
 
-#ifdef _ATTACHMENT_UI_
 static void _composer_attachment_contracted_item_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
-//     int param = (int)(long)(data);
        char buf[PATH_MAX];
        Evas_Object *btn = obj;
 
@@ -1213,7 +1086,6 @@ static void _composer_attachment_contracted_item_clicked_cb(void *data, Evas_Obj
                if (ugd->selected_entry == ugd->body_ewkview) {
                        debug_log("Webkit unfocused");
                        evas_object_focus_set(ugd->body_ewkview, EINA_FALSE);
-                       email_composer_rte_set_buttons_dimmed(ugd);
                        if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_UNFOCUS, _composer_script_executed_cb, 0) == EINA_FALSE)
                                debug_log("COMPOSER_JS_SET_UNFOCUS failed.");
                }
@@ -1234,7 +1106,6 @@ static void _composer_attachment_contracted_item_clicked_cb(void *data, Evas_Obj
                if (ugd->selected_entry == ugd->body_ewkview) {
                        debug_log("Webkit unfocused");
                        evas_object_focus_set(ugd->body_ewkview, EINA_FALSE);
-                       email_composer_rte_set_buttons_dimmed(ugd);
                        if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_UNFOCUS, _composer_script_executed_cb, 0) == EINA_FALSE)
                                debug_log("COMPOSER_JS_SET_UNFOCUS failed.");
                }
@@ -1248,32 +1119,7 @@ static void _composer_attachment_contracted_item_clicked_cb(void *data, Evas_Obj
 
                toggle = 1;
        }
-
-//     ugd->bringin_timer = ecore_timer_add(0.5f, _composer_bringin_cb, ugd);
-}
-#else
-static void _composer_attachment_contracted_item_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
-{
-       debug_log("");
-
-       EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-
-       if (ugd->selected_entry == ugd->body_ewkview) {
-               debug_log("Webkit unfocused");
-               evas_object_focus_set(ugd->body_ewkview, EINA_FALSE);
-               if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_UNFOCUS, _composer_script_executed_cb, 0) == EINA_FALSE)
-                       debug_log("COMPOSER_JS_SET_UNFOCUS failed.");
-       }
-
-       elm_object_focus_set(obj, EINA_TRUE);
-
-       _composer_attachment_expand_items(ugd);
-
-       ugd->priv_selected_entry = ugd->selected_entry;
-       ugd->selected_entry = ugd->attachment_contracted_item;
-//     ugd->bringin_timer = ecore_timer_add(0.5f, _composer_bringin_cb, ugd);
 }
-#endif // _ATTACHMENT_UI_ end
 
 static void _composer_attachment_mouse_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
index 2346b97..089d6da 100755 (executable)
@@ -38,6 +38,7 @@ EmailList email_list[MAX_RECIPIENT_COUNT];
 
 static Elm_Genlist_Item_Class itc;
 static Elm_Genlist_Item_Class from_itc;
+static Elm_Genlist_Item_Class myemail_itc;
 static Elm_Genlist_Item_Class priority_itc;
 static Elm_Genlist_Item_Class tracking_itc;
 
@@ -47,6 +48,11 @@ static void _composer_from_close_response_cb(EmailComposerUGD *ugd);
 static void _composer_from_radio_cb(void *data, Evas_Object *obj, void *event_info);
 static void _composer_from_gl_sel(void *data, Evas_Object *obj, void *event_info);
 
+static void _composer_myemail_change_response_cb(void *data, Evas_Object *obj, void *event_info);
+static void _composer_myemail_close_response_cb(EmailComposerUGD *ugd);
+static void _composer_myemail_radio_cb(void *data, Evas_Object *obj, void *event_info);
+static void _composer_myemail_gl_sel(void *data, Evas_Object *obj, void *event_info);
+
 static Eina_Bool _composer_cc_mbe_set_focus(void *data);
 static void *_composer_contact_search_by_email(EmailComposerUGD *ugd, const char *search_word);
 static void _composer_delete_contacts_list(EMAIL_CONTACT_LIST_INFO_S *contacts_list_item);
@@ -72,11 +78,13 @@ void _composer_edit_field_changed_cb(void *data, Evas_Object *obj, void *event_i
                if (_composer_check_recipient_is_empty(ugd)) {
                        if (!ugd->bSendBtnDisabled) {
                                elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
+                               elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                                ugd->bSendBtnDisabled = true;
                        }
                } else {
                        if (ugd->bSendBtnDisabled) {
                                elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
+                               elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
                                ugd->bSendBtnDisabled = false;
                        }
                }
@@ -84,42 +92,94 @@ void _composer_edit_field_changed_cb(void *data, Evas_Object *obj, void *event_i
                if (_composer_check_recipient_is_empty(ugd)) {
                        if (!ugd->bSendBtnDisabled) {
                                elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
+                               elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                                ugd->bSendBtnDisabled = true;
                        }
                } else {
                        if (ugd->bSendBtnDisabled) {
                                elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
+                               elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
                                ugd->bSendBtnDisabled = false;
                        }
                }
        }
 }
 
-void _composer_more_button_cb(void *data, Evas_Object *obj, void *event_info)
+static void _composer_move_ctxpopup_more(EmailComposerUGD *ugd, Evas_Object *btn)
 {
-       debug_log("Enter");
+       Evas_Coord x, y, w , h;
+       evas_object_geometry_get(btn, &x, &y, &w, &h);
+       debug_log("is_ime_hided:%d, x(%d), y(%d), w(%d), h(%d)", ugd->is_ime_hided, x, y, w, h);
+       if (ugd->is_ime_hided == FALSE)
+               evas_object_move(ugd->context_popup, x + (w / 2), y + h);
+       else
+               evas_object_move(ugd->context_popup, x + (w / 2), y);
+}
 
+static void _composer_ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void *event_info)
+{
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
-       debug_log("More Button Clicked");
+       evas_object_del(ugd->context_popup);
+       ugd->context_popup = NULL;
+}
+
+void _composer_more_toolbar_button_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_enter();
 
-       ugd->option_header_opened = !ugd->option_header_opened;
+       EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
-       if (!ugd->option_header_opened) {
-               elm_object_item_signal_emit(ugd->navi_item, "elm,state,optionheader,close", "");
-       } else {
-               elm_object_item_signal_emit(ugd->navi_item, "elm,state,optionheader,open", "");
+       Evas_Object* icon = NULL;
+
+       if(ugd->context_popup) {
+               evas_object_del(ugd->context_popup);
+               ugd->context_popup = NULL;
        }
 
-       if (ugd->isHorizontal == true) {
-               _composer_resize_body_webview(ugd, COMPOSER_IME_HEIGHT_H);
+       ugd->context_popup = elm_ctxpopup_add(ugd->win_main);
+       elm_ctxpopup_direction_priority_set(ugd->context_popup, ELM_CTXPOPUP_DIRECTION_DOWN,
+                                                 ELM_CTXPOPUP_DIRECTION_UNKNOWN,
+                                                 ELM_CTXPOPUP_DIRECTION_UNKNOWN,
+                                                 ELM_CTXPOPUP_DIRECTION_UNKNOWN);
+       elm_object_style_set(ugd->context_popup, "more_button");
+       evas_object_smart_callback_add(ugd->context_popup, "dismissed", _composer_ctxpopup_dismissed_cb, ugd);
+
+       elm_object_focus_set(ugd->context_popup, EINA_TRUE);
+       ugd->focus_status = COMPOSER_FOCUS_STATUS_SELECTED; // more button is clicked!!
+
+       icon = elm_icon_add(ugd->context_popup);
+       elm_icon_file_set(icon, IMGDIR "/M02_icon_popup_send_email.png", NULL);
+       elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_OPT_SEND_EMAIL_TO_MYSELF_ABB"), icon, _composer_cbar_send_myself_clicked, ugd);
+       icon = NULL;
+
+       icon = elm_icon_add(ugd->context_popup);
+       elm_icon_file_set(icon, IMGDIR "/M02_icon_popup_add cc.png", NULL);
+       if (ugd->cc_added) {
+               elm_ctxpopup_item_append(ugd->context_popup, N_("Remove Cc/Bcc"), icon, _composer_cbar_cc_clicked, ugd);
        } else {
-               _composer_resize_body_webview(ugd, COMPOSER_IME_HEIGHT_V);
+               elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_OPT_ADD_CC_BCC"), icon, _composer_cbar_cc_clicked, ugd);
        }
+       icon = NULL;
+
+       icon = elm_icon_add(ugd->context_popup);
+       elm_icon_file_set(icon, IMGDIR "/M02_icon_popup_save.png", NULL);
+       elm_ctxpopup_item_append(ugd->context_popup, dgettext("sys_string", "IDS_COM_POP_SAVE_IN_DRAFTS"), icon, _composer_cbar_save_as_draft_clicked, ugd);
+       icon = NULL;
+
+       icon = elm_icon_add(ugd->context_popup);
+       elm_icon_file_set(icon, IMGDIR "/M02_icon_popup_priority.png", NULL);
+       elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_BODY_PRIORITY"), icon, _composer_cbar_priority_clicked, ugd);
+       icon = NULL;
 
-       elm_layout_sizing_eval(ugd->c_layout);
+       icon = elm_icon_add(ugd->context_popup);
+       elm_icon_file_set(icon, IMGDIR "/M02_icon_popup_tracking.png", NULL);
+       elm_ctxpopup_item_append(ugd->context_popup, _("IDS_EMAIL_OPT_TRACKING"), icon, _composer_cbar_tracking_clicked, ugd);
+       icon = NULL;
 
-       _composer_mbe_set_focus(ugd);
+       _composer_move_ctxpopup_more(ugd, obj);
+
+       evas_object_show(ugd->context_popup);
 }
 
 void _composer_back_button_cb(void *data, Evas_Object *obj, void *event_info)
@@ -133,7 +193,7 @@ void _composer_back_button_cb(void *data, Evas_Object *obj, void *event_info)
        if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_HTML_CONTENT, _composer_get_html_content_for_draft_cb, (void *)ugd) == EINA_FALSE)
                debug_log("COMPOSER_JS_GET_HTML_CONTENT failed.");
 
-       debug_log("Cancel Button Clicked: %p", ugd->cancel_btn);
+       debug_log("Cancel Button Clicked: %p, %p", ugd->cancel_btn, ugd->cancel_btm_btn);
 }
 
 void _composer_mbe_changed_cb(void *data, Evas_Object *obj, void *event_info)
@@ -295,6 +355,7 @@ void _composer_mbe_added_cb(void *data, Evas_Object *obj, void *event_info)
        if ((obj == ugd->to_mbe) || (obj == ugd->cc_mbe) || (obj == ugd->bcc_mbe)) {
                if (ugd->bSendBtnDisabled && !_composer_check_recipient_is_empty(ugd)) {
                        elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
+                       elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
                        ugd->bSendBtnDisabled = false;
                }
        }
@@ -360,6 +421,7 @@ void _composer_mbe_deleted_cb(void *data, Evas_Object *obj, void *event_info)
        if ((obj == ugd->to_mbe) || (obj == ugd->cc_mbe) || (obj == ugd->bcc_mbe)) {
                if (!ugd->bSendBtnDisabled && _composer_check_recipient_is_empty(ugd)) {
                        elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
+                       elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                        ugd->bSendBtnDisabled = true;
                }
        }
@@ -410,12 +472,7 @@ void _composer_mbe_selected_cb(void *data, Evas_Object *obj, void *event_info)
        debug_log("is_always_bcc = %d", ri->is_always_bcc);
        debug_log("is_from_addr = %d", ri->is_from_addr);
 
-/*     if (obj == ugd->cc_mbe && elm_object_item_text_get(elm_multibuttonentry_first_item_get(ugd->bcc_mbe)) == NULL && (ri->is_always_bcc == true || ri->is_from_addr == true)) {
-               debug_log("");
-
-               ugd->bringin_timer = ecore_timer_add(0.5f, _composer_bringin_cb, ugd);
-
-       } else */if (obj == ugd->from_mbe) {
+       if (obj == ugd->from_mbe) {
                debug_log("from selected");
 
                _composer_from_show_popup(ugd);
@@ -470,36 +527,17 @@ void _composer_mbe_selected_cb(void *data, Evas_Object *obj, void *event_info)
                        elm_list_item_append(pu_list, _("IDS_EMAIL_OPT_MOVE_TO_BCC"), NULL, NULL, _composer_mbe_popup_move_to_bcc_cb, ugd);
 
                debug_log("email_cnt = %d", ri->email_cnt);
-/*             if (ri->is_contact_info == true) {
+               if (ri->is_contact_info == true) {
                        if (ri->email_cnt > 1) {
                                elm_list_item_append(pu_list, _("IDS_EMAIL_OPT_CHANGE_EMAIL_ADDRESS_ABB"), NULL, NULL, _composer_mbe_popup_change_addr_cb, ugd);
-                       } else {
-                               g_ugd = ugd;
-                               EMAIL_CONTACT_LIST_INFO_S *contact_list_item = NULL;
-                               contact_list_item = (EMAIL_CONTACT_LIST_INFO_S *)_composer_contact_search_by_email(ugd, ri->email_list[index].email_addr);
-
-                               if (contact_list_item) {
-                                       debug_log("Contact Item Exist: index[%d]", contact_list_item->index);
-                                       char ct_idx[10] = { 0, };
-                                       snprintf(ct_idx, sizeof(ct_idx), "%d", contact_list_item->index);
-
-                                       elm_list_item_append(pu_list, _("IDS_EMAIL_OPT_VIEW_CONTACT"), NULL, NULL, _composer_mbe_popup_view_contact_detail_cb, g_strdup(ct_idx));
-
-                                       _composer_delete_contacts_list(contact_list_item);
-                               } else {
-                                       debug_log("contact_list_item is NULL");
-                                       elm_list_item_append(pu_list, dgettext("sys_string", "IDS_COM_OPT_ADD_TO_CONTACTS"), NULL, NULL, _composer_mbe_popup_add_to_contact_cb, ugd);
-                               }
                        }
-               } else {
-                       elm_list_item_append(pu_list, dgettext("sys_string", "IDS_COM_OPT_ADD_TO_CONTACTS"), NULL, NULL, _composer_mbe_popup_add_to_contact_cb, ugd);
                }
-*/
+
                elm_list_go(pu_list);
                elm_object_content_set(popup, pu_list);
                evas_object_show(popup);
                elm_object_focus_set(popup, EINA_TRUE);
-               
+
                ugd->composer_popup = popup;
                debug_log("composer_popup = %x, is_mbe_selected = %d", ugd->composer_popup, ugd->is_mbe_selected);
        }
@@ -516,22 +554,18 @@ void _composer_mbe_focused_cb(void *data, Evas_Object *obj, void *event_info)
        if (COMPOSER_FOCUS_STATUS_NONE == ugd->focus_status) {
                if (obj == ugd->to_mbe) {
                        edje_object_signal_emit(_EDJ(ugd->to_ly), "show.button", "*");
-//                     edje_object_signal_emit(_EDJ(ugd->to_ly), "contract.recp", "*");
                }
                else if (obj == ugd->cc_mbe) {
                        edje_object_signal_emit(_EDJ(ugd->cc_ly), "show.button", "*");
-//                     edje_object_signal_emit(_EDJ(ugd->cc_ly), "contract.recp", "*");
                }
                else if (obj == ugd->bcc_mbe) {
                        edje_object_signal_emit(_EDJ(ugd->bcc_ly), "show.button", "*");
-//                     edje_object_signal_emit(_EDJ(ugd->bcc_ly), "contract.recp", "*");
                }
 
                _composer_attachment_contract_items(ugd);
                elm_multibuttonentry_expanded_set(obj, TRUE);
 
                ugd->selected_entry = elm_multibuttonentry_entry_get(obj);
-//             ugd->bringin_timer = ecore_timer_add(0.5f, _composer_bringin_cb, ugd);
                debug_log("MBE editable:%d", elm_multibuttonentry_editable_get(obj));
                elm_layout_sizing_eval(ugd->c_layout);
        } else {
@@ -548,7 +582,7 @@ void _composer_mbe_focused_cb(void *data, Evas_Object *obj, void *event_info)
 
 void _composer_mbe_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       debug_log("Enter");
+       debug_enter();
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
@@ -569,15 +603,12 @@ void _composer_mbe_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
        debug_log("obj = %x, to_mbe = %x, cc_mbe = %x, bcc_mbe = %x", obj, ugd->to_mbe, ugd->cc_mbe, ugd->bcc_mbe);
        if (obj == ugd->to_mbe) {
                edje_object_signal_emit(_EDJ(ugd->to_ly), "hide.button", "*");
-//             edje_object_signal_emit(_EDJ(ugd->to_ly), "extract.recp", "*");
        }
        else if (obj == ugd->cc_mbe) {
                edje_object_signal_emit(_EDJ(ugd->cc_ly), "hide.button", "*");
-//             edje_object_signal_emit(_EDJ(ugd->cc_ly), "extract.recp", "*");
        }
        else if (obj == ugd->bcc_mbe) {
                edje_object_signal_emit(_EDJ(ugd->bcc_ly), "hide.button", "*");
-//             edje_object_signal_emit(_EDJ(ugd->bcc_ly), "extract.recp", "*");
        }
 
        elm_multibuttonentry_expanded_set(obj, FALSE);
@@ -669,6 +700,7 @@ Eina_Bool _composer_mbe_verified_item_cb(Evas_Object *obj, const char *item_labe
                                goto err_return;
                        }
                }
+               free(ri);
        } else {
                debug_log("Invalid Address");
 
@@ -687,7 +719,6 @@ Eina_Bool _composer_mbe_verified_item_cb(Evas_Object *obj, const char *item_labe
 err_return:
        debug_log("err-return");
 
-//     elm_entry_entry_set(elm_multibuttonentry_entry_get(obj), NULL);
        elm_entry_cursor_end_set(elm_multibuttonentry_entry_get(obj));
 
        if (_composer_check_popup_exist(ugd))
@@ -823,7 +854,6 @@ void _composer_mbe_popup_move_to_to_cb(void *data, Evas_Object *obj, void *event
                }
        }
 
-       //ugd->selected_entry = ugd->to_mbe_entry;
        elm_object_focus_set(ugd->to_mbe, EINA_TRUE);
 
        if (ugd->popup_list)
@@ -881,7 +911,6 @@ void _composer_mbe_popup_move_to_cc_cb(void *data, Evas_Object *obj, void *event
                }
        }
 
-       //ugd->selected_entry = ugd->cc_mbe_entry;
        elm_object_focus_set(ugd->cc_mbe, EINA_TRUE);
 
        if (ugd->popup_list)
@@ -939,7 +968,6 @@ void _composer_mbe_popup_move_to_bcc_cb(void *data, Evas_Object *obj, void *even
                }
        }
 
-       //ugd->selected_entry = ugd->bcc_mbe_entry;
        elm_object_focus_set(ugd->bcc_mbe, EINA_TRUE);
 
        if (ugd->popup_list)
@@ -1130,6 +1158,8 @@ void _composer_cancel_send_mail_cb(void *data, Evas_Object *obj, void *event_inf
        elm_object_tree_focus_allow_set(ugd->c_layout, EINA_TRUE); // block the focus not to open IME.
        elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
        elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
+       elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
+       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
 
        if (err != EMAIL_ERROR_NONE) {
                debug_warning("email_engine_cancel_send_mail failed - err(%d)", err);
@@ -1395,7 +1425,6 @@ Eina_Bool _composer_mbe_create_change_addr_list(EmailComposerUGD *ugd)
                elm_genlist_item_update(gen_item);
        }
 
-//     elm_genlist_effect_set(genlist, EINA_FALSE);
        elm_genlist_tree_effect_enabled_set(genlist, EINA_FALSE);
 
 #ifdef _POPUP_WITH_LIST
@@ -1445,59 +1474,12 @@ void _composer_fail_to_send_popup_cb(void *data, Evas_Object *obj, void *event_i
 
        elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
        elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
+       elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
+       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
 
        ugd->bSendBtnDisabled = false;
 }
 
-static void *_composer_contact_search_by_email(EmailComposerUGD *ugd, const char *search_word)
-{
-       debug_log("");
-       if (!ugd || !g_ugd) {
-               debug_log("data is NULL");
-               return NULL;
-       }
-
-       int ct_ret = CONTACTS_ERROR_NONE;
-       EMAIL_CONTACT_LIST_INFO_S *contacts_list_item = NULL;
-       Eina_List *contacts_list = NULL;
-       contacts_list_h list = NULL;
-
-       ct_ret = email_get_contacts_list(CONTACTS_MATCH_EXACTLY, &list, search_word);
-       debug_log("email_get_contacts_record: list : %d", list);
-
-       if (!list) {
-               debug_log("list is NULL");
-               contacts_list_destroy(list, true);
-               return contacts_list;
-       }
-
-       contacts_list_item = (EMAIL_CONTACT_LIST_INFO_S *)calloc(1, sizeof(EMAIL_CONTACT_LIST_INFO_S));
-       contacts_list_item->ugd = ugd;
-
-       ct_ret = email_get_contacts_list_info(list, contacts_list_item);
-       debug_log("email_get_contacts_list_info: contacts_list_item : %d", contacts_list_item);
-
-       contacts_list_destroy(list, true);
-
-       return contacts_list;
-}
-
-static void _composer_delete_contacts_list(EMAIL_CONTACT_LIST_INFO_S *contacts_list_item)
-{
-       debug_log("");
-
-       if (contacts_list_item) {
-               g_free(contacts_list_item->display);
-               contacts_list_item->display = NULL;
-               g_free(contacts_list_item->email_address);
-               contacts_list_item->email_address = NULL;
-               g_free(contacts_list_item->image_path);
-               contacts_list_item->image_path = NULL;
-               g_free(contacts_list_item);
-               contacts_list_item = NULL;
-       }
-}
-
 void _composer_check_email_address(EmailComposerUGD *ugd, Evas_Object *entry)
 {
        debug_log("");
@@ -1526,10 +1508,6 @@ void _composer_check_email_address(EmailComposerUGD *ugd, Evas_Object *entry)
                memset(ugd->ps_keyword, 0x00, sizeof(ugd->ps_keyword));
                strncpy(ugd->ps_keyword, temp, sizeof(ugd->ps_keyword) - 1);
 
-               /*if (ugd->ps_bg_timer) {
-                       ecore_timer_del(ugd->ps_bg_timer);
-                       ugd->ps_bg_timer = NULL;
-               }*/
                _composer_ps_add_timer(ugd);
        }
 
@@ -1590,7 +1568,6 @@ void _composer_from_show_popup(EmailComposerUGD *ugd)
                elm_genlist_item_append(ugd->account_gen_list, &from_itc, (void *)acc_index, NULL, ELM_GENLIST_ITEM_NONE, _composer_from_gl_sel, (void *)acc_index);
        }
 
-//     elm_genlist_effect_set(ugd->account_gen_list, EINA_FALSE);
        elm_genlist_tree_effect_enabled_set(ugd->account_gen_list, EINA_FALSE);
 
 #ifdef _POPUP_WITH_LIST
@@ -1739,7 +1716,6 @@ static void _composer_from_close_response_cb(EmailComposerUGD *ugd)
 
        debug_log("add_my_address_to_bcc = %d, %d", ugd->account_info->account->options.add_my_address_to_bcc, ugd->account_info->account_list[set_val].options.add_my_address_to_bcc);
 
-#ifdef _ALWAYS_CC_MYSELF
        debug_log("remove bcc myself if it is");
        Elm_Object_Item *bcc_item = NULL;
        bcc_item = elm_multibuttonentry_first_item_get(ugd->bcc_mbe);
@@ -1815,7 +1791,6 @@ static void _composer_from_close_response_cb(EmailComposerUGD *ugd)
        } else {
                debug_log("always bcc/cc off");
        }
-#endif
 
        EmailRecpInfo *new_from_ri = (EmailRecpInfo *) calloc(1, sizeof(EmailRecpInfo));
 
@@ -1875,12 +1850,228 @@ static void _composer_from_radio_cb(void *data, Evas_Object *obj, void *event_in
        }
 }
 
+void _composer_select_myemail_popup(EmailComposerUGD *ugd)
+{
+       debug_log("");
+
+       int acc_index;
+
+       g_ugd = ugd;
+
+       if (ugd->composer_noti) {
+               evas_object_del(ugd->composer_noti);
+               ugd->composer_noti = NULL;
+       }
+       ugd->composer_noti = _composer_create_noti(ugd, false, _("IDS_EMAIL_HEADER_SELECT_EMAIL_ADDRESS"), NULL, 1, dgettext("sys_string", "IDS_COM_SK_OK"), NULL, 0.0, _composer_myemail_change_response_cb);
+
+       myemail_itc.item_style = "email.2text.3icon.3";
+       myemail_itc.func.text_get = _composer_myemail_gl_text_get;
+       myemail_itc.func.content_get = _composer_myemail_gl_content_get;
+       myemail_itc.func.state_get = NULL;
+       myemail_itc.func.del = NULL;
+
+       elm_genlist_clear(ugd->account_gen_list);
+       ugd->account_gen_list = elm_genlist_add(ugd->composer_noti);
+       elm_object_theme_set(ugd->account_gen_list, ugd->th);
+
+       evas_object_size_hint_weight_set(ugd->account_gen_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(ugd->account_gen_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+       for (acc_index = 0; acc_index < ugd->account_info->account_count; acc_index++) {
+               elm_genlist_item_append(ugd->account_gen_list, &myemail_itc, (void *)acc_index, NULL, ELM_GENLIST_ITEM_NONE, _composer_myemail_gl_sel, (void *)acc_index);
+       }
+
+       elm_genlist_tree_effect_enabled_set(ugd->account_gen_list, EINA_FALSE);
+
+#ifdef _POPUP_WITH_LIST
+       debug_log("acc_index:%d", acc_index);
+       if (acc_index > 5)
+               acc_index = 5;
+       Evas_Object *box = elm_box_add(ugd->composer_noti);
+       evas_object_size_hint_min_set(box, 610 * elm_scale_get(), 120 * acc_index * elm_scale_get());
+       evas_object_show(ugd->account_gen_list);
+       elm_box_pack_end(box, ugd->account_gen_list);
+       elm_object_content_set(ugd->composer_noti, box);
+#else
+       elm_object_content_set(ugd->composer_noti, ugd->account_gen_list);
+#endif
+}
+
+char *_composer_myemail_gl_text_get(void *data, Evas_Object *obj, const char *part)
+{
+       int index = (int)data;
+
+       debug_log("label index = %d", index);
+
+       if (!strncmp(part, "elm.text.1", 10)) {
+               debug_log("email_addr = %s", g_ugd->account_info->account_list[index].account_name);
+               return g_strdup(g_ugd->account_info->account_list[index].account_name);
+       } else if (!strncmp(part, "elm.text.2", 10)) {
+               debug_log("email_addr = %s", g_ugd->account_info->account_list[index].user_email_address);
+               return g_strdup(g_ugd->account_info->account_list[index].user_email_address);
+       } else {
+               debug_log("part is invalid");
+       }
+
+       return NULL;
+}
+
+Evas_Object *_composer_myemail_gl_content_get(void *data, Evas_Object *obj, const char *part)
+{
+       int count = (int)data;
+
+       debug_log("count = %d", count);
+       debug_log("account_id = %d", g_ugd->account_info->account_list[count].account_id);
+       debug_log("default account_id = %d", g_ugd->account_info->account_id);
+
+       if (!strncmp(part, "elm.icon.1", 10)) {
+               g_ugd->account_info->account_rd[count] = elm_radio_add(obj);
+               elm_radio_state_value_set(g_ugd->account_info->account_rd[count], count);
+
+               if (count == 0) {
+                       g_ugd->account_info->account_rdg = g_ugd->account_info->account_rd[count];
+               } else
+                       elm_radio_group_add(g_ugd->account_info->account_rd[count], g_ugd->account_info->account_rdg);
+
+               if (g_ugd->account_info->account_list[count].account_id == g_ugd->account_info->account_id)
+                       elm_radio_value_set(g_ugd->account_info->account_rdg, count);
+
+               evas_object_smart_callback_add(g_ugd->account_info->account_rd[count], "changed", _composer_myemail_radio_cb, g_ugd);
+
+               return g_ugd->account_info->account_rd[count];
+       } else if (!strncmp(part, "elm.icon.2", 10)) {
+               Evas_Object *icon = elm_icon_add(obj);
+
+               debug_log("logo_icon_path:%s", g_ugd->account_info->account_list[count].logo_icon_path);
+               if (g_ugd->account_info->account_list[count].logo_icon_path)
+                       elm_icon_file_set(icon, g_ugd->account_info->account_list[count].logo_icon_path, NULL);
+               else
+                       elm_icon_file_set(icon, ACCOUNT_ICON_OTHERS, NULL);
+               evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+
+               return icon;
+       } else if (!strncmp(part, "elm.swallow.colorbar", 20)) {
+               account_user_data_t *ud = (account_user_data_t *)g_ugd->account_info->account_list[count].user_data;
+               unsigned int val = ud->index_color;
+               int r = (val & 0xff000000) >> 24;
+               int g = (val & 0x00ff0000) >> 16;
+               int b = (val & 0x0000ff00) >> 8;
+               int a = val & 0x000000ff;
+
+               Evas_Object *color_bar = evas_object_rectangle_add(evas_object_evas_get(obj));
+               evas_object_size_hint_fill_set(color_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_color_set(color_bar, r, g, b, a);
+
+               return color_bar;
+       } else {
+               debug_log("part is invalid");
+       }
+
+       return NULL;
+}
+
+static void _composer_myemail_gl_sel(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("index:%d", (int)data);
+
+       int index = (int)data;
+
+       elm_radio_value_set(g_ugd->account_info->account_rdg, index);
+
+       _composer_myemail_close_response_cb(g_ugd);
+}
+
+static void _composer_myemail_change_response_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       EmailComposerUGD *ugd = (EmailComposerUGD *)data;
+
+       debug_log("composer_noti : %p", ugd->composer_noti);
+
+       char *pszBtnText = (char *)elm_object_text_get(obj);
+       debug_log("selected button text = %s", pszBtnText);
+
+       if (pszBtnText && strcmp(pszBtnText, dgettext("sys_string", "IDS_COM_SK_OK")) == 0) {
+               _composer_myemail_close_response_cb(ugd);
+       }
+}
+
+static void _composer_myemail_close_response_cb(EmailComposerUGD *ugd)
+{
+       debug_log("composer_noti : %p", ugd->composer_noti);
+
+       int set_val = elm_radio_value_get(ugd->account_info->account_rdg);
+
+       debug_log("set_val = %d", set_val);
+       debug_log("account_id = %d", ugd->account_info->account_list[set_val].account_id);
+
+       EmailRecpInfo *new_to_ri = (EmailRecpInfo *) calloc(1, sizeof(EmailRecpInfo));
+
+       new_to_ri->selected_email_idx = 0;
+       new_to_ri->display_name = ugd->account_info->account_list[set_val].user_display_name;
+       snprintf(new_to_ri->email_list[0].email_addr, MAX_RECIPIENT_ADDRESS_LEN, "%s", ugd->account_info->account_list[set_val].user_email_address);
+       new_to_ri->email_cnt = 1;
+       new_to_ri->is_contact_info = false;
+       new_to_ri->is_always_bcc = false;
+       new_to_ri->is_from_addr = true;
+       debug_log("my email_addr = %s, display_name = %s", new_to_ri->email_list[0].email_addr, new_to_ri->display_name);
+
+       elm_multibuttonentry_item_append(ugd->to_mbe, g_strdup(new_to_ri->display_name), NULL, new_to_ri);
+
+       if (ugd->selected_entry == ugd->to_mbe_entry) {
+               elm_object_focus_set(ugd->to_mbe, EINA_TRUE);
+       } else if (ugd->selected_entry == ugd->cc_mbe_entry) {
+               elm_object_focus_set(ugd->cc_mbe, EINA_TRUE);
+       } else if (ugd->selected_entry == ugd->bcc_mbe_entry) {
+               elm_object_focus_set(ugd->bcc_mbe, EINA_TRUE);
+       }
+
+       if (ugd->account_gen_list) {
+               elm_genlist_clear(ugd->account_gen_list);
+
+               evas_object_del(ugd->account_gen_list);
+               ugd->account_gen_list = NULL;
+       }
+
+       if (ugd->popup_list) {
+               debug_log("popup count = %d", eina_list_count(ugd->popup_list));
+               debug_log("composer_noti: %p", ugd->composer_noti);
+
+               ugd->popup_list = eina_list_remove(ugd->popup_list, ugd->composer_noti);
+       }
+
+       if (ugd->composer_noti) {
+               debug_log("@@@ ELM_POPUP_RESPONSE_CLOSE @@@");
+               _composer_popup_delete(ugd->composer_noti);
+               ugd->composer_noti = NULL;
+       }
+}
+
+static void _composer_myemail_radio_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
+
+       EmailComposerUGD *ugd = (EmailComposerUGD *)data;
+       int i;
+
+       for (i = 0; i < ugd->account_info->account_count; i++) {
+               if (obj == ugd->account_info->account_rd[i]) {
+                       debug_log("account_id = %d", ugd->account_info->account_list[i].account_id);
+                       elm_radio_value_set(ugd->account_info->account_rdg, i);
+               }
+       }
+}
+
 void _composer_cbar_cc_clicked(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
+       if(ugd->context_popup) {
+               evas_object_del(ugd->context_popup);
+               ugd->context_popup = NULL;
+       }
+
        if (ugd->cc_added) {
                if (ugd->b_cc_bcc) {
                        debug_log("b_cc_bcc is ON");
@@ -1927,123 +2118,17 @@ void _composer_cbar_cc_clicked(void *data, Evas_Object *obj, void *event_info)
        }
 }
 
-void _composer_cbar_add_me_clicked(void *data, Evas_Object *obj, void *event_info)
+void _composer_cbar_send_myself_clicked(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
-       debug_log("ugd->me_added = %d", ugd->me_added);
-
-       EmailRecpInfo *from_ri = NULL;
-       Elm_Object_Item *from_item = NULL;
-       from_item = elm_multibuttonentry_first_item_get(ugd->from_mbe);
-
-       if (from_item) {
-               from_ri = elm_object_item_data_get(from_item);
-
-               debug_log("from_ri = %s", from_ri->email_list[0].email_addr);
+       if(ugd->context_popup) {
+               evas_object_del(ugd->context_popup);
+               ugd->context_popup = NULL;
        }
 
-       if (ugd->me_added == false) {
-               debug_log("previous: not added -> now: being added");
-               Elm_Object_Item *to_item = NULL;
-               to_item = elm_multibuttonentry_first_item_get(ugd->to_mbe);
-
-               while (to_item) {
-                       EmailRecpInfo *to_ri = NULL;
-                       int index = 0;
-
-                       to_ri = (EmailRecpInfo *) elm_object_item_data_get(to_item);
-
-                       index = to_ri->selected_email_idx;
-
-                       debug_log("to_ri email_addr = %s, index = %d", to_ri->email_list[index].email_addr, index);
-
-                       debug_log("account name = %s", ugd->account_info->account_name);
-                       if (from_ri) {
-                               if (g_strcmp0(to_ri->email_list[index].email_addr, from_ri->email_list[0].email_addr) == 0) {
-                                       elm_object_item_del(to_item);
-                                       break;
-                               }
-                       } else {
-                               if (g_strcmp0(to_ri->email_list[index].email_addr, ugd->account_info->account_name) == 0) {
-                                       elm_object_item_del(to_item);
-                                       break;
-                               }
-                       }
-
-                       to_item = elm_multibuttonentry_item_next_get(to_item);
-               }
-
-               email_account_t *account = NULL;
-               if (!email_engine_get_account_full_data(ugd->account_info->account_id, &account))
-                       debug_log("Failed to Get account full data");
-
-               EmailRecpInfo *new_to_ri = (EmailRecpInfo *) calloc(1, sizeof(EmailRecpInfo));
-
-               new_to_ri->selected_email_idx = 0;
-               if (account) {
-                       new_to_ri->display_name = account->user_display_name;
-                       snprintf(new_to_ri->email_list[0].email_addr, MAX_RECIPIENT_ADDRESS_LEN, "%s", account->user_email_address);
-               } else {
-                       new_to_ri->display_name = ugd->account_info->account->user_display_name;
-                       snprintf(new_to_ri->email_list[0].email_addr, MAX_RECIPIENT_ADDRESS_LEN, "%s", ugd->account_info->account->user_email_address);
-               }
-               new_to_ri->email_cnt = 1;
-               new_to_ri->is_contact_info = false;
-               new_to_ri->is_always_bcc = false;
-               new_to_ri->is_from_addr = true;
-               debug_log("my email_addr = %s, display_name = %s", new_to_ri->email_list[0].email_addr, new_to_ri->display_name);
-
-               to_item = elm_multibuttonentry_first_item_get(ugd->to_mbe);
-               elm_multibuttonentry_item_insert_before(ugd->to_mbe, to_item, g_strdup(new_to_ri->display_name), NULL, new_to_ri);
-
-               elm_object_text_set(ugd->add_me_btn, N_("Remove me"));
-
-               ugd->me_added = true;
-
-               if (account) {
-                       debug_log("email_free_account is called");
-                       email_free_account(&account, 1);
-                       account = NULL;
-               }
-       } else {
-               debug_log("previous: me added -> now: being deleted");
-               Elm_Object_Item *to_item = NULL;
-               to_item = elm_multibuttonentry_first_item_get(ugd->to_mbe);
-
-               while (to_item) {
-                       EmailRecpInfo *to_ri = NULL;
-                       int index = 0;
-
-                       to_ri = (EmailRecpInfo *) elm_object_item_data_get(to_item);
-
-                       index = to_ri->selected_email_idx;
-
-                       debug_log("to_ri email_addr = %s, index = %d", to_ri->email_list[index].email_addr, index);
-
-                       debug_log("account name = %s", ugd->account_info->account_name);
-                       if (from_ri) {
-                               if (g_strcmp0(to_ri->email_list[index].email_addr, from_ri->email_list[0].email_addr) == 0) {
-                                       elm_object_item_del(to_item);
-                                       break;
-                               }
-                       } else {
-                               if (g_strcmp0(to_ri->email_list[index].email_addr, ugd->account_info->account_name) == 0) {
-                                       elm_object_item_del(to_item);
-                                       break;
-                               }
-                       }
-                       to_item = elm_multibuttonentry_item_next_get(to_item);
-               }
-
-               ugd->me_added = false;
-               elm_object_text_set(ugd->add_me_btn, N_("Add me"));
-       }
-
-       if (ugd->selected_entry == ugd->to_mbe_entry) {
-               elm_object_focus_set(ugd->to_mbe, EINA_TRUE);
-       }
+       _composer_select_myemail_popup(ugd);
 }
 
 static void _composer_cbar_save_as_draft_cb(Evas_Object *o, const char *result, void *data)
@@ -2105,8 +2190,6 @@ static void _composer_cbar_save_as_draft_cb(Evas_Object *o, const char *result,
                return;
        }
 
-       debug_log("account_type: %d", ugd->account_info->account_type);
-
        int ret = _composer_add_mailbox_folder(ugd, EMAIL_MAILBOX_TYPE_DRAFT, EINA_TRUE);
 
        if (ret < COMPOSER_ERROR_NONE) {
@@ -2158,6 +2241,11 @@ void _composer_cbar_save_as_draft_clicked(void *data, Evas_Object *obj, void *ev
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
+       if(ugd->context_popup) {
+               evas_object_del(ugd->context_popup);
+               ugd->context_popup = NULL;
+       }
+
        if (EINA_FALSE == ewk_view_plain_text_get(ugd->body_ewkview, _composer_save_to_draft_cb, (void *)ugd))
                debug_log("ewk_view_plain_text_get Failed");
 }
@@ -2270,6 +2358,11 @@ void _composer_cbar_priority_clicked(void *data, Evas_Object *obj, void *event_i
        Elm_Object_Item *gen_item[3];
        int index;
 
+       if(ugd->context_popup) {
+               evas_object_del(ugd->context_popup);
+               ugd->context_popup = NULL;
+       }
+
        g_ugd = ugd;
 
        Evas_Object *popup;
@@ -2320,7 +2413,6 @@ void _composer_cbar_priority_clicked(void *data, Evas_Object *obj, void *event_i
                gen_item[index] = elm_genlist_item_append(priority_genlist, &priority_itc, (void *)index, NULL, ELM_GENLIST_ITEM_NONE, _composer_priority_gl_sel, (void *)index);
        }
 
-//     elm_genlist_effect_set(security_genlist, EINA_FALSE);
        elm_genlist_tree_effect_enabled_set(priority_genlist, EINA_FALSE);
 
 #ifdef _POPUP_WITH_LIST
@@ -2417,6 +2509,11 @@ void _composer_cbar_tracking_clicked(void *data, Evas_Object *obj, void *event_i
        Elm_Object_Item *gen_item[2];
        int index;
 
+       if(ugd->context_popup) {
+               evas_object_del(ugd->context_popup);
+               ugd->context_popup = NULL;
+       }
+
        g_ugd = ugd;
 
        Evas_Object *popup;
@@ -2425,7 +2522,7 @@ void _composer_cbar_tracking_clicked(void *data, Evas_Object *obj, void *event_i
                evas_object_del(ugd->composer_noti);
                ugd->composer_noti = NULL;
        }
-       popup = _composer_create_noti(ugd, false, N_("Tracking"), NULL, 1,
+       popup = _composer_create_noti(ugd, false, _("IDS_EMAIL_OPT_TRACKING"), NULL, 1,
                dgettext("sys_string", "IDS_COM_POP_CLOSE"), NULL, 0.0, _composer_noti_response_cb);
 
        ugd->composer_noti = popup;
@@ -2467,7 +2564,6 @@ void _composer_cbar_tracking_clicked(void *data, Evas_Object *obj, void *event_i
                gen_item[index] = elm_genlist_item_append(tracking_genlist, &tracking_itc, (void *)index, NULL, ELM_GENLIST_ITEM_NONE, _composer_tracking_gl_sel, (void *)index);
        }
 
-//     elm_genlist_effect_set(security_genlist, EINA_FALSE);
        elm_genlist_tree_effect_enabled_set(tracking_genlist, EINA_FALSE);
 
 #ifdef _POPUP_WITH_LIST
@@ -2487,6 +2583,17 @@ void _composer_cbar_send_clicked(void *data, Evas_Object *obj, void *event_info)
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
+       if (_composer_check_recipient_is_empty(ugd)) {
+               if (ugd->composer_noti) {
+                       evas_object_del(ugd->composer_noti);
+                       ugd->composer_noti = NULL;
+               }
+               ugd->composer_noti = _composer_create_noti(ugd, false, dgettext("sys_string", "IDS_COM_POP_WARNING"),
+                       _("IDS_EMAIL_POP_NO_RECIPIENTS_ADDED_ENTER_RECIPIENTS"), 0, NULL, NULL, 1.5, _composer_fail_to_send_popup_cb);
+
+               return;
+       }
+
        debug_log("Send Button Clicked");
        elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
 
@@ -2504,6 +2611,8 @@ void _composer_cbar_send_clicked(void *data, Evas_Object *obj, void *event_info)
 
        elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
        elm_object_disabled_set(ugd->cancel_btn, EINA_TRUE);
+       elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
+       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_TRUE);
 
        if (ugd->need_download == EINA_TRUE) {
                _composer_download_attachment(ugd);
@@ -2539,18 +2648,16 @@ void _composer_script_executed_cb(Evas_Object *o, const char *result, void *data
 void _composer_focus_script_executed_cb(Evas_Object *o, const char *result, void *data)
 {
        debug_log("");
-//     EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-
-//     ugd->bringin_timer = ecore_timer_add(0.7f, _composer_bringin_cb, ugd);
 }
 
 static void _composer_get_html_content_for_draft_cb(Evas_Object *o, const char *result, void *data)
 {
-       debug_log("Enter");
+       debug_enter();
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
        elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE); // It prevents clicking the cancel button several times
+       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
 
        if (NULL != ugd->latest_html_content) {
                g_free(ugd->latest_html_content);
@@ -2641,7 +2748,7 @@ void _composer_get_latest_html_content_cb(Evas_Object *o, const char *result, vo
 
        if (result != NULL) {
                ugd->latest_html_content = g_strdup(result);
-               debug_log("ugd->latest_html_content => %s", ugd->latest_html_content);
+               debug_log("ugd->latest_html_content : \n%s", ugd->latest_html_content);
        }
 }
 
index 05777b7..dfe775a 100755 (executable)
@@ -44,14 +44,11 @@ static void _composer_webkit_scroll_down_cb(void *data, Evas_Object *obj, void *
 static void _composer_webkit_get_ime_rect_cb(void *data, Evas_Object *obj, void *event_info);
 static void _composer_webkit_ime_closed_cb(void *data, Evas_Object *obj, void *event_info);
 static void _composer_webkit_ime_opened_cb(void *data, Evas_Object *obj, void *event_info);
-static void _composer_webkit_resized_cb(void *data, Evas_Object *obj, void *event_info);
 static void _composer_webview_policy_navigation_decide_cb(void *data, Evas_Object *obj, void *event_info);
 static void _composer_webview_contextmenu_customize_cb(void *data, Evas_Object *webview, void *event_info);
 static void _composer_webview_contextmenu_selected_cb(void *data, Evas_Object *webview, void *event_info);
 static void _composer_webkit_get_text_status_cb(void *data, Evas_Object *obj, void *event_info);
 
-static int _g_pos_x;
-static int _g_pos_y;
 
 static void _changed_cb(void *data, Evas_Object *obj, void *event_info) // This callback is for showing(hiding) X marked button.
 {
@@ -84,7 +81,6 @@ static void _focused_cb(void *data, Evas_Object *obj, void *event_info) // Focus
 
                ugd->selected_entry = ugd->subject_entry;
                elm_layout_sizing_eval(ugd->c_layout);
-//             ugd->bringin_timer = ecore_timer_add(0.5f, _composer_bringin_cb, ugd);
        } else {
                if (ugd->selected_entry == ugd->body_ewkview) {
                        elm_object_focus_set(ugd->subject_entry, EINA_FALSE);
@@ -95,13 +91,13 @@ static void _focused_cb(void *data, Evas_Object *obj, void *event_info) // Focus
 static void _unfocused_cb(void *data, Evas_Object *obj, void *event_info) // Unfocused callback will show guidetext and hide X marked button.
 {
        debug_log("");
-       EmailComposerUGD *ugd = (EmailComposerUGD *)data;       
+       EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
        if (ugd->focus_status == COMPOSER_FOCUS_STATUS_SELECTED) {
                elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
                ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
                return;
-       }               
+       }
 
        if (elm_entry_is_empty(obj))
                elm_object_signal_emit(ugd->subject_editfield, "elm,state,guidetext,show", "elm");
@@ -176,7 +172,6 @@ Evas_Object *_composer_create_subject_editfield(Evas_Object *parent, char *title
        entry = elm_entry_add(ef);
        elm_entry_scrollable_set(entry, EINA_TRUE);
        elm_entry_single_line_set(entry, EINA_TRUE);
-//     elm_entry_input_panel_enabled_set(entry, EINA_FALSE);
        elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_NORMAL);
        elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
        evas_object_show(entry);
@@ -185,9 +180,6 @@ Evas_Object *_composer_create_subject_editfield(Evas_Object *parent, char *title
        elm_object_part_content_set(ef, "elm.swallow.content", entry);
        ugd->subject_entry = entry;
 
-       /* add filter for removing markups*/
-//     elm_entry_text_filter_append(entry, _composer_entry_filter_remove_markup, ugd);
-
        return ly;
 }
 
@@ -210,6 +202,7 @@ void _composer_register_editfield_entry_callback(Evas_Object *obj, EmailComposer
 
        evas_object_smart_callback_add(obj, "changed", _composer_edit_field_changed_cb, ugd);
        evas_object_smart_callback_add(obj, "preedit,changed", _composer_edit_field_changed_cb, ugd);
+
        Ecore_IMF_Context *imf_context = elm_entry_imf_context_get(obj);
        ecore_imf_context_input_panel_event_callback_add (imf_context, ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, _composer_input_panel_resize_cb, ugd);
        ecore_imf_context_input_panel_event_callback_add(imf_context, ECORE_IMF_INPUT_PANEL_STATE_EVENT, _composer_input_panel_state_changed_cb, ugd);
@@ -229,7 +222,6 @@ void _composer_webkit_set_body_script(void *data)
 
        if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_HTML_CONTENT, _composer_get_html_content_cb, (void *)ugd) == EINA_FALSE)
                debug_log("COMPOSER_JS_GET_HTML_CONTENT failed.");
-
 }
 
 Evas_Object *_composer_create_body_webview(Evas_Object *parent, char *title, EmailComposerUGD *ugd)
@@ -249,7 +241,6 @@ Evas_Object *_composer_create_body_webview(Evas_Object *parent, char *title, Ema
        evas_object_size_hint_weight_set(ugd->body_ewkview, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(ugd->body_ewkview, EVAS_HINT_FILL, EVAS_HINT_FILL);
        ewk_view_vertical_panning_hold_set(ugd->body_ewkview, EINA_TRUE);
-       //elm_webview_input_field_zoom_set(ugd->body_webview, EINA_TRUE); //reviewing
 
        elm_object_part_content_set(ly, "webkit.swallow", ugd->body_ewkview);
 
@@ -257,8 +248,6 @@ Evas_Object *_composer_create_body_webview(Evas_Object *parent, char *title, Ema
        evas_object_smart_callback_add(ugd->body_ewkview, "edge,bottom", _composer_webview_reach_bottom_cb, ugd);
 
        evas_object_event_callback_add(ugd->body_ewkview, EVAS_CALLBACK_MOUSE_DOWN, _composer_webview_mouse_down_cb, ugd);
-       //evas_object_event_callback_add(ugd->body_webview, EVAS_CALLBACK_MOUSE_MOVE, _composer_webview_mouse_move_cb, ugd);
-       //evas_object_event_callback_add(ugd->body_webview, EVAS_CALLBACK_MOUSE_UP, _composer_webview_mouse_up_cb, ugd);
 
        Ewk_Setting *ewkSetting = NULL;
        ewkSetting = ewk_view_setting_get(ugd->body_ewkview);
@@ -285,52 +274,19 @@ Evas_Object *_composer_create_body_webview(Evas_Object *parent, char *title, Ema
        return ly;
 }
 
-static Eina_Bool _composer_webkit_field_clicked_cb_hit_test_hash_fn(const Eina_Hash *hash, const void *key, void *data, void *fdata)
-{
-       debug_log("Func data: %s, Hash entry: %s / %s\n", fdata, (const char *)key, data);
-
-       bool *val = (bool *)fdata;
-
-       if (strcmp(key, "isselected") == 0) {
-               debug_log("OK!");
-               *val = true;
-       }
-
-       return EINA_TRUE;
-}
-
 void _composer_webview_mouse_down_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info)
 {
        debug_log("");
-
-       /*EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-
-       Evas_Event_Mouse_Down *mouse_info = (Evas_Event_Mouse_Down *)event_info;
-       debug_log("output position: [%d, %d]", mouse_info->output.x, mouse_info->output.y);*/
 }
 
 void _composer_webview_mouse_move_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info)
 {
        debug_log("");
-
-       /*EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-       Evas_Event_Mouse_Move *mouse_info = (Evas_Event_Mouse_Move *) event_info;
-
-       debug_log("prev: output position: [%d, %d]", mouse_info->prev.output.x, mouse_info->prev.output.y);
-       debug_log("prev: canvas position: [%d, %d]", mouse_info->prev.canvas.x, mouse_info->prev.canvas.y);
-
-       debug_log("cur:  output position: [%d, %d]", mouse_info->cur.output.x, mouse_info->cur.output.y);
-       debug_log("cur:  canvas position: [%d, %d]", mouse_info->cur.canvas.x, mouse_info->cur.canvas.y);*/
 }
 
 void _composer_webview_mouse_up_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info)
 {
        debug_log("");
-
-       /*EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-       Evas_Event_Mouse_Up *mouse_info = (Evas_Event_Mouse_Up *)event_info;
-
-       debug_log("output position: [%d, %d]", mouse_info->output.x, mouse_info->output.y);*/
 }
 
 void _composer_webkit_loadFinished_cb(void *data, Evas_Object *obj, void *event_info)
@@ -348,7 +304,6 @@ void _composer_webkit_loadFinished_cb(void *data, Evas_Object *obj, void *event_
                debug_log("ewkSetting is NULL.");
 
        ewk_setting_auto_fitting_set(ewkSetting, EINA_TRUE);
-       //ewk_setting_auto_load_images_set(ewkSetting, EINA_TRUE);
        ewk_setting_editable_link_behavior_set(ewkSetting, EWK_EDITABLE_LINK_BEHAVIOR_NEVER_LIVE);
 
        if (ugd->selected_entry == ugd->body_ewkview) {
@@ -357,12 +312,13 @@ void _composer_webkit_loadFinished_cb(void *data, Evas_Object *obj, void *event_
        }
 
        elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
+       elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
        ugd->b_load_finished = EINA_TRUE;
 }
 
 static void _composer_webkit_focused_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       debug_log("Enter");
+       debug_enter();
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
@@ -379,7 +335,6 @@ static void _composer_webkit_focused_cb(void *data, Evas *e, Evas_Object *obj, v
 
        debug_log("obj = %x, to_mbe = %x, cc_mbe = %x, bcc_mbe = %x, subject_editfield = %x", obj, ugd->to_mbe, ugd->cc_mbe, ugd->bcc_mbe, ugd->subject_editfield);
 
-#if 1
        if (EINA_TRUE == elm_object_focus_get(ugd->to_mbe)) {
                debug_log("to_mbe");
                elm_object_focus_set(ugd->to_mbe, EINA_FALSE);
@@ -396,27 +351,13 @@ static void _composer_webkit_focused_cb(void *data, Evas *e, Evas_Object *obj, v
                debug_log("subject_entry");
                elm_object_focus_set(ugd->subject_entry, EINA_FALSE);
        }
-#else
-       if (ugd->selected_entry == ugd->to_mbe_entry) {
-               elm_object_focus_set(ugd->to_mbe, EINA_FALSE);
-       }
-       else if (ugd->selected_entry == ugd->cc_mbe_entry) {
-               elm_object_focus_set(ugd->cc_mbe, EINA_FALSE);
-       }
-       else if (ugd->selected_entry == ugd->bcc_mbe_entry) {
-               elm_object_focus_set(ugd->bcc_mbe, EINA_FALSE);
-       }
-       else if (ugd->selected_entry == ugd->subject_entry) {
-               elm_object_focus_set(ugd->subject_entry, EINA_FALSE);
-       }
-#endif
+
        ugd->selected_entry = ugd->body_ewkview;
        evas_object_focus_set(ugd->body_ewkview, EINA_TRUE);
 
        ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE; // focus handling when rte is clicked
        _composer_attachment_contract_items(ugd);
 
-//     ugd->bringin_timer = ecore_timer_add(0.7f, _composer_bringin_cb, ugd);
        elm_layout_sizing_eval(ugd->c_layout);
        if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_FOCUS, _composer_script_executed_cb, 0) == EINA_FALSE)
                debug_log("COMPOSER_JS_SET_FOCUS failed.");
@@ -424,7 +365,7 @@ static void _composer_webkit_focused_cb(void *data, Evas *e, Evas_Object *obj, v
 
 static void _composer_webkit_unfocused_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       debug_log("Enter");
+       debug_enter();
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
@@ -434,14 +375,11 @@ static void _composer_webkit_unfocused_cb(void *data, Evas *e, Evas_Object *obj,
        if (ugd->selected_entry == ugd->body_ewkview) {
                debug_log("Webkit unfocused");
                evas_object_focus_set(ugd->body_ewkview, EINA_FALSE);
-#if 0 
-               if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_UNFOCUS, _composer_script_executed_cb, 0) == EINA_FALSE)
-                       debug_log("COMPOSER_JS_SET_UNFOCUS failed.");
-#endif
+
                if (ugd->focus_status == COMPOSER_FOCUS_STATUS_SELECTED) {
                        elm_object_tree_focus_allow_set(ugd->c_layout, EINA_FALSE); // block the focus not to open IME.
                        ugd->focus_status = COMPOSER_FOCUS_STATUS_NONE;
-               }               
+               }
        }
 }
 
@@ -468,17 +406,14 @@ void _composer_webview_reach_top_cb(void *data, Evas_Object *obj, void *event_in
                ugd->is_webview_scrolling = EINA_FALSE;
        }
 
-#ifdef _TEMPORARY_FIX_FOR_ROTATION_
        if (ugd->temporary_fix_for_rotation)
                ugd->temporary_fix_for_rotation = false;
-#endif
 }
 
 void _composer_webview_reach_bottom_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
 
-#ifdef _TEMPORARY_FIX_FOR_ROTATION_
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
 
        if (ugd->temporary_fix_for_rotation) {
@@ -486,7 +421,6 @@ void _composer_webview_reach_bottom_cb(void *data, Evas_Object *obj, void *event
                        elm_object_scroll_freeze_pop(ugd->main_scroller);
                ugd->temporary_fix_for_rotation = false;
        }
-#endif
 }
 
 static void _composer_get_html_content_cb(Evas_Object *o, const char *result, void *data)
@@ -517,6 +451,9 @@ static void _composer_webkit_ime_closed_cb(void *data, Evas_Object *obj, void *e
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
        _composer_resize_body_webview(ugd, 0);
+
+       elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,hidden", "");
+       ugd->is_ime_hided = TRUE;
 }
 
 static void _composer_webkit_ime_opened_cb(void *data, Evas_Object *obj, void *event_info)
@@ -528,16 +465,9 @@ static void _composer_webkit_ime_opened_cb(void *data, Evas_Object *obj, void *e
                _composer_region_show_cb(ugd);
                ugd->isRotated = false;
        }
-}
-
-static void _composer_webkit_resized_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
 
-       //EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-       //_composer_region_show_cb(ugd);
-       //ugd->bringin_timer = ecore_timer_add(0.7f, _composer_bringin_cb, ugd);
-       //ugd->idler_bringin = ecore_idler_add(_composer_bringin_cb, ugd);
+       elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,shown", "");
+       ugd->is_ime_hided = FALSE;
 }
 
 static void _composer_webkit_get_ime_rect_cb(void *data, Evas_Object *obj, void *event_info)
@@ -644,18 +574,20 @@ static void _composer_webview_contextmenu_customize_cb(void *data, Evas_Object *
                        debug_log("no contents");
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_PASTE, _("IDS_EMAIL_OPT_PASTE"), EINA_TRUE);
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_CLIPBOARD, _("IDS_EMAIL_OPT_CLIPBOARD"), EINA_TRUE); // for Clipboard
+                       ewk_context_menu_item_append(contextmenu, EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG, NULL, IMGDIR"/icon_search.png", EINA_TRUE);
                } else {
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_SELECT_WORD, _("IDS_EMAIL_OPT_SELECT"), EINA_TRUE);
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_SELECT_ALL, _("IDS_EMAIL_OPT_SELECT_ALL"), EINA_TRUE);
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_PASTE, _("IDS_EMAIL_OPT_PASTE"), EINA_TRUE);
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_CLIPBOARD, _("IDS_EMAIL_OPT_CLIPBOARD"), EINA_TRUE); // for Clipboard
+                       ewk_context_menu_item_append(contextmenu, EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG, NULL, IMGDIR"/icon_search.png", EINA_TRUE);
                }
        } else {
                if (has_content == EINA_FALSE) {
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_COPY, _("IDS_EMAIL_OPT_COPY"), EINA_TRUE);
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_CUT, _("IDS_EMAIL_OPT_CUT"), EINA_TRUE);
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_CLIPBOARD, _("IDS_EMAIL_OPT_CLIPBOARD"), EINA_TRUE); // for Clipboard
-                       //ewk_context_menu_item_append(contextmenu, EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG, NULL, IMGDIR"/icon_search.png", EINA_TRUE);
+                       ewk_context_menu_item_append(contextmenu, EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG, NULL, IMGDIR"/icon_search.png", EINA_TRUE);
                } else {
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_COPY, _("IDS_EMAIL_OPT_COPY"), EINA_TRUE);
                        ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_CUT, _("IDS_EMAIL_OPT_CUT"), EINA_TRUE);
@@ -707,9 +639,9 @@ static void _composer_webkit_get_text_status_cb(void *data, Evas_Object *obj, vo
        Ewk_Text_Style* textStyle = (Ewk_Text_Style *)event_info;
 
        if ((ugd == NULL) || (textStyle == NULL)) {
-               return; 
+               return;
        }
-       
+
        int ms_x, ms_y, ms_w, ms_h;
        Evas_Point sp, ep;
        ewk_text_style_position_get(textStyle, &sp, &ep);
index 3a9b650..cb61a31 100755 (executable)
@@ -299,7 +299,6 @@ Eina_List *composer_ps_search_contact(EmailComposerUGD *ugd, const char *search_
        }
 
        ct_ret = email_get_contacts_list_info(list, contacts_list_item);
-//     ct_ret = email_get_contacts_list_info2(CONTACTS_MATCH_CONTAINS, search_word, contacts_list_item);
        debug_log("email_get_contacts_list_info: contacts_list_item : %d", contacts_list_item);
 
        if (contacts_list_item->display_name && contacts_list_item->email_address && 
@@ -414,7 +413,6 @@ void _composer_ps_create_sublist(void *data)
        Eina_List *lt = NULL;
        Eina_List *l = NULL;
 
-       /* prevent fix - 0824 */
        if (ugd == NULL)
                return;
 
@@ -450,7 +448,6 @@ static void _composer_ps_list_sel(void *data, Evas_Object *obj, void *event_info
        EmailRecpInfo *ri = NULL;
        EMAIL_CONTACT_LIST_INFO_S *contacts_list_item = NULL;
        int free_ri = 0;
-       Elm_Object_Item *mbe_item;
 
        item = (Elm_Object_Item *) event_info;
 
@@ -539,9 +536,9 @@ static void _composer_ps_list_sel(void *data, Evas_Object *obj, void *event_info
                        }
 
                        if (contacts_list_item->display_name && strlen(contacts_list_item->display_name))
-                               mbe_item = elm_multibuttonentry_item_append(ugd->to_mbe, contacts_list_item->display_name, NULL, ri);
+                               elm_multibuttonentry_item_append(ugd->to_mbe, contacts_list_item->display_name, NULL, ri);
                        else
-                               mbe_item = elm_multibuttonentry_item_append(ugd->to_mbe, contacts_list_item->email_address, NULL, ri);
+                               elm_multibuttonentry_item_append(ugd->to_mbe, contacts_list_item->email_address, NULL, ri);
                        elm_entry_entry_set(ugd->to_mbe_entry, "");
                } else if (ugd->selected_entry == ugd->cc_mbe_entry) {
                        if (_composer_check_recipient_is_duplicated(ugd, ugd->cc_mbe, ri)) {
@@ -576,9 +573,9 @@ static void _composer_ps_list_sel(void *data, Evas_Object *obj, void *event_info
                        }
 
                        if (contacts_list_item->display_name && strlen(contacts_list_item->display_name))
-                               mbe_item = elm_multibuttonentry_item_append(ugd->cc_mbe, contacts_list_item->display_name, NULL, ri);
+                               elm_multibuttonentry_item_append(ugd->cc_mbe, contacts_list_item->display_name, NULL, ri);
                        else
-                               mbe_item = elm_multibuttonentry_item_append(ugd->cc_mbe, contacts_list_item->email_address, NULL, ri);
+                               elm_multibuttonentry_item_append(ugd->cc_mbe, contacts_list_item->email_address, NULL, ri);
                        elm_entry_entry_set(ugd->cc_mbe_entry, "");
                } else if (ugd->selected_entry == ugd->bcc_mbe_entry) {
                        if (_composer_check_recipient_is_duplicated(ugd, ugd->bcc_mbe, ri)) {
@@ -612,10 +609,10 @@ static void _composer_ps_list_sel(void *data, Evas_Object *obj, void *event_info
                                goto FINISH_OFF;
                        }
 
-                       if (contacts_list_item->display_name && strlen(contacts_list_item->display_name))
-                               mbe_item = elm_multibuttonentry_item_append(ugd->bcc_mbe, contacts_list_item->display_name, NULL, ri);
+                       if ((contacts_list_item->display_name != NULL) && strlen(contacts_list_item->display_name))
+                               elm_multibuttonentry_item_append(ugd->bcc_mbe, contacts_list_item->display_name, NULL, ri);
                        else
-                               mbe_item = elm_multibuttonentry_item_append(ugd->bcc_mbe, contacts_list_item->email_address, NULL, ri);
+                               elm_multibuttonentry_item_append(ugd->bcc_mbe, contacts_list_item->email_address, NULL, ri);
                        elm_entry_entry_set(ugd->bcc_mbe_entry, "");
                } else {
                        free_ri = 1;
@@ -647,8 +644,7 @@ void _composer_ps_delete_list(void *data)
 
        if (ugd->ps_list) {
                elm_genlist_clear(ugd->ps_list);
-               /*evas_object_del(ugd->ps_list);
-               ugd->ps_list = NULL;*/
+
                if (ugd->contacts_list_info) {
                        composer_ps_delete_contacts_list(ugd->contacts_list_info);
                        ugd->contacts_list_info = eina_list_free(ugd->contacts_list_info);
@@ -723,11 +719,6 @@ static void _composer_ps_show_recp_field(EmailComposerUGD *ugd, COMPOSER_RECIPIE
                        edje_object_signal_emit(_EDJ(ugd->c_layout), "show.cc", "*");
                }
        }
-
-       /*if (ugd->webkit_ly) {
-               evas_object_show(ugd->webkit_ly);
-               elm_object_part_content_set(ugd->c_layout, "content_field", ugd->webkit_ly);
-       }*/
 }
 
 static void _composer_ps_hide_recp_field(EmailComposerUGD *ugd, COMPOSER_RECIPIENT_TYPE_E type)
@@ -789,9 +780,4 @@ static void _composer_ps_hide_recp_field(EmailComposerUGD *ugd, COMPOSER_RECIPIE
                        edje_object_signal_emit(_EDJ(ugd->c_layout), "hide.cc", "*");
                }
        }
-
-       /*if (ugd->webkit_ly) {
-               evas_object_hide(ugd->webkit_ly);
-               elm_object_part_content_unset(ugd->c_layout, "content_field");
-       }*/
 }
index 7446d22..d44cd56 100755 (executable)
@@ -101,9 +101,6 @@ static Evas_Object *_composer_mbe_create_mbe(Evas_Object *parent, COMPOSER_RECIP
        elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
        elm_entry_text_style_user_push(entry, "DEFAULT='font_size=32 color=#000000'");
 
-       /* add filter for removing markups*/
-//     elm_entry_text_filter_append(entry, _composer_entry_filter_remove_markup, ugd);
-
        if (recp_type == COMPOSER_RECIPIENT_TYPE_TO) {
                snprintf(recp_string, sizeof(recp_string), "<font_size=36><color=#000000>%s%s</color></font_size>", dgettext("sys_string", "IDS_COM_BODY_TO"), ":");
        } else if (recp_type == COMPOSER_RECIPIENT_TYPE_CC) {
@@ -225,7 +222,6 @@ void email_composer_create_cc_field(EmailComposerUGD *ugd)
 
        ugd->cc_added = true;
 
-#ifdef _ALWAYS_CC_MYSELF
        if (ugd->account_info->account->options.add_my_address_to_bcc == EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_CC && ugd->composer_type != RUN_COMPOSER_EDIT) {
                EmailRecpInfo *ri = (EmailRecpInfo *) calloc(1, sizeof(EmailRecpInfo));
 
@@ -242,7 +238,6 @@ void email_composer_create_cc_field(EmailComposerUGD *ugd)
 
                elm_multibuttonentry_item_append(ugd->cc_mbe, ri->display_name, NULL, (void *)ri);
        }
-#endif
 }
 
 void email_composer_delete_cc_field(EmailComposerUGD *ugd)
@@ -282,7 +277,6 @@ void email_composer_create_bcc_field(EmailComposerUGD *ugd)
 
        ugd->bcc_added = true;
 
-#ifdef _ALWAYS_CC_MYSELF
        if (ugd->account_info->account->options.add_my_address_to_bcc == EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_BCC && ugd->composer_type != RUN_COMPOSER_EDIT) {
                EmailRecpInfo *ri = (EmailRecpInfo *) calloc(1, sizeof(EmailRecpInfo));
 
@@ -299,7 +293,6 @@ void email_composer_create_bcc_field(EmailComposerUGD *ugd)
 
                elm_multibuttonentry_item_append(ugd->bcc_mbe, ri->display_name, NULL, (void *)ri);
        }
-#endif
 }
 
 void email_composer_delete_bcc_field(EmailComposerUGD *ugd)
@@ -342,9 +335,6 @@ void email_composer_create_from_field(EmailComposerUGD *ugd)
 
        elm_entry_editable_set(ugd->from_mbe_entry, FALSE);
        elm_object_part_content_set(ly, "recipient.swallow", mbe);
-
-       /* temporarily enable for unfocusing multibutton entry */
-       //_composer_register_mbe_callback(ugd->from_mbe, ugd);
 }
 
 void email_composer_delete_from_field(EmailComposerUGD *ugd)
index f25d3af..89bc8d9 100755 (executable)
@@ -22,6 +22,7 @@
 #undef _
 #include <iconv.h>
 #include <fcntl.h>
+#include <status.h>
 
 #include "email-composer.h"
 #include "email-composer-recipient.h"
 #include "email-composer-attachment.h"
 #include "email-composer-callback.h"
 #include "email-composer-js.h"
+#include "email-composer-contents.h"
 
 #include "email-engine.h"
 #include "email-utils.h"
 
+#define DIV_TAG_START_ORIGIN_INFO "<div id=\"origin_info\">"
+#define DIV_TAG_START_ORIGIN_CONTENT "<div id=\"origin_content\">"
+#define DIV_TAG_END "</div>"
+
 #define DIVIDE_LEFT_LINE_FOR_HTML "<br><br><b>--------------- "
 #define DIVIDE_RIGHT_LINE_FOR_HTML " ---------------</b><br>\n"
 #define ADDED_TEXT "<b>%s:</b> %s<br>\n"
 #define BODY_TAG_START "<body>\n"
 #define BODY_TAG_END "</body>\n"
+#define HTML_TAG_END "</html>\n"
 
 #define DIVIDE_LINE "\n\n-----------------------------------\n"
 
 #define DEFAULT_SIGNATURE _("IDS_EMAIL_BODY_SENT_USING_TIZEN_MOBILE")
 
 #define HTML_META_INFORMATION \
-       "<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi\" /></head>"
+       "<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=medium-dpi\" /></head>\n"
 
 
 static void _composer_save_draft_response_cb(void *data, Evas_Object *obj, void *event_info);
@@ -189,6 +196,66 @@ char *email_composer_parse_get_filepath_from_path(const char *path)
        return file_path;
 }
 
+char *_composer_get_file_ext(const char *a_pszfile_name)
+{
+       if (a_pszfile_name != NULL) {
+               int nlen = strlen(a_pszfile_name);
+               char *psztemp = (char *)a_pszfile_name + nlen;
+
+               while (nlen--) {
+                       psztemp--;
+                       if (*psztemp == '.') {
+                               psztemp++;
+                               break;
+                       }
+               }
+               return psztemp;
+       }
+
+       return NULL;
+}
+
+int _composer_copy_temp_file(const char *src_file_path, char *dst_file_path, int size_dst_file_path)
+{
+       debug_enter();
+       const char *filename = NULL;
+       char temp_file_path[MAX_PATH_LEN] = { 0, };
+       int ret = EINA_TRUE;
+
+       if (ecore_file_exists(src_file_path) == EINA_FALSE) {
+               ret = EINA_FALSE;
+       }
+
+       filename = ecore_file_file_get(src_file_path);
+       debug_log("filename:%s", filename);
+       if (filename) {
+               int i = 0;
+               snprintf(temp_file_path, sizeof(temp_file_path) - 1, "%s/%s", EMAIL_TMP_FOLDER, filename);
+
+               while (ecore_file_exists(temp_file_path)) {
+                       bzero(temp_file_path, sizeof(temp_file_path));
+                       snprintf(temp_file_path, sizeof(temp_file_path) - 1, "%s/%d_%s", EMAIL_TMP_FOLDER, i, filename);
+                       i++;
+
+                       if (i < 0)
+                               ret = EINA_FALSE;
+               }
+
+               if (ecore_file_cp(src_file_path, temp_file_path) == EINA_FALSE) {
+                       debug_log("temp_file_path = %s", temp_file_path);
+                       ret = EINA_FALSE;
+               }
+
+               strncpy(dst_file_path, temp_file_path, size_dst_file_path);
+               debug_log("copy file from %s to %s", src_file_path, dst_file_path);
+       } else {
+               ret = EINA_FALSE;
+       }
+
+       debug_leave();
+       return ret;
+}
+
 /**
  * Changes inline images path from absolute to relative, in a given html content.
  *
@@ -313,16 +380,17 @@ Eina_List *email_composer_change_str_to_EinaList(EmailComposerUGD *ugd, const ch
        debug_log("");
 
        Eina_List *list = NULL;
+       char *p = NULL;
+       char tmp_file_path[MAX_PATH_LEN + 1] = { 0, };
+       char *file_ext = NULL;
 
        debug_log("str = %s", str);
-       char *p;
-
        debug_log("token = %s", token);
        if (token) {
                p = strtok((char *)str, token);
 
                if (p) {
-                       debug_log("str = %s", p);
+                       debug_log("p = %s", p);
                }
 
                while (p != NULL) {
@@ -335,13 +403,22 @@ Eina_List *email_composer_change_str_to_EinaList(EmailComposerUGD *ugd, const ch
                                        ugd->composer_noti = _composer_create_noti(ugd, false, dgettext("sys_string", "IDS_COM_POP_WARNING"),
                                                _("IDS_EMAIL_POP_UNABLE_TO_FORWARD_DRM_CONTENTS"), 0, NULL, NULL, 2.0, _composer_noti_response_cb);
                                } else {
-                                       list = eina_list_append(list, p);
+                                       file_ext = _composer_get_file_ext(p);
+                                       debug_log("file_ext:%s", file_ext);
+
+                                       if (strcasecmp(file_ext, "vcf") == 0 || strcasecmp(file_ext, "vcs") == 0) {
+                                               if (_composer_copy_temp_file(p, tmp_file_path, MAX_PATH_LEN))
+                                                       list = eina_list_append(list, tmp_file_path);
+                                               else
+                                                       list = eina_list_append(list, p);
+                                       } else
+                                               list = eina_list_append(list, p);
                                }
                        }
 
                        p = strtok(NULL, token);
                        if (p) {
-                               debug_log("str = %s", p);
+                               debug_log("p = %s", p);
                        }
                }
        } else {
@@ -404,6 +481,7 @@ int _composer_add_mailbox_folder(EmailComposerUGD *ugd, email_mailbox_type_e mai
                ugd->new_mail_info->attachment_list, ugd->new_mail_info->mail_data->attachment_count);
 
        nResult = email_add_mail(ugd->new_mail_info->mail_data, ugd->new_mail_info->attachment_list, ugd->new_mail_info->mail_data->attachment_count, NULL, 0);
+       debug_log("result of email_add_mail: %d", nResult);
        if (nResult != EMAIL_ERROR_NONE) {
                debug_warning("email_add_mail failed! %d", nResult);
                return nResult;
@@ -468,6 +546,11 @@ int _composer_make_mail(EmailComposerUGD *ugd, Eina_Bool b_save_to_draft)
                return COMPOSER_ERROR_GET_DATA_FAIL;
        }
 
+       if (account == NULL) {
+               debug_log("account is NULL!");
+               return COMPOSER_ERROR_GET_DATA_FAIL;
+       }
+
        debug_log("acc id = %d", ugd->account_info->account_id);
        debug_log("priority = %d", (*ugd->account_info->account).options.priority);
        debug_log("mailbox = %s", ugd->mailbox_info->mail_box->mailbox_name);
@@ -540,7 +623,6 @@ int _composer_make_mail(EmailComposerUGD *ugd, Eina_Bool b_save_to_draft)
 
                char *html_content = NULL;
                char *html_content_processed = NULL;
-               //Eina_List *images_list = NULL;
                char *plain_text_content = NULL;
 
                html_content = g_strdup(ugd->latest_html_content);
@@ -585,9 +667,6 @@ int _composer_make_mail(EmailComposerUGD *ugd, Eina_Bool b_save_to_draft)
                        } else {
                                html_content_processed = html_content;
                        }
-
-                       //eina_list_free(images_list);
-                       //images_list = NULL;
                }
 
                if (EINA_FALSE == email_composer_save_file(ugd->saved_html_path, html_content_processed, strlen(html_content_processed))) {
@@ -670,14 +749,6 @@ int _composer_make_mail(EmailComposerUGD *ugd, Eina_Bool b_save_to_draft)
 
        ugd->new_mail_info->mail_data->flags_draft_field = 1;
 
-       /* Support sync engine */
-/*     if (ugd->composer_type == RUN_COMPOSER_REPLY || ugd->composer_type == RUN_COMPOSER_REPLY_ALL) {
-               email_set_flags_field(ugd->account_info->account_id, &ugd->nExistingMailID, 1, EMAIL_FLAGS_ANSWERED_FIELD, 1, 1);
-       } else if (ugd->composer_type == RUN_COMPOSER_FORWARD) {
-               email_set_flags_field(ugd->account_info->account_id, &ugd->nExistingMailID, 1, EMAIL_FLAGS_FORWARDED_FIELD, 1, 1);
-       }
-       debug_log("existing mail id = %d, %d", ugd->nExistingMailID, ugd->existing_mail_info->mail_data->mail_id);
-*/
        return COMPOSER_ERROR_NONE;
 }
 
@@ -813,8 +884,7 @@ int _composer_send_mail(EmailComposerUGD *ugd)
                1) Add new edited email to Outbox.
                2) Delete the old email from Drafts / Outbox */
 
-               if (0 < ugd->mailbox_info->mailbox_id)
-               {
+               if (0 < ugd->mailbox_info->mailbox_id) {
                        int ret = _composer_add_mailbox_folder(ugd, EMAIL_MAILBOX_TYPE_OUTBOX, EINA_FALSE);
 
                        if (ret < COMPOSER_ERROR_NONE) {
@@ -1083,6 +1153,8 @@ void _composer_popup_end(EmailComposerUGD *ugd, int close_sg)
        } else {
                elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
                elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
+               elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
+               elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
 
                ugd->bSendBtnDisabled = false;
        }
@@ -1193,7 +1265,7 @@ Evas_Object *_composer_create_composer_layout(Evas_Object *parent)
 Evas_Object *_composer_create_outer_layout(Evas_Object *parent)
 {
        debug_log("");
-       Evas_Object *layout/*, *bg*/;
+       Evas_Object *layout;
 
        layout = elm_layout_add(parent);
 
@@ -1261,7 +1333,7 @@ void _composer_set_mail_info(EmailComposerUGD *ugd)
                                        ugd->fw_dn_cnt++;
                                }
                        }
-                       debug_log("ugd->need_download:%d, fw_dn_cnt:%d", ugd->need_download, ugd->fw_dn_cnt);
+                       debug_log("need_download:%d, fw_dn_cnt:%d", ugd->need_download, ugd->fw_dn_cnt);
                }
        }
 
@@ -1269,12 +1341,11 @@ void _composer_set_mail_info(EmailComposerUGD *ugd)
 
 //     _composer_download_attachment(ugd);
 
-       char *plain_charset = NULL;
-       char *charset = NULL;
        if ((EINA_TRUE == ugd->has_body_html) &&
                (ugd->composer_type == RUN_COMPOSER_EDIT || ugd->composer_type == RUN_COMPOSER_REPLY || ugd->composer_type == RUN_COMPOSER_REPLY_ALL || ugd->composer_type == RUN_COMPOSER_FORWARD)) {
                _composer_add_softlink_to_inline_images(ugd);
 
+               char *plain_charset = NULL;
                if (ugd->existing_mail_info->mail_data && ugd->existing_mail_info->mail_data->file_path_plain) {
                        plain_charset = email_parse_get_filename_from_path(ugd->existing_mail_info->mail_data->file_path_plain);
                        debug_log("plain_charset : %s", plain_charset);
@@ -1285,10 +1356,11 @@ void _composer_set_mail_info(EmailComposerUGD *ugd)
                                        debug_log("ewkSetting is NULL.");
 
                                ewk_setting_default_encoding_set(ewkSetting, plain_charset);
+                               g_free(plain_charset);
                        }
                } else {
                        if (ugd->existing_mail_info->mail_data && ugd->existing_mail_info->mail_data->file_path_html) {
-                               charset = email_parse_get_filename_from_path(ugd->existing_mail_info->mail_data->file_path_html);
+                               char *charset = email_parse_get_filename_from_path(ugd->existing_mail_info->mail_data->file_path_html);
                                debug_log("body html filename charset:%s", charset);
                                if (charset) {
                                        Ewk_Setting *ewkSetting = ewk_view_setting_get(ugd->body_ewkview);
@@ -1297,6 +1369,7 @@ void _composer_set_mail_info(EmailComposerUGD *ugd)
                                                debug_log("ewkSetting is NULL.");
 
                                        ewk_setting_default_encoding_set(ewkSetting, charset);
+                                       g_free(charset);
                                }
                        }
                }
@@ -1403,7 +1476,6 @@ Eina_Bool _composer_show_progress_popup(void *data)
 
        Evas_Object *label = elm_label_add(popup);
        elm_object_text_set(label, buf);
-//     elm_label_text_align_set(label, "center");
        evas_object_show(label);
        ugd->fw_dn_label = label;
 
@@ -1455,6 +1527,8 @@ static void _composer_dn_prog_popup_response_cb(void *data, Evas_Object *obj, vo
                elm_object_tree_focus_allow_set(ugd->c_layout, EINA_TRUE); // block the focus not to open IME.
                elm_object_disabled_set(ugd->send_btn, EINA_FALSE);
                elm_object_disabled_set(ugd->cancel_btn, EINA_FALSE);
+               elm_object_disabled_set(ugd->send_btm_btn, EINA_FALSE);
+               elm_object_disabled_set(ugd->cancel_btm_btn, EINA_FALSE);
 
                _composer_cancel_download_attachment(ugd);
 
@@ -1519,24 +1593,7 @@ void _composer_download_attachment(EmailComposerUGD *ugd)
        if (att_cnt > 0) {
                for ( i = 0 ; i < att_cnt ; i++ ) {
                        if (_composer_save_attachment(ugd, i) == EINA_TRUE) {
-                               int ret;
-                               service_h service = NULL;
-
-                               ret = service_create(&service);
-                               debug_log("service_create: %d", ret);
-                               if (!service) {
-                                       debug_log("service create failed");
-                                       return;
-                               }
-
-                               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_UPDATE, EMAIL_BUNDLE_KEY_UPDATE);
-                               debug_log("service_add_extra_data: %d", ret);
-
-                               ret = ug_send_result(ugd->ug_main, service);
-                               debug_log("ug_send_result: %d", ret);
-
-                               ret = service_destroy(service);
-                               debug_log("service_destroy: %d", ret);
+                               debug_log("_composer_save_attachment");
                        }
                }
        } else {
@@ -1586,7 +1643,6 @@ void _composer_update_attachment_info(EmailComposerUGD *ugd, int index)
                                                if (ret == EMAIL_EXT_SAVE_ERR_NONE) {
                                                        char str[128] = { 0, };
                                                        snprintf(str, sizeof(str), "%s", dgettext("sys_string", "IDS_COM_POP_SAVED"));
-                                                       /*_show_select_info(ug_data, str);*/
                                                        ret = status_message_post(str);
                                                        if (ret) {
                                                                debug_log("status_message_post failed: %d", ret);
@@ -1601,8 +1657,6 @@ void _composer_update_attachment_info(EmailComposerUGD *ugd, int index)
                                                debug_log("attachment_size : %d", attachment_data->attachment_size);
                                                debug_log("save_status : %d", attachment_data->save_status);
                                                debug_log("inline_content_status : %d", attachment_data->inline_content_status);
-
-                                               //_composer_attachment_update_thumbnail(ugd, attachment_obj, path);
                                        }
 
                                        if (path != NULL) {
@@ -1616,7 +1670,7 @@ void _composer_update_attachment_info(EmailComposerUGD *ugd, int index)
        }
 }
 
-void _composer_attachment_cancel_download(EmailComposerUGD *ugd)
+void _composer_cancel_download_attachment(EmailComposerUGD *ugd)
 {
        debug_log("");
 
@@ -1631,31 +1685,6 @@ void _composer_attachment_cancel_download(EmailComposerUGD *ugd)
        }
 }
 
-void _composer_cancel_download_attachment(EmailComposerUGD *ugd)
-{
-       debug_log("");
-
-       int ret;
-       service_h service = NULL;
-
-       _composer_attachment_cancel_download(ugd);
-
-       ret = service_create(&service);
-       debug_log("service_create: %d", ret);
-       if (!service) {
-               debug_log("service create failed");
-               return;
-       }
-
-       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_CANCEL_ALL, "CANCEL_ALL");
-       debug_log("service_add_extra_data: %d", ret);
-
-       ug_send_result(ugd->ug_main, service);
-
-       ret = service_destroy(service);
-       debug_log("service_destroy: %d", ret);
-}
-
 const char *_composer_get_sent_time(EmailComposerMail *mail_info)
 {
        debug_log("");
@@ -1913,7 +1942,6 @@ void _composer_add_to_address(EmailComposerUGD *ugd)
 {
        debug_log("");
 
-       //Elm_Object_Item *item;
        Eina_Bool overflow_flag = TRUE;
        Eina_Bool invalid_address_flag = FALSE;
 
@@ -2155,11 +2183,9 @@ void _composer_add_cc_address(EmailComposerUGD *ugd)
                                }
                                debug_log("display_name = %s, email_address = %s", ri->display_name, ri->email_list[0].email_addr);
 
-#ifdef _ALWAYS_CC_MYSELF
                                if (ugd->account_info->account->options.add_my_address_to_bcc == EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_CC && g_strcmp0(ri->email_list[0].email_addr, ugd->account_info->account->user_email_address) == 0) {
                                        ri->is_always_bcc = true;
                                }
-#endif
 
                                if (!_composer_check_recipient_is_duplicated(ugd, ugd->cc_mbe, ri)) {
                                        if (ugd->cc_list) {
@@ -2198,7 +2224,6 @@ void _composer_add_cc_address(EmailComposerUGD *ugd)
                }
        }
 
-#ifdef _ALWAYS_CC_MYSELF
        if (ugd->account_info->account->options.add_my_address_to_bcc == EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_CC && ugd->composer_type != RUN_COMPOSER_EDIT) {
                debug_log("");
                if (ugd->cc_mbe == NULL) {
@@ -2211,7 +2236,6 @@ void _composer_add_cc_address(EmailComposerUGD *ugd)
                        ugd->b_cc_bcc = false;
                }
        }
-#endif
 
        elm_multibuttonentry_expanded_set(ugd->cc_mbe, FALSE);
 }
@@ -2290,11 +2314,9 @@ void _composer_add_bcc_address(EmailComposerUGD *ugd)
                                }
                                debug_log("display_name = %s, email_address = %s", ri->display_name, ri->email_list[0].email_addr);
 
-#ifdef _ALWAYS_CC_MYSELF
                                if (ugd->account_info->account->options.add_my_address_to_bcc == EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_BCC && g_strcmp0(ri->email_list[0].email_addr, ugd->account_info->account->user_email_address) == 0) {
                                        ri->is_always_bcc = true;
                                }
-#endif
 
                                if (!_composer_check_recipient_is_duplicated(ugd, ugd->bcc_mbe, ri)) {
                                        if (ugd->bcc_list) {
@@ -2333,7 +2355,6 @@ void _composer_add_bcc_address(EmailComposerUGD *ugd)
                }
        }
 
-#ifdef _ALWAYS_CC_MYSELF
        if (ugd->account_info->account->options.add_my_address_to_bcc == EMAIL_ADD_MY_ADDRESS_OPTION_ALWAYS_ADD_TO_BCC && ugd->composer_type != RUN_COMPOSER_EDIT) {
                debug_log("");
                if (ugd->bcc_mbe == NULL) {
@@ -2346,7 +2367,6 @@ void _composer_add_bcc_address(EmailComposerUGD *ugd)
                        ugd->b_cc_bcc = false;
                }
        }
-#endif
 
        elm_multibuttonentry_expanded_set(ugd->bcc_mbe, FALSE);
 }
@@ -2614,7 +2634,7 @@ void _composer_make_html_body(EmailComposerUGD *ugd)
                        snprintf(text_for_subject, sizeof(text_for_subject), ADDED_TEXT"<br>", dgettext("sys_string", "IDS_COM_BODY_SUBJECT"), ugd->existing_mail_info->mail_data->subject);
                }
 
-               text_for_original_info = g_strconcat(BODY_TAG_START, DIVIDE_LEFT_LINE_FOR_HTML, _("IDS_EMAIL_BODY_ORIGINAL_MESSAGE"), DIVIDE_RIGHT_LINE_FOR_HTML, text_for_from, text_for_sent, text_for_to, text_for_subject, BODY_TAG_END, NULL);
+               text_for_original_info = g_strconcat(DIVIDE_LEFT_LINE_FOR_HTML, _("IDS_EMAIL_BODY_ORIGINAL_MESSAGE"), DIVIDE_RIGHT_LINE_FOR_HTML, text_for_from, text_for_sent, text_for_to, text_for_subject, NULL);
 
                char *html_charset = email_parse_get_filename_from_path(ugd->existing_mail_info->mail_data->file_path_html);
                debug_log("html_charset : %s", html_charset);
@@ -2669,16 +2689,29 @@ void _composer_make_html_body(EmailComposerUGD *ugd)
 
        strncpy(szMetaViewportInfo, HTML_META_INFORMATION, TEMP_BUFFER_SIZE);
 
-       if (ugd->composer_type != RUN_COMPOSER_EDIT && (ugd->account_info->account->options).add_signature) {
+       if ((ugd->account_info->account->options).add_signature) {
                char signature_text[128] = { 0, };
 
-               if ((ugd->account_info->account->options).signature) {
-                       snprintf(signature_text, sizeof(signature_text), "<body><br><br>%s<br><br></body></html>", (ugd->account_info->account->options).signature);
-               }
+               debug_log("composer_type:%d", ugd->composer_type);
+               if (ugd->composer_type == RUN_COMPOSER_NEW || ugd->composer_type == RUN_COMPOSER_REPLY
+                       || ugd->composer_type == RUN_COMPOSER_REPLY_ALL || ugd->composer_type == RUN_COMPOSER_FORWARD) {
+                       if ((ugd->account_info->account->options).signature) {
+                               snprintf(signature_text, sizeof(signature_text), "<br><br><br>%s<br><br>", (ugd->account_info->account->options).signature);
+                       }
+
+                       full_text = g_strconcat(szMetaViewportInfo, BODY_TAG_START, DIV_TAG_START_ORIGIN_INFO, signature_text, text_for_original_info, DIV_TAG_END,
+                                                                       DIV_TAG_START_ORIGIN_CONTENT, html_text_for_body, DIV_TAG_END, BODY_TAG_END, HTML_TAG_END, NULL);
+               } else if (ugd->composer_type == RUN_COMPOSER_EXTERNAL) {
+                       if ((ugd->account_info->account->options).signature) {
+                               snprintf(signature_text, sizeof(signature_text), "<br><br><br>%s<br><br>", (ugd->account_info->account->options).signature);
+                       }
 
-               full_text = g_strconcat(szMetaViewportInfo, text_for_original_info, html_text_for_body, signature_text, NULL);
+                       full_text = g_strconcat(szMetaViewportInfo, BODY_TAG_START, html_text_for_body, DIV_TAG_START_ORIGIN_INFO, signature_text, text_for_original_info, DIV_TAG_END,
+                                                                       BODY_TAG_END, HTML_TAG_END, NULL);
+               }
        } else {
-               full_text = g_strconcat(szMetaViewportInfo, text_for_original_info, html_text_for_body, NULL);
+               full_text = g_strconcat(szMetaViewportInfo, DIV_TAG_START_ORIGIN_INFO, text_for_original_info, DIV_TAG_END,
+                                                               DIV_TAG_START_ORIGIN_CONTENT, html_text_for_body, DIV_TAG_END, NULL);
        }
 
        debug_log("text_for_original_info: %s", text_for_original_info);
@@ -2718,7 +2751,6 @@ void _composer_add_softlink_to_inline_images(EmailComposerUGD *ugd)
        if (ugd->existing_mail_info->mail_data->body_download_status && ugd->existing_mail_info->mail_data->attachment_count > 0) {
 
                for (i = 0; i < ugd->existing_mail_info->mail_data->attachment_count; i++) {
-//             while (attachment_data_list != NULL) {
                        if (ugd->existing_mail_info->attachment_list[i].inline_content_status && ugd->existing_mail_info->attachment_list[i].attachment_path)
                                /* To do: Must check attachment_temp_list->downloaded condition also.
                                Though inline content is downloaded, in db 'downloaded' flag set to 0. */
@@ -2737,8 +2769,6 @@ void _composer_add_softlink_to_inline_images(EmailComposerUGD *ugd)
                                free(softlink_path);
                                free(temp_save_name);
                        }
-
-//                     attachment_temp_list = attachment_temp_list->next;
                }
        }
 }
@@ -2759,7 +2789,6 @@ void _composer_add_attachment(EmailComposerUGD *ugd)
                        if (ugd->attachment_item_box == NULL) {
                                Evas_Object *attachment_item_box;
                                attachment_item_box = _composer_create_box(ugd->main_layout);
-                               //elm_box_pack_end(ugd->subject_box, attachment_item_box);
                                elm_object_part_content_set(ugd->c_layout, "_attachment_field", attachment_item_box);
                                ugd->attachment_item_box = attachment_item_box;
                        } else {
@@ -3002,7 +3031,8 @@ bool _composer_check_mail_is_modified(void *data)
                }
 
                if (ugd->latest_html_content && ugd->saved_html_content) {
-                       debug_log("html_content:\n%s", ugd->latest_html_content);
+                       debug_log("saved_html_content:\n%s", ugd->saved_html_content);
+                       debug_log("latest_html_content:\n%s", ugd->latest_html_content);
                        if (g_strcmp0(ugd->saved_html_content, ugd->latest_html_content) != 0) {
                                is_modified = true;
                        }
@@ -3065,7 +3095,6 @@ Evas_Object *_composer_create_sub_window(Evas_Object *parent)
        if (eo) {
                elm_win_alpha_set(eo, EINA_TRUE);
                elm_win_title_set(eo, "composer_sub_win");
-//             elm_win_borderless_set(eo, EINA_TRUE);
                elm_win_raise(eo);
                ecore_x_window_geometry_get(ecore_x_window_root_get(ecore_x_window_focus_get()), &x, &y, &w, &h);
 
@@ -3330,8 +3359,6 @@ void _composer_noti_response_cb(void *data, Evas_Object *obj, void *event_info)
                mbe = ugd->bcc_mbe;
        }
 
-//     elm_multibuttonentry_item_unselect_all(mbe);
-
        if (ugd->popup_list) {
                debug_log("popup count = %d", eina_list_count(ugd->popup_list));
                debug_log("obj: %p", obj);
@@ -3373,7 +3400,6 @@ void _composer_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
                elm_multibuttonentry_item_selected_set(item, EINA_FALSE);
        }
 
-//     elm_multibuttonentry_item_unselect_all(mbe);
        elm_object_tree_focus_allow_set(ugd->c_layout, EINA_TRUE);
 
        if (ugd->popup_list) {
@@ -3493,8 +3519,23 @@ char *_composer_get_service_fail_type(int type)
        } else if (type == EMAIL_ERROR_FAILED_BY_SECURITY_POLICY) {
                ret = _("IDS_EMAIL_POP_DOWNLOADING_ATTACHMENTS_ON_THE_MOBILE_DEVICE_IS_NOT_ALLOWED_BY_EXCHANGE_SERVER_POLICY");
                return g_strdup(ret);
+       } else if (type == EMAIL_ERROR_NETWORK_NOT_AVAILABLE) {
+               ret = N_("Network not available");
+               return g_strdup(ret);
+       } else if (type == EMAIL_ERROR_FLIGHT_MODE) {
+               ret = N_("Flight mode enabled");
+               return g_strdup(ret);
+       } else if (type == EMAIL_ERROR_NO_RESPONSE) {
+               ret = N_("No server response");
+               return g_strdup(ret);
+       } else if (type == EMAIL_ERROR_DISCONNECTED) {
+               ret = N_("Disconnected");
+               return g_strdup(ret);
+       } else if (type == EMAIL_ERROR_CONNECTION_BROKEN) {
+               ret = N_("Connection broken");
+               return g_strdup(ret);
        } else {
-               snprintf(str, sizeof(str), "%s (%d)", dgettext("sys_string", "IDS_COM_POP_INTERNAL_ERROR"), type);
+               snprintf(str, sizeof(str), "%s (%d)", dgettext("sys_string", "IDS_COM_POP_UNKNOWN_ERROR_OCCURRED"), type);
                return g_strdup(str);
        }
 }
@@ -3624,14 +3665,23 @@ void _composer_input_panel_state_changed_cb(void *data, Ecore_IMF_Context *ctx,
 
                        switch (value) {
                        case ECORE_IMF_INPUT_PANEL_STATE_HIDE: /* :1 */
+                               debug_log("Hide");
+                               elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,hidden", "");
+                               ugd->is_ime_hided = TRUE;
                                _composer_resize_body_webview(ugd, 0);
                                break;
 
                        case ECORE_IMF_INPUT_PANEL_STATE_SHOW: /* :0 */
+                               debug_log("Show");
+                               elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,shown", "");
+                               ugd->is_ime_hided = FALSE;
                                _composer_resize_body_webview(ugd, h);
                                break;
 
                        default: /* ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW :2 */
+                               debug_log("Will show");
+                               elm_object_item_signal_emit(ugd->navi_item, "elm,state,sip,shown", "");
+                               ugd->is_ime_hided = FALSE;
                                break;
                        }
                }
@@ -3726,124 +3776,3 @@ void _composer_coords_evas_to_ewk(Evas_Object *view, int evasX, int evasY, int *
        *ewkY = evasY + scrollY - viewY;
 }
 
-void _composer_set_option_tray_menu(int num, EmailComposerUGD *ugd)
-{
-       debug_log("");
-
-       Evas_Object *btn = NULL;
-
-       switch (num) {
-       case EMAIL_COMPOSER_ADD_ME_BTN : // Add me btn
-               btn = elm_button_add(ugd->cbar);
-               elm_object_style_set(btn, "naviframe_control/default");
-               evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0.5);
-               ugd->controlbar_item[EMAIL_COMPOSER_ADD_ME_BTN] = elm_toolbar_item_append(ugd->cbar, NULL, NULL, NULL, NULL);
-               elm_object_item_part_content_set(ugd->controlbar_item[EMAIL_COMPOSER_ADD_ME_BTN], "object", btn);
-               if (!ugd->me_added) {
-                       elm_object_text_set(btn, N_("Add me"));
-               } else {
-                       elm_object_text_set(btn, N_("Remove me"));
-               }
-               ugd->add_me_btn = btn;
-               evas_object_smart_callback_add(ugd->add_me_btn, "clicked", _composer_cbar_add_me_clicked, ugd);
-       break;
-       case EMAIL_COMPOSER_ADD_CC_BCC_BTN : // Add Cc/Bcc btn
-               btn = elm_button_add(ugd->cbar);
-               elm_object_style_set(btn, "naviframe_control/default");
-               evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0.5);
-               ugd->controlbar_item[EMAIL_COMPOSER_ADD_CC_BCC_BTN] = elm_toolbar_item_append(ugd->cbar, NULL, NULL, NULL, NULL);
-               elm_object_item_part_content_set(ugd->controlbar_item[EMAIL_COMPOSER_ADD_CC_BCC_BTN], "object", btn);
-               if (ugd->cc_added) {
-                       elm_object_text_set(btn, N_("Remove Cc/Bcc"));
-               } else {
-                       elm_object_text_set(btn, _("IDS_EMAIL_OPT_ADD_CC_BCC"));
-               }
-               ugd->cc_btn = btn;
-               evas_object_smart_callback_add(ugd->cc_btn, "clicked", _composer_cbar_cc_clicked, ugd);
-       break;
-       case EMAIL_COMPOSER_SAVE_AS_DRAFT_BTN : // Save as draft btn
-       {
-               Evas_Object *cbar = NULL;
-               cbar = ugd->cbar;
-               btn = elm_button_add(cbar);
-               elm_object_style_set(btn, "naviframe_control/default");
-               evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0.5);
-               ugd->controlbar_item[EMAIL_COMPOSER_SAVE_AS_DRAFT_BTN] = elm_toolbar_item_append(cbar, NULL, NULL, NULL, NULL);
-               elm_object_item_part_content_set(ugd->controlbar_item[EMAIL_COMPOSER_SAVE_AS_DRAFT_BTN], "object", btn);
-               elm_object_text_set(btn, N_("Save as draft"));
-               ugd->save_as_draft_btn = btn;
-               evas_object_smart_callback_add(ugd->save_as_draft_btn, "clicked", _composer_cbar_save_as_draft_clicked, ugd);
-       }
-       break;
-       case EMAIL_COMPOSER_PRIORITY_BTN : // Priority btn
-               btn = elm_button_add(ugd->cbar2);
-               elm_object_style_set(btn, "naviframe_control/default");
-               evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0.5);
-               ugd->controlbar_item[EMAIL_COMPOSER_PRIORITY_BTN] = elm_toolbar_item_append(ugd->cbar2, NULL, NULL, NULL, NULL);
-               elm_object_item_part_content_set(ugd->controlbar_item[EMAIL_COMPOSER_PRIORITY_BTN], "object", btn);
-               elm_object_text_set(btn, _("IDS_EMAIL_BODY_PRIORITY"));
-               ugd->priority_btn = btn;
-               evas_object_smart_callback_add(ugd->priority_btn, "clicked", _composer_cbar_priority_clicked, ugd);
-       break;
-       case EMAIL_COMPOSER_TRACKING_BTN : // Tracking btn
-               btn = elm_button_add(ugd->cbar2);
-               elm_object_style_set(btn, "naviframe_control/default");
-               evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0.5);
-               ugd->controlbar_item[EMAIL_COMPOSER_TRACKING_BTN] = elm_toolbar_item_append(ugd->cbar2, NULL, NULL, NULL, NULL);
-               elm_object_item_part_content_set(ugd->controlbar_item[EMAIL_COMPOSER_TRACKING_BTN], "object", btn);
-               elm_object_text_set(btn, N_("Tracking"));
-               ugd->tracking_btn = btn;
-               evas_object_smart_callback_add(ugd->tracking_btn, "clicked", _composer_cbar_tracking_clicked, ugd);
-       break;
-       case EMAIL_COMPOSER_DUMMY_BTN : // Dummy btn
-               ugd->dummy_btn = NULL;
-       break;
-       default : // never get here!
-               debug_log("default");
-       }
-
-       evas_object_show(btn);
-}
-
-void _composer_unset_option_tray_menu(int num, EmailComposerUGD *ugd)
-{
-       debug_log("");
-
-       elm_object_item_del(ugd->controlbar_item[num]);
-       ugd->controlbar_item[num] = NULL;
-
-       switch (num) {
-       case EMAIL_COMPOSER_ADD_ME_BTN : // Add me btn
-               evas_object_del(ugd->add_me_btn);
-               ugd->add_me_btn = NULL;
-       break;
-       case EMAIL_COMPOSER_ADD_CC_BCC_BTN : // Add Cc/Bcc btn
-               evas_object_del(ugd->cc_btn);
-               ugd->cc_btn = NULL;
-       break;
-       case EMAIL_COMPOSER_SAVE_AS_DRAFT_BTN : // Save as draft btn
-               evas_object_del(ugd->save_as_draft_btn);
-               ugd->save_as_draft_btn = NULL;
-       break;
-       case EMAIL_COMPOSER_PRIORITY_BTN : // Priority btn
-               evas_object_del(ugd->priority_btn);
-               ugd->priority_btn = NULL;
-       break;
-       case EMAIL_COMPOSER_TRACKING_BTN : // Tracking btn
-               evas_object_del(ugd->tracking_btn);
-               ugd->tracking_btn = NULL;
-       break;
-       case EMAIL_COMPOSER_DUMMY_BTN : // Dummy btn
-               evas_object_del(ugd->dummy_btn);
-               ugd->dummy_btn = NULL;
-       break;
-       default : // never get here!
-               debug_log("default");
-       }
-}
-
index 1f90457..99fa844 100755 (executable)
@@ -37,13 +37,9 @@ static void on_resume(ui_gadget_h ug, service_h data, void *priv);
 static void on_destroy(ui_gadget_h ug, service_h data, void *priv);
 static void on_message(ui_gadget_h ug, service_h msg, service_h data, void *priv);
 static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void *priv);
-#if _ENABLE_ENDKEY_
-static void on_key_event(ui_gadget_h ug, enum ug_key_event event, service_h data, void *priv);
-#endif
 
 static Evas_Object *create_fullview(Evas_Object *parent, EmailComposerUGD *ugd);
 static Evas_Object *create_frameview(Evas_Object *parent, EmailComposerUGD *ugd);
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event);
 static int _composer_check_storage_full(char *path, int mb_size);
 
 static void _composer_delete_evas_objects(EmailComposerUGD *ugd);
@@ -100,9 +96,6 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
        ops->destroy = on_destroy;
        ops->message = on_message;
        ops->event = on_event;
-#if _ENABLE_ENDKEY_
-       ops->key_event = on_key_event;
-#endif
        ops->priv = ugd;
        ops->opt = UG_OPT_INDICATOR_PORTRAIT_ONLY;      //UG_OPT_INDICATOR_ENABLE
 
@@ -151,8 +144,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h data, void *
        else
                ugd->main_layout = create_frameview(parent, ugd);
 
-       evas_object_smart_callback_add(ugd->win_main, "profile,changed", _win_profile_changed_cb, ugd);
-
        ugd->composer_type = RUN_TYPE_UNKNOWN;
        ugd->eComposerErrorType = COMPOSER_ERROR_NONE;
 
@@ -332,7 +323,6 @@ static void on_pause(ui_gadget_h ug, service_h data, void *priv)
 
        ugd = priv;
 
-       //elm_object_focus_set(ugd->cc_btn, EINA_TRUE);
        if (ugd->selected_entry == ugd->body_ewkview) {
                evas_object_focus_set(ugd->body_ewkview, EINA_FALSE);
                ugd->focus_status = COMPOSER_FOCUS_STATUS_ON_PAUSE; // focus handling
@@ -442,28 +432,61 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void *
        case UG_EVENT_LOW_BATTERY:
                break;
        case UG_EVENT_LANG_CHANGE:
+               if (ugd->navi_item) {
+                       char title_str[50] = { 0, };
+                       if (ugd->composer_type == RUN_COMPOSER_REPLY || ugd->composer_type == RUN_COMPOSER_REPLY_ALL)
+                               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_HEADER_REPLY_ABB"));
+                       else if (ugd->composer_type == RUN_COMPOSER_FORWARD)
+                               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_OPT_FORWARD"));
+                       else if (ugd->composer_type == RUN_COMPOSER_EDIT)
+                               snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", "IDS_COM_HEADER_EDIT"));
+                       else
+                               snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_BODY_NEW_EMAIL"));
+                       elm_object_item_text_set(ugd->navi_item, title_str);
+               }
+
+               if (ugd->send_btm_btn)
+                       elm_object_text_set(ugd->send_btm_btn, dgettext("sys_string", "IDS_COM_SK_SEND_ABB"));
+               if (ugd->send_btn)
+                       elm_object_text_set(ugd->send_btn, dgettext("sys_string", "IDS_COM_SK_SEND_ABB"));
+               if (ugd->subject_editfield)
+                       elm_object_part_text_set(ugd->subject_editfield, "elm.guidetext", dgettext("sys_string", "IDS_COM_BODY_SUBJECT"));
+
+               char recp_string[MAX_STR_LEN] = { 0, };
+               if (ugd->to_mbe) {
+                       snprintf(recp_string, sizeof(recp_string), "<font_size=36><color=#000000>%s%s</color></font_size>", dgettext("sys_string", "IDS_COM_BODY_TO"), ":");
+                       elm_object_text_set(ugd->to_mbe, recp_string);
+               }
+               if (ugd->cc_mbe) {
+                       snprintf(recp_string, sizeof(recp_string), "<font_size=36><color=#000000>%s%s</color></font_size>", _("IDS_EMAIL_BODY_CC"), ":");
+                       elm_object_text_set(ugd->cc_mbe, recp_string);
+               }
+               if (ugd->bcc_mbe) {
+                       snprintf(recp_string, sizeof(recp_string), "<font_size=36><color=#000000>%s%s</color></font_size>", _("IDS_EMAIL_BODY_BCC"), ":");
+                       elm_object_text_set(ugd->bcc_mbe, recp_string);
+               }
+               if (ugd->from_mbe) {
+                       snprintf(recp_string, sizeof(recp_string), "<font_size=36><color=#000000>%s%s</color></font_size>", _("IDS_EMAIL_BODY_FROM"), ":");
+                       elm_object_text_set(ugd->from_mbe, recp_string);
+               }
                break;
        case UG_EVENT_ROTATE_PORTRAIT:
                elm_layout_theme_set(ugd->main_layout, "layout", "application", "default");
-//             elm_win_indicator_mode_set(ugd->win_main, ELM_WIN_INDICATOR_SHOW);
                ugd->isHorizontal = false;
                win_main_angle = 0;
                break;
        case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
                elm_layout_theme_set(ugd->main_layout, "layout", "application", "default");
-//             elm_win_indicator_mode_set(ugd->win_main, ELM_WIN_INDICATOR_SHOW);
                ugd->isHorizontal = false;
                win_main_angle = 180;
                break;
        case UG_EVENT_ROTATE_LANDSCAPE:
                elm_layout_theme_set(ugd->main_layout, "layout", "application", "noindicator");
-//             elm_win_indicator_mode_set(ugd->win_main, ELM_WIN_INDICATOR_HIDE);
                ugd->isHorizontal = true;
                win_main_angle = 270;
                break;
        case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
                elm_layout_theme_set(ugd->main_layout, "layout", "application", "noindicator");
-//             elm_win_indicator_mode_set(ugd->win_main, ELM_WIN_INDICATOR_HIDE);
                ugd->isHorizontal = true;
                win_main_angle = 90;
                break;
@@ -487,24 +510,10 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void *
 
                if (elm_widget_scroll_freeze_get(ugd->main_scroller) > 0)
                        elm_object_scroll_freeze_pop(ugd->main_scroller);
-       }
-#ifdef _TEMPORARY_FIX_FOR_ROTATION_
-       else {
+       } else {
                if (ugd->isHorizontal)
                        ugd->temporary_fix_for_rotation = true;
        }
-#else
-       // Resize webview.
-       // (PORTRAIT) When screen is on the bottom of webview and is rotated, we cannot see the bottom of the webview anymore.
-       // The bottom of the main scroller is below the screen.
-       int nWidth, nHeight;
-       ecore_x_window_size_get(ecore_x_window_root_first_get(), &nWidth, &nHeight);
-       if (ugd->isHorizontal) { // LANDSCAPE
-               evas_object_size_hint_min_set(ugd->body_ewkview, nHeight, nWidth - COMPOSER_NAVI_HEIGHT); // screen doesn't have indicator in case of LANDSCAPRE mode
-       } else { // PORTRAIT
-               evas_object_size_hint_min_set(ugd->body_ewkview, nWidth, nHeight - COMPOSER_NAVI_HEIGHT - COMPOSER_INDI_HEIGHT);
-       }
-#endif
 
        if (ugd->popup_win) {
                elm_win_rotation_with_resize_set(ugd->popup_win, win_main_angle);
@@ -512,77 +521,7 @@ static void on_event(ui_gadget_h ug, enum ug_event event, service_h data, void *
 
        elm_win_rotation_with_resize_set(ugd->win_main, win_main_angle);
        ugd->isRotated = true;
-
-//     ugd->bringin_timer = ecore_timer_add(0.1f, _composer_bringin_cb, ugd);
-}
-
-#if _ENABLE_ENDKEY_
-static void on_key_event(ui_gadget_h ug, enum ug_key_event event, service_h data, void *priv)
-{
-       debug_log("");
-       EmailComposerUGD *ugd = priv;
-
-       if (!ug)
-               return;
-
-       if (ugd->idler_save_draft) {
-               debug_log("delete idler_save_draft");
-               ecore_idler_del(ugd->idler_save_draft);
-               ugd->idler_save_draft = NULL;
-       }
-
-       switch (event) {
-               case UG_KEY_EVENT_END:
-               {
-                       debug_log("");
-                       break;
-
-/*                     if (ugd->composer_noti) {
-                               debug_log("");
-
-                               if (ugd->composer_noti) {
-                                       elm_popup_response(ugd->composer_noti, ELM_POPUP_RESPONSE_OK);
-                               }
-                       } else if (ugd->to_box && ugd->delete_popup == false) {
-                               if (_composer_check_mail_is_modified(ugd)) {
-                                       ugd->save_drafts = 1;
-                               } else {
-                                       ugd->save_drafts = 0;
-                               }
-
-                               if (ugd->save_drafts) {
-                                       if (!ugd->composer_noti) {
-                                               ugd->composer_noti = _composer_create_noti(ugd, false, NULL, dgettext("sys_string", "IDS_COM_POP_SAVE_TO_DRAFTS_Q"), 2,
-                                                       dgettext("sys_string", "IDS_COM_SK_YES"), ELM_POPUP_RESPONSE_OK,
-                                                       dgettext("sys_string", "IDS_COM_SK_NO"), ELM_POPUP_RESPONSE_CANCEL, 1.0, _composer_save_popup_response_cb);
-                                       }
-                               } else {
-                                       if (elm_navigationbar_content_top_get(ugd->navi_bar) == elm_navigationbar_content_bottom_get(ugd->navi_bar)) {
-                                               debug_log("UG Destroy");
-                                               ug_destroy_me(ug);
-                                       } else {
-                                               debug_log("navigation pop");
-                                               elm_naviframe_item_pop(ugd->navi_bar);
-                                       }
-                               }
-                       } else {
-                               debug_log("ELSE");
-
-                               if (elm_naviframe_top_item_get(ugd->navi_bar) == elm_naviframe_bottom_item_get(ugd->navi_bar)) {
-                                       debug_log("UG Destroy");
-                                       ug_destroy_me(ug);
-                               } else {
-                                       debug_log("navigation pop");
-                                       elm_naviframe_item_pop(ugd->navi_bar);
-                               }
-                       }
-               }
-*/
-               default:
-                       break;
-       }
 }
-#endif
 
 static Evas_Object *create_fullview(Evas_Object *parent, EmailComposerUGD *ugd)
 {
@@ -612,7 +551,6 @@ static Evas_Object *create_fullview(Evas_Object *parent, EmailComposerUGD *ugd)
        evas_object_show(base);
 
        return base;
-
 }
 
 static Evas_Object *create_frameview(Evas_Object *parent, EmailComposerUGD *ugd)
@@ -657,26 +595,6 @@ static int _composer_check_storage_full(char *path, int mb_size)
        return ret;
 }
 
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event)
-{
-       debug_log("");
-       if (!data) {
-               debug_log("data is NULL");
-               return;
-       }
-
-       EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-
-       const char *profile = elm_config_profile_get();
-       if (!g_strcmp0(profile, "desktop"))
-               elm_layout_theme_set(ugd->main_layout, "layout", "application", "noindicator");
-       else
-               elm_layout_theme_set(ugd->main_layout, "layout", "application", "default");
-
-       evas_object_size_hint_weight_set(ugd->main_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_show(ugd->main_layout);
-}
-
 /* Temporary folder /tmp/email is created when composer is launched. */
 int _composer_create_temp_folder()
 {
@@ -811,7 +729,6 @@ void create_composer_frame(EmailComposerUGD *ugd)
 
        Evas_Object *win;
 
-       Evas_Object *cbar;
        Evas_Object *cancel_btn;
        Evas_Object *more_btn;
        Evas_Object *send_btn;
@@ -847,67 +764,58 @@ void create_composer_frame(EmailComposerUGD *ugd)
                snprintf(title_str, sizeof(title_str), "%s", dgettext("sys_string", "IDS_COM_HEADER_EDIT"));
        else
                snprintf(title_str, sizeof(title_str), "%s", _("IDS_EMAIL_BODY_NEW_EMAIL"));
-       ugd->navi_item = elm_naviframe_item_push(ugd->navi_bar, title_str, NULL, NULL, outer_layout, "2line");
+
+       // Bottom Back Button
+       Evas_Object *cancel_btm_btn = NULL;
+       cancel_btm_btn = elm_button_add(ugd->navi_bar);
+       elm_object_style_set(cancel_btm_btn, "naviframe/end_btn/default");
+       evas_object_smart_callback_add(cancel_btm_btn, "clicked", _composer_back_button_cb, ugd);
+       ugd->cancel_btm_btn = cancel_btm_btn;
+       debug_log("cancel_btm_btn of composer: %p", ugd->cancel_btm_btn);
+
+       ugd->navi_item = elm_naviframe_item_push(ugd->navi_bar, title_str, cancel_btm_btn, NULL, outer_layout, NULL);
 
        // Right : cancel button
        cancel_btn = elm_button_add(ugd->navi_bar);
-       elm_object_style_set(cancel_btn, "naviframe/title/default");
-       elm_object_text_set(cancel_btn, dgettext("sys_string", "IDS_COM_SK_CANCEL"));
-       elm_object_item_part_content_set(ugd->navi_item, "title_right_btn", cancel_btn);
+       elm_object_style_set(cancel_btn, "naviframe/back_btn/default");
+       elm_object_item_part_content_set(ugd->navi_item, "title_prev_btn", cancel_btn);
        evas_object_smart_callback_add(cancel_btn, "clicked", _composer_back_button_cb, ugd);
        ugd->cancel_btn = cancel_btn;
        debug_log("cancel_btn of composer: %p", ugd->cancel_btn);
-       //elm_object_disabled_set(ugd->cancel_btn, EINA_TRUE); // It prevents clicking the cancel button before initializing.
 
        // Middle : more button
        more_btn = elm_button_add(ugd->navi_bar);
        elm_object_style_set(more_btn, "naviframe/more/default");
        elm_object_focus_allow_set(more_btn, EINA_FALSE);
        elm_object_item_part_content_set(ugd->navi_item, "title_more_btn", more_btn);
-       evas_object_smart_callback_add(more_btn, "clicked", _composer_more_button_cb, ugd);
+       evas_object_smart_callback_add(more_btn, "clicked", _composer_more_toolbar_button_cb, ugd);
+
+       Evas_Object *more_btm_btn = elm_button_add(ugd->navi_bar);
+       elm_object_style_set(more_btm_btn, "naviframe/more/default");
+       elm_object_focus_allow_set(more_btm_btn, EINA_FALSE);
+       elm_object_item_part_content_set(ugd->navi_item, "toolbar_more_btn", more_btm_btn);
+       evas_object_smart_callback_add(more_btm_btn, "clicked", _composer_more_toolbar_button_cb, ugd);
+
+       Evas_Object *send_btm_btn = elm_button_add(ugd->navi_bar);
+       elm_object_style_set(send_btm_btn, "naviframe/toolbar/default");
+       elm_object_text_set(send_btm_btn, dgettext("sys_string", "IDS_COM_SK_SEND_ABB"));
+       elm_object_item_part_content_set(ugd->navi_item, "toolbar_button1", send_btm_btn);
+       evas_object_smart_callback_add(send_btm_btn, "clicked", _composer_cbar_send_clicked, ugd);
+       ugd->send_btm_btn = send_btm_btn;
 
        // Left : send button
        send_btn = elm_button_add(ugd->navi_bar);
-       elm_object_style_set(send_btn, "naviframe/title/default");
+       elm_object_style_set(send_btn, "naviframe/toolbar/default");
        elm_object_text_set(send_btn, dgettext("sys_string", "IDS_COM_SK_SEND_ABB"));
-       elm_object_item_part_content_set(ugd->navi_item, "title_left_btn", send_btn);
+       elm_object_item_part_content_set(ugd->navi_item, "title_toolbar_button1", send_btn);
        evas_object_smart_callback_add(send_btn, "clicked", _composer_cbar_send_clicked, ugd);
        ugd->send_btn = send_btn;
 
-       /* upper control bar - at ELM_NAVIFRAME_ITEM_OPTIONHEADER */
-       cbar = elm_toolbar_add(ugd->navi_bar);
-       if (cbar == NULL)
-               return;
-
-       elm_toolbar_shrink_mode_set(cbar, ELM_TOOLBAR_SHRINK_EXPAND);
-       elm_object_style_set(cbar, "naviframe");
-       evas_object_show(cbar);
-       ugd->cbar = cbar;
-
-       cbar = elm_toolbar_add(ugd->navi_bar);
-       if (cbar == NULL)
-               return;
-
-       elm_toolbar_shrink_mode_set(cbar, ELM_TOOLBAR_SHRINK_EXPAND);
-       elm_object_style_set(cbar, "naviframe");
-       evas_object_show(cbar);
-       ugd->cbar2 = cbar;
-
-       int i = 0;
-       for (i = EMAIL_COMPOSER_ADD_ME_BTN; i < EMAIL_COMPOSER_BTN_MAX; i++) {
-               _composer_set_option_tray_menu(i, ugd);
-       }
-       ugd->option_header_opened = 0;
-
-       elm_object_item_part_content_set(ugd->navi_item, "optionheader", ugd->cbar);
-       elm_object_item_part_content_set(ugd->navi_item, "optionheader2", ugd->cbar2);
-       elm_object_item_signal_emit(ugd->navi_item, "elm,state,optionheader,close", "");
-       elm_object_item_signal_emit(ugd->navi_item, "elm,state,optionheader,close", "");
-
        _composer_register_scroller_callback(ugd);
 
        if (_composer_check_recipient_is_empty(ugd)) {
                elm_object_disabled_set(ugd->send_btn, EINA_TRUE);
+               elm_object_disabled_set(ugd->send_btm_btn, EINA_TRUE);
                ugd->bSendBtnDisabled = true;
        }
 
@@ -984,6 +892,7 @@ static void _composer_init_data(void *data)
        ugd->idler_show_progress = NULL;
        ugd->bSendBtnDisabled = false;
        ugd->is_hided = false;
+       ugd->is_ime_hided = TRUE;
 
        ugd->composer_noti = NULL;
        ugd->timeout_noti = NULL;
@@ -1324,8 +1233,6 @@ static void _composer_popup_warning(EmailComposerUGD *ugd, char *header, char *c
        if (!pu)
                return;
 
-//     elm_popup_mode_set(pu, ELM_POPUP_TYPE_NONE);
-
        if (header) {
                elm_object_part_text_set(pu, "title,text", header);
        }
@@ -1485,6 +1392,7 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data)
 
                if (ugd->composer_type == RUN_COMPOSER_EXTERNAL) {
                        if (operation == NULL) {        /* ug called by ug_create */
+                               debug_log("ug called by ug_create");
                                ret = service_get_extra_data(data, EMAIL_BUNDLE_KEY_TO, (char **)&argv[1]);
                                debug_log("service_get_extra_data: %d", ret);
                                debug_log("to:%s", argv[1]);
@@ -1501,6 +1409,7 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data)
                                debug_log("service_get_extra_data: %d", ret);
                                debug_log("body:%s", argv[5]);
                        } else {        /* ug called by appcontrol request */
+                               debug_log("ug called by appcontrol request");
                                ret = service_get_extra_data(data, SERVICE_DATA_TO, (char **)&argv[1]);
                                debug_log("service_get_extra_data: %d", ret);
                                debug_log("to:%s", argv[1]);
@@ -1582,7 +1491,6 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data)
 
                if (ugd->composer_type == RUN_COMPOSER_EDIT) {
                        debug_log("Change state to READ");
-//                     email_modify_seen_flag(&ugd->mail_info->mail_id, 1, 1, 0);
                        email_set_flags_field(ugd->account_info->account_id, &ugd->nExistingMailID, 1, EMAIL_FLAGS_SEEN_FIELD, 1, 1);
                }
 
@@ -1596,9 +1504,11 @@ static int _composer_pre_parse_bundle(EmailComposerUGD *ugd, service_h data)
 
        } else {
                if (operation == NULL) {        /* ug called by ug_create */
+                       debug_log("ug called by ug_create");
                        debug_log("Invaild argument!!");
                        return COMPOSER_ERROR_INVALID_ARG;
                } else {        /* ug called by appcontrol request */
+                       debug_log("ug called by appcontrol request");
 
                        /* default run type: RUN_COMPOSER_EXTERNAL */
                        ugd->composer_type = RUN_COMPOSER_EXTERNAL;
@@ -1673,6 +1583,8 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data)
 
                if (argv[0] != NULL) {
                        Eina_List *list = NULL;
+                       char tmp_file_path[MAX_PATH_LEN + 1] = { 0, };
+                       char *file_ext = NULL;
 
                        debug_log("str = %s", argv[0]);
 
@@ -1685,7 +1597,16 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data)
                                        ugd->composer_noti = _composer_create_noti(ugd, false, dgettext("sys_string", "IDS_COM_POP_WARNING"),
                                                _("IDS_EMAIL_POP_UNABLE_TO_FORWARD_DRM_CONTENTS"), 0, NULL, NULL, 2.0, _composer_noti_response_cb);
                                } else {
-                                       list = eina_list_append(list, argv[0]);
+                                       file_ext = _composer_get_file_ext(argv[0]);
+                                       debug_log("file_ext:%s", file_ext);
+
+                                       if (strcasecmp(file_ext, "vcf") == 0 || strcasecmp(file_ext, "vcs") == 0) {
+                                               if (_composer_copy_temp_file(argv[0], tmp_file_path, MAX_PATH_LEN))
+                                                       list = eina_list_append(list, tmp_file_path);
+                                               else
+                                                       list = eina_list_append(list, argv[0]);
+                                       } else
+                                               list = eina_list_append(list, argv[0]);
                                }
                        } else {
                                vector = g_strsplit_set(argv[0], ";\n", -1);
@@ -1713,7 +1634,16 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data)
 
                                                        g_free(item_str);
                                                } else {
-                                                       list = eina_list_append(list, item_str);
+                                                       file_ext = _composer_get_file_ext(item_str);
+                                                       debug_log("file_ext:%s", file_ext);
+
+                                                       if (strcasecmp(file_ext, "vcf") == 0 || strcasecmp(file_ext, "vcs") == 0) {
+                                                               if (_composer_copy_temp_file(item_str, tmp_file_path, MAX_PATH_LEN))
+                                                                       list = eina_list_append(list, tmp_file_path);
+                                                               else
+                                                                       list = eina_list_append(list, item_str);
+                                                       } else
+                                                               list = eina_list_append(list, item_str);
                                                }
                                        } else {
                                                g_free(item_str);
@@ -1754,9 +1684,6 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data)
                                ugd->selected_entry = ugd->body_ewkview;
                                if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_SET_FOCUS, _composer_focus_script_executed_cb, ugd) == EINA_FALSE)
                                        debug_log("COMPOSER_JS_SET_FOCUS error.");
-
-                               /* Known Issue: Sometimes long mails are not rendered properly in webkit when we bring up the composer */
-                               //ugd->bringin_timer = ecore_timer_add(0.1f, _composer_bringin_cb, ugd);
                        }
                } else {
                        debug_log("To field is empty, setting focus to 'To' field.");
@@ -1764,8 +1691,6 @@ static void _composer_post_parse_bundle(EmailComposerUGD *ugd, service_h data)
                                if (!_composer_check_popup_exist(ugd))
                                        ugd->focus_timer = ecore_timer_add(0.2f, _composer_set_object_focus, ugd->to_mbe);
                        }
-
-                       /*ugd->selected_entry = ugd->to_mbe_entry;*/
                }
        }
 }
@@ -1805,25 +1730,6 @@ static void _composer_main_scroller_reach_top_cb(void *data, Evas_Object *obj, v
 
        if (ugd->ps_list)
                return;
-/*
-       if (ugd->account_info->account_count > 1) {
-               if (ugd->from_box) {
-                       debug_log("from field is hidden, show");
-                       evas_object_show(ugd->from_ly);
-                       evas_object_show(ugd->from_box);
-                       evas_object_show(ugd->from_mbe);
-                       elm_object_part_content_set(ugd->c_layout, "from_field", ugd->from_box);
-                       edje_object_signal_emit(_EDJ(ugd->c_layout), "show.from", "from");
-               } else {
-                       debug_log("from field is not created, create");
-                       _composer_create_from_field(ugd);
-                       elm_object_part_content_set(ugd->c_layout, "from_field", ugd->from_box);
-                       edje_object_signal_emit(_EDJ(ugd->c_layout), "show.from", "from");
-
-                       _composer_add_from_address(ugd);
-               }
-       }
-*/
 }
 
 static void _composer_main_scroller_reach_bottom_cb(void *data, Evas_Object *obj, void *event_info)
@@ -1831,18 +1737,6 @@ static void _composer_main_scroller_reach_bottom_cb(void *data, Evas_Object *obj
        debug_log("");
 
        EmailComposerUGD *ugd = (EmailComposerUGD *)data;
-/*
-       if (ugd->account_info->account_count > 1) {
-               if (ugd->from_box) {
-                       debug_log("from field is shown, hide");
-                       evas_object_hide(ugd->from_ly);
-                       evas_object_hide(ugd->from_box);
-                       evas_object_hide(ugd->from_mbe);
-                       elm_object_part_content_unset(ugd->c_layout, "from_field");
-                       edje_object_signal_emit(_EDJ(ugd->c_layout), "hide.from", "from");
-               }
-       }
-*/
 
        // It's workaround fixes to avoid a problem regarding too many signals of 'edge,bottom' for main_scroller.
        if (ugd->is_main_scroller_scrolling) {
index a97602f..bfcfcdb 100755 (executable)
                scale: 1; \
                description { \
                        state: "default" 0.0; \
+                       fixed: 1 1; \
                        rel1 { relative: 0.0 0.0; to: pTo; } \
                        rel2 { relative: 1.0 1.0; to: pTo; } \
                } \
diff --git a/images/M02_email_icon_favorite_off.png b/images/M02_email_icon_favorite_off.png
deleted file mode 100755 (executable)
index 7986bbe..0000000
Binary files a/images/M02_email_icon_favorite_off.png and /dev/null differ
diff --git a/images/M02_email_icon_favorite_on.png b/images/M02_email_icon_favorite_on.png
deleted file mode 100755 (executable)
index 48f4573..0000000
Binary files a/images/M02_email_icon_favorite_on.png and /dev/null differ
index 3788ce8..4acd2e7 100755 (executable)
@@ -42,7 +42,6 @@ extern Elm_Object_Item *g_selected_item;
  * Function prototype declaration
  */
 static void _create_view(EmailMailboxUGD *mailbox_ugd);
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event);
 static void _title_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _change_unread_icon_to_read_icon(Elm_Object_Item *item);
 static void _create_all_emails_view(Evas_Object *parent, EmailMailboxUGD *mailbox_ugd);
@@ -1486,8 +1485,6 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
 
        elm_win_indicator_mode_set(win, ELM_WIN_INDICATOR_SHOW);
 
-       evas_object_smart_callback_add(mailbox_ugd->win_main, "profile,changed", _win_profile_changed_cb, mailbox_ugd);
-
        panes = elm_panes_add(layout);
        evas_object_size_hint_weight_set(panes, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(panes, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1603,26 +1600,6 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
        evas_object_show(mailbox_ugd->ly);
 }
 
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event)
-{
-       debug_log("");
-       if (!data) {
-               debug_log("data is NULL");
-               return;
-       }
-
-       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
-
-       const char *profile = elm_config_profile_get();
-       if (!g_strcmp0(profile, "desktop"))
-               elm_layout_theme_set(mailbox_ugd->layout_main, "layout", "application", "noindicator");
-       else
-               elm_layout_theme_set(mailbox_ugd->layout_main, "layout", "application", "default");
-
-       evas_object_size_hint_weight_set(mailbox_ugd->layout_main, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_show(mailbox_ugd->layout_main);
-}
-
 static void _title_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        debug_log("");
index b22cea3..12895b3 100755 (executable)
@@ -55,7 +55,7 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 INSTALL(FILES ${CMAKE_EMAIL_BINARY_DIR}/${PKGNAME}.xml DESTINATION ${SHAREDIR}/packages)
 
 #install account xml
-INSTALL(FILES ${CMAKE_EMAIL_BINARY_DIR}/${PKGNAME}.account.xml DESTINATION /opt/usr/share/account)
+INSTALL(FILES ${CMAKE_EMAIL_BINARY_DIR}/email-setting-efl.account.xml DESTINATION /opt/usr/share/account)
 
 # install ini file
 INSTALL(FILES ${CMAKE_EMAIL_SOURCE_DIR}/${PROJECT_NAME}.ini DESTINATION ${SHAREDIR}/process-info)
@@ -65,4 +65,5 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ${SHAREDIR}/license/${PKGN
 
 # install image files
 INSTALL(FILES ${CMAKE_EMAIL_SOURCE_DIR}/${PKGNAME}.png DESTINATION ${ICONDIR})
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/images DESTINATION ${RESDIR} FILES_MATCHING PATTERN "*.png")
\ No newline at end of file
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/images DESTINATION ${RESDIR} FILES_MATCHING PATTERN "*.png")
+
index aaee93b..7887cf3 100755 (executable)
@@ -326,13 +326,15 @@ static bool app_create(void *data)
        elm_win_resize_object_add(ad->win_main, ad->conform);
        evas_object_show(ad->conform);
 
-       /*key_down_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _email_ui_keydown_cb, ad);*/
-
        UG_INIT_EFL(ad->win_main, UG_OPT_INDICATOR_ENABLE);
 
+       email_icu_mutex_init();
        /* icu */
        email_open_icu_pattern_generator();
 
+       //Register timezone changed callback
+       email_register_timezone_changed_callback(_email_timezone_change_cb, NULL);
+
        return true;
 }
 
@@ -342,6 +344,10 @@ static int app_terminate(void *data)
 
        set_app_terminated();
 
+       email_deregister_timezone_changed_callback(_email_timezone_change_cb);
+
+       email_icu_mutex_destroy();
+
        email_engine_finalize_force();
 
        int ret = e_dbus_shutdown();
@@ -398,12 +404,6 @@ static int app_reset(service_h b, void *data)
 
                elm_object_content_set(popup, progress);
 
-               /*Evas_Object *btn1 = elm_button_add(popup);
-               elm_object_style_set(btn1, "popup_button/default");
-               elm_object_text_set(btn1, dgettext("sys_string", "IDS_COM_SK_OK"));
-               elm_object_part_content_set(popup, "button1", btn1);
-               evas_object_smart_callback_add(btn1, "clicked", popup_block_clicked_cb, NULL);*/
-
                evas_object_smart_callback_add(popup, "block,clicked", popup_block_clicked_cb, NULL);
                evas_object_smart_callback_add(popup, "timeout", popup_response_cb, NULL);
                evas_object_show(popup);
index 05473cc..ee68cdd 100755 (executable)
@@ -57,6 +57,7 @@
                <label xml:lang="uk-ua">Email</label>
                <label xml:lang="uz-uz">E-pochta</label>
                <label xml:lang="zh-sg">电邮</label>
+               <label xml:lang="es-mx">Correo</label>
        </ui-application>
        <ui-application appid="email-composer-efl" exec="/usr/ug/bin/email-composer-efl" nodisplay="true" multiple="true" type="capp" taskmanage="false">
                <label>Email</label>
                <label xml:lang="uk-ua">Email</label>
                <label xml:lang="uz-uz">E-pochta</label>
                <label xml:lang="zh-sg">电邮</label>
+               <label xml:lang="es-mx">Correo</label>
                <application-service>
                        <operation name="http://tizen.org/appcontrol/operation/send"/>
                        <mime name="*/*"/>
index d1723e1..4ba7199 100755 (executable)
@@ -1,6 +1,6 @@
 # for i18n
 
-SET(POFILES en.po nl_NL.po de_DE.po zh_HK.po zh_CN.po ru_RU.po ko_KR.po zh_TW.po ja_JP.po es_ES.po el_GR.po it_IT.po tr_TR.po pt_PT.po fr_FR.po ar.po bg.po ca.po cs.po da.po en_US.po fi.po hi.po hr.po hu.po lt.po lv.po pl.po ro.po sk.po sl.po sr.po sv.po uk.po az.po en_PH.po es_US.po et.po eu.po fr_CA.po ga.po gl.po hy.po is.po ka.po kk.po mk.po pt_BR.po zh_SG.po nb.po uz.po)
+SET(POFILES en.po nl_NL.po de_DE.po zh_HK.po zh_CN.po ru_RU.po ko_KR.po zh_TW.po ja_JP.po es_ES.po el_GR.po it_IT.po tr_TR.po pt_PT.po fr_FR.po ar.po bg.po ca.po cs.po da.po en_US.po fi.po hi.po hr.po hu.po lt.po lv.po pl.po ro.po sk.po sl.po sr.po sv.po uk.po az.po en_PH.po es_US.po et.po eu.po fr_CA.po ga.po gl.po hy.po is.po ka.po kk.po mk.po pt_BR.po zh_SG.po nb.po uz.po es_MX.po)
 #he.po id.po ms.po no.po th.po vi.po
 
 SET(MSGFMT "/usr/bin/msgfmt")
index a33008b..062b874 100755 (executable)
--- a/po/ar.po
+++ b/po/ar.po
@@ -1642,3 +1642,24 @@ msgstr "رسالة البريد الإلكتروني المجدولة"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "عرض الصور"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "إرفاق ملفات"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "التتبع"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 قبل SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "مصادقة SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "طلب تقرير القراءة"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "تعرف على النقر المزدوج"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index c1df147..894412a 100755 (executable)
--- a/po/az.po
+++ b/po/az.po
@@ -1642,3 +1642,24 @@ msgstr "Planlaşdırılmış e-poçt"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Şəkil göstərlsn"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Fayllar əlavə et"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "İzləmə"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "SMTP əvvəl POP3"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP əsilliyinin yoxlanılması"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Hesabatları oxumağı sorğula"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "İki dəfə vurma haqqında öyrənin"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index f9fca32..9f7ceb2 100755 (executable)
--- a/po/bg.po
+++ b/po/bg.po
@@ -1642,3 +1642,24 @@ msgstr "Планиран имейл"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Покажи изображ."
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Прикачване на файлове"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Проследяване"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 преди SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP удостоверяване"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Изискване отчети за четене"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Научете за двукратното чукване"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 1807d89..8fec74f 100755 (executable)
--- a/po/ca.po
+++ b/po/ca.po
@@ -1642,3 +1642,24 @@ msgstr "Correu electrònic programat"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Veure imatge"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Adjuntar fitxers"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Rastrejant"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 abans de SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Autenticació SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Sol·licitar informes de lectura"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Més info sobre doble toc"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 7d77b11..4d4b034 100755 (executable)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1642,3 +1642,24 @@ msgstr "Naplánovaný e-mail"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Zobr. obrázek"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Připojit soubory"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Sledování"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "Služba POP3 před SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Ověření SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Požadovat zprávy o přečtení"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Informace o poklepání"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 41dfa6b..22870cf 100755 (executable)
--- a/po/da.po
+++ b/po/da.po
@@ -236,7 +236,7 @@ msgid "IDS_EMAIL_OPT_RECIPIENT_HZ_TO_A"
 msgstr "Modtager (Z til A)"
 
 msgid "IDS_EMAIL_BODY_FLICK_UP_TO_SEARCH_ON_SERVER"
-msgstr "Stryg op for at søge på server"
+msgstr "Vip op for at søge på server"
 
 msgid "IDS_EMAIL_BODY_RECENT_EMAILS"
 msgstr "Nyeste e-mails"
@@ -1274,7 +1274,7 @@ msgid "IDS_EMAIL_OPT_DELETE_FROM_CALENDAR"
 msgstr "Slet fra kalender"
 
 msgid "IDS_EMAIL_BODY_FLICK_UP_TO_SEARCH_ON_SERVER_AGAIN"
-msgstr "Stryg op for at søge på server igen"
+msgstr "Vip op for at søge på server igen"
 
 msgid "IDS_EMAIL_BODY_HIGH_M_PRIORITY"
 msgstr "Høj"
@@ -1642,3 +1642,24 @@ msgstr "Planlagt e-mail"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Vis billede"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Vedhæft filer"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Sporer"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 før SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP-godkendelse"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Anmod om læserapporter"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Lær om dobbelttryk"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 4c439e0..55a4f05 100755 (executable)
@@ -125,7 +125,7 @@ msgid "IDS_EMAIL_HEADER_ADD_ACCOUNT"
 msgstr "Konto hinzufügen"
 
 msgid "IDS_EMAIL_BODY_DEFAULT_SENDING_ACCOUNT"
-msgstr "Standardkonto – Senden"
+msgstr "Standardkonto ??Senden"
 
 msgid "IDS_EMAIL_OPT_CALENDAR"
 msgstr "Kalender"
@@ -1190,7 +1190,7 @@ msgid "IDS_EMAIL_POP_YOU_CAN_ONLY_LOG_IN_ONCE_EVERY_PD_MINUTES"
 msgstr "Sie können sich nur einmal alle %d Minuten anmelden."
 
 msgid "IDS_EMAIL_HEADER_DEFAULT_SENDING_ACCOUNT"
-msgstr "Standardkonto – Senden"
+msgstr "Standardkonto ??Senden"
 
 msgid "IDS_EMAIL_BODY_DO_NOT_MATCH_FOLDER_WITH_SERVER"
 msgstr "Gleichen Sie den Ordner nicht mit dem Server ab"
@@ -1642,3 +1642,24 @@ msgstr "Geplante E-Mail"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Bild anzeigen"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Dateien anhängen"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Orte"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 vor SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP-Authentifizierung"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Leseberichte anfordern"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Was ist Zweimal tippen?"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 2e00d45..97a692e 100755 (executable)
@@ -128,7 +128,7 @@ msgid "IDS_EMAIL_BODY_DEFAULT_SENDING_ACCOUNT"
 msgstr "Προεπιλεγμένος λογαριασμός αποστολής"
 
 msgid "IDS_EMAIL_OPT_CALENDAR"
-msgstr "Ημερ/γιο"
+msgstr "Ημερολόγιο"
 
 msgid "IDS_EMAIL_OPT_MEMO"
 msgstr "Σημείωση"
@@ -1642,3 +1642,24 @@ msgstr "Προγρ/σμένο email"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Προβολή εικόνας"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Επισύναψη αρχείων"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Εντοπισμός"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 πριν από SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Έλεγχος ταυτότητας SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Να ζητούνται αναφορές ανάγνωσης"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Μάθετε για το διπλό πάτημα"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 31c8905..d8a5733 100755 (executable)
--- a/po/en.po
+++ b/po/en.po
@@ -794,7 +794,7 @@ msgid "IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS"
 msgstr "Invalid email address"
 
 msgid "IDS_EMAIL_POP_LOADING_CONTENTS_ING"
-msgstr "Loading contents..."
+msgstr "Loading content..."
 
 msgid "IDS_EMAIL_POP_MAXIMUM_NUMBER_OF_ATTACHMENTS_REACHED"
 msgstr "Maximum number of attachments reached"
@@ -1642,3 +1642,24 @@ msgstr "Scheduled email"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "View image"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Attach files"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Tracking"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 before SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP authentication"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Request read reports"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Learn about double tap"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index d1533e3..37daecb 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "Scheduled Email"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "View image"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Attach files"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Tracking"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 before SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP authentication"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Request read reports"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Learn about double tap"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 660e1b7..3973dfc 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "Scheduled email"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "View image"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Attach files"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Tracking"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 before SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP authentication"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Request read reports"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Learn about double tap"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index f15474f..19b987e 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "Correo electrónico programado"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Ver imagen"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Adjuntar archivos"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Rastreando"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 antes de SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Autenticación SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Solicitar informes de lectura"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Más información sobre doble toque"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
diff --git a/po/es_MX.po b/po/es_MX.po
new file mode 100755 (executable)
index 0000000..cea19f0
--- /dev/null
@@ -0,0 +1,1665 @@
+msgid "IDS_EMAIL_BODY_IMAP4_PORT"
+msgstr "Puerto IMAP4"
+
+msgid "IDS_EMAIL_BODY_GENERAL_SETTINGS"
+msgstr "Configuración general  "
+
+msgid "IDS_EMAIL_HEADER_ACCOUNT_SETTINGS"
+msgstr "Configuración de cuenta"
+
+msgid "IDS_EMAIL_OPT_BLOCK"
+msgstr "Bloquear"
+
+msgid "IDS_EMAIL_OPT_MARK_AS_READ"
+msgstr "Marcar como leído"
+
+msgid "IDS_EMAIL_OPT_MARK_AS_UNREAD"
+msgstr "Marcar como no leído"
+
+msgid "IDS_EMAIL_SK_COMPOSE"
+msgstr "Crear"
+
+msgid "IDS_EMAIL_BODY_IMAP4_SERVER"
+msgstr "Servidor IMAP4"
+
+msgid "IDS_EMAIL_BODY_PD_EMAILS"
+msgstr "%d correos "
+
+msgid "IDS_EMAIL_BODY_SAVED_IN_PS"
+msgstr "Guardado en %s"
+
+msgid "IDS_EMAIL_BODY_ADD_SIGNATURE"
+msgstr "Añadir firma"
+
+msgid "IDS_EMAIL_BODY_ALWAYS_BCC_MYSELF"
+msgstr "Copiarme siempre en CCO"
+
+msgid "IDS_EMAIL_BODY_BCC"
+msgstr "CCO"
+
+msgid "IDS_EMAIL_BODY_BLOCK_EMAILS"
+msgstr "Bloquear correos "
+
+msgid "IDS_EMAIL_BODY_CC"
+msgstr "CC"
+
+msgid "IDS_EMAIL_BODY_DRAFTS"
+msgstr "Borrador"
+
+msgid "IDS_EMAIL_BODY_ENTIRE_EMAIL"
+msgstr "Correo completo"
+
+msgid "IDS_EMAIL_BODY_INBOX"
+msgstr "Buzón de entrada"
+
+msgid "IDS_EMAIL_BODY_RECEIVING_OPTIONS"
+msgstr "Opciones de recepción"
+
+msgid "IDS_EMAIL_BODY_SENDING_OPTIONS"
+msgstr "Opciones de envío"
+
+msgid "IDS_EMAIL_BODY_SENTBOX"
+msgstr "Enviados"
+
+msgid "IDS_EMAIL_BODY_SIGNATURE"
+msgstr "Firma"
+
+msgid "IDS_EMAIL_BODY_SPAMBOX"
+msgstr "Spam"
+
+msgid "IDS_EMAIL_OPT_SENDER"
+msgstr "Remitente"
+
+msgid "IDS_EMAIL_OPT_SEND_EMAIL"
+msgstr "Enviar correo"
+
+msgid "IDS_EMAIL_BODY_ACCEPT_ALL_SSL_CERTIFICATES"
+msgstr "Aceptar todos los certificados de SSL"
+
+msgid "IDS_EMAIL_BODY_FROM"
+msgstr "De"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_CALENDAR"
+msgstr "Añadir a calendario"
+
+msgid "IDS_EMAIL_OPT_CHANGE_EMAIL_ADDRESS_ABB"
+msgstr "Cambiar dirección de correo"
+
+msgid "IDS_EMAIL_BODY_SSL"
+msgstr "SSL"
+
+msgid "IDS_EMAIL_BODY_POP3"
+msgstr "POP3"
+
+msgid "IDS_EMAIL_BODY_IMAP4"
+msgstr "IMAP4"
+
+msgid "IDS_EMAIL_OPT_SECURITY"
+msgstr "Seguridad"
+
+msgid "IDS_EMAIL_OPT_SIGN"
+msgstr "Firma"
+
+msgid "IDS_EMAIL_OPT_ENCRYPT"
+msgstr "Encriptar"
+
+msgid "IDS_EMAIL_BODY_YOU_CAN_USE_EMAIL_ON_YOUR_DEVICE_BY_ADDING_YOUR_ACCOUNT_IF_YOU_DO_NOT_HAVE_AN_EMAIL_ACCOUNT_SIGN_UP_FIRST"
+msgstr "Puede usar el correo en su dispositivo si agrega su cuenta. Si no tiene una cuenta de correo, primero regístrese."
+
+msgid "IDS_EMAIL_BODY_AOL"
+msgstr "AOL"
+
+msgid "IDS_EMAIL_OPT_ADD_ACCOUNTS"
+msgstr "Añadir cuentas"
+
+msgid "IDS_EMAIL_HEADER_BLOCK_EMAILS"
+msgstr "Bloquear correos "
+
+msgid "IDS_EMAIL_HEADER_DELETE"
+msgstr "Eliminar"
+
+msgid "IDS_EMAIL_HEADER_EMAIL"
+msgstr "Correo"
+
+msgid "IDS_EMAIL_HEADER_ADD_ACCOUNT"
+msgstr "Añadir cuenta"
+
+msgid "IDS_EMAIL_BODY_DEFAULT_SENDING_ACCOUNT"
+msgstr "Cuenta de envío predeterminada"
+
+msgid "IDS_EMAIL_OPT_CALENDAR"
+msgstr "Calendario"
+
+msgid "IDS_EMAIL_OPT_MEMO"
+msgstr "Notas"
+
+msgid "IDS_EMAIL_OPT_TINY_M_TEXTSIZE"
+msgstr "Diminuto"
+
+msgid "IDS_EMAIL_OPT_SMALL_M_TEXTSIZE"
+msgstr "Pequeño"
+
+msgid "IDS_EMAIL_OPT_NORMAL_M_TEXTSIZE"
+msgstr "Normal"
+
+msgid "IDS_EMAIL_OPT_LARGE_M_TEXTSIZE"
+msgstr "Grande"
+
+msgid "IDS_EMAIL_OPT_HUGE_M_TEXTSIZE"
+msgstr "Enorme"
+
+msgid "IDS_EMAIL_BODY_ALWAYS_CC_BCC_MYSELF"
+msgstr "Enviarme siempre en copia oculta/visible"
+
+msgid "IDS_EMAIL_BODY_ALWAYS_CC_MYSELF"
+msgstr "Enviarme una copia siempre"
+
+msgid "IDS_EMAIL_BODY_SEND_READ_REPORT"
+msgstr "Enviar informe de lectura"
+
+msgid "IDS_EMAIL_OPT_STANDARD_VIEW"
+msgstr "Vista estándar"
+
+msgid "IDS_EMAIL_OPT_CONVERSATION_VIEW"
+msgstr "Vista de conversación"
+
+msgid "IDS_EMAIL_OPT_DATE_HMOST_RECENT"
+msgstr "Fecha (más reciente)"
+
+msgid "IDS_EMAIL_OPT_DATE_HOLDEST"
+msgstr "Fecha (más antigua)"
+
+msgid "IDS_EMAIL_OPT_SENDER_HA_TO_Z"
+msgstr "Remitente (A a la Z)"
+
+msgid "IDS_EMAIL_OPT_SENDER_HZ_TO_A"
+msgstr "Remitente (Z a la A)"
+
+msgid "IDS_EMAIL_OPT_READ_UNREAD"
+msgstr "Leídos/No leídos"
+
+msgid "IDS_EMAIL_HEADER_ALL_ACCOUNTS"
+msgstr "Todas las cuentas"
+
+msgid "IDS_EMAIL_HEADER_SELECT_EMAILS"
+msgstr "Seleccionar direcciones de correo"
+
+msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC"
+msgstr "Microsoft Exchange ActiveSync"
+
+msgid "IDS_EMAIL_HEADER_VIEW_MODE_ABB"
+msgstr "Modo de vista"
+
+msgid "IDS_EMAIL_OPT_ATTACH"
+msgstr "Adjuntar"
+
+msgid "IDS_EMAIL_OPT_PRINT"
+msgstr "Imprimir"
+
+msgid "IDS_EMAIL_OPT_GALLERY"
+msgstr "Galería"
+
+msgid "IDS_EMAIL_OPT_MY_FILES"
+msgstr "Mis Archivos"
+
+msgid "IDS_EMAIL_BODY_SHOW_IMAGES"
+msgstr "Mostrar imágenes"
+
+msgid "IDS_EMAIL_OPT_SORT_BY"
+msgstr "Ordenar por"
+
+msgid "IDS_EMAIL_OPT_FLAG"
+msgstr "Marca"
+
+msgid "IDS_EMAIL_OPT_MEETING_REQUEST"
+msgstr "Solicitud de reunión"
+
+msgid "IDS_EMAIL_OPT_ATTACHMENTS"
+msgstr "Adjuntos"
+
+msgid "IDS_EMAIL_HEADER_FOLDERS"
+msgstr "Carpetas"
+
+msgid "IDS_EMAIL_OPT_TITLE"
+msgstr "Título"
+
+msgid "IDS_EMAIL_HEADER_PD_CONVERSATIONS"
+msgstr "%d conversaciones"
+
+msgid "IDS_EMAIL_OPT_ALL"
+msgstr "Todo"
+
+msgid "IDS_EMAIL_OPT_RECIPIENT_HA_TO_Z"
+msgstr "Destinatario (A a Z)"
+
+msgid "IDS_EMAIL_OPT_RECIPIENT_HZ_TO_A"
+msgstr "Destinatario (Z a A)"
+
+msgid "IDS_EMAIL_BODY_FLICK_UP_TO_SEARCH_ON_SERVER"
+msgstr "Mover hacia arriba para buscar en el servidor"
+
+msgid "IDS_EMAIL_BODY_RECENT_EMAILS"
+msgstr "Correos recientes"
+
+msgid "IDS_EMAIL_BODY_DELETING_OPTIONS"
+msgstr "Opciones de eliminación"
+
+msgid "IDS_EMAIL_BODY_FAVOURITES"
+msgstr "Favoritos"
+
+msgid "IDS_EMAIL_OPT_FACEBOOK"
+msgstr "Facebook"
+
+msgid "IDS_EMAIL_OPT_TWITTER"
+msgstr "Twitter"
+
+msgid "IDS_EMAIL_BODY_SECURITY_OPTIONS"
+msgstr "Opciones de seguridad"
+
+msgid "IDS_EMAIL_HEADER_SECURITY_OPTIONS"
+msgstr "Opciones de seguridad"
+
+msgid "IDS_EMAIL_BODY_ENCRYPTION_ALGORITHM"
+msgstr "Algoritmo de encriptado"
+
+msgid "IDS_EMAIL_BODY_SIGN_ALGORITHM"
+msgstr "Algoritmo de firma"
+
+msgid "IDS_EMAIL_BODY_EMAIL_CERTIFICATE"
+msgstr "Certificado de correo"
+
+msgid "IDS_EMAIL_BODY_PHONE"
+msgstr "Teléfono"
+
+msgid "IDS_EMAIL_BODY_MANUAL_SETUP"
+msgstr "Configuración manual"
+
+msgid "IDS_EMAIL_BODY_SERVER"
+msgstr "Servidor"
+
+msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL"
+msgstr "Windows Live Hotmail"
+
+msgid "IDS_EMAIL_BODY_TOTAL_EMAILS"
+msgstr "Total de correos "
+
+msgid "IDS_EMAIL_BODY_HEADER_ONLY"
+msgstr "Sólo encabezado"
+
+msgid "IDS_EMAIL_BODY_FORWARD_WITH_FILES"
+msgstr "Reenviar con adjuntos"
+
+msgid "IDS_EMAIL_BODY_REPLY_WITH_BODY"
+msgstr "Incluir mensaje al responder"
+
+msgid "IDS_EMAIL_BODY_SAVE_ALL"
+msgstr "Guardar todo"
+
+msgid "IDS_EMAIL_OPT_TO_SENDER_ABB"
+msgstr "A remitente"
+
+msgid "IDS_EMAIL_OPT_TO_ALL_ABB"
+msgstr "A todos"
+
+msgid "IDS_EMAIL_OPT_ADD_CC_BCC"
+msgstr "Añadir CC/CCO"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_CC"
+msgstr "Mover a CC"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_BCC"
+msgstr "Mover a CCO"
+
+msgid "IDS_EMAIL_OPT_VIEW_CONTACT"
+msgstr "Ver contacto"
+
+msgid "IDS_EMAIL_HEADER_ATTACH_ABB"
+msgstr "Adjuntar"
+
+msgid "IDS_EMAIL_HEADER_MOVE_TO"
+msgstr "Mover a"
+
+msgid "IDS_EMAIL_HEADER_SEARCH_BY"
+msgstr "Buscar por"
+
+msgid "IDS_EMAIL_BODY_ACCOUNT"
+msgstr "Cuentas"
+
+msgid "IDS_EMAIL_BODY_B"
+msgstr "B"
+
+msgid "IDS_EMAIL_BODY_ENCRYPT"
+msgstr "Encriptar"
+
+msgid "IDS_EMAIL_BODY_BYTE"
+msgstr "Byte"
+
+msgid "IDS_EMAIL_BODY_SIGN"
+msgstr "Firma"
+
+msgid "IDS_EMAIL_BODY_GB"
+msgstr "GB"
+
+msgid "IDS_EMAIL_HEADER_SORT_BY"
+msgstr "Ordenar por"
+
+msgid "IDS_EMAIL_SK_DELETE_ALL"
+msgstr "Eliminar todo"
+
+msgid "IDS_EMAIL_BODY_INCOMING"
+msgstr "Entrantes"
+
+msgid "IDS_EMAIL_SK_MOVE"
+msgstr "Mover"
+
+msgid "IDS_EMAIL_BODY_KB"
+msgstr "KB"
+
+msgid "IDS_EMAIL_SK_BLOCK"
+msgstr "Bloquear"
+
+msgid "IDS_EMAIL_BODY_MB"
+msgstr "MB"
+
+msgid "IDS_EMAIL_SK_CREATE_FOLDER"
+msgstr "Crear carpeta"
+
+msgid "IDS_EMAIL_BODY_OUTGOING"
+msgstr "Salientes"
+
+msgid "IDS_EMAIL_OPT_RECORD_AUDIO"
+msgstr "Grabar audio"
+
+msgid "IDS_EMAIL_BODY_POP3_PORT"
+msgstr "Puerto POP3"
+
+msgid "IDS_EMAIL_HEADER_SECURITY"
+msgstr "Seguridad"
+
+msgid "IDS_EMAIL_BODY_PD_ATTACHMENTS"
+msgstr "%d adjuntos"
+
+msgid "IDS_EMAIL_BODY_YOUR_NAME"
+msgstr "Su nombre"
+
+msgid "IDS_EMAIL_BODY_SYNC_SCHEDULE"
+msgstr "Programación de sincronización"
+
+msgid "IDS_EMAIL_OPT_COPY"
+msgstr "Copiar"
+
+msgid "IDS_EMAIL_BODY_ADD_ADDRESS"
+msgstr "Añadir dirección"
+
+msgid "IDS_EMAIL_OPT_COPY_IMAGE"
+msgstr "Copiar imagen"
+
+msgid "IDS_EMAIL_OPT_CUT"
+msgstr "Cortar"
+
+msgid "IDS_EMAIL_OPT_PASTE"
+msgstr "Pegar"
+
+msgid "IDS_EMAIL_OPT_SAVE_IMAGE"
+msgstr "Guardar imagen"
+
+msgid "IDS_EMAIL_OPT_SELECT"
+msgstr "Seleccionar"
+
+msgid "IDS_EMAIL_OPT_SELECT_ALL"
+msgstr "Seleccionar todo"
+
+msgid "IDS_EMAIL_OPT_SEND_IMAGE_VIA_MESSAGING"
+msgstr "Enviar imagen mediante mensaje"
+
+msgid "IDS_EMAIL_POP_FILE_NAME_EMPTY"
+msgstr "Nombre de archivo vacío"
+
+msgid "IDS_EMAIL_POP_INCORRECT_USER_NAME_OR_PASSWORD"
+msgstr "Contraseña o nombre de usuario incorrecto"
+
+msgid "IDS_EMAIL_POP_SERVER_NOT_AVAILABLE"
+msgstr "Servidor no disponible"
+
+msgid "IDS_EMAIL_OPT_DOWNLOAD_MESSAGE"
+msgstr "Descargar mensaje"
+
+msgid "IDS_EMAIL_OPT_TENTATIVE"
+msgstr "Provisional"
+
+msgid "IDS_EMAIL_POP_TRY_AGAIN_IN_PD_MINUTES"
+msgstr "Inténtelo nuevamente en %d minutos"
+
+msgid "IDS_EMAIL_POP_NO_EMAIL_ADDRESS"
+msgstr "Sin dirección de correo"
+
+msgid "IDS_EMAIL_BUTTON_MANUAL_SETUP"
+msgstr "Configuración manual"
+
+msgid "IDS_EMAIL_BODY_1_HOUR"
+msgstr "1 hora"
+
+msgid "IDS_EMAIL_BODY_TODAY"
+msgstr "Hoy"
+
+msgid "IDS_EMAIL_BODY_YESTERDAY"
+msgstr "Ayer"
+
+msgid "IDS_EMAIL_OPT_VIEW_MODE_ABB"
+msgstr "Modo de vista"
+
+msgid "IDS_EMAIL_SK3_DELETE_ALL"
+msgstr "Eliminar todo"
+
+msgid "IDS_EMAIL_SK3_REPLY"
+msgstr "Responder"
+
+msgid "IDS_EMAIL_SK3_FORWARD"
+msgstr "Reenviar"
+
+msgid "IDS_EMAIL_BODY_DELETE"
+msgstr "Eliminar"
+
+msgid "IDS_EMAIL_BODY_TO_C_PS"
+msgstr "Para: %s"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_CONTACTS"
+msgstr "Añadir a Contactos"
+
+msgid "IDS_EMAIL_BUTTON_PD_ATTACHMENTS_ABB"
+msgstr "%d adjuntos"
+
+msgid "IDS_EMAIL_SK_REPLY"
+msgstr "Responder"
+
+msgid "IDS_EMAIL_SK3_DELETE"
+msgstr "Eliminar"
+
+msgid "IDS_EMAIL_BODY_NEW_EMAIL"
+msgstr "Nuevo correo"
+
+msgid "IDS_EMAIL_BODY_FROM_C_PS"
+msgstr "De: %s"
+
+msgid "IDS_EMAIL_BODY_SUBJECT"
+msgstr "Asunto"
+
+msgid "IDS_EMAIL_SK3_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_EMAIL_OPT_CONTACTS_ABB"
+msgstr "Contactos"
+
+msgid "IDS_EMAIL_BODY_EMAIL_SIZE"
+msgstr "Tamaño de correo"
+
+msgid "IDS_EMAIL_BODY_100_KB"
+msgstr "100 KB"
+
+msgid "IDS_EMAIL_TAB_ADDRESS"
+msgstr "Dirección privada"
+
+msgid "IDS_EMAIL_HEADER_SELECT_FOLDER_ABB"
+msgstr "Seleccionar carpeta"
+
+msgid "IDS_EMAIL_SK_DELETE"
+msgstr "Eliminar"
+
+msgid "IDS_EMAIL_BUTTON_CANCEL"
+msgstr "Cancelar"
+
+msgid "IDS_EMAIL_POP_DELETE_ALL_Q"
+msgstr "¿Eliminar todo?"
+
+msgid "IDS_EMAIL_BODY_CAPTURE_VIDEO"
+msgstr "Capturar video"
+
+msgid "IDS_EMAIL_BODY_SELECT_ALL"
+msgstr "Seleccionar todo"
+
+msgid "IDS_EMAIL_BODY_EMAIL_T_MAINMENU_ABB2"
+msgstr "Correo"
+
+msgid "IDS_EMAIL_SK3_DONE"
+msgstr "Realizado"
+
+msgid "IDS_EMAIL_BODY_NONE_M_EMPTY"
+msgstr "Ninguno"
+
+msgid "IDS_EMAIL_DROP_PD_PD_KB"
+msgstr "%d.%d KB"
+
+msgid "IDS_EMAIL_BODY_1_KB"
+msgstr "1 KB"
+
+msgid "IDS_EMAIL_OPT_PD_KB"
+msgstr "%d KB"
+
+msgid "IDS_EMAIL_OPT_PHONE_ONLY"
+msgstr "Sólo teléfono"
+
+msgid "IDS_EMAIL_OPT_PHONE_AND_SERVER"
+msgstr "Teléfono y servidor"
+
+msgid "IDS_EMAIL_BODY_OTHERS"
+msgstr "Otros"
+
+msgid "IDS_EMAIL_BUTTON_VIEW_CONTACT_ABB"
+msgstr "Ver contacto"
+
+msgid "IDS_EMAIL_BODY_COMPLETE"
+msgstr "Completo"
+
+msgid "IDS_EMAIL_BODY_ACCEPTED_C_PS"
+msgstr "Aceptado: %s"
+
+msgid "IDS_EMAIL_BODY_DECLINED_C_PS"
+msgstr "No aceptado: %s"
+
+msgid "IDS_EMAIL_BODY_DOWNLOAD_FULL_MESSAGE"
+msgstr "Descargar mensaje completo"
+
+msgid "IDS_EMAIL_BODY_TENTATIVE_C_PS"
+msgstr "Provisional: %s"
+
+msgid "IDS_EMAIL_BODY_WHEN_C_PS"
+msgstr "Cuándo: %s"
+
+msgid "IDS_EMAIL_BODY_WHERE_C_PS"
+msgstr "Dónde: %s"
+
+msgid "IDS_EMAIL_BUTTON_DECLINE_ABB"
+msgstr "Rechazar"
+
+msgid "IDS_EMAIL_BODY_ORIGINAL_MESSAGE"
+msgstr "Mensaje original"
+
+msgid "IDS_EMAIL_OPT_OTHERS"
+msgstr "Otros"
+
+msgid "IDS_EMAIL_OPT_UNREAD"
+msgstr "No leídos"
+
+msgid "IDS_EMAIL_MBODY_HUGE"
+msgstr "Enorme"
+
+msgid "IDS_EMAIL_BODY_MOVE_TO_TO"
+msgstr "Mover a A"
+
+msgid "IDS_EMAIL_HEADER_SELECT_EMAIL_ADDRESS"
+msgstr "Seleccionar dirección de correo"
+
+msgid "IDS_EMAIL_POP_GIANT_M_TEXTSIZE"
+msgstr "Gigante"
+
+msgid "IDS_EMAIL_HEADER_DOWNLOAD_FAILED"
+msgstr "Error de descarga"
+
+msgid "IDS_EMAIL_OPT_ADD_TO_CONTACT"
+msgstr "Añadir a contacto"
+
+msgid "IDS_EMAIL_OPT_VOICE_CALL"
+msgstr "Llamada de voz"
+
+msgid "IDS_EMAIL_BODY_ACCOUNT_NAME"
+msgstr "Nombre de la cuenta"
+
+msgid "IDS_EMAIL_BODY_ATTACHMENTS"
+msgstr "Adjuntos"
+
+msgid "IDS_EMAIL_BODY_FROM_C"
+msgstr "De:"
+
+msgid "IDS_EMAIL_BODY_INCLUDES"
+msgstr "Incluye"
+
+msgid "IDS_EMAIL_BODY_INCOMING_PORT"
+msgstr "Puerto entrante"
+
+msgid "IDS_EMAIL_BODY_INCOMING_SERVER"
+msgstr "Servidor entrante"
+
+msgid "IDS_EMAIL_BODY_IN_PD_MINUTES"
+msgstr "Dentro de %d minutos"
+
+msgid "IDS_EMAIL_BODY_KEEP_IN_SERVER"
+msgstr "Guardar en servidor"
+
+msgid "IDS_EMAIL_BODY_NO_TEXT"
+msgstr "Sin texto"
+
+msgid "IDS_EMAIL_BODY_OUTGOING_PORT"
+msgstr "Puerto saliente"
+
+msgid "IDS_EMAIL_BODY_OUTGOING_SERVER"
+msgstr "Servidor saliente"
+
+msgid "IDS_EMAIL_BODY_POP3_SERVER"
+msgstr "Servidor POP3"
+
+msgid "IDS_EMAIL_BODY_RECENT"
+msgstr "Reciente"
+
+msgid "IDS_EMAIL_BODY_RETRIEVING_OPTIONS"
+msgstr "Opciones de recepción"
+
+msgid "IDS_EMAIL_BODY_RE_C"
+msgstr "RE:"
+
+msgid "IDS_EMAIL_BODY_SENT_C"
+msgstr "Enviado:"
+
+msgid "IDS_EMAIL_BODY_SENT_FROM_SAMSUNG_MOBILE"
+msgstr "Enviado desde Samsung Mobile"
+
+msgid "IDS_EMAIL_BODY_USER_PASSWORD"
+msgstr "Contraseña de usuario"
+
+msgid "IDS_EMAIL_HEADER_EDIT_RULES"
+msgstr "Editar reglas"
+
+msgid "IDS_EMAIL_HEADER_EMAIL_SETTINGS"
+msgstr "Config. de correo"
+
+msgid "IDS_EMAIL_HEADER_MAILBOXES"
+msgstr "Buzón de correo"
+
+msgid "IDS_EMAIL_POP_ALERT"
+msgstr "Alerta"
+
+msgid "IDS_EMAIL_POP_FILE_ALREADY_EXISTS"
+msgstr "Archivo ya existe"
+
+msgid "IDS_EMAIL_POP_NO_SENDER"
+msgstr "Ningún remitente"
+
+msgid "IDS_EMAIL_POP_SUCCEEDED"
+msgstr "Correcto"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_ATTACH_MAXIMUM_NUMBER_OF_FILES_IS_PD"
+msgstr "No se puede adjuntar. El número máximo de archivos es de %d."
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_ATTACH_MAXIMUM_SIZE_OF_FILES_IS_PD_KB"
+msgstr "No se puede adjuntar. El tamaño máximo de archivos es de %d KB."
+
+msgid "IDS_EMAIL_POP_VALIDATION_FAILED"
+msgstr "Error de validación"
+
+msgid "IDS_EMAIL_SK_REPLY_ALL"
+msgstr "Responder a todos"
+
+msgid "IDS_EMAIL_BODY_1_ITEM"
+msgstr "1 elemento"
+
+msgid "IDS_EMAIL_BODY_ADD_MY_NAMECARD"
+msgstr "Añadir mi tarjeta de presentación"
+
+msgid "IDS_EMAIL_BODY_ALL_EMAILS"
+msgstr "Todo el correo "
+
+msgid "IDS_EMAIL_BODY_BODY"
+msgstr "Cuerpo"
+
+msgid "IDS_EMAIL_BODY_CC_BCC"
+msgstr "CC/CCO"
+
+msgid "IDS_EMAIL_BODY_CHECK_INTERVAL"
+msgstr "Comprobar intervalo"
+
+msgid "IDS_EMAIL_BODY_DEFAULT_ACCOUNT"
+msgstr "Cuenta predeterminada"
+
+msgid "IDS_EMAIL_BODY_EMAIL_ACCOUNTS"
+msgstr "Cuentas de correo"
+
+msgid "IDS_EMAIL_BODY_END_TIME"
+msgstr "Hora final"
+
+msgid "IDS_EMAIL_BODY_EXACTLY_THE_SAME_AS"
+msgstr "Exactamente igual a"
+
+msgid "IDS_EMAIL_BODY_EXAMPLE"
+msgstr "Ejemplo"
+
+msgid "IDS_EMAIL_BODY_FROM_M_SENDER"
+msgstr "De:"
+
+msgid "IDS_EMAIL_BODY_INCLUDE"
+msgstr "Incluir"
+
+msgid "IDS_EMAIL_BODY_MATCH_CRITERIA"
+msgstr "Criterios de asignación"
+
+msgid "IDS_EMAIL_BODY_NOT_USED"
+msgstr "Sin utilizar"
+
+msgid "IDS_EMAIL_BODY_NO_ACCOUNTS"
+msgstr "Ninguna cuenta"
+
+msgid "IDS_EMAIL_BODY_PD_DAYS"
+msgstr "%d días"
+
+msgid "IDS_EMAIL_BODY_PD_ITEMS"
+msgstr "%d elementos"
+
+msgid "IDS_EMAIL_BODY_PRIORITY"
+msgstr "Prioridad"
+
+msgid "IDS_EMAIL_BODY_SECURE_CONNECTION"
+msgstr "Conexión segura"
+
+msgid "IDS_EMAIL_BODY_SERVER_URL"
+msgstr "URL de servidor"
+
+msgid "IDS_EMAIL_BODY_START_TIME"
+msgstr "Hora inicial"
+
+msgid "IDS_EMAIL_BODY_TRASH"
+msgstr "Papelera"
+
+msgid "IDS_EMAIL_BODY_WITHOUT_ATTACHMENTS"
+msgstr "Sin adjuntos"
+
+msgid "IDS_EMAIL_BUTTON_GROUP"
+msgstr "Grupo"
+
+msgid "IDS_EMAIL_HEADER_ADD_RULES"
+msgstr "Añadir reglas"
+
+msgid "IDS_EMAIL_OPT_ATTACH_ITEMS"
+msgstr "Adjuntar"
+
+msgid "IDS_EMAIL_OPT_EXCHANGE"
+msgstr "Exchange"
+
+msgid "IDS_EMAIL_OPT_FILE"
+msgstr "Archivo"
+
+msgid "IDS_EMAIL_OPT_NAMECARD"
+msgstr "Tarjeta de presentación"
+
+msgid "IDS_EMAIL_OPT_OPEN_URL"
+msgstr "Ir a URL"
+
+msgid "IDS_EMAIL_OPT_UPDATE_EXISTING"
+msgstr "Actualizar existente"
+
+msgid "IDS_EMAIL_POP_ADD_ACCOUNTS"
+msgstr "Añadir cuentas"
+
+msgid "IDS_EMAIL_POP_DOWNLOADING_ATTACHMENT_ING"
+msgstr "Descargando adjunto..."
+
+msgid "IDS_EMAIL_POP_INVALID_EMAIL_ADDRESS"
+msgstr "Dirección de correo no válida"
+
+msgid "IDS_EMAIL_POP_LOADING_CONTENTS_ING"
+msgstr "Cargando contenidos..."
+
+msgid "IDS_EMAIL_POP_MAXIMUM_NUMBER_OF_ATTACHMENTS_REACHED"
+msgstr "Se ha alcanzado el número máximo de adjuntos."
+
+msgid "IDS_EMAIL_POP_MOVE_TO_SPAMBOX_Q"
+msgstr "¿Mover a Spam?"
+
+msgid "IDS_EMAIL_POP_NO_RECIPIENTS_ADDED_ENTER_RECIPIENTS"
+msgstr "No se han añadido destinatarios. Introducir destinatarios"
+
+msgid "IDS_EMAIL_POP_PLEASE_FILL_ALL_THE_MANDATORY_FIELDS"
+msgstr "Rellene todos los campos obligatorios"
+
+msgid "IDS_EMAIL_POP_SAVE_IN_DRAFTS_Q"
+msgstr "¿Guardar en Borrador?"
+
+msgid "IDS_EMAIL_POP_THERE_IS_NO_ACCOUNT_CREATE_A_NEW_ACCOUNT_FIRST"
+msgstr "No hay ninguna cuenta. Crear primero una cuenta nueva "
+
+msgid "IDS_EMAIL_POP_TOO_MANY_RECIPIENTS"
+msgstr "Demasiados destinatarios"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_DOWNLOAD"
+msgstr "No se puede descargar"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_ENTER_TEXT"
+msgstr "No se puede escribir texto"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_LAUNCH_APPLICATION"
+msgstr "No se puede iniciar aplicación"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_OPEN_ATTACHMENT"
+msgstr "No se puede abrir adjunto"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_SAVE_ATTACHMENT"
+msgstr "No se puede guardar adjunto."
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_SAVE_IN_DRAFTS"
+msgstr "No se puede guardar en Borrador"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_SEND_EMAIL"
+msgstr "No se puede enviar correo"
+
+msgid "IDS_EMAIL_POP_UNSUPPORTED_FILE_TYPE"
+msgstr "Tipo de archivo no admitido"
+
+msgid "IDS_EMAIL_POP_VALIDATING_ACCOUNT_ING"
+msgstr "Validando cuenta..."
+
+msgid "IDS_EMAIL_SK_RESEND"
+msgstr "Reenviar"
+
+msgid "IDS_EMAIL_SK3_ACCOUNT_LIST"
+msgstr "Lista de cuentas"
+
+msgid "IDS_EMAIL_BODY_USER_ID"
+msgstr "ID de usuario"
+
+msgid "IDS_EMAIL_POP_ACCOUNT_ALREADY_REGISTERED"
+msgstr "Cuenta ya registrada"
+
+msgid "IDS_EMAIL_HEADER_ATTACH_FILE"
+msgstr "Adjuntar archivo"
+
+msgid "IDS_EMAIL_BODY_ACCOUNT_PS_ALREADY_IN_USE"
+msgstr "La cuenta %s ya existe"
+
+msgid "IDS_EMAIL_POP_ACCOUNT_ALREADY_EXISTS"
+msgstr "La cuenta ya existe"
+
+msgid "IDS_EMAIL_BODY_NO_SUBJECT"
+msgstr "Sin asunto"
+
+msgid "IDS_EMAIL_BODY_NO_ADDRESS"
+msgstr "Sin dirección"
+
+msgid "IDS_EMAIL_OPT_RECORD_SOUND"
+msgstr "Grabar sonido"
+
+msgid "IDS_EMAIL_OPT_RECORD_VIDEO"
+msgstr "Grabar video"
+
+msgid "IDS_EMAIL_OPT_INSERT_IMAGE"
+msgstr "Añadir imagen"
+
+msgid "IDS_EMAIL_OPT_CLIPBOARD"
+msgstr "Portapapeles"
+
+msgid "IDS_EMAIL_OPT_VIEW_CONTACT_DETAILS"
+msgstr "Ver detalles del contacto"
+
+msgid "IDS_EMAIL_POP_SAVED_IN_DRAFTS"
+msgstr "Guardado"
+
+msgid "IDS_EMAIL_POP_NETWORK_BUSY"
+msgstr "Red ocupada"
+
+msgid "IDS_EMAIL_POP_LOGIN_ALLOWED_ONLY_EVERY_PD_MINUTES"
+msgstr "Inicio de sesión permitido solamente cada %d minutos"
+
+msgid "IDS_EMAIL_POP_HOST_NOT_FOUND"
+msgstr "Host no encontrado"
+
+msgid "IDS_EMAIL_POP_HOST_NOT_REACHABLE"
+msgstr "Host no localizable"
+
+msgid "IDS_EMAIL_POP_NO_SERVICE"
+msgstr "Sin servicio"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_FORWARD_DRM_CONTENTS"
+msgstr "No se pueden reenviar contenidos de DRM"
+
+msgid "IDS_EMAIL_POP_BLOCKED"
+msgstr "Bloqueado"
+
+msgid "IDS_EMAIL_POP_1_EMAIL_SELECTED"
+msgstr "1 correo seleccionado"
+
+msgid "IDS_EMAIL_POP_PD_EMAILS_SELECTED"
+msgstr "%d correos seleccionados"
+
+msgid "IDS_EMAIL_POP_1_RECIPIENT_SELECTED"
+msgstr "1 destinatario seleccionado"
+
+msgid "IDS_EMAIL_POP_PD_RECIPIENTS_SELECTED"
+msgstr "%d destinatarios seleccionados"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_ADD_ACCOUNT"
+msgstr "No se puede añadir cuenta"
+
+msgid "IDS_EMAIL_SK3_MOVE_HERE"
+msgstr "Mover aquí"
+
+msgid "IDS_EMAIL_OPT_UNDO"
+msgstr "Deshacer"
+
+msgid "IDS_EMAIL_OPT_REDO"
+msgstr "Rehacer"
+
+msgid "IDS_EMAIL_OPT_BOLD"
+msgstr "Negrita"
+
+msgid "IDS_EMAIL_OPT_ITALIC"
+msgstr "Cursiva"
+
+msgid "IDS_EMAIL_OPT_UNDERLINE"
+msgstr "Subrayado"
+
+msgid "IDS_EMAIL_OPT_FONT_SIZE"
+msgstr "Tamaño de fuente"
+
+msgid "IDS_EMAIL_OPT_INDENT"
+msgstr "Sangrar"
+
+msgid "IDS_EMAIL_OPT_VIEW_BY"
+msgstr "Ver por"
+
+msgid "IDS_EMAIL_OPT_IMPORTANT"
+msgstr "Importante"
+
+msgid "IDS_EMAIL_OPT_REFRESH"
+msgstr "Actualizar"
+
+msgid "IDS_EMAIL_POP_MAXIMUM_NUMBER_OF_RECIPIENTS_HPD_REACHED"
+msgstr "Se ha alcanzado el número máximo de destinatarios (%d)"
+
+msgid "IDS_EMAIL_BODY_TLS"
+msgstr "TLS"
+
+msgid "IDS_EMAIL_OPT_VIDEO_CALL"
+msgstr "Videollamada"
+
+msgid "IDS_EMAIL_OPT_SEND_MESSAGE"
+msgstr "Enviar mensaje"
+
+msgid "IDS_EMAIL_OPT_COMPOSE_EMAIL"
+msgstr "Escribir correo"
+
+msgid "IDS_EMAIL_OPT_OTHER"
+msgstr "Otro"
+
+msgid "IDS_EMAIL_OPT_TAKE_PHOTO"
+msgstr "Tomar foto"
+
+msgid "IDS_EMAIL_POP_AUTHENTICATION_FAILED"
+msgstr "Error de autentificación"
+
+msgid "IDS_EMAIL_POP_DOWNLOAD_CANCELLED"
+msgstr "Descarga cancelada"
+
+msgid "IDS_EMAIL_POP_SENDING_CANCELLED"
+msgstr "Envío cancelado"
+
+msgid "IDS_EMAIL_POP_ACCOUNT_EDITED"
+msgstr "Cuenta editada"
+
+msgid "IDS_EMAIL_POP_ACCOUNT_LIST_NOT_FOUND"
+msgstr "No se encontró la lista de la cuenta"
+
+msgid "IDS_EMAIL_OPT_COPY_IMAGE_LOCATION"
+msgstr "Copiar ubicación de imagen"
+
+msgid "IDS_EMAIL_POP_DEVICE_STORAGE_FULL"
+msgstr "Almacenamiento de dispositivo completo"
+
+msgid "IDS_EMAIL_POP_DOWNLOAD_ATTACHMENT_Q"
+msgstr "¿Desea descargar el adjunto?"
+
+msgid "IDS_EMAIL_POP_EMAIL_DELETED_FROM_SERVER"
+msgstr "Correo eliminado del servidor"
+
+msgid "IDS_EMAIL_POP_FAILED_TO_ACTIVATE_PDP"
+msgstr "No se pudo activar el PDP"
+
+msgid "IDS_EMAIL_POP_FAILED_TO_ADD_BLOCK_RULE"
+msgstr "No se pudo agregar una regla de bloqueo"
+
+msgid "IDS_EMAIL_POP_FAILED_TO_MARK_AS_UNREAD"
+msgstr "No se pudo marcar como no leído"
+
+msgid "IDS_EMAIL_BODY_INCOMING_MAIL_SERVER_TYPE"
+msgstr "Tipo de servidor de correo entrante"
+
+msgid "IDS_EMAIL_BODY_LOADING_MORE_EMAILS_ING"
+msgstr "Cargando más correos…"
+
+msgid "IDS_EMAIL_POP_LOG_IN_FAILED"
+msgstr "Falló el inicio de sesión"
+
+msgid "IDS_EMAIL_POP_RETRIEVING_ADDRESS_LIST_ING"
+msgstr "Recuperando lista de direcciones..."
+
+msgid "IDS_EMAIL_OPT_SEND_IMAGE_VIA_EMAIL"
+msgstr "Enviar imagen vía correo"
+
+msgid "IDS_EMAIL_POP_DOWNLOADING_ATTACHMENTS_ON_THE_MOBILE_DEVICE_IS_NOT_ALLOWED_BY_EXCHANGE_SERVER_POLICY"
+msgstr "La descarga de adjuntos en el dispositivo móvil no está permitida por políticas de Exchange Server"
+
+msgid "IDS_EMAIL_POP_FAILED_TO_DELETE"
+msgstr "Error al eliminar"
+
+msgid "IDS_EMAIL_POP_FAILED_TO_MOVE"
+msgstr "Error al mover"
+
+msgid "IDS_EMAIL_POP_MARKED_AS_UNREAD"
+msgstr "Marcado como no leído"
+
+msgid "IDS_EMAIL_POP_DOWNLOAD_ATTACHMENTS_Q"
+msgstr "¿Descargar adjuntos?"
+
+msgid "IDS_EMAIL_POP_MAXIMUM_RECIPIENT_EMAIL_LENGTH_EXCEEDED"
+msgstr "Se superó la longitud máxima de correo de destinatario"
+
+msgid "IDS_EMAIL_POP_ACCOUNT_CREATION_CANCELLED"
+msgstr "Se canceló la creación de la cuenta"
+
+msgid "IDS_EMAIL_MBODY_MAILBOX_LIST"
+msgstr "Lista de casilla de corr."
+
+msgid "IDS_EMAIL_BODY_MAILBOX_SETUP"
+msgstr "Configuración de casilla de correo"
+
+msgid "IDS_EMAIL_POP_ALREADY_DOWNLOADING_T_HEADER"
+msgstr "Descarga en curso"
+
+msgid "IDS_EMAIL_POP_CANCELLING_ATTACHMENT_DOWNLOAD_ING"
+msgstr "Cancelando descarga de adjunto..."
+
+msgid "IDS_EMAIL_BODY_SENT_USING_TIZEN_MOBILE"
+msgstr "Enviado mediante móvil TIZEN"
+
+msgid "IDS_EMAIL_POP_EXCHANGE_ACTIVESYNC_ACCOUNT_NOT_AVAILABLE_NOTI"
+msgstr "Cuenta de Exchange ActiveSync no disponible"
+
+msgid "IDS_EMAIL_BODY_RE"
+msgstr "Re"
+
+msgid "IDS_EMAIL_BODY_FWD_T_EMAIL_PREFIX_ABB"
+msgstr "Reenvío"
+
+msgid "IDS_EMAIL_BODY_EXCHANGE_ACTIVESYNC"
+msgstr "Exchange ActiveSync"
+
+msgid "IDS_EMAIL_BODY_GMAIL"
+msgstr "Gmail"
+
+msgid "IDS_EMAIL_BODY_HOTMAIL"
+msgstr "Hotmail"
+
+msgid "IDS_EMAIL_BODY_YAHOO_E_MAIL"
+msgstr "Yahoo! mail"
+
+msgid "IDS_EMAIL_BODY_DOWNLOAD_MESSAGE"
+msgstr "Descargar mensaje"
+
+msgid "IDS_EMAIL_POP_ALREADY_BLOCKED"
+msgstr "Ya bloqueado"
+
+msgid "IDS_EMAIL_BODY_SEARCH_ON_SERVER"
+msgstr "Buscar en servidor"
+
+msgid "IDS_EMAIL_OPT_RECIPIENT"
+msgstr "Destinatario"
+
+msgid "IDS_EMAIL_OPT_DELETE_ALL"
+msgstr "Eliminar todo"
+
+msgid "IDS_EMAIL_OPT_RECENT_HPD"
+msgstr "Reciente (%d)"
+
+msgid "IDS_EMAIL_OPT_REPLY_TO_SENDER"
+msgstr "Responder al remitente"
+
+msgid "IDS_EMAIL_HEADER_RECENT_T_HEADER"
+msgstr "Reciente"
+
+msgid "IDS_EMAIL_OPT_CONTACT_DETAILS"
+msgstr "Detalles del contacto"
+
+msgid "IDS_EMAIL_OPT_REPLY_TO_ALL"
+msgstr "Responder a todos"
+
+msgid "IDS_EMAIL_BODY_THREADED_LIST"
+msgstr "Lista en hilo"
+
+msgid "IDS_EMAIL_BODY_SELECT_EMAIL"
+msgstr "Seleccionar dirección de correo"
+
+msgid "IDS_EMAIL_OPT_VIEW_AS"
+msgstr "Ver por"
+
+msgid "IDS_EMAIL_HEADER_DEFAULT_ACCOUNT"
+msgstr "Cuenta predeterminada"
+
+msgid "IDS_EMAIL_BODY_SHOW_EMAILS"
+msgstr "Mostrar correos"
+
+msgid "IDS_EMAIL_OPT_DATE"
+msgstr "Fecha"
+
+msgid "IDS_EMAIL_HEADER_SEARCH"
+msgstr "Buscar"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_OPEN_EMAIL_MESSAGE"
+msgstr "No se puede abrir el mensaje de correo"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_COMPOSE_EMAIL_MESSAGE"
+msgstr "No se puede escribir el mensaje de correo"
+
+msgid "IDS_EMAIL_POP_FAILED_TO_START_EMAIL_APPLICATION"
+msgstr "No se pudo iniciar la aplicación de correo"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_SAVE_SUBJECT_EMPTY"
+msgstr "No se puede guardar. Asunto vacío"
+
+msgid "IDS_EMAIL_HEADER_ALL_EMAILS"
+msgstr "Todo el correo "
+
+msgid "IDS_EMAIL_HEADER_MAILBOX_SETUP"
+msgstr "Configuración de casilla de correo"
+
+msgid "IDS_EMAIL_HEADER_RETRIEVING_OPTIONS"
+msgstr "Opciones de recepción"
+
+msgid "IDS_EMAIL_HEADER_TEXT_COLOUR"
+msgstr "Color de texto"
+
+msgid "IDS_EMAIL_HEADER_TEXT_BACKGROUND_COLOUR"
+msgstr "Color de fondo del texto"
+
+msgid "IDS_EMAIL_BODY_ADDRESS"
+msgstr "Dirección"
+
+msgid "IDS_EMAIL_SK_DECLINE"
+msgstr "Rechazar"
+
+msgid "IDS_EMAIL_OPT_RESEND"
+msgstr "Volver a enviar"
+
+msgid "IDS_EMAIL_OPT_ATTACH_FILE"
+msgstr "Adjuntar archivo"
+
+msgid "IDS_EMAIL_HEADER_COMPOSE_EMAIL"
+msgstr "Escribir correo"
+
+msgid "IDS_EMAIL_HEADER_ADD_ACCOUNTS"
+msgstr "Añadir cuentas"
+
+msgid "IDS_EMAIL_OPT_PD_MOST_RECENT_EMAILS"
+msgstr "%d correos más recientes"
+
+msgid "IDS_EMAIL_POP_YOU_CAN_ONLY_LOG_IN_ONCE_EVERY_PD_MINUTES"
+msgstr "Solo puede iniciar sesión una vez cada %d minutos"
+
+msgid "IDS_EMAIL_HEADER_DEFAULT_SENDING_ACCOUNT"
+msgstr "Cuenta de envío predeterminada"
+
+msgid "IDS_EMAIL_BODY_DO_NOT_MATCH_FOLDER_WITH_SERVER"
+msgstr "No asociar carpeta con servidor"
+
+msgid "IDS_EMAIL_POP_QUERYING_SERVER_INFORMATION_ING"
+msgstr "Consultando información de servidor..."
+
+msgid "IDS_EMAIL_POP_SERVER_INFORMATION_QUERY_FAILED_ENTER_SERVER_INFORMATION_MANUALLY"
+msgstr "Error al consultar información de servidor. Introduzca la información de servidor manualmente"
+
+msgid "IDS_EMAIL_POP_SECURITY_POLICY_RESTRICTS_USE_OF_POP_IMAP_EMAIL"
+msgstr "La política de seguridad restringe el uso de correo POP/IMAP"
+
+msgid "IDS_EMAIL_OPT_VIEW"
+msgstr "Ver"
+
+msgid "IDS_EMAIL_OPT_COPY_LINK"
+msgstr "Copiar enlace"
+
+msgid "IDS_EMAIL_POP_FAILED_TO_MARK_AS_READ"
+msgstr "No se pudo marcar como leído"
+
+msgid "IDS_EMAIL_POP_MARKED_AS_READ"
+msgstr "Marcado como leído"
+
+msgid "IDS_EMAIL_OPT_COPY_IMAGE_URL"
+msgstr "Copiar URL de imagen"
+
+msgid "IDS_EMAIL_OPT_COPY_URL"
+msgstr "Copiar URL"
+
+msgid "IDS_EMAIL_OPT_MOVE_TO_SPAMBOX"
+msgstr "Mover a Spam"
+
+msgid "IDS_EMAIL_POP_DISCARD_CURRENT_MESSAGE_Q"
+msgstr "¿Cancelar mensaje actual?"
+
+msgid "IDS_EMAIL_POP_MEETING_REQUEST_DECLINED_MESSAGE_WILL_BE_MOVED_TO_RECYCLE_BIN"
+msgstr "Solicitud de reunión rechazada. El mensaje se moverá a la papelera"
+
+msgid "IDS_EMAIL_POP_MEETING_REQUEST_TENTATIVELY_ACCEPTED_MESSAGE_WILL_BE_MOVED_TO_RECYCLE_BIN"
+msgstr "Solicitud de tentativa de reunión aceptada. El mensaje se moverá a la papelera"
+
+msgid "IDS_EMAIL_POP_MEETING_REQUEST_ACCEPTED_MESSAGE_WILL_BE_MOVED_TO_RECYCLE_BIN"
+msgstr "Solicitud de reunión aceptada. El mensaje se moverá a la papelera"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_ATTACH_FILE"
+msgstr "No se puede adjuntar el archivo"
+
+msgid "IDS_EMAIL_OPT_VIEW_MODE"
+msgstr "Modo de visualización"
+
+msgid "IDS_EMAIL_OPT_FAVOURITES"
+msgstr "Favoritos"
+
+msgid "IDS_EMAIL_BODY_NO_EMAILS"
+msgstr "No hay correos"
+
+msgid "IDS_EMAIL_OPT_DOCUMENTS_ABB"
+msgstr "Documentos"
+
+msgid "IDS_EMAIL_OPT_CONTACTS"
+msgstr "Contactos"
+
+msgid "IDS_EMAIL_OPT_INSERT"
+msgstr "Insertar"
+
+msgid "IDS_EMAIL_OPT_ADD_FOLDER"
+msgstr "Añadir carpeta"
+
+msgid "IDS_EMAIL_HEADER_SERVER"
+msgstr "Servidor"
+
+msgid "IDS_EMAIL_HEADER_SEARCH_SHAREPOINT"
+msgstr "Buscar SharePoint"
+
+msgid "IDS_EMAIL_BODY_ENTER_PATH_OF_WINDOWS_SHAREPOINT_SERVICES_OR_WINDOWS_FILE_SHARE_HUNC_TO_ACCESS_DOCUMENTS_REMOTELY"
+msgstr "Ingrese la ruta de Windows SharePoint Services o Windows file share (UNC) para acceder a los documentos de forma remota"
+
+msgid "IDS_EMAIL_OPT_DELETE_FROM_CALENDAR"
+msgstr "Eliminar del Calendario"
+
+msgid "IDS_EMAIL_BODY_FLICK_UP_TO_SEARCH_ON_SERVER_AGAIN"
+msgstr "Mover hacia arriba para buscar en el servidor nuevamente"
+
+msgid "IDS_EMAIL_BODY_HIGH_M_PRIORITY"
+msgstr "Alta"
+
+msgid "IDS_EMAIL_BODY_NORMAL_M_EMAILPRIORITY"
+msgstr "Normal"
+
+msgid "IDS_EMAIL_BODY_LOW_M_EMAILPRIORITY"
+msgstr "Baja"
+
+msgid "IDS_EMAIL_BODY_MEETING_REQUEST"
+msgstr "Solicitud de reunión"
+
+msgid "IDS_EMAIL_BODY_MEETING_INVITATION"
+msgstr "Invitación a una reunión"
+
+msgid "IDS_EMAIL_OPT_SUGGEST_NEW_TIME_ABB"
+msgstr "Sugerir nueva hora"
+
+msgid "IDS_EMAIL_BODY_VIEW_IN_CALENDAR"
+msgstr "Ver en Calendario"
+
+msgid "IDS_EMAIL_BODY_SEARCH_EMAIL"
+msgstr "Buscar correo"
+
+msgid "IDS_EMAIL_BODY_ALWAYS_SHOW_THIS_MESSAGE"
+msgstr "Siempre mostrar este mensaje"
+
+msgid "IDS_EMAIL_BODY_SEND_EMAIL_FROM_THIS_ACCOUNT_BY_DEFAULT"
+msgstr "Enviar correo desde cuenta predeterminada "
+
+msgid "IDS_EMAIL_BODY_SMTP_SERVER"
+msgstr "Servidor SMTP"
+
+msgid "IDS_EMAIL_OPT_SEARCH"
+msgstr "Buscar"
+
+msgid "IDS_EMAIL_OPT_SHARE"
+msgstr "Compartir"
+
+msgid "IDS_EMAIL_OPT_MESSAGE"
+msgstr "Mensaje"
+
+msgid "IDS_EMAIL_OPT_EMAIL"
+msgstr "Correo"
+
+msgid "IDS_EMAIL_OPT_NFC"
+msgstr "NFC"
+
+msgid "IDS_EMAIL_BODY_SUNDAY"
+msgstr "Domingo"
+
+msgid "IDS_EMAIL_BODY_MONDAY"
+msgstr "Lunes"
+
+msgid "IDS_EMAIL_BODY_TUESDAY"
+msgstr "Martes"
+
+msgid "IDS_EMAIL_BODY_WEDNESDAY"
+msgstr "Miércoles"
+
+msgid "IDS_EMAIL_BODY_THURSDAY"
+msgstr "Jueves"
+
+msgid "IDS_EMAIL_BODY_FRIDAY"
+msgstr "Viernes"
+
+msgid "IDS_EMAIL_BODY_SATURDAY"
+msgstr "Sábado"
+
+msgid "IDS_EMAIL_BODY_OTHER"
+msgstr "Otro"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_DECRYPT_MESSAGE"
+msgstr "No se puede descifrar el mensaje"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_DECRYPT_MESSAGE_CERTIFICATE_NOT_INSTALLED"
+msgstr "No se puede descifrar el mensaje. Certificado no instalado"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_SIGN_OR_ENCRYPT_MESSAGE_CERTIFICATE_NOT_INSTALLED"
+msgstr "No se puede firmar o encriptar el mensaje. Certificado no instalado"
+
+msgid "IDS_EMAIL_POP_DOWNLOAD_MORE_DETAILS_TO_SHOW_S_MIME_MESSAGES_CONTINUE_Q"
+msgstr "Descargue más detalles para mostrar los mensajes S/MIME. ¿Continuar?"
+
+msgid "IDS_EMAIL_BODY_LAST_WEEK"
+msgstr "Última semana"
+
+msgid "IDS_EMAIL_BODY_PD_WEEKS_AGO"
+msgstr "Hace %d semanas"
+
+msgid "IDS_EMAIL_BODY_UNREAD"
+msgstr "No leídos"
+
+msgid "IDS_EMAIL_BODY_CLEAR"
+msgstr "Eliminar"
+
+msgid "IDS_EMAIL_BODY_OLDER_M_HISTORY"
+msgstr "Más antiguo"
+
+msgid "IDS_EMAIL_HEADER_CHECKING"
+msgstr "Verificando"
+
+msgid "IDS_EMAIL_POP_THIS_ATTACHMENT_CANNOT_BE_DISPLAYED"
+msgstr "No se puede mostrar el adjunto"
+
+msgid "IDS_EMAIL_BODY_ADD_ACCOUNT"
+msgstr "Añadir cuenta"
+
+msgid "IDS_EMAIL_BODY_REMOVE_EVENT_FROM_CALENDAR"
+msgstr "Eliminar evento del calendario"
+
+msgid "IDS_EMAIL_POP_GETTING_RECIPIENTS_CERTIFICATES_ING"
+msgstr "Obteniendo certificados de destinatarios..."
+
+msgid "IDS_EMAIL_POP_VALIDATING_CERTIFICATES_ING"
+msgstr "Validando certificados..."
+
+msgid "IDS_EMAIL_HEADER_CERTIFICATES"
+msgstr "Certificados"
+
+msgid "IDS_EMAIL_POP_FOLLOWING_RECIPIENTS_HAVE_INVALID_CERTIFICATES"
+msgstr "Los siguientes destinatarios tienen certificados no válidos"
+
+msgid "IDS_EMAIL_POP_VERIFYING_SIGNATURE_ING"
+msgstr "Verificando firma..."
+
+msgid "IDS_EMAIL_BODY_ADVANCED"
+msgstr "Avanzados"
+
+msgid "IDS_EMAIL_BODY_SEARCH_BY"
+msgstr "Buscar por"
+
+msgid "IDS_EMAIL_BODY_DELETE_ALL_Q"
+msgstr "¿Eliminar todo?"
+
+msgid "IDS_EMAIL_BODY_MOVE_TO"
+msgstr "Mover a"
+
+msgid "IDS_EMAIL_BODY_PHONE_AND_SERVER"
+msgstr "Teléfono y servidor"
+
+msgid "IDS_EMAIL_BODY_PHONE_ONLY"
+msgstr "Sólo teléfono"
+
+msgid "IDS_EMAIL_BODY_USE_SAME_USERNAME_PASSWORD_AS_POP3_IMAP4"
+msgstr "Usar mismo nombre de usuario y contraseña que en POP3/IMAP4"
+
+msgid "IDS_EMAIL_BODY_USE_POP3_IMAP4_BEFORE_SMTP"
+msgstr "Usar POP3/IMAP4 en vez de SMTP"
+
+msgid "IDS_EMAIL_POP_FAILED_TO_VALIDATE_ACCOUNT_CHECK_EMAIL_ADDRESS_AND_PASSWORD"
+msgstr "Error al validar la cuenta. Compruebe la dirección de correo y la contraseña"
+
+msgid "IDS_EMAIL_BODY_SMTP_PORT"
+msgstr "Puerto SMTP"
+
+msgid "IDS_EMAIL_BODY_SHOW_PASSWORD"
+msgstr "Mostrar contraseña"
+
+msgid "IDS_EMAIL_BODY_LAST_MONTH"
+msgstr "Último mes"
+
+msgid "IDS_EMAIL_BODY_1_WEEK_AGO"
+msgstr "Hace 1 semana"
+
+msgid "IDS_EMAIL_OPT_LOG_IN"
+msgstr "Iniciar sesión"
+
+msgid "IDS_EMAIL_OPT_NEW_MEETING_INVITATION"
+msgstr "Nueva invitación a reunión"
+
+msgid "IDS_EMAIL_OPT_MEETING_INVITATION"
+msgstr "Invitación a una reunión"
+
+msgid "IDS_EMAIL_HEADER_REPLY_ABB"
+msgstr "Responder"
+
+msgid "IDS_EMAIL_OPT_ADVANCED"
+msgstr "Avanzados"
+
+msgid "IDS_EMAIL_POP_THE_DIGITAL_SIGNATURE_ON_THIS_MESSAGE_IS_NOT_VALID_AND_IS_NOT_TRUSTED"
+msgstr "La firma digital en este mensaje no es válida y no es de confianza"
+
+msgid "IDS_EMAIL_POP_CONNECTION_ERROR"
+msgstr "Error de conexión"
+
+msgid "IDS_EMAIL_BODY_EVERY_30_MINUTES"
+msgstr "Cada 30 minutos"
+
+msgid "IDS_EMAIL_BODY_EVERY_PD_HOURS"
+msgstr "Cada %d horas"
+
+msgid "IDS_EMAIL_BODY_ONCE_A_DAY"
+msgstr "Una vez por día"
+
+msgid "IDS_EMAIL_POP_CERTIFICATE_DOES_NOT_MATCH_EMAIL_ADDRESS"
+msgstr "El certificado no coincide con la dirección de correo"
+
+msgid "IDS_EMAIL_POP_DECRYPTING_MESSAGE_ING"
+msgstr "Descifrando mensaje..."
+
+msgid "IDS_EMAIL_BODY_1_MONTH_AGO"
+msgstr "Hace 1 mes"
+
+msgid "IDS_EMAIL_OPT_ACCEPT"
+msgstr "Aceptar"
+
+msgid "IDS_EMAIL_OPT_DECLINE"
+msgstr "Rechazar"
+
+msgid "IDS_EMAIL_BODY_ALL_ACCOUNTS"
+msgstr "Todas las cuentas"
+
+msgid "IDS_EMAIL_SK_SORT_BY"
+msgstr "Ord. por"
+
+msgid "IDS_EMAIL_HEADER_CREATE_FOLDER"
+msgstr "Crear carpeta"
+
+msgid "IDS_EMAIL_POP_FOLDER_NAME"
+msgstr "Nombre de carpeta"
+
+msgid "IDS_EMAIL_OPT_REPLY"
+msgstr "Responder"
+
+msgid "IDS_EMAIL_OPT_FORWARD"
+msgstr "Reenviar"
+
+msgid "IDS_EMAIL_OPT_SHARE_VIA_EMAIL"
+msgstr "Compartir vía correo"
+
+msgid "IDS_EMAIL_OPT_OPEN"
+msgstr "Abrir"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_OPEN_FILE"
+msgstr "No se puede abrir el archivo"
+
+msgid "IDS_EMAIL_POP_RETRIEVING_ING"
+msgstr "Recuperando..."
+
+msgid "IDS_EMAIL_BODY_EVERY_PD_MINUTES"
+msgstr "Cada %d minutos"
+
+msgid "IDS_EMAIL_SK3_RETRIEVE"
+msgstr "Recuperar"
+
+msgid "IDS_EMAIL_SK3_BACK"
+msgstr "Atrás"
+
+msgid "IDS_EMAIL_HEADER_LIST_BY"
+msgstr "Ordenar por"
+
+msgid "IDS_EMAIL_POP_PD_ATTACHMENTS"
+msgstr "%d adjuntos"
+
+msgid "IDS_EMAIL_SK3_SAVE"
+msgstr "Guardar"
+
+msgid "IDS_EMAIL_HEADER_FORWARD_ABB"
+msgstr "Reenviar"
+
+msgid "IDS_EMAIL_OPT_SAVE_TO_CALENDAR_ABB"
+msgstr "Guard. en Calendario"
+
+msgid "IDS_EMAIL_OPT_DETAILS"
+msgstr "Detalles"
+
+msgid "IDS_EMAIL_BODY_TO_MRECIPENT"
+msgstr "A"
+
+msgid "IDS_EMAIL_OPT_ORIGINAL"
+msgstr "Original"
+
+msgid "IDS_EMAIL_BODY_SIZE"
+msgstr "Tamaño"
+
+msgid "IDS_EMAIL_OPT_MY_FOLDERS"
+msgstr "Mis carpetas"
+
+msgid "IDS_EMAIL_OPT2_SETTINGS"
+msgstr "Configuración"
+
+msgid "IDS_EMAIL_BUTTON2_ADD_ACCOUNT"
+msgstr "Añadir cuenta"
+
+msgid "IDS_EMAIL_BODY_KEEP_A_COPY"
+msgstr "Guardar una copia"
+
+msgid "IDS_EMAIL_BODY_GET_READ_REPORT"
+msgstr "Solicitar informe de lectura"
+
+msgid "IDS_EMAIL_BODY_GET_DELIVERY_REPORT"
+msgstr "Solicitar informe de entrega"
+
+msgid "IDS_EMAIL_BODY_PLAIN_TEXT"
+msgstr "Texto sin formato"
+
+msgid "IDS_EMAIL_TAB_SUBJECT"
+msgstr "Asunto"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_SEARCH"
+msgstr "No se puede buscar"
+
+msgid "IDS_EMAIL_OPT_READ"
+msgstr "Leídos"
+
+msgid "IDS_EMAIL_POP_DOUBLE_TAP_TO_GO_TO_THE_TOP_OF_CONTACTS_LISTS_EMAIL_LISTS_AND_EMAIL_MESSAGES"
+msgstr "Presione dos veces para ir al inicio de las listas de contactos, listas de correo y mensajes de correo"
+
+msgid "IDS_EMAIL_OPT_EDIT_RESPONSE_BEFORE_SENDING"
+msgstr "Editar respuesta antes de enviar"
+
+msgid "IDS_EMAIL_OPT_SEND_RESPONSE_NOW"
+msgstr "Enviar respuesta ahora"
+
+msgid "IDS_EMAIL_OPT_DO_NOT_SEND_RESPONSE"
+msgstr "No enviar respuesta"
+
+msgid "IDS_EMAIL_BUTTON_VERIFY_SIGNATURE"
+msgstr "Verificar firma"
+
+msgid "IDS_EMAIL_HEADER_VERIFY_SIGNATURE_HEADER"
+msgstr "Verificar firma"
+
+msgid "IDS_EMAIL_BODY_UNABLE_TO_VERIFY_SIGNATURE_PUBLIC_KEY_IS_NOT_INSTALLED"
+msgstr "No es posible verificar la firma. El código público no está instalado"
+
+msgid "IDS_EMAIL_POP_THE_DIGITAL_SIGNATURE_ON_THIS_MESSAGE_IS_VALID_AND_TRUSTED"
+msgstr "La firma digital en este mensaje es válida y es de confianza"
+
+msgid "IDS_EMAIL_BUTTON_DECRYPT_MESSAGE"
+msgstr "Descifrar mensaje"
+
+msgid "IDS_EMAIL_OPT_SAVE_EMAIL_ABB"
+msgstr "Guardar correo"
+
+msgid "IDS_EMAIL_POP_UNABLE_TO_CREATE_FOLDER"
+msgstr "No se puede crear la carpeta"
+
+msgid "IDS_EMAIL_BUTTON_TAKE_PICTURE"
+msgstr "Capturar imagen"
+
+msgid "IDS_EMAIL_HEADER_PUSH_NOTIFICATION_ABB"
+msgstr "Notificación Push"
+
+msgid "IDS_EMAIL_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q"
+msgstr "Se eliminarán todos los datos relacionados con esta cuenta. ¿Continuar?"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORT"
+msgstr "Solicitar informe de entrega"
+
+msgid "IDS_EMAIL_BODY_SAME_AS_POP3_IMAP4"
+msgstr "Igual que POP3/IMAP4"
+
+msgid "IDS_EMAIL_BODY_EVERY_1_HOUR"
+msgstr "Cada hora"
+
+msgid "IDS_EMAIL_OPT_SEND_EMAIL_TO_MYSELF_ABB"
+msgstr "Enviarme correo"
+
+msgid "IDS_EMAIL_HEADER_SCHEDULED_EMAIL"
+msgstr "Correo programado"
+
+msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
+msgstr "Ver imagen"
+
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Adjuntar archivos"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Seguimiento"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 antes de SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Autenticación de SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Solicitar informe de lectura"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Conocer sobre doble pulsación"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index e20404c..58a3e04 100755 (executable)
@@ -1642,3 +1642,9 @@ msgstr "Correo programado"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Ver imagen"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Adjuntar archivos"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Conocer sobre doble pulsación"
+
index 9346b80..6a409c5 100755 (executable)
--- a/po/et.po
+++ b/po/et.po
@@ -1642,3 +1642,24 @@ msgstr "Planeeritud e-kiri"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Kuva pilt"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Manusta faile"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Jälgimine"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 enne SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP-i autentimine"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Taotle lugemisraporteid"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Teave topelttoksamise kohta"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index a63e541..adb6901 100755 (executable)
--- a/po/eu.po
+++ b/po/eu.po
@@ -1642,3 +1642,24 @@ msgstr "Programatutako posta elektronikoa"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Ikusi irudia"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Fitxategiak erantsi"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Segitzen"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 SMTP aurretik"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP autentifikazioa"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Eskatu irakur-txostenak"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Ikasi bi aldiz ukitzeari buruz"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index fe7b49b..0e7d7fd 100755 (executable)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1642,3 +1642,24 @@ msgstr "Ajoitettu sähköpostiviesti"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Näytä kuva"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Liitä tiedostot"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Seuranta"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 ennen SMTP:tä"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP-todennus"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Pyydä lukuraportteja"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Perehdy kaksoisnapauttamiseen"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 0bbda82..c44d77f 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "Courriel programmé"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Afficher l'image"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Joindre des fichiers"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Suivi"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 avant SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Authentification SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Demander des confirmations de lecture"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "En savoir plus sur la double touche"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 2e30b63..2759fa6 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "E-mail programmé"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Afficher image"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Joindre des fichiers"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Suivi"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 avant SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Authentification SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Demander des confirmations de lecture"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "En savoir plus sur le double appui"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 47d55e3..8f04532 100755 (executable)
--- a/po/ga.po
+++ b/po/ga.po
@@ -1642,3 +1642,24 @@ msgstr "R-phost sceidealaithe"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Amharc ar íomhá"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Ceangail comhaid"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Á rianú"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 roimh SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Fíordheimhniú SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Iarr tuairiscí léite"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Foghlaim faoi dhéthapáil"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 880e264..c398935 100755 (executable)
--- a/po/gl.po
+++ b/po/gl.po
@@ -1642,3 +1642,24 @@ msgstr "Correo electrónico programado"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Ver imaxe"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Incluír arquivos"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Seguimento"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 antes que SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Autenticación SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Solicitar informes de lectura"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Máis información acerca de tocar dúas veces"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 8af0a9d..3b0366c 100755 (executable)
--- a/po/hi.po
+++ b/po/hi.po
@@ -1642,3 +1642,24 @@ msgstr "निर्धारित किया गया ईमेल"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "छवि देखें"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "फ़ाइलें अटैच करें"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "ट्रैक किया जा रहा है"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "SMTP के पहले POP3"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP प्रमाणीकरण"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "पठित रिपोर्ट्स का अनुरोध करें"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "बल टैप के बारे में जानें"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index bd729cb..6e1421a 100755 (executable)
--- a/po/hr.po
+++ b/po/hr.po
@@ -236,7 +236,7 @@ msgid "IDS_EMAIL_OPT_RECIPIENT_HZ_TO_A"
 msgstr "Primatelj (Z do A)"
 
 msgid "IDS_EMAIL_BODY_FLICK_UP_TO_SEARCH_ON_SERVER"
-msgstr "Trznite prema gore za traženje na poslužitelju"
+msgstr "Kvrcnite prema gore za traženje na poslužitelju"
 
 msgid "IDS_EMAIL_BODY_RECENT_EMAILS"
 msgstr "Nedavni emailovi"
@@ -1274,7 +1274,7 @@ msgid "IDS_EMAIL_OPT_DELETE_FROM_CALENDAR"
 msgstr "Obriši iz Kalendara"
 
 msgid "IDS_EMAIL_BODY_FLICK_UP_TO_SEARCH_ON_SERVER_AGAIN"
-msgstr "Trznite prema gore za ponovno traženje na poslužitelju"
+msgstr "Kvrcnite prema gore za ponovno traženje na poslužitelju"
 
 msgid "IDS_EMAIL_BODY_HIGH_M_PRIORITY"
 msgstr "Visoki"
@@ -1642,3 +1642,24 @@ msgstr "Zakazani email"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Prikaži sliku"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Pridruži datoteke"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Traženje"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 prije SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP provjera"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Zatraži izvještaj čitanja"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Info o duplom udarcu"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 33b074c..670c878 100755 (executable)
--- a/po/hu.po
+++ b/po/hu.po
@@ -1642,3 +1642,24 @@ msgstr "Ütemezett e-mail"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Képet megtekint"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Fájlok csatolása"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Követés"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 az SMTP előtt"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP-hitelesítés"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Olvasási jelentések kérése"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Dupla érintés – infó"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 74400c2..e82bf8e 100755 (executable)
--- a/po/hy.po
+++ b/po/hy.po
@@ -1642,3 +1642,24 @@ msgstr "Պլանավորված էլ. նամակ"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Տեսնել պատկերը"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Կցել ֆայլեր"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Հետևում"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 նախքան SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP նույնականացում"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Պահանջել կարդացվելու մասին հաղորդումներ"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Տեղեկացեք կրկնակի թակման մասին"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index c83450c..19612b9 100755 (executable)
--- a/po/is.po
+++ b/po/is.po
@@ -1642,3 +1642,24 @@ msgstr "Áætlaður tölvupóstur"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Skoða mynd"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Hengja skrár við"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Rakning"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 á undan SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP-sannvottun"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Biðja um lestilkynningar"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Upplýsingar um tvípikk"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 8de92c5..5212f79 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "E-mail pianificata"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Vedi immagine"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Allega file"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Rilevamento in corso"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 prima di SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Autenticazione SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Chiedi conferma lettura"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Informazioni sul doppio tocco"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index f8ef338..d71238c 100755 (executable)
@@ -461,7 +461,7 @@ msgid "IDS_EMAIL_BODY_DELETE"
 msgstr "削除"
 
 msgid "IDS_EMAIL_BODY_TO_C_PS"
-msgstr "宛先 %s"
+msgstr "宛先: %s"
 
 msgid "IDS_EMAIL_OPT_ADD_TO_CONTACTS"
 msgstr "連絡先に追加"
@@ -1642,3 +1642,24 @@ msgstr "送信予約Eメール"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "画像を表示"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "ファイルを添付"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "追跡"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 before SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP認証"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "閲覧確認通知を要求"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "ダブルタップ操作について"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 1bb5c64..d8c2e4f 100755 (executable)
--- a/po/ka.po
+++ b/po/ka.po
@@ -1642,3 +1642,24 @@ msgstr "დაგეგმილი ელწერილი"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "სურათის ნახვა"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "ფაილების მიმაგრება"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "თვალყურის დევნება"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3, SMTP-მდე"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP იდენტიფიკაცია"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "მოითხოვეთ საანგარიშო მოხსენების წაკითხვა"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "შეიტყვეთ რა შეგიძლიათ გააკეთოთ ორჯერ დაკაკუნებით"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 4033808..10c0a1b 100755 (executable)
--- a/po/kk.po
+++ b/po/kk.po
@@ -1642,3 +1642,24 @@ msgstr "Жоспарланған электрондық пошта"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Суретті көру"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Файлдарды қосу"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Бақылау"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "SMTP алдында POP3"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP аутентификациясы"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Есептерді оқуды сұрау"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Екі рет түрту туралы оқып біліңіз"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index f50e45a..d20a8f0 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "예약 이메일"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "이미지 보기"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "파일 첨부"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "추적"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "SMTP 인증 전에 POP3 연결"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP 인증"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "읽음 확인 메시지 요청"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "두 번 두드리기에 대해 알아보기"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 30cf8f9..c4ca155 100755 (executable)
--- a/po/lt.po
+++ b/po/lt.po
@@ -248,10 +248,10 @@ msgid "IDS_EMAIL_BODY_FAVOURITES"
 msgstr "Parankiniai"
 
 msgid "IDS_EMAIL_OPT_FACEBOOK"
-msgstr "„Facebook“"
+msgstr "Facebook"
 
 msgid "IDS_EMAIL_OPT_TWITTER"
-msgstr "„Twitter“"
+msgstr "Twitter"
 
 msgid "IDS_EMAIL_BODY_SECURITY_OPTIONS"
 msgstr "Saugos parinktys"
@@ -1642,3 +1642,24 @@ msgstr "Suplanuotas el. laiškas"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Žiūrėti pav."
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Pridėti failus"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Sekama"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 prieš SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP patvirtinimas"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Prašyti perskaitymo patvirtinimo"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Sužinokite apie bakstelėjimą du kartus"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 7f57877..6c2d2fd 100755 (executable)
--- a/po/lv.po
+++ b/po/lv.po
@@ -1642,3 +1642,24 @@ msgstr "Ieplānota e-pasta ziņa"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Skatīt attēlu"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Pievienot failus"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Sekošana"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 pirms SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP autentifikācija"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Pieprasīt lasīšanas atskaites"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Uzziniet par divkāršo pieskārienu"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 942c5b5..3c8a8ab 100755 (executable)
--- a/po/mk.po
+++ b/po/mk.po
@@ -1642,3 +1642,24 @@ msgstr "Закажана е-пошта"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Види слика"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Приложи фајлови"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Се лоцира"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 пред SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Потврдување SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Барај извештаи за прочитаност"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Дознајте за двојното допирање"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 5521319..be8fc3d 100755 (executable)
--- a/po/nb.po
+++ b/po/nb.po
@@ -1642,3 +1642,24 @@ msgstr "Planlagt e-post"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Vis bilde"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Legg ved filer"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Sporing"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 før SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP-godkjenning"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Be om leserapporter"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Lær om dobbelttrykking"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index c1d479d..2fe393e 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "Geplande e-mail"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Afbeelding bekijken"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Bijlagen toevoegen"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Opsporen"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 voor SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP-verificatie"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Leesbevestigingen vragen"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Informatie over twee keer tikken"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index a9291c4..bb66e18 100755 (executable)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1642,3 +1642,24 @@ msgstr "Zaplanowany e-mail"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Wyświetl obraz"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Dołącz pliki"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Śledzenie"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "Serwer POP3 przed SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Uwierzytelnianie SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Żądaj raportów przeczytania"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Inform. o podwójnym dotknięcia"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index dc94efa..793c058 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "E-mail agendado"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Ver imagem"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Anexar ficheiros"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Rastreamento"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 antes de SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Autenticação SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Solicitar relatórios de leitura"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Aprenda sobre o toque duplo"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 1a0bcf2..4fed966 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "E-mail programado"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Ver imagem"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Anexar ficheiros"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Rastreio"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 antes de SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Autenticação SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Pedir relatórios de leitura"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Aprender a utilizar o duplo toque"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 695c7e2..7bfcf1f 100755 (executable)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1642,3 +1642,24 @@ msgstr "E-mail planificat"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Viz. imagine"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Ataşare fişiere"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Urmărire"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 înainte de SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Autentificare SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Solicitare rapoarte de citire"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Aflaţi despre atingerea dublă"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index d26b783..bfb4a0d 100755 (executable)
@@ -1277,7 +1277,7 @@ msgid "IDS_EMAIL_BODY_FLICK_UP_TO_SEARCH_ON_SERVER_AGAIN"
 msgstr "Проведите пальцем вверх, чтобы повторить поиск на сервере"
 
 msgid "IDS_EMAIL_BODY_HIGH_M_PRIORITY"
-msgstr "Ð\92Ñ\8bÑ\81окое"
+msgstr "Ð\92Ñ\8bÑ\81окий"
 
 msgid "IDS_EMAIL_BODY_NORMAL_M_EMAILPRIORITY"
 msgstr "Обычный"
@@ -1642,3 +1642,24 @@ msgstr "Запланированная электронная почта"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Просмотр картинки"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Вложить файлы"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Отслеживание"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 до SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Проверка подлинности SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Запрашивать отчеты о прочтении"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Сведения о двойном касании"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index ee2869c..8940884 100755 (executable)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1642,3 +1642,24 @@ msgstr "Naplánovaný e-mail"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Zobr. obrázok"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Pripojiť súbory"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Sledovanie"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 pred SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Overovanie SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Vyžiadať potvrdenia o prečítaní"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Informácie o dvojitom ťuknutí"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 984a3be..9ba16af 100755 (executable)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1642,3 +1642,24 @@ msgstr "Načrtovana e-pošta"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Prikaži sliko"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Priloži datoteke"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Sledenje"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 pred SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Preverjanje pristnosti za SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Zahtevaj poročila o branju"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Več o dvojnem pritiskanju"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 081169f..515cb7a 100755 (executable)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1642,3 +1642,24 @@ msgstr "Planirana e-poruka"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Prikaži sliku"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Priloži fajlove"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Praćenje"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 pre SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP autentikacija"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Zahtevaj izveštaje o čitanju"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Saznaj o dvostrukom kucanju"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 25b3509..4ca565e 100755 (executable)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1642,3 +1642,24 @@ msgstr "Schemalagt e-postmeddelande"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Visa bild"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Bifoga filer"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Spårning"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 före SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP-autentisering"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Begär läsrapporter"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Lär dig om dubbeltryckning"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 6483cfe..27bcc69 100755 (executable)
@@ -1136,7 +1136,7 @@ msgid "IDS_EMAIL_OPT_DATE"
 msgstr "Tarih"
 
 msgid "IDS_EMAIL_HEADER_SEARCH"
-msgstr "Akıllı Arama"
+msgstr "Buluyor"
 
 msgid "IDS_EMAIL_POP_UNABLE_TO_OPEN_EMAIL_MESSAGE"
 msgstr "E-posta mesajı açılamıyor"
@@ -1310,7 +1310,7 @@ msgid "IDS_EMAIL_BODY_SMTP_SERVER"
 msgstr "SMTP sunucusu"
 
 msgid "IDS_EMAIL_OPT_SEARCH"
-msgstr "Akıllı Arama"
+msgstr "Buluyor"
 
 msgid "IDS_EMAIL_OPT_SHARE"
 msgstr "Paylaşıma aç"
@@ -1642,3 +1642,24 @@ msgstr "Zamanlanan e-posta"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Resmi görüntüle"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Dosya ekle"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "İzleniyor"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "SMTP öncesinde POP3"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP kimlik denetimi"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Rapor okuma talep et"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Çift dokunma hakkında bilgi"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index a508bba..459875d 100755 (executable)
--- a/po/uk.po
+++ b/po/uk.po
@@ -455,7 +455,7 @@ msgid "IDS_EMAIL_SK3_REPLY"
 msgstr "Відповісти"
 
 msgid "IDS_EMAIL_SK3_FORWARD"
-msgstr "Переслати"
+msgstr "Пересла-\nти"
 
 msgid "IDS_EMAIL_BODY_DELETE"
 msgstr "Видалити"
@@ -1642,3 +1642,24 @@ msgstr "Заплановане повідомлення Email"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Перегл. зображ."
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Приєднати файли"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Відстеження"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 перед SMTP"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "Аутентифікація SMTP"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "Запитувати звіти про прочитання"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Відомості про подвійне постукування"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 6dc2c6a..4df962b 100755 (executable)
--- a/po/uz.po
+++ b/po/uz.po
@@ -1642,3 +1642,24 @@ msgstr "Rejalashtirilgan e-pochta"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "Rasmni ko‘rish"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "Fayllarni birikltirish"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "Joylashuv aniqlanmoqda"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "POP3 SMTPdan oldin"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP avtorizatsiyasi"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "O‘qilganlik haqidagi hisobotlarni talab qilish"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "Ikki marta chertish haqida ma’lumot"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index e9e6cb8..5bf0b84 100755 (executable)
@@ -197,7 +197,7 @@ msgid "IDS_EMAIL_OPT_PRINT"
 msgstr "打印"
 
 msgid "IDS_EMAIL_OPT_GALLERY"
-msgstr "相册"
+msgstr "图库"
 
 msgid "IDS_EMAIL_OPT_MY_FILES"
 msgstr "我的文件"
@@ -206,7 +206,7 @@ msgid "IDS_EMAIL_BODY_SHOW_IMAGES"
 msgstr "显示图像"
 
 msgid "IDS_EMAIL_OPT_SORT_BY"
-msgstr "排序通过"
+msgstr "排序方式"
 
 msgid "IDS_EMAIL_OPT_FLAG"
 msgstr "标记"
@@ -341,7 +341,7 @@ msgid "IDS_EMAIL_BODY_GB"
 msgstr "GB"
 
 msgid "IDS_EMAIL_HEADER_SORT_BY"
-msgstr "排序通过"
+msgstr "排序方式"
 
 msgid "IDS_EMAIL_SK_DELETE_ALL"
 msgstr "全部删除"
@@ -1642,3 +1642,24 @@ msgstr "预定的电子邮件"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "查看图像"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "附加文件"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "信件追踪"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "寄信 (POP3) 前需收信 (SMTP)"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP 验证"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "请求已读报告"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "了解“双击”动作"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 91ead87..093069f 100755 (executable)
@@ -146,7 +146,7 @@ msgid "IDS_EMAIL_OPT_LARGE_M_TEXTSIZE"
 msgstr "大"
 
 msgid "IDS_EMAIL_OPT_HUGE_M_TEXTSIZE"
-msgstr "大"
+msgstr "大"
 
 msgid "IDS_EMAIL_BODY_ALWAYS_CC_BCC_MYSELF"
 msgstr "總是抄送/密送自己"
@@ -206,7 +206,7 @@ msgid "IDS_EMAIL_BODY_SHOW_IMAGES"
 msgstr "顯示圖像"
 
 msgid "IDS_EMAIL_OPT_SORT_BY"
-msgstr "æ\8e\92åº\8fæ\8c\89"
+msgstr "æ\8e\92åº\8fæ\96¹å¼\8f"
 
 msgid "IDS_EMAIL_OPT_FLAG"
 msgstr "標誌"
@@ -341,7 +341,7 @@ msgid "IDS_EMAIL_BODY_GB"
 msgstr "GB"
 
 msgid "IDS_EMAIL_HEADER_SORT_BY"
-msgstr "æ\8e\92åº\8fæ\8c\89"
+msgstr "æ\8e\92åº\8fæ\96¹å¼\8f"
 
 msgid "IDS_EMAIL_SK_DELETE_ALL"
 msgstr "全部刪除"
@@ -581,7 +581,7 @@ msgid "IDS_EMAIL_OPT_UNREAD"
 msgstr "未讀取"
 
 msgid "IDS_EMAIL_MBODY_HUGE"
-msgstr "大"
+msgstr "大"
 
 msgid "IDS_EMAIL_BODY_MOVE_TO_TO"
 msgstr "移動到至"
@@ -1490,7 +1490,7 @@ msgid "IDS_EMAIL_BODY_ALL_ACCOUNTS"
 msgstr "所有帳戶"
 
 msgid "IDS_EMAIL_SK_SORT_BY"
-msgstr "æ\8e\92åº\8fæ\8c\89"
+msgstr "æ\8e\92åº\8fæ\96¹å¼\8f"
 
 msgid "IDS_EMAIL_HEADER_CREATE_FOLDER"
 msgstr "建立資料夾"
@@ -1642,3 +1642,24 @@ msgstr "預定的電子郵件"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "檢視圖像"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "附加檔案"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "信件追蹤"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "SMTP 之前的 POP3"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP 認證"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "要求閱讀報告"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "瞭解關於輕觸兩下"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 80a21aa..7ebea94 100755 (executable)
@@ -1642,3 +1642,24 @@ msgstr "预定的电子邮件"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "查看图像"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "附加文件"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "信件追踪"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "寄信 (POP3) 前需收信 (SMTP)"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP 验证"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "请求已读报告"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "关于双击"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 24da4be..6ac7cbe 100755 (executable)
@@ -863,7 +863,7 @@ msgid "IDS_EMAIL_BODY_ACCOUNT_PS_ALREADY_IN_USE"
 msgstr "帳號%s已被使用"
 
 msgid "IDS_EMAIL_POP_ACCOUNT_ALREADY_EXISTS"
-msgstr "帳已存在"
+msgstr "帳已存在"
 
 msgid "IDS_EMAIL_BODY_NO_SUBJECT"
 msgstr "無主旨"
@@ -1642,3 +1642,24 @@ msgstr "預定的電子郵件"
 msgid "IDS_EMAIL_OPT_VIEW_IMAGE"
 msgstr "檢視圖像"
 
+msgid "IDS_EMAIL_OPT_ATTACH_FILES"
+msgstr "附加檔案"
+
+msgid "IDS_EMAIL_OPT_TRACKING"
+msgstr "信件追蹤"
+
+msgid "IDS_EMAIL_BODY_POP3_BEFORE_SMTP"
+msgstr "寄信 (SMTP) 前需先收信 (POP3)"
+
+msgid "IDS_EMAIL_BODY_SMTP_AUTHENTICATION"
+msgstr "SMTP 認證"
+
+msgid "IDS_EMAIL_BODY_REQUEST_READ_REPORTS"
+msgstr "要求閱讀報告"
+
+msgid "IDS_EMAIL_POP_LEARN_ABOUT_DOUBLE_TAP"
+msgstr "瞭解關於輕觸兩下"
+
+msgid "IDS_EMAIL_BODY_REQUEST_DELIVERY_REPORTS"
+msgstr "Request delivery reports"
+
index 8ed3051..edb8fa5 100755 (executable)
@@ -56,7 +56,6 @@ static int _parse_option(service_h service, struct ug_data *ugd);
 static void _dispatch_view(struct ug_data *ugd);
 static void _create_navigationbar(struct ug_data *ugd);
 static Evas_Object *_create_layout(Evas_Object *parent, struct ug_data *ugd);
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event);
 
 static void _layout_block_cb(ui_gadget_h ug, enum ug_mode mode, void *priv);
 static void _result_block_cb(ui_gadget_h ug, service_h service, void *priv);
@@ -146,7 +145,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi
        elm_theme_extension_add(ugd->theme, EV_THEME_PATH);*/
 
        ugd->layout_main = _create_layout(parent, ugd);
-       evas_object_smart_callback_add(ugd->win, "profile,changed", _win_profile_changed_cb, ugd);
        _create_navigationbar(ugd);
        ugd->base = ugd->layout_main;
        elm_win_indicator_mode_set(ugd->win, ELM_WIN_INDICATOR_SHOW);
@@ -745,26 +743,6 @@ static Evas_Object *_create_layout(Evas_Object *parent, struct ug_data *ugd)
        return base;
 }
 
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event)
-{
-       debug_log("");
-       if (!data) {
-               debug_log("data is NULL");
-               return;
-       }
-
-       EmailSettingUGD *ugd = (EmailSettingUGD *)data;
-
-       const char *profile = elm_config_profile_get();
-       if (!g_strcmp0(profile, "desktop"))
-               elm_layout_theme_set(ugd->layout_main, "layout", "application", "noindicator");
-       else
-               elm_layout_theme_set(ugd->layout_main, "layout", "application", "default");
-
-       evas_object_size_hint_weight_set(ugd->layout_main, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_show(ugd->layout_main);
-}
-
 static void _layout_block_cb(ui_gadget_h ug, enum ug_mode mode, void *priv)
 {
        debug_log("");
index a3ac7bd..ff19947 100755 (executable)
@@ -21,7 +21,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/common/include)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs-viewer REQUIRED appcore-efl ui-gadget-1 x11 elementary ecore glib-2.0 gobject-2.0
                status capi-media-metadata-extractor capi-media-image-util capi-content-media-content
-               email-service edbus capi-appfw-application vconf ewebkit2 contacts-service2 sysman bundle dlog efreet-mime libmedia-utils calendar-service2 ethumb)
+               email-service edbus capi-appfw-application vconf ewebkit2
+               contacts-service2 sysman bundle dlog efreet-mime libmedia-utils calendar-service2 ethumb)
 
 FOREACH(flag ${pkgs-viewer_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
@@ -44,7 +45,6 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DDEBUG")
 ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
 ADD_DEFINITIONS("-DDATAFS=\"$ENV{DATAFS}\"")
-ADD_DEFINITIONS("-D_POPUP_WITH_LIST")
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${CMAKE_LDFLAGS} ${pkgs-viewer_LDFLAGS})
diff --git a/viewer/include/email-viewer-js.h b/viewer/include/email-viewer-js.h
deleted file mode 100755 (executable)
index 93a7c54..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2012  Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.tizenopensource.org/license
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef EMAIL_VIEWER_JS_H_
-#define EMAIL_VIEWER_JS_H_
-
-#include "email-viewer.h"
-
-#define VIEWER_JS_FILE_PATH    JSDIR"/email-viewer.js"
-
-#define COMPOSER_JS_REMOVE_IM                          "IM_JS.parentNode.removeChild(IM_JS);"
-
-#define VIEWER_JS_GET_HTML_BODY_CONTENT \
-       "function getHtmlContent() { " \
-               "console.log(\"Here\");" \
-               "var elements = document.getElementsByTagName(\"body\");" \
-               "console.log(\"elements[0].outerHTML : \" + elements[0].outerHTML);" \
-               "return elements[0].outerHTML;" \
-       "};" \
-       "getHtmlContent();"
-
-#define VIEWER_JS_INSERT_IM(s) \
-       "var IM_JS = document.createElement(\"script\");" \
-       "IM_JS.setAttribute(\"type\", \"text/javascript\");" \
-       "IM_JS.setAttribute(\"src\", \""s"\");" \
-       "console.log(IM_JS);" \
-       "if (typeof IM_JS != \"undefined\")" \
-               "document.getElementsByTagName(\"head\")[0].appendChild(IM_JS);"
-
-
-#endif /* EMAIL_VIEWER_JS_H_ */
index f3dcf93..c601fcb 100755 (executable)
@@ -63,8 +63,8 @@ void _create_notify_3btn(EmailViewerUGD *ug_data, char *header, char *content,
 
 int _find_folder_id_using_folder_type(EmailViewerUGD *ug_data, email_mailbox_type_e mailbox_type);
 
-void _move_email(EmailViewerUGD *ug_data, int dest_folder_id, gboolean is_delete);
-void _delete_email(EmailViewerUGD *ug_data);
+int _move_email(EmailViewerUGD *ug_data, int dest_folder_id, gboolean is_delete);
+int _delete_email(EmailViewerUGD *ug_data);
 void _notify_mailbox_size(EmailViewerUGD *ug_data, char *size);
 
 int viewer_get_filepath_from_path(char *default_path, char *origin_path, char *new_path, Eina_Bool get_new_path);
index 48cae75..2638d9c 100755 (executable)
@@ -480,7 +480,7 @@ int _find_folder_id_using_folder_type(EmailViewerUGD *ug_data, email_mailbox_typ
        return -1;
 }
 
-void _move_email(EmailViewerUGD *ug_data, int dest_folder_id, gboolean is_delete)
+int _move_email(EmailViewerUGD *ug_data, int dest_folder_id, gboolean is_delete)
 {
        debug_log("");
 
@@ -498,6 +498,7 @@ void _move_email(EmailViewerUGD *ug_data, int dest_folder_id, gboolean is_delete
                                                        _("IDS_EMAIL_POP_FAILED_TO_MOVE"), 0,
                                                        NULL, NULL, NULL, NULL, _popup_response_cb);
 
+               return 0;
        } else {
                debug_log("account_id: %d, moveto folder id: %d, mail_id: %d", priv->account_id, dest_folder_id, priv->mail_id);
                char str[128] = { 0, };
@@ -508,10 +509,11 @@ void _move_email(EmailViewerUGD *ug_data, int dest_folder_id, gboolean is_delete
                int ret = status_message_post(str);
                if (ret)
                        debug_log("status_message_post failed: %d", ret);
+               return 1;
        }
 }
 
-void _delete_email(EmailViewerUGD *ug_data)
+int _delete_email(EmailViewerUGD *ug_data)
 {
        debug_log("");
 
@@ -546,6 +548,7 @@ void _delete_email(EmailViewerUGD *ug_data)
                _create_notify(ug_data, _("IDS_EMAIL_POP_ALERT"),
                                                _("IDS_EMAIL_POP_FAILED_TO_DELETE"), 0,
                                                NULL, NULL, NULL, NULL, _popup_response_cb);
+               return 0;
        } else {
                debug_log("account_id: %d, mailbox_id: %d, mail_id: %d", priv->account_id, priv->mailbox_id, priv->mail_id);
                char str[128] = { 0, };
@@ -553,6 +556,7 @@ void _delete_email(EmailViewerUGD *ug_data)
                int ret = status_message_post(str);
                if (ret)
                        debug_log("status_message_post failed: %d", ret);
+               return 1;
        }
 }
 
index d569186..7cc0dac 100755 (executable)
  * limitations under the License.
  */
 
+#include <status.h>
+#include <media_content.h>
+
 #include "email-viewer-webview.h"
-#include "email-viewer-js.h"
 #include "email-viewer-utils.h"
 #include "email-debug.h"
 #include "email-engine.h"
@@ -68,7 +70,6 @@ Evas_Object *viewer_get_webview(EmailViewerUGD *ug_data, gboolean has_html)
        evas_object_smart_callback_add(ug_data->webview, "scroll,up", _webview_scroll_up_cb, ug_data);
        evas_object_smart_callback_add(ug_data->webview, "scroll,down", _webview_scroll_down_cb, ug_data);
 
-       /*evas_object_smart_callback_add(ug_data->webkit, "load,progress", _webview_progressed_cb, ug_data);*/
        evas_object_smart_callback_add(ug_data->webview, "load,committed", _webview_load_committed_cb, ug_data);
        evas_object_smart_callback_add(ug_data->webview, "load,finished", _webview_load_finished_cb, ug_data);
        evas_object_smart_callback_add(ug_data->webview, "load,nonemptylayout,finished", _webview_load_noemptylayout_finished_cb, ug_data);
@@ -143,7 +144,6 @@ void viewer_set_webview_content(EmailViewerUGD *ug_data, int reload)
        debug_log("default encoding:%s", ug_data->property->charset);
        Ewk_Setting *setting = ewk_view_setting_get(ug_data->webview);
        ewk_setting_default_encoding_set(setting, ug_data->property->charset);
-//     ewk_view_encoding_custom_set(ug_data->webview, ug_data->property->charset);
        ewk_view_uri_set(ug_data->webview, tmp_file_path);
 }
 
@@ -236,11 +236,6 @@ static void _webview_script_executed_cb(Evas_Object *o, const char *result, void
 static void _webview_get_html_content_cb(Evas_Object *o, const char *result, void *data)
 {
        debug_log("");
-
-//     EmailViewerUGD *ug_data = (EmailViewerUGD *)data;
-
-//     ug_data->saved_html_content = g_strdup(result);
-//     debug_log("ug_data->saved_html_content => %s", ug_data->saved_html_content);
 }
 
 static Eina_Bool _loading_prog_finish_cb(void *data)
@@ -289,9 +284,6 @@ static void _webview_load_finished_cb(void *data, Evas_Object *obj, void *event_
        }
        ug_data->timer = ecore_timer_add(0.0, viewer_send_message, ug_data);
 
-       if (ewk_view_script_execute(ug_data->webview, VIEWER_JS_INSERT_IM(VIEWER_JS_FILE_PATH), _webview_script_executed_cb, 0) == EINA_FALSE)
-               debug_log("VIEWER_JS_INSERT_IM(VIEWER_JS_FILE_PATH) failed.");
-
        double scale, t_scale, ratio, mins, maxs;
        int w, h;
        scale = ewk_view_scale_get(ug_data->webview);
@@ -404,14 +396,14 @@ static void _webview_edge_bottom_cb(void *data, Evas_Object *obj, void *event_in
        debug_log("");
 }
 
-static void _webview_scroll_down_cb(void *data, Evas_Object *obj, void *event_info)
+static void _webview_scroll_up_cb(void *data, Evas_Object *obj, void *event_info)
 {
-//     debug_log("");
+       //debug_log("");
 }
 
-static void _webview_scroll_up_cb(void *data, Evas_Object *obj, void *event_info)
+static void _webview_scroll_down_cb(void *data, Evas_Object *obj, void *event_info)
 {
-//     debug_log("");
+       //debug_log("");
 }
 
 static void _webview_mouse_down_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info)
@@ -506,7 +498,6 @@ static void _webview_contextmenu_customize_cb(void *data, Evas_Object *obj, void
 
        if (isText == EINA_TRUE) {
                ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_TAG_COPY, _("IDS_EMAIL_OPT_COPY"), EINA_TRUE);
-//             ewk_context_menu_item_append_as_action(contextmenu, EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG + 4, _("IDS_EMAIL_OPT_SHARE"), EINA_TRUE);
                ewk_context_menu_item_append(contextmenu, EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG, NULL, IMGDIR"/icon_search.png", EINA_TRUE);
        } else {
                if (isImage == EINA_TRUE) {
@@ -582,7 +573,6 @@ static void _webview_contextmenu_selected_cb(void *data, Evas_Object *webview, v
                        } else {
                                char str[128] = { 0, };
                                snprintf(str, sizeof(str), "%s", dgettext("sys_string", "IDS_COM_POP_SAVED"));
-                               /*_show_select_info(ug_data, str);*/
                                ret = status_message_post(str);
                                if (ret)
                                        debug_log("status_message_post failed: %d", ret);
index 2c1d658..f894258 100755 (executable)
@@ -66,7 +66,6 @@ static ui_gadget_h create_ug(char *ug_name, service_h bd, void *data);
 static void _create_view(EmailViewerUGD *ug_data);
 static void _reset_view(EmailViewerUGD *ug_data);
 
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event);
 static void _timezone_changed_cb(keynode_t *key, void *data);
 
 static Evas_Object *_create_navigation_bar(EmailViewerUGD *ug_data);
@@ -78,7 +77,6 @@ static Evas_Object *_create_attach(EmailViewerUGD *ug_data);
 static Evas_Object *_create_attach_ex(EmailViewerUGD *ug_data);
 static Evas_Object *_create_body(EmailViewerUGD *ug_data);
 static Evas_Object *_create_tab_bar(EmailViewerUGD *ug_data);
-//static Evas_Object *_update_tab_bar(EmailViewerUGD *ug_data);
 static Evas_Object *_create_partial_body_dn_btn(EmailViewerUGD *ug_data);
 static Evas_Object *_create_bg(Evas_Object *win);
 
@@ -96,7 +94,6 @@ static void _reply_cb(void *data, Evas_Object *obj, void *event_info);
 static void _reply_all_cb(void *data, Evas_Object *obj, void *event_info);
 static void _reply_option_cb(void *data, Evas_Object *obj, void *event_info);
 static void _forward_cb(void *data, Evas_Object *obj, void *event_info);
-static void _launch_message_composer(EmailViewerUGD *ug_data);
 static void _resend_cb(void *data, Evas_Object *obj, void *event_info);
 static void _cancel_send_cb(void *data, Evas_Object *obj, void *event_info);
 static void _edit_email_cb(void *data, Evas_Object *obj, void *event_info);
@@ -121,6 +118,7 @@ static void _ctxpopup_detail_contact_cb(void *data, Evas_Object *obj, void *even
 static void _ctxpopup_send_email_cb(void *data, Evas_Object *obj, void *event_info);
 static void _ctxpopup_add_contact_cb(void *data, Evas_Object *obj, void *event_info);
 static void _ctxpopup_add_block_rule_cb(void *data, Evas_Object *obj, void *event_info);
+static void _ctxpopup_remove_block_rule_cb(void *data, Evas_Object *obj, void *event_info);
 static void _popup_waiting_response_cb(void *data, Evas_Object *obj, void *event_info);
 static void _popup_response_cb(void *data, Evas_Object *obj, void *event_info);
 static void _popup_response_delete_ok_cb(void *data, Evas_Object *obj, void *event_info);
@@ -128,8 +126,6 @@ static void _popup_response_move_to_trash_cb(void *data, Evas_Object *obj, void
 static void _popup_response_delete_permanent_cb(void *data, Evas_Object *obj, void *event_info);
 static void _popup_response_to_destroy_cb(void *data, Evas_Object *obj, void *event_info);
 
-static void _webview_multi_up_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info);
-static void _webview_multi_down_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info);
 static void _webview_policy_navigation_decide_cb(void *data, Evas_Object *obj, void *event_info);
 
 static void _outter_scroller_bottom_hit_cb(void *data, Evas_Object *obj, void *event_info);
@@ -191,7 +187,6 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
                return -1;
 
        _g_ug_data = ug_data;
-//     g_type_init();
 
        ops->create = on_create;
        ops->start = on_start;
@@ -255,11 +250,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h data, void *
                return NULL;
        }
 
-/*     Elm_Theme *theme = elm_theme_new();
-       elm_theme_ref_set(theme, NULL);
-       ug_data->theme = theme;
-       elm_theme_extension_add(ug_data->theme, EV_THEME_PATH);*/
-
        int ret;
        ret = service_get_extra_data(data, EMAIL_BUNDLE_KEY_ACCOUNT_ID, (char **)&account_id);
        debug_log("service_get_extra_data: %d", ret);
@@ -493,12 +483,6 @@ static void on_destroy(ui_gadget_h ug, service_h data, void *pd)
                        email_engine_stop_working(ug_data->account_id, priv->download_all_email_handle[i]);
        }
 
-/*     if (ug_data->theme) {
-               elm_theme_extension_del(ug_data->theme, EV_THEME_PATH);
-               elm_theme_free(ug_data->theme);
-               ug_data->theme = NULL;
-       }*/
-
        _delete_evas_objects(ug_data);
 
        debug_log("free webview_data");
@@ -945,7 +929,7 @@ static void on_key_event(ui_gadget_h ug, enum ug_key_event event, service_h data
 static void layout_cb(ui_gadget_h ug, enum ug_mode mode, void *priv)
 {
        debug_log("");
-       Evas_Object *base, *win;
+       Evas_Object *base;
 
        if (!ug || !priv)
                return;
@@ -954,8 +938,6 @@ static void layout_cb(ui_gadget_h ug, enum ug_mode mode, void *priv)
        if (!base)
                return;
 
-       win = ug_get_window();
-
        switch (mode) {
        case UG_MODE_FULLVIEW:
                evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -972,50 +954,6 @@ static void result_cb(ui_gadget_h ug, service_h result, void *priv)
 
        if (!ug || !priv)
                return;
-
-       EmailViewerUGD *ug_data = (EmailViewerUGD *)priv;
-       EmailViewerProp *prop = ug_data->property;
-       EmailViewerPrivate *private = ug_data->email_data;
-
-       if (ug == ug_data->ug_composer) {
-               char *cmd = NULL;
-               int ret = service_get_extra_data(result, EMAIL_BUNDLE_KEY_SAVE_ALL, (char **)&cmd);
-               debug_log("service_get_extra_data: %d", ret);
-               debug_log("return of bundle_get_val for save all(%s)", cmd);
-               if (cmd) {
-                       debug_log("save all from composer(%s), real_att_len(%d), att_len(%d)", cmd, prop->real_att_len, prop->att_len);
-
-                       if (prop->real_att_len == 1) {
-                               private->b_all_att_save = TRUE;
-                               _save_attachment(ug_data, 0);
-                       } else if (prop->real_att_len > 1) {
-                               _save_attachment_all(ug_data);
-                       }
-                       g_free(cmd);
-                       return;
-               }
-
-               ret = service_get_extra_data(result, EMAIL_BUNDLE_KEY_CANCEL_ALL, (char **)&cmd);
-               debug_log("service_get_extra_data: %d", ret);
-               debug_log("return of bundle_get_val for cancel all(%s)", cmd);
-               if (cmd) {
-                       debug_log("cancel all attachment from composer(%s)", cmd);
-
-                       _cancel_download_attachment(ug_data);
-                       g_free(cmd);
-                       return;
-               }
-
-               ret = service_get_extra_data(result, EMAIL_BUNDLE_KEY_UPDATE, (char **)&cmd);
-               debug_log("service_get_extra_data: %d", ret);
-               debug_log("return of bundle_get_val for cancel all(%s)", cmd);
-               if (cmd) {
-                       debug_log("update attachments in viewer(%s)", cmd);
-                       //ancel_download_attachment(ug_data);
-                       g_free(cmd);
-                       return;
-               }
-       }
 }
 
 static void destroy_cb(ui_gadget_h ug, void *priv)
@@ -1076,8 +1014,6 @@ static void _create_view(EmailViewerUGD *ug_data)
        /* indicator */
        elm_win_indicator_mode_set(ug_data->win_main, ELM_WIN_INDICATOR_SHOW);
 
-       evas_object_smart_callback_add(ug_data->win_main, "profile,changed", _win_profile_changed_cb, ug_data);
-
        /* navigation Bar */
        _create_navigation_bar(ug_data);
 
@@ -1093,7 +1029,7 @@ static void _create_view(EmailViewerUGD *ug_data)
        evas_object_smart_callback_add(b_btn, "clicked", _back_cb, ug_data);
        ug_data->b_btn = b_btn;
 
-       ug_data->navi_main_it = elm_naviframe_item_push(ug_data->navi_bar, NULL/*prop->sender_display_name*/, b_btn, NULL, ug_data->sub_ly, NULL);
+       ug_data->navi_main_it = elm_naviframe_item_push(ug_data->navi_bar, NULL, b_btn, NULL, ug_data->sub_ly, NULL);
        elm_naviframe_item_title_visible_set(ug_data->navi_main_it, EINA_FALSE);
 
        _create_tab_bar(ug_data);
@@ -1216,14 +1152,6 @@ static void _reset_view(EmailViewerUGD *ug_data)
 
        elm_object_part_text_set(ug_data->ly_subject, "elm.text.sub", date_time);
 
-       /* reset icons */
-       /*Evas_Object *attach_icon = elm_icon_add(ug_data->ly_subject);
-       elm_icon_file_set(attach_icon, IMGDIR "/M02_email_icon_attach.png", NULL);
-       evas_object_size_hint_aspect_set(attach_icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-       elm_icon_resizable_set(attach_icon, 1, 1);
-       elm_object_part_content_set(ug_data->ly_subject, "elm.icon.attach", attach_icon);
-       evas_object_show(attach_icon);*/
-
        Evas_Object *favorite_icon = elm_icon_add(ug_data->ly_subject);
        switch(prop->favorite)
        {
@@ -1390,39 +1318,6 @@ void _hide_view(EmailViewerUGD *ug_data)
 
        ewk_view_uri_set(ug_data->webview, EMAIL_DEFAULT_HTML);
 
-#ifdef _URI_SET
-       ewk_view_uri_set(ug_data->webview, EMAIL_DEFAULT_HTML/*""*/);
-#else
-       char tmp_file_path[MAX_PATH_LEN] = { 0, };
-       char *file_stream = NULL;
-       int file_size = 0;
-       FILE *fp = NULL;
-
-       fp = fopen(DATADIR"/_email_default.html", "r");
-       if (fp != NULL) {
-               fseek(fp, 0L, SEEK_END);
-               file_size = ftell(fp);
-               debug_log("file size: %d", file_size);
-               fseek(fp, 0L, SEEK_SET);
-
-               if (file_size > 0) {
-                       file_stream = calloc(file_size, sizeof(char));
-
-                       if (file_stream) {
-                               if (fread(file_stream, sizeof(char), file_size, fp) != file_size) {
-                                       debug_log("error in fread");
-                               }
-                       }
-               }
-
-               fclose(fp);
-       }
-
-       snprintf(tmp_file_path, sizeof(tmp_file_path), "file://%s", RESDIR);
-       debug_log("tmp_file_path [%s]", tmp_file_path);
-       ewk_view_contents_set(ug_data->webview, file_stream, file_size, NULL, DEFAULT_CHARSET, tmp_file_path);
-       g_free(file_stream);
-#endif
        _viewer_remove_temp_folder();
 
        debug_log("free address info list");
@@ -1450,26 +1345,6 @@ void _hide_view(EmailViewerUGD *ug_data)
        ug_data->is_main_scroller_scrolling = EINA_FALSE;
 }
 
-static void _win_profile_changed_cb(void *data, Evas_Object *obj, void *event)
-{
-       debug_log("");
-       if (!data) {
-               debug_log("data is NULL");
-               return;
-       }
-
-       EmailViewerUGD *ug_data = (EmailViewerUGD *)data;
-
-       const char *profile = elm_config_profile_get();
-       if (!g_strcmp0(profile, "desktop"))
-               elm_layout_theme_set(ug_data->layout_main, "layout", "application", "noindicator");
-       else
-               elm_layout_theme_set(ug_data->layout_main, "layout", "application", "default");
-
-       evas_object_size_hint_weight_set(ug_data->layout_main, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_show(ug_data->layout_main);
-}
-
 static void _timezone_changed_cb(keynode_t *key, void *data)
 {
        debug_enter();
@@ -1566,13 +1441,6 @@ static Evas_Object *_create_subject(EmailViewerUGD *ug_data)
 
        elm_object_part_text_set(di, "elm.text.sub", date_time);
 
-       /*Evas_Object *attach_icon = elm_icon_add(di);
-       elm_icon_file_set(attach_icon, IMGDIR "/M02_email_icon_attach.png", NULL);
-       evas_object_size_hint_aspect_set(attach_icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-       elm_icon_resizable_set(attach_icon, 1, 1);
-       elm_object_part_content_set(di, "elm.icon.attach", attach_icon);
-       evas_object_show(attach_icon);*/
-
        Evas_Object *favorite_icon = elm_icon_add(di);
        switch(prop->favorite)
        {
@@ -2068,8 +1936,6 @@ static Evas_Object *_create_body(EmailViewerUGD *ug_data)
                evas_object_show(ug_data->webview_bx);
                evas_object_show(ug_data->webview);
                elm_box_pack_end(ug_data->main_bx, ug_data->webview_bx);
-
-//             _update_tab_bar(ug_data);
        } else {
                /* create webview layout */
                ug_data->webview_bx = _load_edj(ug_data->navi_bar, EV_THEME_PATH, "layout.email.web_view");
@@ -2225,7 +2091,6 @@ static Evas_Object *_create_partial_body_dn_btn(EmailViewerUGD *ug_data)
        Evas_Object *dn_btn = elm_button_add(ug_data->navi_bar);
        elm_object_text_set(dn_btn, _("IDS_EMAIL_BODY_DOWNLOAD_FULL_MESSAGE"));
        evas_object_smart_callback_add(dn_btn, "clicked", _body_down_cb, (void *)ug_data);
-       /*elm_object_theme_set(dn_btn, ug_data->theme);*/
        elm_object_style_set(dn_btn, "text_only/style2");
        evas_object_show(dn_btn);
        ug_data->partial_dn_btn = dn_btn;
@@ -2384,7 +2249,6 @@ static void _create_down_progress_ex(int index, EMAIL_VIEWER_PROGRESSBAR_TYPE p_
        evas_object_show(progressbar);
 
        Evas_Object *cancel_btn = elm_button_add(pbar_ly);
-       /*elm_object_theme_set(cancel_btn, ug_data->theme);*/
        elm_object_style_set(cancel_btn, "text_only/style2");
        elm_object_text_set(cancel_btn, dgettext("sys_string", "IDS_COM_SK_CANCEL"));
 
@@ -2588,7 +2452,7 @@ static void _create_more_ctxpopup(EmailViewerUGD *ug_data, Evas_Object *obj)
 
                elm_ctxpopup_item_append(ug_data->con_popup, dgettext("sys_string", "IDS_COM_BODY_MOVE"), NULL, _move_cb, ug_data);
                elm_ctxpopup_item_append(ug_data->con_popup, _("IDS_EMAIL_OPT_SAVE_EMAIL_ABB"), icon, _save_email_cb, ug_data);
-/*
+
                if (contact_list_item) {
                        debug_log("Contact Item Exist: index[%d]", contact_list_item->index);
                        char index[10] = { 0, };
@@ -2599,16 +2463,10 @@ static void _create_more_ctxpopup(EmailViewerUGD *ug_data, Evas_Object *obj)
                        ug_data->create_contact_arg = CONTACTUI_REQ_ADD_EMAIL;
                        elm_ctxpopup_item_append(ug_data->con_popup, dgettext("sys_string", "IDS_COM_OPT_ADD_TO_CONTACTS"), NULL, _ctxpopup_add_contact_cb, prop->sender);
                }
-               elm_ctxpopup_item_append(ug_data->con_popup, _("IDS_EMAIL_OPT_ADD_TO_CALENDAR"), NULL, _add_to_calendar_cb, ug_data);
-*/
-               if (ug_data->account_type != EMAIL_SERVER_TYPE_ACTIVE_SYNC) {
-                       if (ug_data->mailbox_type != EMAIL_MAILBOX_TYPE_SPAMBOX)
-                               ug_data->more_ctx_block_item = elm_ctxpopup_item_append(ug_data->con_popup, _("IDS_EMAIL_OPT_BLOCK"), NULL, _ctxpopup_add_block_rule_cb, prop->sender);
-               }
 
-               if (ug_data->mailbox_type != EMAIL_MAILBOX_TYPE_SPAMBOX) {
                        int count, i;
                        email_rule_t *rule_list = NULL;
+                       bool is_blocked = FALSE;
 
                        /* get the rule list from service */
                        if (email_get_rule_list(&rule_list, &count) < 0) {
@@ -2616,13 +2474,13 @@ static void _create_more_ctxpopup(EmailViewerUGD *ug_data, Evas_Object *obj)
                        } else {
                                if (count > 0) {
                                        for (i = 0; i < count; i++) {
-                                               if (rule_list[i].type == EMAIL_FILTER_FROM/*TYPE_BLOCK_ADDRESS*/) {
+                                               if (rule_list[i].type == EMAIL_FILTER_FROM) {
                                                        debug_log("block address %s", rule_list[i].value);
 
                                                        if (g_strcmp0(rule_list[i].value, prop->sender) == 0) {
                                                                debug_log("[%s] already blocked", rule_list[i].value);
-                                                               if (ug_data->more_ctx_block_item)
-                                                                       elm_object_item_disabled_set(ug_data->more_ctx_block_item, EINA_TRUE);
+                                                               is_blocked = TRUE;
+                                                               break;
                                                        }
                                                }
                                        }
@@ -2630,6 +2488,12 @@ static void _create_more_ctxpopup(EmailViewerUGD *ug_data, Evas_Object *obj)
                                /* free email rule_list */
                                email_free_rule(&rule_list, count);
                        }
+
+               if (ug_data->account_type != EMAIL_SERVER_TYPE_ACTIVE_SYNC) {
+                       if (is_blocked == FALSE)
+                               ug_data->more_ctx_block_item = elm_ctxpopup_item_append(ug_data->con_popup, _("IDS_EMAIL_OPT_BLOCK"), NULL, _ctxpopup_add_block_rule_cb, prop->sender);
+                       else
+                               ug_data->more_ctx_block_item = elm_ctxpopup_item_append(ug_data->con_popup, N_("Unblock"), NULL, _ctxpopup_remove_block_rule_cb, prop->sender);
                }
        }
 
@@ -2963,13 +2827,8 @@ static void _reply_cb(void *data, Evas_Object *obj, void *event_info)
                ug_data->con_popup = NULL;
        }
 
-       debug_log("mailbox_type:%d, message_class:%d", ug_data->mailbox_type, ug_data->email_data->mail_info->message_class);
-       if (ug_data->mailbox_type == EMAIL_MAILBOX_TYPE_INBOX && ug_data->email_data->mail_info->message_class == EMAIL_MESSAGE_CLASS_SMS) {
-               _launch_message_composer(ug_data);
-       } else {
-               ug_data->display_download_result = FALSE;
-               _launch_composer(ug_data, RUN_COMPOSER_REPLY);
-       }
+       ug_data->display_download_result = FALSE;
+       _launch_composer(ug_data, RUN_COMPOSER_REPLY);
 
        if (ug_data->notify) {
                evas_object_del(ug_data->notify);
@@ -2992,13 +2851,8 @@ static void _reply_all_cb(void *data, Evas_Object *obj, void *event_info)
                ug_data->con_popup = NULL;
        }
 
-       debug_log("mailbox_type:%d, message_class:%d", ug_data->mailbox_type, ug_data->email_data->mail_info->message_class);
-       if (ug_data->mailbox_type == EMAIL_MAILBOX_TYPE_INBOX && ug_data->email_data->mail_info->message_class == EMAIL_MESSAGE_CLASS_SMS) {
-               _launch_message_composer(ug_data);
-       } else {
-               ug_data->display_download_result = FALSE;
-               _launch_composer(ug_data, RUN_COMPOSER_REPLY_ALL);
-       }
+       ug_data->display_download_result = FALSE;
+       _launch_composer(ug_data, RUN_COMPOSER_REPLY_ALL);
 
        if (ug_data->notify) {
                evas_object_del(ug_data->notify);
@@ -3034,60 +2888,8 @@ static void _forward_cb(void *data, Evas_Object *obj, void *event_info)
                ug_data->con_popup = NULL;
        }
 
-       debug_log("mailbox_type:%d, message_class:%d", ug_data->mailbox_type, ug_data->email_data->mail_info->message_class);
-       if (ug_data->mailbox_type == EMAIL_MAILBOX_TYPE_INBOX && ug_data->email_data->mail_info->message_class == EMAIL_MESSAGE_CLASS_SMS) {
-               _launch_message_composer(ug_data);
-       } else {
-               ug_data->display_download_result = FALSE;
-               _launch_composer(ug_data, RUN_COMPOSER_FORWARD);
-       }
-}
-
-static void _launch_message_composer(EmailViewerUGD *ug_data)
-{
-       debug_log("");
-
-       if (!ug_data) {
-               debug_log("ug_data is NULL");
-               return;
-       }
-
-       int ret;
-       service_h service = NULL;
-
-       ret = service_create(&service);
-       debug_log("service_create: %d", ret);
-       if (!service) {
-               debug_log("service create failed");
-               return;
-       }
-
-       debug_log("full_address_from [%s]", ug_data->email_data->mail_info->full_address_from);
-#ifndef _MSG_COMPOSER_BY_APP_CONTROL_
-       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_TO, ug_data->email_data->mail_info->full_address_from);
-       debug_log("service_add_extra_data: %d", ret);
-
-       create_ug(UG_NAME_MESSAGE_COMPOSER, service, ug_data);
-#else
-       ret = service_set_window(service, elm_win_xwindow_get(ug_data->win_main));
-       debug_log("service_set_window: %d", ret);
-       ret = service_set_app_id(service, UG_NAME_MESSAGE_COMPOSER);
-       debug_log("service_set_app_id: %d", ret);
-       ret = service_set_operation(service, SERVICE_OPERATION_SEND_TEXT);
-       debug_log("service_set_operation: %d", ret);
-       ret = service_add_extra_data(service, SERVICE_DATA_TO, ug_data->email_data->mail_info->full_address_from);
-       debug_log("service_add_extra_data: %d", ret);
-       ret = service_send_launch_request(service, NULL, NULL);
-       debug_log("service_send_launch_request: %d", ret);
-#endif
-
-       ret = service_destroy(service);
-       debug_log("service_destroy: %d", ret);
-
-       if (ug_data->notify) {
-               evas_object_del(ug_data->notify);
-               ug_data->notify = NULL;
-       }
+       ug_data->display_download_result = FALSE;
+       _launch_composer(ug_data, RUN_COMPOSER_FORWARD);
 }
 
 static void _resend_cb(void *data, Evas_Object *obj, void *event_info)
@@ -3120,27 +2922,6 @@ static void _resend_cb(void *data, Evas_Object *obj, void *event_info)
        /* close viewer */
        if (ug_data->b_internal) {
                _hide_view(ug_data);
-
-               /* send next or previous mail request to mailbox. */
-/*             int ret;
-               service_h service = NULL;
-
-               ret = service_create(&service);
-               debug_log("service_create: %d", ret);
-               if (!service) {
-                       debug_log("service create failed");
-                       return;
-               }
-
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
-               debug_log("service_add_extra_data: %d", ret);
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "1");
-               debug_log("service_add_extra_data: %d", ret);
-
-               ug_send_message(_g_mailbox_ug, service);
-
-               ret = service_destroy(service);
-               debug_log("service_destroy: %d", ret);*/
        } else {
                debug_log("ug_destory_me");
                ug_destroy_me(ug_data->ug);
@@ -3284,24 +3065,25 @@ static void _move_cb(void *data, Evas_Object *obj, void *event_info)
        ug_data->move_mailbox_count = mailbox_count;
 
        for (i = 0; i < mailbox_count; i++) {
-               if (g_strcmp0(ug_data->mailbox_name, mailbox_list[i].mailbox_name) != 0) {
-                       if (mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_OUTBOX &&
-                               mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_SENTBOX &&
-                               mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_DRAFT &&
-                               mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_TRASH &&
-                               mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_ALL_EMAILS &&
-                               mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_SEARCH_RESULT)
-                               if (g_strcmp0(mailbox_list[i].alias, "[Gmail]")) {
-                                       elm_genlist_item_append(gl, &ug_data->itc1, (void *)&(mailbox_list[i]), NULL, ELM_GENLIST_ITEM_NONE, _move_here_cb, (void *)&(mailbox_list[i]));
-                               }
+               if (mailbox_list[i].mailbox_id != ug_data->mailbox_id &&
+                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_OUTBOX &&
+                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_SENTBOX &&
+                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_DRAFT &&
+                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_TRASH &&
+                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_ALL_EMAILS &&
+                       mailbox_list[i].mailbox_type != EMAIL_MAILBOX_TYPE_SEARCH_RESULT) {
+                       if (g_strcmp0(mailbox_list[i].alias, "[Gmail]")) {
+                               elm_genlist_item_append(gl, &ug_data->itc1, (void *)&(mailbox_list[i]), NULL, ELM_GENLIST_ITEM_NONE, _move_here_cb, (void *)&(mailbox_list[i]));
+                       } else {
+                               Elm_Object_Item *item = elm_genlist_item_append(gl, &ug_data->itc1, (void *)&(mailbox_list[i]), NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+                               elm_object_item_disabled_set(item, EINA_TRUE);
+                       }
+               } else {
+                       Elm_Object_Item *item = elm_genlist_item_append(gl, &ug_data->itc1, (void *)&(mailbox_list[i]), NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+                       elm_object_item_disabled_set(item, EINA_TRUE);
                }
        }
 
-       /*if (ug_data->b_internal)
-               elm_layout_theme_set(ug_data->layout_main, "layout", "application", "noindicator");
-       else
-               elm_layout_theme_set(ug_data->layout_main, "layout", "application", "default");*/
-
        Evas_Object *move_back_btn = NULL;
        move_back_btn = elm_object_item_part_content_get(navi_it, "prev_btn");
        if (move_back_btn) {
@@ -3867,17 +3649,11 @@ static Eina_Bool _save_email_prog_cb(void *data)
                                                dgettext("sys_string", "IDS_COM_POP_UNABLE_TO_SAVE"), 0,
                                                NULL, NULL, NULL, NULL, _popup_response_cb);
        } else {
-#ifdef _SMALL_NOTI
                char str[128] = { 0, };
                snprintf(str, sizeof(str), "%s", N_("Saved in My files"));
                int ret = status_message_post(str);
                if (ret)
                        debug_log("status_message_post failed: %d", ret);
-#else
-               _create_notify(ug_data, dgettext("sys_string", "IDS_COM_OPT_INFORMATION"),
-                                               N_("Saved in My files"), 0,
-                                               NULL, NULL, NULL, NULL, _popup_response_cb);
-#endif
        }
 
        if (attachment_t && attachment_count > 0) {
@@ -4104,6 +3880,8 @@ static void _ctxpopup_add_block_rule_cb(void *data, Evas_Object *obj, void *even
        rule->flag2 = RULE_TYPE_INCLUDES;
 
        ret = email_add_rule(rule);
+       email_free_rule(&rule, 1);
+
        if (ret < 0) {
                debug_log("email_add_rule failed %d", ret);
                _create_notify(ug_data, _("IDS_EMAIL_POP_ALERT"),
@@ -4124,20 +3902,97 @@ static void _ctxpopup_add_block_rule_cb(void *data, Evas_Object *obj, void *even
                        if (ret)
                                debug_log("status_message_post failed: %d", ret);
                }
+
+               if (ug_data->isRotate == false && ug_data->b_internal) {
+                       _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
+               }
+
+               /* close viewer */
+               if (ug_data->b_internal) {
+                       _hide_view(ug_data);
+               } else {
+                       debug_log("ug_destory_me");
+                       ug_destroy_me(ug_data->ug);
+               }
        }
+}
 
-       email_free_rule(&rule, 1);
+static void _ctxpopup_remove_block_rule_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       debug_log("");
 
-       if (ug_data->isRotate == false && ug_data->b_internal) {
-               _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
+       if (!data || !_g_ug_data) {
+               debug_log("data is NULL");
+               return;
        }
 
-       /* close viewer */
-       if (ug_data->b_internal) {
-               _hide_view(ug_data);
+       EmailViewerUGD *ug_data = _g_ug_data;
+       char *addr = (char *)data;
+
+       debug_log("Block address: %s", addr);
+
+       if (ug_data->con_popup) {
+               evas_object_del(ug_data->con_popup);
+               ug_data->con_popup = NULL;
+       }
+
+       int count, i;
+       int ret = EMAIL_ERROR_NONE;
+       email_rule_t *rule_list = NULL;
+
+       /* get the rule list from service */
+       if (email_get_rule_list(&rule_list, &count) < 0) {
+               debug_log("email_get_rule_list failed");
        } else {
-               debug_log("ug_destory_me");
-               ug_destroy_me(ug_data->ug);
+               if (count > 0) {
+                       for (i = 0; i < count; i++) {
+                               if (rule_list[i].type == EMAIL_FILTER_FROM/*TYPE_BLOCK_ADDRESS*/) {
+                                       debug_log("block address %s", rule_list[i].value);
+
+                                       if (g_strcmp0(rule_list[i].value, addr) == 0) {
+                                               debug_log("[%s] already blocked", rule_list[i].value);
+
+                                               ret = email_delete_rule(rule_list->filter_id);
+                                       }
+                               }
+                       }
+               }
+               /* free email rule_list */
+               email_free_rule(&rule_list, count);
+       }
+
+       if (ret != EMAIL_ERROR_NONE) {
+               debug_log("email_add_rule failed %d", ret);
+               _create_notify(ug_data, _("IDS_EMAIL_POP_ALERT"),
+                                               N_("Failed to remove block rule"), 0,
+                                               NULL, NULL, NULL, NULL, _popup_response_cb);
+       } else {
+               int vconf_ret = -1;
+               vconf_ret = vconf_set_int(EMAIL_VCONF_KEY_BLOCK_RULE_CHANGED, 1);
+               if (vconf_ret == -1) {
+                       debug_log("fail to set vconf int(spam_rule_changed)");
+                       _create_notify(ug_data, _("IDS_EMAIL_POP_ALERT"),
+                                                       N_("Failed to remove block rule"), 0,
+                                                       NULL, NULL, NULL, NULL, _popup_response_cb);
+               } else {
+                       char str[128] = { 0, };
+                       snprintf(str, sizeof(str), "%s", N_("Unblocked"));
+                       ret = status_message_post(str);
+                       if (ret)
+                               debug_log("status_message_post failed: %d", ret);
+               }
+
+               if (ug_data->isRotate == false && ug_data->b_internal) {
+                       _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
+               }
+
+               /* close viewer */
+               if (ug_data->b_internal) {
+                       _hide_view(ug_data);
+               } else {
+                       debug_log("ug_destory_me");
+                       ug_destroy_me(ug_data->ug);
+               }
        }
 }
 
@@ -4192,6 +4047,7 @@ static void _popup_response_delete_ok_cb(void *data, Evas_Object *obj, void *eve
        }
 
        EmailViewerUGD *ug_data = (EmailViewerUGD *)data;
+       int ret;
 
        if (ug_data->notify) {
                evas_object_del(ug_data->notify);
@@ -4199,40 +4055,41 @@ static void _popup_response_delete_ok_cb(void *data, Evas_Object *obj, void *eve
        }
 
        if (ug_data->mailbox_type == EMAIL_MAILBOX_TYPE_TRASH)
-               _delete_email(ug_data);
+               ret = _delete_email(ug_data);
        else
-               _move_email(ug_data, _find_folder_id_using_folder_type(ug_data, EMAIL_MAILBOX_TYPE_TRASH), TRUE);
+               ret = _move_email(ug_data, _find_folder_id_using_folder_type(ug_data, EMAIL_MAILBOX_TYPE_TRASH), TRUE);
 
-       if (ug_data->isRotate == false && ug_data->b_internal) {
-               _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
-       }
+       if (ret == 1) {
+               if (ug_data->isRotate == false && ug_data->b_internal) {
+                       _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
+               }
 
-       /* close viewer */
-       if (ug_data->b_internal) {
-               _hide_view(ug_data);
+               /* close viewer */
+               if (ug_data->b_internal) {
+                       _hide_view(ug_data);
 
-               /* send next or previous mail request to mailbox. */
-               int ret;
-               service_h service = NULL;
+                       /* send next or previous mail request to mailbox. */
+                       service_h service = NULL;
 
-               ret = service_create(&service);
-               debug_log("service_create: %d", ret);
-               if (!service) {
-                       debug_log("service create failed");
-                       return;
-               }
+                       ret = service_create(&service);
+                       debug_log("service_create: %d", ret);
+                       if (!service) {
+                               debug_log("service create failed");
+                               return;
+                       }
 
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
-               debug_log("service_add_extra_data: %d", ret);
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "1");
-               debug_log("service_add_extra_data: %d", ret);
+                       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
+                       debug_log("service_add_extra_data: %d", ret);
+                       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "1");
+                       debug_log("service_add_extra_data: %d", ret);
 
-               ug_send_message(_g_mailbox_ug, service);
+                       ug_send_message(_g_mailbox_ug, service);
 
-               ret = service_destroy(service);
-               debug_log("service_destroy: %d", ret);
-       } else
-               ug_destroy_me(ug_data->ug);
+                       ret = service_destroy(service);
+                       debug_log("service_destroy: %d", ret);
+               } else
+                       ug_destroy_me(ug_data->ug);
+       }
 }
 
 static void _popup_response_move_to_trash_cb(void *data, Evas_Object *obj, void *event_info)
@@ -4249,44 +4106,47 @@ static void _popup_response_move_to_trash_cb(void *data, Evas_Object *obj, void
        }
 
        EmailViewerUGD *ug_data = (EmailViewerUGD *)data;
+       int ret;
 
        if (ug_data->notify) {
                evas_object_del(ug_data->notify);
                ug_data->notify = NULL;
        }
 
-       _move_email(ug_data, _find_folder_id_using_folder_type(ug_data, EMAIL_MAILBOX_TYPE_TRASH), TRUE);
+       ret = _move_email(ug_data, _find_folder_id_using_folder_type(ug_data, EMAIL_MAILBOX_TYPE_TRASH), TRUE);
 
-       if (ug_data->isRotate == false && ug_data->b_internal) {
-               _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
-       }
+       if (ret == 1) {
+               if (ug_data->isRotate == false && ug_data->b_internal) {
+                       _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
+               }
 
-       /* close viewer */
-       if (ug_data->b_internal) {
-               _hide_view(ug_data);
+               /* close viewer */
+               if (ug_data->b_internal) {
+                       _hide_view(ug_data);
 
-               /* send next or previous mail request to mailbox. */
-               int ret;
-               service_h service = NULL;
+                       /* send next or previous mail request to mailbox. */
+                       int ret;
+                       service_h service = NULL;
 
-               ret = service_create(&service);
-               debug_log("service_create: %d", ret);
-               if (!service) {
-                       debug_log("service create failed");
-                       return;
-               }
+                       ret = service_create(&service);
+                       debug_log("service_create: %d", ret);
+                       if (!service) {
+                               debug_log("service create failed");
+                               return;
+                       }
 
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
-               debug_log("service_add_extra_data: %d", ret);
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "1");
-               debug_log("service_add_extra_data: %d", ret);
+                       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
+                       debug_log("service_add_extra_data: %d", ret);
+                       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "1");
+                       debug_log("service_add_extra_data: %d", ret);
 
-               ug_send_message(_g_mailbox_ug, service);
+                       ug_send_message(_g_mailbox_ug, service);
 
-               ret = service_destroy(service);
-               debug_log("service_destroy: %d", ret);
-       } else
-               ug_destroy_me(ug_data->ug);
+                       ret = service_destroy(service);
+                       debug_log("service_destroy: %d", ret);
+               } else
+                       ug_destroy_me(ug_data->ug);
+       }
 }
 
 static void _popup_response_delete_permanent_cb(void *data, Evas_Object *obj, void *event_info)
@@ -4303,44 +4163,46 @@ static void _popup_response_delete_permanent_cb(void *data, Evas_Object *obj, vo
        }
 
        EmailViewerUGD *ug_data = (EmailViewerUGD *)data;
+       int ret;
 
        if (ug_data->notify) {
                evas_object_del(ug_data->notify);
                ug_data->notify = NULL;
        }
 
-       _delete_email(ug_data);
+       ret = _delete_email(ug_data);
 
-       if (ug_data->isRotate == false && ug_data->b_internal) {
-               _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
-       }
+       if (ret == 1) {
+               if (ug_data->isRotate == false && ug_data->b_internal) {
+                       _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
+               }
 
-       /* close viewer */
-       if (ug_data->b_internal) {
-               _hide_view(ug_data);
+               /* close viewer */
+               if (ug_data->b_internal) {
+                       _hide_view(ug_data);
 
-               /* send next or previous mail request to mailbox. */
-               int ret;
-               service_h service = NULL;
+                       /* send next or previous mail request to mailbox. */
+                       service_h service = NULL;
 
-               ret = service_create(&service);
-               debug_log("service_create: %d", ret);
-               if (!service) {
-                       debug_log("service create failed");
-                       return;
-               }
+                       ret = service_create(&service);
+                       debug_log("service_create: %d", ret);
+                       if (!service) {
+                               debug_log("service create failed");
+                               return;
+                       }
 
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
-               debug_log("service_add_extra_data: %d", ret);
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "1");
-               debug_log("service_add_extra_data: %d", ret);
+                       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
+                       debug_log("service_add_extra_data: %d", ret);
+                       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "1");
+                       debug_log("service_add_extra_data: %d", ret);
 
-               ug_send_message(_g_mailbox_ug, service);
+                       ug_send_message(_g_mailbox_ug, service);
 
-               ret = service_destroy(service);
-               debug_log("service_destroy: %d", ret);
-       } else
-               ug_destroy_me(ug_data->ug);
+                       ret = service_destroy(service);
+                       debug_log("service_destroy: %d", ret);
+               } else
+                       ug_destroy_me(ug_data->ug);
+       }
 }
 
 static void _popup_response_to_destroy_cb(void *data, Evas_Object *obj, void *event_info)
@@ -4355,49 +4217,6 @@ static void _popup_response_to_destroy_cb(void *data, Evas_Object *obj, void *ev
        _g_ug_data = NULL;
 }
 
-static void _webview_multi_up_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-       if (_g_ug_data == NULL)
-               return;
-
-       if (!data) {
-               debug_log("data is NULL");
-               return;
-       }
-
-       EmailViewerUGD *ug_data = (EmailViewerUGD *)data;
-
-       ug_data->m_is_multi_touch = FALSE;
-
-       if (ug_data->scroller_locked) {
-               ug_data->scroller_locked = FALSE;
-               debug_log("<<unlock scroller>>");
-               debug_log("<<lock webview>>");
-       }
-}
-
-static void _webview_multi_down_cb(void *data, Evas * evas, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-       if (_g_ug_data == NULL)
-               return;
-
-       if (!data) {
-               debug_log("data is NULL");
-               return;
-       }
-
-       EmailViewerUGD *ug_data = (EmailViewerUGD *)data;
-
-       ug_data->m_is_multi_touch = TRUE;
-       if (ug_data->scroller_locked == FALSE) {
-               ug_data->scroller_locked = TRUE;
-               debug_log("<<lock scroller>>");
-               debug_log("<<unlock webview>>");
-       }
-}
-
 static void _webview_policy_navigation_decide_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
@@ -4615,7 +4434,7 @@ static void _mbe_selected_cb(void *data, Evas_Object *obj, void *event_info)
                _delete_contacts_list(contact_list_item);
        } else {
                ug_data->create_contact_arg = CONTACTUI_REQ_ADD_EMAIL;
-               elm_ctxpopup_item_append(ug_data->con_popup, dgettext("sys_string", "IDS_COM_OPT_ADD_TO_CONTACTS"), NULL, _ctxpopup_add_contact_cb/*_ctxpopup_select_contact_mode_email_cb*//*_ctxpopup_create_contact_cb*/, addrs_info->address);
+               elm_ctxpopup_item_append(ug_data->con_popup, dgettext("sys_string", "IDS_COM_OPT_ADD_TO_CONTACTS"), NULL, _ctxpopup_add_contact_cb, addrs_info->address);
                elm_ctxpopup_item_append(ug_data->con_popup, _("IDS_EMAIL_OPT_SEND_EMAIL"), NULL, _ctxpopup_send_email_cb, addrs_info->address);
                ug_data->ctx_block_item = elm_ctxpopup_item_append(ug_data->con_popup, _("IDS_EMAIL_OPT_BLOCK"), NULL, _ctxpopup_add_block_rule_cb, addrs_info->address);
        }
@@ -4625,7 +4444,7 @@ static void _mbe_selected_cb(void *data, Evas_Object *obj, void *event_info)
 
        /* get the rule list from service */
        if (email_get_rule_list(&rule_list, &count) < 0) {
-                       debug_log("email_get_rule_list failed");
+               debug_log("email_get_rule_list failed");
        } else {
                if (count > 0) {
                        for (i = 0; i < count; i++) {
@@ -4874,7 +4693,6 @@ static Eina_Bool _check_body_download(void *data)
                        elm_box_pack_end(ug_data->main_bx, ug_data->noc_bx);
 
                        Evas_Object *dn_btn = elm_button_add(ug_data->navi_bar);
-                       /*elm_object_theme_set(dn_btn, ug_data->theme);*/
                        elm_object_style_set(dn_btn, "text_only/style2");
                        elm_object_text_set(dn_btn, _("IDS_EMAIL_BODY_DOWNLOAD_MESSAGE"));
                        evas_object_smart_callback_add(dn_btn, "clicked", _body_down_cb, (void *)ug_data);
@@ -5345,7 +5163,6 @@ static void _dbus_receiver_remove(EmailViewerUGD *ug_data)
        }
 
        if (_g_viewer_dbus_conn != NULL) {
-               /*e_dbus_connection_close(_g_viewer_dbus_conn);*/
                _g_viewer_dbus_conn = NULL;
        }
 }
@@ -5682,10 +5499,8 @@ static void _on_edbus_event_email_viewer_receive(void *data, DBusMessage *messag
                        debug_log("receive data error: %s", error.message);
                        dbus_error_free(&error);
                }
-               /*return DBUS_HANDLER_RESULT_HANDLED;*/
                return;
        }
-       /*return DBUS_HANDLER_RESULT_HANDLED;*/
        return;
 }
 
@@ -6033,42 +5848,44 @@ static void _move_here_cb(void *data, Evas_Object *obj, void *event_info)
 
        EmailViewerUGD *ug_data = _g_ug_data;
        int folder_id = mailbox_list->mailbox_id;
+       int ret;
 
-       _move_email(ug_data, folder_id, FALSE);
+       ret = _move_email(ug_data, folder_id, FALSE);
 
-       ug_data->navi_move_it1 = NULL;
-       elm_naviframe_item_pop_to(ug_data->navi_main_it);
+       if (ret == 1) {
+               ug_data->navi_move_it1 = NULL;
+               elm_naviframe_item_pop_to(ug_data->navi_main_it);
 
-       if (ug_data->isRotate == false && ug_data->b_internal) {
-               /* Viewer to hide, so set left content (mailbox) size to full */
-               _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
-       }
+               if (ug_data->isRotate == false && ug_data->b_internal) {
+                       /* Viewer to hide, so set left content (mailbox) size to full */
+                       _notify_mailbox_size(ug_data, "MAILBOX_RESIZE_FULL");
+               }
 
-       if (ug_data->b_internal) {
-               _hide_view(ug_data);
+               if (ug_data->b_internal) {
+                       _hide_view(ug_data);
 
-               /* send next or previous mail request to mailbox. */
-               int ret;
-               service_h service = NULL;
+                       /* send next or previous mail request to mailbox. */
+                       service_h service = NULL;
 
-               ret = service_create(&service);
-               debug_log("service_create: %d", ret);
-               if (!service) {
-                       debug_log("service create failed");
-                       return;
-               }
+                       ret = service_create(&service);
+                       debug_log("service_create: %d", ret);
+                       if (!service) {
+                               debug_log("service create failed");
+                               return;
+                       }
 
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
-               debug_log("service_add_extra_data: %d", ret);
-               ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "1");
-               debug_log("service_add_extra_data: %d", ret);
+                       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
+                       debug_log("service_add_extra_data: %d", ret);
+                       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "1");
+                       debug_log("service_add_extra_data: %d", ret);
 
-               ug_send_message(_g_mailbox_ug, service);
+                       ug_send_message(_g_mailbox_ug, service);
 
-               ret = service_destroy(service);
-               debug_log("service_destroy: %d", ret);
-       } else {
-               ug_destroy_me(ug_data->ug);
+                       ret = service_destroy(service);
+                       debug_log("service_destroy: %d", ret);
+               } else {
+                       ug_destroy_me(ug_data->ug);
+               }
        }
 }
 
@@ -6085,11 +5902,6 @@ static void _move_back_cb(void *data, Evas_Object *obj, void *event_info)
 
        elm_object_item_del(ug_data->navi_move_it1);
        ug_data->navi_move_it1 = NULL;
-
-       /*if (ug_data->b_internal)
-               elm_layout_theme_set(ug_data->layout_main, "layout", "controlbar", "default");
-       else
-               elm_layout_theme_set(ug_data->layout_main, "layout", "application", "controlbar");*/
 }
 
 /* EOF */