merge...

SVN commit 628742 by dmiceman:

Create all inline forward messages as text/plain

Solves 140549

svn path=/branches/kdepim/enterprise/kdepim/; revision=665673

kmmessage.cpp

@@ -1221,14 +1221,20 @@ KMMessage* KMMessage::createForward( const QString &tmpl /* = QString::null */ )
 
     msg->initFromMessage( this );
     //restore type
-    msg->setType( type );
-    msg->setSubtype( subtype );
+    // msg->setType( type );
+    // msg->setSubtype( subtype );
+
+    // set plain text content type for forwarded message
+    // of you change this, please test how templates work on forward
+    msg->setType( DwMime::kTypeText );
+    msg->setSubtype( DwMime::kSubtypePlain );
   } else if( type() == DwMime::kTypeText && subtype() == DwMime::kSubtypeHtml ) {
     // This is non-multipart html mail. Let`s make it text/plain and allow
     // template parser do the hard job.
     msg->initFromMessage( this );
     msg->setType( DwMime::kTypeText );
-    msg->setSubtype( DwMime::kSubtypeHtml );
+    // msg->setSubtype( DwMime::kSubtypeHtml );
+    msg->setSubtype( DwMime::kSubtypePlain );
     msg->mNeedsAssembly = true;
     msg->cleanupHeader();
   } else {