11 files changed, 81 insertions, 4 deletions

diff --git a/noncore/net/mail/abstractmail.h b/noncore/net/mail/abstractmail.h
index 0a1719d..62e0715 100644
--- a/noncore/net/mail/abstractmail.h
+++ b/noncore/net/mail/abstractmail.h
@@ -1,30 +1,31 @@
 #ifndef __abstract_mail_
 #define __abstract_mail_
 
 #include <qobject.h>
 #include "settings.h"
 
 class RecMail;
 class RecBody;
 class RecPart;
 class IMAPwrapper;
 class POP3wrapper;
 class Folder;
 
 class AbstractMail:public QObject
 {
     Q_OBJECT
 public:
     AbstractMail(){};
     virtual ~AbstractMail(){}
     virtual QList<Folder>* listFolders()=0;
     virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0;
     virtual RecBody fetchBody(const RecMail&mail)=0;
     virtual QString fetchPart(const RecMail&mail,const RecPart&part)=0;
     virtual void deleteMail(const RecMail&mail)=0;
+    virtual void answeredMail(const RecMail&mail)=0;
     
     static AbstractMail* getWrapper(IMAPaccount *a);
     static AbstractMail* getWrapper(POP3account *a);
 };
 
 #endif
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 912a412..b253b49 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -718,24 +718,54 @@ void IMAPwrapper::deleteMail(const RecMail&mail)
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox for delete: %s",m_imap->imap_response);
         return;
     }
     flist = mailimap_flag_list_new_empty();
     mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
     store_flags = mailimap_store_att_flags_new_set_flags(flist);
     set = mailimap_set_new_single(mail.getNumber());
     err = mailimap_store(m_imap,set,store_flags);
     mailimap_set_free( set );
     mailimap_store_att_flags_free(store_flags);
 
     if (err != MAILIMAP_NO_ERROR) {
         qDebug("error deleting mail: %s",m_imap->imap_response);
         return;
     }
     qDebug("deleting mail: %s",m_imap->imap_response);
     /* should we realy do that at this moment? */
     err = mailimap_expunge(m_imap);
     if (err != MAILIMAP_NO_ERROR) {
         qDebug("error deleting mail: %s",m_imap->imap_response);
     }
     qDebug("Delete successfull %s",m_imap->imap_response);
 }
