diff -ruN balsa-2.0.16/src/mailbox-node.c balsa-2.0.16-enable_special_outbox/src/mailbox-node.c
--- balsa-2.0.16/src/mailbox-node.c	2003-09-25 19:09:32.000000000 +0200
+++ balsa-2.0.16-enable_special_outbox/src/mailbox-node.c	2004-02-19 19:04:34.665875528 +0100
@@ -824,36 +824,43 @@
     else folder_conf_delete(mbnode);
 }
 
+/* helper function to set special mailboxes */
 static void
-mb_inbox_cb(GtkWidget * widget, BalsaMailboxNode * mbnode)
+mb_set_special(BalsaMailboxNode * mbnode, specialType type)
 {
     g_return_if_fail(LIBBALSA_IS_MAILBOX(mbnode->mailbox));
-    config_mailbox_set_as_special(mbnode->mailbox, SPECIAL_INBOX);
+    config_mailbox_set_as_special(mbnode->mailbox, type);
     balsa_mblist_repopulate(balsa_app.mblist_tree_store);
 }
 
 static void
+mb_inbox_cb(GtkWidget * widget, BalsaMailboxNode * mbnode)
+{
+    mb_set_special(mbnode, SPECIAL_INBOX);
+}
+
+static void
 mb_sentbox_cb(GtkWidget * widget, BalsaMailboxNode * mbnode)
 {
-    g_return_if_fail(LIBBALSA_IS_MAILBOX(mbnode->mailbox));
-    config_mailbox_set_as_special(mbnode->mailbox, SPECIAL_SENT);
-    balsa_mblist_repopulate(balsa_app.mblist_tree_store);
+    mb_set_special(mbnode, SPECIAL_SENT);
 }
 
 static void
 mb_trash_cb(GtkWidget * widget, BalsaMailboxNode * mbnode)
 {
-    g_return_if_fail(LIBBALSA_IS_MAILBOX(mbnode->mailbox));
-    config_mailbox_set_as_special(mbnode->mailbox, SPECIAL_TRASH);
-    balsa_mblist_repopulate(balsa_app.mblist_tree_store);
+    mb_set_special(mbnode, SPECIAL_TRASH);
 }
 
 static void
 mb_draftbox_cb(GtkWidget * widget, BalsaMailboxNode * mbnode)
 {
-    g_return_if_fail(LIBBALSA_IS_MAILBOX(mbnode->mailbox));
-    config_mailbox_set_as_special(mbnode->mailbox, SPECIAL_DRAFT);
-    balsa_mblist_repopulate(balsa_app.mblist_tree_store);
+    mb_set_special(mbnode, SPECIAL_DRAFT);
+}
+
+static void
+mb_outbox_cb(GtkWidget * widget, BalsaMailboxNode * mbnode)
+{
+    mb_set_special(mbnode, SPECIAL_OUTBOX);
 }
 
 static void
@@ -977,6 +984,9 @@
 	if(mbnode->mailbox != balsa_app.draftbox)
 	    add_menu_entry(menu, _("Mark as D_raftbox"),
                            GTK_SIGNAL_FUNC(mb_draftbox_cb), mbnode);
+	if(mbnode->mailbox != balsa_app.outbox)
+	    add_menu_entry(menu, _("Mark as Outbox"),
+                           GTK_SIGNAL_FUNC(mb_outbox_cb), mbnode);
 	/* FIXME : No test on mailbox type is made yet, should we ? */
 	add_menu_entry(menu, _("_Edit/Apply filters"), 
                        GTK_SIGNAL_FUNC(mb_filter_cb), mbnode);
diff -ruN balsa-2.0.16/src/save-restore.c balsa-2.0.16-enable_special_outbox/src/save-restore.c
--- balsa-2.0.16/src/save-restore.c	2003-11-22 00:45:34.000000000 +0100
+++ balsa-2.0.16-enable_special_outbox/src/save-restore.c	2004-02-19 18:51:24.256036088 +0100
@@ -205,7 +205,6 @@
 
 /* config_mailbox_set_as_special:
    allows to set given mailboxe as one of the special mailboxes
-   PS: I am not sure if I should add outbox to the list.
    specialNames must be in sync with the specialType definition.
 
    WARNING: may destroy mailbox.
@@ -233,6 +232,9 @@
     case SPECIAL_DRAFT:
 	special = &balsa_app.draftbox;
 	break;
+    case SPECIAL_OUTBOX:
+	special = &balsa_app.outbox;
+	break;
     default:
 	return;
     }
