diff --git a/mail/roundcube-automatic_addressbook/Makefile b/mail/roundcube-automatic_addressbook/Makefile
index 37cc22b85dd0..591497c40371 100644
--- a/mail/roundcube-automatic_addressbook/Makefile
+++ b/mail/roundcube-automatic_addressbook/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	automatic_addressbook
-PORTVERSION=	0.4.3
+DISTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	andrej@ebert.su
 COMMENT=	Roundcube webmail automatic addressbook plugin
 WWW=		https://github.com/sblaisot/automatic_addressbook
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=0.8:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
 USE_GITHUB=	yes
 GH_ACCOUNT=	sblaisot
 
 WWWDIR=		${RCDIR}/plugins/automatic_addressbook
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 RCDIR=		${PREFIX}/www/roundcube
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PLUGINDIR=${WWWDIR} \
 		RCDIR=${RCDIR}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-automatic_addressbook/files/patch-automatic__addressbook.php b/mail/roundcube-automatic_addressbook/files/patch-automatic__addressbook.php
new file mode 100644
index 000000000000..02dd4fd59b40
--- /dev/null
+++ b/mail/roundcube-automatic_addressbook/files/patch-automatic__addressbook.php
@@ -0,0 +1,24 @@
+--- automatic_addressbook.php.orig	2017-01-26 08:10:28 UTC
++++ automatic_addressbook.php
+@@ -129,9 +129,9 @@ class automatic_addressbook extends rcube_plugin
+             );
+         } else {
+             $all_recipients = array_merge(
+-                rcube_mime::decode_address_list($headers['To'], null, true, $headers['charset']),
+-                rcube_mime::decode_address_list($headers['Cc'], null, true, $headers['charset']),
+-                rcube_mime::decode_address_list($headers['Bcc'], null, true, $headers['charset'])
++                @rcube_mime::decode_address_list($headers['To'], null, true, $headers['charset']),
++                @rcube_mime::decode_address_list($headers['Cc'], null, true, $headers['charset']),
++                @rcube_mime::decode_address_list($headers['Bcc'], null, true, $headers['charset'])
+             );
+         }
+ 
+@@ -284,7 +284,7 @@ class automatic_addressbook extends rcube_plugin
+         if ($args['source'] !== $this->abook_id) {
+             foreach (array('email:home', 'email:work', 'email:other') as $email_field) {
+                 // Would trigger a warning with rc 0.5 without this if
+-                if ($args['record'][$email_field]) {
++                if (@$args['record'][$email_field]) {
+                     foreach ($args['record'][$email_field] as $email) {
+                         $contact_emails[] = $email;
+                     }