+
+void IMAPwrapper::answeredMail(const RecMail&mail)
+{
+    mailimap_flag_list*flist;
+    mailimap_set *set;
+    mailimap_store_att_flags * store_flags;
+    int err;
+    login();
+    if (!m_imap) {
+        return;
+    }
+    const char *mb = mail.getMbox().latin1();
+    err = mailimap_select( m_imap, (char*)mb);
+    if ( err != MAILIMAP_NO_ERROR ) {
+        qDebug("error selecting mailbox for mark: %s",m_imap->imap_response);
+        return;
+    }
+    flist = mailimap_flag_list_new_empty();
+    mailimap_flag_list_add(flist,mailimap_flag_new_answered());
+    store_flags = mailimap_store_att_flags_new_set_flags(flist);
+    set = mailimap_set_new_single(mail.getNumber());
+    err = mailimap_store(m_imap,set,store_flags);
+    mailimap_set_free( set );
+    mailimap_store_att_flags_free(store_flags);
+
+    if (err != MAILIMAP_NO_ERROR) {
+        qDebug("error marking mail: %s",m_imap->imap_response);
+        return;
+    }
+}
diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h
index 4f4d575..700d512 100644
--- a/noncore/net/mail/imapwrapper.h
+++ b/noncore/net/mail/imapwrapper.h
@@ -4,48 +4,49 @@
 #include <qlist.h>
 #include "mailwrapper.h"
 #include "abstractmail.h"
 
 struct mailimap;
 struct mailimap_body_type_1part;
 struct mailimap_body_type_text;
 struct mailimap_body_type_basic;
 struct mailimap_body_type_msg;
 struct mailimap_body_type_mpart;
 struct mailimap_body_fields;
 struct mailimap_msg_att;
 
 class IMAPwrapper : public AbstractMail
 {
     Q_OBJECT
 public:
     IMAPwrapper( IMAPaccount *a );
     virtual ~IMAPwrapper();
     virtual QList<Folder>* listFolders();
     virtual void listMessages(const QString & mailbox,QList<RecMail>&target );
     virtual RecBody fetchBody(const RecMail&mail);
     virtual QString fetchPart(const RecMail&mail,const RecPart&part);
     virtual void deleteMail(const RecMail&mail);
+    virtual void answeredMail(const RecMail&mail);
 
     static void imap_progress( size_t current, size_t maximum );
 
 protected:
     RecMail*parse_list_result(mailimap_msg_att*);
     void login();
     void logout();
 
     virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false);
     
     void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body);
     void searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion=0,QValueList<int>recList=QValueList<int>());
 
     void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description);
     void fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which);
     void fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which);
     void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which);
     
     /* just helpers */
     static void fillBodyFields(RecPart&target_part,mailimap_body_fields*which);
     static QStringList address_list_to_stringlist(clist*list);
 
 private:
     IMAPaccount *account;
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index 0a1719d..62e0715 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -1,30 +1,31 @@
 #ifndef __abstract_mail_
 #define __abstract_mail_
 
 #include <qobject.h>
 #include "settings.h"
 
 class RecMail;
 class RecBody;
 class RecPart;
 class IMAPwrapper;
 class POP3wrapper;
 class Folder;
 
 class AbstractMail:public QObject
 {
     Q_OBJECT
 public:
     AbstractMail(){};
     virtual ~AbstractMail(){}
     virtual QList<Folder>* listFolders()=0;
     virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0;
     virtual RecBody fetchBody(const RecMail&mail)=0;
     virtual QString fetchPart(const RecMail&mail,const RecPart&part)=0;
     virtual void deleteMail(const RecMail&mail)=0;
+    virtual void answeredMail(const RecMail&mail)=0;
     
     static AbstractMail* getWrapper(IMAPaccount *a);
     static AbstractMail* getWrapper(POP3account *a);
 };
 
 #endif
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 912a412..b253b49 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -718,24 +718,54 @@ void IMAPwrapper::deleteMail(const RecMail&mail)
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox for delete: %s",m_imap->imap_response);
         return;
     }
     flist = mailimap_flag_list_new_empty();
     mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
     store_flags = mailimap_store_att_flags_new_set_flags(flist);
     set = mailimap_set_new_single(mail.getNumber());
     err = mailimap_store(m_imap,set,store_flags);
     mailimap_set_free( set );
     mailimap_store_att_flags_free(store_flags);
 
     if (err != MAILIMAP_NO_ERROR) {
         qDebug("error deleting mail: %s",m_imap->imap_response);
         return;
     }
     qDebug("deleting mail: %s",m_imap->imap_response);
     /* should we realy do that at this moment? */
     err = mailimap_expunge(m_imap);
     if (err != MAILIMAP_NO_ERROR) {
         qDebug("error deleting mail: %s",m_imap->imap_response);
     }
     qDebug("Delete successfull %s",m_imap->imap_response);
 }
