diff --git a/mutt-1.6.1.dif b/mutt-1.6.1.dif
index 9060645..95c5ee0 100644
--- a/mutt-1.6.1.dif
+++ b/mutt-1.6.1.dif
@@ -3,10 +3,11 @@
  doc/Makefile.in |    2 -
  doc/Muttrc      |  102 +++++++++++++++++++++++++++++++++++++++++---------------
  doc/Muttrc.head |    2 -
+ headers.c       |    9 ++++
  imap/auth.c     |   20 ++++++++++
  init.h          |    3 +
  mx.c            |    3 +
- 7 files changed, 112 insertions(+), 30 deletions(-)
+ 8 files changed, 121 insertions(+), 30 deletions(-)
 
 --- configure.ac
 +++ configure.ac	2016-05-31 11:11:35.279958476 +0000
@@ -319,8 +320,28 @@
      {
        /* NOTE: this _must_ be done before the check for mailcap! */
 --- headers.c
-+++ headers.c	2016-06-01 10:56:51.193585638 +0000
-@@ -360,6 +360,9 @@ void mutt_scan_labels(CONTEXT *ctx)
++++ headers.c	2016-06-02 06:52:06.767101363 +0000
+@@ -220,6 +220,9 @@ void mutt_label_ref_dec(ENVELOPE *env)
+   uintptr_t count;
+   LIST *label;
+ 
++  if (!Labels)
++    return;
++
+   for (label = env->labels; label; label = label->next)
+   {
+     if (label->data == NULL)
+@@ -241,6 +244,9 @@ void mutt_label_ref_inc(ENVELOPE *env)
+   uintptr_t count;
+   LIST *label;
+ 
++  if (!Labels)
++    return;
++
+   for (label = env->labels; label; label = label->next)
+   {
+     if (label->data == NULL)
+@@ -360,6 +366,9 @@ void mutt_scan_labels(CONTEXT *ctx)
  {
    int i;
  
diff --git a/mutt.changes b/mutt.changes
index 2339420..42a10af 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,8 +1,13 @@
+-------------------------------------------------------------------
+Thu Jun  2 06:58:11 UTC 2016 - werner@suse.de
+
+- Yet an other crash due keywords.patch (boo#982129) 
+
 -------------------------------------------------------------------
 Wed Jun  1 11:04:06 UTC 2016 - werner@suse.de
 
 - Fix crash due keywords.patch which stumble over not existing
-  standard mailbox 
+  standard mailbox (boo#982129)
 
 -------------------------------------------------------------------
 Tue May 31 12:35:33 UTC 2016 - werner@suse.de