Fixes NB#107231, show folder in proper font after moving
[modest] / src / hildon2 / modest-platform.c
index 56915b6..2028960 100644 (file)
@@ -29,7 +29,9 @@
 
 #include <config.h>
 #include <glib/gi18n.h>
+
 #include <modest-platform.h>
+#include <modest-defs.h>
 #include <modest-runtime.h>
 #include <modest-main-window.h>
 #include <modest-header-view.h>
 #include <libosso.h>
 #include <tny-maemo-conic-device.h>
 #include <tny-simple-list.h>
+#include <tny-merge-folder.h>
+#include <tny-error.h>
 #include <tny-folder.h>
+#include <tny-account-store-view.h>
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmain.h>
 #include <modest-account-settings-dialog.h>
 #include <modest-easysetup-wizard-dialog.h>
 #include "modest-hildon2-sort-dialog.h"
-#include <hildon/hildon-sound.h>
+#include <hildon/hildon.h>
 #include <osso-mem.h>
 #include "hildon2/modest-hildon2-details-dialog.h"
+#include "hildon2/modest-hildon2-window-mgr.h"
+#include <keys_nokia.h>
+#include <libprofile.h>
+#include <canberra.h>
+#include <modest-datetime-formatter.h>
+#include "modest-header-window.h"
+#include <modest-folder-window.h>
+#include <modest-account-mgr.h>
+#include <modest-account-mgr-helpers.h>
+#include <modest-ui-constants.h>
+#include <modest-selector-picker.h>
+#include <modest-icon-names.h>
 
 #ifdef MODEST_HAVE_MCE
 #include <mce/dbus-names.h>
 
 #define HILDON_OSSO_URI_ACTION "uri-action"
 #define URI_ACTION_COPY "copy:"
-#define MODEST_NEW_MAIL_SOUND_FILE "/usr/share/sounds/ui-new_email.wav"
+#define MODEST_NOTIFICATION_CATEGORY "email-message"
 #define MODEST_NEW_MAIL_LIGHTING_PATTERN "PatternCommunicationEmail"
+#define PROFILE_MAIL_TONE PROFILEKEY_EMAIL_ALERT_TONE
+#define PROFILE_MAIL_VOLUME PROFILEKEY_EMAIL_ALERT_VOLUME
+
+#define COMMON_FOLDER_DIALOG_ENTRY "entry"
+#define COMMON_FOLDER_DIALOG_ACCOUNT_PICKER "account-picker"
+#define FOLDER_PICKER_CURRENT_FOLDER "current-folder"
+#define MODEST_ALARMD_APPID PACKAGE_NAME
+
+
+static void _modest_platform_play_email_tone (void);
+
 
 static void    
 on_modest_conf_update_interval_changed (ModestConf* self, 
@@ -97,7 +125,7 @@ on_modest_conf_update_interval_changed (ModestConf* self,
 static gboolean
 check_required_files (void)
 {
-       FILE *mcc_file = modest_maemo_open_mcc_mapping_file ();
+       FILE *mcc_file = modest_maemo_open_mcc_mapping_file (NULL);
        if (!mcc_file) {
                g_printerr ("modest: check for mcc file failed\n");
                return FALSE;
@@ -440,7 +468,7 @@ modest_platform_show_uri_popup (const gchar *uri)
                        GSList *node;                   
                        popup_info->actions = actions_list;
                        popup_info->uri = g_strdup (uri);
-                       
+
                        for (node = actions_list; node != NULL; node = g_slist_next (node)) {
                                GtkWidget *menu_item;
                                const gchar *action_name;
@@ -452,7 +480,7 @@ modest_platform_show_uri_popup (const gchar *uri)
                                g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name);  /* hack */
                                g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),
                                                  popup_info);
-                               
+
                                if (hildon_uri_is_default_action (action, NULL)) {
                                        gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
                                } else {
@@ -462,25 +490,15 @@ modest_platform_show_uri_popup (const gchar *uri)
                        }
                }
 
-               /* always add the copy item */
-               GtkWidget* menu_item = gtk_menu_item_new_with_label (dgettext("osso-uri",
-                                                                             "uri_link_copy_link_location"));
-               g_object_set_data_full (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION,
-                                       g_strconcat (URI_ACTION_COPY, uri, NULL),
-                                       g_free);
-               g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),NULL);
-               gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-               gtk_widget_show (menu_item);
 
-               
                /* and what to do when the link is deleted */
                g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info);
                gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ());
-                                                 
+
        } else {
                hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
        }
-       
+
        return TRUE;
 }
 
@@ -499,7 +517,7 @@ modest_platform_get_icon (const gchar *name, guint icon_size)
         */
        if (!name || strlen(name) == 0)
                return NULL;
-       
+
        current_theme = gtk_icon_theme_get_default ();
        pixbuf = gtk_icon_theme_load_icon (current_theme, name, icon_size,
                                           GTK_ICON_LOOKUP_NO_SVG,
@@ -518,7 +536,7 @@ modest_platform_get_app_name (void)
        return _("mcen_ap_name");
 }
 
-static void 
+static void
 entry_insert_text (GtkEditable *editable,
                   const gchar *text,
                   gint         length,
@@ -540,15 +558,19 @@ entry_insert_text (GtkEditable *editable,
                if (modest_text_utils_is_forbidden_char (*text, FOLDER_NAME_FORBIDDEN_CHARS)) {
                        /* Show an error */
                        gchar *tmp, *msg;
-                       
-                       tmp = g_strndup (folder_name_forbidden_chars, 
+
+                       tmp = g_strndup (folder_name_forbidden_chars,
                                         FOLDER_NAME_FORBIDDEN_CHARS_LENGTH);
                        msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
-                       hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (data)), 
+                       hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (data)),
                                                         NULL, msg);
                        g_free (msg);
                        g_free (tmp);
-               } else {        
+               } else {
+                       if (length >= 20) {
+                               hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
+                                                                _CS("ckdg_ib_maximum_characters_reached"));
+                       }
                        /* Write the text in the entry if it's valid */
                        g_signal_handlers_block_by_func (editable,
                                                         (gpointer) entry_insert_text, data);
@@ -571,17 +593,17 @@ entry_changed (GtkEditable *editable,
 
        buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (user_data)->action_area));
        ok_button = GTK_WIDGET (buttons->data);
-       
+
        chars = gtk_editable_get_chars (editable, 0, -1);
        g_return_if_fail (chars != NULL);
 
-       
-       if (g_utf8_strlen (chars,-1) >= 20)
+
+       if (g_utf8_strlen (chars,-1) >= 20) {
                hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL,
                                                 _CS("ckdg_ib_maximum_characters_reached"));
-       else
-               gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars));
-               
+       }
+       gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars));
+
        /* Free */
        g_list_free (buttons);
        g_free (chars);
