diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index 0fb3d52a1..cc8411a8b 100644
--- a/UI/MailerUI/GNUmakefile
+++ b/UI/MailerUI/GNUmakefile
@@ -27,16 +27,17 @@ MailerUI_OBJC_FILES += \
 	\
 	UIxMailAccountActions.m		\
 	UIxMailFolderActions.m		\
+	UIxMailActions.m		\
 	UIxMailEditor.m			\
-	UIxMailEditorAction.m		\
-	UIxMailReplyAction.m		\
-	UIxMailForwardAction.m		\
 	UIxMailToSelection.m		\
 	UIxMailWindowCloser.m		\
 	\
+	UIxMailUserRightsEditor.m	\
+#	UIxMailEditorAction.m		\
+#	UIxMailReplyAction.m		\
+#	UIxMailForwardAction.m		\
 # 	UIxFilterList.m			\
 # 	\
-	UIxMailUserRightsEditor.m
 # 	UIxSieveEditor.m
 
 MailerUI_RESOURCE_FILES += \
diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index 8a3b1331a..f974b0728 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -133,8 +133,8 @@ categories = {
 	 };
 	 expunge = {
 	    protectedBy = "View";
-	    pageName    = "UIxMailListView";
-	    actionName  = "expunge";
+	    actionClass = "UIxMailFolderActions";
+	    actionName = "emptyTrash";
 	 };
 	 createFolder = {
 	    protectedBy = "View";
@@ -151,11 +151,6 @@ categories = {
 	    actionClass = "UIxMailFolderActions";
 	    actionName = "deleteFolder";
 	 };
-	 compose = {
-	    protectedBy = "View";
-	    actionClass = "UIxMailEditorAction";
-	    actionName  = "compose";
-	 };
 	 userRights = {
 	    protectedBy = "ReadAcls";
 	    pageName    = "UIxMailUserRightsEditor";
@@ -228,26 +223,22 @@ categories = {
 	 };
 	 edit = {
 	    protectedBy = "View";
-	    pageName    = "UIxMailEditor";
-	 };
-	 compose = {
-	    protectedBy = "View";
-	    actionClass = "UIxMailEditorAction";
-	    actionName  = "compose";
+	    actionClass = "UIxMailActions";
+	    actionName = "edit";
 	 };
 	 reply = {
 	    protectedBy = "View";
-	    actionClass = "UIxMailReplyAction";
+	    actionClass = "UIxMailActions";
 	    actionName  = "reply";
 	 };
 	 replyall = {
 	    protectedBy = "View";
-	    actionClass = "UIxMailReplyAction";
-	    actionName  = "replyall";
+	    actionClass = "UIxMailActions";
+	    actionName  = "replyToAll";
 	 };
 	 forward = {
 	    protectedBy = "View";
-	    actionClass = "UIxMailForwardAction";
+	    actionClass = "UIxMailActions";
 	    actionName  = "forward";
 	 };
       };
@@ -265,11 +256,6 @@ categories = {
 	    protectedBy = "View";
 	    pageName    = "UIxMailMainFrame";
 	 };
-	 compose = {
-	    protectedBy = "View";
-	    pageName    = "UIxMailMainFrame";
-	    actionName  = "compose";
-	 };
 	 getMail = {
 	    protectedBy = "View";
 	    pageName    = "UIxMailAccountsView";
@@ -287,7 +273,7 @@ categories = {
       methods = {
 	 compose = {
 	    protectedBy = "View";
-	    actionClass = "UIxMailEditorAction";
+	    actionClass = "UIxMailAccountActions";
 	    actionName  = "compose";
 	 };
 	 mailboxes = {
@@ -331,11 +317,6 @@ categories = {
 	    protectedBy = "View";
 	    pageName    = "UIxMailListView";
 	 };
-	 compose = {
-	    protectedBy = "View";
-	    actionClass = "UIxMailEditorAction";
-	    actionName  = "compose";
-	 };
       };
    };
 
@@ -347,10 +328,6 @@ categories = {
 	 };
       };
       methods = {
-	 view = { /* somewhat hackish */
-            protectedBy = "View";
-	    pageName    = "UIxMailView";
-	 };
 	 edit = {
 	    protectedBy = "View";
 	    pageName    = "UIxMailEditor";
@@ -360,27 +337,6 @@ categories = {
 	    pageName    = "UIxMailEditor";
 	    actionName  = "save";
 	 };
-	 delete = {
-	    protectedBy = "View";
-	    pageName    = "UIxMailEditor";
-	    actionName  = "delete";
-	 };
-
-	 viewAttachments = {
-	    protectedBy = "View";
-	    pageName    = "UIxMailEditorAttach";
-	    actionName  = "viewAttachments";
-	 };
-	 attach = {
-	    protectedBy = "View";
-	    pageName    = "UIxMailEditorAttach";
-	    actionName  = "attach";
-	 };
-	 deleteAttachment = {
-	    protectedBy = "View";
-	    pageName    = "UIxMailEditorAttach";
-	    actionName  = "deleteAttachment";
-	 };
 	 send = {
 	    protectedBy = "View";
 	    pageName    = "UIxMailEditor";