diff --git a/headerstyle.cpp b/headerstyle.cpp index 13c1d0f54..f0a4471e5 100644 --- a/headerstyle.cpp +++ b/headerstyle.cpp @@ -779,16 +779,16 @@ namespace KMail { QStringList headerParts; if( strategy->showHeader( "to" ) ) - headerParts << KMMessage::emailAddrAsAnchor( message->to(),false,"", false ); - + headerParts << KMMessage::emailAddrAsAnchor( message->to(), false, "class=\"white\"" ); + if ( strategy->showHeader( "cc" ) && !message->cc().isEmpty() ) - headerParts << i18n("CC: ") + KMMessage::emailAddrAsAnchor( message->cc(), true, "", false ); - + headerParts << i18n("CC: ") + KMMessage::emailAddrAsAnchor( message->cc(), true, "class=\"white\"" ); + if ( strategy->showHeader( "bcc" ) && !message->bcc().isEmpty() ) - headerParts << i18n("BCC: ") + KMMessage::emailAddrAsAnchor( message->bcc(), true, "", false ); + headerParts << i18n("BCC: ") + KMMessage::emailAddrAsAnchor( message->bcc(), true, "class=\"white\"" ); // remove all empty (modulo whitespace) entries and joins them via ", \n" - QString headerPart = " " + headerParts.grep( QRegExp( "\\S" ) ).join( ",\n" ); + QString headerPart = " " + headerParts.grep( QRegExp( "\\S" ) ).join( ", " ); // Prepare the date string (when printing always use the localized date) QString dateString; @@ -808,7 +808,6 @@ namespace KMail { imgpath.append("enterprise_"); const QString borderSettings(" padding-top: 0px; padding-bottom: 0px; border-width: 0px "); QString headerStr ( - " \n" "
\n" "
"+dateString+"
" // #0057ae @@ -838,15 +837,15 @@ namespace KMail { if ( fromStr.isEmpty() ) // no valid email in from, maybe just a name fromStr = message->fromStrip(); // let's use that // TODO vcard - //QString fromPart = KMMessage::emailAddrAsAnchor( fromStr, true ); - //if ( !vCardName.isEmpty() ) - //fromPart += "  " + i18n("[vCard]") + ""; + QString fromPart = KMMessage::emailAddrAsAnchor( fromStr, true, "class=\"white\"" ); + if ( !vCardName.isEmpty() ) + fromPart += "  " + i18n("[vCard]") + ""; //TDDO strategy date //if ( strategy->showHeader( "date" ) ) headerStr += " \n" " "+i18n("From: ")+" \n" - " "+ fromStr +" " + " "+ fromPart +" " " "; }