@@ -594,8 +616,7 @@ on_response (GtkDialog *dialog,
             gint response,
             gpointer user_data)
 {
-       GList *child_vbox, *child_hbox;
-       GtkWidget *hbox, *entry;
+       GtkWidget *entry, *picker;
        TnyFolderStore *parent;
        const gchar *new_name;
        gboolean exists;
@@ -604,15 +625,18 @@ on_response (GtkDialog *dialog,
                return;
        
        /* Get entry */
-       child_vbox = gtk_container_get_children (GTK_CONTAINER (dialog->vbox));
-       hbox = child_vbox->data;
-       child_hbox = gtk_container_get_children (GTK_CONTAINER (hbox));
-       entry = child_hbox->next->data;
+       entry = g_object_get_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ENTRY);
+       picker = g_object_get_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ACCOUNT_PICKER);
        
        parent = TNY_FOLDER_STORE (user_data);
        new_name = gtk_entry_get_text (GTK_ENTRY (entry));
        exists = FALSE;
        
+       if (picker != NULL) {
+
+               parent = g_object_get_data (G_OBJECT (picker), FOLDER_PICKER_CURRENT_FOLDER);
+       }
+
        /* Look for another folder with the same name */
        if (modest_tny_folder_has_subfolder_with_name (parent, 
                                                       new_name,
@@ -640,89 +664,410 @@ on_response (GtkDialog *dialog,
                /* Do not close the dialog */
                g_signal_stop_emission_by_name (dialog, "response");
        }
+
+}
+
+typedef struct _FolderChooserData {
+       TnyFolderStore *store;
+       GtkWidget *dialog;
+} FolderChooserData;
+
+static void
+folder_chooser_activated (ModestFolderView *folder_view,
+                         TnyFolderStore *folder,
+                         FolderChooserData *userdata)
+{
+       userdata->store = folder;
+       gtk_dialog_response (GTK_DIALOG (userdata->dialog), GTK_RESPONSE_OK);
+}
+
+static TnyFolderStore *
+folder_chooser_dialog_run (ModestFolderView *original)
+{
+       GtkWidget *folder_view;
+       FolderChooserData userdata = {NULL, NULL};
+       GtkWidget *pannable;
+       const gchar *visible_id = NULL;
+
+       userdata.dialog = hildon_dialog_new ();
+       pannable = hildon_pannable_area_new ();
+       folder_view = modest_platform_create_folder_view (NULL);
+
+       gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM("ckdg_ti_change_folder"));
+
+       modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), 
+                                      MODEST_FOLDER_VIEW (folder_view));
+
+       visible_id = 
+               modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original));
+       modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view),
+                                                                    visible_id);
+
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable);
+       gtk_container_add (GTK_CONTAINER (pannable), folder_view);
+       gtk_widget_set_size_request (pannable, -1, 320);
+
+       gtk_widget_show (folder_view);
+       gtk_widget_show (pannable);
+       gtk_widget_show (userdata.dialog);
+       g_signal_connect (G_OBJECT (folder_view), "folder-activated", 
+                         G_CALLBACK (folder_chooser_activated), 
+                         (gpointer) &userdata);
+
+       gtk_dialog_run (GTK_DIALOG (userdata.dialog));
+       gtk_widget_destroy (userdata.dialog);
+
+       return userdata.store;
+}
+
+static gchar *
+folder_store_get_display_name (TnyFolderStore *store)
+{
+       if (TNY_IS_ACCOUNT (store)) {
+               if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (store)))
+                       return modest_conf_get_string (modest_runtime_get_conf(),
+                                                      MODEST_CONF_DEVICE_NAME, NULL);
+               else
+                       return g_strdup (tny_account_get_name (TNY_ACCOUNT (store)));
+       } else {
+               gchar *fname;
+               TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+
+               fname = g_strdup (tny_folder_get_name (TNY_FOLDER (store)));
+               type = tny_folder_get_folder_type (TNY_FOLDER (store));
+               if (modest_tny_folder_is_local_folder (TNY_FOLDER (store)) ||
+                   modest_tny_folder_is_memory_card_folder (TNY_FOLDER (store))) {
+                       type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (store));
+                       if (type != TNY_FOLDER_TYPE_UNKNOWN) {
+                               g_free (fname);
+                               fname = g_strdup (modest_local_folder_info_get_type_display_name (type));
+                       }
+               } else {
+                       /* Sometimes an special folder is reported by the server as
+                          NORMAL, like some versions of Dovecot */
+                       if (type == TNY_FOLDER_TYPE_NORMAL ||
+                           type == TNY_FOLDER_TYPE_UNKNOWN) {
+                               type = modest_tny_folder_guess_folder_type (TNY_FOLDER (store));
+                       }
+               }
+
+               if (type == TNY_FOLDER_TYPE_INBOX) {
+                       g_free (fname);
+                       fname = g_strdup (_("mcen_me_folder_inbox"));
+               }
+               return fname;
+       }
+}
+
+static void
+folder_picker_set_store (GtkButton *button, TnyFolderStore *store)
+{
+       gchar *name;
+
+       if (store == NULL) {
+               g_object_set_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, NULL);
+       } else {
+               GdkPixbuf *pixbuf;
+               const gchar *icon_name = NULL;
+
+               g_object_ref (store);
+               g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, 
+                                       store, (GDestroyNotify) g_object_unref);
+               name = folder_store_get_display_name (store);
+               hildon_button_set_value (HILDON_BUTTON (button), name);
+               g_free (name);
+
+               /* Select icon */
+               if (TNY_IS_ACCOUNT (store)) {
+                       if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (store)))
+                           icon_name = MODEST_FOLDER_ICON_LOCAL_FOLDERS;
+                       else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (store)))
+                               icon_name = MODEST_FOLDER_ICON_MMC;
+                       else
+                               icon_name = MODEST_FOLDER_ICON_ACCOUNT;
+               } else {
+                       TnyFolderType type = modest_tny_folder_guess_folder_type (TNY_FOLDER (store));
+                       if (modest_tny_folder_is_remote_folder (TNY_FOLDER (store))) {
+                               switch (type) {
+                               case TNY_FOLDER_TYPE_INBOX:
+                                       icon_name = MODEST_FOLDER_ICON_INBOX;
+                                       break;
+                               default:
+                                       icon_name = MODEST_FOLDER_ICON_ACCOUNT;
+                               }
+                       } else if (modest_tny_folder_is_local_folder (TNY_FOLDER (store))) {
+                               switch (type) {
+                               case TNY_FOLDER_TYPE_OUTBOX:
+                                       icon_name = MODEST_FOLDER_ICON_OUTBOX;
+                                       break;
+                               case TNY_FOLDER_TYPE_DRAFTS:
+                                       icon_name = MODEST_FOLDER_ICON_DRAFTS;
+                                       break;
+                               case TNY_FOLDER_TYPE_SENT:
+                                       icon_name = MODEST_FOLDER_ICON_SENT;
+                                       break;
+                               default:
+                                       icon_name = MODEST_FOLDER_ICON_NORMAL;
+                               }
+                       } else if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (store))) {
+                               icon_name = MODEST_FOLDER_ICON_MMC_FOLDER;
+                       }
+               }
+
+               /* Set icon */
+               pixbuf = modest_platform_get_icon (icon_name, MODEST_ICON_SIZE_SMALL);
+
+               if (pixbuf) {
+                       hildon_button_set_image (HILDON_BUTTON (button),
+                                                gtk_image_new_from_pixbuf (pixbuf));
+                       g_object_unref (pixbuf);
+               }
+       }
+}
+
+/* Always returns DUPs so you must free the returned value */
+static gchar *
+get_next_folder_name (const gchar *suggested_name, 
+                     TnyFolderStore *suggested_folder)
+{
+       const gchar *default_name = _FM("ckdg_va_new_folder_name_stub");
+       unsigned int i;
+       gchar *real_suggested_name;
+
+       if (suggested_name !=NULL) {
+               return g_strdup (suggested_name);
+       }
+
+       for(i = 0; i < 100; ++ i) {
+               gboolean exists = FALSE;
+
+               if (i == 0)
+                       real_suggested_name = g_strdup (default_name);
+               else
+                       real_suggested_name = g_strdup_printf ("%s(%d)",
+                                                              _FM("ckdg_va_new_folder_name_stub"),
+                                                              i);
+               exists = modest_tny_folder_has_subfolder_with_name (suggested_folder,
+                                                                   real_suggested_name,
+                                                                   TRUE);
+
+               if (!exists)
+                       break;
+
+               g_free (real_suggested_name);
+       }
+
+       /* Didn't find a free number */
+       if (i == 100)
+               real_suggested_name = g_strdup (default_name);
+
+       return real_suggested_name;
 }
 
