* src/maemo/modest-platform.c:

[modest] / src / maemo / modest-main-window.c

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 7bde64d..03ffe7f 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1929,6 +1929,8 @@ on_msg_count_changed (ModestHeaderView *header_view,
 
                if ((changed) & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)
                        refilter = TRUE;
+       } else {
+               folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (folder))) == 0);
        }
 
        /* Check if all messages are marked to be deleted */
@@ -2302,6 +2304,10 @@ on_mail_operation_started (ModestMailOperation *mail_op,
                        tmp = g_slist_next (tmp);
                }
        }
+
+       /* Update the main menu as well, we need to explicitely do
+          this in order to enable/disable accelerators */
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
 }
 
 static void 
@@ -2484,9 +2490,9 @@ refresh_account (const gchar *account_name)
        
        /* If account_name == NULL, we must update all (option All) */
        if (!account_name)
-               modest_ui_actions_do_send_receive_all (win, FALSE);
+               modest_ui_actions_do_send_receive_all (win, TRUE);
        else
-               modest_ui_actions_do_send_receive (account_name, FALSE, win);
+               modest_ui_actions_do_send_receive (account_name, TRUE, win);
        
 }