SVN_MERGE

Merged revisions 1055353 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1055353 | winterz | 2009-11-27 22:19:34 +0100 (Fri, 27 Nov 2009) | 12 lines
  
  Merged revisions 1055261 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1055261 | tmcguire | 2009-11-27 13:04:53 -0500 (Fri, 27 Nov 2009) | 5 lines
    
    Always recognize attached messages as attachments, as some clients (Hello Microsoft) don't
    set the content disposition for this correctly.
    
    Part of kolab/issue3978
  ........
................

svn path=/trunk/KDE/kdepim/; revision=1058351

partNode.cpp

@@ -590,6 +590,13 @@ bool partNode::isAttachment() const
   if ( !dwPart()->hasHeaders() )
     return false;
   DwHeaders& headers = dwPart()->Headers();
+  if ( headers.HasContentType() &&
+       headers.ContentType().Type() == DwMime::kTypeMessage &&
+       headers.ContentType().Subtype() == DwMime::kSubtypeRfc822 ) {
+    // Messages are always attachments. Normally message attachments created from KMail have a content
+    // disposition, but some mail clients omit that.
+    return true;
+  }
   if( !headers.HasContentDisposition() )
     return false;
   return ( headers.ContentDisposition().DispositionType()