+typedef struct {
+       ModestFolderView *folder_view;
+       GtkEntry *entry;
+} FolderPickerHelper;
+
+static void
+folder_picker_clicked (GtkButton *button,
+                      FolderPickerHelper *helper)
+{
+       TnyFolderStore *store;
+
+       store = folder_chooser_dialog_run (helper->folder_view);
+       if (store) {
+               const gchar *current_name;
+               gboolean exists;
+
+               folder_picker_set_store (GTK_BUTTON (button), store);
+
+               /* Update the name of the folder */
+               current_name = gtk_entry_get_text (helper->entry);
+               exists = modest_tny_folder_has_subfolder_with_name (store,
+                                                                   current_name,
+                                                                   TRUE);
+               if (exists) {
+                       gchar *new_name = get_next_folder_name (NULL, store);
+                       gtk_entry_set_text (helper->entry, new_name);
+                       g_free (new_name);
+               }
+       }
+}
+
+static GtkWidget *
+folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
+{
+       GtkWidget *button;
+
+       button = hildon_button_new (MODEST_EDITABLE_SIZE,
+                                   HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+
+       hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0);
+
+       if (suggested) {
+               folder_picker_set_store (GTK_BUTTON (button), suggested);
+       }
+
+       g_signal_connect (G_OBJECT (button), "clicked",
+                         G_CALLBACK (folder_picker_clicked),
+                         helper);
+
+       return button;
+}
 
 
 static gint
-modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
-                                       TnyFolderStore *parent,
-                                       const gchar *dialog_title,
-                                       const gchar *label_text,
-                                       const gchar *suggested_name,
-                                       gchar **folder_name)
+modest_platform_run_folder_common_dialog (GtkWindow *parent_window,
+                                         TnyFolderStore *suggested_parent,
+                                         const gchar *dialog_title,
+                                         const gchar *label_text,
+                                         const gchar *suggested_name,
+                                         gboolean show_name,
+                                         gboolean show_parent,
+                                         gchar **folder_name,
+                                         TnyFolderStore **parent)
 {
        GtkWidget *accept_btn = NULL; 
-       GtkWidget *dialog, *entry, *label, *hbox;
+       GtkWidget *dialog, *entry = NULL, *label_entry = NULL,  *label_location = NULL, *hbox;
+       GtkWidget *account_picker = NULL;
        GList *buttons = NULL;
        gint result;
+       GtkSizeGroup *sizegroup;
+       ModestFolderView *folder_view;
+       ModestWindow *folder_window;
+       ModestHildon2WindowMgr *window_mgr;
+       FolderPickerHelper *helper = NULL;
+       GtkWidget *top_vbox, *top_align;
 
+       window_mgr = (ModestHildon2WindowMgr *) modest_runtime_get_window_mgr ();
+       folder_window = modest_hildon2_window_mgr_get_folder_window (window_mgr);
+       g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW (folder_window), GTK_RESPONSE_NONE);
+       
+       folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (folder_window));
+       
+       top_vbox = gtk_vbox_new (FALSE, 0);
+       top_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (top_align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+       
        /* Ask the user for the folder name */
        dialog = gtk_dialog_new_with_buttons (dialog_title,
                                              parent_window,
                                              GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             _HL("wdgt_bd_done"),
+                                             _FM("ckdg_bd_new_folder_dialog_ok"),
                                              GTK_RESPONSE_ACCEPT,
                                              NULL);
 
        /* Add accept button (with unsensitive handler) */
        buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area));
        accept_btn = GTK_WIDGET (buttons->data);
-       /* Create label and entry */
-       label = gtk_label_new (label_text);
 
-       entry = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
-       gtk_entry_set_max_length (GTK_ENTRY (entry), 20);
+       sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
-       if (suggested_name)
-               gtk_entry_set_text (GTK_ENTRY (entry), suggested_name);
-       else
-               gtk_entry_set_text (GTK_ENTRY (entry), _("mcen_ia_default_folder_name"));
-       gtk_entry_set_width_chars (GTK_ENTRY (entry),
-                                  MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1),
-                                       g_utf8_strlen (_("mcen_ia_default_folder_name"), -1)));
-       gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
+       if (show_name) {
+               label_entry = gtk_label_new (label_text);
+               entry = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+               gtk_entry_set_max_length (GTK_ENTRY (entry), 20);
+
+               gtk_misc_set_alignment (GTK_MISC (label_entry), 0.0, 0.5);
+               gtk_size_group_add_widget (sizegroup, label_entry);
+               
+               if (suggested_name)
+                 gtk_entry_set_text (GTK_ENTRY (entry), suggested_name);
+               else
+                       gtk_entry_set_text (GTK_ENTRY (entry), _FM("ckdg_va_new_folder_name_stub"));
+               gtk_entry_set_width_chars (GTK_ENTRY (entry),
+                                          MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1),
+                                               g_utf8_strlen (_FM("ckdg_va_new_folder_name_stub"), -1)));
+               gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
+       }
+       
+       if (show_parent) {
+         
+               label_location = gtk_label_new (_FM("ckdg_fi_new_folder_location"));
 
+               gtk_misc_set_alignment (GTK_MISC (label_location), 0.0, 0.5);
+               gtk_size_group_add_widget (sizegroup, label_location);
+
+               helper = g_slice_new0 (FolderPickerHelper);
+               helper->folder_view = folder_view;
+               helper->entry = (GtkEntry *) entry;
+
+               account_picker = folder_picker_new (suggested_parent, helper);
+       }
+
+       g_object_unref (sizegroup);
+       
        /* Connect to the response method to avoid closing the dialog
           when an invalid name is selected*/
        g_signal_connect (dialog,
                          "response",
                          G_CALLBACK (on_response),
-                         parent);
-
-       /* Track entry changes */
-       g_signal_connect (entry,
-                         "insert-text",
-                         G_CALLBACK (entry_insert_text),
-                         dialog);
-       g_signal_connect (entry,
-                         "changed",
-                         G_CALLBACK (entry_changed),
-                         dialog);
-
-
+                         suggested_parent);
+       
+       if (show_name) {
+               /* Track entry changes */
+               g_signal_connect (entry,
+                                 "insert-text",
+                                 G_CALLBACK (entry_insert_text),
+                                 dialog);
+               g_signal_connect (entry,
+                                 "changed",
+                                 G_CALLBACK (entry_changed),
+                                 dialog);
+       }
+       
+       
        /* Some locales like pt_BR need this to get the full window
           title shown */
        gtk_widget_set_size_request (GTK_WIDGET (dialog), 300, -1);