+
+void IMAPwrapper::answeredMail(const RecMail&mail)
+{
+    mailimap_flag_list*flist;
+    mailimap_set *set;
+    mailimap_store_att_flags * store_flags;
+    int err;
+    login();
+    if (!m_imap) {
+        return;
+    }
+    const char *mb = mail.getMbox().latin1();
+    err = mailimap_select( m_imap, (char*)mb);
+    if ( err != MAILIMAP_NO_ERROR ) {
+        qDebug("error selecting mailbox for mark: %s",m_imap->imap_response);
+        return;
+    }
+    flist = mailimap_flag_list_new_empty();
+    mailimap_flag_list_add(flist,mailimap_flag_new_answered());
+    store_flags = mailimap_store_att_flags_new_set_flags(flist);
+    set = mailimap_set_new_single(mail.getNumber());
+    err = mailimap_store(m_imap,set,store_flags);
+    mailimap_set_free( set );
+    mailimap_store_att_flags_free(store_flags);
+
+    if (err != MAILIMAP_NO_ERROR) {
+        qDebug("error marking mail: %s",m_imap->imap_response);
+        return;
+    }
+}
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
index 4f4d575..700d512 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.h
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -4,48 +4,49 @@
 #include <qlist.h>
 #include "mailwrapper.h"
 #include "abstractmail.h"
 
 struct mailimap;
 struct mailimap_body_type_1part;
 struct mailimap_body_type_text;
 struct mailimap_body_type_basic;
 struct mailimap_body_type_msg;
 struct mailimap_body_type_mpart;
 struct mailimap_body_fields;
 struct mailimap_msg_att;
 
 class IMAPwrapper : public AbstractMail
 {
     Q_OBJECT
 public:
     IMAPwrapper( IMAPaccount *a );
     virtual ~IMAPwrapper();
     virtual QList<Folder>* listFolders();
     virtual void listMessages(const QString & mailbox,QList<RecMail>&target );
     virtual RecBody fetchBody(const RecMail&mail);
     virtual QString fetchPart(const RecMail&mail,const RecPart&part);
     virtual void deleteMail(const RecMail&mail);
+    virtual void answeredMail(const RecMail&mail);
 
     static void imap_progress( size_t current, size_t maximum );
 
 protected:
     RecMail*parse_list_result(mailimap_msg_att*);
     void login();
     void logout();
 
     virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false);
     
     void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body);
     void searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion=0,QValueList<int>recList=QValueList<int>());
 
     void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description);
     void fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which);
     void fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which);
     void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which);
     
     /* just helpers */
     static void fillBodyFields(RecPart&target_part,mailimap_body_fields*which);
     static QStringList address_list_to_stringlist(clist*list);
 
 private:
     IMAPaccount *account;
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 5065d29..46c854b 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -266,24 +266,28 @@ void POP3wrapper::logout()
     if ( m_pop3 == NULL ) return;
     err = mailpop3_quit( m_pop3 );
     mailpop3_free( m_pop3 );
     m_pop3 = NULL;
 }
 
 
 QList<Folder>* POP3wrapper::listFolders()
 {
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
     Folder*inb=new Folder("INBOX");
     folders->append(inb);
     return folders;
 }
 
 QString POP3wrapper::fetchPart(const RecMail&,const RecPart&)
 {
     return "";
 }
 
 void POP3wrapper::deleteMail(const RecMail&)
 {
 }
+
+void POP3wrapper::answeredMail(const RecMail&)
+{
+}
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index ef972c8..6ff8d62 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -1,43 +1,44 @@
 #ifndef __POP3WRAPPER
 #define __POP3WRAPPER
 
 #include "mailwrapper.h"
 #include "abstractmail.h"
 
 class RecMail;
 class RecBody;
 struct mailpop3;
 
 class POP3wrapper : public AbstractMail
 {
     Q_OBJECT
 
 public:
     POP3wrapper( POP3account *a );
     virtual ~POP3wrapper();
     /* mailbox will be ignored */
     virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
     virtual QList<Folder>* listFolders();
     virtual QString fetchPart(const RecMail&mail,const RecPart&part);
     virtual void deleteMail(const RecMail&mail);
+    virtual void answeredMail(const RecMail&mail);
 
     RecBody fetchBody( const RecMail &mail );
     static void pop3_progress( size_t current, size_t maximum );
 
 protected:
     void login();
     void logout();
 
 private:
     RecMail *parseHeader( const char *header );
     RecBody parseBody( const char *message );
     QString parseMailboxList( mailimf_mailbox_list *list );
     QString parseMailbox( mailimf_mailbox *box );
     QString parseGroup( mailimf_group *group );
     QString parseAddressList( mailimf_address_list *list );
     QString parseDateTime( mailimf_date_time *date );
     POP3account *account;
     mailpop3 *m_pop3;
 };
 
 #endif
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 5065d29..46c854b 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -266,24 +266,28 @@ void POP3wrapper::logout()
     if ( m_pop3 == NULL ) return;
     err = mailpop3_quit( m_pop3 );
     mailpop3_free( m_pop3 );
     m_pop3 = NULL;
 }
 
 
 QList<Folder>* POP3wrapper::listFolders()
 {
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
     Folder*inb=new Folder("INBOX");
     folders->append(inb);
     return folders;
 }
 
 QString POP3wrapper::fetchPart(const RecMail&,const RecPart&)
 {
     return "";
 }
 
 void POP3wrapper::deleteMail(const RecMail&)
 {
 }
