Index: src/message-window.c
===================================================================
RCS file: /cvs/gnome/balsa/src/message-window.c,v
retrieving revision 1.78
diff -u -r1.78 message-window.c
--- src/message-window.c	4 Oct 2004 20:15:19 -0000	1.78
+++ src/message-window.c	8 Oct 2004 19:59:56 -0000
@@ -295,15 +313,22 @@
 
     balsa_message_set_close(msg, TRUE);
 
-    if(msg && msg->treeview) {
-	if (msg->info_count > 1) {
-            GtkWidget *toolbar =
-                balsa_toolbar_get_from_gnome_app(GNOME_APP(mw->window));
-	    balsa_toolbar_set_button_sensitive(toolbar,
-                                               BALSA_PIXMAP_PREVIOUS, TRUE);
-	    balsa_toolbar_set_button_sensitive(toolbar,
-                                               BALSA_PIXMAP_NEXT, TRUE);
-	}
+    if (msg && msg->treeview) {
+        GtkWidget *toolbar =
+            balsa_toolbar_get_from_gnome_app(GNOME_APP(mw->window));
+        gboolean enable = msg->info_count > 1;
+
+        balsa_toolbar_set_button_sensitive(toolbar,
+                                           BALSA_PIXMAP_PREVIOUS_PART,
+                                           enable);
+        balsa_toolbar_set_button_sensitive(toolbar,
+                                           BALSA_PIXMAP_NEXT_PART, enable);
+        gtk_widget_set_sensitive(message_menu
+                                 [MENU_MESSAGE_NEXT_PART_POS].widget,
+                                 enable);
+        gtk_widget_set_sensitive(message_menu
+                                 [MENU_MESSAGE_PREVIOUS_PART_POS].widget,
+                                 enable);
     }
 
     /* Update the style and message counts in the mailbox list */
