diff --git a/src/lib-sieve/plugins/Makefile.am b/src/lib-sieve/plugins/Makefile.am
index 92389755bb453ae3b142516f1cd6ad88f0efd7db..c098e06c7dad8e34dca43d117e8a93e1e1643b2d 100644
--- a/src/lib-sieve/plugins/Makefile.am
+++ b/src/lib-sieve/plugins/Makefile.am
@@ -11,5 +11,6 @@ SUBDIRS = \
 	variables \
 	enotify \
 	notify \
-	environment
+	environment \
+	mailbox
 
diff --git a/src/lib-sieve/plugins/notify/cmd-denotify.c b/src/lib-sieve/plugins/notify/cmd-denotify.c
index dbc72b22e60b9e8f10a74c61c66d244a87fbbb8e..12e3837d8de308c087e6f41a07e9013d1eff72ac 100644
--- a/src/lib-sieve/plugins/notify/cmd-denotify.c
+++ b/src/lib-sieve/plugins/notify/cmd-denotify.c
@@ -79,15 +79,18 @@ enum cmd_denotify_optional {
  */
 
 static bool cmd_denotify_operation_dump
-(const struct sieve_operation *op ATTR_UNUSED,
-	const struct sieve_dumptime_env *denv, sieve_size_t *address);
+	(const struct sieve_operation *op ATTR_UNUSED,
+		const struct sieve_dumptime_env *denv, sieve_size_t *address);
+static int cmd_denotify_operation_execute
+	(const struct sieve_operation *op ATTR_UNUSED,
+		const struct sieve_runtime_env *renv, sieve_size_t *address);
 
 const struct sieve_operation denotify_operation = { 
 	"DENOTIFY",
 	&notify_extension,
 	EXT_NOTIFY_OPERATION_DENOTIFY,
 	cmd_denotify_operation_dump,
-	NULL
+	cmd_denotify_operation_execute
 };
 
 /*
@@ -227,12 +230,10 @@ static bool cmd_denotify_operation_dump
  * Code execution
  */
 
-static int cmd_notify_operation_execute
+static int cmd_denotify_operation_execute
 (const struct sieve_operation *op ATTR_UNUSED,
 	const struct sieve_runtime_env *renv, sieve_size_t *address)
 {	
-	struct ext_notify_action *act;
-	pool_t pool;
 	int opt_code = 1;
 	sieve_number_t importance = 1;
 	const struct sieve_match_type *match_type = NULL;