-
+       
        /* Create the hbox */
-       hbox = gtk_hbox_new (FALSE, 12);
-       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+       if (show_name) {
+               hbox = gtk_hbox_new (FALSE, 12);
+               gtk_box_pack_start (GTK_BOX (hbox), label_entry, FALSE, FALSE, 0);
+               gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+               
+               /* Add hbox to dialog */
+               gtk_box_pack_start (GTK_BOX (top_vbox), 
+                                   hbox, FALSE, FALSE, 0);
+               g_object_set_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ENTRY, entry);
+       }
 
-       /* Add hbox to dialog */
-       gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
-                           hbox, FALSE, FALSE, 0);
+       if (show_parent) {
+               hbox = gtk_hbox_new (FALSE, 12);
+               gtk_box_pack_start (GTK_BOX (hbox), label_location, FALSE, FALSE, 0);
+               gtk_box_pack_start (GTK_BOX (hbox), account_picker, TRUE, TRUE, 0);
+
+               /* Add hbox to dialog */
+               gtk_box_pack_start (GTK_BOX (top_vbox), 
+                                   hbox, FALSE, FALSE, 0);
+               g_object_set_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ACCOUNT_PICKER, account_picker);
+       }
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
                                     GTK_WINDOW (dialog), parent_window);
+
+       gtk_container_add (GTK_CONTAINER (top_align), top_vbox);
+       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), top_align, TRUE, TRUE, 0);
+
        gtk_widget_show_all (GTK_WIDGET(dialog));
-               
+
        result = gtk_dialog_run (GTK_DIALOG(dialog));
-       if (result == GTK_RESPONSE_ACCEPT)
-               *folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+       if (result == GTK_RESPONSE_ACCEPT) {
+               if (show_name)
+                       *folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+               if (show_parent) {
+                       *parent = g_object_get_data (G_OBJECT (account_picker), FOLDER_PICKER_CURRENT_FOLDER);
+                       if (*parent)
+                               g_object_ref (*parent);
+               }
+       }
 
        gtk_widget_destroy (dialog);
 
+       if (helper)
+               g_slice_free (FolderPickerHelper, helper);
+
        while (gtk_events_pending ())
                gtk_main_iteration ();
 
@@ -731,57 +1076,46 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
 
 gint
 modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
-                                      TnyFolderStore *parent_folder,
+                                      TnyFolderStore *suggested_folder,
                                       gchar *suggested_name,
-                                      gchar **folder_name)
+                                      gchar **folder_name,
+                                      TnyFolderStore **parent_folder)
 {
-       gchar *real_suggested_name = NULL, *tmp = NULL;
+       gchar *real_suggested_name = NULL;
        gint result;
+       ModestTnyAccountStore *acc_store;
+       TnyAccount *account;
 
-       if(suggested_name == NULL)
-       {
-               const gchar *default_name = _("mcen_ia_default_folder_name");
-               unsigned int i;
-               gchar num_str[3];
-
-               for(i = 0; i < 100; ++ i) {
-                       gboolean exists = FALSE;
-
-                       sprintf(num_str, "%.2u", i);
-
-                       if (i == 0)
-                               real_suggested_name = g_strdup (default_name);
-                       else
-                               real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"),
-                                                                      num_str);
-                       exists = modest_tny_folder_has_subfolder_with_name (parent_folder,
-                                                                           real_suggested_name,
-                                                                           TRUE);
-
-                       if (!exists)
-                               break;
-
-                       g_free (real_suggested_name);
-               }
+       real_suggested_name = get_next_folder_name ((const gchar *) suggested_name,
+                                                   suggested_folder);
 
-               /* Didn't find a free number */
-               if (i == 100)
-                       real_suggested_name = g_strdup (default_name);
-       } else {
-               real_suggested_name = suggested_name;
+       /* In hildon 2.2 we always suggest the archive folder as parent */
+       acc_store = modest_runtime_get_account_store ();
+       account = modest_tny_account_store_get_mmc_folders_account (acc_store);
+       if (account) {
+               suggested_folder = (TnyFolderStore *)
+                       modest_tny_account_get_special_folder (account,
+                                                              TNY_FOLDER_TYPE_ARCHIVE);
+               g_object_unref (account);
+               account = NULL;
        }
 
-       tmp = g_strconcat (_("mcen_fi_new_folder_name"), ":", NULL);
-       result = modest_platform_run_folder_name_dialog (parent_window, 
-                                                        parent_folder,
-                                                        _("mcen_ti_new_folder"),
-                                                        tmp,
-                                                        real_suggested_name,
-                                                        folder_name);
-       g_free (tmp);
+       /* If there is not archive folder then fallback to local folders account */
+       if (!suggested_folder)
+               suggested_folder = (TnyFolderStore *)
+                       modest_tny_account_store_get_local_folders_account (acc_store);
+
+       result = modest_platform_run_folder_common_dialog (parent_window,
+                                                          suggested_folder,
+                                                          _HL("ckdg_ti_new_folder"),
+                                                          _FM("ckdg_fi_new_folder_name"),
+                                                          real_suggested_name,
+                                                          TRUE,
+                                                          TRUE,
+                                                          folder_name,
+                                                          parent_folder);
 
-       if (suggested_name == NULL)
-               g_free(real_suggested_name);
+       g_free(real_suggested_name);
 
        return result;
 }
@@ -794,12 +1128,15 @@ modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
 {
        g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent_folder), GTK_RESPONSE_REJECT);
 
-       return modest_platform_run_folder_name_dialog (parent_window, 
-                                                      parent_folder,
-                                                      _HL("ckdg_ti_rename_folder"),
-                                                      _HL("ckdg_fi_rename_name"),
-                                                      suggested_name,
-                                                      folder_name);
+       return modest_platform_run_folder_common_dialog (parent_window, 
+                                                        parent_folder,
+                                                        _HL("ckdg_ti_rename_folder"),
+                                                        _HL("ckdg_fi_rename_name"),
+                                                        suggested_name,
+                                                        TRUE,
+                                                        FALSE,
+                                                        folder_name,
+                                                        NULL);
 }
 
 
@@ -1009,13 +1346,11 @@ modest_platform_connect_and_wait (GtkWindow *parent_window,
        g_mutex_unlock (data->mutex);
 
  frees:
-       if (data) {
-               if (g_signal_handler_is_connected (account, data->handler))
-                       g_signal_handler_disconnect (account, data->handler);
-               g_mutex_free (data->mutex);
-               g_main_loop_unref (data->wait_loop);
-               g_slice_free (ConnectAndWaitData, data);
-       }
+       if (g_signal_handler_is_connected (account, data->handler))
+               g_signal_handler_disconnect (account, data->handler);
+       g_mutex_free (data->mutex);
+       g_main_loop_unref (data->wait_loop);
+       g_slice_free (ConnectAndWaitData, data);
 
        conn_status = tny_account_get_connection_status (account);
        return (conn_status == TNY_CONNECTION_STATUS_CONNECTED) ? TRUE: FALSE;
@@ -1081,7 +1416,7 @@ modest_platform_set_update_interval (guint minutes)
        /* Delete any existing alarm,
         * because we will replace it: */
        if (alarm_cookie) {
-               if (alarmd_event_del(alarm_cookie) != 1)
+               if (alarmd_event_del(alarm_cookie) != 0)
                        g_warning ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie);
                alarm_cookie = 0;
                modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL);
