Imported Upstream version 0.63.0

[hcoop/debian/courier-authlib.git] / rfc822 / imaprefs.c

diff --git a/rfc822/imaprefs.c b/rfc822/imaprefs.c
index a507e8d..f86ad5e 100644 (file)
--- a/rfc822/imaprefs.c
+++ b/rfc822/imaprefs.c
@@ -4,7 +4,7 @@
 */
 
 /*
-** $Id: imaprefs.c,v 1.10 2003/07/09 21:33:20 mrsam Exp $
+** $Id: imaprefs.c,v 1.12 2009/11/22 19:39:52 mrsam Exp $
 */
 
 #include       "config.h"
@@ -252,9 +252,9 @@ int n;
 
        for (n=0; n<a->naddrs; n++)
        {
-               char *msgid=rfc822_getaddr(a, n);
+               char *msgid=a->addrs[n].tokens ? rfc822_getaddr(a, n):NULL;
 
-               msg=*msgid ? rfc822_threadsearchmsg(mt, msgid ? msgid:""):0;
+               msg=msgid ? rfc822_threadsearchmsg(mt, msgid):0;
                if (!msg)
                {
                        msg=rfc822_threadallocmsg(mt, msgid ? msgid:"");