+
+void POP3wrapper::answeredMail(const RecMail&)
+{
+}
diff --git a/noncore/net/mail/pop3wrapper.h b/noncore/net/mail/pop3wrapper.h
index ef972c8..6ff8d62 100644
--- a/noncore/net/mail/pop3wrapper.h
+++ b/noncore/net/mail/pop3wrapper.h
@@ -1,43 +1,44 @@
 #ifndef __POP3WRAPPER
 #define __POP3WRAPPER
 
 #include "mailwrapper.h"
 #include "abstractmail.h"
 
 class RecMail;
 class RecBody;
 struct mailpop3;
 
 class POP3wrapper : public AbstractMail
 {
     Q_OBJECT
 
 public:
     POP3wrapper( POP3account *a );
     virtual ~POP3wrapper();
     /* mailbox will be ignored */
     virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
     virtual QList<Folder>* listFolders();
     virtual QString fetchPart(const RecMail&mail,const RecPart&part);
     virtual void deleteMail(const RecMail&mail);
+    virtual void answeredMail(const RecMail&mail);
 
     RecBody fetchBody( const RecMail &mail );
     static void pop3_progress( size_t current, size_t maximum );
 
 protected:
     void login();
     void logout();
 
 private:
     RecMail *parseHeader( const char *header );
     RecBody parseBody( const char *message );
     QString parseMailboxList( mailimf_mailbox_list *list );
     QString parseMailbox( mailimf_mailbox *box );
     QString parseGroup( mailimf_group *group );
     QString parseAddressList( mailimf_address_list *list );
     QString parseDateTime( mailimf_date_time *date );
     POP3account *account;
     mailpop3 *m_pop3;
 };
 
 #endif
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index e53f4a3..68d3c51 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -238,90 +238,93 @@ void ViewMail::exec()
                 qApp->enter_loop();
         }
 
 }
 
 QString ViewMail::deHtml(const QString &string)
 {
         QString string_ = string;
         string_.replace(QRegExp("&"), "&amp;");
         string_.replace(QRegExp("<"), "&lt;");
         string_.replace(QRegExp(">"), "&gt;");
         string_.replace(QRegExp("\\n"), "<br>");
         return string_;
 }
 
 void ViewMail::slotReply()
 {
         if (!m_gotBody) {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
                 return;
         }
 
         QString rtext;
                 rtext += QString("* %1 wrote on %2:\n")         // no i18n on purpose
-                .arg(  m_mail[1] )
+                .arg(  m_mail[0] )
                 .arg( m_mail[3] );
 
         QString text = m_mail[2];
         QStringList lines = QStringList::split(QRegExp("\\n"), text);
         QStringList::Iterator it;
         for (it = lines.begin(); it != lines.end(); it++) {
                 rtext += "> " + *it + "\n";
         }
         rtext += "\n";
 
         QString prefix;
         if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
                 else prefix = "Re: ";                   // no i18n on purpose
 
         Settings *settings = new Settings();
         ComposeMail composer( settings ,this, 0, true);
         composer.setTo( m_mail[0] );
         composer.setSubject( "Re: " + m_mail[1] );
         composer.setMessage( rtext );
         composer.showMaximized();
-        composer.exec();
-
+    if ( QDialog::Accepted==composer.exec()) {
+        m_recMail.Wrapper()->answeredMail(m_recMail);
+    }
 }
 
 void ViewMail::slotForward()
 {
         if (!m_gotBody) {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
                 return;
         }
 
         QString ftext;
         ftext += QString("\n----- Forwarded message from %1 -----\n\n")
                 .arg( m_mail[0] );
         if (!m_mail[3].isNull())
                  ftext += QString("Date: %1\n")
                          .arg( m_mail[3] );
         if (!m_mail[0].isNull())
                  ftext += QString("From: %1\n")
                          .arg( m_mail[0] );
         if (!m_mail[1].isNull())
                  ftext += QString("Subject: %1\n")
                          .arg( m_mail[1] );
 
         ftext += QString("\n%1\n")
                  .arg( m_mail[2]);
 
         ftext += QString("----- End forwarded message -----\n");
 
         Settings *settings = new Settings();
         ComposeMail composer( settings ,this, 0, true);
         composer.setSubject( "Fwd: " + m_mail[1] );
         composer.setMessage( ftext );
         composer.showMaximized();
-        composer.exec();
+    if ( QDialog::Accepted==composer.exec()) {
+        
+    }
 }
 
 void ViewMail::slotDeleteMail( )
 {
     if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
         m_recMail.Wrapper()->deleteMail( m_recMail );
         hide();
         deleted = true;
     }
 }