@@ -1098,6 +1433,7 @@ modest_platform_set_update_interval (guint minutes)
        alarm_event_t *event = alarm_event_create ();
        alarm_event_add_actions (event, 1);
        alarm_action_t *action = alarm_event_get_action (event, 0);
+       alarm_event_set_alarm_appid (event, MODEST_ALARMD_APPID);
        event->alarm_time = minutes * 60; /* seconds */
        
        /* Set recurrence every few minutes: */
@@ -1111,7 +1447,7 @@ modest_platform_set_update_interval (guint minutes)
        action->dbus_interface = g_strdup (MODEST_DBUS_IFACE);
        action->dbus_service = g_strdup (MODEST_DBUS_SERVICE);
        action->dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE);
-       action->flags = ALARM_ACTION_TYPE_DBUS | ALARM_ACTION_DBUS_USE_ACTIVATION;
+       action->flags = ALARM_ACTION_WHEN_TRIGGERED | ALARM_ACTION_TYPE_DBUS | ALARM_ACTION_DBUS_USE_ACTIVATION;
 
        /* Use ALARM_EVENT_NO_DIALOG: Otherwise, a dialog will be shown if 
         * exec_name or dbus_path is NULL, even though we have specified no dialog text.
@@ -1144,29 +1480,18 @@ modest_platform_set_update_interval (guint minutes)
 void
 modest_platform_push_email_notification(void)
 {
-       gboolean play_sound;
-       ModestWindow *main_window;
-       gboolean screen_on = TRUE, app_in_foreground;
-
-       /* Check whether or not we should play a sound */
-       play_sound = modest_conf_get_bool (modest_runtime_get_conf (),
-                                          MODEST_CONF_PLAY_SOUND_MSG_ARRIVE,
-                                          NULL);
-
-       /* Get the screen status */
-       main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
-       if (main_window)
-               screen_on = modest_main_window_screen_is_on (MODEST_MAIN_WINDOW (main_window));
+       gboolean screen_on, app_in_foreground;
 
        /* Get the window status */
        app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ());
 
+       screen_on = modest_window_mgr_screen_is_on (modest_runtime_get_window_mgr ());
+
        /* If the screen is on and the app is in the
           foreground we don't show anything */
        if (!(screen_on && app_in_foreground)) {
-               /* Play a sound */
-               if (play_sound)
-                       hildon_play_system_sound (MODEST_NEW_MAIL_SOUND_FILE);
+
+               _modest_platform_play_email_tone ();
 
                /* Activate LED. This must be deactivated by
                   modest_platform_remove_new_mail_notifications */
@@ -1193,7 +1518,7 @@ modest_platform_on_new_headers_received (TnyList *header_list,
                g_warning ("%s: header list is empty", __FUNCTION__);
                return;
        }
-       
+
        if (!show_visual) {
                 modest_platform_push_email_notification ();
                /* We do a return here to avoid indentation with an else */
@@ -1201,44 +1526,33 @@ modest_platform_on_new_headers_received (TnyList *header_list,
        }
 
 #ifdef MODEST_HAVE_HILDON_NOTIFY
-       gboolean play_sound;
-
-       /* Check whether or not we should play a sound */
-       play_sound = modest_conf_get_bool (modest_runtime_get_conf (),
-                                          MODEST_CONF_PLAY_SOUND_MSG_ARRIVE,
-                                          NULL);
-
        HildonNotification *notification;
        TnyIterator *iter;
        GSList *notifications_list = NULL;
 
        /* Get previous notifications ids */
-       notifications_list = modest_conf_get_list (modest_runtime_get_conf (), 
-                                                  MODEST_CONF_NOTIFICATION_IDS, 
+       notifications_list = modest_conf_get_list (modest_runtime_get_conf (),
+                                                  MODEST_CONF_NOTIFICATION_IDS,
                                                   MODEST_CONF_VALUE_INT, NULL);
 
        iter = tny_list_create_iterator (header_list);
        while (!tny_iterator_is_done (iter)) {
-               gchar *url = NULL, *display_address = NULL,  *summary = NULL;
-               const gchar *display_date;
+               gchar *url = NULL, *display_address = NULL;
                TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
                TnyFolder *folder = tny_header_get_folder (header);
                gboolean first_notification = TRUE;
                gint notif_id;
                gchar *str;
 
-               /* constant string, don't free */
-               display_date = modest_text_utils_get_display_date (tny_header_get_date_received (header));
-
                display_address = tny_header_dup_from (header);
-               modest_text_utils_get_display_address (display_address); /* string is changed in-place */
-               
-               summary = g_strdup_printf ("%s - %s", display_date, display_address);
+               /* string is changed in-place */
+               modest_text_utils_get_display_address (display_address);
+
                str = tny_header_dup_subject (header);
-               notification = hildon_notification_new (summary,
+               notification = hildon_notification_new (display_address,
                                                        str,
                                                        "qgn_list_messagin",
-                                                       "email.arrive");
+                                                       MODEST_NOTIFICATION_CATEGORY);
                g_free (str);
                /* Create the message URL */
                str = tny_header_dup_uid (header);
@@ -1259,18 +1573,25 @@ modest_platform_on_new_headers_received (TnyList *header_list,
                /* Play sound if the user wants. Show the LED
                   pattern. Show and play just one */
                if (G_UNLIKELY (first_notification)) {
+                       TnyAccount *account;
+
                        first_notification = FALSE;
-                       if (play_sound)  {
-                               notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
-                                                                   "sound-file", MODEST_NEW_MAIL_SOUND_FILE);
-                       }
 
                        /* Set the led pattern */
                        notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
                                                            "dialog-type", 4);
                        notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
                                                            "led-pattern",
-                                                           MODEST_NEW_MAIL_LIGHTING_PATTERN);                  
+                                                           MODEST_NEW_MAIL_LIGHTING_PATTERN);
+
+                       /* Set the account of the headers */
+                       account = tny_folder_get_account (folder);
+                       if (account) {
+                               notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
+                                                                   "email-account",
+                                                                   tny_account_get_id (account));
+                               g_object_unref (account);
+                       }
                }
 
                /* Notify. We need to do this in an idle because this function
@@ -1286,7 +1607,6 @@ modest_platform_on_new_headers_received (TnyList *header_list,
        
                /* Free & carry on */
                g_free (display_address);
-               g_free (summary);
                g_free (url);
                g_object_unref (folder);
                g_object_unref (header);
