4 files changed, 47 insertions, 2 deletions

diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index bf91c63..96e0fd5 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -25,31 +25,33 @@ void RecMail::copy_old(const RecMail&old)
     subject = old.subject;
     date = old.date;
     mbox = old.mbox;
     msg_id = old.msg_id;
     msg_size = old.msg_size;
     msg_number = old.msg_number;
     from = old.from;
     msg_flags = old.msg_flags;
     to = old.to;
     cc = old.cc;
     bcc = old.bcc;
     wrapper = old.wrapper;
+    in_reply_to = old.in_reply_to;
 }
 
 void RecMail::init()
 {
     to.clear();
     cc.clear();
     bcc.clear();
+    in_reply_to.clear();
     wrapper = 0;
 }
 
 void RecMail::setWrapper(AbstractMail*awrapper)
 {
     wrapper = awrapper;
 }
 
 AbstractMail* RecMail::Wrapper()
 {
     return wrapper;
 }
@@ -75,24 +77,35 @@ const QStringList&RecMail::CC()const
 }
 
 void RecMail::setBcc(const QStringList&list)
 {
     bcc = list;
 }
 
 const QStringList& RecMail::Bcc()const
 {
     return bcc;
 }
 
+void RecMail::setInreply(const QStringList&list)
+{
+    in_reply_to = list;
+}
+
+const QStringList& RecMail::Inreply()const
+{
+    return in_reply_to;
+}
+
+
 RecPart::RecPart()
     : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0)
 {
     m_Parameters.clear();
     m_poslist.clear();
 }
 
 RecPart::~RecPart()
 {
 }
 
 void RecPart::setSize(unsigned int size)
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h
index b2047cb..1420f79 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.h
+++ b/noncore/net/mail/libmailwrapper/mailtypes.h
@@ -50,35 +50,37 @@ public:
     void setReplyto(const QString&reply){replyto=reply;}
     const QString&Replyto()const{return replyto;}
     void setMsgsize(int size){msg_size = size;}
     const int Msgsize()const{return msg_size;}
 
 
     void setTo(const QStringList&list);
     const QStringList&To()const;
     void setCC(const QStringList&list);
     const QStringList&CC()const;
     void setBcc(const QStringList&list);
     const QStringList&Bcc()const;
+    void setInreply(const QStringList&list);
+    const QStringList&Inreply()const;
     const QBitArray&getFlags()const{return msg_flags;}
     void setFlags(const QBitArray&flags){msg_flags = flags;}
     
     void setWrapper(AbstractMail*wrapper);
     AbstractMail* Wrapper();
 
 protected:
     QString subject,date,from,mbox,msg_id,replyto;
     int msg_number,msg_size;
     QBitArray msg_flags;
-    QStringList to,cc,bcc;
+    QStringList to,cc,bcc,in_reply_to;
     AbstractMail*wrapper;
     void init();
     void copy_old(const RecMail&old);
 };
 
 typedef QMap<QString,QString> part_plist_t;
 
 class RecPart
 {
 protected:
     QString m_type,m_subtype,m_identifier,m_encoding,m_description;
     unsigned int m_lines,m_size;
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index caaa3a2..3a9f97b 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -46,28 +46,31 @@ public:
     const QString&getTo()const{ return to; }
     void setTo( const QString&s ) { to = s; }
     const QString&getCC()const{ return cc; }
     void setCC( const QString&s ) { cc = s; }
     const QString&getBCC()const { return bcc; }
     void setBCC( const QString&s ) { bcc = s; }
     const QString&getMessage()const { return message; }
     void setMessage( const QString&s ) { message = s; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getReply()const{ return reply; }
     void setReply( const QString&a ) { reply = a; }
+    void setInreply(const QStringList&list){m_in_reply_to = list;}
+    const QStringList&Inreply()const{return m_in_reply_to;}
 
 private:
     QList<Attachment> attList;
     QString name, mail, to, cc, bcc, reply, subject, message;
+    QStringList m_in_reply_to;
 };
 
 class Folder : public QObject
 {
     Q_OBJECT
 
 public:
     Folder( const QString&init_name,const QString&sep );
     const QString&getDisplayName()const { return nameDisplay; }
     const QString&getName()const { return name; }
     const QString&getPrefix()const{return prefix; }
     virtual bool may_select()const{return true;}
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index d7a005e..63acfd5 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -140,24 +140,25 @@ mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr ) {
             qDebug( "Parse success! %s",(*it).latin1());
         }
     }
     return addresses;
 }
 
 mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail ) {
     mailimf_fields *fields;
     mailimf_field *xmailer;
     mailimf_mailbox *sender=0,*fromBox=0;
     mailimf_mailbox_list *from=0;
     mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0;
+    clist*in_reply_to = 0;
     char *subject = strdup( mail.getSubject().latin1() );
     int err;
 
     sender = newMailbox( mail.getName(), mail.getMail() );
     if ( sender == NULL )
         goto err_free;
 
     fromBox = newMailbox( mail.getName(), mail.getMail() );
     if ( fromBox == NULL )
         goto err_free_sender;
 
     from = mailimf_mailbox_list_new_empty();
@@ -166,27 +167,53 @@ mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail ) {
 
     err = mailimf_mailbox_list_add( from, fromBox );
     if ( err != MAILIMF_NO_ERROR )
         goto err_free_from;
 
     to = parseAddresses( mail.getTo() );
     if ( to == NULL )
         goto err_free_from;
 
     cc = parseAddresses( mail.getCC() );
     bcc = parseAddresses( mail.getBCC() );
     reply = parseAddresses( mail.getReply() );
+    
+    if (mail.Inreply().count()>0) {
+        in_reply_to = clist_new();
+        char*c_reply;
+        unsigned int nsize = 0;
+        for (QStringList::ConstIterator it=mail.Inreply().begin();
+             it != mail.Inreply().end();++it) {
+            /* yes! must be malloc! */
+            if ((*it).isEmpty())
+                continue;
+            QString h((*it));
+            while (h.length()>0 && h[0]=='<') {
+                h.remove(0,1);
+            }
+            while (h.length()>0 && h[h.length()-1]=='>') {
+                h.remove(h.length()-1,1);
+            }
+            if (h.isEmpty()) continue;
+            nsize = strlen(h.latin1());
+            c_reply = (char*)malloc( (nsize+1)*sizeof(char));
+            memset(c_reply,0,nsize+1);
+            memcpy(c_reply,h.latin1(),nsize);
+            clist_append(in_reply_to,c_reply);
+            qDebug("In reply to: %s",c_reply);
+        }
+    }
 
     fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc,
-                                           NULL, NULL, subject );
+                                           in_reply_to, NULL, subject );
     if ( fields == NULL )
         goto err_free_reply;
 
     xmailer = mailimf_field_new_custom( strdup( "User-Agent" ),
                                         strdup( USER_AGENT ) );
     if ( xmailer == NULL )
         goto err_free_fields;
 
     err = mailimf_fields_add( fields, xmailer );
     if ( err != MAILIMF_NO_ERROR )
         goto err_free_xmailer;