Index: src/summaryview.c
===================================================================
--- src/summaryview.c	(Revision 1094)
+++ src/summaryview.c	(Arbeitskopie)
@@ -358,6 +358,8 @@
 					 GtkTreeIter		*a,
 					 GtkTreeIter		*b,
 					 gpointer		 data);
+static void summary_junk_cb			(SummaryView *summaryview,
+									 guint action, GtkWidget *widget);


 /* must be synched with FolderSortKey */
@@ -433,6 +435,9 @@
 	{N_("/_Mark/Mark all _read"),	NULL, summary_mark_all_read, 0, NULL},
 	{N_("/Color la_bel"),		NULL, NULL,		0, NULL},
 	{N_("/---"),			NULL, NULL,		0, "<Separator>"},
+	{N_("/Set as _junk mail"),	NULL, summary_junk_cb, 0, NULL},
+	{N_("/Set as not j_unk mail"),	NULL, summary_junk_cb, 1, NULL},
+	{N_("/---"),			NULL, NULL,		0, "<Separator>"},
 	{N_("/_Delete"),		NULL, summary_delete,	0, NULL},
 	{N_("/---"),			NULL, NULL,		0, "<Separator>"},
 	{N_("/Re-_edit"),		NULL, summary_reedit,   0, NULL},
@@ -1164,9 +1169,13 @@
 	    FOLDER_TYPE(summaryview->folder_item->folder) != F_NEWS) {
 		menu_set_sensitive(ifactory, "/Move...", TRUE);
 		menu_set_sensitive(ifactory, "/Delete", TRUE);
+		menu_set_sensitive(ifactory, "/Set as junk mail", TRUE);
+		menu_set_sensitive(ifactory, "/Set as not junk mail", TRUE);
 	} else {
 		menu_set_sensitive(ifactory, "/Move...", FALSE);
 		menu_set_sensitive(ifactory, "/Delete", FALSE);
+		menu_set_sensitive(ifactory, "/Set as junk mail", FALSE);
+		menu_set_sensitive(ifactory, "/Set as not junk mail", FALSE);
 	}

 	menu_set_sensitive(ifactory, "/Copy...", TRUE);
@@ -5948,3 +5957,13 @@
 	return (ret != 0) ? ret :
 		(msginfo_a->date_t - msginfo_b->date_t);
 }
+
+static void summary_junk_cb(SummaryView *summaryview, guint action,
+							GtkWidget *widget)
+{
+	if (action == 0)
+		summary_junk(summaryview);
+	else
+		summary_not_junk(summaryview);
+}
+