Fix PGP-mimedecode.

svn path=/trunk/; revision=2413

2 files changed, 2 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index f83d5e00..41fd79de 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ fetchmail-5.0.0 ():
 * Eliminate a realloc error in fetchmail -v -v progress message generation.
 * Spanish-language update by Javier Kohen.
 * Danish summary and description for specgen.sh.
+* Henrik Storner's fix for the PGP/mimedecode problem.
 
 There are 263 people on fetchmail-friends and 361 on fetchmail-announce.
 
diff --git a/unmime.c b/unmime.c
index 7d60b546..6e7362b4 100644
--- a/unmime.c
+++ b/unmime.c
@@ -45,7 +45,6 @@ static int qp_char(unsigned char c1, unsigned char c2, unsigned char *c_out)
 }
 
 
-
 /*
  * Routines to decode MIME QP-encoded headers, as per RFC 2047.
  */
@@ -457,7 +456,7 @@ int MimeBodyType(unsigned char *hdrs, int WantDecode)
 
     /* Check Content-Type to see if this is a multipart message */
     if ( (CntType != NULL) &&
-         ((strncasecmp(CntType, "multipart/", 10) == 0) ||
+         ((strncasecmp(CntType, "multipart/mixed", 16) == 0) ||
 	  (strncasecmp(CntType, "message/", 8) == 0)) ) {
 
       char *p1 = GetBoundary(CntType);