Index: src/addressbook.c
===================================================================
RCS file: //claws/src/addressbook.c,v
retrieving revision 1.60.2.124
retrieving revision 1.60.2.125
diff -u -r1.60.2.124 -r1.60.2.125
--- src/addressbook.c	31 Aug 2008 07:24:00 -0000	1.60.2.124
+++ src/addressbook.c	4 Oct 2008 08:25:04 -0000	1.60.2.125
@@ -951,7 +951,7 @@
 #ifndef MAEMO
 	MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-	MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+	MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
 
 	MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Book", "Book", GTK_UI_MANAGER_MENU)
Index: src/compose.c
===================================================================
RCS file: //claws/src/compose.c,v
retrieving revision 1.382.2.481
retrieving revision 1.382.2.482
diff -u -r1.382.2.481 -r1.382.2.482
--- src/compose.c	30 Sep 2008 15:34:22 -0000	1.382.2.481
+++ src/compose.c	4 Oct 2008 08:25:04 -0000	1.382.2.482
@@ -6748,7 +6748,7 @@
 #ifndef MAEMO
 	MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-	MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+	MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
 
 	MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Message", "Message", GTK_UI_MANAGER_MENU)
Index: src/mainwindow.c
===================================================================
RCS file: //claws/src/mainwindow.c,v
retrieving revision 1.274.2.275
retrieving revision 1.274.2.276
diff -u -r1.274.2.275 -r1.274.2.276
--- src/mainwindow.c	23 Sep 2008 19:57:34 -0000	1.274.2.275
+++ src/mainwindow.c	4 Oct 2008 08:25:04 -0000	1.274.2.276
@@ -1543,7 +1543,7 @@
 #ifndef MAEMO
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
Index: src/messageview.c
===================================================================
RCS file: //claws/src/messageview.c,v
retrieving revision 1.94.2.188
retrieving revision 1.94.2.189
diff -u -r1.94.2.188 -r1.94.2.189
--- src/messageview.c	23 Sep 2008 19:57:35 -0000	1.94.2.188
+++ src/messageview.c	4 Oct 2008 08:25:05 -0000	1.94.2.189
@@ -442,7 +442,7 @@
 #ifndef MAEMO
 	MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-	MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+	MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
 
 	MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
Index: src/summaryview.c
===================================================================
RCS file: //claws/src/summaryview.c,v
retrieving revision 1.395.2.393
retrieving revision 1.395.2.394
diff -u -r1.395.2.393 -r1.395.2.394
--- src/summaryview.c	30 Sep 2008 15:34:24 -0000	1.395.2.393
+++ src/summaryview.c	4 Oct 2008 08:25:05 -0000	1.395.2.394
@@ -811,8 +811,10 @@
 
 	MENUITEM_ADDUI("/Menus", "SummaryViewPopup", "SummaryViewPopup", GTK_UI_MANAGER_MENU)
 	MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Reply", "SummaryViewPopup/Reply", GTK_UI_MANAGER_MENUITEM)
+#ifndef GENERIC_UMPC
 	MENUITEM_ADDUI("/Menus/SummaryViewPopup", "ReplyTo", "SummaryViewPopup/ReplyTo", GTK_UI_MANAGER_MENU)
 	MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Separator1", "SummaryViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+#endif
 	MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Forward", "SummaryViewPopup/Forward", GTK_UI_MANAGER_MENUITEM)
 #ifndef GENERIC_UMPC
 	MENUITEM_ADDUI("/Menus/SummaryViewPopup", "ForwardAsAtt", "SummaryViewPopup/ForwardAsAtt", GTK_UI_MANAGER_MENUITEM)