diff --git a/dovecot-2.2.31-notifyrevert.patch b/dovecot-2.2.31-notifyrevert.patch
new file mode 100644
index 0000000..a0fa251
--- /dev/null
+++ b/dovecot-2.2.31-notifyrevert.patch
@@ -0,0 +1,28 @@
+From 64d2efdc4b0bdf92249840e9db89b91c8dc0f3a3 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@dovecot.fi>
+Date: Sat, 17 Jun 2017 14:38:22 +0300
+Subject: [PATCH] imap: Fix NOTIFY to parse more than just the first
+ event-group
+
+---
+ src/imap/cmd-notify.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/imap/cmd-notify.c b/src/imap/cmd-notify.c
+index 4c6aad975..94cf103b8 100644
+--- a/src/imap/cmd-notify.c
++++ b/src/imap/cmd-notify.c
+@@ -292,10 +292,10 @@ cmd_notify_set(struct imap_notify_context *ctx, const struct imap_arg *args)
+ 		ctx->send_immediate_status = TRUE;
+ 		args++;
+ 	}
++	for (; args->type != IMAP_ARG_EOL; args++) {
++		if (!imap_arg_get_list(args, &event_group))
++			return -1;
+ 
+-	if (!imap_arg_get_list(args, &event_group))
+-		return -1;
+-	for (; event_group->type != IMAP_ARG_EOL; event_group++) {
+ 		/* filter-mailboxes */
+ 		if (!imap_arg_get_atom(event_group, &filter_mailboxes))
+ 			return -1;
diff --git a/dovecot.spec b/dovecot.spec
index 39f26d3..6112285 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -5,7 +5,7 @@ Name: dovecot
 Epoch: 1
 Version: 2.2.31
 %global prever %{nil}
-Release: 1%{?dist}
+Release: 2%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -33,6 +33,7 @@ Patch7: dovecot-2.2.13-online.patch
 
 Patch8: dovecot-2.2.20-initbysystemd.patch
 Patch9: dovecot-2.2.22-systemd_w_protectsystem.patch
+Patch10: dovecot-2.2.31-notifyrevert.patch
 
 Source15: prestartscript
 
@@ -129,6 +130,7 @@ This package provides the development files for dovecot.
 %patch7 -p1 -b .online
 %patch8 -p1 -b .initbysystemd
 %patch9 -p1 -b .systemd_w_protectsystem
+%patch10 -p1 -b .notifyrevert
 
 #pushd dovecot-2*2-pigeonhole-%{pigeonholever}
 #popd
@@ -488,6 +490,9 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Tue Jul 04 2017 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.31-2
+- revert commit breaking NOTIFY support
+
 * Tue Jun 27 2017 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.31-1
 - dovecot updated to 2.2.31
 - Various fixes to handling mailbox listing. Especially related to