@@ -1390,7 +1710,7 @@ void
 modest_platform_show_addressbook (GtkWindow *parent_window)
 {
        osso_return_t result = OSSO_ERROR;
-       
+
        result = osso_rpc_run_with_defaults (modest_maemo_utils_get_osso_context(),
                                             "osso_addressbook",
                                             "top_application", NULL, DBUS_TYPE_INVALID);
@@ -1433,7 +1753,7 @@ modest_platform_information_banner (GtkWidget *parent,
        GtkWidget *banner, *banner_parent = NULL;
        ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
 
-       if (modest_window_mgr_num_windows (mgr) == 0)
+       if (modest_window_mgr_get_num_windows (mgr) == 0)
                return;
 
        if (parent && GTK_IS_WINDOW (parent)) {
@@ -1469,7 +1789,7 @@ modest_platform_information_banner_with_timeout (GtkWidget *parent,
 {
        GtkWidget *banner;
 
-       if (modest_window_mgr_num_windows (modest_runtime_get_window_mgr ()) == 0)
+       if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()) == 0)
                return;
 
        banner = hildon_banner_show_information (parent, icon_name, text);
@@ -1485,7 +1805,7 @@ modest_platform_animation_banner (GtkWidget *parent,
 
        g_return_val_if_fail (text != NULL, NULL);
 
-       if (modest_window_mgr_num_windows (modest_runtime_get_window_mgr ()) == 0)
+       if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()) == 0)
                return NULL;
 
        /* If the parent is not visible then do not show */
@@ -1618,7 +1938,7 @@ on_cert_dialog_response (GtkDialog *dialog, gint response_id,  const gchar* cert
                g_signal_stop_emission_by_name (dialog, "response");
 
                msg = g_strdup_printf (_("mcen_ni_view_unknown_certificate"), cert);    
-               note = hildon_note_new_information (GTK_WINDOW(dialog), msg);
+               note = hildon_note_new_information (NULL, msg);
                gtk_dialog_run (GTK_DIALOG(note));
                gtk_widget_destroy (note);
        }
@@ -1631,81 +1951,79 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
 {
        GtkWidget *note;
        gint response;
-       ModestWindow *main_win;
-       
-       if (!modest_window_mgr_main_window_exists (modest_runtime_get_window_mgr())) {
-               g_warning ("%s: don't show dialogs if there's no main window; assuming 'Cancel'",
+       ModestWindow *win;
+       HildonWindowStack *stack;
+
+       stack = hildon_window_stack_get_default ();
+       win = MODEST_WINDOW (hildon_window_stack_peek (stack));
+
+       if (!win) {
+         g_warning ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'",
                           __FUNCTION__);
                return FALSE;
        }
 
-       /* don't create it */
-       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
-       g_return_val_if_fail (main_win, FALSE); /* should not happen */
-       
-       
        gchar *question = g_strdup_printf (_("mcen_nc_unknown_certificate"),
                                           server_name);
-       
+
        /* We use GTK_RESPONSE_APPLY because we want the button in the
           middle of OK and CANCEL the same as the browser does for
           example. With GTK_RESPONSE_HELP the view button is aligned
           to the left while the other two to the right */
        note = hildon_note_new_confirmation_add_buttons  (
-               GTK_WINDOW(main_win),
+               NULL,
                question,
                _HL("wdgt_bd_yes"),     GTK_RESPONSE_OK,
                _HL("wdgt_bd_view"),          GTK_RESPONSE_APPLY,   /* abusing this... */
                _HL("wdgt_bd_no"), GTK_RESPONSE_CANCEL,
                NULL, NULL);
-       
+
        g_signal_connect (G_OBJECT(note), "response", 
                          G_CALLBACK(on_cert_dialog_response),
                          (gpointer) certificate);
-       
-       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
-                                    GTK_WINDOW (note), GTK_WINDOW (main_win));
+
        response = gtk_dialog_run(GTK_DIALOG(note));
 
        on_destroy_dialog (note);
        g_free (question);
-       
+
        return response == GTK_RESPONSE_OK;
 }
 
 gboolean
-modest_platform_run_alert_dialog (const gchar* prompt, 
+modest_platform_run_alert_dialog (const gchar* prompt,
                                  gboolean is_question)
-{      
-       ModestWindow *main_win; 
+{
+       ModestWindow *top_win;
+       HildonWindowStack *stack;
+
+       stack = hildon_window_stack_get_default ();
+       top_win = MODEST_WINDOW (hildon_window_stack_peek (stack));
 
-       if (!modest_window_mgr_main_window_exists (modest_runtime_get_window_mgr())) {
-               g_warning ("%s:\n'%s'\ndon't show dialogs if there's no main window;"
-                          " assuming 'Cancel' for questions, 'Ok' otherwise", prompt, __FUNCTION__);
-               return is_question ? FALSE : TRUE;
+       if (!top_win) {
+               g_warning ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'",
+                          __FUNCTION__);
+               return FALSE;
        }
 
-       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
-       g_return_val_if_fail (main_win, FALSE); /* should not happen */
-       
        gboolean retval = TRUE;
        if (is_question) {
-               /* The Tinymail documentation says that we should show Yes and No buttons, 
+               /* The Tinymail documentation says that we should show Yes and No buttons,
                 * when it is a question.
                 * Obviously, we need tinymail to use more specific error codes instead,
                 * so we know what buttons to show. */
-               GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_win), 
+               GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (top_win), 
                                                                              prompt));
                modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
-                                            GTK_WINDOW (dialog), GTK_WINDOW (main_win));
-               
+                                            GTK_WINDOW (dialog), GTK_WINDOW (top_win));
+
                const int response = gtk_dialog_run (GTK_DIALOG (dialog));
                retval = (response == GTK_RESPONSE_YES) || (response == GTK_RESPONSE_OK);
-               
-               on_destroy_dialog (dialog);             
+
+               on_destroy_dialog (dialog);
        } else {
                /* Just show the error text and use the default response: */
-               modest_platform_run_information_dialog (GTK_WINDOW (main_win), 
+               modest_platform_run_information_dialog (GTK_WINDOW (top_win), 
                                                        prompt, FALSE);
        }
        return retval;
@@ -1931,12 +2249,19 @@ modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window,
                                               gpointer user_data)
 {
        TnyAccount *account = NULL;
-       
-       if (!folder_store) {
+
+       if (!folder_store ||
+           (TNY_IS_MERGE_FOLDER (folder_store) &&
+            (tny_folder_get_folder_type (TNY_FOLDER(folder_store)) == TNY_FOLDER_TYPE_OUTBOX))) {
+
                /* We promise to instantly perform the callback, so ... */
                if (callback) {
-                       callback (FALSE, NULL, parent_window, NULL, user_data);
-               }
+                       GError *error = NULL;
+                       g_set_error (&error, TNY_ERROR_DOMAIN, TNY_SERVICE_ERROR_UNKNOWN,
+                                    "Unable to move or not found folder");
+                       callback (FALSE, error, parent_window, NULL, user_data);
+                       g_error_free (error);
+               }
                return;
 
        } else if (TNY_IS_FOLDER (folder_store)) {
@@ -1947,7 +2272,7 @@ modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window,
                account = TNY_ACCOUNT (g_object_ref (folder_store));
        }
 
-       if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) {
+       if (account && (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE)) {
                if (!modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) {
                        /* No need to connect a local account */
                        if (callback)
@@ -2058,7 +2383,7 @@ modest_platform_check_memory_low (ModestWindow *win,
        if (win && lowmem && visuals)
                modest_platform_run_information_dialog (
                        GTK_WINDOW(win),
-                       dgettext("ke-recv","memr_ib_operation_disabled"),
+                       _KR("memr_ib_operation_disabled"),
                        TRUE);
 
        if (lowmem)
@@ -2093,7 +2418,7 @@ modest_platform_run_header_details_dialog (GtkWindow *parent_window,
                                           TnyHeader *header)
 {
        GtkWidget *dialog;
-       
+
        /* Create dialog */
        dialog = modest_hildon2_details_dialog_new_with_header (parent_window, header);
 
@@ -2113,3 +2438,417 @@ modest_platform_get_osso_context (void)
 {
        return modest_maemo_utils_get_osso_context ();
 }
+
+static void
+_modest_platform_play_email_tone (void)
+{
+       gchar *active_profile;
+       gchar *mail_tone;
+       gchar *mail_volume;
+       gint mail_volume_int;
+       int ret;
+       ca_context *ca_con = NULL;
+       ca_proplist *pl = NULL;
+
+       active_profile = profile_get_profile ();
+       mail_tone = profile_get_value (active_profile, PROFILE_MAIL_TONE);
+       mail_volume = profile_get_value (active_profile, PROFILE_MAIL_VOLUME);
+       mail_volume_int = profile_parse_int (mail_volume);
+
+       if (mail_tone && !strstr (mail_tone, "/")) {
+               gchar *tmp;
+
+               tmp = g_strconcat ("/usr/share/sounds", mail_tone, NULL);
+               g_free (mail_tone);
+               mail_tone = tmp;
+       }
+
+       if (mail_volume_int > 0) {
+
+               if ((ret = ca_context_create(&ca_con)) != CA_SUCCESS) {
+                       g_warning("ca_context_create: %s\n", ca_strerror(ret));
+                       return;
+               }
+
+               if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) {
+                       g_warning("ca_context_open: %s\n", ca_strerror(ret));
+                       ca_context_destroy(ca_con);
+                       return;
+               }
+
+               ca_proplist_create(&pl);
+               ca_proplist_sets(pl, CA_PROP_MEDIA_FILENAME, mail_tone);
+               ca_proplist_setf(pl, CA_PROP_CANBERRA_VOLUME, "%f", (gfloat) mail_volume_int);
+
+               ret = ca_context_play_full(ca_con, 0, pl, NULL, NULL);
+               g_debug("ca_context_play_full (vol %f): %s\n", (gfloat) mail_volume_int, ca_strerror(ret));
+
+               ca_proplist_destroy(pl);
+               ca_context_destroy(ca_con);
+       }
+
+       g_free (mail_volume);
+       g_free (mail_tone);
+       g_free (active_profile);
+}
+
+#define MOVE_TO_DIALOG_FOLDER_VIEW "folder-view"
+#define MOVE_TO_DIALOG_BACK_BUTTON "back-button"
+#define MOVE_TO_DIALOG_ACTION_BUTTON "action-button"
+#define MOVE_TO_DIALOG_SELECTION_LABEL "selection-label"
+#define MOVE_TO_DIALOG_SHOWING_FOLDERS "showing-folders"
+#define MOVE_TO_DIALOG_PANNABLE "pannable"
+
+static void
+move_to_dialog_show_accounts (GtkWidget *dialog)
+{
+       GtkWidget *selection_label;
+       GtkWidget *back_button;
+       GtkWidget *folder_view;
+       GtkWidget *pannable;
+       GtkWidget *action_button;
+
+        selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
+        back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
+        action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
+        folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+        pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
+
+       gtk_widget_set_sensitive (back_button, FALSE);
+       gtk_widget_set_sensitive (action_button, FALSE);
+
+       /* Need to set this here, otherwise callbacks called because
+          of filtering won't perform correctly */
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE));
+
+       gtk_label_set_text (GTK_LABEL (selection_label), "");
+       modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), TRUE);
+       modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
+       modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
+       hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
+
+       g_object_set (G_OBJECT (folder_view), 
+                     "hildon-ui-mode", HILDON_UI_MODE_NORMAL, 
+                     NULL);
+}
+
+static void
+move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
+{
+       GtkWidget *selection_label;
+       GtkWidget *back_button;
+       GtkWidget *folder_view;
+       TnyAccount *account;
+       const gchar *account_id;
+       gchar *selection_label_text;
+       GtkWidget *pannable;
+       GtkWidget *action_button;
+
+        selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
+        back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
+        action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
+        folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+        pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
+
+       gtk_widget_set_sensitive (back_button, TRUE);
+       gtk_widget_set_sensitive (action_button, FALSE);
+
+       /* Need to set this here, otherwise callbacks called because
+          of filtering won't perform correctly */
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE));
+
+       g_object_set (G_OBJECT (folder_view),
+                     "hildon-ui-mode", HILDON_UI_MODE_EDIT,
+                     NULL);
+
+       account = TNY_ACCOUNT (folder_store);
+       if (modest_tny_account_is_virtual_local_folders (account)) {
+               gchar *device_name;
+               account_id = tny_account_get_id (account);
+               device_name = modest_conf_get_string (modest_runtime_get_conf(),
+                                                     MODEST_CONF_DEVICE_NAME, NULL);
+               if (device_name) {
+                       selection_label_text = g_strconcat (device_name, "/", NULL);
+                       g_free (device_name);
+               } else {
+                       selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
+               }
+               modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
+                                              MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
+       } else if (modest_tny_account_is_memory_card_account (account)) {
+               account_id = tny_account_get_id (account);
+               selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
+               modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
+                                              MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS);
+       } else {
+               account_id = tny_account_get_id (account);
+
+               selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
+               modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
+                                              MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS);
+               modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
+                                              MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
+       }
+       gtk_label_set_text (GTK_LABEL (selection_label), selection_label_text);
+       g_free (selection_label_text);
+
+       modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view),
+                                                                    account_id);
+
+       modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), FALSE);
+       modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
+       modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
+       hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
+}
+
+static void
+move_to_dialog_set_selected_folder (GtkWidget *dialog, TnyFolderStore *folder_store)
+{
+       GtkWidget *selection_label;
+       GtkWidget *action_button;
+       gchar *folder_name;
+
+        selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
+        action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
+
+       gtk_widget_set_sensitive (action_button, TRUE);
+
+       if (TNY_IS_FOLDER (folder_store)) {
+               folder_name = modest_tny_folder_get_display_name (TNY_FOLDER (folder_store));
+       } else if (TNY_IS_ACCOUNT (folder_store)) {
+               folder_name = g_strdup (tny_account_get_name (TNY_ACCOUNT (folder_store)));
+       } else {
+               folder_name = g_strdup ("");
+       }
+
+       gtk_label_set_text (GTK_LABEL (selection_label), folder_name);
+       g_free (folder_name);
+
+}
+
+static void
+on_move_to_dialog_back_clicked (GtkButton *button,
+                               gpointer userdata)
+{
+       GtkWidget *dialog = (GtkWidget *) userdata;
+       ModestFolderView *folder_view;
+
+       /* Revert the effect of show_folders filters */
+        folder_view = MODEST_FOLDER_VIEW (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+       modest_folder_view_set_account_id_of_visible_server_account (folder_view, NULL);
+       modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), TRUE);
+       modest_folder_view_unset_filter (folder_view, MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS);
+       modest_folder_view_unset_filter (folder_view, MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
+
+       /* Back to show accounts */
+       move_to_dialog_show_accounts (dialog);
+}
+
+static void
+on_move_to_dialog_folder_activated (GtkTreeView       *tree_view,
+                                    GtkTreePath       *path,
+                                    GtkTreeViewColumn *column,
+                                    gpointer           user_data)
+{
+       TnyFolderStore *selected;
+       GtkWidget *dialog;
+       GtkWidget *folder_view;
+       gboolean showing_folders;
+
+       dialog = (GtkWidget *) user_data;
+       showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
+       if (!showing_folders) {
+               folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+
+               selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+               if (selected) {
+                       move_to_dialog_show_folders (dialog, selected);
+               }
+       }
+}
+
+static void
+on_move_to_dialog_selection_changed (GtkTreeSelection       *selection,
+                                    gpointer           user_data)
+{
+       gboolean showing_folders;
+       GtkWidget *dialog;
+
+       dialog = (GtkWidget *) user_data;
+       showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
+       if (showing_folders) {
+               TnyFolderStore *selected;
+               GtkWidget *folder_view;
+
+               folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+               selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+               if (selected) {
+                       move_to_dialog_set_selected_folder (dialog, selected);
+                       g_object_unref (selected);
+               }
+       }
+}
+
+static void
+on_move_to_dialog_action_clicked (GtkButton       *selection,
+                                 gpointer           user_data)
+{
+       TnyFolderStore *selected;
+       GtkWidget *dialog;
+       GtkWidget *folder_view;
+       gboolean showing_folders;
+
+       dialog = (GtkWidget *) user_data;
+       showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
+       if (showing_folders) {
+               folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+               selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+               if (selected)
+                       gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+       }
+}
+
+GtkWidget *
+modest_platform_create_move_to_dialog (GtkWindow *parent_window,
+                                      GtkWidget **folder_view)
+{
+       GtkWidget *dialog, *folder_view_container;
+       GtkWidget *align;
+       GtkWidget *buttons_hbox;
+       GtkWidget *back_button, *selection_label;
+       GdkPixbuf *back_pixbuf;
+       GtkWidget *top_vbox;
+       GtkWidget *action_button;
+       GtkTreeSelection *selection;
+
+       /* Create dialog. We cannot use a touch selector because we
+          need to use here the folder view widget directly */
+       dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
+                                             GTK_WINDOW (parent_window),
+                                             GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR |
+                                             GTK_DIALOG_DESTROY_WITH_PARENT,
+                                             _HL("wdgt_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
+                                             NULL);
+
+       align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_NONE);
+       top_vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
+
+       /* Create folder view */
+       *folder_view = modest_platform_create_folder_view (NULL);
+
+       modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (*folder_view),
+                                          MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);
+       modest_folder_view_show_message_count (MODEST_FOLDER_VIEW (*folder_view),
+                                              FALSE);
+       tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (*folder_view),
+                                                 (TnyAccountStore *) modest_runtime_get_account_store ());
+
+       buttons_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
+       back_button = gtk_button_new ();
+       back_pixbuf = modest_platform_get_icon (_FM("filemanager_folder_up"), MODEST_ICON_SIZE_BIG);
+       if (back_pixbuf) {
+               gtk_button_set_image (GTK_BUTTON (back_button), gtk_image_new_from_pixbuf (back_pixbuf));
+               g_object_unref (back_pixbuf);
+       }
+       selection_label = gtk_label_new ("");
+       gtk_misc_set_alignment (GTK_MISC (selection_label), 0.0, 0.5);
+
+       action_button = gtk_button_new ();
+       gtk_container_add (GTK_CONTAINER (action_button), selection_label);
+
+       gtk_box_pack_start (GTK_BOX (buttons_hbox), back_button, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (buttons_hbox), action_button, TRUE, TRUE, 0);
+       gtk_widget_set_sensitive (GTK_WIDGET (back_button), FALSE);
+       gtk_widget_set_sensitive (GTK_WIDGET (action_button), FALSE);
+       gtk_box_pack_start (GTK_BOX (top_vbox), buttons_hbox, FALSE, FALSE, 0);
+
+       /* Create pannable and add it to the dialog */
+       folder_view_container = hildon_pannable_area_new ();
+       gtk_container_add (GTK_CONTAINER (folder_view_container), *folder_view);
+       gtk_box_pack_start (GTK_BOX (top_vbox), folder_view_container, TRUE, TRUE, 0);
+
+       gtk_container_add (GTK_CONTAINER (align), top_vbox);
+       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), align, TRUE, TRUE, 0);
+
+       gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300);
+
+       gtk_widget_show (GTK_DIALOG (dialog)->vbox);
+       gtk_widget_show (folder_view_container);
+       gtk_widget_show (align);
+       gtk_widget_show (top_vbox);
+       gtk_widget_show (*folder_view);
+       gtk_widget_show_all (back_button);
+       gtk_widget_show (selection_label);
+       gtk_widget_show (action_button);
+       gtk_widget_show (buttons_hbox);
+
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW, *folder_view);
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON, back_button);
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON, action_button);
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL, selection_label);
+       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE, folder_view_container);
+
+        /* Simulate the behaviour of a HildonPickerDialog by emitting
+          a response when a folder is selected */
+        g_signal_connect (*folder_view, "row-activated",
+                          G_CALLBACK (on_move_to_dialog_folder_activated),
+                          dialog);
+
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*folder_view));
+       g_signal_connect (selection, "changed",
+                         G_CALLBACK (on_move_to_dialog_selection_changed),
+                         dialog);
+
+       g_signal_connect (action_button, "clicked",
+                         G_CALLBACK (on_move_to_dialog_action_clicked),
+                         dialog);
+
+       g_signal_connect (back_button, "clicked",
+                         G_CALLBACK (on_move_to_dialog_back_clicked),
+                         dialog);
+
+       move_to_dialog_show_accounts (dialog);
+
+       return dialog;
+}
+
+TnyList *
+modest_platform_get_list_to_move (ModestWindow *window)
+{
+       TnyList *list = NULL;
+
+       if (MODEST_IS_HEADER_WINDOW (window)) {
+               ModestHeaderView *header_view;
+
+               header_view = modest_header_window_get_header_view (MODEST_HEADER_WINDOW (window));
+               list = modest_header_view_get_selected_headers (header_view);
+       } else if (MODEST_IS_FOLDER_WINDOW (window)) {
+               ModestFolderView *folder_view;
+               TnyFolderStore *selected_folder;
+
+               list = TNY_LIST (tny_simple_list_new ());
+               folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window));
+               selected_folder = modest_folder_view_get_selected (folder_view);
+               if (selected_folder) {
+                       tny_list_prepend (list, G_OBJECT (selected_folder));
+                       g_object_unref (selected_folder);
+               }
+               return list;
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+               TnyHeader *header;
+
+               header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (window));
+               if (header) {
+                       list = TNY_LIST (tny_simple_list_new ());
+                       tny_list_prepend (list, G_OBJECT (header));
+                       g_object_unref (header);
+               }
+       } else {
+               g_return_val_if_reached (NULL);
+       }
+
+       return list;
+}