from 3_1_BRANCH: fix missing "Fwd: " reply prefix when doing forward as attachment

svn path=/trunk/kdenetwork/kmail/; revision=198529

kmcommands.cpp

@@ -759,6 +759,7 @@ void KMForwardAttachedCommand::execute()
   else if (msgList.count() == 1) {
     KMMessage *msg = msgList.getFirst();
     fwdMsg->initFromMessage(msg);
+    fwdMsg->setSubject( msg->forwardSubject() );
   }
 
   fwdMsg->setAutomaticFields(true);

kmmessage.cpp

@@ -1641,6 +1641,14 @@ QString KMMessage::replaceHeadersInString( const QString & s ) const {
   return result;
 }
 
+QString KMMessage::forwardSubject() const {
+  return cleanSubject( sForwardSubjPrefixes, sReplaceForwSubjPrefix, "Fwd:" );
+}
+
+QString KMMessage::replySubject() const {
+  return cleanSubject( sReplySubjPrefixes, sReplaceSubjPrefix, "Re:" );
+}
+
 KMMessage* KMMessage::createDeliveryReceipt() const
 {
   QString str, receiptTo;

kmmessage.h

@@ -333,6 +333,12 @@ public:
   QString cleanSubject(const QStringList& prefixRegExps, bool replace,
 		       const QString& newPrefix) const;
 
+  /** Return this mails subject, formatted for "forward" mails */
+  QString forwardSubject() const;
+
+  /** Return this mails subject, formatted for "reply" mails */
+  QString replySubject() const;
+
   /** Get or set the 'X-Mark' header field */
   virtual QString xmark(void) const;
   virtual void setXMark(const QString& aStr);